diff --git a/.gitignore b/.gitignore
index 40d6e6ca0fe0c3d38ee57cc4c4f7cff3116d4b1c..b57dd3d2058063ba2afabfaeae4dcf51ac19b7b2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,6 @@ owncloud
 config/config.php
 config/mount.php
 apps/inc.php
-3rdparty
 
 # ignore all apps except core ones
 apps/*
@@ -17,6 +16,10 @@ apps/*
 !apps/user_ldap
 !apps/user_webdavauth
 
+# ignore themes except the README
+themes/*
+!themes/README
+
 # just sane ignores
 .*.sw[po]
 *.bak
@@ -50,6 +53,7 @@ nbproject
 
 # phpStorm
 .idea
+*.iml
 
 # geany
 *.geany
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000000000000000000000000000000000000..b9c1a3702cfb2f5dbc88f54aca9a46a246c97550
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "3rdparty"]
+	path = 3rdparty
+	url = git://github.com/owncloud/3rdparty.git
diff --git a/.htaccess b/.htaccess
index 616118b2ce8ae57bd914f595f1d6f069e52478c7..08e2a82facbfc2a80ef95eb21a3533de1136bc3f 100755
--- a/.htaccess
+++ b/.htaccess
@@ -1,5 +1,4 @@
 <IfModule mod_fcgid.c>
-php_value cgi.fix_pathinfo 1
 <IfModule mod_setenvif.c>
 <IfModule mod_headers.c>
 SetEnvIfNoCase ^Authorization$ "(.+)" XAUTHORIZATION=$1
@@ -13,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>
@@ -33,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
new file mode 160000
index 0000000000000000000000000000000000000000..a13af72fbe8983686fc47489a750e60319f68ac2
--- /dev/null
+++ b/3rdparty
@@ -0,0 +1 @@
+Subproject commit a13af72fbe8983686fc47489a750e60319f68ac2
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 1021eae0f647c565bd23fff175e56e1b94a8804c..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
-* Report the issue using our [template][template], it includes all the informations we need to track down the issue.
+* 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/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/ajax/upload.php b/apps/files/ajax/upload.php
index 5b697777e47cd701f09c4d61d1d7c95dfcb9c8d1..e1263744e1b454680347ab672f201c247701487e 100644
--- a/apps/files/ajax/upload.php
+++ b/apps/files/ajax/upload.php
@@ -47,7 +47,7 @@ $totalSize = 0;
 foreach ($files['size'] as $size) {
 	$totalSize += $size;
 }
-if ($totalSize > $maxUploadFilesize) {
+if ($maxUploadFilesize >= 0 and $totalSize > $maxUploadFilesize) {
 	OCP\JSON::error(array('data' => array('message' => $l->t('Not enough storage available'),
 		'uploadMaxFilesize' => $maxUploadFilesize,
 		'maxHumanFilesize' => $maxHumanFilesize)));
@@ -71,6 +71,7 @@ if (strpos($dir, '..') === false) {
 				'size' => $meta['size'],
 				'id' => $meta['fileid'],
 				'name' => basename($target),
+				'originalname'=>$files['name'][$i],
 				'uploadMaxFilesize' => $maxUploadFilesize,
 				'maxHumanFilesize' => $maxHumanFilesize
 			);
diff --git a/apps/files/appinfo/app.php b/apps/files/appinfo/app.php
index da17a7f2ccd26d5dbb2a7479999b60510eedbd36..05ab1722b3e4f5411bb32671bb69dd03582ecd86 100644
--- a/apps/files/appinfo/app.php
+++ b/apps/files/appinfo/app.php
@@ -1,4 +1,6 @@
 <?php
+OC::$CLASSPATH['OCA\Files\Capabilities'] = 'apps/files/lib/capabilities.php';
+
 $l = OC_L10N::get('files');
 
 OCP\App::registerAdmin('files', 'admin');
@@ -10,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');
+
+\OC_BackgroundJob_RegularTask::register('\OC\Files\Cache\BackgroundWatcher', 'checkNext');
diff --git a/apps/files/appinfo/routes.php b/apps/files/appinfo/routes.php
index 043782a9c04c5cdb5cb9958b0b848ba6f8994f93..fcd5f4b2608d9d51b45edce8ff1faac4eef1c03d 100644
--- a/apps/files/appinfo/routes.php
+++ b/apps/files/appinfo/routes.php
@@ -8,4 +8,7 @@
 
 $this->create('download', 'download{file}')
 	->requirements(array('file' => '.*'))
-	->actionInclude('files/download.php');
\ No newline at end of file
+	->actionInclude('files/download.php');
+	
+// Register with the capabilities API
+OC_API::register('get', '/cloud/capabilities', array('OCA\Files\Capabilities', 'getCapabilities'), 'files', OC_API::USER_AUTH);
\ No newline at end of file
diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index 4d2b16e6f1c2f4cefbbf04410e8678f5f7adeb68..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; }
@@ -45,7 +47,11 @@
 }
 
 #uploadprogresswrapper { float: right; position: relative; }
-#uploadprogresswrapper #uploadprogressbar { position:relative; display:inline-block; width:10em; height:1.5em; top:.4em; }
+#uploadprogresswrapper #uploadprogressbar {
+	position:relative; float: right;
+	margin-left: 12px; width:10em; height:1.5em; top:.4em;
+	display:inline-block;
+}
 
 /* FILE TABLE */
 
@@ -84,7 +90,7 @@ table td.filename input.filename { width:100%; cursor:text; }
 table td.filename a, table td.login, table td.logout, table td.download, table td.upload, table td.create, table td.delete { padding:.2em .5em .5em 0; }
 table td.filename .nametext, .uploadtext, .modified { float:left; padding:.3em 0; }
 /* TODO fix usability bug (accidental file/folder selection) */
-table td.filename .nametext { overflow:hidden; text-overflow:ellipsis; }
+table td.filename .nametext { overflow:hidden; text-overflow:ellipsis; max-width:800px; }
 table td.filename .uploadtext { font-weight:normal; margin-left:.5em; }
 table td.filename form { font-size:.85em; margin-left:3em; margin-right:3em; }
 
@@ -144,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 38f5bab6f73a4ba0bf52c516d8eadf1cf24bc18e..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 = {};
@@ -112,7 +112,8 @@ var FileActions = {
 				addAction(name, action);
 			}
 		});
-		if(actions.Share){
+		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 1db54f45bb82839d86cc41ec6f68a16178de636f..c24d1fd8244dd124d781e41f140cae700b6bb528 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -88,17 +88,17 @@ var FileList={
 			$('#permissions').val()
 		);
 
-		FileList.insertElement(name, 'file', tr.attr('data-file',name));
-		var row = $('tr').filterAttr('data-file',name);
+		FileList.insertElement(name, 'file', tr);
 		if(loading){
-			row.data('loading',true);
+			tr.data('loading',true);
 		}else{
-			row.find('td.filename').draggable(dragOptions);
+			tr.find('td.filename').draggable(dragOptions);
 		}
 		if (hidden) {
-			row.hide();
+			tr.hide();
 		}
-		FileActions.display(row.find('td.filename'));
+		FileActions.display(tr.find('td.filename'));
+		return tr;
 	},
 	addDir:function(name,size,lastModified,hidden){
 
@@ -113,13 +113,14 @@ var FileList={
 		);
 
 		FileList.insertElement(name,'dir',tr);
-		var row = $('tr').filterAttr('data-file',name);
-		row.find('td.filename').draggable(dragOptions);
-		row.find('td.filename').droppable(folderDropOptions);
+		var td = tr.find('td.filename');
+		td.draggable(dragOptions);
+		td.droppable(folderDropOptions);
 		if (hidden) {
-			row.hide();
+			tr.hide();
 		}
-		FileActions.display(row.find('td.filename'));
+		FileActions.display(tr.find('td.filename'));
+		return tr;
 	},
 	refresh:function(data) {
 		var result = jQuery.parseJSON(data.responseText);
@@ -190,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();
@@ -319,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) {
@@ -343,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);
 						});
 					}
 				});
@@ -351,6 +359,148 @@ var FileList={
 };
 
 $(document).ready(function(){
+
+	// handle upload events
+	var file_upload_start = $('#file_upload_start');
+	file_upload_start.on('fileuploaddrop', function(e, data) {
+		// only handle drop to dir if fileList exists
+		if ($('#fileList').length > 0) {
+			var dropTarget = $(e.originalEvent.target).closest('tr');
+			if(dropTarget && dropTarget.data('type') === 'dir') { // drag&drop upload to folder
+				var dirName = dropTarget.data('file');
+				// update folder in form
+				data.formData = function(form) {
+					var formArray = form.serializeArray();
+					// array index 0 contains the max files size
+					// array index 1 contains the request token
+					// array index 2 contains the directory
+					var parentDir = formArray[2]['value'];
+					if (parentDir === '/') {
+						formArray[2]['value'] += dirName;
+					} else {
+						formArray[2]['value'] += '/'+dirName;
+					}
+					return formArray;
+				}
+			}
+		}
+	});
+	file_upload_start.on('fileuploadadd', function(e, data) {
+		// only add to fileList if it exists
+		if ($('#fileList').length > 0) {
+
+			if(FileList.deleteFiles && FileList.deleteFiles.indexOf(data.files[0].name)!=-1){//finish delete if we are uploading a deleted file
+				FileList.finishDelete(null, true); //delete file before continuing
+			}
+
+			// add ui visualization to existing folder or as new stand-alone file?
+			var dropTarget = $(e.originalEvent.target).closest('tr');
+			if(dropTarget && dropTarget.data('type') === 'dir') {
+				// add to existing folder
+				var dirName = dropTarget.data('file');
+
+				// set dir context
+				data.context = $('tr').filterAttr('data-type', 'dir').filterAttr('data-file', dirName);
+
+				// update upload counter ui
+				var uploadtext = data.context.find('.uploadtext');
+				var currentUploads = parseInt(uploadtext.attr('currentUploads'));
+				currentUploads += 1;
+				uploadtext.attr('currentUploads', currentUploads);
+				if(currentUploads === 1) {
+					var img = OC.imagePath('core', 'loading.gif');
+					data.context.find('td.filename').attr('style','background-image:url('+img+')');
+					uploadtext.text(t('files', '1 file uploading'));
+					uploadtext.show();
+				} else {
+					uploadtext.text(currentUploads + ' ' + t('files', 'files uploading'));
+				}
+			} else {
+				// add as stand-alone row to filelist
+				var uniqueName = getUniqueName(data.files[0].name);
+				var size=t('files','Pending');
+				if(data.files[0].size>=0){
+					size=data.files[0].size;
+				}
+				var date=new Date();
+				// create new file context
+				data.context = FileList.addFile(uniqueName,size,date,true,false);
+
+			}
+		}
+	});
+	file_upload_start.on('fileuploaddone', function(e, data) {
+		// only update the fileList if it exists
+		if ($('#fileList').length > 0) {
+			var response;
+			if (typeof data.result === 'string') {
+				response = data.result;
+			} else {
+				// fetch response from iframe
+				response = data.result[0].body.innerText;
+			}
+			var result=$.parseJSON(response);
+
+			if(typeof result[0] !== 'undefined' && result[0].status === 'success') {
+				var file = result[0];
+
+				if (data.context.data('type') === 'file') {
+					// update file data
+					data.context.attr('data-mime',file.mime).attr('data-id',file.id);
+					var size = data.context.data('size');
+					if(size!=file.size){
+						data.context.attr('data-size', file.size);
+						data.context.find('td.filesize').text(humanFileSize(file.size));
+					}
+					if (FileList.loadingDone) {
+						FileList.loadingDone(file.name, file.id);
+					}
+				} else {
+					// update upload counter ui
+					var uploadtext = data.context.find('.uploadtext');
+					var currentUploads = parseInt(uploadtext.attr('currentUploads'));
+					currentUploads -= 1;
+					uploadtext.attr('currentUploads', currentUploads);
+					if(currentUploads === 0) {
+						var img = OC.imagePath('core', 'filetypes/folder.png');
+						data.context.find('td.filename').attr('style','background-image:url('+img+')');
+						uploadtext.text('');
+						uploadtext.hide();
+					} else {
+						uploadtext.text(currentUploads + ' ' + t('files', 'files uploading'));
+					}
+
+					// update folder size
+					var size =  parseInt(data.context.data('size'));
+					size +=  parseInt(file.size)	;
+					data.context.attr('data-size', size);
+					data.context.find('td.filesize').text(humanFileSize(size));
+
+				}
+			}
+		}
+	});
+	file_upload_start.on('fileuploadfail', function(e, data) {
+		// only update the fileList if it exists
+		// cleanup files, error notification has been shown by fileupload code
+		var tr = data.context;
+		if (typeof tr === 'undefined') {
+			tr = $('tr').filterAttr('data-file', data.files[0].name);
+		}
+		if (tr.attr('data-type') === 'dir') {
+			//cleanup uploading to a dir
+			var uploadtext = tr.find('.uploadtext');
+			var img = OC.imagePath('core', 'filetypes/folder.png');
+			tr.find('td.filename').attr('style','background-image:url('+img+')');
+			uploadtext.text('');
+			uploadtext.hide(); //TODO really hide already
+		} else {
+			//remove file
+			tr.fadeOut();
+			tr.remove();
+		}
+	});
+
 	$('#notification').hide();
 	$('#notification').on('click', '.undo', function(){
 		if (FileList.deleteFiles) {
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index a4ef41c280382cdf34925504d416ea0ea39777eb..a15f0588f9f3cec5ac8e589772e0809b132f7341 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');
@@ -226,14 +231,14 @@ $(document).ready(function() {
 		OC.Notification.show(t('files','Your download is being prepared. This might take some time if the files are big.'));
 		// use special download URL if provided, e.g. for public shared files
 		if ( (downloadURL = document.getElementById("downloadURL")) ) {
-			window.location=downloadURL.value+"&download&files="+files;
+			window.location=downloadURL.value+"&download&files="+encodeURIComponent(fileslist);
 		} else {
 			window.location=OC.filePath('files', 'ajax', 'download.php') + '?'+ $.param({ dir: dir, files: fileslist });
 		}
 		return false;
 	});
 
-	$('.delete').click(function(event) {
+	$('.delete-selected').click(function(event) {
 		var files=getSelectedFiles('name');
 		event.preventDefault();
 		FileList.do_delete(files);
@@ -247,241 +252,151 @@ $(document).ready(function() {
 	});
 
 	if ( document.getElementById('data-upload-form') ) {
-	$(function() {
-		$('#file_upload_start').fileupload({
-			dropZone: $('#content'), // restrict dropZone to content div
-			add: function(e, data) {
-				var files = data.files;
-				var totalSize=0;
-				if(files){
-					if (FileList.lastAction) {
-						FileList.lastAction();
-					}
-					for(var i=0;i<files.length;i++){
-						if(files[i].size ==0 && files[i].type== '')
-						{
-							OC.dialogs.alert(t('files', 'Unable to upload your file as it is a directory or has 0 bytes'), t('files', 'Upload Error'));
-							return;
-						}
-						totalSize+=files[i].size;
+		$(function() {
+			$('#file_upload_start').fileupload({
+				dropZone: $('#content'), // restrict dropZone to content div
+				//singleFileUploads is on by default, so the data.files array will always have length 1
+				add: function(e, data) {
+
+					if(data.files[0].type === '' && data.files[0].size == 4096)
+					{
+						data.textStatus = 'dirorzero';
+						data.errorThrown = t('files','Unable to upload your file as it is a directory or has 0 bytes');
+						var fu = $(this).data('blueimp-fileupload') || $(this).data('fileupload');
+						fu._trigger('fail', e, data);
+						return true; //don't upload this file but go on with next in queue
 					}
-				}
-				if(totalSize>$('#max_upload').val()){
-					$( '#uploadsize-message' ).dialog({
-						modal: true,
-						buttons: {
-							Close: {
-								text:t('files', 'Close'),
-								click:function() {
-									$( this ).dialog( 'close' );
-								}
-							}
-						}
+
+					var totalSize=0;
+					$.each(data.originalFiles, function(i,file){
+						totalSize+=file.size;
 					});
-				}else{
-					var dropTarget = $(e.originalEvent.target).closest('tr');
-					if(dropTarget && dropTarget.attr('data-type') === 'dir') { // drag&drop upload to folder
-						var dirName = dropTarget.attr('data-file')
+
+					if(totalSize>$('#max_upload').val()){
+						data.textStatus = 'notenoughspace';
+						data.errorThrown = t('files','Not enough space available');
+						var fu = $(this).data('blueimp-fileupload') || $(this).data('fileupload');
+						fu._trigger('fail', e, data);
+						return false; //don't upload anything
 					}
 
-					var date=new Date();
-					if(files){
-						for(var i=0;i<files.length;i++){
-							if(files[i].size>0){
-								var size=files[i].size;
-							}else{
-								var size=t('files','Pending');
-							}
-							if(files && !dirName){
-								var uniqueName = getUniqueName(files[i].name);
-								if (uniqueName != files[i].name) {
-									FileList.checkName(uniqueName, files[i].name, true);
-									var hidden = true;
-								} else {
-									var hidden = false;
-								}
-								FileList.addFile(uniqueName,size,date,true,hidden);
-							} else if(dirName) {
-								var uploadtext = $('tr').filterAttr('data-type', 'dir').filterAttr('data-file', dirName).find('.uploadtext')
-								var currentUploads = parseInt(uploadtext.attr('currentUploads'));
-								currentUploads += 1;
-								uploadtext.attr('currentUploads', currentUploads);
-								if(currentUploads === 1) {
-									var img = OC.imagePath('core', 'loading.gif');
-									var tr=$('tr').filterAttr('data-file',dirName);
-									tr.find('td.filename').attr('style','background-image:url('+img+')');
-									uploadtext.text(t('files', '1 file uploading'));
-									uploadtext.show();
-								} else {
-									uploadtext.text(t('files', '{count} files uploading', {count: currentUploads}));
-								}
-							}
+					// start the actual file upload
+					var jqXHR = data.submit();
+
+					// remember jqXHR to show warning to user when he navigates away but an upload is still in progress
+					if (typeof data.context !== 'undefined' && data.context.data('type') === 'dir') {
+						var dirName = data.context.data('file');
+						if(typeof uploadingFiles[dirName] === 'undefined') {
+							uploadingFiles[dirName] = {};
 						}
-					}else{
-						var filename=this.value.split('\\').pop(); //ie prepends C:\fakepath\ in front of the filename
-						var uniqueName = getUniqueName(filename);
-						if (uniqueName != filename) {
-							FileList.checkName(uniqueName, filename, true);
-							var hidden = true;
+						uploadingFiles[dirName][data.files[0].name] = jqXHR;
+					} else {
+						uploadingFiles[data.files[0].name] = jqXHR;
+					}
+
+					//show cancel button
+					if($('html.lte9').length === 0 && data.dataType !== 'iframe') {
+						$('#uploadprogresswrapper input.stop').show();
+					}
+				},
+				/**
+				 * called after the first add, does NOT have the data param
+				 * @param e
+				 */
+				start: function(e) {
+					//IE < 10 does not fire the necessary events for the progress bar.
+					if($('html.lte9').length > 0) {
+						return;
+					}
+					$('#uploadprogressbar').progressbar({value:0});
+					$('#uploadprogressbar').fadeIn();
+				},
+				fail: function(e, data) {
+					if (typeof data.textStatus !== 'undefined' && data.textStatus !== 'success' ) {
+						if (data.textStatus === 'abort') {
+							$('#notification').text(t('files', 'Upload cancelled.'));
 						} else {
-							var hidden = false;
+							// HTTP connection problem
+							$('#notification').text(data.errorThrown);
 						}
-						FileList.addFile(uniqueName,'Pending',date,true,hidden);
+						$('#notification').fadeIn();
+						//hide notification after 5 sec
+						setTimeout(function() {
+							$('#notification').fadeOut();
+						}, 5000);
 					}
-					if($.support.xhrFileUpload) {
-						for(var i=0;i<files.length;i++){
-							var fileName = files[i].name
-							var dropTarget = $(e.originalEvent.target).closest('tr');
-							if(dropTarget && dropTarget.attr('data-type') === 'dir') { // drag&drop upload to folder
-								var dirName = dropTarget.attr('data-file')
-								var jqXHR =  $('#file_upload_start').fileupload('send', {files: files[i],
-										formData: function(form) {
-											var formArray = form.serializeArray();
-											// array index 0 contains the max files size
-											// array index 1 contains the request token
-											// array index 2 contains the directory
-											formArray[2]['value'] = dirName;
-											return formArray;
-										}}).success(function(result, textStatus, jqXHR) {
-											var response;
-											response=jQuery.parseJSON(result);
-											if(response[0] == undefined || response[0].status != 'success') {
-												OC.Notification.show(t('files', response.data.message));
-											}
-											Files.updateMaxUploadFilesize(response);
-											var file=response[0];
-											// TODO: this doesn't work if the file name has been changed server side
-											delete uploadingFiles[dirName][file.name];
-											if ($.assocArraySize(uploadingFiles[dirName]) == 0) {
-												delete uploadingFiles[dirName];
-											}
-											//TODO update file upload size limit
-
-											var uploadtext = $('tr').filterAttr('data-type', 'dir').filterAttr('data-file', dirName).find('.uploadtext')
-											var currentUploads = parseInt(uploadtext.attr('currentUploads'));
-											currentUploads -= 1;
-											uploadtext.attr('currentUploads', currentUploads);
-											if(currentUploads === 0) {
-												var img = OC.imagePath('core', 'filetypes/folder.png');
-												var tr=$('tr').filterAttr('data-file',dirName);
-												tr.find('td.filename').attr('style','background-image:url('+img+')');
-												uploadtext.text('');
-												uploadtext.hide();
-											} else {
-												uploadtext.text(t('files', '{count} files uploading', {count: currentUploads}));
-											}
-										})
-								.error(function(jqXHR, textStatus, errorThrown) {
-									if(errorThrown === 'abort') {
-										var currentUploads = parseInt(uploadtext.attr('currentUploads'));
-										currentUploads -= 1;
-										uploadtext.attr('currentUploads', currentUploads);
-										if(currentUploads === 0) {
-											var img = OC.imagePath('core', 'filetypes/folder.png');
-											var tr=$('tr').filterAttr('data-file',dirName);
-											tr.find('td.filename').attr('style','background-image:url('+img+')');
-											uploadtext.text('');
-											uploadtext.hide();
-										} else {
-											uploadtext.text(t('files', '{count} files uploading', {count: currentUploads}));
-										}
-										delete uploadingFiles[dirName][fileName];
-										OC.Notification.show(t('files', 'Upload cancelled.'));
-									}
-								});
-								//TODO test with filenames containing slashes
-								if(uploadingFiles[dirName] === undefined) {
-									uploadingFiles[dirName] = {};
-								}
-								uploadingFiles[dirName][fileName] = jqXHR;
-							} else {
-								var jqXHR =  $('#file_upload_start').fileupload('send', {files: files[i]})
-										.success(function(result, textStatus, jqXHR) {
-											var response;
-											response=jQuery.parseJSON(result);
-											Files.updateMaxUploadFilesize(response);
-
-											if(response[0] != undefined && response[0].status == 'success') {
-												var file=response[0];
-												delete uploadingFiles[file.name];
-												$('tr').filterAttr('data-file',file.name).data('mime',file.mime).data('id',file.id);
-												var size = $('tr').filterAttr('data-file',file.name).find('td.filesize').text();
-												if(size==t('files','Pending')){
-													$('tr').filterAttr('data-file',file.name).find('td.filesize').text(file.size);
-												}
-												//TODO update file upload size limit
-												FileList.loadingDone(file.name, file.id);
-											} else {
-												Files.cancelUpload(this.files[0].name);
-												OC.Notification.show(t('files', response.data.message));
-												$('#fileList > tr').not('[data-mime]').fadeOut();
-												$('#fileList > tr').not('[data-mime]').remove();
-											}
-									})
-									.error(function(jqXHR, textStatus, errorThrown) {
-										if(errorThrown === 'abort') {
-											Files.cancelUpload(this.files[0].name);
-											OC.Notification.show(t('files', 'Upload cancelled.'));
-										}
-									});
-								uploadingFiles[uniqueName] = jqXHR;
-							}
+					delete uploadingFiles[data.files[0].name];
+				},
+				progress: function(e, data) {
+					// TODO: show nice progress bar in file row
+				},
+				progressall: function(e, data) {
+					//IE < 10 does not fire the necessary events for the progress bar.
+					if($('html.lte9').length > 0) {
+						return;
+					}
+					var progress = (data.loaded/data.total)*100;
+					$('#uploadprogressbar').progressbar('value',progress);
+				},
+				/**
+				 * called for every successful upload
+				 * @param e
+				 * @param data
+				 */
+				done:function(e, data) {
+					// handle different responses (json or body from iframe for ie)
+					var response;
+					if (typeof data.result === 'string') {
+						response = data.result;
+					} else {
+						//fetch response from iframe
+						response = data.result[0].body.innerText;
+					}
+					var result=$.parseJSON(response);
+
+					if(typeof result[0] !== 'undefined' && result[0].status === 'success') {
+						var file = result[0];
+					} else {
+						data.textStatus = 'servererror';
+						data.errorThrown = t('files', result.data.message);
+						var fu = $(this).data('blueimp-fileupload') || $(this).data('fileupload');
+						fu._trigger('fail', e, data);
+					}
+
+					var filename = result[0].originalname;
+
+					// delete jqXHR reference
+					if (typeof data.context !== 'undefined' && data.context.data('type') === 'dir') {
+						var dirName = data.context.data('file');
+						delete uploadingFiles[dirName][filename];
+						if ($.assocArraySize(uploadingFiles[dirName]) == 0) {
+							delete uploadingFiles[dirName];
 						}
-					}else{
-						data.submit().success(function(data, status) {
-							// in safari data is a string
-							response = jQuery.parseJSON(typeof data === 'string' ? data : data[0].body.innerText);
-							Files.updateMaxUploadFilesize(response);
-							if(response[0] != undefined && response[0].status == 'success') {
-								var file=response[0];
-								delete uploadingFiles[file.name];
-								$('tr').filterAttr('data-file',file.name).data('mime',file.mime).data('id',file.id);
-								var size = $('tr').filterAttr('data-file',file.name).find('td.filesize').text();
-								if(size==t('files','Pending')){
-									$('tr').filterAttr('data-file',file.name).find('td.filesize').text(file.size);
-								}
-								//TODO update file upload size limit
-								FileList.loadingDone(file.name, file.id);
-							} else {
-								//TODO Files.cancelUpload(/*where do we get the filename*/);
-								OC.Notification.show(t('files', response.data.message));
-								$('#fileList > tr').not('[data-mime]').fadeOut();
-								$('#fileList > tr').not('[data-mime]').remove();
-							}
-						});
+					} else {
+						delete uploadingFiles[filename];
 					}
+
+				},
+				/**
+				 * called after last upload
+				 * @param e
+				 * @param data
+				 */
+				stop: function(e, data) {
+					if(data.dataType !== 'iframe') {
+						$('#uploadprogresswrapper input.stop').hide();
+					}
+
+					//IE < 10 does not fire the necessary events for the progress bar.
+					if($('html.lte9').length > 0) {
+						return;
+					}
+
+					$('#uploadprogressbar').progressbar('value',100);
+					$('#uploadprogressbar').fadeOut();
 				}
-			},
-			fail: function(e, data) {
-				// TODO: cancel upload & display error notification
-			},
-			progress: function(e, data) {
-				// TODO: show nice progress bar in file row
-			},
-			progressall: function(e, data) {
-				var progress = (data.loaded/data.total)*100;
-				$('#uploadprogressbar').progressbar('value',progress);
-			},
-			start: function(e, data) {
-				//IE < 10 does not fire the necessary events for the progress bar.
-				if($.browser.msie && parseInt($.browser.version) < 10) {
-					return;
-				}
-				$('#uploadprogressbar').progressbar({value:0});
-				$('#uploadprogressbar').fadeIn();
-				if(data.dataType != 'iframe ') {
-					$('#upload input.stop').show();
-				}
-			},
-			stop: function(e, data) {
-				if(data.dataType != 'iframe ') {
-					$('#upload input.stop').hide();
-				}
-				$('#uploadprogressbar').progressbar('value',100);
-				$('#uploadprogressbar').fadeOut();
-			}
-		})
-	});
+			})
+		});
 	}
 	$.assocArraySize = function(obj) {
 		// http://stackoverflow.com/a/6700/11236
@@ -596,13 +511,13 @@ $(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 {
-								OC.dialogs.alert(result.data.message, 'Error');
+								OC.dialogs.alert(result.data.message, t('core', 'Error'));
 							}
 						}
 					);
@@ -618,7 +533,7 @@ $(document).ready(function() {
 								var tr=$('tr').filterAttr('data-file',name);
 								tr.attr('data-id', result.data.id);
 							} else {
-								OC.dialogs.alert(result.data.message, 'Error');
+								OC.dialogs.alert(result.data.message, t('core', 'Error'));
 							}
 						}
 					);
@@ -637,12 +552,20 @@ $(document).ready(function() {
 						localName=(localName.match(/:\/\/(.[^/]+)/)[1]).replace('www.','');
 					}
 					localName = getUniqueName(localName);
-					$('#uploadprogressbar').progressbar({value:0});
-					$('#uploadprogressbar').fadeIn();
+					//IE < 10 does not fire the necessary events for the progress bar.
+					if($('html.lte9').length > 0) {
+					} else {
+						$('#uploadprogressbar').progressbar({value:0});
+						$('#uploadprogressbar').fadeIn();
+					}
 
 					var eventSource=new OC.EventSource(OC.filePath('files','ajax','newfile.php'),{dir:$('#dir').val(),source:name,filename:localName});
 					eventSource.listen('progress',function(progress){
-						$('#uploadprogressbar').progressbar('value',progress);
+						//IE < 10 does not fire the necessary events for the progress bar.
+						if($('html.lte9').length > 0) {
+						} else {
+							$('#uploadprogressbar').progressbar('value',progress);
+						}
 					});
 					eventSource.listen('success',function(data){
 						var mime=data.mime;
@@ -839,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')+')');
@@ -865,7 +788,7 @@ var dragOptions={
 	}
 }
 // sane browsers support using the distance option
-if ( ! $.browser.msie) {
+if ( $('html.ie').length === 0) {
 	dragOptions['distance'] = 20;
 } 
 
@@ -900,7 +823,7 @@ var folderDropOptions={
 						$('#notification').fadeIn();
 					}
 				} else {
-					OC.dialogs.alert(t('Error moving file'));
+					OC.dialogs.alert(t('Error moving file'), t('core', 'Error'));
 				}
 			});
 		});
@@ -938,7 +861,7 @@ var crumbDropOptions={
 						$('#notification').fadeIn();
 					}
 				} else {
-					OC.dialogs.alert(t('Error moving file'));
+					OC.dialogs.alert(t('Error moving file'), t('core', 'Error'));
 				}
 			});
 		});
diff --git a/apps/files/l10n/ar.php b/apps/files/l10n/ar.php
index ce8a34acedb3ef8462d1659bde80f0145b526d14..ca198b7efe95a31501f411f6f7d644addd3c0b54 100644
--- a/apps/files/l10n/ar.php
+++ b/apps/files/l10n/ar.php
@@ -1,24 +1,72 @@
 <?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.",
 "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" => "Ø§Ù„Ù…Ù„ÙØ§Øª",
-"Delete" => "Ù…ØØ°ÙˆÙ",
-"Close" => "Ø¥ØºÙ„Ù‚",
-"Name" => "Ø§Ù„Ø§Ø³Ù…",
+"Share" => "Ø´Ø§Ø±Ùƒ",
+"Delete permanently" => "ØØ°Ù Ø¨Ø´ÙƒÙ„ Ø¯Ø§Ø¦Ù…",
+"Delete" => "Ø¥Ù„ØºØ§Ø¡",
+"Rename" => "Ø¥Ø¹Ø§Ø¯Ø© ØªØ³Ù…ÙŠÙ‡",
+"Pending" => "Ù‚ÙŠØ¯ Ø§Ù„Ø§Ù†ØªØ¸Ø§Ø±",
+"{new_name} already exists" => "{new_name} Ù…ÙˆØ¬ÙˆØ¯ Ù…Ø³Ø¨Ù‚Ø§",
+"replace" => "Ø§Ø³ØªØ¨Ø¯Ø§Ù„",
+"suggest name" => "Ø§Ù‚ØªØ±Ø Ø¥Ø³Ù…",
+"cancel" => "Ø¥Ù„ØºØ§Ø¡",
+"replaced {new_name} with {old_name}" => "Ø§Ø³ØªØ¨Ø¯Ù„ {new_name}  Ø¨Ù€  {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}%)" => "Ù…Ø³Ø§ØØªÙƒ Ø§Ù„ØªØ®Ø²ÙŠÙ†ÙŠØ© Ø§Ù…ØªÙ„Ø£Øª ØªÙ‚Ø±ÙŠØ¨Ø§ ",
+"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 Ø¨Ø§ÙŠØª",
+"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\" Ù…ØØ¬ÙˆØ² Ù„Ù„Ù†Ø¸Ø§Ù…",
+"Error" => "Ø®Ø·Ø£",
+"Name" => "Ø§Ø³Ù…",
 "Size" => "ØØ¬Ù…",
 "Modified" => "Ù…Ø¹Ø¯Ù„",
-"Upload" => "Ø¥Ø±ÙØ¹",
+"1 folder" => "Ù…Ø¬Ù„Ø¯ Ø¹Ø¯Ø¯ 1",
+"{count} folders" => "{count} Ù…Ø¬Ù„Ø¯Ø§Øª",
+"1 file" => "Ù…Ù„Ù ÙˆØ§ØØ¯",
+"{count} files" => "{count} Ù…Ù„ÙØ§Øª",
+"Unable to rename file" => "ÙØ´Ù„ ÙÙŠ Ø§Ø¹Ø§Ø¯Ø© ØªØ³Ù…ÙŠØ© Ø§Ù„Ù…Ù„Ù",
+"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" => "Ù…Ù† Ø±Ø§Ø¨Ø·",
+"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." => "ØØ¬Ù… Ø§Ù„Ù…Ù„ÙØ§Øª Ø§Ù„ØªÙŠ ØªØ±ÙŠØ¯ ØªØ±ÙÙŠØ¹Ù‡Ø§ Ø£Ø¹Ù„Ù‰ Ù…Ù† Ø§Ù„Ù…Ø³Ù…ÙˆØ Ø¹Ù„Ù‰ Ø§Ù„Ø®Ø§Ø¯Ù…."
+"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..." => "ØªØØ¯ÙŠØ« Ø°Ø§ÙƒØ±Ø© Ø§Ù„ØªØ®Ø²ÙŠÙ† Ø§Ù„Ù…Ø¤Ù‚Øª(Ø§Ù„ÙƒØ§Ø´)  Ø§Ù„Ø®Ø§ØµØ© Ø¨Ù…Ù„ÙØ§Øª Ø§Ù„Ù†Ø¸Ø§Ù… ..."
 );
diff --git a/apps/files/l10n/bg_BG.php b/apps/files/l10n/bg_BG.php
index a4d23e5afb54e317b8a7b15ddd8aea2f343de914..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" => "ÐŸÑ€ÐµÐ¸Ð¼ÐµÐ½ÑƒÐ²Ð°Ð½Ðµ",
@@ -10,9 +15,8 @@
 "replace" => "Ð¿Ñ€ÐµÐ¿Ð¾ÐºÑ€Ð¸Ð²Ð°Ð½Ðµ",
 "cancel" => "Ð¾Ñ‚ÐºÐ°Ð·",
 "undo" => "Ð²ÑŠÐ·Ñ‚Ð°Ð½Ð¾Ð²ÑÐ²Ð°Ð½Ðµ",
-"Upload Error" => "Ð’ÑŠÐ·Ð½Ð¸ÐºÐ½Ð° Ð³Ñ€ÐµÑˆÐºÐ° Ð¿Ñ€Ð¸ ÐºÐ°Ñ‡Ð²Ð°Ð½ÐµÑ‚Ð¾",
-"Close" => "Ð—Ð°Ñ‚Ð²Ð¾Ñ€Ð¸",
 "Upload cancelled." => "ÐšÐ°Ñ‡Ð²Ð°Ð½ÐµÑ‚Ð¾ Ðµ ÑÐ¿Ñ€ÑÐ½Ð¾.",
+"Error" => "Ð“Ñ€ÐµÑˆÐºÐ°",
 "Name" => "Ð˜Ð¼Ðµ",
 "Size" => "Ð Ð°Ð·Ð¼ÐµÑ€",
 "Modified" => "ÐŸÑ€Ð¾Ð¼ÐµÐ½ÐµÐ½Ð¾",
@@ -30,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 aec5d7f9d9215e934c10358d6e782ad844d5c4b4..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} à¦Ÿà¦¿ à¦¬à¦¿à¦¦à§à¦¯à¦®à¦¾à¦¨",
@@ -21,25 +21,25 @@
 "cancel" => "à¦¬à¦¾à¦¤à¦¿à¦²",
 "replaced {new_name} with {old_name}" => "{new_name} à¦•à§‡ {old_name} à¦¨à¦¾à¦®à§‡ à¦ªà§à¦°à¦¤à¦¿à¦¸à§à¦¥à¦¾à¦ªà¦¨ à¦•à¦°à¦¾ à¦¹à§Ÿà§‡à¦›à§‡",
 "undo" => "à¦•à§à¦°à¦¿à§Ÿà¦¾ à¦ªà§à¦°à¦¤à§à¦¯à¦¾à¦¹à¦¾à¦°",
+"1 file uploading" => "à§§à¦Ÿà¦¿ à¦«à¦¾à¦‡à¦² à¦†à¦ªà¦²à§‹à¦¡ à¦•à¦°à¦¾ à¦¹à¦šà§à¦›à§‡",
 "'.' is an invalid file name." => "à¦Ÿà¦¿ à¦à¦•à¦Ÿà¦¿ à¦…à¦¨à¦¨à§à¦®à§‹à¦¦à¦¿à¦¤ à¦¨à¦¾à¦®à¥¤",
 "File name cannot be empty." => "à¦«à¦¾à¦‡à¦²à§‡à¦° à¦¨à¦¾à¦®à¦Ÿà¦¿ à¦«à¦¾à¦à¦•à¦¾ à¦°à¦¾à¦–à¦¾ à¦¯à¦¾à¦¬à§‡ à¦¨à¦¾à¥¤",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "à¦¨à¦¾à¦®à¦Ÿà¦¿ à¦¸à¦ à¦¿à¦• à¦¨à§Ÿ,  '\\', '/', '<', '>', ':', '\"', '|', '?' à¦à¦¬à¦‚  '*'  à¦…à¦¨à§à¦®à§‹à¦¦à¦¿à¦¤ à¦¨à§Ÿà¥¤",
 "Unable to upload your file as it is a directory or has 0 bytes" => "à¦†à¦ªà¦¨à¦¾à¦° à¦«à¦¾à¦‡à¦²à¦Ÿà¦¿ à¦†à¦ªà¦²à§‹à¦¡ à¦•à¦°à¦¾ à¦¸à¦®à§à¦à¦¬ à¦¹à¦²à§‹ à¦¨à¦¾, à¦•à§‡à¦¨à¦¨à¦¾ à¦à¦Ÿà¦¿ à¦¹à§Ÿ à¦à¦•à¦Ÿà¦¿ à¦«à§‹à¦²à§à¦¡à¦¾à¦° à¦•à¦¿à¦‚à¦¬à¦¾ à¦à¦° à¦†à¦•à¦¾à¦° à§¦ à¦¬à¦¾à¦‡à¦Ÿ",
-"Upload Error" => "à¦†à¦ªà¦²à§‹à¦¡ à¦•à¦°à¦¤à§‡ à¦¸à¦®à¦¸à§à¦¯à¦¾ ",
-"Close" => "à¦¬à¦¨à§à¦§",
-"1 file uploading" => "à§§à¦Ÿà¦¿ à¦«à¦¾à¦‡à¦² à¦†à¦ªà¦²à§‹à¦¡ à¦•à¦°à¦¾ à¦¹à¦šà§à¦›à§‡",
-"{count} files uploading" => "{count} à¦Ÿà¦¿ à¦«à¦¾à¦‡à¦² à¦†à¦ªà¦²à§‹à¦¡ à¦•à¦°à¦¾ à¦¹à¦šà§à¦›à§‡",
+"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  à¦à¦° à¦œà¦¨à§à¦¯ à¦¸à¦‚à¦°à¦•à§à¦·à¦¿à¦¤à¥¤",
-"Name" => "à¦¨à¦¾à¦®",
+"Error" => "à¦¸à¦®à¦¸à§à¦¯à¦¾",
+"Name" => "à¦°à¦¾à¦®",
 "Size" => "à¦†à¦•à¦¾à¦°",
 "Modified" => "à¦ªà¦°à¦¿à¦¬à¦°à§à¦¤à¦¿à¦¤",
 "1 folder" => "à§§à¦Ÿà¦¿ à¦«à§‹à¦²à§à¦¡à¦¾à¦°",
 "{count} folders" => "{count} à¦Ÿà¦¿ à¦«à§‹à¦²à§à¦¡à¦¾à¦°",
 "1 file" => "à§§à¦Ÿà¦¿ à¦«à¦¾à¦‡à¦²",
 "{count} files" => "{count} à¦Ÿà¦¿ à¦«à¦¾à¦‡à¦²",
+"Unable to rename file" => "à¦«à¦¾à¦‡à¦²à§‡à¦° à¦¨à¦¾à¦® à¦ªà¦°à¦¿à¦¬à¦°à§à¦¤à¦¨ à¦•à¦°à¦¾ à¦¸à¦®à§à¦à¦¬ à¦¹à¦²à§‹ à¦¨à¦¾",
 "Upload" => "à¦†à¦ªà¦²à§‹à¦¡",
 "File handling" => "à¦«à¦¾à¦‡à¦² à¦¹à§à¦¯à¦¾à¦°à§à¦¡à¦²à¦¿à¦‚",
 "Maximum upload size" => "à¦†à¦ªà¦²à§‹à¦¡à§‡à¦° à¦¸à¦°à§à¦¬à§‹à¦šà§à¦š à¦†à¦•à¦¾à¦°",
@@ -48,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 43aaea31e8a722e7268338990b0e9fe610752ef7..f34c9f59cf54b3cd7885b83b4d7fa9a2c7383a87 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",
@@ -24,6 +24,8 @@
 "replaced {new_name} with {old_name}" => "s'ha substituÃ¯t {old_name} per {new_name}",
 "undo" => "desfÃ©s",
 "perform delete operation" => "executa d'operaciÃ³ d'esborrar",
+"1 file uploading" => "1 fitxer pujant",
+"files uploading" => "fitxers pujant",
 "'.' is an invalid file name." => "'.' Ã©s un nom no vÃ lid per un fitxer.",
 "File name cannot be empty." => "El nom del fitxer no pot ser buit.",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "El nÃ³m no Ã©s vÃ lid, '\\', '/', '<', '>', ':', '\"', '|', '?' i '*' no estan permesos.",
@@ -31,14 +33,12 @@
 "Your storage is almost full ({usedSpacePercent}%)" => "El vostre espai d'emmagatzemament Ã©s gairebÃ© ple ({usedSpacePercent}%)",
 "Your download is being prepared. This might take some time if the files are big." => "S'estÃ  preparant la baixada. Pot trigar una estona si els fitxers sÃ³n grans.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "No es pot pujar el fitxer perquÃ¨ Ã©s una carpeta o tÃ© 0 bytes",
-"Upload Error" => "Error en la pujada",
-"Close" => "Tanca",
-"1 file uploading" => "1 fitxer pujant",
-"{count} files uploading" => "{count} fitxers en pujada",
+"Not enough space available" => "No hi ha prou espai disponible",
 "Upload cancelled." => "La pujada s'ha cancelÂ·lat.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Hi ha una pujada en curs. Si abandoneu la pÃ gina la pujada es cancelÂ·larÃ .",
 "URL cannot be empty." => "La URL no pot ser buida",
 "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Nom de carpeta no vÃ lid. L'Ãºs de 'Shared' estÃ  reservat per Owncloud",
+"Error" => "Error",
 "Name" => "Nom",
 "Size" => "Mida",
 "Modified" => "Modificat",
@@ -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",
@@ -55,7 +57,7 @@
 "0 is unlimited" => "0 Ã©s sense lÃmit",
 "Maximum input size for ZIP files" => "Mida mÃ xima d'entrada per fitxers ZIP",
 "Save" => "Desa",
-"New" => "Nou",
+"New" => "Nova",
 "Text file" => "Fitxer de text",
 "Folder" => "Carpeta",
 "From link" => "Des d'enllaÃ§",
diff --git a/apps/files/l10n/cs_CZ.php b/apps/files/l10n/cs_CZ.php
index 48b60bfb7118c7f8e3cb82e1118369bdf8682930..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",
@@ -24,28 +24,29 @@
 "replaced {new_name} with {old_name}" => "nahrazeno {new_name} s {old_name}",
 "undo" => "zpÄ›t",
 "perform delete operation" => "provÃ©st smazÃ¡nÃ",
+"1 file uploading" => "odesÃlÃ¡ se 1 soubor",
+"files uploading" => "soubory se odesÃlajÃ",
 "'.' is an invalid file name." => "'.' je neplatnÃ½m nÃ¡zvem souboru.",
 "File name cannot be empty." => "NÃ¡zev souboru nemÅ¯Å¾e bÃ½t prÃ¡zdnÃ½ Å™etÄ›zec.",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "NeplatnÃ½ nÃ¡zev, znaky '\\', '/', '<', '>', ':', '\"', '|', '?' a '*' nejsou povoleny.",
 "Your storage is full, files can not be updated or synced anymore!" => "VaÅ¡e ÃºloÅ¾iÅ¡tÄ› je plnÃ©, nelze aktualizovat ani synchronizovat soubory.",
 "Your storage is almost full ({usedSpacePercent}%)" => "VaÅ¡e ÃºloÅ¾iÅ¡tÄ› je tÃ©mÄ›Å™ plnÃ© ({usedSpacePercent}%)",
 "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Å¯",
-"Upload Error" => "Chyba odesÃlÃ¡nÃ",
-"Close" => "ZavÅ™Ãt",
-"1 file uploading" => "odesÃlÃ¡ se 1 soubor",
-"{count} files uploading" => "odesÃlÃ¡m {count} souborÅ¯",
+"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Ã.",
 "URL cannot be empty." => "URL nemÅ¯Å¾e bÃ½t prÃ¡zdnÃ¡",
 "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "NeplatnÃ½ nÃ¡zev sloÅ¾ky. PouÅ¾itÃ 'Shared' je rezervovÃ¡no pro vnitÅ™nÃ potÅ™eby Owncloud",
+"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 c147c939f847bd96768e18ca3850777ab187d883..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",
@@ -24,21 +24,21 @@
 "replaced {new_name} with {old_name}" => "erstattede {new_name} med {old_name}",
 "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",
-"Upload Error" => "Fejl ved upload",
-"Close" => "Luk",
-"1 file uploading" => "1 fil uploades",
-"{count} files uploading" => "{count} filer uploades",
+"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.",
 "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Ugyldigt mappenavn. Brug af \"Shared\" er forbeholdt Owncloud",
+"Error" => "Fejl",
 "Name" => "Navn",
 "Size" => "StÃ¸rrelse",
 "Modified" => "Ã†ndret",
@@ -46,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",
@@ -65,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 53427503f4c0ac790c3a126e1705d99b7f2efded..bcc3a4c6c9da269ffdc8e8bf943bf4eaaa0f3b7a 100644
--- a/apps/files/l10n/de.php
+++ b/apps/files/l10n/de.php
@@ -1,51 +1,52 @@
 <?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" => "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.",
-"Upload Error" => "Fehler beim Upload",
-"Close" => "SchlieÃŸen",
-"1 file uploading" => "Eine Datei wird hoch geladen",
-"{count} files uploading" => "{count} Dateien werden hochgeladen",
+"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.",
 "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",
+"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 538c1b63652f2c0ba16466473d39256215364976..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 - Datei mit diesem Namen existiert bereits",
+"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.",
+"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" => "Der temporÃ¤re 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 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" => "Name 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, '\\', '/', '<', '>', ':', '\"', '|', '?' 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 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.",
-"Upload Error" => "Fehler beim Upload",
-"Close" => "SchlieÃŸen",
-"1 file uploading" => "1 Datei wird hochgeladen",
-"{count} files uploading" => "{count} Dateien wurden hochgeladen",
+"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" => "Nicht mehr freigeben",
+"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 63759f1201eed295f2c01c994604f811d7d963cd..a8bb96cdfc8cf818b84784c65d776746c98222af 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 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" => "Î›ÎµÎ¯Ï€ÎµÎ¹ Î¿ Ï€ÏÎ¿ÏƒÏ‰ÏÎ¹Î½ÏŒÏ‚ Ï†Î¬ÎºÎµÎ»Î¿Ï‚",
@@ -13,6 +12,7 @@
 "Not enough storage available" => "ÎœÎ· ÎµÏ€Î±ÏÎºÎ®Ï‚ Î´Î¹Î±Î¸ÎÏƒÎ¹Î¼Î¿Ï‚ Î±Ï€Î¿Î¸Î·ÎºÎµÏ…Ï„Î¹ÎºÏŒÏ‚ Ï‡ÏŽÏÎ¿Ï‚",
 "Invalid directory." => "ÎœÎ· ÎÎ³ÎºÏ…ÏÎ¿Ï‚ Ï†Î¬ÎºÎµÎ»Î¿Ï‚.",
 "Files" => "Î‘ÏÏ‡ÎµÎ¯Î±",
+"Share" => "Î”Î¹Î±Î¼Î¿Î¹ÏÎ±ÏƒÎ¼ÏŒÏ‚",
 "Delete permanently" => "ÎœÏŒÎ½Î¹Î¼Î· Î´Î¹Î±Î³ÏÎ±Ï†Î®",
 "Delete" => "Î”Î¹Î±Î³ÏÎ±Ï†Î®",
 "Rename" => "ÎœÎµÏ„Î¿Î½Î¿Î¼Î±ÏƒÎ¯Î±",
@@ -23,22 +23,22 @@
 "cancel" => "Î±ÎºÏÏÏ‰ÏƒÎ·",
 "replaced {new_name} with {old_name}" => "Î±Î½Ï„Î¹ÎºÎ±Ï„Î±ÏƒÏ„Î¬Î¸Î·ÎºÎµ Ï„Î¿ {new_name} Î¼Îµ {old_name}",
 "undo" => "Î±Î½Î±Î¯ÏÎµÏƒÎ·",
-"perform delete operation" => "ÎµÎºÏ„ÎÎ»ÎµÏƒÎ· Î´Î¹Î±Î´Î¹ÎºÎ±ÏƒÎ¯Î± Î´Î¹Î±Î³ÏÎ±Ï†Î®Ï‚",
+"perform delete operation" => "ÎµÎºÏ„ÎÎ»ÎµÏƒÎ· Ï„Î·Ï‚ Î´Î¹Î±Î´Î¹ÎºÎ±ÏƒÎ¯Î±Ï‚ Î´Î¹Î±Î³ÏÎ±Ï†Î®Ï‚",
+"1 file uploading" => "1 Î±ÏÏ‡ÎµÎ¯Î¿ Î±Î½ÎµÎ²Î±Î¯Î½ÎµÎ¹",
+"files uploading" => "Î±ÏÏ‡ÎµÎ¯Î± Î±Î½ÎµÎ²Î±Î¯Î½Î¿Ï…Î½",
 "'.' is an invalid file name." => "'.' ÎµÎ¯Î½Î±Î¹ Î¼Î· ÎÎ³ÎºÏ…ÏÎ¿ ÏŒÎ½Î¿Î¼Î± Î±ÏÏ‡ÎµÎ¯Î¿Ï….",
-"File name cannot be empty." => "Î¤Î¿ ÏŒÎ½Î¿Î¼Î± Î±ÏÏ‡ÎµÎ¯Î¿Ï… Î´ÎµÎ½ Ï€ÏÎÏ€ÎµÎ¹ Î½Î± ÎµÎ¯Î½Î±Î¹ ÎºÎµÎ½ÏŒ.",
+"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 bytes",
-"Upload Error" => "Î£Ï†Î¬Î»Î¼Î± Î‘Ï€Î¿ÏƒÏ„Î¿Î»Î®Ï‚",
-"Close" => "ÎšÎ»ÎµÎ¯ÏƒÎ¹Î¼Î¿",
-"1 file uploading" => "1 Î±ÏÏ‡ÎµÎ¯Î¿ Î±Î½ÎµÎ²Î±Î¯Î½ÎµÎ¹",
-"{count} files uploading" => "{count} Î±ÏÏ‡ÎµÎ¯Î± Î±Î½ÎµÎ²Î±Î¯Î½Î¿Ï…Î½",
+"Not enough space available" => "Î”ÎµÎ½ Ï…Ï€Î¬ÏÏ‡ÎµÎ¹ Î±ÏÎºÎµÏ„ÏŒÏ‚ Î´Î¹Î±Î¸ÎÏƒÎ¹Î¼Î¿Ï‚ Ï‡ÏŽÏÎ¿Ï‚",
 "Upload cancelled." => "Î— Î±Ï€Î¿ÏƒÏ„Î¿Î»Î® Î±ÎºÏ…ÏÏŽÎ¸Î·ÎºÎµ.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Î— Î±Ï€Î¿ÏƒÏ„Î¿Î»Î® Ï„Î¿Ï… Î±ÏÏ‡ÎµÎ¯Î¿Ï… Î²ÏÎ¯ÏƒÎºÎµÏ„Î±Î¹ ÏƒÎµ ÎµÎ¾ÎÎ»Î¹Î¾Î·. Î¤Î¿ ÎºÎ»ÎµÎ¯ÏƒÎ¹Î¼Î¿ Ï„Î·Ï‚ ÏƒÎµÎ»Î¯Î´Î±Ï‚ Î¸Î± Î±ÎºÏ…ÏÏŽÏƒÎµÎ¹ Ï„Î·Î½ Î±Ï€Î¿ÏƒÏ„Î¿Î»Î®.",
-"URL cannot be empty." => "Î— URL Î´ÎµÎ½ Ï€ÏÎÏ€ÎµÎ¹ Î½Î± ÎµÎ¯Î½Î±Î¹ ÎºÎµÎ½Î®.",
+"URL cannot be empty." => "Î— URL Î´ÎµÎ½ Î¼Ï€Î¿ÏÎµÎ¯ Î½Î± ÎµÎ¯Î½Î±Î¹ ÎºÎµÎ½Î®.",
 "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "ÎœÎ· ÎÎ³ÎºÏ…ÏÎ¿ ÏŒÎ½Î¿Î¼Î± Ï†Î±ÎºÎÎ»Î¿Ï…. Î— Ï‡ÏÎ®ÏƒÎ· Ï„Î¿Ï… 'ÎšÎ¿Î¹Î½ÏŒÏ‡ÏÎ·ÏƒÏ„Î¿Ï‚' Ï‡ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¹ÎµÎ¯Ï„Î±Î¹ Î±Ï€ÏŒ Î¿ Owncloud",
+"Error" => "Î£Ï†Î¬Î»Î¼Î±",
 "Name" => "ÎŒÎ½Î¿Î¼Î±",
 "Size" => "ÎœÎÎ³ÎµÎ¸Î¿Ï‚",
 "Modified" => "Î¤ÏÎ¿Ï€Î¿Ï€Î¿Î¹Î®Î¸Î·ÎºÎµ",
@@ -46,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: " => "Î¼ÎÎ³Î¹ÏƒÏ„Î¿ Î´Ï…Î½Î±Ï„ÏŒ:",
@@ -61,12 +62,13 @@
 "From link" => "Î‘Ï€ÏŒ ÏƒÏÎ½Î´ÎµÏƒÎ¼Î¿",
 "Deleted files" => "Î”Î¹Î±Î³ÏÎ±Î¼Î¼ÎÎ½Î± Î±ÏÏ‡ÎµÎ¯Î±",
 "Cancel upload" => "Î‘ÎºÏÏÏ‰ÏƒÎ· Î±Ï€Î¿ÏƒÏ„Î¿Î»Î®Ï‚",
-"Nothing in here. Upload something!" => "Î”ÎµÎ½ Ï…Ï€Î¬ÏÏ‡ÎµÎ¹ Ï„Î¯Ï€Î¿Ï„Î± ÎµÎ´ÏŽ. ÎœÎµÏ„Î±Ï†Î¿ÏÏ„ÏŽÏƒÏ„Îµ ÎºÎ¬Ï„Î¹!",
+"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." => "Î¤Î± Î±ÏÏ‡ÎµÎ¯Î± ÏƒÎ±ÏÏŽÎ½Î¿Î½Ï„Î±Î¹, Ï€Î±ÏÎ±ÎºÎ±Î»ÏŽ Ï€ÎµÏÎ¹Î¼ÎÎ½ÎµÏ„Îµ",
-"Current scanning" => "Î¤ÏÎÏ‡Î¿Ï…ÏƒÎ± Î±Î½Î±Î¶Î®Ï„Î·ÏƒÎ· ",
-"Upgrading filesystem cache..." => "Î‘Î½Î±Î²Î¬Î¸Î¼Î¹ÏƒÎ· Î¼Î½Î®Î¼Î·Ï‚ cache Ï„Î¿Ï… ÏƒÏ…ÏƒÏ„Î®Î¼Î±Ï„Î¿Ï‚ Î±ÏÏ‡ÎµÎ¯Ï‰Î½..."
+"Files are being scanned, please wait." => "Î¤Î± Î±ÏÏ‡ÎµÎ¯Î± ÏƒÎ±ÏÏŽÎ½Î¿Î½Ï„Î±Î¹, Ï€Î±ÏÎ±ÎºÎ±Î»ÏŽ Ï€ÎµÏÎ¹Î¼ÎÎ½ÎµÏ„Îµ.",
+"Current scanning" => "Î¤ÏÎÏ‡Î¿Ï…ÏƒÎ± Î±Î½Î¯Ï‡Î½ÎµÏ…ÏƒÎ·",
+"Upgrading filesystem cache..." => "Î•Î½Î·Î¼ÎÏÏ‰ÏƒÎ· Ï„Î·Ï‚ Î¼Î½Î®Î¼Î·Ï‚ cache Ï„Î¿Ï… ÏƒÏ…ÏƒÏ„Î®Î¼Î±Ï„Î¿Ï‚ Î±ÏÏ‡ÎµÎ¯Ï‰Î½..."
 );
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 225408f9a76e8ef9b664bc1e25e18572016cb8f1..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",
@@ -21,19 +21,19 @@
 "cancel" => "nuligi",
 "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.",
 "Your download is being prepared. This might take some time if the files are big." => "Via elÅuto pretiÄatas. Äˆi tio povas daÅri iom da tempo se la dosieroj grandas.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Ne eblis alÅuti vian dosieron Ä‰ar Äi estas dosierujo aÅ havas 0 duumokojn",
-"Upload Error" => "AlÅuta eraro",
-"Close" => "Fermi",
-"1 file uploading" => "1 dosiero estas alÅutata",
-"{count} files uploading" => "{count} dosieroj alÅutatas",
+"Not enough space available" => "Ne haveblas sufiÄ‰a spaco",
 "Upload cancelled." => "La alÅuto nuliÄis.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "DosieralÅuto plenumiÄas. Lasi la paÄon nun nuligus la alÅuton.",
 "URL cannot be empty." => "URL ne povas esti malplena.",
 "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Nevalida dosierujnomo. Uzo de â€œSharedâ€ rezervatas de Owncloud.",
+"Error" => "Eraro",
 "Name" => "Nomo",
 "Size" => "Grando",
 "Modified" => "Modifita",
@@ -41,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",
@@ -58,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 f702a5b513d4d89ea35f2771074255e14f61627d..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",
@@ -24,21 +24,21 @@
 "replaced {new_name} with {old_name}" => "reemplazado {new_name} con {old_name}",
 "undo" => "deshacer",
 "perform delete operation" => "Eliminar",
-"'.' is an invalid file name." => "'.' es un nombre de archivo invÃ¡lido.",
+"1 file uploading" => "subiendo 1 archivo",
+"files uploading" => "subiendo archivos",
+"'.' 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",
-"Upload Error" => "Error al subir el archivo",
-"Close" => "cerrrar",
-"1 file uploading" => "subiendo 1 archivo",
-"{count} files uploading" => "Subiendo {count} archivos",
+"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",
 "Modified" => "Modificado",
@@ -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 f16385a652d5b4318036a5e1f7b035cbb9cadbfc..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",
@@ -24,6 +24,8 @@
 "replaced {new_name} with {old_name}" => "reemplazado {new_name} con {old_name}",
 "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.",
@@ -31,14 +33,12 @@
 "Your storage is almost full ({usedSpacePercent}%)" => "El almacenamiento estÃ¡ casi lleno ({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 fue posible subir el archivo porque es un directorio o porque su tamaÃ±o es 0 bytes",
-"Upload Error" => "Error al subir el archivo",
-"Close" => "Cerrar",
-"1 file uploading" => "Subiendo 1 archivo",
-"{count} files uploading" => "Subiendo {count} archivos",
+"Not enough space available" => "No hay suficiente espacio disponible",
 "Upload cancelled." => "La subida fue cancelada",
 "File upload is in progress. Leaving the page now will cancel the upload." => "La subida del archivo estÃ¡ en proceso. Si salÃs de la pÃ¡gina ahora, la subida se cancelarÃ¡.",
 "URL cannot be empty." => "La URL no puede estar vacÃa",
 "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Nombre de carpeta invÃ¡lido. El uso de 'Shared' estÃ¡ reservado por ownCloud",
+"Error" => "Error",
 "Name" => "Nombre",
 "Size" => "TamaÃ±o",
 "Modified" => "Modificado",
@@ -46,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",
@@ -61,10 +63,11 @@
 "From link" => "Desde enlace",
 "Deleted files" => "Archivos Borrados",
 "Cancel upload" => "Cancelar subida",
+"You donâ€™t have write permissions here." => "No tenÃ©s permisos de escritura acÃ¡.",
 "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 f1c94e93aab7a02334a4f41f10c0f0f1d38cff6c..d3fab4b0bd167e59a03f3f9e0f1f620a155b850c 100644
--- a/apps/files/l10n/et_EE.php
+++ b/apps/files/l10n/et_EE.php
@@ -1,9 +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 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",
@@ -11,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",
@@ -21,17 +23,22 @@
 "cancel" => "loobu",
 "replaced {new_name} with {old_name}" => "asendas nime {old_name} nimega {new_name}",
 "undo" => "tagasi",
+"perform delete operation" => "teosta kustutamine",
+"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.",
-"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",
-"Upload Error" => "Ãœleslaadimise viga",
-"Close" => "Sulge",
-"1 file uploading" => "1 faili Ã¼leslaadimisel",
-"{count} files uploading" => "{count} faili Ã¼leslaadimist",
+"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" => "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",
 "Name" => "Nimi",
 "Size" => "Suurus",
 "Modified" => "Muudetud",
@@ -39,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",
@@ -52,12 +61,15 @@
 "Text file" => "Tekstifail",
 "Folder" => "Kaust",
 "From link" => "Allikast",
+"Deleted files" => "Kustutatud failid",
 "Cancel upload" => "TÃ¼hista Ã¼leslaadimine",
+"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",
-"Current scanning" => "Praegune skannimine"
+"Files are being scanned, please wait." => "Faile skannitakse, palun oota.",
+"Current scanning" => "Praegune skannimine",
+"Upgrading filesystem cache..." => "FailisÃ¼steemi puhvri uuendamine..."
 );
diff --git a/apps/files/l10n/eu.php b/apps/files/l10n/eu.php
index 63c62ce9a55d92e747edcdd88cde30a3ad92d0ff..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",
@@ -24,21 +24,21 @@
 "replaced {new_name} with {old_name}" => " {new_name}-k {old_name} ordezkatu du",
 "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",
-"Upload Error" => "Igotzean errore bat suertatu da",
-"Close" => "Itxi",
-"1 file uploading" => "fitxategi 1 igotzen",
-"{count} files uploading" => "{count} fitxategi igotzen",
+"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.",
 "URL cannot be empty." => "URLa ezin da hutsik egon.",
 "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Baliogabeako karpeta izena. 'Shared' izena Owncloudek erreserbatzen du",
+"Error" => "Errorea",
 "Name" => "Izena",
 "Size" => "Tamaina",
 "Modified" => "Aldatuta",
@@ -46,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",
@@ -65,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 f4e0af9576d269c298ee3ec0cbe3de814beb1871..b97067ac19314eb9fc3d694ff8f638faffc48b22 100644
--- a/apps/files/l10n/fa.php
+++ b/apps/files/l10n/fa.php
@@ -1,18 +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" => "ÙØ§ÛŒÙ„ Ù‡Ø§",
-"Delete" => "Ù¾Ø§Ú© Ú©Ø±Ø¯Ù†",
+"Files" => "Ù¾Ø±ÙˆÙ†Ø¯Ù‡â€ŒÙ‡Ø§",
+"Share" => "Ø§Ø´ØªØ±Ø§Ú©â€ŒÚ¯Ø°Ø§Ø±ÛŒ",
+"Delete permanently" => "ØØ°Ù Ù‚Ø·Ø¹ÛŒ",
+"Delete" => "ØØ°Ù",
 "Rename" => "ØªØºÛŒÛŒØ±Ù†Ø§Ù…",
 "Pending" => "Ø¯Ø± Ø§Ù†ØªØ¸Ø§Ø±",
 "{new_name} already exists" => "{Ù†Ø§Ù… _Ø¬Ø¯ÛŒØ¯} Ø¯Ø± ØØ§Ù„ ØØ§Ø¶Ø± ÙˆØ¬ÙˆØ¯ Ø¯Ø§Ø±Ø¯.",
@@ -21,27 +23,31 @@
 "cancel" => "Ù„ØºÙˆ",
 "replaced {new_name} with {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Ø¨Ø§ÛŒØª Ø¯Ø§Ø±Ø¯",
-"Upload Error" => "Ø®Ø·Ø§ Ø¯Ø± Ø¨Ø§Ø± Ú¯Ø°Ø§Ø±ÛŒ",
-"Close" => "Ø¨Ø³ØªÙ†",
-"1 file uploading" => "1 Ù¾Ø±ÙˆÙ†Ø¯Ù‡ Ø¢Ù¾Ù„ÙˆØ¯ Ø´Ø¯.",
-"{count} files uploading" => "{ Ø´Ù…Ø§Ø± } ÙØ§ÛŒÙ„ Ù‡Ø§ÛŒ Ø¯Ø± ØØ§Ù„ Ø¢Ù¾Ù„ÙˆØ¯",
+"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" => "ØªØºÛŒÛŒØ± ÛŒØ§ÙØªÙ‡",
+"Modified" => "ØªØ§Ø±ÛŒØ®",
 "1 folder" => "1 Ù¾ÙˆØ´Ù‡",
 "{count} folders" => "{ Ø´Ù…Ø§Ø±} Ù¾ÙˆØ´Ù‡ Ù‡Ø§",
 "1 file" => "1 Ù¾Ø±ÙˆÙ†Ø¯Ù‡",
 "{count} files" => "{ Ø´Ù…Ø§Ø± } ÙØ§ÛŒÙ„ Ù‡Ø§",
-"Upload" => "Ø¨Ø§Ø±Ú¯Ø°Ø§Ø±ÛŒ",
+"Unable to rename file" => "Ù‚Ø§Ø¯Ø± Ø¨Ù‡ ØªØºÛŒÛŒØ± Ù†Ø§Ù… Ù¾Ø±ÙˆÙ†Ø¯Ù‡ Ù†ÛŒØ³Øª.",
+"Upload" => "Ø¨Ø§Ø±Ú¯Ø²Ø§Ø±ÛŒ",
 "File handling" => "Ø§Ø¯Ø§Ø±Ù‡ Ù¾Ø±ÙˆÙ†Ø¯Ù‡ Ù‡Ø§",
 "Maximum upload size" => "ØØ¯Ø§Ú©Ø«Ø± Ø§Ù†Ø¯Ø§Ø²Ù‡ Ø¨Ø§Ø±Ú¯Ø²Ø§Ø±ÛŒ",
 "max. possible: " => "ØØ¯Ø§Ú©Ø«Ø±Ù…Ù‚Ø¯Ø§Ø±Ù…Ù…Ú©Ù†:",
@@ -54,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" => "Ø¨Ø§Ø±Ú¯ÛŒØ±ÛŒ",
+"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" => "Ø¨Ø§Ø²Ø±Ø³ÛŒ Ú©Ù†ÙˆÙ†ÛŒ"
+"Current scanning" => "Ø¨Ø§Ø²Ø±Ø³ÛŒ Ú©Ù†ÙˆÙ†ÛŒ",
+"Upgrading filesystem cache..." => "Ø¨Ù‡Ø¨ÙˆØ¯ ÙØ§ÛŒÙ„ Ø³ÛŒØ³ØªÙ…ÛŒ Ø°Ø®ÛŒØ±Ù‡ Ú¯Ø§Ù‡..."
 );
diff --git a/apps/files/l10n/fi.php b/apps/files/l10n/fi.php
new file mode 100644
index 0000000000000000000000000000000000000000..c5ce878aded2fb3a742cc65acd12f3112d59a4ab
--- /dev/null
+++ b/apps/files/l10n/fi.php
@@ -0,0 +1,3 @@
+<?php $TRANSLATIONS = array(
+"Save" => "tallentaa"
+);
diff --git a/apps/files/l10n/fi_FI.php b/apps/files/l10n/fi_FI.php
index 6eb891d29d3b5b902b9090b93c21130f4c0c605b..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,19 +29,20 @@
 "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",
-"Upload Error" => "LÃ¤hetysvirhe.",
-"Close" => "Sulje",
+"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.",
 "URL cannot be empty." => "Verkko-osoite ei voi olla tyhjÃ¤",
+"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 9849184441d861a43f605a4d580129fc5e665fc7..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,21 +24,21 @@
 "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 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.",
-"Upload Error" => "Erreur de chargement",
-"Close" => "Fermer",
-"1 file uploading" => "1 fichier en cours de tÃ©lÃ©chargement",
-"{count} files uploading" => "{count} fichiers tÃ©lÃ©versÃ©s",
-"Upload cancelled." => "Chargement annulÃ©.",
+"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." => "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",
+"Error" => "Erreur",
 "Name" => "Nom",
 "Size" => "Taille",
 "Modified" => "ModifiÃ©",
@@ -46,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",
@@ -61,10 +63,11 @@
 "From link" => "Depuis le lien",
 "Deleted files" => "Fichiers supprimÃ©s",
 "Cancel upload" => "Annuler l'envoi",
+"You donâ€™t have write permissions here." => "Vous n'avez pas le droit d'Ã©criture ici.",
 "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 d48839d0b6022788f0243af3f1054f1469ede71a..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",
@@ -24,6 +24,8 @@
 "replaced {new_name} with {old_name}" => "substituÃr {new_name} por {old_name}",
 "undo" => "desfacer",
 "perform delete operation" => "realizar a operaciÃ³n de eliminaciÃ³n",
+"1 file uploading" => "EnviÃ¡ndose 1 ficheiro",
+"files uploading" => "ficheiros enviÃ¡ndose",
 "'.' is an invalid file name." => "Â«.Â» Ã© un nome de ficheiro incorrecto",
 "File name cannot be empty." => "O nome de ficheiro non pode estar baleiro",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nome incorrecto, non se permite Â«\\Â», Â«/Â», Â«<Â», Â«>Â», Â«:Â», Â«\"Â», Â«|Â», Â«?Â» e Â«*Â».",
@@ -31,14 +33,12 @@
 "Your storage is almost full ({usedSpacePercent}%)" => "O seu espazo de almacenamento estÃ¡ case cheo ({usedSpacePercent}%)",
 "Your download is being prepared. This might take some time if the files are big." => "EstÃ¡ a prepararse a sÃºa descarga. Isto pode levar bastante tempo se os ficheiros son grandes.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Non foi posÃbel enviar o ficheiro pois ou Ã© un directorio ou ten 0 bytes",
-"Upload Error" => "Produciuse un erro no envÃo",
-"Close" => "Pechar",
-"1 file uploading" => "EnviÃ¡ndose 1 ficheiro",
-"{count} files uploading" => "Enviandose {count} ficheiros",
+"Not enough space available" => "O espazo dispoÃ±Ãbel Ã© insuficiente",
 "Upload cancelled." => "EnvÃo cancelado.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "O envÃo do ficheiro estÃ¡ en proceso. SaÃr agora da pÃ¡xina cancelarÃ¡ o envÃo.",
 "URL cannot be empty." => "O URL non pode quedar baleiro.",
 "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Nome de cartafol incorrecto. O uso de Â«SharedÂ» estÃ¡ reservado por Owncloud",
+"Error" => "Erro",
 "Name" => "Nome",
 "Size" => "TamaÃ±o",
 "Modified" => "Modificado",
@@ -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 9d6b411c415d826adc98c0f95df0b74cb83a1ab7..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" => "×©×™× ×•×™ ×©×",
@@ -18,15 +19,13 @@
 "cancel" => "×‘×™×˜×•×œ",
 "replaced {new_name} with {old_name}" => "{new_name} ×”×•×—×œ×£ ×‘Ö¾{old_name}",
 "undo" => "×‘×™×˜×•×œ",
+"1 file uploading" => "×§×•×‘×¥ ××—×“ × ×©×œ×—",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "×”×©× ×©×’×•×™, ××¡×•×¨ ×œ×”×©×ª×ž×© ×‘×ª×•×•×™× '\\', '/', '<', '>', ':', '\"', '|', '?' ×•Ö¾'*'.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "×œ× ×™×›×•×œ ×œ×”×¢×œ×•×ª ××ª ×”×§×•×‘×¥ ×ž×›×™×•×•×Ÿ ×©×–×• ×ª×§×™×” ××• ×©×ž×©×§×œ ×”×§×•×‘×¥ 0 ×‘×ª×™×",
-"Upload Error" => "×©×’×™××ª ×”×¢×œ××”",
-"Close" => "×¡×’×™×¨×”",
-"1 file uploading" => "×§×•×‘×¥ ××—×“ × ×©×œ×—",
-"{count} files uploading" => "{count} ×§×‘×¦×™× × ×©×œ×—×™×",
 "Upload cancelled." => "×”×”×¢×œ××” ×‘×•×˜×œ×”.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "×ž×ª×‘×¦×¢×ª ×›×¢×ª ×”×¢×œ××ª ×§×‘×¦×™×. ×¢×–×™×‘×” ×©×œ ×”×¢×ž×•×“ ×ª×‘×˜×œ ××ª ×”×”×¢×œ××”.",
 "URL cannot be empty." => "×§×™×©×•×¨ ××™× ×• ×™×›×•×œ ×œ×”×™×•×ª ×¨×™×§.",
+"Error" => "×©×’×™××”",
 "Name" => "×©×",
 "Size" => "×’×•×“×œ",
 "Modified" => "×–×ž×Ÿ ×©×™× ×•×™",
diff --git a/apps/files/l10n/hr.php b/apps/files/l10n/hr.php
index 3516ab8c1e6a76377ca949e19c217fe8013a5ef4..d634faee7537ca22813eb4b21ff54c969fb838b3 100644
--- a/apps/files/l10n/hr.php
+++ b/apps/files/l10n/hr.php
@@ -1,28 +1,29 @@
 <?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",
 "suggest name" => "predloÅ¾i ime",
 "cancel" => "odustani",
 "undo" => "vrati",
-"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 Error" => "PogreÅ¡ka pri slanju",
-"Close" => "Zatvori",
 "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.",
-"Name" => "Naziv",
+"Error" => "GreÅ¡ka",
+"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: ",
@@ -36,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 54d5033f907d1cdce3825039c6a6877bce46befc..4520bfdd085dd934fee131f490e5e3a19ebaf5c9 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",
@@ -24,6 +24,8 @@
 "replaced {new_name} with {old_name}" => "{new_name} fÃ¡jlt kicserÃ©ltÃ¼k ezzel:  {old_name}",
 "undo" => "visszavonÃ¡s",
 "perform delete operation" => "a tÃ¶rlÃ©s vÃ©grehajtÃ¡sa",
+"1 file uploading" => "1 fÃ¡jl tÃ¶ltÅ‘dik fÃ¶l",
+"files uploading" => "fÃ¡jl tÃ¶ltÅ‘dik fÃ¶l",
 "'.' is an invalid file name." => "'.' fÃ¡jlnÃ©v Ã©rvÃ©nytelen.",
 "File name cannot be empty." => "A fÃ¡jlnÃ©v nem lehet semmi.",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ã‰rvÃ©nytelen elnevezÃ©s. Ezek a karakterek nem hasznÃ¡lhatÃ³k: '\\', '/', '<', '>', ':', '\"', '|', '?' Ã©s '*'",
@@ -31,14 +33,12 @@
 "Your storage is almost full ({usedSpacePercent}%)" => "A tÃ¡rolÃ³ majdnem tele van ({usedSpacePercent}%)",
 "Your download is being prepared. This might take some time if the files are big." => "KÃ©szÃ¼l a letÃ¶ltendÅ‘ Ã¡llomÃ¡ny. Ez eltarthat egy ideig, ha nagyok a fÃ¡jlok.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Nem tÃ¶lthetÅ‘ fel, mert mappa volt, vagy 0 byte mÃ©retÅ±",
-"Upload Error" => "FeltÃ¶ltÃ©si hiba",
-"Close" => "BezÃ¡rÃ¡s",
-"1 file uploading" => "1 fÃ¡jl tÃ¶ltÅ‘dik fÃ¶l",
-"{count} files uploading" => "{count} fÃ¡jl tÃ¶ltÅ‘dik fÃ¶l",
+"Not enough space available" => "Nincs elÃ©g szabad hely",
 "Upload cancelled." => "A feltÃ¶ltÃ©st megszakÃtottuk.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "FÃ¡jlfeltÃ¶ltÃ©s van folyamatban. Az oldal elhagyÃ¡sa megszakÃtja a feltÃ¶ltÃ©st.",
 "URL cannot be empty." => "Az URL nem lehet semmi.",
 "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Ã‰rvÃ©nytelen mappanÃ©v. A nÃ©v hasznÃ¡lata csak a Owncloud szÃ¡mÃ¡ra lehetsÃ©ges.",
+"Error" => "Hiba",
 "Name" => "NÃ©v",
 "Size" => "MÃ©ret",
 "Modified" => "MÃ³dosÃtva",
@@ -46,6 +46,7 @@
 "{count} folders" => "{count} mappa",
 "1 file" => "1 fÃ¡jl",
 "{count} files" => "{count} fÃ¡jl",
+"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 +65,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/hy.php b/apps/files/l10n/hy.php
index 29c0cd8b8d0627dcd2b067b297f902c626f162ef..22edf32c6e68ed17c7a4c3761d4b0006f4f496bc 100644
--- a/apps/files/l10n/hy.php
+++ b/apps/files/l10n/hy.php
@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "Delete" => "Õ‹Õ¶Õ»Õ¥Õ¬",
-"Close" => "Õ“Õ¡Õ¯Õ¥Õ¬",
 "Save" => "ÕŠÕ¡Õ°ÕºÕ¡Õ¶Õ¥Õ¬",
 "Download" => "Ô²Õ¥Õ¼Õ¶Õ¥Õ¬"
 );
diff --git a/apps/files/l10n/ia.php b/apps/files/l10n/ia.php
index ae614c1bf5dadfa661d90da8ee0f64f4ae35df75..886922d954687866367c1e806a5f7d50a62430c2 100644
--- a/apps/files/l10n/ia.php
+++ b/apps/files/l10n/ia.php
@@ -1,10 +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",
-"Close" => "Clauder",
+"Error" => "Error",
 "Name" => "Nomine",
 "Size" => "Dimension",
 "Modified" => "Modificate",
diff --git a/apps/files/l10n/id.php b/apps/files/l10n/id.php
index aff1933e569e9d3b801b5769dcf8d083dbfadf7c..58cc0ea7fd953e2c086f45a3983d593012151b19 100644
--- a/apps/files/l10n/id.php
+++ b/apps/files/l10n/id.php
@@ -1,46 +1,74 @@
 <?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",
+"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 MAX_FILE_SIZE directive that was specified in the HTML form" => "File yang diunggah melampaui directive MAX_FILE_SIZE yang disebutan dalam form HTML.",
+"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.",
 "The uploaded file was only partially uploaded" => "Berkas hanya diunggah sebagian",
 "No file was uploaded" => "Tidak ada berkas yang diunggah",
-"Missing a temporary folder" => "Kehilangan folder temporer",
+"Missing a temporary folder" => "Folder sementara tidak ada",
 "Failed to write to disk" => "Gagal menulis ke disk",
+"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",
 "Pending" => "Menunggu",
-"replace" => "mengganti",
+"{new_name} already exists" => "{new_name} sudah ada",
+"replace" => "ganti",
+"suggest name" => "sarankan nama",
 "cancel" => "batalkan",
-"undo" => "batal dikerjakan",
-"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",
-"Upload Error" => "Terjadi Galat Pengunggahan",
-"Close" => "tutup",
+"replaced {new_name} with {old_name}" => "mengganti {new_name} dengan {old_name}",
+"undo" => "urungkan",
+"perform delete operation" => "Lakukan operasi penghapusan",
+"1 file uploading" => "1 berkas diunggah",
+"files uploading" => "berkas diunggah",
+"'.' is an invalid file name." => "'.' bukan nama berkas yang valid.",
+"File name cannot be empty." => "Nama berkas tidak boleh kosong.",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nama tidak valid, karakter '\\', '/', '<', '>', ':', '\"', '|', '?' dan '*' tidak diizinkan.",
+"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 mempunyai ukuran 0 byte",
+"Not enough space available" => "Ruang penyimpanan tidak mencukupi",
 "Upload cancelled." => "Pengunggahan dibatalkan.",
-"URL cannot be empty." => "tautan tidak boleh kosong",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Berkas sedang diunggah. Meninggalkan halaman ini akan membatalkan proses.",
+"URL cannot be empty." => "URL tidak boleh kosong",
+"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Nama folder salah. Nama 'Shared' telah digunakan oleh Owncloud.",
+"Error" => "Galat",
 "Name" => "Nama",
 "Size" => "Ukuran",
 "Modified" => "Dimodifikasi",
-"1 folder" => "1 map",
-"{count} folders" => "{count} map",
+"1 folder" => "1 folder",
+"{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 unggah maksimum",
-"max. possible: " => "Kemungkinan maks:",
-"Needed for multi-file and folder downloads." => "Dibutuhkan untuk multi-berkas dan unduhan folder",
+"Maximum upload size" => "Ukuran pengunggahan maksimum",
+"max. possible: " => "Kemungkinan maks.:",
+"Needed for multi-file and folder downloads." => "Dibutuhkan untuk pengunduhan multi-berkas dan multi-folder",
 "Enable ZIP-download" => "Aktifkan unduhan ZIP",
-"0 is unlimited" => "0 adalah tidak terbatas",
-"Maximum input size for ZIP files" => "Ukuran masukan maksimal untuk berkas ZIP",
-"Save" => "simpan",
+"0 is unlimited" => "0 berarti tidak terbatas",
+"Maximum input size for ZIP files" => "Ukuran masukan maksimum untuk berkas ZIP",
+"Save" => "Simpan",
 "New" => "Baru",
 "Text file" => "Berkas teks",
 "Folder" => "Folder",
-"Cancel upload" => "Batal mengunggah",
+"From link" => "Dari tautan",
+"Deleted files" => "Berkas yang dihapus",
+"Cancel upload" => "Batal pengunggahan",
+"You donâ€™t have write permissions here." => "Anda tidak memiliki izin menulis di sini.",
 "Nothing in here. Upload something!" => "Tidak ada apa-apa di sini. Unggah sesuatu!",
 "Download" => "Unduh",
-"Unshare" => "batalkan berbagi",
-"Upload too large" => "Unggahan terlalu besar",
-"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Berkas yang anda coba unggah melebihi ukuran maksimum untuk pengunggahan berkas di server ini.",
-"Files are being scanned, please wait." => "Berkas sedang dipindai, silahkan tunggu.",
-"Current scanning" => "Sedang memindai"
+"Unshare" => "Batalkan berbagi",
+"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",
+"Upgrading filesystem cache..." => "Meningkatkan tembolok sistem berkas..."
 );
diff --git a/apps/files/l10n/is.php b/apps/files/l10n/is.php
index 9d735c3c5411ab29e43c2d0cde6f7c5290b09612..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",
@@ -21,18 +21,17 @@
 "cancel" => "hÃ¦tta viÃ°",
 "replaced {new_name} with {old_name}" => "yfirskrifaÃ°i {new_name} meÃ° {old_name}",
 "undo" => "afturkalla",
+"1 file uploading" => "1 skrÃ¡ innsend",
 "'.' is an invalid file name." => "'.' er ekki leyfilegt nafn.",
 "File name cannot be empty." => "Nafn skrÃ¡ar mÃ¡ ekki vera tÃ³mt",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ã“gilt nafn, tÃ¡knin '\\', '/', '<', '>', ':', '\"', '|', '?' og '*' eru ekki leyfÃ°.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Innsending Ã¡ skrÃ¡ mistÃ³kst, hugsanlega sendir Ã¾Ãº mÃ¶ppu eÃ°a skrÃ¡in er 0 bÃ¦ti.",
-"Upload Error" => "Villa viÃ° innsendingu",
-"Close" => "Loka",
-"1 file uploading" => "1 skrÃ¡ innsend",
-"{count} files uploading" => "{count} skrÃ¡r innsendar",
+"Not enough space available" => "Ekki nÃ¦gt plÃ¡ss tiltÃ¦kt",
 "Upload cancelled." => "HÃ¦tt viÃ° innsendingu.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Innsending Ã gangi. Ef Ã¾Ãº ferÃ° af Ã¾essari sÃÃ°u mun innsending misheppnast.",
 "URL cannot be empty." => "VefslÃ³Ã° mÃ¡ ekki vera tÃ³m.",
 "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Ã“leyfilegt nafn Ã¡ mÃ¶ppu. NafniÃ° 'Shared' er frÃ¡tekiÃ° fyrir Owncloud",
+"Error" => "Villa",
 "Name" => "Nafn",
 "Size" => "StÃ¦rÃ°",
 "Modified" => "Breytt",
@@ -40,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 2aac4ef20f532176aa0fccbf4433ff377866aead..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",
@@ -24,21 +24,21 @@
 "replaced {new_name} with {old_name}" => "sostituito {new_name} con {old_name}",
 "undo" => "annulla",
 "perform delete operation" => "esegui l'operazione di eliminazione",
+"1 file uploading" => "1 file in fase di caricamento",
+"files uploading" => "caricamento file",
 "'.' is an invalid file name." => "'.' non Ã¨ un nome file valido.",
 "File name cannot be empty." => "Il nome del file non puÃ² essere vuoto.",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nome non valido, '\\', '/', '<', '>', ':', '\"', '|', '?' e '*' non sono consentiti.",
 "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",
-"Upload Error" => "Errore di invio",
-"Close" => "Chiudi",
-"1 file uploading" => "1 file in fase di caricamento",
-"{count} files uploading" => "{count} file in fase di caricamentoe",
+"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.",
 "URL cannot be empty." => "L'URL non puÃ² essere vuoto.",
 "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Nome della cartella non valido. L'uso di 'Shared' Ã¨ riservato da ownCloud",
+"Error" => "Errore",
 "Name" => "Nome",
 "Size" => "Dimensione",
 "Modified" => "Modificato",
@@ -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 88349d1ba4022e84598b962386581d5188e5c24a..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" => "æŽ¨å¥¨åç§°",
@@ -24,6 +24,8 @@
 "replaced {new_name} with {old_name}" => "{old_name} ã‚’ {new_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." => "ç„¡åŠ¹ãªåå‰ã€'\\', '/', '<', '>', ':', '\"', '|', '?', '*' ã¯ä½¿ç”¨ã§ãã¾ã›ã‚“ã€‚",
@@ -31,21 +33,21 @@
 "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ãƒã‚¤ãƒˆã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ã§ãã¾ã›ã‚“",
-"Upload Error" => "ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ã‚¨ãƒ©ãƒ¼",
-"Close" => "é–‰ã˜ã‚‹",
-"1 file uploading" => "ãƒ•ã‚¡ã‚¤ãƒ«ã‚’1ã¤ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ä¸",
-"{count} files uploading" => "{count} ãƒ•ã‚¡ã‚¤ãƒ«ã‚’ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ä¸",
+"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" => "ç„¡åŠ¹ãªãƒ•ã‚©ãƒ«ãƒ€åã§ã™ã€‚'Shared' ã®åˆ©ç”¨ã¯ ownCloud ãŒäºˆç´„æ¸ˆã¿ã§ã™ã€‚",
+"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 421c720a330024db5d36e0e4ac8eb5322695d234..c50ca2594b6db137143b18a48ba7cd8077544176 100644
--- a/apps/files/l10n/ka_GE.php
+++ b/apps/files/l10n/ka_GE.php
@@ -1,11 +1,19 @@
 <?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 áƒ¤áƒáƒ áƒ›áƒáƒ¨áƒ˜",
 "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" => "áƒ›áƒáƒªáƒ“áƒ˜áƒ¡ áƒ áƒ”áƒŸáƒ˜áƒ›áƒ¨áƒ˜",
@@ -15,13 +23,22 @@
 "cancel" => "áƒ£áƒáƒ áƒ§áƒáƒ¤áƒ",
 "replaced {new_name} with {old_name}" => "{new_name} áƒ¨áƒ”áƒªáƒ•áƒšáƒ˜áƒšáƒ˜áƒ {old_name}â€“áƒ˜áƒ—",
 "undo" => "áƒ“áƒáƒ‘áƒ áƒ£áƒœáƒ”áƒ‘áƒ",
-"Unable to upload your file as it is a directory or has 0 bytes" => "áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ áƒ¤áƒáƒ˜áƒšáƒ˜áƒ¡ áƒáƒ¢áƒ•áƒ˜áƒ áƒ—áƒ•áƒ áƒ•áƒ”áƒ  áƒ›áƒáƒ®áƒ”áƒ áƒ®áƒ“áƒ. áƒ˜áƒ¡ áƒáƒ áƒ˜áƒ¡ áƒ¡áƒáƒ¥áƒáƒ¦áƒáƒšáƒ“áƒ” áƒ“áƒ áƒ¨áƒ”áƒ˜áƒªáƒáƒ•áƒ¡ 0 áƒ‘áƒáƒ˜áƒ¢áƒ¡",
-"Upload Error" => "áƒ¨áƒ”áƒªáƒ“áƒáƒ›áƒ áƒáƒ¢áƒ•áƒ˜áƒ áƒ—áƒ•áƒ˜áƒ¡áƒáƒ¡",
-"Close" => "áƒ“áƒáƒ®áƒ£áƒ áƒ•áƒ",
+"perform delete operation" => "áƒ›áƒ˜áƒ›áƒ“áƒ˜áƒœáƒáƒ áƒ”áƒáƒ‘áƒ¡ áƒ¬áƒáƒ¨áƒšáƒ˜áƒ¡ áƒáƒžáƒ”áƒ áƒáƒªáƒ˜áƒ",
 "1 file uploading" => "1 áƒ¤áƒáƒ˜áƒšáƒ˜áƒ¡ áƒáƒ¢áƒ•áƒ˜áƒ áƒ—áƒ•áƒ",
-"{count} files uploading" => "{count} áƒ¤áƒáƒ˜áƒšáƒ˜ áƒ˜áƒ¢áƒ•áƒ˜áƒ áƒ—áƒ”áƒ‘áƒ",
+"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." => "URL áƒáƒ  áƒ¨áƒ”áƒ˜áƒ«áƒšáƒ”áƒ‘áƒ áƒ˜áƒ§áƒáƒ¡ áƒªáƒáƒ áƒ˜áƒ”áƒšáƒ˜.",
+"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "áƒ“áƒáƒ£áƒ¨áƒ•áƒ”áƒ‘áƒ”áƒšáƒ˜ áƒ¤áƒáƒšáƒ“áƒ”áƒ áƒ˜áƒ¡ áƒ¡áƒáƒ®áƒ”áƒšáƒ˜.  'Shared'â€“áƒ˜áƒ¡ áƒ’áƒáƒ›áƒáƒ§áƒ”áƒœáƒ”áƒ‘áƒ áƒ áƒ”áƒ–áƒ”áƒ áƒ•áƒ˜áƒ áƒ”áƒ‘áƒ£áƒšáƒ˜áƒ Owncloudâ€“áƒ˜áƒ¡ áƒ›áƒ˜áƒ”áƒ ",
+"Error" => "áƒ¨áƒ”áƒªáƒ“áƒáƒ›áƒ",
 "Name" => "áƒ¡áƒáƒ®áƒ”áƒšáƒ˜",
 "Size" => "áƒ–áƒáƒ›áƒ",
 "Modified" => "áƒ¨áƒ”áƒªáƒ•áƒšáƒ˜áƒšáƒ˜áƒ",
@@ -29,6 +46,7 @@
 "{count} folders" => "{count} áƒ¡áƒáƒ¥áƒáƒ¦áƒáƒšáƒ“áƒ”",
 "1 file" => "1 áƒ¤áƒáƒ˜áƒšáƒ˜",
 "{count} files" => "{count} áƒ¤áƒáƒ˜áƒšáƒ˜",
+"Unable to rename file" => "áƒ¤áƒáƒ˜áƒšáƒ˜áƒ¡ áƒ¡áƒáƒ®áƒ”áƒšáƒ˜áƒ¡ áƒ’áƒáƒ“áƒáƒ áƒ¥áƒ›áƒ”áƒ•áƒ áƒ•áƒ”áƒ  áƒ›áƒáƒ®áƒ”áƒ áƒ®áƒ“áƒ",
 "Upload" => "áƒáƒ¢áƒ•áƒ˜áƒ áƒ—áƒ•áƒ",
 "File handling" => "áƒ¤áƒáƒ˜áƒšáƒ˜áƒ¡ áƒ“áƒáƒ›áƒ£áƒ¨áƒáƒ•áƒ”áƒ‘áƒ",
 "Maximum upload size" => "áƒ›áƒáƒ¥áƒ¡áƒ˜áƒ›áƒ£áƒ› áƒáƒ¢áƒ•áƒ˜áƒ áƒ—áƒ˜áƒ¡ áƒ–áƒáƒ›áƒ",
@@ -41,12 +59,16 @@
 "New" => "áƒáƒ®áƒáƒšáƒ˜",
 "Text file" => "áƒ¢áƒ”áƒ¥áƒ¡áƒ¢áƒ£áƒ áƒ˜ áƒ¤áƒáƒ˜áƒšáƒ˜",
 "Folder" => "áƒ¡áƒáƒ¥áƒáƒ¦áƒáƒšáƒ“áƒ”",
+"From link" => "áƒ›áƒ˜áƒ¡áƒáƒ›áƒáƒ áƒ—áƒ˜áƒ“áƒáƒœ",
+"Deleted files" => "áƒ¬áƒáƒ¨áƒšáƒ˜áƒšáƒ˜ áƒ¤áƒáƒ˜áƒšáƒ”áƒ‘áƒ˜",
 "Cancel upload" => "áƒáƒ¢áƒ•áƒ˜áƒ áƒ—áƒ•áƒ˜áƒ¡ áƒ’áƒáƒ£áƒ¥áƒ›áƒ”áƒ‘áƒ",
+"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." => "áƒ›áƒ˜áƒ›áƒ“áƒ˜áƒœáƒáƒ áƒ”áƒáƒ‘áƒ¡ áƒ¤áƒáƒ˜áƒšáƒ”áƒ‘áƒ˜áƒ¡ áƒ¡áƒ™áƒáƒœáƒ˜áƒ áƒ”áƒ‘áƒ, áƒ’áƒ—áƒ®áƒáƒ•áƒ— áƒ“áƒáƒ”áƒšáƒáƒ“áƒáƒ—.",
-"Current scanning" => "áƒ›áƒ˜áƒ›áƒ“áƒ˜áƒœáƒáƒ áƒ” áƒ¡áƒ™áƒáƒœáƒ˜áƒ áƒ”áƒ‘áƒ"
+"Current scanning" => "áƒ›áƒ˜áƒ›áƒ“áƒ˜áƒœáƒáƒ áƒ” áƒ¡áƒ™áƒáƒœáƒ˜áƒ áƒ”áƒ‘áƒ",
+"Upgrading filesystem cache..." => "áƒ¤áƒáƒ˜áƒšáƒ£áƒ áƒ˜ áƒ¡áƒ˜áƒ¡áƒ¢áƒ”áƒ›áƒ˜áƒ¡ áƒ¥áƒ”áƒ¨áƒ˜áƒ¡ áƒ’áƒáƒœáƒáƒ®áƒšáƒ”áƒ‘áƒ...."
 );
diff --git a/apps/files/l10n/ko.php b/apps/files/l10n/ko.php
index ba45bdaa5d7f2b479f15f10354434d1b489560cf..c78f58542e460d27b5b9cab6acb249a4e2b15580 100644
--- a/apps/files/l10n/ko.php
+++ b/apps/files/l10n/ko.php
@@ -1,41 +1,44 @@
 <?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" => "ì´ íŒŒì¼ì€ ë””ë ‰í„°ë¦¬ì´ê±°ë‚˜ ë¹„ì–´ ìžˆê¸° ë•Œë¬¸ì— ì—…ë¡œë“œí•  ìˆ˜ ì—†ìŠµë‹ˆë‹¤",
-"Upload Error" => "ì—…ë¡œë“œ ì˜¤ë¥˜",
-"Close" => "ë‹«ê¸°",
-"1 file uploading" => "íŒŒì¼ 1ê°œ ì—…ë¡œë“œ ì¤‘",
-"{count} files uploading" => "íŒŒì¼ {count}ê°œ ì—…ë¡œë“œ ì¤‘",
+"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." => "íŒŒì¼ ì—…ë¡œë“œê°€ ì§„í–‰ ì¤‘ìž…ë‹ˆë‹¤. ì´ íŽ˜ì´ì§€ë¥¼ ë²—ì–´ë‚˜ë©´ ì—…ë¡œë“œê°€ ì·¨ì†Œë©ë‹ˆë‹¤.",
 "URL cannot be empty." => "URLì„ ìž…ë ¥í•´ì•¼ í•©ë‹ˆë‹¤.",
 "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "í´ë” ì´ë¦„ì´ ìœ íš¨í•˜ì§€ ì•ŠìŠµë‹ˆë‹¤. ",
+"Error" => "ì˜¤ë¥˜",
 "Name" => "ì´ë¦„",
 "Size" => "í¬ê¸°",
 "Modified" => "ìˆ˜ì •ë¨",
@@ -43,6 +46,7 @@
 "{count} folders" => "í´ë” {count}ê°œ",
 "1 file" => "íŒŒì¼ 1ê°œ",
 "{count} files" => "íŒŒì¼ {count}ê°œ",
+"Unable to rename file" => "íŒŒì¼ ì´ë¦„ë°”ê¾¸ê¸° í•  ìˆ˜ ì—†ìŒ",
 "Upload" => "ì—…ë¡œë“œ",
 "File handling" => "íŒŒì¼ ì²˜ë¦¬",
 "Maximum upload size" => "ìµœëŒ€ ì—…ë¡œë“œ í¬ê¸°",
@@ -56,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/ku_IQ.php b/apps/files/l10n/ku_IQ.php
index 5c5a3d6bd8fae6d14a19fb6084aac33e367ba13d..7b36c3b710b7a426734832e0aea9cb8dd7888603 100644
--- a/apps/files/l10n/ku_IQ.php
+++ b/apps/files/l10n/ku_IQ.php
@@ -1,6 +1,6 @@
 <?php $TRANSLATIONS = array(
-"Close" => "Ø¯Ø§Ø®Ø³ØªÙ†",
 "URL cannot be empty." => "Ù†Ø§ÙˆÙ†ÛŒØ´Ø§Ù†ÛŒ Ø¨Ù‡â€ŒØ³ØªÙ‡â€ŒØ± Ù†Ø§Ø¨ÛŽØª Ø¨Ù‡â€ŒØªØ§Úµ Ø¨ÛŽØª.",
+"Error" => "Ù‡Ù‡â€ŒÚµÙ‡",
 "Name" => "Ù†Ø§Ùˆ",
 "Upload" => "Ø¨Ø§Ø±Ú©Ø±Ø¯Ù†",
 "Save" => "Ù¾Ø§Ø´Ú©Ù‡â€ŒÙˆØªÚ©Ø±Ø¯Ù†",
diff --git a/apps/files/l10n/lb.php b/apps/files/l10n/lb.php
index b052da3a027c540e4535f6ba41352bfcccaae3f5..4a60295c5cb3680a3759f857c16579c7b06ef721 100644
--- a/apps/files/l10n/lb.php
+++ b/apps/files/l10n/lb.php
@@ -2,19 +2,19 @@
 "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",
 "undo" => "rÃ©ckgÃ¤ngeg man",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Kann deng Datei net eroplueden well et en Dossier ass oder 0 byte grouss ass.",
-"Upload Error" => "Fehler beim eroplueden",
-"Close" => "Zoumaachen",
 "Upload cancelled." => "Upload ofgebrach.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "File Upload am gaang. Wann's de des SÃ¤it verlÃ©iss gÃ«tt den Upload ofgebrach.",
+"Error" => "Fehler",
 "Name" => "Numm",
 "Size" => "GrÃ©isst",
 "Modified" => "GeÃ¤nnert",
@@ -32,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 2f16fc224200fe36a54171ea990ab6a02c9220ce..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",
@@ -15,13 +16,11 @@
 "cancel" => "atÅ¡aukti",
 "replaced {new_name} with {old_name}" => "pakeiskite {new_name} Ä¯ {old_name}",
 "undo" => "anuliuoti",
-"Unable to upload your file as it is a directory or has 0 bytes" => "NeÄ¯manoma Ä¯kelti failo - jo dydis gali bÅ«ti 0 bitÅ³ arba tai katalogas",
-"Upload Error" => "Ä®kÄ—limo klaida",
-"Close" => "UÅ¾verti",
 "1 file uploading" => "Ä¯keliamas 1 failas",
-"{count} files uploading" => "{count}  Ä¯keliami failai",
+"Unable to upload your file as it is a directory or has 0 bytes" => "NeÄ¯manoma Ä¯kelti failo - jo dydis gali bÅ«ti 0 bitÅ³ arba tai katalogas",
 "Upload cancelled." => "Ä®kÄ—limas atÅ¡auktas.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Failo Ä¯kÄ—limas pradÄ—tas. Jei paliksite Å¡Ä¯ puslapÄ¯, Ä¯kÄ—limas nutrÅ«ks.",
+"Error" => "Klaida",
 "Name" => "Pavadinimas",
 "Size" => "Dydis",
 "Modified" => "Pakeista",
@@ -46,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 a7a9284c6512fa1661554d042198dcfa1d742f11..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",
@@ -24,21 +24,20 @@
 "replaced {new_name} with {old_name}" => "aizvietoja {new_name} ar {old_name}",
 "undo" => "atsaukt",
 "perform delete operation" => "veikt dzÄ“Å¡anas darbÄ«bu",
+"1 file uploading" => "AugÅ¡upielÄdÄ“ 1 datni",
 "'.' is an invalid file name." => "'.' ir nederÄ«gs datnes nosaukums.",
 "File name cannot be empty." => "Datnes nosaukums nevar bÅ«t tukÅ¡s.",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "NederÄ«gs nosaukums, nav atÄ¼auti '\\', '/', '<', '>', ':', '\"', '|', '?' un '*'.",
 "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",
-"Upload Error" => "KÄ¼Å«da augÅ¡upielÄdÄ“jot",
-"Close" => "AizvÄ“rt",
-"1 file uploading" => "AugÅ¡upielÄdÄ“ 1 datni",
-"{count} files uploading" => "augÅ¡upielÄdÄ“ {count} datnes",
+"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.",
 "URL cannot be empty." => "URL nevar bÅ«t tukÅ¡s.",
 "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "NederÄ«gs mapes nosaukums. â€œKoplietotsâ€ izmantojums ir rezervÄ“ts ownCloud servisam.",
+"Error" => "KÄ¼Å«da",
 "Name" => "Nosaukums",
 "Size" => "IzmÄ“rs",
 "Modified" => "MainÄ«ts",
@@ -46,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 cf9ad8abafc75fdcf85a367e91786d0155dd62ca..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" => "Ð§ÐµÐºÐ°",
@@ -17,15 +18,13 @@
 "cancel" => "Ð¾Ñ‚ÐºÐ°Ð¶Ð¸",
 "replaced {new_name} with {old_name}" => "Ð·Ð°Ð¼ÐµÐ½ÐµÑ‚Ð° {new_name} ÑÐ¾ {old_name}",
 "undo" => "Ð²Ñ€Ð°Ñ‚Ð¸",
+"1 file uploading" => "1 Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ° ÑÐµ Ð¿Ð¾Ð´Ð¸Ð³Ð°",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "ÐÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»Ð½Ð¾ Ð¸Ð¼Ðµ. , '\\', '/', '<', '>', ':', '\"', '|', '?' Ð¸ '*' Ð½Ðµ ÑÐµ Ð´Ð¾Ð·Ð²Ð¾Ð»ÐµÐ½Ð¸.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "ÐÐµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° ÑÐµ Ð¿Ñ€ÐµÐ·ÐµÐ¼Ðµ Ð²Ð°ÑˆÐ°Ñ‚Ð° Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ° Ð±Ð¸Ð´ÐµÑ˜ÑœÐ¸ Ñ„Ð¾Ð»Ð´ÐµÑ€Ð¾Ñ‚ Ð²Ð¾ ÐºÐ¾Ñ˜ ÑÐµ Ð½Ð°Ð¾Ñ“Ð° Ñ„Ð°Ñ˜Ð»Ð¾Ñ‚ Ð¸Ð¼Ð° Ð³Ð¾Ð»ÐµÐ¼Ð¸Ð½Ð° Ð¾Ð´ 0 Ð±Ð°Ñ˜Ñ‚Ð¸",
-"Upload Error" => "Ð“Ñ€ÐµÑˆÐºÐ° Ð¿Ñ€Ð¸ Ð¿Ñ€ÐµÐ·ÐµÐ¼Ð°ÑšÐµ",
-"Close" => "Ð—Ð°Ñ‚Ð²Ð¾Ð¸",
-"1 file uploading" => "1 Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ° ÑÐµ Ð¿Ð¾Ð´Ð¸Ð³Ð°",
-"{count} files uploading" => "{count} Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ¸ ÑÐµ Ð¿Ð¾Ð´Ð¸Ð³Ð°Ð°Ñ‚",
 "Upload cancelled." => "ÐŸÑ€ÐµÐ·ÐµÐ¼Ð°ÑšÐµÑ‚Ð¾ Ðµ Ð¿Ñ€ÐµÐºÐ¸Ð½Ð°Ñ‚Ð¾.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "ÐŸÐ¾Ð´Ð¸Ð³Ð°ÑšÐµ Ð½Ð° Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ° Ðµ Ð²Ð¾ Ñ‚ÐµÐº. ÐÐ°Ð¿ÑƒÑˆÑ‚ÐµÑšÐµ Ð½Ð° ÑÑ‚Ñ€Ð°Ð½Ð¸Ñ†Ð°Ñ‚Ð° ÑœÐµ Ð³Ð¾ Ð¿Ñ€ÐµÐºÐ¸Ð½Ðµ.",
 "URL cannot be empty." => "ÐÐ´Ñ€ÐµÑÐ°Ñ‚Ð° Ð½ÐµÐ¼Ð¾Ð¶Ðµ Ð´Ð° Ð±Ð¸Ð´Ðµ Ð¿Ñ€Ð°Ð·Ð½Ð°.",
+"Error" => "Ð“Ñ€ÐµÑˆÐºÐ°",
 "Name" => "Ð˜Ð¼Ðµ",
 "Size" => "Ð“Ð¾Ð»ÐµÐ¼Ð¸Ð½Ð°",
 "Modified" => "ÐŸÑ€Ð¾Ð¼ÐµÐ½ÐµÑ‚Ð¾",
@@ -50,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 b15a9111e70475f697e409c700c650d4e55f456a..2ce4f1633284f2efb84b9d42cb080536a7a0c509 100644
--- a/apps/files/l10n/ms_MY.php
+++ b/apps/files/l10n/ms_MY.php
@@ -1,21 +1,21 @@
 <?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",
 "cancel" => "Batal",
 "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 Error" => "Muat naik ralat",
-"Close" => "Tutup",
 "Upload cancelled." => "Muatnaik dibatalkan.",
-"Name" => "Nama ",
+"Error" => "Ralat",
+"Name" => "Nama",
 "Size" => "Saiz",
 "Modified" => "Dimodifikasi",
 "Upload" => "Muat naik",
@@ -33,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 d9972feb6a585c8bde21be9082311499f3db0126..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,15 +23,22 @@
 "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",
-"Upload Error" => "Opplasting feilet",
-"Close" => "Lukk",
-"1 file uploading" => "1 fil lastes opp",
-"{count} files uploading" => "{count} filer laster opp",
+"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",
 "Modified" => "Endret",
@@ -33,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",
@@ -46,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 6af7edf2501836bf3ba9dc6d8f7dc497af5464d0..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",
@@ -24,29 +24,31 @@
 "replaced {new_name} with {old_name}" => "verving {new_name} met {old_name}",
 "undo" => "ongedaan maken",
 "perform delete operation" => "uitvoeren verwijderactie",
+"1 file uploading" => "1 bestand wordt ge-upload",
+"files uploading" => "bestanden aan het uploaden",
 "'.' is an invalid file name." => "'.' is een ongeldige bestandsnaam.",
 "File name cannot be empty." => "Bestandsnaam kan niet leeg zijn.",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Onjuiste naam; '\\', '/', '<', '>', ':', '\"', '|', '?' en '*' zijn niet toegestaan.",
 "Your storage is full, files can not be updated or synced anymore!" => "Uw opslagruimte zit vol, Bestanden kunnen niet meer worden ge-upload of gesynchroniseerd!",
 "Your storage is almost full ({usedSpacePercent}%)" => "Uw opslagruimte zit bijna vol ({usedSpacePercent}%)",
 "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",
-"Upload Error" => "Upload Fout",
-"Close" => "Sluit",
-"1 file uploading" => "1 bestand wordt ge-upload",
-"{count} files uploading" => "{count} bestanden aan het uploaden",
+"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.",
 "URL cannot be empty." => "URL kan niet leeg zijn.",
 "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Ongeldige mapnaam. Gebruik van'Gedeeld' is voorbehouden aan Owncloud",
+"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 8a4ab91ea7ec74d9cc21fdfad63d5545ba76d78b..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",
-"Close" => "Lukk",
+"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 7a39e9399f5c3d7e49ff2af9d07c645996d74a7c..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",
@@ -13,11 +14,12 @@
 "suggest name" => "nom prepausat",
 "cancel" => "anulla",
 "undo" => "defar",
-"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 Error" => "Error d'amontcargar",
 "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. ",
+"Error" => "Error",
 "Name" => "Nom",
 "Size" => "Talha",
 "Modified" => "Modificat",
@@ -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 89eb3421291944cdec37b27f1d8506c94c08d258..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Ä™",
@@ -24,6 +24,8 @@
 "replaced {new_name} with {old_name}" => "zastÄ…piono {new_name} przez {old_name}",
 "undo" => "cofnij",
 "perform delete operation" => "wykonaj operacjÄ™ usuniÄ™cia",
+"1 file uploading" => "1 plik wczytywany",
+"files uploading" => "pliki wczytane",
 "'.' is an invalid file name." => "â€ž.â€ jest nieprawidÅ‚owÄ… nazwÄ… pliku.",
 "File name cannot be empty." => "Nazwa pliku nie moÅ¼e byÄ‡ pusta.",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "NieprawidÅ‚owa nazwa. Znaki '\\', '/', '<', '>', ':', '\"', '|', '?' oraz '*' sÄ… niedozwolone.",
@@ -31,14 +33,12 @@
 "Your storage is almost full ({usedSpacePercent}%)" => "TwÃ³j magazyn jest prawie peÅ‚ny ({usedSpacePercent}%)",
 "Your download is being prepared. This might take some time if the files are big." => "Pobieranie jest przygotowywane. MoÅ¼e to zajÄ…Ä‡ trochÄ™ czasu jeÅ›li pliki sÄ… duÅ¼e.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Nie moÅ¼na wczytaÄ‡ pliku, poniewaÅ¼ jest on katalogiem lub ma 0 bajtÃ³w",
-"Upload Error" => "BÅ‚Ä…d wczytywania",
-"Close" => "Zamknij",
-"1 file uploading" => "1 plik wczytywany",
-"{count} files uploading" => "IloÅ›Ä‡ przesyÅ‚anych plikÃ³w: {count}",
+"Not enough space available" => "Za maÅ‚o miejsca",
 "Upload cancelled." => "Wczytywanie anulowane.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "WysyÅ‚anie pliku jest w toku. JeÅ›li opuÅ›cisz tÄ™ stronÄ™, wysyÅ‚anie zostanie przerwane.",
 "URL cannot be empty." => "URL nie moÅ¼e byÄ‡ pusty.",
 "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "NieprawidÅ‚owa nazwa folderu. Korzystanie z nazwy â€žSharedâ€ jest zarezerwowane dla ownCloud",
+"Error" => "BÅ‚Ä…d",
 "Name" => "Nazwa",
 "Size" => "Rozmiar",
 "Modified" => "Modyfikacja",
@@ -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 3bebb68227113e7e01b39f667e072fd70608fdac..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",
@@ -24,6 +24,8 @@
 "replaced {new_name} with {old_name}" => "SubstituÃdo {old_name} por {new_name} ",
 "undo" => "desfazer",
 "perform delete operation" => "realizar operaÃ§Ã£o de exclusÃ£o",
+"1 file uploading" => "enviando 1 arquivo",
+"files uploading" => "enviando arquivos",
 "'.' is an invalid file name." => "'.' Ã© um nome de arquivo invÃ¡lido.",
 "File name cannot be empty." => "O nome do arquivo nÃ£o pode estar vazio.",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nome invÃ¡lido, '\\', '/', '<', '>', ':', '\"', '|', '?' e '*' nÃ£o sÃ£o permitidos.",
@@ -31,14 +33,12 @@
 "Your storage is almost full ({usedSpacePercent}%)" => "Seu armazenamento estÃ¡ quase cheio ({usedSpacePercent}%)",
 "Your download is being prepared. This might take some time if the files are big." => "Seu download estÃ¡ sendo preparado. Isto pode levar algum tempo se os arquivos forem grandes.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "ImpossÃvel enviar seus arquivo por ele ser um diretÃ³rio ou ter 0 bytes.",
-"Upload Error" => "Erro de envio",
-"Close" => "Fechar",
-"1 file uploading" => "enviando 1 arquivo",
-"{count} files uploading" => "Enviando {count} arquivos",
+"Not enough space available" => "EspaÃ§o de armazenamento insuficiente",
 "Upload cancelled." => "Envio cancelado.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Upload em andamento. Sair da pÃ¡gina agora resultarÃ¡ no cancelamento do envio.",
 "URL cannot be empty." => "URL nÃ£o pode ficar em branco",
 "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Nome de pasta invÃ¡lido. O uso de 'Shared' Ã© reservado para o Owncloud",
+"Error" => "Erro",
 "Name" => "Nome",
 "Size" => "Tamanho",
 "Modified" => "Modificado",
@@ -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 7162517e8162dcff122399c849521733ad5a79b1..15d6fc80bd36cec03e9c89bb6b5cd83653f1ebfb 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",
@@ -24,6 +24,8 @@
 "replaced {new_name} with {old_name}" => "substituido {new_name} por {old_name}",
 "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.",
@@ -31,14 +33,12 @@
 "Your storage is almost full ({usedSpacePercent}%)" => "O seu espaÃ§o de armazenamento estÃ¡ quase cheiro ({usedSpacePercent}%)",
 "Your download is being prepared. This might take some time if the files are big." => "O seu download estÃ¡ a ser preparado. Este processo pode demorar algum tempo se os ficheiros forem grandes.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "NÃ£o Ã© possÃvel fazer o envio do ficheiro devido a ser uma pasta ou ter 0 bytes",
-"Upload Error" => "Erro no envio",
-"Close" => "Fechar",
-"1 file uploading" => "A enviar 1 ficheiro",
-"{count} files uploading" => "A carregar {count} ficheiros",
+"Not enough space available" => "EspaÃ§o em disco insuficiente!",
 "Upload cancelled." => "Envio cancelado.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Envio de ficheiro em progresso. IrÃ¡ cancelar o envio se sair da pÃ¡gina agora.",
 "URL cannot be empty." => "O URL nÃ£o pode estar vazio.",
 "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Nome de pasta invÃ¡lido. O Uso de 'shared' Ã© reservado para o ownCloud",
+"Error" => "Erro",
 "Name" => "Nome",
 "Size" => "Tamanho",
 "Modified" => "Modificado",
@@ -46,11 +46,12 @@
 "{count} folders" => "{count} pastas",
 "1 file" => "1 ficheiro",
 "{count} files" => "{count} ficheiros",
-"Upload" => "Enviar",
+"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",
@@ -65,8 +66,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 153caba2291e8938db91e0e8d0f3316f993df763..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,19 +23,22 @@
 "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.",
-"Upload Error" => "Eroare la Ã®ncÄƒrcare",
-"Close" => "ÃŽnchide",
-"1 file uploading" => "un fiÈ™ier se Ã®ncarcÄƒ",
-"{count} files uploading" => "{count} fisiere incarcate",
+"Not enough space available" => "Nu este suficient spaÈ›iu disponibil",
 "Upload cancelled." => "ÃŽncÄƒrcare anulatÄƒ.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "FiÈ™ierul este Ã®n curs de Ã®ncÄƒrcare. PÄƒrÄƒsirea paginii va Ã®ntrerupe Ã®ncÄƒrcarea.",
 "URL cannot be empty." => "Adresa URL nu poate fi goalÄƒ.",
 "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Invalid folder name. Usage of 'Shared' is reserved by Ownclou",
+"Error" => "Eroare",
 "Name" => "Nume",
 "Size" => "Dimensiune",
 "Modified" => "Modificat",
@@ -41,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:",
@@ -49,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 cf8ee7c6c75693c0bda14776b6f5372b6af9533c..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" => "ÐŸÐµÑ€ÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ñ‚ÑŒ",
@@ -24,29 +24,30 @@
 "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 Ð±Ð°Ð¹Ñ‚ Ð² ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³",
-"Upload Error" => "ÐžÑˆÐ¸Ð±ÐºÐ° Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸",
-"Close" => "Ð—Ð°ÐºÑ€Ñ‹Ñ‚ÑŒ",
-"1 file uploading" => "Ð·Ð°Ð³Ñ€ÑƒÐ¶Ð°ÐµÑ‚ÑÑ 1 Ñ„Ð°Ð¹Ð»",
-"{count} files uploading" => "{count} Ñ„Ð°Ð¹Ð»Ð¾Ð² Ð·Ð°Ð³Ñ€ÑƒÐ¶Ð°ÐµÑ‚ÑÑ",
+"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' Ð·Ð°Ñ€ÐµÐ·ÐµÑ€Ð²Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¾.",
-"Name" => "ÐÐ°Ð·Ð²Ð°Ð½Ð¸Ðµ",
+"Error" => "ÐžÑˆÐ¸Ð±ÐºÐ°",
+"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: " => "Ð¼Ð°ÐºÑ. Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾: ",
@@ -64,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 054ed8094db1b6d74d861565689a47aa736dc615..1ef163d48f33d1aa62018a4d5ee96a95cfb06d73 100644
--- a/apps/files/l10n/ru_RU.php
+++ b/apps/files/l10n/ru_RU.php
@@ -1,71 +1,3 @@
 <?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" => "Ð—Ð°Ð³Ñ€ÑƒÐ¶Ð°ÐµÐ¼Ñ‹Ð¹ Ñ„Ð°Ð¹Ð» Ð±Ñ‹Ð» Ð·Ð°Ð³Ñ€ÑƒÐ¶ÐµÐ½ Ñ‡Ð°ÑÑ‚Ð¸Ñ‡Ð½Ð¾",
-"No file was uploaded" => "Ð¤Ð°Ð¹Ð» Ð½Ðµ Ð±Ñ‹Ð» Ð·Ð°Ð³Ñ€ÑƒÐ¶ÐµÐ½",
-"Missing a temporary folder" => "ÐžÑ‚ÑÑƒÑ‚ÑÑ‚Ð²ÑƒÐµÑ‚ Ð²Ñ€ÐµÐ¼ÐµÐ½Ð½Ð°Ñ Ð¿Ð°Ð¿ÐºÐ°",
-"Failed to write to disk" => "ÐÐµ ÑƒÐ´Ð°Ð»Ð¾ÑÑŒ Ð·Ð°Ð¿Ð¸ÑÐ°Ñ‚ÑŒ Ð½Ð° Ð´Ð¸ÑÐº",
-"Not enough storage available" => "ÐÐµÐ´Ð¾ÑÑ‚Ð°Ñ‚Ð¾Ñ‡Ð½Ð¾ Ð¼ÐµÑÑ‚Ð° Ð² Ñ…Ñ€Ð°Ð½Ð¸Ð»Ð¸Ñ‰Ðµ",
-"Invalid directory." => "ÐÐµÐ²ÐµÑ€Ð½Ñ‹Ð¹ ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³.",
-"Files" => "Ð¤Ð°Ð¹Ð»Ñ‹",
-"Delete permanently" => "Ð£Ð´Ð°Ð»Ð¸Ñ‚ÑŒ Ð½Ð°Ð²ÑÐµÐ³Ð´Ð°",
-"Delete" => "Ð£Ð´Ð°Ð»Ð¸Ñ‚ÑŒ",
-"Rename" => "ÐŸÐµÑ€ÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ñ‚ÑŒ",
-"Pending" => "ÐžÐ¶Ð¸Ð´Ð°ÑŽÑ‰Ð¸Ð¹ Ñ€ÐµÑˆÐµÐ½Ð¸Ñ",
-"{new_name} already exists" => "{Ð½Ð¾Ð²Ð¾Ðµ_Ð¸Ð¼Ñ} ÑƒÐ¶Ðµ ÑÑƒÑ‰ÐµÑÑ‚Ð²ÑƒÐµÑ‚",
-"replace" => "Ð¾Ñ‚Ð¼ÐµÐ½Ð°",
-"suggest name" => "Ð¿Ð¾Ð´Ð¾Ð±Ñ€Ð°Ñ‚ÑŒ Ð½Ð°Ð·Ð²Ð°Ð½Ð¸Ðµ",
-"cancel" => "Ð¾Ñ‚Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ",
-"replaced {new_name} with {old_name}" => "Ð·Ð°Ð¼ÐµÐ½ÐµÐ½Ð¾ {Ð½Ð¾Ð²Ð¾Ðµ_Ð¸Ð¼Ñ} Ñ {ÑÑ‚Ð°Ñ€Ð¾Ðµ_Ð¸Ð¼Ñ}",
-"undo" => "Ð¾Ñ‚Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ Ð´ÐµÐ¹ÑÑ‚Ð²Ð¸Ðµ",
-"perform delete operation" => "Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÑÐµÑ‚ÑÑ Ð¿Ñ€Ð¾Ñ†ÐµÑÑ ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ",
-"'.' 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 Ñ‚Ð°Ðº ÐºÐ°Ðº Ð¾Ð½ Ð¸Ð¼ÐµÐµÑ‚ Ð½ÑƒÐ»ÐµÐ²Ð¾Ð¹ Ñ€Ð°Ð·Ð¼ÐµÑ€ Ð¸Ð»Ð¸ ÑÐ²Ð»ÑÐµÑ‚ÑÑ Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸ÐµÐ¹",
-"Upload Error" => "ÐžÑˆÐ¸Ð±ÐºÐ° Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸",
-"Close" => "Ð—Ð°ÐºÑ€Ñ‹Ñ‚ÑŒ",
-"1 file uploading" => "Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ° 1 Ñ„Ð°Ð¹Ð»Ð°",
-"{count} files uploading" => "{ÐºÐ¾Ð»Ð¸Ñ‡ÐµÑÑ‚Ð²Ð¾} Ð·Ð°Ð³Ñ€ÑƒÐ¶ÐµÐ½Ð¾ Ñ„Ð°Ð¹Ð»Ð¾Ð²",
-"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",
-"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..." => "ÐžÐ±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ðµ ÐºÑÑˆÐ° Ñ„Ð°Ð¹Ð»Ð¾Ð²Ð¾Ð¹ ÑÐ¸ÑÑ‚ÐµÐ¼Ñ‹... "
+"Error" => "ÐžÑˆÐ¸Ð±ÐºÐ°"
 );
diff --git a/apps/files/l10n/si_LK.php b/apps/files/l10n/si_LK.php
index de2b89068451e83d9833f7ec8494fea9b853bb54..351021a9f8bf1ad3df0a7eac44c692418d1af737 100644
--- a/apps/files/l10n/si_LK.php
+++ b/apps/files/l10n/si_LK.php
@@ -1,30 +1,30 @@
 <?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" => "à¶±à¶¸à¶šà·Š à¶ºà·à¶¢à¶±à· à¶šà¶»à¶±à·Šà¶±",
 "cancel" => "à¶…à¶à·Š à·„à¶»à·’à¶±à·Šà¶±",
 "undo" => "à¶±à·’à·‚à·Šà¶´à·Šâ€à¶»à¶· à¶šà¶»à¶±à·Šà¶±",
-"Upload Error" => "à¶‹à¶©à·”à¶œà¶ à¶šà·’à¶»à·“à¶¸à·š à¶¯à·à·à¶ºà¶šà·Š",
-"Close" => "à·€à·ƒà¶±à·Šà¶±",
 "1 file uploading" => "1 à¶œà·œà¶±à·”à·€à¶šà·Š à¶‹à¶©à¶œà¶ à¶šà·™à¶»à·š",
 "Upload cancelled." => "à¶‹à¶©à·”à¶œà¶ à¶šà·’à¶»à·“à¶¸ à¶…à¶à·Š à·„à¶»à·’à¶±à·Šà¶± à¶½à¶¯à·“",
 "File upload is in progress. Leaving the page now will cancel the upload." => "à¶‹à¶©à·”à¶œà¶à¶šà·’à¶»à·“à¶¸à¶šà·Š à·ƒà·’à¶¯à·”à·€à·š. à¶´à·’à¶§à·”à·€ à·„à·à¶» à¶ºà·à¶¸à·™à¶±à·Š à¶‘à¶º à¶±à·à·€à¶à·™à¶±à·” à¶‡à¶",
 "URL cannot be empty." => "à¶ºà·œà¶¸à·”à·€ à·„à·’à·ƒà·Š à·€à·’à¶º à¶±à·œà·„à·à¶š",
+"Error" => "à¶¯à·à·‚à¶ºà¶šà·Š",
 "Name" => "à¶±à¶¸",
 "Size" => "à¶´à·Šâ€à¶»à¶¸à·à¶«à¶º",
 "Modified" => "à·€à·™à¶±à·ƒà·Š à¶šà·…",
 "1 folder" => "1 à·†à·œà¶½à·Šà¶©à¶»à¶ºà¶šà·Š",
 "1 file" => "1 à¶œà·œà¶±à·”à·€à¶šà·Š",
-"Upload" => "à¶‹à¶©à·”à¶œà¶ à¶šà·’à¶»à·“à¶¸",
+"Upload" => "à¶‹à¶©à·”à¶œà¶ à¶šà¶»à¶±à·Šà¶±",
 "File handling" => "à¶œà·œà¶±à·” à¶´à¶»à·’à·„à¶»à¶«à¶º",
 "Maximum upload size" => "à¶‹à¶©à·”à¶œà¶ à¶šà·’à¶»à·“à¶¸à¶š à¶‹à¶´à¶»à·’à¶¸ à¶´à·Šâ€à¶»à¶¸à·à¶«à¶º",
 "max. possible: " => "à·„à·à¶šà·’ à¶‹à¶´à¶»à·’à¶¸à¶º:",
@@ -39,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 a6cb2909111d3e9183acae000e50453492db5e89..b7f329c3626dbfc59603487210cf1ec1668c3eaa 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",
@@ -24,28 +24,29 @@
 "replaced {new_name} with {old_name}" => "prepÃsanÃ½ {new_name} sÃºborom {old_name}",
 "undo" => "vrÃ¡tiÅ¥",
 "perform delete operation" => "vykonaÅ¥ zmazanie",
+"1 file uploading" => "1 sÃºbor sa posiela ",
+"files uploading" => "nahrÃ¡vanie sÃºborov",
 "'.' is an invalid file name." => "'.' je neplatnÃ© meno sÃºboru.",
 "File name cannot be empty." => "Meno sÃºboru nemÃ´Å¾e byÅ¥ prÃ¡zdne",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "NesprÃ¡vne meno, '\\', '/', '<', '>', ':', '\"', '|', '?' a '*' nie sÃº povolenÃ© hodnoty.",
 "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.",
-"Upload Error" => "Chyba odosielania",
-"Close" => "ZavrieÅ¥",
-"1 file uploading" => "1 sÃºbor sa posiela ",
-"{count} files uploading" => "{count} sÃºborov odosielanÃ½ch",
+"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",
-"Name" => "Meno",
+"Error" => "Chyba",
+"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",
+"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 +56,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 +64,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 6458a588aedfe2165b0836f1d837209c375fac64..6902d311ab76327b93b19abe746e635283e7df21 100644
--- a/apps/files/l10n/sl.php
+++ b/apps/files/l10n/sl.php
@@ -1,13 +1,19 @@
 <?php $TRANSLATIONS = array(
-"No file was uploaded. Unknown error" => "Nobena datoteka ni naloÅ¾ena. Neznana napaka.",
-"There is no error, the file uploaded with success" => "Datoteka je uspeÅ¡no naloÅ¾ena brez napak.",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "NaloÅ¾ena datoteka presega dovoljeno velikost. Le-ta je doloÄena z vrstico upload_max_filesize v datoteki php.ini:",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "NaloÅ¾ena datoteka presega velikost, ki jo doloÄa parameter MAX_FILE_SIZE v HTML obrazcu",
-"The uploaded file was only partially uploaded" => "Datoteka je le delno naloÅ¾ena",
-"No file was uploaded" => "Nobena datoteka ni bila naloÅ¾ena",
+"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",
+"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" => "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",
+"Share" => "Souporaba",
+"Delete permanently" => "IzbriÅ¡i dokonÄno",
 "Delete" => "IzbriÅ¡i",
 "Rename" => "Preimenuj",
 "Pending" => "V Äakanju ...",
@@ -15,17 +21,24 @@
 "replace" => "zamenjaj",
 "suggest name" => "predlagaj ime",
 "cancel" => "prekliÄi",
-"replaced {new_name} with {old_name}" => "zamenjano ime {new_name} z imenom {old_name}",
+"replaced {new_name} with {old_name}" => "preimenovano ime {new_name} z imenom {old_name}",
 "undo" => "razveljavi",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Neveljavno ime, znaki '\\', '/', '<', '>', ':', '\"', '|', '?' in '*' niso dovoljeni.",
-"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.",
-"Upload Error" => "Napaka med nalaganjem",
-"Close" => "Zapri",
+"perform delete operation" => "izvedi opravilo brisanja",
 "1 file uploading" => "PoÅ¡iljanje 1 datoteke",
-"{count} files uploading" => "nalagam {count} datotek",
+"files uploading" => "poteka poÅ¡iljanje datotek",
+"'.' is an invalid file name." => "'.' je neveljavno ime datoteke.",
+"File name cannot be empty." => "Ime datoteke ne sme biti prazno polje.",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Neveljavno ime, znaki '\\', '/', '<', '>', ':', '\"', '|', '?' in '*' niso dovoljeni.",
+"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Å¡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.",
-"URL cannot be empty." => "Naslov URL ne sme biti prazen.",
+"URL cannot be empty." => "Naslov URL ne sme biti prazna vrednost.",
+"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Neveljavno ime mape. Uporaba oznake \"Souporaba\" je zadrÅ¾an za sistem ownCloud.",
+"Error" => "Napaka",
 "Name" => "Ime",
 "Size" => "Velikost",
 "Modified" => "Spremenjeno",
@@ -33,25 +46,29 @@
 "{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",
 "max. possible: " => "najveÄ mogoÄe:",
-"Needed for multi-file and folder downloads." => "Uporabljeno za prenos veÄ datotek in map.",
+"Needed for multi-file and folder downloads." => "Uporabljeno za prejem veÄ datotek in map.",
 "Enable ZIP-download" => "OmogoÄi prejemanje arhivov ZIP",
-"0 is unlimited" => "0 je neskonÄno",
+"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",
+"Deleted files" => "Izbrisane datoteke",
 "Cancel upload" => "PrekliÄi poÅ¡iljanje",
-"Nothing in here. Upload something!" => "Tukaj ni niÄesar. NaloÅ¾ite kaj!",
+"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",
-"Upload too large" => "Nalaganje ni mogoÄe, ker je preveliko",
-"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Datoteke, ki jih Å¾elite naloÅ¾iti, presegajo najveÄjo dovoljeno velikost na tem streÅ¾niku.",
+"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 ...",
-"Current scanning" => "Trenutno poteka preuÄevanje"
+"Current scanning" => "Trenutno poteka preuÄevanje",
+"Upgrading filesystem cache..." => "Nadgrajevanje predpomnilnika datoteÄnega sistema ..."
 );
diff --git a/apps/files/l10n/sq.php b/apps/files/l10n/sq.php
new file mode 100644
index 0000000000000000000000000000000000000000..63c95f692e26842b4b33785d8b02e002a81a2ac5
--- /dev/null
+++ b/apps/files/l10n/sq.php
@@ -0,0 +1,74 @@
+<?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",
+"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:",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Skedari i ngarkuar tejkalon udhÃ«zimin MAX_FILE_SIZE tÃ« specifikuar nÃ« formularin HTML",
+"The uploaded file was only partially uploaded" => "Skedari i ngarkuar u ngarkua vetÃ«m pjesÃ«risht",
+"No file was uploaded" => "Nuk u ngarkua asnjÃ« skedar",
+"Missing a temporary folder" => "NjÃ« dosje e pÃ«rkohshme nuk u gjet",
+"Failed to write to disk" => "Ruajtja nÃ« disk dÃ«shtoi",
+"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",
+"Pending" => "Pezulluar",
+"{new_name} already exists" => "{new_name} ekziston",
+"replace" => "zÃ«vÃ«ndÃ«so",
+"suggest name" => "sugjero njÃ« emÃ«r",
+"cancel" => "anulo",
+"replaced {new_name} with {old_name}" => "U zÃ«vÃ«ndÃ«sua {new_name} me {old_name}",
+"undo" => "anulo",
+"perform delete operation" => "ekzekuto operacionin e eliminimit",
+"1 file uploading" => "Po ngarkohet 1 skedar",
+"files uploading" => "po ngarkoj skedarÃ«t",
+"'.' is an invalid file name." => "'.' Ã«shtÃ« emÃ«r i pavlefshÃ«m.",
+"File name cannot be empty." => "Emri i skedarit nuk mund tÃ« jetÃ« bosh.",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "EmÃ«r i pavlefshÃ«m, '\\', '/', '<', '>', ':', '\"', '|', '?' dhe '*' nuk lejohen.",
+"Your storage is full, files can not be updated or synced anymore!" => "HapÃ«sira juaj e memorizimit Ã«shtÃ« plot, nuk mund tÃ« ngarkoni apo sinkronizoni mÃ« skedarÃ«t.",
+"Your storage is almost full ({usedSpacePercent}%)" => "HapÃ«sira juaj e memorizimit Ã«shtÃ« gati plot ({usedSpacePercent}%)",
+"Your download is being prepared. This might take some time if the files are big." => "Shkarkimi juaj po pÃ«rgatitet. Mund tÃ« duhet pak kohÃ« nqse skedarÃ«t janÃ« tÃ« mÃ«dhenj.",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Nuk Ã«shtÃ« i mundur ngarkimi i skedarit tuaj sepse Ã«shtÃ« dosje ose ka dimension 0 byte",
+"Not enough space available" => "Nuk ka hapÃ«sirÃ« memorizimi e mjaftueshme",
+"Upload cancelled." => "Ngarkimi u anulua.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Ngarkimi i skedarit Ã«shtÃ« nÃ« vazhdim. Nqse ndÃ«rroni faqen tani ngarkimi do tÃ« anulohet.",
+"URL cannot be empty." => "URL-i nuk mund tÃ« jetÃ« bosh.",
+"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Emri i dosjes Ã«shtÃ« i pavlefshÃ«m. PÃ«rdorimi i \"Shared\" Ã«shtÃ« i rezervuar nga Owncloud-i.",
+"Error" => "Veprim i gabuar",
+"Name" => "Emri",
+"Size" => "Dimensioni",
+"Modified" => "Modifikuar",
+"1 folder" => "1 dosje",
+"{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",
+"max. possible: " => "maks. i mundur:",
+"Needed for multi-file and folder downloads." => "Duhet pÃ«r shkarkimin e dosjeve dhe tÃ« skedarÃ«ve",
+"Enable ZIP-download" => "Aktivizo shkarkimin e ZIP-eve",
+"0 is unlimited" => "0 Ã«shtÃ« i pakufizuar",
+"Maximum input size for ZIP files" => "Dimensioni maksimal i ngarkimit tÃ« skedarÃ«ve ZIP",
+"Save" => "Ruaj",
+"New" => "I ri",
+"Text file" => "Skedar teksti",
+"Folder" => "Dosje",
+"From link" => "Nga lidhja",
+"Deleted files" => "SkedarÃ« tÃ« eliminuar",
+"Cancel upload" => "Anulo ngarkimin",
+"You donâ€™t have write permissions here." => "Nuk keni tÃ« drejta pÃ«r tÃ« shkruar kÃ«tu.",
+"Nothing in here. Upload something!" => "KÃ«tu nuk ka asgjÃ«. Ngarkoni diÃ§ka!",
+"Download" => "Shkarko",
+"Unshare" => "Hiq ndarjen",
+"Upload too large" => "Ngarkimi Ã«shtÃ« shumÃ« i madh",
+"The files you are trying to upload exceed the maximum size for file uploads on this server." => "SkedarÃ«t qÃ« doni tÃ« ngarkoni tejkalojnÃ« dimensionet maksimale pÃ«r ngarkimet nÃ« kÃ«tÃ« server.",
+"Files are being scanned, please wait." => "SkedarÃ«t po analizohen, ju lutemi pritni.",
+"Current scanning" => "Analizimi aktual",
+"Upgrading filesystem cache..." => "Po pÃ«rmirÃ«soj memorjen e filesystem-it..."
+);
diff --git a/apps/files/l10n/sr.php b/apps/files/l10n/sr.php
index fe71ee9c90d1b05bcd9712f9b5ca340dd0157d43..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,21 +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 Ð±Ð°Ñ˜Ñ‚Ð¾Ð²Ð°",
-"Upload Error" => "Ð“Ñ€ÐµÑˆÐºÐ° Ð¿Ñ€Ð¸ Ð¾Ñ‚Ð¿Ñ€ÐµÐ¼Ð°ÑšÑƒ",
-"Close" => "Ð—Ð°Ñ‚Ð²Ð¾Ñ€Ð¸",
-"1 file uploading" => "ÐžÑ‚Ð¿Ñ€ÐµÐ¼Ð°Ð¼ 1 Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÑƒ",
-"{count} files uploading" => "ÐžÑ‚Ð¿Ñ€ÐµÐ¼Ð°Ð¼ {count} Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐµ/Ð°",
+"Not enough space available" => "ÐÐµÐ¼Ð° Ð´Ð¾Ð²Ð¾Ñ™Ð½Ð¾ Ð¿Ñ€Ð¾ÑÑ‚Ð¾Ñ€Ð°",
 "Upload cancelled." => "ÐžÑ‚Ð¿Ñ€ÐµÐ¼Ð°ÑšÐµ Ñ˜Ðµ Ð¿Ñ€ÐµÐºÐ¸Ð½ÑƒÑ‚Ð¾.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "ÐžÑ‚Ð¿Ñ€ÐµÐ¼Ð°ÑšÐµ Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐµ Ñ˜Ðµ Ñƒ Ñ‚Ð¾ÐºÑƒ. ÐÐºÐ¾ ÑÐ°Ð´Ð° Ð½Ð°Ð¿ÑƒÑÑ‚Ð¸Ñ‚Ðµ ÑÑ‚Ñ€Ð°Ð½Ð¸Ñ†Ñƒ, Ð¿Ñ€ÐµÐºÐ¸Ð½ÑƒÑ›ÐµÑ‚Ðµ Ð¾Ñ‚Ð¿Ñ€ÐµÐ¼Ð°ÑšÐµ.",
-"Name" => "ÐÐ°Ð·Ð¸Ð²",
+"URL cannot be empty." => "ÐÐ´Ñ€ÐµÑÐ° Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð±Ð¸Ñ‚Ð¸ Ð¿Ñ€Ð°Ð·Ð½Ð°.",
+"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "ÐÐµÐ¸ÑÐ¿Ñ€Ð°Ð²Ð½Ð¾ Ð¸Ð¼Ðµ Ñ„Ð°ÑÑ†Ð¸ÐºÐ»Ðµ. Ð¤Ð°ÑÑ†Ð¸ÐºÐ»Ð° â€žSharedâ€œ Ñ˜Ðµ Ñ€ÐµÐ·ÐµÑ€Ð²Ð¸ÑÐ°Ð½Ð° Ð·Ð° ownCloud.",
+"Error" => "Ð“Ñ€ÐµÑˆÐºÐ°",
+"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" => "ÐÐ°Ñ˜Ð²ÐµÑ›Ð° Ð²ÐµÐ»Ð¸Ñ‡Ð¸Ð½Ð° Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐµ",
@@ -44,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/sr@latin.php b/apps/files/l10n/sr@latin.php
index 0fda24532dca3d034d3b4cc57968d59ddd6cb9a0..fb08bca2cae91733e2c1501ed3bace48110858ec 100644
--- a/apps/files/l10n/sr@latin.php
+++ b/apps/files/l10n/sr@latin.php
@@ -6,7 +6,6 @@
 "Missing a temporary folder" => "Nedostaje privremena fascikla",
 "Files" => "Fajlovi",
 "Delete" => "ObriÅ¡i",
-"Close" => "Zatvori",
 "Name" => "Ime",
 "Size" => "VeliÄina",
 "Modified" => "Zadnja izmena",
diff --git a/apps/files/l10n/sv.php b/apps/files/l10n/sv.php
index ca9610a33c7766bb746df9c14008180b134b41fd..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",
@@ -24,21 +24,21 @@
 "replaced {new_name} with {old_name}" => "ersatt {new_name} med {old_name}",
 "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.",
-"Upload Error" => "Uppladdningsfel",
-"Close" => "StÃ¤ng",
-"1 file uploading" => "1 filuppladdning",
-"{count} files uploading" => "{count} filer laddas upp",
+"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.",
 "URL cannot be empty." => "URL kan inte vara tom.",
 "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Ogiltigt mappnamn. AnvÃ¤ndande av 'Shared' Ã¤r reserverat av ownCloud",
+"Error" => "Fel",
 "Name" => "Namn",
 "Size" => "Storlek",
 "Modified" => "Ã„ndrad",
@@ -46,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 304453f1290b87b5b30e3df562bf0c77488625ef..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} à®à®±à¯à®•à®©à®µà¯‡ à®‰à®³à¯à®³à®¤à¯",
@@ -16,15 +17,13 @@
 "cancel" => "à®‡à®°à®¤à¯à®¤à¯ à®šà¯†à®¯à¯à®•",
 "replaced {new_name} with {old_name}" => "{new_name} à®†à®©à®¤à¯ {old_name} à®‡à®©à®¾à®²à¯ à®®à®¾à®±à¯à®±à®ªà¯à®ªà®Ÿà¯à®Ÿà®¤à¯",
 "undo" => "à®®à¯à®©à¯ à®šà¯†à®¯à®²à¯ à®¨à¯€à®•à¯à®•à®®à¯ ",
+"1 file uploading" => "1 à®•à¯‹à®ªà¯à®ªà¯ à®ªà®¤à®¿à®µà¯‡à®±à¯à®±à®ªà¯à®ªà®Ÿà¯à®•à®¿à®±à®¤à¯",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "à®šà¯†à®²à¯à®²à¯à®ªà®Ÿà®¿à®¯à®±à¯à®± à®ªà¯†à®¯à®°à¯,'\\', '/', '<', '>', ':', '\"', '|', '?' à®®à®±à¯à®±à¯à®®à¯ '*' à®†à®•à®¿à®¯à®© à®…à®©à¯à®®à®¤à®¿à®•à¯à®•à®ªà¯à®ªà®Ÿà®®à®¾à®Ÿà¯à®Ÿà®¾à®¤à¯.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "à®…à®Ÿà¯ˆà®µà¯ à®…à®²à¯à®²à®¤à¯ 0 bytes à® à®•à¯Šà®£à¯à®Ÿà¯à®³à¯à®³à®¤à®¾à®²à¯ à®‰à®™à¯à®•à®³à¯à®Ÿà¯ˆà®¯ à®•à¯‡à®¾à®ªà¯à®ªà¯ˆ à®ªà®¤à®¿à®µà¯‡à®±à¯à®± à®®à¯à®Ÿà®¿à®¯à®µà®¿à®²à¯à®²à¯ˆ",
-"Upload Error" => "à®ªà®¤à®¿à®µà¯‡à®±à¯à®±à®²à¯ à®µà®´à¯",
-"Close" => "à®®à¯‚à®Ÿà¯à®•",
-"1 file uploading" => "1 à®•à¯‹à®ªà¯à®ªà¯ à®ªà®¤à®¿à®µà¯‡à®±à¯à®±à®ªà¯à®ªà®Ÿà¯à®•à®¿à®±à®¤à¯",
-"{count} files uploading" => "{à®Žà®£à¯à®£à®¿à®•à¯à®•à¯ˆ} à®•à¯‹à®ªà¯à®ªà¯à®•à®³à¯ à®ªà®¤à®¿à®µà¯‡à®±à¯à®±à®ªà¯à®ªà®Ÿà¯à®•à®¿à®©à¯à®±à®¤à¯",
 "Upload cancelled." => "à®ªà®¤à®¿à®µà¯‡à®±à¯à®±à®²à¯ à®‡à®°à®¤à¯à®¤à¯ à®šà¯†à®¯à¯à®¯à®ªà¯à®ªà®Ÿà¯à®Ÿà¯à®³à¯à®³à®¤à¯",
 "File upload is in progress. Leaving the page now will cancel the upload." => "à®•à¯‹à®ªà¯à®ªà¯ à®ªà®¤à®¿à®µà¯‡à®±à¯à®±à®®à¯ à®šà¯†à®¯à®²à¯à®ªà®¾à®Ÿà¯à®Ÿà®¿à®²à¯ à®‰à®³à¯à®³à®¤à¯. à®‡à®¨à¯à®¤à®ªà¯ à®ªà®•à¯à®•à®¤à¯à®¤à®¿à®²à®¿à®°à¯à®¨à¯à®¤à¯ à®µà¯†à®±à®¿à®¯à¯‡à®±à¯à®µà®¤à®¾à®©à®¤à¯ à®ªà®¤à®¿à®µà¯‡à®±à¯à®±à®²à¯ˆ à®‡à®°à®¤à¯à®¤à¯ à®šà¯†à®¯à¯à®¯à¯à®®à¯.",
 "URL cannot be empty." => "URL  à®µà¯†à®±à¯à®®à¯ˆà®¯à®¾à®• à®‡à®°à¯à®•à¯à®•à®®à¯à®Ÿà®¿à®¯à®¾à®¤à¯.",
+"Error" => "à®µà®´à¯",
 "Name" => "à®ªà¯†à®¯à®°à¯",
 "Size" => "à®…à®³à®µà¯",
 "Modified" => "à®®à®¾à®±à¯à®±à®ªà¯à®ªà®Ÿà¯à®Ÿà®¤à¯",
@@ -40,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/te.php b/apps/files/l10n/te.php
new file mode 100644
index 0000000000000000000000000000000000000000..b280200d30a37f9eb1fb3b3f37689962dc46880e
--- /dev/null
+++ b/apps/files/l10n/te.php
@@ -0,0 +1,9 @@
+<?php $TRANSLATIONS = array(
+"Delete permanently" => "à°¶à°¾à°¶à±à°µà°¤à°‚à°—à°¾ à°¤à±Šà°²à°—à°¿à°‚à°šà±",
+"Delete" => "à°¤à±Šà°²à°—à°¿à°‚à°šà±",
+"cancel" => "à°°à°¦à±à°¦à±à°šà±‡à°¯à°¿",
+"Error" => "à°ªà±Šà°°à°ªà°¾à°Ÿà±",
+"Name" => "à°ªà±‡à°°à±",
+"Size" => "à°ªà°°à°¿à°®à°¾à°£à°‚",
+"Save" => "à°à°¦à±à°°à°ªà°°à°šà±"
+);
diff --git a/apps/files/l10n/th_TH.php b/apps/files/l10n/th_TH.php
index 2353501b4782dfe8ba4649a43ef9dabf282ea3e4..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" => "à¸à¸¢à¸¹à¹ˆà¸£à¸°à¸«à¸§à¹ˆà¸²à¸‡à¸”à¸³à¹€à¸™à¸´à¸™à¸à¸²à¸£",
@@ -23,28 +23,29 @@
 "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 à¹„à¸šà¸•à¹Œ",
-"Upload Error" => "à¹€à¸à¸´à¸”à¸‚à¹‰à¸à¸œà¸´à¸”à¸žà¸¥à¸²à¸”à¹ƒà¸™à¸à¸²à¸£à¸à¸±à¸žà¹‚à¸«à¸¥à¸”",
-"Close" => "à¸›à¸´à¸”",
-"1 file uploading" => "à¸à¸³à¸¥à¸±à¸‡à¸à¸±à¸žà¹‚à¸«à¸¥à¸”à¹„à¸Ÿà¸¥à¹Œ 1 à¹„à¸Ÿà¸¥à¹Œ",
-"{count} files uploading" => "à¸à¸³à¸¥à¸±à¸‡à¸à¸±à¸žà¹‚à¸«à¸¥à¸” {count} à¹„à¸Ÿà¸¥à¹Œ",
+"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." => "URL à¹„à¸¡à¹ˆà¸ªà¸²à¸¡à¸²à¸£à¸–à¹€à¸§à¹‰à¸™à¸§à¹ˆà¸²à¸‡à¹„à¸”à¹‰",
 "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "à¸Šà¸·à¹ˆà¸à¹‚à¸Ÿà¸¥à¹€à¸”à¸à¸£à¹Œà¹„à¸¡à¹ˆà¸–à¸¹à¸à¸•à¹‰à¸à¸‡ à¸à¸²à¸£à¹ƒà¸Šà¹‰à¸‡à¸²à¸™ 'à¹à¸Šà¸£à¹Œ' à¸ªà¸‡à¸§à¸™à¹„à¸§à¹‰à¸ªà¸³à¸«à¸£à¸±à¸š Owncloud à¹€à¸—à¹ˆà¸²à¸™à¸±à¹‰à¸™",
+"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" => "à¸‚à¸™à¸²à¸”à¹„à¸Ÿà¸¥à¹Œà¸ªà¸¹à¸‡à¸ªà¸¸à¸”à¸—à¸µà¹ˆà¸à¸±à¸žà¹‚à¸«à¸¥à¸”à¹„à¸”à¹‰",
@@ -61,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 bcbef8daf3581dfd47cfe09cc87f59c863dcc9df..fd5c6bc6f09faccf190e7c14b25c215aaeb303f5 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.",
@@ -24,6 +24,8 @@
 "replaced {new_name} with {old_name}" => "{new_name} ismi {old_name} ile deÄŸiÅŸtirildi",
 "undo" => "geri al",
 "perform delete operation" => "Silme iÅŸlemini gerÃ§ekleÅŸtir",
+"1 file uploading" => "1 dosya yÃ¼klendi",
+"files uploading" => "Dosyalar yÃ¼kleniyor",
 "'.' is an invalid file name." => "'.' geÃ§ersiz dosya adÄ±.",
 "File name cannot be empty." => "Dosya adÄ± boÅŸ olamaz.",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "GeÃ§ersiz isim, '\\', '/', '<', '>', ':', '\"', '|', '?' ve '*' karakterlerine izin verilmemektedir.",
@@ -31,21 +33,20 @@
 "Your storage is almost full ({usedSpacePercent}%)" => "Depolama alanÄ±nÄ±z neredeyse dolu ({usedSpacePercent}%)",
 "Your download is being prepared. This might take some time if the files are big." => "Ä°ndirmeniz hazÄ±rlanÄ±yor. Dosya bÃ¼yÃ¼k ise biraz zaman alabilir.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "DosyanÄ±zÄ±n boyutu 0 byte olduÄŸundan veya bir dizin olduÄŸundan yÃ¼klenemedi",
-"Upload Error" => "YÃ¼kleme hatasÄ±",
-"Close" => "Kapat",
-"1 file uploading" => "1 dosya yÃ¼klendi",
-"{count} files uploading" => "{count} dosya yÃ¼kleniyor",
+"Not enough space available" => "Yeterli disk alanÄ± yok",
 "Upload cancelled." => "YÃ¼kleme iptal edildi.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Dosya yÃ¼kleme iÅŸlemi sÃ¼rÃ¼yor. Åžimdi sayfadan ayrÄ±lÄ±rsanÄ±z iÅŸleminiz iptal olur.",
 "URL cannot be empty." => "URL boÅŸ olamaz.",
 "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "GeÃ§ersiz dizin adÄ±. Shared isminin kullanÄ±mÄ± Owncloud tarafÄ±ndan rezerver edilmiÅŸtir.",
-"Name" => "Ad",
+"Error" => "Hata",
+"Name" => "Ä°sim",
 "Size" => "Boyut",
 "Modified" => "DeÄŸiÅŸtirilme",
 "1 folder" => "1 dizin",
 "{count} folders" => "{count} dizin",
 "1 file" => "1 dosya",
 "{count} files" => "{count} dosya",
+"Unable to rename file" => "Dosya adÄ± deÄŸiÅŸtirilemedi",
 "Upload" => "YÃ¼kle",
 "File handling" => "Dosya taÅŸÄ±ma",
 "Maximum upload size" => "Maksimum yÃ¼kleme boyutu",
@@ -61,10 +62,11 @@
 "From link" => "BaÄŸlantÄ±dan",
 "Deleted files" => "Dosyalar silindi",
 "Cancel upload" => "YÃ¼klemeyi iptal et",
+"You donâ€™t have write permissions here." => "Buraya eriÅŸim hakkÄ±nÄ±z yok.",
 "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 f5e161996c0e2e993ba98a802d348f50e4415a24..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" => "ÐŸÐµÑ€ÐµÐ¹Ð¼ÐµÐ½ÑƒÐ²Ð°Ñ‚Ð¸",
@@ -24,6 +24,8 @@
 "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." => "ÐÐµÐ²Ñ–Ñ€Ð½Ðµ Ñ–Ð¼'Ñ, '\\', '/', '<', '>', ':', '\"', '|', '?' Ñ‚Ð° '*' Ð½Ðµ Ð´Ð¾Ð·Ð²Ð¾Ð»ÐµÐ½Ñ–.",
@@ -31,14 +33,12 @@
 "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 Ð±Ð°Ð¹Ñ‚",
-"Upload Error" => "ÐŸÐ¾Ð¼Ð¸Ð»ÐºÐ° Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ",
-"Close" => "Ð—Ð°ÐºÑ€Ð¸Ñ‚Ð¸",
-"1 file uploading" => "1 Ñ„Ð°Ð¹Ð» Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÑƒÑ”Ñ‚ÑŒÑÑ",
-"{count} files uploading" => "{count} Ñ„Ð°Ð¹Ð»Ñ–Ð² Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÑƒÑ”Ñ‚ÑŒÑÑ",
+"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" => "ÐÐµÐ²Ñ–Ñ€Ð½Ðµ Ñ–Ð¼'Ñ Ñ‚ÐµÐºÐ¸. Ð’Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð°Ð½Ð½Ñ \"Shared\" Ð·Ð°Ñ€ÐµÐ·ÐµÑ€Ð²Ð¾Ð²Ð°Ð½Ð¾ Owncloud",
+"Error" => "ÐŸÐ¾Ð¼Ð¸Ð»ÐºÐ°",
 "Name" => "Ð†Ð¼'Ñ",
 "Size" => "Ð Ð¾Ð·Ð¼Ñ–Ñ€",
 "Modified" => "Ð—Ð¼Ñ–Ð½ÐµÐ½Ð¾",
@@ -46,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: " => "Ð¼Ð°ÐºÑ.Ð¼Ð¾Ð¶Ð»Ð¸Ð²Ðµ:",
@@ -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/ur_PK.php b/apps/files/l10n/ur_PK.php
new file mode 100644
index 0000000000000000000000000000000000000000..aa87eeda385efc7fd0a155e28808004f47a2b8c8
--- /dev/null
+++ b/apps/files/l10n/ur_PK.php
@@ -0,0 +1,4 @@
+<?php $TRANSLATIONS = array(
+"Error" => "Ø§ÛŒØ±Ø±",
+"Unshare" => "Ø´Ø¦ÛŒØ±Ù†Ú¯ Ø®ØªÙ… Ú©Ø±ÛŒÚº"
+);
diff --git a/apps/files/l10n/vi.php b/apps/files/l10n/vi.php
index affca6c12f86b9109dcd20781ea2aeb209598fec..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 Ã½",
@@ -24,21 +24,21 @@
 "replaced {new_name} with {old_name}" => "Ä‘Ã£ thay tháº¿ {new_name} báº±ng {old_name}",
 "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",
-"Upload Error" => "Táº£i lÃªn lá»—i",
-"Close" => "ÄÃ³ng",
-"1 file uploading" => "1 tá»‡p tin Ä‘ang Ä‘Æ°á»£c táº£i lÃªn",
-"{count} files uploading" => "{count} táºp tin Ä‘ang táº£i lÃªn",
+"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.",
 "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Invalid folder name. Usage of 'Shared' is reserved by Owncloud",
+"Error" => "Lá»—i",
 "Name" => "TÃªn",
 "Size" => "KÃch cá»¡",
 "Modified" => "Thay Ä‘á»•i",
@@ -46,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 ",
@@ -61,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 fa75627f141da59894425a31de973b64b97cde34..0d87975918e4a0705a5871c94b61a79f3dec4246 100644
--- a/apps/files/l10n/zh_CN.GB2312.php
+++ b/apps/files/l10n/zh_CN.GB2312.php
@@ -1,30 +1,30 @@
 <?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" => "æŽ¨èåç§°",
 "cancel" => "å–æ¶ˆ",
 "replaced {new_name} with {old_name}" => "å·²ç”¨ {old_name} æ›¿æ¢ {new_name}",
 "undo" => "æ’¤é”€",
-"Unable to upload your file as it is a directory or has 0 bytes" => "ä¸èƒ½ä¸Šä¼ ä½ æŒ‡å®šçš„æ–‡ä»¶,å¯èƒ½å› ä¸ºå®ƒæ˜¯ä¸ªæ–‡ä»¶å¤¹æˆ–è€…å¤§å°ä¸º0",
-"Upload Error" => "ä¸Šä¼ é”™è¯¯",
-"Close" => "å…³é—",
 "1 file uploading" => "1 ä¸ªæ–‡ä»¶æ£åœ¨ä¸Šä¼ ",
-"{count} files uploading" => "{count} ä¸ªæ–‡ä»¶æ£åœ¨ä¸Šä¼ ",
+"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." => "ç½‘å€ä¸èƒ½ä¸ºç©ºã€‚",
-"Name" => "åå—",
+"Error" => "å‡ºé”™",
+"Name" => "åç§°",
 "Size" => "å¤§å°",
 "Modified" => "ä¿®æ”¹æ—¥æœŸ",
 "1 folder" => "1 ä¸ªæ–‡ä»¶å¤¹",
@@ -47,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 88fdc537c3aab28ae731fe0bcc9c7bd02f3651f5..c883670e8485f22440438ae3580e36512d4b231c 100644
--- a/apps/files/l10n/zh_CN.php
+++ b/apps/files/l10n/zh_CN.php
@@ -1,39 +1,44 @@
 <?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" => "å»ºè®®åç§°",
 "cancel" => "å–æ¶ˆ",
 "replaced {new_name} with {old_name}" => "å·²å°† {old_name}æ›¿æ¢æˆ {new_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 å—èŠ‚",
-"Upload Error" => "ä¸Šä¼ é”™è¯¯",
-"Close" => "å…³é—",
-"1 file uploading" => "1ä¸ªæ–‡ä»¶ä¸Šä¼ ä¸",
-"{count} files uploading" => "{count} ä¸ªæ–‡ä»¶ä¸Šä¼ ä¸",
+"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." => "æ–‡ä»¶æ£åœ¨ä¸Šä¼ ä¸ã€‚çŽ°åœ¨ç¦»å¼€æ¤é¡µä¼šå¯¼è‡´ä¸Šä¼ åŠ¨ä½œè¢«å–æ¶ˆã€‚",
 "URL cannot be empty." => "URLä¸èƒ½ä¸ºç©º",
 "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "æ— æ•ˆæ–‡ä»¶å¤¹åã€‚'å…±äº«' æ˜¯ Owncloud é¢„ç•™çš„æ–‡ä»¶å¤¹åã€‚",
+"Error" => "é”™è¯¯",
 "Name" => "åç§°",
 "Size" => "å¤§å°",
 "Modified" => "ä¿®æ”¹æ—¥æœŸ",
@@ -41,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" => "æœ€å¤§ä¸Šä¼ å¤§å°",
@@ -54,12 +61,15 @@
 "Text file" => "æ–‡æœ¬æ–‡ä»¶",
 "Folder" => "æ–‡ä»¶å¤¹",
 "From link" => "æ¥è‡ªé“¾æŽ¥",
+"Deleted files" => "åˆ é™¤æ–‡ä»¶",
 "Cancel upload" => "å–æ¶ˆä¸Šä¼ ",
+"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." => "æ–‡ä»¶æ£åœ¨è¢«æ‰«æï¼Œè¯·ç¨å€™ã€‚",
-"Current scanning" => "å½“å‰æ‰«æ"
+"Current scanning" => "å½“å‰æ‰«æ",
+"Upgrading filesystem cache..." => "æ£åœ¨æ›´æ–°æ–‡ä»¶ç³»ç»Ÿç¼“å˜..."
 );
diff --git a/apps/files/l10n/zh_HK.php b/apps/files/l10n/zh_HK.php
new file mode 100644
index 0000000000000000000000000000000000000000..caafc74b859dadf611c3e2f7781d9eefa424742b
--- /dev/null
+++ b/apps/files/l10n/zh_HK.php
@@ -0,0 +1,12 @@
+<?php $TRANSLATIONS = array(
+"Files" => "æ–‡ä»¶",
+"Share" => "åˆ†äº«",
+"Delete" => "åˆªé™¤",
+"Error" => "éŒ¯èª¤",
+"Name" => "åç¨±",
+"{count} folders" => "{}æ–‡ä»¶å¤¾",
+"Upload" => "ä¸Šå‚³",
+"Save" => "å„²å˜",
+"Download" => "ä¸‹è¼‰",
+"Unshare" => "å–æ¶ˆåˆ†äº«"
+);
diff --git a/apps/files/l10n/zh_TW.php b/apps/files/l10n/zh_TW.php
index 793fedac41260ef5630419250e01b2bc6bad9c03..600048a321c41172531177aa52360b9e1d11957e 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" => "é‡æ–°å‘½å",
@@ -24,6 +24,8 @@
 "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." => "æª”åä¸åˆæ³•ï¼Œä¸å…è¨± '\\', '/', '<', '>', ':', '\"', '|', '?' å’Œ '*' ã€‚",
@@ -31,14 +33,12 @@
 "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",
-"Upload Error" => "ä¸Šå‚³ç™¼ç”ŸéŒ¯èª¤",
-"Close" => "é—œé–‰",
-"1 file uploading" => "1 å€‹æª”æ¡ˆæ£åœ¨ä¸Šå‚³",
-"{count} files uploading" => "{count} å€‹æª”æ¡ˆæ£åœ¨ä¸Šå‚³",
-"Upload cancelled." => "ä¸Šå‚³å–æ¶ˆ",
+"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" => "ç„¡æ•ˆçš„è³‡æ–™å¤¾åç¨±ï¼Œ'Shared' çš„ä½¿ç”¨è¢« Owncloud ä¿ç•™",
+"URL cannot be empty." => "URL ä¸èƒ½ç‚ºç©ºç™½ã€‚",
+"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "ç„¡æ•ˆçš„è³‡æ–™å¤¾åç¨±ï¼Œ'Shared' çš„ä½¿ç”¨è¢« ownCloud ä¿ç•™",
+"Error" => "éŒ¯èª¤",
 "Name" => "åç¨±",
 "Size" => "å¤§å°",
 "Modified" => "ä¿®æ”¹",
@@ -46,6 +46,7 @@
 "{count} folders" => "{count} å€‹è³‡æ–™å¤¾",
 "1 file" => "1 å€‹æª”æ¡ˆ",
 "{count} files" => "{count} å€‹æª”æ¡ˆ",
+"Unable to rename file" => "ç„¡æ³•é‡æ–°å‘½åæª”æ¡ˆ",
 "Upload" => "ä¸Šå‚³",
 "File handling" => "æª”æ¡ˆè™•ç†",
 "Maximum upload size" => "æœ€å¤§ä¸Šå‚³æª”æ¡ˆå¤§å°",
@@ -59,13 +60,15 @@
 "Text file" => "æ–‡å—æª”",
 "Folder" => "è³‡æ–™å¤¾",
 "From link" => "å¾žé€£çµ",
+"Deleted files" => "å·²åˆªé™¤çš„æª”æ¡ˆ",
 "Cancel upload" => "å–æ¶ˆä¸Šå‚³",
-"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/lib/capabilities.php b/apps/files/lib/capabilities.php
new file mode 100644
index 0000000000000000000000000000000000000000..90a5e2f4eb900a8650b9819c02c43bcdf6c521bf
--- /dev/null
+++ b/apps/files/lib/capabilities.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright (c) 2013 Tom Needham <tom@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+ 
+namespace OCA\Files; 
+
+class Capabilities {
+	
+	public static function getCapabilities() {
+		return new \OC_OCS_Result(array(
+			'capabilities' => array(
+				'files' => array(
+					'bigfilechunking' => true,
+					'undelete' => true,
+					),
+				),
+			));
+	}
+	
+}
\ No newline at end of file
diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php
index a53df4e2d3e808af55e8d55136e56868cf627342..b576253f4f0f324cd83d2a8602ed4c0e229bd1e8 100644
--- a/apps/files/templates/index.php
+++ b/apps/files/templates/index.php
@@ -23,8 +23,10 @@
 					  method="post"
 					  enctype="multipart/form-data"
 					  target="file_upload_target_1">
+					<?php if($_['uploadMaxFilesize'] >= 0):?>
 					<input type="hidden" name="MAX_FILE_SIZE" id="max_upload"
 						   value="<?php p($_['uploadMaxFilesize']) ?>">
+					<?php endif;?>
 					<!-- Send the requesttoken, this is needed for older IE versions
 						 because they don't send the CSRF token via HTTP header in this case -->
 					<input type="hidden" name="requesttoken" value="<?php p($_['requesttoken']) ?>" id="requesttoken">
@@ -32,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'] ): ?>
@@ -44,13 +46,12 @@
 				<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>
 		<div id="file_action_panel"></div>
 	<?php else:?>
-		<div class="crumb last"><?php p($l->t('You donâ€™t have write permissions here.'))?></div>
+		<div class="actions"><input type="button" disabled value="<?php p($l->t('You donâ€™t have write permissions here.'))?>"></div>
 		<input type="hidden" name="dir" value="<?php p($_['dir']) ?>" id="dir">
 	<?php endif;?>
 	<input type="hidden" name="permissions" value="<?php p($_['permissions']); ?>" id="permissions">
@@ -82,13 +83,13 @@
 				<?php if ($_['permissions'] & OCP\PERMISSION_DELETE): ?>
 <!-- 					NOTE: Temporary fix to allow unsharing of files in root of Shared folder -->
 					<?php if ($_['dir'] == '/Shared'): ?>
-						<span class="selectedActions"><a href="" class="delete">
+						<span class="selectedActions"><a href="" class="delete-selected">
 							<?php p($l->t('Unshare'))?>
 							<img class="svg" alt="<?php p($l->t('Unshare'))?>"
 								 src="<?php print_unescaped(OCP\image_path("core", "actions/delete.svg")); ?>" />
 						</a></span>
 					<?php else: ?>
-						<span class="selectedActions"><a href="" class="delete">
+						<span class="selectedActions"><a href="" class="delete-selected">
 							<?php p($l->t('Delete'))?>
 							<img class="svg" alt="<?php p($l->t('Delete'))?>"
 								 src="<?php print_unescaped(OCP\image_path("core", "actions/delete.svg")); ?>" />
diff --git a/apps/files/templates/part.list.php b/apps/files/templates/part.list.php
index 59267690e66585b8dd88637436dff55fc4619fa3..1719d25e660103893c20d07fb3cf85e8fb4053e8 100644
--- a/apps/files/templates/part.list.php
+++ b/apps/files/templates/part.list.php
@@ -9,9 +9,9 @@
 	// the older the file, the brighter the shade of grey; days*14
 	$relative_date_color = round((time()-$file['mtime'])/60/60/24*14);
 	if($relative_date_color>200) $relative_date_color = 200;
-	$name = str_replace('+', '%20', urlencode($file['name']));
+	$name = rawurlencode($file['name']);
 	$name = str_replace('%2F', '/', $name);
-	$directory = str_replace('+', '%20', urlencode($file['directory']));
+	$directory = rawurlencode($file['directory']);
 	$directory = str_replace('%2F', '/', $directory); ?>
 	<tr data-id="<?php p($file['fileid']); ?>"
 		data-file="<?php p($name);?>"
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/appinfo/app.php b/apps/files_encryption/appinfo/app.php
index f7b2140b580afa15b02923ec1f3ac0d8f91b5e5e..bf16fec3aea0d60678d0a26d8121c9cbd0413868 100644
--- a/apps/files_encryption/appinfo/app.php
+++ b/apps/files_encryption/appinfo/app.php
@@ -7,6 +7,7 @@ OC::$CLASSPATH['OCA\Encryption\Keymanager'] = 'files_encryption/lib/keymanager.p
 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_FileProxy::register( new OCA\Encryption\Proxy() );
 
diff --git a/apps/files_encryption/appinfo/routes.php b/apps/files_encryption/appinfo/routes.php
new file mode 100644
index 0000000000000000000000000000000000000000..ab83432a4b2d5a84188c862dbdc61a1faf30ea9a
--- /dev/null
+++ b/apps/files_encryption/appinfo/routes.php
@@ -0,0 +1,9 @@
+<?php
+/**
+ * Copyright (c) 2013, Tom Needham <tom@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or later.
+ * See the COPYING-README file.
+ */
+
+// Register with the capabilities API
+OC_API::register('get', '/cloud/capabilities', array('OCA\Encryption\Capabilities', 'getCapabilities'), 'files_encryption', OC_API::USER_AUTH);
\ No newline at end of file
diff --git a/apps/files_encryption/l10n/ar.php b/apps/files_encryption/l10n/ar.php
index 375fbd9a9a640b439cd4c9d12a5c82bf554a6431..c8a475afd67e29cbb2392e212433572fea889101 100644
--- a/apps/files_encryption/l10n/ar.php
+++ b/apps/files_encryption/l10n/ar.php
@@ -1,4 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Encryption" => "Ø§Ù„ØªØ´ÙÙŠØ±",
+"File encryption is enabled." => "ØªØ´ÙÙŠØ± Ø§Ù„Ù…Ù„ÙØ§Øª ÙØ¹Ø§Ù„.",
+"The following file types will not be encrypted:" => "Ø§Ù„Ù…Ù„ÙØ§Øª Ø§Ù„Ø§ØªÙŠØ© Ù„Ù† ÙŠØªÙ… ØªØ´ÙÙŠØ±Ù‡Ø§:",
+"Exclude the following file types from encryption:" => "Ø¥Ø³ØªØ«Ù†Ø§Ø¡ Ø£Ù†ÙˆØ§Ø¹ Ø§Ù„Ù…Ù„ÙØ§Øª Ø§Ù„Ø§ØªÙŠØ© Ù…Ù† Ø§Ù„ØªØ´ÙÙŠØ±: ",
 "None" => "Ù„Ø§ Ø´ÙŠØ¡"
 );
diff --git a/apps/files_encryption/l10n/ca.php b/apps/files_encryption/l10n/ca.php
index 0c661353a776ce7644bc8ad3e5c954e2becc28ad..2d59a306d33bfcdd090f16dcac2eae1a6858dd5d 100644
--- a/apps/files_encryption/l10n/ca.php
+++ b/apps/files_encryption/l10n/ca.php
@@ -1,7 +1,7 @@
 <?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:",
+"Encryption" => "Xifrat",
+"File encryption is enabled." => "El xifrat de fitxers estÃ  activat.",
+"The following file types will not be encrypted:" => "Els tipus de fitxers segÃ¼ents no es xifraran:",
+"Exclude the following file types from encryption:" => "Exclou els tipus de fitxers segÃ¼ents del xifratge:",
 "None" => "Cap"
 );
diff --git a/apps/files_encryption/l10n/cy_GB.php b/apps/files_encryption/l10n/cy_GB.php
new file mode 100644
index 0000000000000000000000000000000000000000..523b5dd73dff8cd97306b67eaaf33632eeb85531
--- /dev/null
+++ b/apps/files_encryption/l10n/cy_GB.php
@@ -0,0 +1,7 @@
+<?php $TRANSLATIONS = array(
+"Encryption" => "Amgryptiad",
+"File encryption is enabled." => "Galluogwyd amgryptio ffeiliau.",
+"The following file types will not be encrypted:" => "Ni fydd ffeiliau o'r math yma'n cael eu hamgryptio:",
+"Exclude the following file types from encryption:" => "Eithrio'r mathau canlynol o ffeiliau rhag cael eu hamgryptio:",
+"None" => "Dim"
+);
diff --git a/apps/files_encryption/l10n/de.php b/apps/files_encryption/l10n/de.php
index cdcd8a40b23c87ae5c13660fd17539a8885b399e..bcf0ca5ad63917d3a73fee9de9bc7e927d4fa8fe 100644
--- a/apps/files_encryption/l10n/de.php
+++ b/apps/files_encryption/l10n/de.php
@@ -3,5 +3,5 @@
 "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"
+"None" => "Nichts"
 );
diff --git a/apps/files_encryption/l10n/de_DE.php b/apps/files_encryption/l10n/de_DE.php
index 4f08b98eb29fdb50d0866b4b8ead9a1e9a468e38..71fd7d96711d06e12a79c4273ca08f394761a594 100644
--- a/apps/files_encryption/l10n/de_DE.php
+++ b/apps/files_encryption/l10n/de_DE.php
@@ -3,5 +3,5 @@
 "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"
+"None" => "Nichts"
 );
diff --git a/apps/files_encryption/l10n/el.php b/apps/files_encryption/l10n/el.php
index 0031a7319445a45b376950d0e4f1f38d379a3dc4..82a4c92ec2856e27a7aff4f9b1c1db7cbdb7f8cb 100644
--- a/apps/files_encryption/l10n/el.php
+++ b/apps/files_encryption/l10n/el.php
@@ -3,5 +3,5 @@
 "File encryption is enabled." => "Î— ÎºÏÏ…Ï€Ï„Î¿Î³ÏÎ¬Ï†Î·ÏƒÎ· Î±ÏÏ‡ÎµÎ¯Ï‰Î½ ÎµÎ¯Î½Î±Î¹ ÎµÎ½ÎµÏÎ³Î®.",
 "The following file types will not be encrypted:" => "ÎŸÎ¹ Ï€Î±ÏÎ±ÎºÎ¬Ï„Ï‰ Ï„ÏÏ€Î¿Î¹ Î±ÏÏ‡ÎµÎ¯Ï‰Î½ Î´ÎµÎ½ Î¸Î± ÎºÏÏ…Ï€Ï„Î¿Î³ÏÎ±Ï†Î·Î¸Î¿ÏÎ½:",
 "Exclude the following file types from encryption:" => "Î•Î¾Î±Î¯ÏÎµÏƒÎ· Ï„Ï‰Î½ Ï€Î±ÏÎ±ÎºÎ¬Ï„Ï‰ Ï„ÏÏ€Ï‰Î½ Î±ÏÏ‡ÎµÎ¯Ï‰Î½ Î±Ï€ÏŒ Ï„Î·Î½ ÎºÏÏ…Ï€Ï„Î¿Î³ÏÎ¬Ï†Î·ÏƒÎ·:",
-"None" => "ÎšÎ±Î¼Î¯Î±"
+"None" => "Î¤Î¯Ï€Î¿Ï„Î±"
 );
diff --git a/apps/files_encryption/l10n/eu.php b/apps/files_encryption/l10n/eu.php
index 5a22b65728ef5d9d669b57dcd72559cda9830c60..7e3b7611ff2e49f85bbdf0501623bdc70acf750a 100644
--- a/apps/files_encryption/l10n/eu.php
+++ b/apps/files_encryption/l10n/eu.php
@@ -3,5 +3,5 @@
 "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"
+"None" => "Ezer"
 );
diff --git a/apps/files_encryption/l10n/fa.php b/apps/files_encryption/l10n/fa.php
index 21ad7e565667e07fb2b69f735dcac5b2f176a9eb..7acf196b791aade55985c5ec52201a482402fe1e 100644
--- a/apps/files_encryption/l10n/fa.php
+++ b/apps/files_encryption/l10n/fa.php
@@ -1,4 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Encryption" => "Ø±Ù…Ø²Ú¯Ø°Ø§Ø±ÛŒ",
+"File encryption is enabled." => "Ø±Ù…Ø²Ù†Ú¯Ø§Ø±ÛŒ ÙØ§ÛŒÙ„Ù‡Ø§ ÙØ¹Ø§Ù„ Ø´Ø¯.",
+"The following file types will not be encrypted:" => "ÙØ§ÛŒÙ„Ù‡Ø§ÛŒ Ø²ÛŒØ± Ø±Ù…Ø²Ù†Ú¯Ø§Ø±ÛŒ Ù†Ø®ÙˆØ§Ù‡Ù†Ø¯ Ø´Ø¯:",
+"Exclude the following file types from encryption:" => "ÙØ§ÛŒÙ„Ù‡Ø§ÛŒ Ø²ÛŒØ± Ø§Ø² Ø±Ù…Ø²Ù†Ú¯Ø§Ø±ÛŒ Ù†Ø§Ø¯ÛŒØ¯Ù‡ Ú¯Ø±ÙØªÙ‡ Ù…ÛŒ Ø´ÙˆÙ†Ø¯:",
 "None" => "Ù‡ÛŒÚ†â€ŒÚ©Ø¯Ø§Ù…"
 );
diff --git a/apps/files_encryption/l10n/it.php b/apps/files_encryption/l10n/it.php
index 9ab9bc492a0fb599349802711ac6ada4df5a7237..c71713452695ab9048e9c8e608c243a6d81cee04 100644
--- a/apps/files_encryption/l10n/it.php
+++ b/apps/files_encryption/l10n/it.php
@@ -3,5 +3,5 @@
 "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"
+"None" => "Nessuno"
 );
diff --git a/apps/files_encryption/l10n/ka_GE.php b/apps/files_encryption/l10n/ka_GE.php
new file mode 100644
index 0000000000000000000000000000000000000000..0362c676f00896ffeec998b4d561fd6ec189d674
--- /dev/null
+++ b/apps/files_encryption/l10n/ka_GE.php
@@ -0,0 +1,7 @@
+<?php $TRANSLATIONS = array(
+"Encryption" => "áƒ”áƒœáƒ™áƒ áƒ˜áƒžáƒªáƒ˜áƒ",
+"File encryption is enabled." => "áƒ¤áƒáƒ˜áƒšáƒ˜áƒ¡ áƒ”áƒœáƒ™áƒ áƒ˜áƒžáƒªáƒ˜áƒ áƒ©áƒáƒ áƒ—áƒ£áƒšáƒ˜áƒ.",
+"The following file types will not be encrypted:" => "áƒ¨áƒ”áƒ›áƒ“áƒ”áƒ’áƒ˜ áƒ¤áƒáƒ˜áƒšáƒ£áƒ áƒ˜ áƒ¢áƒ˜áƒžáƒ”áƒ‘áƒ˜áƒ¡ áƒ”áƒœáƒ™áƒ áƒ˜áƒžáƒªáƒ˜áƒ áƒáƒ  áƒ›áƒáƒ®áƒ“áƒ”áƒ‘áƒ:",
+"Exclude the following file types from encryption:" => "áƒáƒ›áƒáƒ˜áƒ¦áƒ” áƒ¨áƒ”áƒ›áƒ“áƒ”áƒ’áƒ˜ áƒ¤áƒáƒ˜áƒšáƒ˜áƒ¡ áƒ¢áƒ˜áƒžáƒ”áƒ‘áƒ˜ áƒ”áƒœáƒ™áƒ áƒ˜áƒžáƒªáƒ˜áƒ˜áƒ“áƒáƒœ:",
+"None" => "áƒáƒ áƒ"
+);
diff --git a/apps/files_encryption/l10n/pl.php b/apps/files_encryption/l10n/pl.php
index 2fa86f454f9bfbc1bbf6a361e3c44bc9b9f68739..836f545359633a970a4dce81b8979f5eb53908ac 100644
--- a/apps/files_encryption/l10n/pl.php
+++ b/apps/files_encryption/l10n/pl.php
@@ -3,5 +3,5 @@
 "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"
+"None" => "Nic"
 );
diff --git a/apps/files_encryption/l10n/pt_BR.php b/apps/files_encryption/l10n/pt_BR.php
index 28807db72ce820c067840756b9e19ef6a3cf6d2a..b41c6ed3153ae4afab3b292ff4bcbe3992367d75 100644
--- a/apps/files_encryption/l10n/pt_BR.php
+++ b/apps/files_encryption/l10n/pt_BR.php
@@ -3,5 +3,5 @@
 "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"
+"None" => "Nada"
 );
diff --git a/apps/files_encryption/l10n/ru.php b/apps/files_encryption/l10n/ru.php
index 22c1e3da3747c957863a007ce8bc54708eebe2cf..f07dec621d78e75d93f11fd30df7ac4aed1f1327 100644
--- a/apps/files_encryption/l10n/ru.php
+++ b/apps/files_encryption/l10n/ru.php
@@ -3,5 +3,5 @@
 "File encryption is enabled." => "Ð¨Ð¸Ñ„Ñ€Ð¾Ð²Ð°Ð½Ð¸Ðµ Ñ„Ð°Ð¹Ð»Ð° Ð²ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¾.",
 "The following file types will not be encrypted:" => "Ð¡Ð»ÐµÐ´ÑƒÑŽÑ‰Ð¸Ðµ Ñ‚Ð¸Ð¿Ñ‹ Ñ„Ð°Ð¹Ð»Ð¾Ð² Ð½Ðµ Ð±ÑƒÐ´ÑƒÑ‚ Ð·Ð°ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ð½Ñ‹:",
 "Exclude the following file types from encryption:" => "Ð˜ÑÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ ÑÐ»ÐµÐ´ÑƒÑŽÑ‰Ð¸Ðµ Ñ‚Ð¸Ð¿Ñ‹ Ñ„Ð°Ð¹Ð»Ð¾Ð² Ð¸Ð· ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ð½Ð½Ñ‹Ñ…:",
-"None" => "ÐÐ¸Ñ‡ÐµÐ³Ð¾"
+"None" => "ÐÐµÑ‚ Ð½Ð¾Ð²Ð¾ÑÑ‚ÐµÐ¹"
 );
diff --git a/apps/files_encryption/l10n/sk_SK.php b/apps/files_encryption/l10n/sk_SK.php
index bebb6234710dc2146021ca6a95dcc86a77a658cd..aaea9da21b4c87dad882049dbd3748efa4b6b2c1 100644
--- a/apps/files_encryption/l10n/sk_SK.php
+++ b/apps/files_encryption/l10n/sk_SK.php
@@ -3,5 +3,5 @@
 "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"
+"None" => "Å½iadny"
 );
diff --git a/apps/files_encryption/l10n/sl.php b/apps/files_encryption/l10n/sl.php
index 45272f1ee0635d972e83a788e17b127bf2fabfdc..4754e21214ea5b66c4a757e59fbe23ea04fca946 100644
--- a/apps/files_encryption/l10n/sl.php
+++ b/apps/files_encryption/l10n/sl.php
@@ -1,4 +1,7 @@
 <?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"
 );
diff --git a/apps/files_encryption/l10n/th_TH.php b/apps/files_encryption/l10n/th_TH.php
index e46d249118606f7f97352d974cd6054385262726..30c0324a9884b8f194f076d996e69b27436d4114 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" => "à¹„à¸¡à¹ˆà¸•à¹‰à¸à¸‡"
+"None" => "à¹„à¸¡à¹ˆà¸¡à¸µ"
 );
diff --git a/apps/files_encryption/l10n/ug.php b/apps/files_encryption/l10n/ug.php
new file mode 100644
index 0000000000000000000000000000000000000000..34eeb373b3e2bf4b98576c78d1b402562f6ef9ce
--- /dev/null
+++ b/apps/files_encryption/l10n/ug.php
@@ -0,0 +1,7 @@
+<?php $TRANSLATIONS = array(
+"Encryption" => "Ø´Ù‰ÙÙ‰Ø±Ù„Ø§Ø´",
+"File encryption is enabled." => "Ú¾Û†Ø¬Ø¬Û•Øª Ø´Ù‰ÙÙ‰Ø±Ù„Ø§Ø´ Ù‚ÙˆØ²ØºÙ‰ØªÙ‰Ù„Ø¯Ù‰.",
+"The following file types will not be encrypted:" => "ØªÛ†Û‹Û•Ù†Ø¯Ù‰ÙƒÙ‰ Ú¾Û†Ø¬Ø¬Û•Øª ØªÙ‰Ù¾Ù„Ù‰Ø±Ù‰ Ø´Ù‰ÙÙ‰Ø±Ù„Ø§Ù†Ù…Ø§ÙŠØ¯Û‡:",
+"Exclude the following file types from encryption:" => "ØªÛ†Û‹Û•Ù†Ø¯Ù‰ÙƒÙ‰ Ú¾Û†Ø¬Ø¬Û•Øª ØªÙ‰Ù¾Ù„Ù‰Ø±Ù‰ Ø´Ù‰ÙÙ‰Ø±Ù„Ø§Ø´Ù†Ù‰Ú Ø³Ù‰Ø±ØªÙ‰Ø¯Ø§:",
+"None" => "ÙŠÙˆÙ‚"
+);
diff --git a/apps/files_encryption/l10n/vi.php b/apps/files_encryption/l10n/vi.php
index 0a88d1b2db60b09f23e67d9ed317e9e4aa771cc7..40d4b1d0fec3757d7854462c60757d3a361d8635 100644
--- a/apps/files_encryption/l10n/vi.php
+++ b/apps/files_encryption/l10n/vi.php
@@ -3,5 +3,5 @@
 "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"
+"None" => "KhÃ´ng gÃ¬ cáº£"
 );
diff --git a/apps/files_encryption/l10n/zh_CN.php b/apps/files_encryption/l10n/zh_CN.php
index 867d000f2ed12dbb2860656655aa4a9833103bf7..13fa95203e437684194ed12b40637bbb00d50c6c 100644
--- a/apps/files_encryption/l10n/zh_CN.php
+++ b/apps/files_encryption/l10n/zh_CN.php
@@ -1,4 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Encryption" => "åŠ å¯†",
-"None" => "None"
+"File encryption is enabled." => "æ–‡ä»¶åŠ å¯†å·²å¯ç”¨.",
+"The following file types will not be encrypted:" => "å¦‚ä¸‹çš„æ–‡ä»¶ç±»åž‹å°†ä¸ä¼šè¢«åŠ å¯†:",
+"Exclude the following file types from encryption:" => "ä»ŽåŠ å¯†ä¸æŽ’é™¤å¦‚ä¸‹çš„æ–‡ä»¶ç±»åž‹:",
+"None" => "æ— "
 );
diff --git a/apps/files_encryption/l10n/zh_HK.php b/apps/files_encryption/l10n/zh_HK.php
new file mode 100644
index 0000000000000000000000000000000000000000..0c0b709fdc1f47d88eb809638ab9a75391d08884
--- /dev/null
+++ b/apps/files_encryption/l10n/zh_HK.php
@@ -0,0 +1,6 @@
+<?php $TRANSLATIONS = array(
+"Encryption" => "åŠ å¯†",
+"File encryption is enabled." => "æª”æ¡ˆåŠ å¯†å·²é–‹å•Ÿ",
+"The following file types will not be encrypted:" => "ä»¥ä¸‹æ–‡ä»¶é¡žåˆ¥å°‡ä¸æœƒè¢«åŠ å¯†",
+"None" => "ç©º"
+);
diff --git a/apps/files_encryption/l10n/zh_TW.php b/apps/files_encryption/l10n/zh_TW.php
index 1655e171433828affb536dc94ee161cf710ae901..95e61b45dc263998071b5987e32b2b7fd9e21166 100644
--- a/apps/files_encryption/l10n/zh_TW.php
+++ b/apps/files_encryption/l10n/zh_TW.php
@@ -1,4 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Encryption" => "åŠ å¯†",
+"File encryption is enabled." => "æª”æ¡ˆåŠ å¯†å·²è¢«å•Ÿç”¨",
+"The following file types will not be encrypted:" => "ä»¥ä¸‹çš„æ–‡ä»¶é¡žåž‹ä¸æœƒè¢«åŠ å¯†ï¼š",
+"Exclude the following file types from encryption:" => "å¾žåŠ å¯†ä¸æŽ’é™¤çš„æª”æ¡ˆé¡žåž‹ï¼š",
 "None" => "ç„¡"
 );
diff --git a/apps/files_encryption/lib/capabilities.php b/apps/files_encryption/lib/capabilities.php
new file mode 100644
index 0000000000000000000000000000000000000000..72baddcd0495f2197592b8f53cde23bfaca54507
--- /dev/null
+++ b/apps/files_encryption/lib/capabilities.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Copyright (c) 2013 Tom Needham <tom@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 Capabilities {
+	
+	public static function getCapabilities() {
+		return new \OC_OCS_Result(array(
+			'capabilities' => array(
+				'files' => array(
+					'encryption' => true,
+					),
+				),
+			));
+	}
+	
+}
\ No newline at end of file
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 0c9c6c390443c5a789b73dad88908215cf08f4e4..f2c1e45778d34c42f15eb8c7ac220c73025cee0d 100644
--- a/apps/files_external/l10n/da.php
+++ b/apps/files_external/l10n/da.php
@@ -6,11 +6,14 @@
 "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",
 "Configuration" => "OpsÃ¦tning",
 "Options" => "Valgmuligheder",
 "Applicable" => "Kan anvendes",
+"Add storage" => "TilfÃ¸j lager",
 "None set" => "Ingen sat",
 "All Users" => "Alle brugere",
 "Groups" => "Grupper",
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 38b5a098f6266fe169329cde07322dff6e65f3e6..62703b08fbc1422f2b7b9b95bd65643009da7825 100644
--- a/apps/files_external/l10n/el.php
+++ b/apps/files_external/l10n/el.php
@@ -6,11 +6,14 @@
 "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" => "Î•Î¾Ï‰Ï„ÎµÏÎ¹ÎºÎ® Î±Ï€Î¿Î¸Î®ÎºÎµÏ…ÏƒÎ·",
 "Configuration" => "Î¡Ï…Î¸Î¼Î¯ÏƒÎµÎ¹Ï‚",
 "Options" => "Î•Ï€Î¹Î»Î¿Î³ÎÏ‚",
 "Applicable" => "Î•Ï†Î±ÏÎ¼ÏŒÏƒÎ¹Î¼Î¿",
+"Add storage" => "Î ÏÎ¿ÏƒÎ¸Î·ÎºÎ· Î±Ï€Î¿Î¸Î·ÎºÎµÏ…ÏƒÎ·Ï‚",
 "None set" => "ÎšÎ±Î½ÎÎ½Î± ÎµÏ€Î¹Î»ÎµÎ³Î¼ÎÎ½Î¿",
 "All Users" => "ÎŒÎ»Î¿Î¹ Î¿Î¹ Î§ÏÎ®ÏƒÏ„ÎµÏ‚",
 "Groups" => "ÎŸÎ¼Î¬Î´ÎµÏ‚",
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 fd0cdefd347cd7bfb232ebc93777c66aeb847390..465201df4dd3834a40f41c088ca9f7a2c1ce1199 100644
--- a/apps/files_external/l10n/et_EE.php
+++ b/apps/files_external/l10n/et_EE.php
@@ -4,11 +4,16 @@
 "Grant access" => "Anna ligipÃ¤Ã¤s",
 "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> 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",
 "Configuration" => "Seadistamine",
 "Options" => "Valikud",
 "Applicable" => "Rakendatav",
+"Add storage" => "Lisa andmehoidla",
 "None set" => "Pole mÃ¤Ã¤ratud",
 "All Users" => "KÃµik kasutajad",
 "Groups" => "Grupid",
diff --git a/apps/files_external/l10n/fa.php b/apps/files_external/l10n/fa.php
index a7eac596b04925a0c0c636fc751356180857a65a..1921ba9f2aebc217c287ab8204ddba0dbe40a376 100644
--- a/apps/files_external/l10n/fa.php
+++ b/apps/files_external/l10n/fa.php
@@ -3,9 +3,11 @@
 "Configuration" => "Ù¾ÛŒÚ©Ø±Ø¨Ù†Ø¯ÛŒ",
 "Options" => "ØªÙ†Ø¸ÛŒÙ…Ø§Øª",
 "Applicable" => "Ù‚Ø§Ø¨Ù„ Ø§Ø¬Ø±Ø§",
+"None set" => "ØªÙ†Ø¸ÛŒÙ… Ù†Ø´Ø¯Ù‡",
 "All Users" => "ØªÙ…Ø§Ù… Ú©Ø§Ø±Ø¨Ø±Ø§Ù†",
 "Groups" => "Ú¯Ø±ÙˆÙ‡ Ù‡Ø§",
 "Users" => "Ú©Ø§Ø±Ø¨Ø±Ø§Ù†",
 "Delete" => "ØØ°Ù",
-"Enable User External Storage" => "ÙØ¹Ø§Ù„ Ø³Ø§Ø²ÛŒ ØØ§ÙØ¸Ù‡ Ø®Ø§Ø±Ø¬ÛŒ Ú©Ø§Ø±Ø¨Ø±"
+"Enable User External Storage" => "ÙØ¹Ø§Ù„ Ø³Ø§Ø²ÛŒ ØØ§ÙØ¸Ù‡ Ø®Ø§Ø±Ø¬ÛŒ Ú©Ø§Ø±Ø¨Ø±",
+"Allow users to mount their own external storage" => "Ø§Ø¬Ø§Ø²Ù‡ Ø¨Ù‡ Ú©Ø§Ø±Ø¨Ø±Ø§Ù† Ø¨Ø±Ø§ÛŒ Ù…ØªØµÙ„ Ú©Ø±Ø¯Ù† Ù…Ù†Ø§Ø¨Ø¹ Ø°Ø®ÛŒØ±Ù‡ ÛŒ Ø®Ø§Ø±Ø¬ÛŒ Ø®ÙˆØ¯Ø´Ø§Ù†"
 );
diff --git a/apps/files_external/l10n/fi_FI.php b/apps/files_external/l10n/fi_FI.php
index 4cf97f2fc35db8e525376a5be388b119e831133b..ba39d140fbc87f922ee3e02fd645ac34168fa6f8 100644
--- a/apps/files_external/l10n/fi_FI.php
+++ b/apps/files_external/l10n/fi_FI.php
@@ -6,11 +6,14 @@
 "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",
 "Configuration" => "Asetukset",
 "Options" => "Valinnat",
 "Applicable" => "Sovellettavissa",
+"Add storage" => "LisÃ¤Ã¤ tallennustila",
 "None set" => "Ei asetettu",
 "All Users" => "Kaikki kÃ¤yttÃ¤jÃ¤t",
 "Groups" => "RyhmÃ¤t",
diff --git a/apps/files_external/l10n/fr.php b/apps/files_external/l10n/fr.php
index db4140b483db83aed824e20b16c3299d5a8bcf8e..5006133a7b688cc4e59bb84d097a777acc5ac7ec 100644
--- a/apps/files_external/l10n/fr.php
+++ b/apps/files_external/l10n/fr.php
@@ -6,11 +6,14 @@
 "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",
 "Configuration" => "Configuration",
 "Options" => "Options",
 "Applicable" => "Disponible",
+"Add storage" => "Ajouter un support de stockage",
 "None set" => "Aucun spÃ©cifiÃ©",
 "All Users" => "Tous les utilisateurs",
 "Groups" => "Groupes",
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/id.php b/apps/files_external/l10n/id.php
index 647220706bae67ec6469ea2ae3c8c6e0ff100e71..30cd28bba1c91fb9f70fcd6809a12040c796f830 100644
--- a/apps/files_external/l10n/id.php
+++ b/apps/files_external/l10n/id.php
@@ -1,22 +1,25 @@
 <?php $TRANSLATIONS = array(
 "Access granted" => "Akses diberikan",
-"Error configuring Dropbox storage" => "Kesalahan dalam mengkonfigurasi penyimpanan Dropbox",
+"Error configuring Dropbox storage" => "Kesalahan dalam mengonfigurasi penyimpanan Dropbox",
 "Grant access" => "Berikan hak akses",
 "Please provide a valid Dropbox app key and secret." => "Masukkan kunci dan sandi aplikasi Dropbox yang benar.",
 "Error configuring Google Drive storage" => "Kesalahan dalam mengkonfigurasi penyimpanan 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>Peringatan:</b> \"smbclient\" tidak terpasang. Mount direktori CIFS/SMB tidak dapat dilakukan. Silakan minta administrator sistem untuk memasangnya.",
 "<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>Peringatan:</b> Dukungan FTP di PHP tidak aktif atau tidak terpasang. Mount direktori FTP tidak dapat dilakukan. Silakan minta administrator sistem untuk memasangnya.",
 "External Storage" => "Penyimpanan Eksternal",
+"Folder name" => "Nama folder",
+"External storage" => "Penyimpanan eksternal",
 "Configuration" => "Konfigurasi",
-"Options" => "Pilihan",
+"Options" => "Opsi",
 "Applicable" => "Berlaku",
+"Add storage" => "Tambahkan penyimpanan",
 "None set" => "Tidak satupun di set",
 "All Users" => "Semua Pengguna",
 "Groups" => "Grup",
 "Users" => "Pengguna",
 "Delete" => "Hapus",
 "Enable User External Storage" => "Aktifkan Penyimpanan Eksternal Pengguna",
-"Allow users to mount their own external storage" => "Ijinkan pengguna untuk me-mount penyimpanan eksternal mereka",
+"Allow users to mount their own external storage" => "Izinkan pengguna untuk mengaitkan penyimpanan eksternal mereka",
 "SSL root certificates" => "Sertifikat root SSL",
 "Import Root Certificate" => "Impor Sertifikat Root"
 );
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 efccca9fd782b119528d5b037f8ac194d41338e3..b0845555b4b41d6d46b76cffb628dd6b61ee37af 100644
--- a/apps/files_external/l10n/ka_GE.php
+++ b/apps/files_external/l10n/ka_GE.php
@@ -1,5 +1,26 @@
 <?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 áƒ›áƒ®áƒáƒ áƒ“áƒáƒáƒ”áƒ áƒ áƒáƒ  áƒáƒ áƒ˜áƒ¡ áƒáƒ¥áƒ¢áƒ˜áƒ£áƒ áƒ˜ áƒáƒœ áƒ“áƒáƒ˜áƒœáƒ¡áƒ¢áƒáƒšáƒ˜áƒ áƒ”áƒ‘áƒ£áƒšáƒ˜. 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" => "áƒ”áƒ¥áƒ¡áƒ¢áƒ”áƒ áƒœáƒáƒš áƒ¡áƒáƒªáƒáƒ•áƒ˜",
+"Configuration" => "áƒ™áƒáƒœáƒ¤áƒ˜áƒ’áƒ£áƒ áƒáƒªáƒ˜áƒ",
+"Options" => "áƒáƒ¤áƒªáƒ˜áƒ",
+"Applicable" => "áƒ›áƒ˜áƒ¦áƒ”áƒ‘áƒáƒ“áƒ˜",
+"Add storage" => "áƒ¡áƒáƒªáƒáƒ•áƒ˜áƒ¡ áƒ“áƒáƒ›áƒáƒ¢áƒ”áƒ‘áƒ",
+"None set" => "áƒáƒ áƒáƒ¤áƒ”áƒ áƒ˜áƒ áƒ›áƒ˜áƒ—áƒ˜áƒ—áƒ”áƒ‘áƒ£áƒšáƒ˜",
+"All Users" => "áƒ§áƒ•áƒ”áƒšáƒ áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒ”áƒšáƒ˜",
 "Groups" => "áƒ¯áƒ’áƒ£áƒ¤áƒ”áƒ‘áƒ˜",
 "Users" => "áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒ”áƒšáƒ˜",
-"Delete" => "áƒ¬áƒáƒ¨áƒšáƒ"
+"Delete" => "áƒ¬áƒáƒ¨áƒšáƒ",
+"Enable User External Storage" => "áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒšáƒ˜áƒ¡ áƒ”áƒ¥áƒ¡áƒ¢áƒ”áƒ áƒœáƒáƒš áƒ¡áƒáƒªáƒáƒ•áƒ˜áƒ¡ áƒáƒ¥áƒ¢áƒ˜áƒ•áƒ˜áƒ áƒ”áƒ‘áƒ",
+"Allow users to mount their own external storage" => "áƒ›áƒ˜áƒ”áƒªáƒ˜áƒ— áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒšáƒ”áƒ‘áƒ¡ áƒ—áƒáƒ•áƒ˜áƒ¡áƒ˜ áƒ”áƒ¥áƒ¡áƒ¢áƒ”áƒ áƒœáƒáƒš áƒ¡áƒáƒªáƒáƒ•áƒ˜áƒ¡ áƒ›áƒáƒœáƒ¢áƒ˜áƒ áƒ”áƒ‘áƒ˜áƒ¡  áƒ£áƒ¤áƒšáƒ”áƒ‘áƒ",
+"SSL root certificates" => "SSL root áƒ¡áƒ”áƒ áƒ—áƒ˜áƒ¤áƒ˜áƒ™áƒáƒ¢áƒ”áƒ‘áƒ˜",
+"Import Root Certificate" => "Root áƒ¡áƒ”áƒ áƒ—áƒ˜áƒ¤áƒ˜áƒ™áƒáƒ¢áƒ˜áƒ¡ áƒ˜áƒ›áƒžáƒáƒ áƒ¢áƒ˜áƒ áƒ”áƒ‘áƒ"
 );
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 f7dca99ef654bb245aaf65135c2e4977990c4e3b..9bf997d87cb8d0a21a79ba115c6d2993d483549c 100644
--- a/apps/files_external/l10n/lt_LT.php
+++ b/apps/files_external/l10n/lt_LT.php
@@ -4,11 +4,15 @@
 "Grant access" => "Suteikti priÄ—jimÄ…",
 "Please provide a valid Dropbox app key and secret." => "PraÅ¡ome Ä¯vesti teisingus Dropbox \"app key\" ir \"secret\".",
 "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. ",
 "External Storage" => "IÅ¡orinÄ—s saugyklos",
 "Folder name" => "Katalogo pavadinimas",
+"External storage" => "IÅ¡orinÄ— saugykla",
 "Configuration" => "KonfigÅ«racija",
 "Options" => "Nustatymai",
 "Applicable" => "Pritaikyti",
+"Add storage" => "PridÄ—ti saugyklÄ…",
 "None set" => "Nieko nepasirinkta",
 "All Users" => "Visi vartotojai",
 "Groups" => "GrupÄ—s",
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/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/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 5614c93585adb26bdbb0e87dc76904470d0a2751..09b91b913e9a796899b1b8b96d7756939b5e8814 100644
--- a/apps/files_external/l10n/sl.php
+++ b/apps/files_external/l10n/sl.php
@@ -2,21 +2,24 @@
 "Access granted" => "Dostop je odobren",
 "Error configuring Dropbox storage" => "Napaka nastavljanja shrambe Dropbox",
 "Grant access" => "Odobri dostop",
-"Please provide a valid Dropbox app key and secret." => "VpiÅ¡ite veljaven kljuÄ programa in kodo za Dropbox",
+"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> \"smbclient\" ni nameÅ¡Äen. Priklapljanje CIFS/SMB pogonov ni mogoÄe. Prosimo, prosite vaÅ¡ega skrbnika, Äe ga namesti.",
-"<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> FTP podpora v PHP ni omogoÄena ali nameÅ¡Äena. Priklapljanje FTP pogonov ni mogoÄe. Prosimo, prosite vaÅ¡ega skrbnika, Äe jo namesti ali omogoÄi.",
+"<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 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",
 "Configuration" => "Nastavitve",
 "Options" => "MoÅ¾nosti",
 "Applicable" => "Se uporablja",
+"Add storage" => "Dodaj shrambo",
 "None set" => "Ni nastavljeno",
 "All Users" => "Vsi uporabniki",
 "Groups" => "Skupine",
 "Users" => "Uporabniki",
 "Delete" => "IzbriÅ¡i",
-"Enable User External Storage" => "OmogoÄi uporabo zunanje podatkovne shrambe za uporabnike",
+"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/sq.php b/apps/files_external/l10n/sq.php
new file mode 100644
index 0000000000000000000000000000000000000000..d5393aa38527a242df701d3002ca1c60335c346c
--- /dev/null
+++ b/apps/files_external/l10n/sq.php
@@ -0,0 +1,4 @@
+<?php $TRANSLATIONS = array(
+"Users" => "PÃ«rdoruesit",
+"Delete" => "Elimino"
+);
diff --git a/apps/files_external/l10n/te.php b/apps/files_external/l10n/te.php
new file mode 100644
index 0000000000000000000000000000000000000000..f557dda5592acf4333c58d020240b7d33c75b100
--- /dev/null
+++ b/apps/files_external/l10n/te.php
@@ -0,0 +1,4 @@
+<?php $TRANSLATIONS = array(
+"Users" => "à°µà°¾à°¡à±à°•à°°à±à°²à±",
+"Delete" => "à°¤à±Šà°²à°—à°¿à°‚à°šà±"
+);
diff --git a/apps/files_external/l10n/tr.php b/apps/files_external/l10n/tr.php
index cddb2b35e03e4ca2d1311a9d5c65d33f39a9a0e0..3c3c0c24f97ad6baa6c8529f8272b5aed44ff0b1 100644
--- a/apps/files_external/l10n/tr.php
+++ b/apps/files_external/l10n/tr.php
@@ -1,12 +1,19 @@
 <?php $TRANSLATIONS = array(
 "Access granted" => "GiriÅŸ kabul edildi",
+"Error configuring Dropbox storage" => "Dropbox depo yapÄ±landÄ±rma hatasÄ±",
 "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",
 "Configuration" => "YapÄ±landÄ±rma",
 "Options" => "SeÃ§enekler",
 "Applicable" => "Uygulanabilir",
+"Add storage" => "Depo ekle",
 "None set" => "HiÃ§biri",
 "All Users" => "TÃ¼m KullanÄ±cÄ±lar",
 "Groups" => "Gruplar",
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.GB2312.php b/apps/files_external/l10n/zh_CN.GB2312.php
index 74b9e3cad8134419b79993227992135b41cf5e93..c74323db1750342cdc6dee9bfe82d74115167b20 100644
--- a/apps/files_external/l10n/zh_CN.GB2312.php
+++ b/apps/files_external/l10n/zh_CN.GB2312.php
@@ -4,11 +4,15 @@
 "Grant access" => "æŽˆäºˆæƒé™",
 "Please provide a valid Dropbox app key and secret." => "è¯·æä¾›ä¸€ä¸ªæœ‰æ•ˆçš„ Dropbox app key å’Œ 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>â€œSMBå®¢æˆ·ç«¯â€æœªå®‰è£…ã€‚CIFS/SMBåˆ†äº«ä¸å¯ç”¨ã€‚è¯·å‘æ‚¨çš„ç³»ç»Ÿç®¡ç†å‘˜è¯·æ±‚å®‰è£…è¯¥å®¢æˆ·ç«¯ã€‚",
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>æ³¨æ„ï¼š</b>PHPçš„FTPæ”¯æŒå°šæœªå¯ç”¨æˆ–æœªå®‰è£…ã€‚FTPåˆ†äº«ä¸å¯ç”¨ã€‚è¯·å‘æ‚¨çš„ç³»ç»Ÿç®¡ç†å‘˜è¯·æ±‚å®‰è£…ã€‚",
 "External Storage" => "å¤–éƒ¨å˜å‚¨",
 "Folder name" => "æ–‡ä»¶å¤¹å",
+"External storage" => "å¤–éƒ¨å˜å‚¨",
 "Configuration" => "é…ç½®",
 "Options" => "é€‰é¡¹",
 "Applicable" => "å¯åº”ç”¨",
+"Add storage" => "æ‰©å®¹",
 "None set" => "æœªè®¾ç½®",
 "All Users" => "æ‰€æœ‰ç”¨æˆ·",
 "Groups" => "ç¾¤ç»„",
diff --git a/apps/files_external/l10n/zh_CN.php b/apps/files_external/l10n/zh_CN.php
index 1860b6f70d71506eb2b75e34d7b16f6e32b6c3b5..8157923183cc92a1909a3b06cb7c28b1c8ec2089 100644
--- a/apps/files_external/l10n/zh_CN.php
+++ b/apps/files_external/l10n/zh_CN.php
@@ -6,11 +6,14 @@
 "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" => "å¤–éƒ¨å˜å‚¨",
 "Configuration" => "é…ç½®",
 "Options" => "é€‰é¡¹",
 "Applicable" => "é€‚ç”¨çš„",
+"Add storage" => "æ·»åŠ å˜å‚¨",
 "None set" => "æœªè®¾ç½®",
 "All Users" => "æ‰€æœ‰ç”¨æˆ·",
 "Groups" => "ç»„",
diff --git a/apps/files_external/l10n/zh_HK.php b/apps/files_external/l10n/zh_HK.php
new file mode 100644
index 0000000000000000000000000000000000000000..a85b5a03b8a57a72423892c9f6446fb6b36f6087
--- /dev/null
+++ b/apps/files_external/l10n/zh_HK.php
@@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"Groups" => "ç¾¤çµ„",
+"Users" => "ç”¨æˆ¶",
+"Delete" => "åˆªé™¤"
+);
diff --git a/apps/files_external/l10n/zh_TW.php b/apps/files_external/l10n/zh_TW.php
index 512a151a3c88b3c9756f725f832564419a0b2513..a8314dcef03660b8b3ecd734b66c340f5fb3c610 100644
--- a/apps/files_external/l10n/zh_TW.php
+++ b/apps/files_external/l10n/zh_TW.php
@@ -1,10 +1,26 @@
 <?php $TRANSLATIONS = array(
-"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" => "å¤–éƒ¨å„²å˜",
+"Configuration" => "è¨å®š",
+"Options" => "é¸é …",
+"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 430269e03d9061f82bc98fa92ae6823251a33cf8..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',
@@ -307,8 +307,9 @@ class OC_Mount_Config {
 			$phpFile = OC_User::getHome(OCP\User::getUser()).'/mount.php';
 			$jsonFile = OC_User::getHome(OCP\User::getUser()).'/mount.json';
 		} else {
+			$datadir = \OC_Config::getValue("datadirectory", \OC::$SERVERROOT . "/data");
 			$phpFile = OC::$SERVERROOT.'/config/mount.php';
-			$jsonFile = OC::$SERVERROOT.'/config/mount.json';
+			$jsonFile = $datadir . '/mount.json';
 		}
 		if (is_file($jsonFile)) {
 			$mountPoints = json_decode(file_get_contents($jsonFile), true);
@@ -333,10 +334,12 @@ class OC_Mount_Config {
 		if ($isPersonal) {
 			$file = OC_User::getHome(OCP\User::getUser()).'/mount.json';
 		} else {
-			$file = OC::$SERVERROOT.'/config/mount.json';
+			$datadir = \OC_Config::getValue("datadirectory", \OC::$SERVERROOT . "/data");
+			$file = $datadir . '/mount.json';
 		}
 		$content = json_encode($data);
 		@file_put_contents($file, $content);
+		@chmod($file, 0640);
 	}
 
 	/**
@@ -411,6 +414,13 @@ class OC_Mount_Config {
 		}
 	}
 
+	/**
+	 * check if curl is installed
+	 */
+	public static function checkcurl() {
+		return (function_exists('curl_init'));
+	}
+
 	/**
 	 * check dependencies
 	 */
@@ -423,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..655c3c9a81653b1fafad3bee8c8e6ffb9d1e4129 100644
--- a/apps/files_external/lib/smb.php
+++ b/apps/files_external/lib/smb.php
@@ -73,7 +73,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/settings.php b/apps/files_external/settings.php
index 1a39affe2e6606e0d9cf439a8eaff63b139d578d..31183409e3965b5c2b73cac6066fb38be171ce96 100644
--- a/apps/files_external/settings.php
+++ b/apps/files_external/settings.php
@@ -32,6 +32,7 @@ $tmpl->assign('mounts', OC_Mount_Config::getSystemMountPoints());
 $tmpl->assign('backends', OC_Mount_Config::getBackends());
 $tmpl->assign('groups', OC_Group::getGroups());
 $tmpl->assign('users', OCP\User::getUsers());
+$tmpl->assign('userDisplayNames', OC_User::getDisplayNames());
 $tmpl->assign('dependencies', OC_Mount_Config::checkDependencies());
 $tmpl->assign('allowUserMounting', OCP\Config::getAppValue('files_external', 'allow_user_mounting', 'yes'));
 return $tmpl->fetchPage();
diff --git a/apps/files_external/templates/settings.php b/apps/files_external/templates/settings.php
index 86492699fc2d3ffe0324c9b05ff3f21da9078215..b3c08e212251da025bc621e314158ed4a7fd7a13 100644
--- a/apps/files_external/templates/settings.php
+++ b/apps/files_external/templates/settings.php
@@ -102,7 +102,7 @@
 									<option value="<?php p($user); ?>"
 									<?php if (isset($mount['applicable']['users']) && in_array($user, $mount['applicable']['users'])): ?>
 											selected="selected"
-									<?php endif; ?>><?php p($user); ?></option>
+									<?php endif; ?>><?php p($_['userDisplayNames'][$user]); ?></option>
 								<?php endforeach; ?>
 								</optgroup>
 							</select>
@@ -155,7 +155,7 @@
 			</tbody>
 		</table>
 		<input type="hidden" name="requesttoken" value="<?php p($_['requesttoken']); ?>">
-		<input type="file" id="rootcert_import" name="rootcert_import" style="width:230px;">
+		<input type="file" id="rootcert_import" name="rootcert_import">
 		<input type="submit" name="cert_import" value="<?php p($l->t('Import Root Certificate')); ?>" />
 </fieldset>
 </form>
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/appinfo/app.php b/apps/files_sharing/appinfo/app.php
index 5b5893abc930c0d2934ec6fa09472796f6d725ac..9363a5431faa38d142f7597a4813141b6d52d324 100644
--- a/apps/files_sharing/appinfo/app.php
+++ b/apps/files_sharing/appinfo/app.php
@@ -5,8 +5,14 @@ OC::$CLASSPATH['OC_Share_Backend_Folder'] = 'files_sharing/lib/share/folder.php'
 OC::$CLASSPATH['OC\Files\Storage\Shared'] = 'files_sharing/lib/sharedstorage.php';
 OC::$CLASSPATH['OC\Files\Cache\Shared_Cache'] = 'files_sharing/lib/cache.php';
 OC::$CLASSPATH['OC\Files\Cache\Shared_Permissions'] = 'files_sharing/lib/permissions.php';
+OC::$CLASSPATH['OC\Files\Cache\Shared_Updater'] = 'files_sharing/lib/updater.php';
 OC::$CLASSPATH['OC\Files\Cache\Shared_Watcher'] = 'files_sharing/lib/watcher.php';
 OCP\Util::connectHook('OC_Filesystem', 'setup', '\OC\Files\Storage\Shared', 'setup');
 OCP\Share::registerBackend('file', 'OC_Share_Backend_File');
 OCP\Share::registerBackend('folder', 'OC_Share_Backend_Folder', 'file');
 OCP\Util::addScript('files_sharing', 'share');
+\OC_Hook::connect('OC_Filesystem', 'post_write', '\OC\Files\Cache\Shared_Updater', 'writeHook');
+\OC_Hook::connect('OC_Filesystem', 'delete', '\OC\Files\Cache\Shared_Updater', 'deleteHook');
+\OC_Hook::connect('OC_Filesystem', 'post_rename', '\OC\Files\Cache\Shared_Updater', 'renameHook');
+\OC_Hook::connect('OCP\Share', 'post_shared', '\OC\Files\Cache\Shared_Updater', 'shareHook');
+\OC_Hook::connect('OCP\Share', 'pre_unshare', '\OC\Files\Cache\Shared_Updater', 'shareHook');
\ No newline at end of file
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/id.php b/apps/files_sharing/l10n/id.php
index 8897269d989ea4bafc894d8f2919b510e0653852..95cf84312cdb68be3bcced840cbc3bd6e1f2ff11 100644
--- a/apps/files_sharing/l10n/id.php
+++ b/apps/files_sharing/l10n/id.php
@@ -1,9 +1,9 @@
 <?php $TRANSLATIONS = array(
-"Password" => "kata kunci",
-"Submit" => "kirim",
-"%s shared the folder %s with you" => "%s membagikan folder %s dengan anda",
-"%s shared the file %s with you" => "%s membagikan file %s dengan anda",
-"Download" => "unduh",
-"No preview available for" => "tidak ada pratinjau tersedia untuk",
-"web services under your control" => "servis web dibawah kendali anda"
+"Password" => "Sandi",
+"Submit" => "Kirim",
+"%s shared the folder %s with you" => "%s membagikan folder %s dengan Anda",
+"%s shared the file %s with you" => "%s membagikan file %s dengan Anda",
+"Download" => "Unduh",
+"No preview available for" => "Tidak ada pratinjau tersedia untuk",
+"web services under your control" => "layanan web dalam kontrol Anda"
 );
diff --git a/apps/files_sharing/l10n/ka_GE.php b/apps/files_sharing/l10n/ka_GE.php
index ef42196d2cbf8cc38384b2b9100f433cb4808bec..6da1a8b019d4d823b763acf73779636fc69c807e 100644
--- a/apps/files_sharing/l10n/ka_GE.php
+++ b/apps/files_sharing/l10n/ka_GE.php
@@ -1,6 +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",
 "Download" => "áƒ©áƒáƒ›áƒáƒ¢áƒ•áƒ˜áƒ áƒ—áƒ•áƒ",
+"No preview available for" => "áƒ¬áƒ˜áƒœáƒáƒ¡áƒ¬áƒáƒ áƒ˜ áƒ“áƒáƒ—áƒ•áƒáƒšáƒ˜áƒ”áƒ áƒ”áƒ‘áƒ áƒ¨áƒ”áƒ£áƒ«áƒšáƒ”áƒ‘áƒ”áƒšáƒ˜áƒ",
 "web services under your control" => "web services under your control"
 );
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/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/sq.php b/apps/files_sharing/l10n/sq.php
new file mode 100644
index 0000000000000000000000000000000000000000..244ca87c552770ddb3824fcd05d7edfa6e4ac2c5
--- /dev/null
+++ b/apps/files_sharing/l10n/sq.php
@@ -0,0 +1,9 @@
+<?php $TRANSLATIONS = array(
+"Password" => "Kodi",
+"Submit" => "Parashtro",
+"%s shared the folder %s with you" => "%s ndau me ju dosjen %s",
+"%s shared the file %s with you" => "%s ndau me ju skedarin %s",
+"Download" => "Shkarko",
+"No preview available for" => "Shikimi paraprak nuk Ã«shtÃ« i mundur pÃ«r",
+"web services under your control" => "shÃ«rbime web nÃ«n kontrollin tÃ«nd"
+);
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/te.php b/apps/files_sharing/l10n/te.php
new file mode 100644
index 0000000000000000000000000000000000000000..1e2eedc684412607f66fba52489aef0edf896b6b
--- /dev/null
+++ b/apps/files_sharing/l10n/te.php
@@ -0,0 +1,3 @@
+<?php $TRANSLATIONS = array(
+"Password" => "à°¸à°‚à°•à±‡à°¤à°ªà°¦à°‚"
+);
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_HK.php b/apps/files_sharing/l10n/zh_HK.php
new file mode 100644
index 0000000000000000000000000000000000000000..7ef0f19ca435e0ae17be1f4112bb4fdef1133c0c
--- /dev/null
+++ b/apps/files_sharing/l10n/zh_HK.php
@@ -0,0 +1,4 @@
+<?php $TRANSLATIONS = array(
+"Password" => "å¯†ç¢¼",
+"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 fb0f6c7b5a6bd3b4fb4f8cad64b4f7e900471bac..2160fe9a393bb366a1e4fd0c6d3bf415684e2a1a 100644
--- a/apps/files_sharing/lib/cache.php
+++ b/apps/files_sharing/lib/cache.php
@@ -28,10 +28,11 @@ namespace OC\Files\Cache;
  */
 class Shared_Cache extends Cache {
 
+	private $storage;
 	private $files = array();
 
 	public function __construct($storage) {
-
+		$this->storage = $storage;
 	}
 
 	/**
@@ -41,21 +42,32 @@ class Shared_Cache extends Cache {
 	 */
 	private function getSourceCache($target) {
 		$source = \OC_Share_Backend_File::getSource($target);
-		if (isset($source['path'])) {
-			$source['path'] = '/' . $source['uid_owner'] . '/' . $source['path'];
-			\OC\Files\Filesystem::initMountPoints($source['uid_owner']);
-			list($storage, $internalPath) = \OC\Files\Filesystem::resolvePath($source['path']);
-			if ($storage) {
-				$this->files[$target] = $internalPath;
-				$cache = $storage->getCache();
-				$this->storageId = $storage->getId();
-				$this->numericId = $cache->getNumericStorageId();
-				return $cache;
+		if (isset($source['path']) && isset($source['fileOwner'])) {
+			\OC\Files\Filesystem::initMountPoints($source['fileOwner']);
+			$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;
+					$cache = $storage->getCache();
+					$this->storageId = $storage->getId();
+					$this->numericId = $cache->getNumericStorageId();
+					return $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
 	 *
@@ -64,7 +76,14 @@ class Shared_Cache extends Cache {
 	 */
 	public function get($file) {
 		if ($file == '') {
-			return \OCP\Share::getItemsSharedWith('file', \OC_Share_Backend_File::FORMAT_FILE_APP_ROOT);
+			$data = \OCP\Share::getItemsSharedWith('file', \OC_Share_Backend_File::FORMAT_FILE_APP_ROOT);
+			$etag = \OCP\Config::getUserValue(\OCP\User::getUser(), 'files_sharing', 'etag');
+			if (!isset($etag)) {
+				$etag = $this->storage->getETag('');
+				\OCP\Config::setUserValue(\OCP\User::getUser(), 'files_sharing', 'etag', $etag);
+			}
+			$data['etag'] = $etag;
+			return $data;
 		} else if (is_string($file)) {
 			if ($cache = $this->getSourceCache($file)) {
 				return $cache->get($this->files[$file]);
@@ -118,7 +137,9 @@ class Shared_Cache extends Cache {
 	 * @return int file id
 	 */
 	public function put($file, array $data) {
-		if ($cache = $this->getSourceCache($file)) {
+		if ($file === '' && isset($data['etag'])) {
+			return \OCP\Config::setUserValue(\OCP\User::getUser(), 'files_sharing', 'etag', $data['etag']);
+		} else if ($cache = $this->getSourceCache($file)) {
 			return $cache->put($this->files[$file], $data);
 		}
 		return false;
@@ -169,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']);
 			}
-
 		}
 	}
 
@@ -256,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/share/file.php b/apps/files_sharing/lib/share/file.php
index fa43e87b49e39be3091e81c27501bbe36704b1e7..62948651806fdde14b0d28b67d64dcaa57567cc5 100644
--- a/apps/files_sharing/lib/share/file.php
+++ b/apps/files_sharing/lib/share/file.php
@@ -93,6 +93,7 @@ class OC_Share_Backend_File implements OCP\Share_Backend_File_Dependent {
 				$file['size'] = $item['size'];
 				$file['mtime'] = $item['mtime'];
 				$file['encrypted'] = $item['encrypted'];
+				$file['etag'] = $item['etag'];
 				$files[] = $file;
 			}
 			return $files;
diff --git a/apps/files_sharing/lib/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php
index be0e59e6732dc52bbc8e0ec99fdf94200b41dde6..5c23a9eb0d0a69a0c1001786538c624790a718c6 100644
--- a/apps/files_sharing/lib/sharedstorage.php
+++ b/apps/files_sharing/lib/sharedstorage.php
@@ -45,7 +45,18 @@ class Shared extends \OC\Files\Storage\Common {
 	*/
 	private function getFile($target) {
 		if (!isset($this->files[$target])) {
-			$this->files[$target] = \OC_Share_Backend_File::getSource($target);
+			// Check for partial files
+			if (pathinfo($target, PATHINFO_EXTENSION) === 'part') {
+				$source = \OC_Share_Backend_File::getSource(substr($target, 0, -5));
+				if ($source) {
+					$source['path'] .= '.part';
+					// All partial files have delete permission
+					$source['permissions'] |= \OCP\PERMISSION_DELETE;
+				}
+			} else {
+				$source = \OC_Share_Backend_File::getSource($target);
+			}
+			$this->files[$target] = $source;
 		}
 		return $this->files[$target];
 	}
@@ -60,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;
 				}
@@ -280,34 +291,43 @@ class Shared extends \OC\Files\Storage\Common {
 	}
 
 	public function rename($path1, $path2) {
-		// Renaming/moving is only allowed within shared folders
-		$pos1 = strpos($path1, '/', 1);
-		$pos2 = strpos($path2, '/', 1);
-		if ($pos1 !== false && $pos2 !== false && ($oldSource = $this->getSourcePath($path1))) {
-			$newSource = $this->getSourcePath(dirname($path2)).'/'.basename($path2);
-			if (dirname($path1) == dirname($path2)) {
-				// Rename the file if UPDATE permission is granted
-				if ($this->isUpdatable($path1)) {
-					list($storage, $oldInternalPath) = \OC\Files\Filesystem::resolvePath($oldSource);
-					list( , $newInternalPath) = \OC\Files\Filesystem::resolvePath($newSource);
-					return $storage->rename($oldInternalPath, $newInternalPath);
-				}
-			} else {
-				// Move the file if DELETE and CREATE permissions are granted
-				if ($this->isDeletable($path1) && $this->isCreatable(dirname($path2))) {
-					// Get the root shared folder
-					$folder1 = substr($path1, 0, $pos1);
-					$folder2 = substr($path2, 0, $pos2);
-					// Copy and unlink the file if it exists in a different shared folder
-					if ($folder1 != $folder2) {
-						if ($this->copy($path1, $path2)) {
-							return $this->unlink($path1);
-						}
-					} else {
+		// Check for partial files
+		if (pathinfo($path1, PATHINFO_EXTENSION) === 'part') {
+			if ($oldSource = $this->getSourcePath($path1)) {
+				list($storage, $oldInternalPath) = \OC\Files\Filesystem::resolvePath($oldSource);
+				$newInternalPath = substr($oldInternalPath, 0, -5);
+				return $storage->rename($oldInternalPath, $newInternalPath);
+			}
+		} else {
+			// Renaming/moving is only allowed within shared folders
+			$pos1 = strpos($path1, '/', 1);
+			$pos2 = strpos($path2, '/', 1);
+			if ($pos1 !== false && $pos2 !== false && ($oldSource = $this->getSourcePath($path1))) {
+				$newSource = $this->getSourcePath(dirname($path2)).'/'.basename($path2);
+				if (dirname($path1) == dirname($path2)) {
+					// Rename the file if UPDATE permission is granted
+					if ($this->isUpdatable($path1)) {
 						list($storage, $oldInternalPath) = \OC\Files\Filesystem::resolvePath($oldSource);
 						list( , $newInternalPath) = \OC\Files\Filesystem::resolvePath($newSource);
 						return $storage->rename($oldInternalPath, $newInternalPath);
 					}
+				} else {
+					// Move the file if DELETE and CREATE permissions are granted
+					if ($this->isDeletable($path1) && $this->isCreatable(dirname($path2))) {
+						// Get the root shared folder
+						$folder1 = substr($path1, 0, $pos1);
+						$folder2 = substr($path2, 0, $pos2);
+						// Copy and unlink the file if it exists in a different shared folder
+						if ($folder1 != $folder2) {
+							if ($this->copy($path1, $path2)) {
+								return $this->unlink($path1);
+							}
+						} else {
+							list($storage, $oldInternalPath) = \OC\Files\Filesystem::resolvePath($oldSource);
+							list( , $newInternalPath) = \OC\Files\Filesystem::resolvePath($newSource);
+							return $storage->rename($oldInternalPath, $newInternalPath);
+						}
+					}
 				}
 			}
 		}
@@ -371,7 +391,7 @@ class Shared extends \OC\Files\Storage\Common {
 
 	public function free_space($path) {
 		if ($path == '') {
-			return -1;
+			return \OC\Files\FREE_SPACE_UNKNOWN;
 		}
 		$source = $this->getSourcePath($path);
 		if ($source) {
diff --git a/apps/files_sharing/lib/updater.php b/apps/files_sharing/lib/updater.php
new file mode 100644
index 0000000000000000000000000000000000000000..a43ab2e2a0a5e07ad5188b96b3e481e99c60d69e
--- /dev/null
+++ b/apps/files_sharing/lib/updater.php
@@ -0,0 +1,106 @@
+<?php
+/**
+ * ownCloud
+ *
+ * @author Michael Gapczynski
+ * @copyright 2013 Michael Gapczynski mtgap@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/>.
+ */
+
+namespace OC\Files\Cache;
+
+class Shared_Updater {
+
+	/**
+	* Correct the parent folders' ETags for all users shared the file at $target
+	*
+	* @param string $target
+	*/
+	static public function correctFolders($target) {
+		$uid = \OCP\User::getUser();
+		$uidOwner = \OC\Files\Filesystem::getOwner($target);
+		$info = \OC\Files\Filesystem::getFileInfo($target);
+		// Correct Shared folders of other users shared with
+		$users = \OCP\Share::getUsersItemShared('file', $info['fileid'], $uidOwner, true);
+		if (!empty($users)) {
+			while (!empty($users)) {
+				$reshareUsers = array();
+				foreach ($users as $user) {
+					if ( $user !== $uidOwner ) {
+						$etag = \OC\Files\Filesystem::getETag('');
+						\OCP\Config::setUserValue($user, 'files_sharing', 'etag', $etag);
+						// Look for reshares
+						$reshareUsers = array_merge($reshareUsers, \OCP\Share::getUsersItemShared('file', $info['fileid'], $user, true));
+					}
+				}
+				$users = $reshareUsers;
+			}
+			// Correct folders of shared file owner
+			$target = substr($target, 8);
+			if ($uidOwner !== $uid && $source = \OC_Share_Backend_File::getSource($target)) {
+				\OC\Files\Filesystem::initMountPoints($uidOwner);
+				$source = '/'.$uidOwner.'/'.$source['path'];
+				\OC\Files\Cache\Updater::correctFolder($source, $info['mtime']);
+			}
+		}
+	}
+
+	/**
+	 * @param array $params
+	 */
+	static public function writeHook($params) {
+		self::correctFolders($params['path']);
+	}
+
+	/**
+	 * @param array $params
+	 */
+	static public function renameHook($params) {
+		self::correctFolders($params['newpath']);
+		self::correctFolders(pathinfo($params['oldpath'], PATHINFO_DIRNAME));
+	}
+
+	/**
+	 * @param array $params
+	 */
+	static public function deleteHook($params) {
+		self::correctFolders($params['path']);
+	}
+
+	/**
+	 * @param array $params
+	 */
+	static public function shareHook($params) {
+		if ($params['itemType'] === 'file' || $params['itemType'] === 'folder') {
+			$uidOwner = \OCP\User::getUser();
+			$users = \OCP\Share::getUsersItemShared($params['itemType'], $params['fileSource'], $uidOwner, true);
+			if (!empty($users)) {
+				while (!empty($users)) {
+					$reshareUsers = array();
+					foreach ($users as $user) {
+						if ($user !== $uidOwner) {
+							$etag = \OC\Files\Filesystem::getETag('');
+							\OCP\Config::setUserValue($user, 'files_sharing', 'etag', $etag);
+							// Look for reshares
+							$reshareUsers = array_merge($reshareUsers, \OCP\Share::getUsersItemShared('file', $params['fileSource'], $user, true));
+						}
+					}
+					$users = $reshareUsers;
+				}
+			}
+		}
+	}
+
+}
diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php
index 1da972ad7e3fd295053a4b419de74cb1bdf2c501..2b283375a67734e15bde3e4c811b83e486d9a1f3 100644
--- a/apps/files_sharing/public.php
+++ b/apps/files_sharing/public.php
@@ -3,6 +3,13 @@ $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;
@@ -113,7 +120,13 @@ if (isset($path)) {
 	// Download the file
 	if (isset($_GET['download'])) {
 		if (isset($_GET['files'])) { // download selected files
-			OC_Files::get($path, $_GET['files'], $_SERVER['REQUEST_METHOD'] == 'HEAD' ? true : false);
+			$files = urldecode($_GET['files']);
+			$files_list = json_decode($files);
+			// in case we get only a single file
+			if ($files_list === NULL ) {
+				$files_list = array($files);
+			}
+			OC_Files::get($path, $files_list, $_SERVER['REQUEST_METHOD'] == 'HEAD' ? true : false);
 		} else {
 			OC_Files::get($dir, $file, $_SERVER['REQUEST_METHOD'] == 'HEAD' ? true : false);
 		}
diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php
index 88692445ec308d2f45f5c001a92b08bad738b050..88a4cc242ba6c3442faa47de41a119d333548ce8 100644
--- a/apps/files_sharing/templates/public.php
+++ b/apps/files_sharing/templates/public.php
@@ -28,7 +28,13 @@
 			<div id="imgframe">
 				<img src="<?php p($_['downloadURL']); ?>" />
 			</div>
-		<?php endif; ?>
+		<?php elseif (substr($_['mimetype'], 0, strpos($_['mimetype'], '/')) == 'video'): ?>
+			<div id="imgframe">
+				<video tabindex="0" controls="" autoplay="">
+				<source src="<?php p($_['downloadURL']); ?>" type="<?php p($_['mimetype']); ?>" />
+				</video>
+			</div>
+		<?php else: ?>
 		<ul id="noPreview">
 			<li class="error">
 				<?php p($l->t('No preview available for').' '.$_['fileTarget']); ?><br />
@@ -37,6 +43,7 @@
 					/><?php p($l->t('Download'))?></a>
 			</li>
 		</ul>
+		<?php endif; ?>
 	<?php endif; ?>
 </div>
 <footer><p class="info"><a href="http://owncloud.org/">ownCloud</a> &ndash;
diff --git a/apps/files_trashbin/ajax/delete.php b/apps/files_trashbin/ajax/delete.php
index 1834fb54003a476aacf4b7c2a7339ff6d5e11ccd..16c39ab385382507cdd4a6069c31a2d4cca66805 100644
--- a/apps/files_trashbin/ajax/delete.php
+++ b/apps/files_trashbin/ajax/delete.php
@@ -10,6 +10,7 @@ $list = json_decode($files);
 $error = array();
 $success = array();
 
+
 $i = 0;
 foreach ($list as $file) {
 	if ( $dirlisting=='0') {
@@ -28,6 +29,7 @@ foreach ($list as $file) {
 		$i++;
 	} else {
 		$error[] = $filename;
+		OC_Log::write('trashbin','can\'t delete ' . $filename . ' permanently.', OC_Log::ERROR);
 	}
 }
 
diff --git a/apps/files_trashbin/ajax/undelete.php b/apps/files_trashbin/ajax/undelete.php
index 80de3c31f912379a955de633584afde20196891a..9d78f166765b13f44344bfb1a3361cd8aec6f7d2 100644
--- a/apps/files_trashbin/ajax/undelete.php
+++ b/apps/files_trashbin/ajax/undelete.php
@@ -24,6 +24,7 @@ foreach ($list as $file) {
 
 	if ( !OCA\Files_Trashbin\Trashbin::restore($file, $filename, $timestamp) ) {
 		$error[] = $filename;
+		OC_Log::write('trashbin','can\'t restore ' . $filename, OC_Log::ERROR);
 	} else {
 		$success[$i]['filename'] = $file;
 		$success[$i]['timestamp'] = $timestamp;
diff --git a/apps/files_trashbin/appinfo/app.php b/apps/files_trashbin/appinfo/app.php
index a6a99db034c9f19deb1fa1d1e9b47e1e9254fe39..e83d3b8fbbd766ccadf600b766452bec191e3a16 100644
--- a/apps/files_trashbin/appinfo/app.php
+++ b/apps/files_trashbin/appinfo/app.php
@@ -3,5 +3,7 @@
 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
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/appinfo/update.php b/apps/files_trashbin/appinfo/update.php
index b0bf79cc510f4c5c22a1af8df09cb092df4f9c0a..f4dad7b26bf2dbcdd33d4d7c3f49d5c2dabfcc47 100644
--- a/apps/files_trashbin/appinfo/update.php
+++ b/apps/files_trashbin/appinfo/update.php
@@ -1,40 +1,10 @@
 <?php
 
 $installedVersion=OCP\Config::getAppValue('files_trashbin', 'installed_version');
-// move versions to new directory
 
-if (version_compare($installedVersion, '0.2', '<')) {
-	$datadir = \OCP\Config::getSystemValue('datadirectory').'/';
-
-	$users = \OCP\User::getUsers();
-	foreach ($users as $user) {
-		
-		//create new folders
-		@mkdir($datadir.$user.'/files_trashbin/files');
-		@mkdir($datadir.$user.'/files_trashbin/versions');
-		@mkdir($datadir.$user.'/files_trashbin/keyfiles');
-			
-		// move files to the new folders
-		if ($handle = opendir($datadir.$user.'/files_trashbin')) {
-			while (false !== ($file = readdir($handle))) {
-				if ($file != "." && $file != ".." && $file != 'files' && $file != 'versions' && $file != 'keyfiles') {
-					rename($datadir.$user.'/files_trashbin/'.$file,
-							$datadir.$user.'/files_trashbin/files/'.$file);
-				}
-			}
-			closedir($handle);
-		}
-				
-		// move versions to the new folder
-		if ($handle = opendir($datadir.$user.'/versions_trashbin')) {
-			while (false !== ($file = readdir($handle))) {
-				rename($datadir.$user.'/versions_trashbin/'.$file,
-						$datadir.$user.'/files_trashbin/versions/'.$file);
-			}
-			closedir($handle);
-		}
-		
-		@rmdir($datadir.$user.'/versions_trashbin');
-		
-	}
+if (version_compare($installedVersion, '0.4', '<')) {
+	//size of the trash bin could be incorrect, remove it for all users to
+	//enforce a recalculation during next usage.
+	$query = \OC_DB::prepare('DELETE FROM `*PREFIX*files_trashsize`');
+	$result = $query->execute();
 }
\ No newline at end of file
diff --git a/apps/files_trashbin/appinfo/version b/apps/files_trashbin/appinfo/version
index be586341736ee60d6ca2be0f3762a307e8fe79f9..bd73f47072b1fe4b9914ec14a7f6d47fcc8f816a 100644
--- a/apps/files_trashbin/appinfo/version
+++ b/apps/files_trashbin/appinfo/version
@@ -1 +1 @@
-0.3
+0.4
diff --git a/apps/files_trashbin/index.php b/apps/files_trashbin/index.php
index 24ccd8c4609535299f006fb661a9cf05d85b3282..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 != '..' ) {
@@ -43,7 +42,7 @@ if ($dir) {
 
 } else {
 	$dirlisting = false;
-	$query = \OC_DB::prepare('SELECT `id`,`location`,`timestamp`,`type`,`mime` FROM `*PREFIX*files_trash` WHERE user = ?');
+	$query = \OC_DB::prepare('SELECT `id`,`location`,`timestamp`,`type`,`mime` FROM `*PREFIX*files_trash` WHERE `user` = ?');
 	$result = $query->execute(array($user))->fetchAll();
 }
 
diff --git a/apps/files_trashbin/js/trash.js b/apps/files_trashbin/js/trash.js
index 39e76e10c9c6792cab6411c72dc319cead3fcddb..eed253d66025ecea4341ec018506505f5485ead3 100644
--- a/apps/files_trashbin/js/trash.js
+++ b/apps/files_trashbin/js/trash.js
@@ -16,7 +16,7 @@ $(document).ready(function() {
 						row.parentNode.removeChild(row);
 					}
 					if (result.status != 'success') {
-						OC.dialogs.alert(result.data.message, 'Error');
+						OC.dialogs.alert(result.data.message, t('core', 'Error'));
 					}
 				});
 
@@ -43,7 +43,7 @@ $(document).ready(function() {
 						row.parentNode.removeChild(row);
 					}
 					if (result.status != 'success') {
-						OC.dialogs.alert(result.data.message, 'Error');
+						OC.dialogs.alert(result.data.message, t('core', 'Error'));
 					}
 				});
 
@@ -111,7 +111,7 @@ $(document).ready(function() {
 							row.parentNode.removeChild(row);
 						}
 						if (result.status != 'success') {
-							OC.dialogs.alert(result.data.message, 'Error');
+							OC.dialogs.alert(result.data.message, t('core', 'Error'));
 						}
 					});
 			});
@@ -136,7 +136,7 @@ $(document).ready(function() {
 							row.parentNode.removeChild(row);
 						}
 						if (result.status != 'success') {
-							OC.dialogs.alert(result.data.message, 'Error');
+							OC.dialogs.alert(result.data.message, t('core', 'Error'));
 						}
 					});
 			});
diff --git a/apps/files_trashbin/l10n/ar.php b/apps/files_trashbin/l10n/ar.php
index 7b2e286336753dc219700de49dc0eb0847e77dd3..f36133db547948a97806359b82f8459cc7e232b2 100644
--- a/apps/files_trashbin/l10n/ar.php
+++ b/apps/files_trashbin/l10n/ar.php
@@ -1,4 +1,18 @@
 <?php $TRANSLATIONS = array(
+"Couldn't delete %s permanently" => "ØªØ¹Ø°Ù‘Ø± ØØ°Ù%s Ø¨Ø´ÙƒÙ„ Ø¯Ø§Ø¦Ù…",
+"Couldn't restore %s" => "ØªØ¹Ø°Ù‘Ø± Ø§Ø³ØªØ±Ø¬Ø§Ø¹ %s ",
+"perform restore operation" => "Ø¥Ø¨Ø¯Ø¡ Ø¹Ù…Ù„ÙŠØ© Ø§Ù„Ø¥Ø³ØªØ¹Ø§Ø¯Ø©",
+"Error" => "Ø®Ø·Ø£",
+"delete file permanently" => "ØØ°Ù Ø¨Ø´ÙƒÙ„ Ø¯Ø§Ø¦Ù…",
+"Delete permanently" => "ØØ°Ù Ø¨Ø´ÙƒÙ„ Ø¯Ø§Ø¦Ù…",
 "Name" => "Ø§Ø³Ù…",
-"Delete" => "Ø¥Ù„ØºØ§Ø¡"
+"Deleted" => "ØªÙ… Ø§Ù„ØØ°Ù",
+"1 folder" => "Ù…Ø¬Ù„Ø¯ Ø¹Ø¯Ø¯ 1",
+"{count} folders" => "{count} Ù…Ø¬Ù„Ø¯Ø§Øª",
+"1 file" => "Ù…Ù„Ù ÙˆØ§ØØ¯",
+"{count} files" => "{count} Ù…Ù„ÙØ§Øª",
+"Nothing in here. Your trash bin is empty!" => "Ù„Ø§ ÙŠÙˆØ¬Ø¯ Ø´ÙŠØ¡ Ù‡Ù†Ø§. Ø³Ù„Ø© Ø§Ù„Ù…Ù‡Ù…Ù„Ø§Øª Ø®Ø§Ù„ÙŠÙ‡.",
+"Restore" => "Ø§Ø³ØªØ¹ÙŠØ¯",
+"Delete" => "Ø¥Ù„ØºØ§Ø¡",
+"Deleted Files" => "Ø§Ù„Ù…Ù„ÙØ§Øª Ø§Ù„Ù…ØØ°ÙˆÙÙ‡"
 );
diff --git a/apps/files_trashbin/l10n/bg_BG.php b/apps/files_trashbin/l10n/bg_BG.php
index 29e69a02fbb755aa1613b758361719f460c2b7c4..288518e1a41320914d5abee9cae4a70af6460318 100644
--- a/apps/files_trashbin/l10n/bg_BG.php
+++ b/apps/files_trashbin/l10n/bg_BG.php
@@ -2,6 +2,7 @@
 "Couldn't delete %s permanently" => "ÐÐµÐ²ÑŠÐ·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¸Ð·Ñ‚Ñ€Ð¸Ð²Ð°Ð½Ðµ Ð½Ð° %s Ð·Ð°Ð²Ð¸Ð½Ð°Ð³Ð¸",
 "Couldn't restore %s" => "ÐÐµÐ²ÑŠÐ·Ð¼Ð¾Ð¶Ð½Ð¾ Ð²ÑŠÐ·Ñ‚Ð°Ð½Ð¾Ð²ÑÐ²Ð°Ð½Ðµ Ð½Ð° %s",
 "perform restore operation" => "Ð¸Ð·Ð²ÑŠÑ€ÑˆÐ²Ð°Ð½Ðµ Ð½Ð° Ð´ÐµÐ¹ÑÑ‚Ð²Ð¸Ðµ Ð¿Ð¾ Ð²ÑŠÐ·ÑÑ‚Ð°Ð½Ð¾Ð²ÑÐ²Ð°Ð½Ðµ",
+"Error" => "Ð“Ñ€ÐµÑˆÐºÐ°",
 "delete file permanently" => "Ð¸Ð·Ñ‚Ñ€Ð¸Ð²Ð°Ð½Ðµ Ð½Ð° Ñ„Ð°Ð¹Ð»Ð° Ð·Ð°Ð²Ð¸Ð½Ð°Ð³Ð¸",
 "Delete permanently" => "Ð˜Ð·Ñ‚Ñ€Ð¸Ð²Ð°Ð½Ðµ Ð·Ð°Ð²Ð¸Ð½Ð°Ð³Ð¸",
 "Name" => "Ð˜Ð¼Ðµ",
@@ -12,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/bn_BD.php b/apps/files_trashbin/l10n/bn_BD.php
index d61355c52c204f51da086053120b6fa9653cc910..75b071bfa7432dab12c1303049c4b8a57ef9aee0 100644
--- a/apps/files_trashbin/l10n/bn_BD.php
+++ b/apps/files_trashbin/l10n/bn_BD.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"Error" => "à¦¸à¦®à¦¸à§à¦¯à¦¾",
 "Name" => "à¦°à¦¾à¦®",
 "1 folder" => "à§§à¦Ÿà¦¿ à¦«à§‹à¦²à§à¦¡à¦¾à¦°",
 "{count} folders" => "{count} à¦Ÿà¦¿ à¦«à§‹à¦²à§à¦¡à¦¾à¦°",
diff --git a/apps/files_trashbin/l10n/ca.php b/apps/files_trashbin/l10n/ca.php
index 894ed6a729d5307af31a160f85abdba8029e8b97..b7540f653d678d28fb17e1cfe0e36829293930d4 100644
--- a/apps/files_trashbin/l10n/ca.php
+++ b/apps/files_trashbin/l10n/ca.php
@@ -2,6 +2,7 @@
 "Couldn't delete %s permanently" => "No s'ha pogut esborrar permanentment %s",
 "Couldn't restore %s" => "No s'ha pogut restaurar %s",
 "perform restore operation" => "executa l'operaciÃ³ de restauraciÃ³",
+"Error" => "Error",
 "delete file permanently" => "esborra el fitxer permanentment",
 "Delete permanently" => "Esborra permanentment",
 "Name" => "Nom",
@@ -12,5 +13,6 @@
 "{count} files" => "{count} fitxers",
 "Nothing in here. Your trash bin is empty!" => "La paperera estÃ  buida!",
 "Restore" => "Recupera",
-"Delete" => "Esborra"
+"Delete" => "Esborra",
+"Deleted Files" => "Fitxers eliminats"
 );
diff --git a/apps/files_trashbin/l10n/cs_CZ.php b/apps/files_trashbin/l10n/cs_CZ.php
index d32af39877b590810707e6ba749efe3ebf6d004b..416b6b231d5a63f5331aae8bdbcaf2db150e46b5 100644
--- a/apps/files_trashbin/l10n/cs_CZ.php
+++ b/apps/files_trashbin/l10n/cs_CZ.php
@@ -2,6 +2,7 @@
 "Couldn't delete %s permanently" => "Nelze trvale odstranit %s",
 "Couldn't restore %s" => "Nelze obnovit %s",
 "perform restore operation" => "provÃ©st obnovu",
+"Error" => "Chyba",
 "delete file permanently" => "trvale odstranit soubor",
 "Delete permanently" => "Trvale odstranit",
 "Name" => "NÃ¡zev",
@@ -12,5 +13,6 @@
 "{count} files" => "{count} soubory",
 "Nothing in here. Your trash bin is empty!" => "Å½Ã¡dnÃ½ obsah. VÃ¡Å¡ koÅ¡ je prÃ¡zdnÃ½.",
 "Restore" => "Obnovit",
-"Delete" => "Smazat"
+"Delete" => "Smazat",
+"Deleted Files" => "SmazanÃ© soubory"
 );
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/da.php b/apps/files_trashbin/l10n/da.php
index ca4a2e8215d6ea2ee46925490851ccf856530646..16f98baed7e879d806030dbb3ea0d497f8fb3074 100644
--- a/apps/files_trashbin/l10n/da.php
+++ b/apps/files_trashbin/l10n/da.php
@@ -2,6 +2,7 @@
 "Couldn't delete %s permanently" => "Kunne ikke slette %s permanent",
 "Couldn't restore %s" => "Kunne ikke gendanne %s",
 "perform restore operation" => "udfÃ¸r gendannelsesoperation",
+"Error" => "Fejl",
 "delete file permanently" => "slet fil permanent",
 "Delete permanently" => "Slet permanent",
 "Name" => "Navn",
@@ -12,5 +13,6 @@
 "{count} files" => "{count} filer",
 "Nothing in here. Your trash bin is empty!" => "Intet at se her. Din papirkurv er tom!",
 "Restore" => "Gendan",
-"Delete" => "Slet"
+"Delete" => "Slet",
+"Deleted Files" => "Slettede filer"
 );
diff --git a/apps/files_trashbin/l10n/de.php b/apps/files_trashbin/l10n/de.php
index d1952c9635a14f85485bcae6837715c75e18f668..4dd9033969e485482ec028e2f90530d3e7ed7a6a 100644
--- a/apps/files_trashbin/l10n/de.php
+++ b/apps/files_trashbin/l10n/de.php
@@ -2,8 +2,9 @@
 "Couldn't delete %s permanently" => "Konnte %s nicht dauerhaft lÃ¶schen",
 "Couldn't restore %s" => "Konnte %s nicht wiederherstellen",
 "perform restore operation" => "Wiederherstellung ausfÃ¼hren",
+"Error" => "Fehler",
 "delete file permanently" => "Datei dauerhaft lÃ¶schen",
-"Delete permanently" => "Permanent lÃ¶schen",
+"Delete permanently" => "EndgÃ¼ltig lÃ¶schen",
 "Name" => "Name",
 "Deleted" => "gelÃ¶scht",
 "1 folder" => "1 Ordner",
@@ -12,5 +13,6 @@
 "{count} files" => "{count} Dateien",
 "Nothing in here. Your trash bin is empty!" => "Nichts zu lÃ¶schen, der Papierkorb ist leer!",
 "Restore" => "Wiederherstellen",
-"Delete" => "LÃ¶schen"
+"Delete" => "LÃ¶schen",
+"Deleted Files" => "GelÃ¶schte Dateien"
 );
diff --git a/apps/files_trashbin/l10n/de_DE.php b/apps/files_trashbin/l10n/de_DE.php
index 269680ca2c3f0ce5537998be967e2d7d8aa02e5a..829b5026e1a354d5fc07ec4a325d86422e0eef4d 100644
--- a/apps/files_trashbin/l10n/de_DE.php
+++ b/apps/files_trashbin/l10n/de_DE.php
@@ -2,6 +2,7 @@
 "Couldn't delete %s permanently" => "Konnte %s nicht dauerhaft lÃ¶schen",
 "Couldn't restore %s" => "Konnte %s nicht wiederherstellen",
 "perform restore operation" => "Wiederherstellung ausfÃ¼hren",
+"Error" => "Fehler",
 "delete file permanently" => "Datei dauerhaft lÃ¶schen",
 "Delete permanently" => "EndgÃ¼ltig lÃ¶schen",
 "Name" => "Name",
@@ -12,5 +13,6 @@
 "{count} files" => "{count} Dateien",
 "Nothing in here. Your trash bin is empty!" => "Nichts zu lÃ¶schen, Ihr Papierkorb ist leer!",
 "Restore" => "Wiederherstellen",
-"Delete" => "LÃ¶schen"
+"Delete" => "LÃ¶schen",
+"Deleted Files" => "GelÃ¶schte Dateien"
 );
diff --git a/apps/files_trashbin/l10n/el.php b/apps/files_trashbin/l10n/el.php
index cf9471780c09264cdac51f51f09c375859c1127b..f95d90ada6171ae224c1c3a90494bd4e5530b3c9 100644
--- a/apps/files_trashbin/l10n/el.php
+++ b/apps/files_trashbin/l10n/el.php
@@ -2,6 +2,7 @@
 "Couldn't delete %s permanently" => "Î‘Î´ÏÎ½Î±Ï„Î· Î· Î¼ÏŒÎ½Î¹Î¼Î· Î´Î¹Î±Î³ÏÎ±Ï†Î® Ï„Î¿Ï… %s",
 "Couldn't restore %s" => "Î‘Î´Ï…Î½Î±Î¼Î¯Î± ÎµÏ€Î±Î½Î±Ï†Î¿ÏÎ¬Ï‚ %s",
 "perform restore operation" => "ÎµÎºÏ„ÎÎ»ÎµÏƒÎ· Î»ÎµÎ¹Ï„Î¿Ï…ÏÎ³Î¯Î± ÎµÏ€Î±Î½Î±Ï†Î¿ÏÎ¬Ï‚",
+"Error" => "Î£Ï†Î¬Î»Î¼Î±",
 "delete file permanently" => "Î¼ÏŒÎ½Î¹Î¼Î· Î´Î¹Î±Î³ÏÎ±Ï†Î® Î±ÏÏ‡ÎµÎ¯Î¿Ï…",
 "Delete permanently" => "ÎœÏŒÎ½Î¹Î¼Î· Î´Î¹Î±Î³ÏÎ±Ï†Î®",
 "Name" => "ÎŒÎ½Î¿Î¼Î±",
@@ -12,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/eo.php b/apps/files_trashbin/l10n/eo.php
index e1e5acbb5a80f6a9bb6b381976ba053db0a94b02..3288c4fcdc56187e88df52df3e501e71e3cb3848 100644
--- a/apps/files_trashbin/l10n/eo.php
+++ b/apps/files_trashbin/l10n/eo.php
@@ -1,9 +1,11 @@
 <?php $TRANSLATIONS = array(
+"Error" => "Eraro",
 "Name" => "Nomo",
 "1 folder" => "1 dosierujo",
 "{count} folders" => "{count} dosierujoj",
 "1 file" => "1 dosiero",
 "{count} files" => "{count} dosierujoj",
 "Restore" => "RestaÅri",
-"Delete" => "Forigi"
+"Delete" => "Forigi",
+"Deleted Files" => "Forigitaj dosieroj"
 );
diff --git a/apps/files_trashbin/l10n/es.php b/apps/files_trashbin/l10n/es.php
index ebc01b1d21e43c702dc571212d9bba4410bbaf8f..c267db7358af01e7f2996fa6f5495affe2938d2d 100644
--- a/apps/files_trashbin/l10n/es.php
+++ b/apps/files_trashbin/l10n/es.php
@@ -2,6 +2,7 @@
 "Couldn't delete %s permanently" => "No se puede eliminar %s permanentemente",
 "Couldn't restore %s" => "No se puede restaurar %s",
 "perform restore operation" => "Restaurar",
+"Error" => "Error",
 "delete file permanently" => "Eliminar archivo permanentemente",
 "Delete permanently" => "Eliminar permanentemente",
 "Name" => "Nombre",
@@ -10,7 +11,8 @@
 "{count} folders" => "{count} carpetas",
 "1 file" => "1 archivo",
 "{count} files" => "{count} archivos",
-"Nothing in here. Your trash bin is empty!" => "Nada aqui. La papelera esta vacia!",
+"Nothing in here. Your trash bin is empty!" => "No hay nada aquÃ. Â¡Tu papelera esta vacÃa!",
 "Restore" => "Recuperar",
-"Delete" => "Eliminar"
+"Delete" => "Eliminar",
+"Deleted Files" => "Archivos Eliminados"
 );
diff --git a/apps/files_trashbin/l10n/es_AR.php b/apps/files_trashbin/l10n/es_AR.php
index bb78a39d6c33c0744fc02c5aa24ea484ae516483..de7494ca69e879b7100ebcb96e3766d71c8ef57c 100644
--- a/apps/files_trashbin/l10n/es_AR.php
+++ b/apps/files_trashbin/l10n/es_AR.php
@@ -2,6 +2,7 @@
 "Couldn't delete %s permanently" => "No fue posible borrar %s de manera permanente",
 "Couldn't restore %s" => "No se pudo restaurar %s",
 "perform restore operation" => "Restaurar",
+"Error" => "Error",
 "delete file permanently" => "Borrar archivo de manera permanente",
 "Delete permanently" => "Borrar de manera permanente",
 "Name" => "Nombre",
@@ -12,5 +13,6 @@
 "{count} files" => "{count} archivos",
 "Nothing in here. Your trash bin is empty!" => "No hay nada acÃ¡. Â¡La papelera estÃ¡ vacÃa!",
 "Restore" => "Recuperar",
-"Delete" => "Borrar"
+"Delete" => "Borrar",
+"Deleted Files" => "Archivos eliminados"
 );
diff --git a/apps/files_trashbin/l10n/et_EE.php b/apps/files_trashbin/l10n/et_EE.php
index 73ae9dbee18023376de4214899a8f3d721136871..3d3b46a180823b469bfcf364ccaa548aaa0f2bf0 100644
--- a/apps/files_trashbin/l10n/et_EE.php
+++ b/apps/files_trashbin/l10n/et_EE.php
@@ -2,6 +2,7 @@
 "Couldn't delete %s permanently" => "%s jÃ¤Ã¤davalt kustutamine ebaÃµnnestus",
 "Couldn't restore %s" => "%s ei saa taastada",
 "perform restore operation" => "soorita taastamine",
+"Error" => "Viga",
 "delete file permanently" => "kustuta fail jÃ¤Ã¤davalt",
 "Delete permanently" => "Kustuta jÃ¤Ã¤davalt",
 "Name" => "Nimi",
@@ -12,5 +13,6 @@
 "{count} files" => "{count} faili",
 "Nothing in here. Your trash bin is empty!" => "Siin pole midagi. Sinu prÃ¼gikast on tÃ¼hi!",
 "Restore" => "Taasta",
-"Delete" => "Kustuta"
+"Delete" => "Kustuta",
+"Deleted Files" => "Kustutatud failid"
 );
diff --git a/apps/files_trashbin/l10n/eu.php b/apps/files_trashbin/l10n/eu.php
index 5a565436ede778f74ae895bfc139adc52900375d..45b77b7990c23d6449f6090d5cb9ef17c99b8816 100644
--- a/apps/files_trashbin/l10n/eu.php
+++ b/apps/files_trashbin/l10n/eu.php
@@ -2,6 +2,7 @@
 "Couldn't delete %s permanently" => "Ezin izan da %s betirako ezabatu",
 "Couldn't restore %s" => "Ezin izan da %s berreskuratu",
 "perform restore operation" => "berreskuratu",
+"Error" => "Errorea",
 "delete file permanently" => "ezabatu fitxategia betirako",
 "Delete permanently" => "Ezabatu betirako",
 "Name" => "Izena",
@@ -12,5 +13,6 @@
 "{count} files" => "{count} fitxategi",
 "Nothing in here. Your trash bin is empty!" => "Ez dago ezer ez. Zure zakarrontzia hutsik dago!",
 "Restore" => "Berrezarri",
-"Delete" => "Ezabatu"
+"Delete" => "Ezabatu",
+"Deleted Files" => "Ezabatutako Fitxategiak"
 );
diff --git a/apps/files_trashbin/l10n/fa.php b/apps/files_trashbin/l10n/fa.php
index 7cc695215e617500373d1d7e3b400de72c580bd3..6ecc6feacbf8d7bf15750547cc75cc9094f95d46 100644
--- a/apps/files_trashbin/l10n/fa.php
+++ b/apps/files_trashbin/l10n/fa.php
@@ -1,9 +1,18 @@
 <?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" => "ØØ°Ù"
+"Delete" => "ØØ°Ù",
+"Deleted Files" => "ÙØ§ÛŒÙ„Ù‡Ø§ÛŒ ØØ°Ù Ø´Ø¯Ù‡"
 );
diff --git a/apps/files_trashbin/l10n/fi_FI.php b/apps/files_trashbin/l10n/fi_FI.php
index e18689956d08e11b9d4a8d19049444bed59a176a..fd6edf398ea017164b971f00f955bf8748c6b8f4 100644
--- a/apps/files_trashbin/l10n/fi_FI.php
+++ b/apps/files_trashbin/l10n/fi_FI.php
@@ -2,6 +2,7 @@
 "Couldn't delete %s permanently" => "Kohdetta %s ei voitu poistaa pysyvÃ¤sti",
 "Couldn't restore %s" => "Kohteen %s palautus epÃ¤onnistui",
 "perform restore operation" => "suorita palautustoiminto",
+"Error" => "Virhe",
 "delete file permanently" => "poista tiedosto pysyvÃ¤sti",
 "Delete permanently" => "Poista pysyvÃ¤sti",
 "Name" => "Nimi",
@@ -12,5 +13,6 @@
 "{count} files" => "{count} tiedostoa",
 "Nothing in here. Your trash bin is empty!" => "TyhjÃ¤Ã¤ tÃ¤ynnÃ¤! Roskakorissa ei ole mitÃ¤Ã¤n.",
 "Restore" => "Palauta",
-"Delete" => "Poista"
+"Delete" => "Poista",
+"Deleted Files" => "Poistetut tiedostot"
 );
diff --git a/apps/files_trashbin/l10n/fr.php b/apps/files_trashbin/l10n/fr.php
index 0a783785efb5354687c58a73a59dad3198581173..8198e3e32a8287454400b8926b3b54341692bb1e 100644
--- a/apps/files_trashbin/l10n/fr.php
+++ b/apps/files_trashbin/l10n/fr.php
@@ -2,6 +2,7 @@
 "Couldn't delete %s permanently" => "Impossible d'effacer %s de faÃ§on permanente",
 "Couldn't restore %s" => "Impossible de restaurer %s",
 "perform restore operation" => "effectuer l'opÃ©ration de restauration",
+"Error" => "Erreur",
 "delete file permanently" => "effacer dÃ©finitivement le fichier",
 "Delete permanently" => "Supprimer de faÃ§on dÃ©finitive",
 "Name" => "Nom",
@@ -12,5 +13,6 @@
 "{count} files" => "{count} fichiers",
 "Nothing in here. Your trash bin is empty!" => "Il n'y a rien ici. Votre corbeille est vide !",
 "Restore" => "Restaurer",
-"Delete" => "Supprimer"
+"Delete" => "Supprimer",
+"Deleted Files" => "Fichiers effacÃ©s"
 );
diff --git a/apps/files_trashbin/l10n/gl.php b/apps/files_trashbin/l10n/gl.php
index 4e31dd0018a2cdc5a3e07a54ac29902bfd0ed79f..b9b3c8a1e5c73663530541360eb39d45459c230a 100644
--- a/apps/files_trashbin/l10n/gl.php
+++ b/apps/files_trashbin/l10n/gl.php
@@ -2,6 +2,7 @@
 "Couldn't delete %s permanently" => "Non foi posÃbel eliminar %s permanente",
 "Couldn't restore %s" => "Non foi posÃbel restaurar %s",
 "perform restore operation" => "realizar a operaciÃ³n de restauraciÃ³n",
+"Error" => "Erro",
 "delete file permanently" => "eliminar o ficheiro permanentemente",
 "Delete permanently" => "Eliminar permanentemente",
 "Name" => "Nome",
@@ -12,5 +13,6 @@
 "{count} files" => "{count} ficheiros",
 "Nothing in here. Your trash bin is empty!" => "AquÃ non hai nada. O cesto do lixo estÃ¡ baleiro!",
 "Restore" => "Restablecer",
-"Delete" => "Eliminar"
+"Delete" => "Eliminar",
+"Deleted Files" => "Ficheiros eliminados"
 );
diff --git a/apps/files_trashbin/l10n/he.php b/apps/files_trashbin/l10n/he.php
index 9c767d2222c818a39039bf5a13a07c29d322e059..e31fdb952ea85e061b8f683237603aea819fede3 100644
--- a/apps/files_trashbin/l10n/he.php
+++ b/apps/files_trashbin/l10n/he.php
@@ -2,6 +2,7 @@
 "Couldn't delete %s permanently" => "×‘×œ×ª×™ ××¤×©×¨×™ ×œ×ž×—×•×§ ××ª %s ×œ×¦×ž×™×ª×•×ª",
 "Couldn't restore %s" => "×‘×œ×ª×™ ××¤×©×¨×™ ×œ×©×—×–×¨ ××ª %s",
 "perform restore operation" => "×‘×¦×¢ ×¤×¢×•×œ×ª ×©×—×–×•×¨",
+"Error" => "×©×’×™××”",
 "delete file permanently" => "×ž×—×§ ×§×•×‘×¥ ×œ×¦×ž×™×ª×•×ª",
 "Delete permanently" => "×ž×—×§ ×œ×¦×ž×™×ª×•×ª",
 "Name" => "×©×",
diff --git a/apps/files_trashbin/l10n/hr.php b/apps/files_trashbin/l10n/hr.php
index 2cb86adfd405423190d97c24b545ae11bc04795f..a65d876e1f06311cbb151b7af98a2268ba6615bc 100644
--- a/apps/files_trashbin/l10n/hr.php
+++ b/apps/files_trashbin/l10n/hr.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"Error" => "GreÅ¡ka",
 "Name" => "Ime",
 "Delete" => "ObriÅ¡i"
 );
diff --git a/apps/files_trashbin/l10n/hu_HU.php b/apps/files_trashbin/l10n/hu_HU.php
index 9c158c2b9ecae46bf74d3039f7eaccd4a468458f..5e64bc04e03132ab36250716d23d24e2efd8eec0 100644
--- a/apps/files_trashbin/l10n/hu_HU.php
+++ b/apps/files_trashbin/l10n/hu_HU.php
@@ -2,6 +2,7 @@
 "Couldn't delete %s permanently" => "Nem sikerÃ¼lt %s vÃ©gleges tÃ¶rlÃ©se",
 "Couldn't restore %s" => "Nem sikerÃ¼lt %s visszaÃ¡llÃtÃ¡sa",
 "perform restore operation" => "a visszaÃ¡llÃtÃ¡s vÃ©grehajtÃ¡sa",
+"Error" => "Hiba",
 "delete file permanently" => "az Ã¡llomÃ¡ny vÃ©gleges tÃ¶rlÃ©se",
 "Delete permanently" => "VÃ©gleges tÃ¶rlÃ©s",
 "Name" => "NÃ©v",
@@ -12,5 +13,6 @@
 "{count} files" => "{count} fÃ¡jl",
 "Nothing in here. Your trash bin is empty!" => "Itt nincs semmi. Az Ã–n szemetes mappÃ¡ja Ã¼res!",
 "Restore" => "VisszaÃ¡llÃtÃ¡s",
-"Delete" => "TÃ¶rlÃ©s"
+"Delete" => "TÃ¶rlÃ©s",
+"Deleted Files" => "TÃ¶rÃ¶lt fÃ¡jlok"
 );
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 ab5fe25ac6b2ab270c59f328bd464ed148c2e0a0..62a63d515a3749ac279aa642c8132f22d0a1da05 100644
--- a/apps/files_trashbin/l10n/id.php
+++ b/apps/files_trashbin/l10n/id.php
@@ -2,14 +2,17 @@
 "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" => "Galat",
 "delete file permanently" => "hapus berkas 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!",
 "Restore" => "Pulihkan",
-"Delete" => "Hapus"
+"Delete" => "Hapus",
+"Deleted Files" => "Berkas yang Dihapus"
 );
diff --git a/apps/files_trashbin/l10n/is.php b/apps/files_trashbin/l10n/is.php
index fba36c91cb53b0184573d9df6884f5ee933ea71f..12267c6695a30511218476c545d50fc2d50e6ded 100644
--- a/apps/files_trashbin/l10n/is.php
+++ b/apps/files_trashbin/l10n/is.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"Error" => "Villa",
 "Name" => "Nafn",
 "1 folder" => "1 mappa",
 "{count} folders" => "{count} mÃ¶ppur",
diff --git a/apps/files_trashbin/l10n/it.php b/apps/files_trashbin/l10n/it.php
index 027b22c91ac0baa0a5f7529007c00bf6f3e45289..795fd6ea1674618537b7380e7040b98d77591300 100644
--- a/apps/files_trashbin/l10n/it.php
+++ b/apps/files_trashbin/l10n/it.php
@@ -2,6 +2,7 @@
 "Couldn't delete %s permanently" => "Impossibile eliminare %s definitivamente",
 "Couldn't restore %s" => "Impossibile ripristinare %s",
 "perform restore operation" => "esegui operazione di ripristino",
+"Error" => "Errore",
 "delete file permanently" => "elimina il file definitivamente",
 "Delete permanently" => "Elimina definitivamente",
 "Name" => "Nome",
@@ -12,5 +13,6 @@
 "{count} files" => "{count} file",
 "Nothing in here. Your trash bin is empty!" => "Qui non c'Ã¨ niente. Il tuo cestino Ã¨ vuoto.",
 "Restore" => "Ripristina",
-"Delete" => "Elimina"
+"Delete" => "Elimina",
+"Deleted Files" => "File eliminati"
 );
diff --git a/apps/files_trashbin/l10n/ja_JP.php b/apps/files_trashbin/l10n/ja_JP.php
index 478aa400664677d1d898dfb78ea24db5800b7a0b..db5783bf4328a690bc12794794ed8d0f7873c6f9 100644
--- a/apps/files_trashbin/l10n/ja_JP.php
+++ b/apps/files_trashbin/l10n/ja_JP.php
@@ -2,6 +2,7 @@
 "Couldn't delete %s permanently" => "%s ã‚’å®Œå…¨ã«å‰Šé™¤å‡ºæ¥ã¾ã›ã‚“ã§ã—ãŸ",
 "Couldn't restore %s" => "%s ã‚’å¾©å…ƒå‡ºæ¥ã¾ã›ã‚“ã§ã—ãŸ",
 "perform restore operation" => "å¾©å…ƒæ“ä½œã‚’å®Ÿè¡Œã™ã‚‹",
+"Error" => "ã‚¨ãƒ©ãƒ¼",
 "delete file permanently" => "ãƒ•ã‚¡ã‚¤ãƒ«ã‚’å®Œå…¨ã«å‰Šé™¤ã™ã‚‹",
 "Delete permanently" => "å®Œå…¨ã«å‰Šé™¤ã™ã‚‹",
 "Name" => "åå‰",
@@ -12,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/ka_GE.php b/apps/files_trashbin/l10n/ka_GE.php
index 05068767863df0a674b962cc1b8fab5db515a332..667eb500eb9f11ea6e716a642849d582be03c466 100644
--- a/apps/files_trashbin/l10n/ka_GE.php
+++ b/apps/files_trashbin/l10n/ka_GE.php
@@ -1,8 +1,18 @@
 <?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" => "{count} áƒ¡áƒáƒ¥áƒáƒ¦áƒáƒšáƒ“áƒ”",
 "1 file" => "1 áƒ¤áƒáƒ˜áƒšáƒ˜",
 "{count} files" => "{count} áƒ¤áƒáƒ˜áƒšáƒ˜",
-"Delete" => "áƒ¬áƒáƒ¨áƒšáƒ"
+"Nothing in here. Your trash bin is empty!" => "áƒáƒ¥ áƒáƒ áƒáƒ¤áƒ”áƒ áƒ˜ áƒáƒ  áƒáƒ áƒ˜áƒ¡. áƒ¡áƒáƒœáƒáƒ’áƒ•áƒ” áƒ§áƒ£áƒ—áƒ˜ áƒªáƒáƒ áƒ˜áƒ”áƒšáƒ˜áƒ!",
+"Restore" => "áƒáƒ¦áƒ“áƒ’áƒ”áƒœáƒ",
+"Delete" => "áƒ¬áƒáƒ¨áƒšáƒ",
+"Deleted Files" => "áƒ¬áƒáƒ¨áƒšáƒ˜áƒšáƒ˜ áƒ¤áƒáƒ˜áƒšáƒ”áƒ‘áƒ˜"
 );
diff --git a/apps/files_trashbin/l10n/ko.php b/apps/files_trashbin/l10n/ko.php
index b40546e34b8365be4d055b17493e79935800c29f..42ad87e98d2247283f347a1df1e85f5de1e4f83e 100644
--- a/apps/files_trashbin/l10n/ko.php
+++ b/apps/files_trashbin/l10n/ko.php
@@ -1,4 +1,6 @@
 <?php $TRANSLATIONS = array(
+"Error" => "ì˜¤ë¥˜",
+"Delete permanently" => "ì˜ì›ížˆ ì‚ì œ",
 "Name" => "ì´ë¦„",
 "1 folder" => "í´ë” 1ê°œ",
 "{count} folders" => "í´ë” {count}ê°œ",
diff --git a/apps/files_trashbin/l10n/ku_IQ.php b/apps/files_trashbin/l10n/ku_IQ.php
index cbdbe4644d120d3cdcfe89dd5a0c395d3a458edb..67fdd7d08fa910660052b87b9adaa4ba95746bdb 100644
--- a/apps/files_trashbin/l10n/ku_IQ.php
+++ b/apps/files_trashbin/l10n/ku_IQ.php
@@ -1,3 +1,4 @@
 <?php $TRANSLATIONS = array(
+"Error" => "Ù‡Ù‡â€ŒÚµÙ‡",
 "Name" => "Ù†Ø§Ùˆ"
 );
diff --git a/apps/files_trashbin/l10n/lb.php b/apps/files_trashbin/l10n/lb.php
index 01deea2350037c96bc26ede0753a6124fb31876e..2065ee03d3204b97d1d4fa1552d85bc3f15cd55c 100644
--- a/apps/files_trashbin/l10n/lb.php
+++ b/apps/files_trashbin/l10n/lb.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"Error" => "Fehler",
 "Name" => "Numm",
 "Delete" => "LÃ¤schen"
 );
diff --git a/apps/files_trashbin/l10n/lt_LT.php b/apps/files_trashbin/l10n/lt_LT.php
index 513c7626c4e75f4dcae8d5f5428463c4e80b4b35..011de161e425ebf70062567de246b3e2c384340e 100644
--- a/apps/files_trashbin/l10n/lt_LT.php
+++ b/apps/files_trashbin/l10n/lt_LT.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"Error" => "Klaida",
 "Name" => "Pavadinimas",
 "1 folder" => "1 aplankalas",
 "{count} folders" => "{count} aplankalai",
diff --git a/apps/files_trashbin/l10n/lv.php b/apps/files_trashbin/l10n/lv.php
index d3c68e2a778ee342aae530370a0b61004cda85bf..b1b8c3e6b03ab09e82f55a411a9395e0e0fdb8e1 100644
--- a/apps/files_trashbin/l10n/lv.php
+++ b/apps/files_trashbin/l10n/lv.php
@@ -2,6 +2,7 @@
 "Couldn't delete %s permanently" => "NevarÄ“ja pilnÄ«bÄ izdzÄ“st %s",
 "Couldn't restore %s" => "NevarÄ“ja atjaunot %s",
 "perform restore operation" => "veikt atjaunoÅ¡anu",
+"Error" => "KÄ¼Å«da",
 "delete file permanently" => "dzÄ“st datni pavisam",
 "Delete permanently" => "DzÄ“st pavisam",
 "Name" => "Nosaukums",
@@ -12,5 +13,6 @@
 "{count} files" => "{count} datnes",
 "Nothing in here. Your trash bin is empty!" => "Å eit nekÄ nav. JÅ«su miskaste ir tukÅ¡a!",
 "Restore" => "Atjaunot",
-"Delete" => "DzÄ“st"
+"Delete" => "DzÄ“st",
+"Deleted Files" => "DzÄ“stÄs datnes"
 );
diff --git a/apps/files_trashbin/l10n/mk.php b/apps/files_trashbin/l10n/mk.php
index 22b288b002f6e9476b9f2b4594dc4ac9d49e6069..175399249e55dd20bafb3a64e17b6b2f6d949fd2 100644
--- a/apps/files_trashbin/l10n/mk.php
+++ b/apps/files_trashbin/l10n/mk.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"Error" => "Ð“Ñ€ÐµÑˆÐºÐ°",
 "Name" => "Ð˜Ð¼Ðµ",
 "1 folder" => "1 Ð¿Ð°Ð¿ÐºÐ°",
 "{count} folders" => "{count} Ð¿Ð°Ð¿ÐºÐ¸",
diff --git a/apps/files_trashbin/l10n/ms_MY.php b/apps/files_trashbin/l10n/ms_MY.php
index 381d599865ee81c0bb00ea74a894fb57f3233823..52a997aab15678a8157171a982614f6a911c36cd 100644
--- a/apps/files_trashbin/l10n/ms_MY.php
+++ b/apps/files_trashbin/l10n/ms_MY.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"Error" => "Ralat",
 "Name" => "Nama",
 "Delete" => "Padam"
 );
diff --git a/apps/files_trashbin/l10n/nb_NO.php b/apps/files_trashbin/l10n/nb_NO.php
index fa9543a5eb06e1f45012e6752bfb9f852933b41a..43ad018049447a8d0a1b6c1bcf98a031bf498680 100644
--- a/apps/files_trashbin/l10n/nb_NO.php
+++ b/apps/files_trashbin/l10n/nb_NO.php
@@ -2,6 +2,7 @@
 "Couldn't delete %s permanently" => "Kunne ikke slette %s fullstendig",
 "Couldn't restore %s" => "Kunne ikke gjenopprette %s",
 "perform restore operation" => "utfÃ¸r gjenopprettings operasjon",
+"Error" => "Feil",
 "delete file permanently" => "slett filer permanent",
 "Delete permanently" => "Slett permanent",
 "Name" => "Navn",
@@ -12,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/nl.php b/apps/files_trashbin/l10n/nl.php
index c576e5d81f8cc19b69fcc01463dc3b76f9954a33..91844a14b663eca3c3be1984becb1ecd6e7a9cbb 100644
--- a/apps/files_trashbin/l10n/nl.php
+++ b/apps/files_trashbin/l10n/nl.php
@@ -2,6 +2,7 @@
 "Couldn't delete %s permanently" => "Kon %s niet permanent verwijderen",
 "Couldn't restore %s" => "Kon %s niet herstellen",
 "perform restore operation" => "uitvoeren restore operatie",
+"Error" => "Fout",
 "delete file permanently" => "verwijder bestanden definitief",
 "Delete permanently" => "Verwijder definitief",
 "Name" => "Naam",
@@ -12,5 +13,6 @@
 "{count} files" => "{count} bestanden",
 "Nothing in here. Your trash bin is empty!" => "Niets te vinden. Uw prullenbak is leeg!",
 "Restore" => "Herstellen",
-"Delete" => "Verwijder"
+"Delete" => "Verwijder",
+"Deleted Files" => "Verwijderde bestanden"
 );
diff --git a/apps/files_trashbin/l10n/nn_NO.php b/apps/files_trashbin/l10n/nn_NO.php
index f8ab465ee42d5837bf5e2056ee07254860942f26..454ea2b05753198172040752659ff7bc99149290 100644
--- a/apps/files_trashbin/l10n/nn_NO.php
+++ b/apps/files_trashbin/l10n/nn_NO.php
@@ -1,4 +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/oc.php b/apps/files_trashbin/l10n/oc.php
index e6b939dac0c3565332ac03c58d7bdec703ed1798..fa9e097f6ca53fd35c4462ec4f9b2e3a26d95855 100644
--- a/apps/files_trashbin/l10n/oc.php
+++ b/apps/files_trashbin/l10n/oc.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"Error" => "Error",
 "Name" => "Nom",
 "Delete" => "Escafa"
 );
diff --git a/apps/files_trashbin/l10n/pl.php b/apps/files_trashbin/l10n/pl.php
index e5ea45b88aeee81c6601b0867100caedc733f444..5c9f558f11fd610ed79046a6cd880493f05e0a6d 100644
--- a/apps/files_trashbin/l10n/pl.php
+++ b/apps/files_trashbin/l10n/pl.php
@@ -2,15 +2,17 @@
 "Couldn't delete %s permanently" => "Nie moÅ¼na trwale usunÄ…Ä‡ %s",
 "Couldn't restore %s" => "Nie moÅ¼na przywrÃ³ciÄ‡ %s",
 "perform restore operation" => "wykonywanie operacji przywracania",
+"Error" => "BÅ‚Ä…d",
 "delete file permanently" => "trwale usuÅ„ plik",
 "Delete permanently" => "Trwale usuÅ„",
 "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Å„"
+"Delete" => "UsuÅ„",
+"Deleted Files" => "UsuniÄ™te pliki"
 );
diff --git a/apps/files_trashbin/l10n/pt_BR.php b/apps/files_trashbin/l10n/pt_BR.php
index b9932a71023f7a344a385e5e23a162edc15b0ce9..9dad8a40a85e4ab5abbae6e09579db6a7dc5d75a 100644
--- a/apps/files_trashbin/l10n/pt_BR.php
+++ b/apps/files_trashbin/l10n/pt_BR.php
@@ -2,6 +2,7 @@
 "Couldn't delete %s permanently" => "NÃ£o foi possÃvel excluir %s permanentemente",
 "Couldn't restore %s" => "NÃ£o foi possÃvel restaurar %s",
 "perform restore operation" => "realizar operaÃ§Ã£o de restauraÃ§Ã£o",
+"Error" => "Erro",
 "delete file permanently" => "excluir arquivo permanentemente",
 "Delete permanently" => "Excluir permanentemente",
 "Name" => "Nome",
@@ -12,5 +13,6 @@
 "{count} files" => "{count} arquivos",
 "Nothing in here. Your trash bin is empty!" => "Nada aqui. Sua lixeira estÃ¡ vazia!",
 "Restore" => "Restaurar",
-"Delete" => "Excluir"
+"Delete" => "Excluir",
+"Deleted Files" => "Arquivos Apagados"
 );
diff --git a/apps/files_trashbin/l10n/pt_PT.php b/apps/files_trashbin/l10n/pt_PT.php
index a621587ea0bb0ef94690a7fe96bbc441a1edaad5..ba85158b70e1a4c3a098232f3e5595b5454409e5 100644
--- a/apps/files_trashbin/l10n/pt_PT.php
+++ b/apps/files_trashbin/l10n/pt_PT.php
@@ -1,7 +1,8 @@
 <?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",
 "Name" => "Nome",
@@ -10,7 +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 6a919b62dfbb8a80edaff20fd98af6ac62aee07c..3af21b7e3f367ab670c38fa81358d1db4835668e 100644
--- a/apps/files_trashbin/l10n/ro.php
+++ b/apps/files_trashbin/l10n/ro.php
@@ -1,4 +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.php b/apps/files_trashbin/l10n/ru.php
index 4cf9af1fc39f731232d3831902556a69819e26e1..0d55703cdc064b7e4ddfa58330e571f1fe60a936 100644
--- a/apps/files_trashbin/l10n/ru.php
+++ b/apps/files_trashbin/l10n/ru.php
@@ -2,6 +2,7 @@
 "Couldn't delete %s permanently" => "%s Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ‚ Ð±Ñ‹Ñ‚ÑŒ ÑƒÐ´Ð°Ð»Ñ‘Ð½ Ð½Ð°Ð²ÑÐµÐ³Ð´Ð°",
 "Couldn't restore %s" => "%s Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ‚ Ð±Ñ‹Ñ‚ÑŒ Ð²Ð¾ÑÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½",
 "perform restore operation" => "Ð²Ñ‹Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÑŒ Ð¾Ð¿ÐµÑ€Ð°Ñ†Ð¸ÑŽ Ð²Ð¾ÑÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ",
+"Error" => "ÐžÑˆÐ¸Ð±ÐºÐ°",
 "delete file permanently" => "ÑƒÐ´Ð°Ð»Ð¸Ñ‚ÑŒ Ñ„Ð°Ð¹Ð» Ð½Ð°Ð²ÑÐµÐ³Ð´Ð°",
 "Delete permanently" => "Ð£Ð´Ð°Ð»ÐµÐ½Ð¾ Ð½Ð°Ð²ÑÐµÐ³Ð´Ð°",
 "Name" => "Ð˜Ð¼Ñ",
@@ -12,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/ru_RU.php b/apps/files_trashbin/l10n/ru_RU.php
index 04a899bdd5dfb6b2a0945b1198164b17079ce3f4..1ef163d48f33d1aa62018a4d5ee96a95cfb06d73 100644
--- a/apps/files_trashbin/l10n/ru_RU.php
+++ b/apps/files_trashbin/l10n/ru_RU.php
@@ -1,16 +1,3 @@
 <?php $TRANSLATIONS = array(
-"Couldn't delete %s permanently" => "%s Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ‚ Ð±Ñ‹Ñ‚ÑŒ ÑƒÐ´Ð°Ð»Ñ‘Ð½ Ð½Ð°Ð²ÑÐµÐ³Ð´Ð°",
-"Couldn't restore %s" => "%s Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ‚ Ð±Ñ‹Ñ‚ÑŒ Ð²Ð¾ÑÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½",
-"perform restore operation" => "Ð²Ñ‹Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÑŒ Ð¾Ð¿ÐµÑ€Ð°Ñ†Ð¸ÑŽ Ð²Ð¾ÑÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ",
-"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" => "Ð£Ð´Ð°Ð»Ð¸Ñ‚ÑŒ"
+"Error" => "ÐžÑˆÐ¸Ð±ÐºÐ°"
 );
diff --git a/apps/files_trashbin/l10n/si_LK.php b/apps/files_trashbin/l10n/si_LK.php
index 71c5632977654828af903c662fb900a122fd0cd3..48ea423a4c4b3339e7e38dc8627d4d79c7847b3d 100644
--- a/apps/files_trashbin/l10n/si_LK.php
+++ b/apps/files_trashbin/l10n/si_LK.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"Error" => "à¶¯à·à·‚à¶ºà¶šà·Š",
 "Name" => "à¶±à¶¸",
 "1 folder" => "1 à·†à·œà¶½à·Šà¶©à¶»à¶ºà¶šà·Š",
 "1 file" => "1 à¶œà·œà¶±à·”à·€à¶šà·Š",
diff --git a/apps/files_trashbin/l10n/sk_SK.php b/apps/files_trashbin/l10n/sk_SK.php
index c5806a5dee8da3063108527bd54c971ca245a327..7cef36ef1c0805436aed68f7816bc32542f19f33 100644
--- a/apps/files_trashbin/l10n/sk_SK.php
+++ b/apps/files_trashbin/l10n/sk_SK.php
@@ -2,9 +2,10 @@
 "Couldn't delete %s permanently" => "NemoÅ¾no zmazaÅ¥ %s navÅ¾dy",
 "Couldn't restore %s" => "NemoÅ¾no obnoviÅ¥ %s",
 "perform restore operation" => "vykonaÅ¥ obnovu",
+"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",
@@ -12,5 +13,6 @@
 "{count} files" => "{count} sÃºborov",
 "Nothing in here. Your trash bin is empty!" => "Å½iadny obsah. KÃ´Å¡ je prÃ¡zdny!",
 "Restore" => "ObnoviÅ¥",
-"Delete" => "ZmazaÅ¥"
+"Delete" => "ZmazaÅ¥",
+"Deleted Files" => "ZmazanÃ© sÃºbory"
 );
diff --git a/apps/files_trashbin/l10n/sl.php b/apps/files_trashbin/l10n/sl.php
index 4765945747de1efdac7463745a662382e1c126c5..8c8446d4e5b0d2ac2e762755b8801326769adfd0 100644
--- a/apps/files_trashbin/l10n/sl.php
+++ b/apps/files_trashbin/l10n/sl.php
@@ -1,8 +1,18 @@
 <?php $TRANSLATIONS = array(
+"Couldn't delete %s permanently" => "Datoteke %s ni mogoÄe dokonÄno izbrisati.",
+"Couldn't restore %s" => "Ni mogoÄe obnoviti %s",
+"perform restore operation" => "izvedi opravilo obnavljanja",
+"Error" => "Napaka",
+"delete file permanently" => "dokonÄno izbriÅ¡i datoteko",
+"Delete permanently" => "IzbriÅ¡i dokonÄno",
 "Name" => "Ime",
+"Deleted" => "Izbrisano",
 "1 folder" => "1 mapa",
 "{count} folders" => "{count} map",
 "1 file" => "1 datoteka",
 "{count} files" => "{count} datotek",
-"Delete" => "IzbriÅ¡i"
+"Nothing in here. Your trash bin is empty!" => "Mapa smeti je prazna.",
+"Restore" => "Obnovi",
+"Delete" => "IzbriÅ¡i",
+"Deleted Files" => "Izbrisane datoteke"
 );
diff --git a/apps/files_trashbin/l10n/sq.php b/apps/files_trashbin/l10n/sq.php
new file mode 100644
index 0000000000000000000000000000000000000000..ce3ed947ccd57c106321d8150b3a484f2adca86d
--- /dev/null
+++ b/apps/files_trashbin/l10n/sq.php
@@ -0,0 +1,18 @@
+<?php $TRANSLATIONS = array(
+"Couldn't delete %s permanently" => "Nuk munda ta eliminoj pÃ«rfundimisht %s",
+"Couldn't restore %s" => "Nuk munda ta rivendos %s",
+"perform restore operation" => "ekzekuto operacionin e rivendosjes",
+"Error" => "Veprim i gabuar",
+"delete file permanently" => "eliminoje pÃ«rfundimisht skedarin",
+"Delete permanently" => "Elimino pÃ«rfundimisht",
+"Name" => "Emri",
+"Deleted" => "Eliminuar",
+"1 folder" => "1 dosje",
+"{count} folders" => "{count} dosje",
+"1 file" => "1 skedar",
+"{count} files" => "{count} skedarÃ«",
+"Nothing in here. Your trash bin is empty!" => "KÃ«tu nuk ka asgjÃ«. Koshi juaj Ã«shtÃ« bosh!",
+"Restore" => "Rivendos",
+"Delete" => "Elimino",
+"Deleted Files" => "SkedarÃ« tÃ« eliminuar"
+);
diff --git a/apps/files_trashbin/l10n/sr.php b/apps/files_trashbin/l10n/sr.php
index 2e7c139e389ef544ae1d67c0ef41ce9d01801a78..280c2b028204dcca9d3be74749416cdef968d070 100644
--- a/apps/files_trashbin/l10n/sr.php
+++ b/apps/files_trashbin/l10n/sr.php
@@ -1,5 +1,7 @@
 <?php $TRANSLATIONS = array(
 "perform restore operation" => "Ð²Ñ€Ð°Ñ‚Ð¸ Ñƒ Ð¿Ñ€ÐµÑ‚Ñ…Ð¾Ð´Ð½Ð¾ ÑÑ‚Ð°ÑšÐµ",
+"Error" => "Ð“Ñ€ÐµÑˆÐºÐ°",
+"Delete permanently" => "ÐžÐ±Ñ€Ð¸ÑˆÐ¸ Ð·Ð° ÑÑ‚Ð°Ð»Ð½Ð¾",
 "Name" => "Ð˜Ð¼Ðµ",
 "Deleted" => "ÐžÐ±Ñ€Ð¸ÑÐ°Ð½Ð¾",
 "1 folder" => "1 Ñ„Ð°ÑÑ†Ð¸ÐºÐ»Ð°",
diff --git a/apps/files_trashbin/l10n/sv.php b/apps/files_trashbin/l10n/sv.php
index 6f8c2365818a0abcdaf820db7d317730921685fd..d56d8946f34d63602f5ed6eb903abe49aa2c3fd9 100644
--- a/apps/files_trashbin/l10n/sv.php
+++ b/apps/files_trashbin/l10n/sv.php
@@ -2,6 +2,7 @@
 "Couldn't delete %s permanently" => "Kunde inte radera %s permanent",
 "Couldn't restore %s" => "Kunde inte Ã¥terstÃ¤lla %s",
 "perform restore operation" => "utfÃ¶r Ã¥terstÃ¤llning",
+"Error" => "Fel",
 "delete file permanently" => "radera filen permanent",
 "Delete permanently" => "Radera permanent",
 "Name" => "Namn",
@@ -12,5 +13,6 @@
 "{count} files" => "{count} filer",
 "Nothing in here. Your trash bin is empty!" => "Ingenting hÃ¤r. Din papperskorg Ã¤r tom!",
 "Restore" => "Ã…terskapa",
-"Delete" => "Radera"
+"Delete" => "Radera",
+"Deleted Files" => "Raderade filer"
 );
diff --git a/apps/files_trashbin/l10n/ta_LK.php b/apps/files_trashbin/l10n/ta_LK.php
index f21e5fc750de22b2f683f7fa128535f698fdfa17..2badaa8546772cbb10f2e49c63879a472209375c 100644
--- a/apps/files_trashbin/l10n/ta_LK.php
+++ b/apps/files_trashbin/l10n/ta_LK.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"Error" => "à®µà®´à¯",
 "Name" => "à®ªà¯†à®¯à®°à¯",
 "1 folder" => "1 à®•à¯‹à®ªà¯à®ªà¯à®±à¯ˆ",
 "{count} folders" => "{à®Žà®£à¯à®£à®¿à®•à¯à®•à¯ˆ} à®•à¯‹à®ªà¯à®ªà¯à®±à¯ˆà®•à®³à¯",
diff --git a/apps/files_trashbin/l10n/te.php b/apps/files_trashbin/l10n/te.php
new file mode 100644
index 0000000000000000000000000000000000000000..9b36ac4272eff1e0af94a04ba38c519b27d98946
--- /dev/null
+++ b/apps/files_trashbin/l10n/te.php
@@ -0,0 +1,6 @@
+<?php $TRANSLATIONS = array(
+"Error" => "à°ªà±Šà°°à°ªà°¾à°Ÿà±",
+"Delete permanently" => "à°¶à°¾à°¶à±à°µà°¤à°‚à°—à°¾ à°¤à±Šà°²à°—à°¿à°‚à°šà±",
+"Name" => "à°ªà±‡à°°à±",
+"Delete" => "à°¤à±Šà°²à°—à°¿à°‚à°šà±"
+);
diff --git a/apps/files_trashbin/l10n/th_TH.php b/apps/files_trashbin/l10n/th_TH.php
index 3f5d44c763e819c6d4a2bebff5a63e88543a1482..82d3cd2353095a6244fec279cd1d589193440c1d 100644
--- a/apps/files_trashbin/l10n/th_TH.php
+++ b/apps/files_trashbin/l10n/th_TH.php
@@ -1,5 +1,6 @@
 <?php $TRANSLATIONS = array(
 "perform restore operation" => "à¸”à¸³à¹€à¸™à¸´à¸™à¸à¸²à¸£à¸„à¸·à¸™à¸„à¹ˆà¸²",
+"Error" => "à¸‚à¹‰à¸à¸œà¸´à¸”à¸žà¸¥à¸²à¸”",
 "Name" => "à¸Šà¸·à¹ˆà¸",
 "Deleted" => "à¸¥à¸šà¹à¸¥à¹‰à¸§",
 "1 folder" => "1 à¹‚à¸Ÿà¸¥à¹€à¸”à¸à¸£à¹Œ",
@@ -8,5 +9,6 @@
 "{count} files" => "{count} à¹„à¸Ÿà¸¥à¹Œ",
 "Nothing in here. Your trash bin is empty!" => "à¹„à¸¡à¹ˆà¸¡à¸µà¸à¸°à¹„à¸£à¸à¸¢à¸¹à¹ˆà¹ƒà¸™à¸™à¸µà¹‰ à¸–à¸±à¸‡à¸‚à¸¢à¸°à¸‚à¸à¸‡à¸„à¸¸à¸“à¸¢à¸±à¸‡à¸§à¹ˆà¸²à¸‡à¸à¸¢à¸¹à¹ˆ",
 "Restore" => "à¸„à¸·à¸™à¸„à¹ˆà¸²",
-"Delete" => "à¸¥à¸š"
+"Delete" => "à¸¥à¸š",
+"Deleted Files" => "à¹„à¸Ÿà¸¥à¹Œà¸—à¸µà¹ˆà¸¥à¸šà¸—à¸´à¹‰à¸‡"
 );
diff --git a/apps/files_trashbin/l10n/tr.php b/apps/files_trashbin/l10n/tr.php
index c874d73316a22fd085e320944a10c91e73413662..53c143c3a9d184ceaf3798472e0cff11be04f594 100644
--- a/apps/files_trashbin/l10n/tr.php
+++ b/apps/files_trashbin/l10n/tr.php
@@ -2,6 +2,7 @@
 "Couldn't delete %s permanently" => "%s KalÄ±cÄ± olarak silinemedi",
 "Couldn't restore %s" => "%s Geri yÃ¼klenemedi",
 "perform restore operation" => "Geri yÃ¼kleme iÅŸlemini gerÃ§ekleÅŸtir",
+"Error" => "Hata",
 "delete file permanently" => "DosyayÄ± kalÄ±cÄ± olarak sil",
 "Delete permanently" => "KalÄ±cÄ± olarak sil",
 "Name" => "Ä°sim",
@@ -12,5 +13,6 @@
 "{count} files" => "{count} dosya",
 "Nothing in here. Your trash bin is empty!" => "BurasÄ± boÅŸ. Ã‡Ã¶p kutun tamamen boÅŸ.",
 "Restore" => "Geri yÃ¼kle",
-"Delete" => "Sil"
+"Delete" => "Sil",
+"Deleted Files" => "Silinen Dosyalar"
 );
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/uk.php b/apps/files_trashbin/l10n/uk.php
index df7dd24864c5d945e4c202f1178d006d418a61f7..ffc9ab02f4895268910d613baaf119d1f12724c2 100644
--- a/apps/files_trashbin/l10n/uk.php
+++ b/apps/files_trashbin/l10n/uk.php
@@ -2,6 +2,7 @@
 "Couldn't delete %s permanently" => "ÐÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ %s Ð½Ð°Ð·Ð°Ð²Ð¶Ð´Ð¸",
 "Couldn't restore %s" => "ÐÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ Ð²Ñ–Ð´Ð½Ð¾Ð²Ð¸Ñ‚Ð¸ %s",
 "perform restore operation" => "Ð²Ð¸ÐºÐ¾Ð½Ð°Ñ‚Ð¸ Ð¾Ð¿ÐµÑ€Ð°Ñ†Ñ–ÑŽ Ð²Ñ–Ð´Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ",
+"Error" => "ÐŸÐ¾Ð¼Ð¸Ð»ÐºÐ°",
 "delete file permanently" => "Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ Ñ„Ð°Ð¹Ð» Ð½Ð°Ð·Ð°Ð²Ð¶Ð´Ð¸",
 "Delete permanently" => "Ð’Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ Ð½Ð°Ð·Ð°Ð²Ð¶Ð´Ð¸",
 "Name" => "Ð†Ð¼'Ñ",
@@ -12,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/ur_PK.php b/apps/files_trashbin/l10n/ur_PK.php
new file mode 100644
index 0000000000000000000000000000000000000000..e13a623fecc335ac65e09bcaeca82fe9abb71099
--- /dev/null
+++ b/apps/files_trashbin/l10n/ur_PK.php
@@ -0,0 +1,3 @@
+<?php $TRANSLATIONS = array(
+"Error" => "Ø§ÛŒØ±Ø±"
+);
diff --git a/apps/files_trashbin/l10n/vi.php b/apps/files_trashbin/l10n/vi.php
index 165fa9cfd9497bc0af710679602d84cc2db9ab3a..a8924c541f8fee86f3624037731ee8b6032b7f0b 100644
--- a/apps/files_trashbin/l10n/vi.php
+++ b/apps/files_trashbin/l10n/vi.php
@@ -2,6 +2,7 @@
 "Couldn't delete %s permanently" => "KhÃ´ng thá»ƒ Ã³a %s vÄ©nh viá»…n",
 "Couldn't restore %s" => "KhÃ´ng thá»ƒ khÃ´i phá»¥c %s",
 "perform restore operation" => "thá»±c hiá»‡n phá»¥c há»“i",
+"Error" => "Lá»—i",
 "delete file permanently" => "xÃ³a file vÄ©nh viá»…n",
 "Delete permanently" => "XÃ³a vÄ©nh vá»…n",
 "Name" => "TÃªn",
@@ -12,5 +13,6 @@
 "{count} files" => "{count} táºp tin",
 "Nothing in here. Your trash bin is empty!" => "KhÃ´ng cÃ³ gÃ¬ á»Ÿ Ä‘Ã¢y. ThÃ¹ng rÃ¡c cá»§a báº¡n rá»—ng!",
 "Restore" => "KhÃ´i phá»¥c",
-"Delete" => "XÃ³a"
+"Delete" => "XÃ³a",
+"Deleted Files" => "File Ä‘Ã£ xÃ³a"
 );
diff --git a/apps/files_trashbin/l10n/zh_CN.GB2312.php b/apps/files_trashbin/l10n/zh_CN.GB2312.php
index 606d80d441b0cb130b1758bb44b042004d4c75af..4dda1e0433c9a0444115553f7c200f2871c2fd1b 100644
--- a/apps/files_trashbin/l10n/zh_CN.GB2312.php
+++ b/apps/files_trashbin/l10n/zh_CN.GB2312.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"Error" => "å‡ºé”™",
 "Name" => "åç§°",
 "1 folder" => "1 ä¸ªæ–‡ä»¶å¤¹",
 "{count} folders" => "{count} ä¸ªæ–‡ä»¶å¤¹",
diff --git a/apps/files_trashbin/l10n/zh_CN.php b/apps/files_trashbin/l10n/zh_CN.php
index 327a3e247079f4db06c3e201dad4bc12172ae30f..9c0f0bb3b75186fd002fed1ffa292764f81ae3f7 100644
--- a/apps/files_trashbin/l10n/zh_CN.php
+++ b/apps/files_trashbin/l10n/zh_CN.php
@@ -1,8 +1,18 @@
 <?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" => "{count} ä¸ªæ–‡ä»¶å¤¹",
 "1 file" => "1 ä¸ªæ–‡ä»¶",
 "{count} files" => "{count} ä¸ªæ–‡ä»¶",
-"Delete" => "åˆ é™¤"
+"Nothing in here. Your trash bin is empty!" => "è¿™é‡Œæ²¡æœ‰ä¸œè¥¿. ä½ çš„å›žæ”¶ç«™æ˜¯ç©ºçš„!",
+"Restore" => "æ¢å¤",
+"Delete" => "åˆ é™¤",
+"Deleted Files" => "å·²åˆ é™¤æ–‡ä»¶"
 );
diff --git a/apps/files_trashbin/l10n/zh_HK.php b/apps/files_trashbin/l10n/zh_HK.php
new file mode 100644
index 0000000000000000000000000000000000000000..53dd9869219e08d2f69033b64c7b8fbc8545359b
--- /dev/null
+++ b/apps/files_trashbin/l10n/zh_HK.php
@@ -0,0 +1,6 @@
+<?php $TRANSLATIONS = array(
+"Error" => "éŒ¯èª¤",
+"Name" => "åç¨±",
+"{count} folders" => "{}æ–‡ä»¶å¤¾",
+"Delete" => "åˆªé™¤"
+);
diff --git a/apps/files_trashbin/l10n/zh_TW.php b/apps/files_trashbin/l10n/zh_TW.php
index 0142e901f5848d62514438bb2b5409b5691cae18..a9dcba8f7d73ea151c6cd6aff67bfdf2a0723a96 100644
--- a/apps/files_trashbin/l10n/zh_TW.php
+++ b/apps/files_trashbin/l10n/zh_TW.php
@@ -1,9 +1,18 @@
 <?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" => "{count} å€‹è³‡æ–™å¤¾",
 "1 file" => "1 å€‹æª”æ¡ˆ",
 "{count} files" => "{count} å€‹æª”æ¡ˆ",
-"Delete" => "åˆªé™¤"
+"Nothing in here. Your trash bin is empty!" => "æ‚¨çš„åžƒåœ¾æ¡¶æ˜¯ç©ºçš„ï¼",
+"Restore" => "å¾©åŽŸ",
+"Delete" => "åˆªé™¤",
+"Deleted Files" => "å·²åˆªé™¤çš„æª”æ¡ˆ"
 );
diff --git a/apps/files_trashbin/lib/hooks.php b/apps/files_trashbin/lib/hooks.php
index 9081706a2c56defdf26eb609a4f89ff8d2606b0b..f1df1d7ec77f9106e7b7ed4c1a2542d44b81118b 100644
--- a/apps/files_trashbin/lib/hooks.php
+++ b/apps/files_trashbin/lib/hooks.php
@@ -42,4 +42,18 @@ class Hooks {
 			Trashbin::move2trash($path);
 		}
 	}
+
+	/**
+	 * @brief clean up user specific settings if user gets deleted
+	 * @param array with uid
+	 *
+	 * This function is connected to the pre_deleteUser signal of OC_Users
+	 * to remove the used space for the trash bin stored in the database
+	 */
+	public static function deleteUser_hook($params) {
+		if( \OCP\App::isEnabled('files_trashbin') ) {
+			$uid = $params['uid'];
+			Trashbin::deleteUser($uid);
+			}
+	}
 }
diff --git a/apps/files_trashbin/lib/trash.php b/apps/files_trashbin/lib/trash.php
index 2fc8a8bc3c64fab96dcb3408cc900bcb9b628b55..7fda855d0c2c2765192a73f71c85e6052da388b7 100644
--- a/apps/files_trashbin/lib/trash.php
+++ b/apps/files_trashbin/lib/trash.php
@@ -39,14 +39,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,82 +62,163 @@ class Trashbin {
 		if ( $trashbinSize === false || $trashbinSize < 0 ) {
 			$trashbinSize = self::calculateSize(new \OC\Files\View('/'. $user.'/files_trashbin'));
 		}
-		$trashbinSize += self::copy_recursive($file_path, 'files_trashbin/files/'.$deleted.'.d'.$timestamp, $view);
+		
+		$sizeOfAddedFiles = self::copy_recursive($file_path, 'files_trashbin/files/'.$filename.'.d'.$timestamp, $view);
 
-		if ( $view->file_exists('files_trashbin/files/'.$deleted.'.d'.$timestamp) ) {
-			$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));
+		if ( $view->file_exists('files_trashbin/files/'.$filename.'.d'.$timestamp) ) {
+			$trashbinSize += $sizeOfAddedFiles;
+			$query = \OC_DB::prepare("INSERT INTO `*PREFIX*files_trash` (`id`,`timestamp`,`location`,`type`,`mime`,`user`) VALUES (?,?,?,?,?,?)");
+			$result = $query->execute(array($filename, $timestamp, $location, $type, $mime, $user));
 			if ( !$result ) { // if file couldn't be added to the database than also don't store it in the trash bin.
-				$view->deleteAll('files_trashbin/files/'.$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();
+			if ($view->is_dir('files_versions/' . $file_path)) {
+                $size += self::calculateSize(new \OC\Files\View('/' . $user . '/files_versions/' . $file_path));
+                $view->rename('files_versions/' . $file_path, 'files_trashbin/versions/' . $filename . '.d' . $timestamp);
+			} else if ($versions = \OCA\Files_Versions\Storage::getVersions($user, $file_path)) {
+                foreach ($versions as $v) {
+					$size += $view->filesize('files_versions' . $v['path'] . '.v' . $v['version']);
+                	$view->rename('files_versions' . $v['path'] . '.v' . $v['version'], '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();
+
+            // disable proxy to prevent recursive calls
+            $proxyStatus = \OC_FileProxy::$enabled;
+            \OC_FileProxy::$enabled = false;
+
+            // retain key files
+			$keyfile = \OC\Files\Filesystem::normalizePath('files_encryption/keyfiles/' . $file_path);
+
+            if ($view->is_dir($keyfile) || $view->file_exists($keyfile . '.key')) {
+            	$user = \OCP\User::getUser();
+                // move keyfiles
+			    if ($view->is_dir($keyfile)) {
+                    $size += self::calculateSize(new \OC\Files\View('/' . $user . '/' . $keyfile));
+					$view->rename($keyfile, 'files_trashbin/keyfiles/' . $filename . '.d' . $timestamp);
+				} else {
+					$size += $view->filesize($keyfile . '.key');
+            		$view->rename($keyfile . '.key', 'files_trashbin/keyfiles/' . $filename . '.key.d' . $timestamp);
+				}
+			}
+
+            // retain share keys
+			$sharekeys = \OC\Files\Filesystem::normalizePath('files_encryption/share-keys/' . $file_path);
+
+			if ($view->is_dir($sharekeys)) {
+				$size += self::calculateSize(new \OC\Files\View('/' . $user . '/' . $sharekeys));
+				$view->rename($sharekeys, 'files_trashbin/share-keys/' . $filename . '.d' . $timestamp);
+			} else {
+                // get local path to share-keys
+                $localShareKeysPath = $view->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 += $view->filesize($sharekeys. '.' . $user. '.shareKey');
+
+                        // move file
+                        $view->rename($sharekeys. '.' . $user. '.shareKey', '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);
@@ -144,8 +226,8 @@ class Trashbin {
 			$trashbinSize = self::calculateSize(new \OC\Files\View('/'. $user.'/files_trashbin'));
 		}
 		if ( $timestamp ) {
-			$query = \OC_DB::prepare('SELECT location,type FROM *PREFIX*files_trash'
-				.' WHERE user=? AND id=? AND timestamp=?');
+			$query = \OC_DB::prepare('SELECT `location`,`type` FROM `*PREFIX*files_trash`'
+				.' WHERE `user`=? AND `id`=? AND `timestamp`=?');
 			$result = $query->execute(array($user,$filename,$timestamp))->fetchAll();
 			if ( count($result) != 1 ) {
 				\OC_Log::write('files_trashbin', 'trash bin database inconsistent!', \OC_Log::ERROR);
@@ -174,8 +256,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)));
@@ -184,68 +278,183 @@ 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 = \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();
+			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));
+            	$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) {
+            			$size += $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 {
+            			$size += $view->filesize('files_trashbin/versions/' . $versionedFile . '.v' . $v);
+						$view->rename('files_trashbin/versions/' . $versionedFile . '.v' . $v, 'files_versions/' . $location . '/' . $filename . $ext . '.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 if 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();
+
+            $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('files_trashbin/keyfiles/' . $source_location . '/' . $filename);
+                    $sharekey = \OC\Files\Filesystem::normalizePath('files_trashbin/share-keys/' . $source_location . '/' . $filename);
+                } else {
+                    $keyfile = \OC\Files\Filesystem::normalizePath('files_trashbin/keyfiles/' . $filename);
+                    $sharekey = \OC\Files\Filesystem::normalizePath('files_trashbin/share-keys/' . $filename);
+                }
+            } else {
+                $keyfile = \OC\Files\Filesystem::normalizePath('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 ($view->file_exists($keyfile)) {
+                // handle directory
+            	if ($view->is_dir($keyfile)) {
+
+                    // handle keyfiles
+                    $size += self::calculateSize(new \OC\Files\View('/' . $user . '/' . $keyfile));
+            		$view->rename($keyfile, 'files_encryption/keyfiles/' . $location . '/' . $filename . $ext);
+
+                    // handle share-keys
+                    if ($timestamp) {
+                        $sharekey .= '.d' . $timestamp;
+                    }
+                    $view->rename($sharekey, 'files_encryption/share-keys/' . $location . '/' . $filename . $ext);
+
+				} else {
+                    // handle keyfiles
+					$size += $view->filesize($keyfile);
+            		$view->rename($keyfile, 'files_encryption/keyfiles/' . $location . '/' . $filename . $ext . '.key');
+
+                    // handle share-keys
+                    $ownerShareKey = \OC\Files\Filesystem::normalizePath('files_trashbin/share-keys/' . $source_location . '/' . $filename . '.' . $user. '.shareKey');
+                    if ($timestamp) {
+                        $ownerShareKey .= '.d' . $timestamp;
+                    }
+
+                    $size += $view->filesize($ownerShareKey);
+
+                    // move only owners key
+                    $view->rename($ownerShareKey, 'files_encryption/share-keys/' . $location . '/' . $filename . $ext . '.' . $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('/' . $user . '/files/'. $location. '/' .$filename);
+                    $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) {
@@ -259,7 +468,7 @@ class Trashbin {
 		}
 
 		if ( $timestamp ) {
-			$query = \OC_DB::prepare('DELETE FROM *PREFIX*files_trash WHERE user=? AND id=? AND timestamp=?');
+			$query = \OC_DB::prepare('DELETE FROM `*PREFIX*files_trash` WHERE `user`=? AND `id`=? AND `timestamp`=?');
 			$query->execute(array($user,$filename,$timestamp));
 			$file = $filename.'.d'.$timestamp;
 		} else {
@@ -334,17 +543,72 @@ class Trashbin {
 		return $view->file_exists($target);
 	}
 
+	/**
+	 * @brief deletes used space for trash bin in db if user was deleted
+	 *
+	 * @param type $uid id of deleted user
+	 * @return result of db delete operation
+	 */
+	public static function deleteUser($uid) {
+		$query = \OC_DB::prepare('DELETE FROM `*PREFIX*files_trash` WHERE `user`=?');
+		$result = $query->execute(array($uid));
+		if ($result) {
+			$query = \OC_DB::prepare('DELETE FROM `*PREFIX*files_trashsize` WHERE `user`=?');
+			return $query->execute(array($uid));
+		}
+		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=?');
+		$query = \OC_DB::prepare('SELECT `location`,`type`,`id`,`timestamp` FROM `*PREFIX*files_trash` WHERE `user`=?');
 		$result = $query->execute(array($user))->fetchAll();
 
 		$retention_obligation = \OC_Config::getValue('trashbin_retention_obligation',
@@ -357,18 +621,20 @@ 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;
 		// if size limit for trash bin reached, delete oldest files in trash bin
 		if ($availableSpace < 0) {
-			$query = \OC_DB::prepare('SELECT location,type,id,timestamp FROM *PREFIX*files_trash'
-				.' WHERE user=? ORDER BY timestamp ASC');
+			$query = \OC_DB::prepare('SELECT `location`,`type`,`id`,`timestamp` FROM `*PREFIX*files_trash`'
+				.' WHERE `user`=? ORDER BY `timestamp` ASC');
 			$result = $query->execute(array($user))->fetchAll();
 			$length = count($result);
 			$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++;
@@ -490,7 +756,7 @@ class Trashbin {
 	 * @return mixed trash bin size or false if no trash bin size is stored
 	 */
 	private static function getTrashbinSize($user) {
-		$query = \OC_DB::prepare('SELECT size FROM *PREFIX*files_trashsize WHERE user=?');
+		$query = \OC_DB::prepare('SELECT `size` FROM `*PREFIX*files_trashsize` WHERE `user`=?');
 		$result = $query->execute(array($user))->fetchAll();
 
 		if ($result) {
@@ -507,9 +773,9 @@ class Trashbin {
 	 */
 	private static function setTrashbinSize($user, $size) {
 		if ( self::getTrashbinSize($user) === false) {
-			$query = \OC_DB::prepare('INSERT INTO *PREFIX*files_trashsize (size, user) VALUES (?, ?)');
+			$query = \OC_DB::prepare('INSERT INTO `*PREFIX*files_trashsize` (`size`, `user`) VALUES (?, ?)');
 		}else {
-			$query = \OC_DB::prepare('UPDATE *PREFIX*files_trashsize SET size=? WHERE user=?');
+			$query = \OC_DB::prepare('UPDATE `*PREFIX*files_trashsize` SET `size`=? WHERE `user`=?');
 		}
 		$query->execute(array($size, $user));
 	}
diff --git a/apps/files_versions/appinfo/app.php b/apps/files_versions/appinfo/app.php
index 44d01f5cd5e893d8e62d3010fd6db638301f43cf..0d0850e186432f2e037262826ab432a576b178d2 100644
--- a/apps/files_versions/appinfo/app.php
+++ b/apps/files_versions/appinfo/app.php
@@ -3,6 +3,7 @@
 //require_once 'files_versions/versions.php';
 OC::$CLASSPATH['OCA\Files_Versions\Storage'] = 'files_versions/lib/versions.php';
 OC::$CLASSPATH['OCA\Files_Versions\Hooks'] = 'files_versions/lib/hooks.php';
+OC::$CLASSPATH['OCA\Files_Versions\Capabilities'] = 'files_versions/lib/capabilities.php';
 
 OCP\Util::addscript('files_versions', 'versions');
 
@@ -11,3 +12,5 @@ OCP\Util::connectHook('OC_Filesystem', 'write', "OCA\Files_Versions\Hooks", "wri
 // Listen to delete and rename signals
 OCP\Util::connectHook('OC_Filesystem', 'post_delete', "OCA\Files_Versions\Hooks", "remove_hook");
 OCP\Util::connectHook('OC_Filesystem', 'rename', "OCA\Files_Versions\Hooks", "rename_hook");
+//Listen to delete user signal
+OCP\Util::connectHook('OC_User', 'pre_deleteUser', "OCA\Files_Versions\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/appinfo/routes.php b/apps/files_versions/appinfo/routes.php
new file mode 100644
index 0000000000000000000000000000000000000000..8cef57c9e4dd723e0d81e1643a8c6d2207e21272
--- /dev/null
+++ b/apps/files_versions/appinfo/routes.php
@@ -0,0 +1,9 @@
+<?php
+/**
+ * Copyright (c) 2013, Tom Needham <tom@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or later.
+ * See the COPYING-README file.
+ */
+
+// Register with the capabilities API
+OC_API::register('get', '/cloud/capabilities', array('OCA\Files_Versions\Capabilities', 'getCapabilities'), 'files_versions', OC_API::USER_AUTH);
\ No newline at end of file
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/de_DE.php b/apps/files_versions/l10n/de_DE.php
index c0b2f2a83f77bbdd8b16a993d6d174f83e902453..8354852a5b5e5c6a1da96fabe8737e7faebe9075 100644
--- a/apps/files_versions/l10n/de_DE.php
+++ b/apps/files_versions/l10n/de_DE.php
@@ -1,9 +1,9 @@
 <?php $TRANSLATIONS = array(
 "Could not revert: %s" => "Konnte %s nicht zurÃ¼cksetzen",
 "success" => "Erfolgreich",
-"File %s was reverted to version %s" => "Die Datei %s wurde zur Version %s zurÃ¼ckgesetzt",
+"File %s was reverted to version %s" => "Die Datei %s wurde auf die Version %s zurÃ¼ckgesetzt",
 "failure" => "Fehlgeschlagen",
-"File %s could not be reverted to version %s" => "Die Datei %s konnte nicht zur Version %s zurÃ¼ckgesetzt werden",
+"File %s could not be reverted to version %s" => "Die Datei %s konnte nicht auf die Version %s zurÃ¼ckgesetzt werden",
 "No old versions available" => "Keine Ã¤lteren Versionen verfÃ¼gbar",
 "No path specified" => "Kein Pfad angegeben",
 "Versions" => "Versionen",
diff --git a/apps/files_versions/l10n/el.php b/apps/files_versions/l10n/el.php
index 6e1900b233b7a5ca016a93f1a9c710a2edc37108..8b67e471a9ead7048954c81d13ef74d32a2d36e6 100644
--- a/apps/files_versions/l10n/el.php
+++ b/apps/files_versions/l10n/el.php
@@ -6,5 +6,6 @@
 "File %s could not be reverted to version %s" => "Î¤Î¿ Î±ÏÏ‡ÎµÎ¯Î¿ %s Î´ÎµÎ½ ÎµÎ¯Î½Î±Î¹ Î´Ï…Î½Î±Ï„ÏŒ Î½Î± ÎµÏ€Î±Î½Î±Ï†ÎµÏÎ¸ÎµÎ¯ ÏƒÏ„Î·Î½ ÎÎºÎ´Î¿ÏƒÎ· %s",
 "No old versions available" => "ÎœÎ· Î´Î¹Î±Î¸ÎÏƒÎ¹Î¼ÎµÏ‚ Ï€Î±Î»Î¹ÎÏ‚ ÎµÎºÎ´ÏŒÏƒÎµÎ¹Ï‚",
 "No path specified" => "Î”ÎµÎ½ ÎºÎ±Î¸Î¿ÏÎ¯ÏƒÏ„Î·ÎºÎµ Î´Î¹Î±Î´ÏÎ¿Î¼Î®",
+"Versions" => "Î•ÎºÎ´ÏŒÏƒÎµÎ¹Ï‚",
 "Revert a file to a previous version by clicking on its revert button" => "Î•Ï€Î±Î½Î±Ï†Î¿ÏÎ¬ ÎµÎ½ÏŒÏ‚ Î±ÏÏ‡ÎµÎ¯Î¿Ï… ÏƒÎµ Ï€ÏÎ¿Î·Î³Î¿ÏÎ¼ÎµÎ½Î· ÎÎºÎ´Î¿ÏƒÎ· Ï€Î±Ï„ÏŽÎ½Ï„Î±Ï‚ ÏƒÏ„Î¿ ÎºÎ¿Ï…Î¼Ï€Î¯ ÎµÏ€Î±Î½Î±Ï†Î¿ÏÎ¬Ï‚"
 );
diff --git a/apps/files_versions/l10n/eo.php b/apps/files_versions/l10n/eo.php
index 87b314655c0d48f8f5cc7143c96ebd6737b402e5..17f97808578d71da24b6f2827c1bd714510743f1 100644
--- a/apps/files_versions/l10n/eo.php
+++ b/apps/files_versions/l10n/eo.php
@@ -1,5 +1,11 @@
 <?php $TRANSLATIONS = array(
-"History" => "Historio",
-"Files Versioning" => "Dosiereldonigo",
-"Enable" => "Kapabligi"
+"Could not revert: %s" => "Ne eblas malfari: %s",
+"success" => "sukceso",
+"File %s was reverted to version %s" => "Dosiero %s estis malfarita al versio %s",
+"failure" => "malsukceso",
+"File %s could not be reverted to version %s" => "Ne eblis malfari dosieron %s al versio %s",
+"No old versions available" => "Neniu malnova versio disponeblas",
+"No path specified" => "Neniu vojo estas specifita",
+"Versions" => "Versioj",
+"Revert a file to a previous version by clicking on its revert button" => "Malfari dosieron al antaÅa versio per klako sur sia malfarad-butono"
 );
diff --git a/apps/files_versions/l10n/et_EE.php b/apps/files_versions/l10n/et_EE.php
index fa2a33f9dda11cef85b7f15bfa58a74d756c4604..c8d2f7cfacdc289bce2ef79d46c63841de943149 100644
--- a/apps/files_versions/l10n/et_EE.php
+++ b/apps/files_versions/l10n/et_EE.php
@@ -1,6 +1,11 @@
 <?php $TRANSLATIONS = array(
+"Could not revert: %s" => "Ei suuda taastada faili: %s",
 "success" => "korras",
+"File %s was reverted to version %s" => "Fail %s taastati versioonile %s",
 "failure" => "ebaÃµnnestus",
+"File %s could not be reverted to version %s" => "Faili %s ei saa taastada versioonile %s",
 "No old versions available" => "Vanu versioone pole saadaval",
-"No path specified" => "Asukohta pole mÃ¤Ã¤ratud"
+"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 nupule \"Taasta\""
 );
diff --git a/apps/files_versions/l10n/fi_FI.php b/apps/files_versions/l10n/fi_FI.php
index 0dec7fc2580469145ed99fcade72ad5cf14dcaa0..6f138e0f163650e0482945f793c91ae6594c2606 100644
--- a/apps/files_versions/l10n/fi_FI.php
+++ b/apps/files_versions/l10n/fi_FI.php
@@ -4,7 +4,8 @@
 "File %s was reverted to version %s" => "Tiedosto %s palautettiin versioon %s",
 "failure" => "epÃ¤onnistui",
 "File %s could not be reverted to version %s" => "Tiedoston %s palautus versioon %s epÃ¤onnistui",
-"No old versions available" => "Vanhoja ei ole saatavilla",
+"No old versions available" => "Vanhoja versioita ei ole saatavilla",
 "No path specified" => "Polkua ei ole mÃ¤Ã¤ritetty",
+"Versions" => "Versiot",
 "Revert a file to a previous version by clicking on its revert button" => "Palauta tiedoston edellinen versio napsauttamalla palautuspainiketta"
 );
diff --git a/apps/files_versions/l10n/fr.php b/apps/files_versions/l10n/fr.php
index 76ad8fc97a6b8dff2f161e95fab4e2ce33efc17f..e2698c5c4aaeeeeb123bd02a15b1d8c23315b613 100644
--- a/apps/files_versions/l10n/fr.php
+++ b/apps/files_versions/l10n/fr.php
@@ -6,5 +6,6 @@
 "File %s could not be reverted to version %s" => "Le fichier %s ne peut Ãªtre restaurÃ© dans sa version %s",
 "No old versions available" => "Aucune ancienne version n'est disponible",
 "No path specified" => "Aucun chemin spÃ©cifiÃ©",
+"Versions" => "Versions",
 "Revert a file to a previous version by clicking on its revert button" => "Restaurez un fichier dans une version antÃ©rieure en cliquant sur son bouton de restauration"
 );
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/id.php b/apps/files_versions/l10n/id.php
index 4662aa86432630bce00ac0c08bfafd00642d9044..48ae5ad622325d10d972ccdcaece69ed37b9d785 100644
--- a/apps/files_versions/l10n/id.php
+++ b/apps/files_versions/l10n/id.php
@@ -6,5 +6,6 @@
 "File %s could not be reverted to version %s" => "Berkas %s gagal dikembalikan ke versi %s",
 "No old versions available" => "Versi lama tidak tersedia",
 "No path specified" => "Lokasi tidak ditentukan",
-"Revert a file to a previous version by clicking on its revert button" => "Kembalikan berkas ke versi sebelumnya dengan mengklik tombol kembalikan"
+"Versions" => "Versi",
+"Revert a file to a previous version by clicking on its revert button" => "Kembalikan berkas ke versi sebelumnya dengan mengeklik tombol kembalikan"
 );
diff --git a/apps/files_versions/l10n/ka_GE.php b/apps/files_versions/l10n/ka_GE.php
new file mode 100644
index 0000000000000000000000000000000000000000..6856d647dae57d226a2012ec2c5167ae80816bec
--- /dev/null
+++ b/apps/files_versions/l10n/ka_GE.php
@@ -0,0 +1,11 @@
+<?php $TRANSLATIONS = array(
+"Could not revert: %s" => "áƒ•áƒ”áƒ  áƒ›áƒáƒ®áƒ”áƒ áƒ®áƒ“áƒ áƒ£áƒ™áƒáƒœ áƒ“áƒáƒ‘áƒ áƒ£áƒœáƒ”áƒ‘áƒ: %s",
+"success" => "áƒ“áƒáƒ¡áƒ áƒ£áƒšáƒ“áƒ",
+"File %s was reverted to version %s" => "áƒ¤áƒáƒ˜áƒšáƒ˜ %s áƒ“áƒáƒ‘áƒ áƒ£áƒœáƒ“áƒ áƒ•áƒ”áƒ áƒ¡áƒ˜áƒáƒ–áƒ” %s",
+"failure" => "áƒ¨áƒ”áƒªáƒ“áƒáƒ›áƒ",
+"File %s could not be reverted to version %s" => "áƒ•áƒ”áƒ  áƒ›áƒáƒ®áƒ”áƒ áƒ®áƒ“áƒ %s áƒ¤áƒáƒ˜áƒšáƒ˜áƒ¡ %s áƒ•áƒ”áƒ áƒ¡áƒ˜áƒáƒ–áƒ” áƒ“áƒáƒ‘áƒ áƒ£áƒœáƒ”áƒ‘áƒ",
+"No old versions available" => "áƒ«áƒ•áƒ”áƒšáƒ˜ áƒ•áƒ”áƒ áƒ¡áƒ˜áƒ áƒáƒ  áƒáƒ áƒ¡áƒ”áƒ‘áƒáƒ‘áƒ¡",
+"No path specified" => "áƒ’áƒ–áƒ áƒáƒ  áƒáƒ áƒ˜áƒ¡ áƒ›áƒ˜áƒ—áƒ˜áƒ—áƒ”áƒ‘áƒ£áƒšáƒ˜",
+"Versions" => "áƒ•áƒ”áƒ áƒ¡áƒ˜áƒ”áƒ‘áƒ˜",
+"Revert a file to a previous version by clicking on its revert button" => "áƒ“áƒáƒáƒ‘áƒ áƒ£áƒœáƒ”áƒ— áƒ¤áƒáƒ˜áƒšáƒ˜ áƒ¬áƒ˜áƒœáƒ áƒžáƒáƒ–áƒ˜áƒªáƒ˜áƒáƒ–áƒ” revert áƒ¦áƒ˜áƒšáƒáƒ™áƒ–áƒ” áƒ“áƒáƒáƒ”áƒ áƒ˜áƒ—"
+);
diff --git a/apps/files_versions/l10n/ko.php b/apps/files_versions/l10n/ko.php
index f40925e1be2dc2d0a2b6d08dca26e0d40a144cb9..994144f39e1830aa47b4b00c7b5851fb39f7d53d 100644
--- a/apps/files_versions/l10n/ko.php
+++ b/apps/files_versions/l10n/ko.php
@@ -1,5 +1,11 @@
 <?php $TRANSLATIONS = array(
-"History" => "ì—ì‚¬",
-"Files Versioning" => "íŒŒì¼ ë²„ì „ ê´€ë¦¬",
-"Enable" => "ì‚¬ìš©í•¨"
+"Could not revert: %s" => "ë˜ëŒë¦´ ìˆ˜ ì—†ìŠµë‹ˆë‹¤: %s",
+"success" => "ì™„ë£Œ",
+"File %s was reverted to version %s" => "íŒŒì¼ %së¥¼ ë²„ì „ %së¡œ ë³€ê²½í•˜ì˜€ìŠµë‹ˆë‹¤.",
+"failure" => "ì‹¤íŒ¨",
+"File %s could not be reverted to version %s" => "íŒŒì¼ %së¥¼ ë²„ì „ %së¡œ ë˜ëŒë¦¬ì§€ ëª»í–ˆìŠµë‹ˆë‹¤.",
+"No old versions available" => "ì˜¤ëž˜ëœ ë²„ì „ì„ ì‚¬ìš©í•  ìˆ˜ ì—†ìŠµë‹ˆë‹¤",
+"No path specified" => "ê²½ë¡œë¥¼ ì•Œìˆ˜ ì—†ìŠµë‹ˆë‹¤.",
+"Versions" => "ë²„ì ¼",
+"Revert a file to a previous version by clicking on its revert button" => "ë³€ê²½ ë²„íŠ¼ì„ í´ë¦í•˜ì—¬ ì´ì „ ë²„ì „ì˜ íŒŒì¼ë¡œ ë³€ê²½í•  ìˆ˜ ìžˆìŠµë‹ˆë‹¤."
 );
diff --git a/apps/files_versions/l10n/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/lt_LT.php b/apps/files_versions/l10n/lt_LT.php
index adf4893020e583c923c1893373b8907f6487ac08..fb4574c106a4557f10ea95cbd1657de6ac359efb 100644
--- a/apps/files_versions/l10n/lt_LT.php
+++ b/apps/files_versions/l10n/lt_LT.php
@@ -1,5 +1,11 @@
 <?php $TRANSLATIONS = array(
-"History" => "Istorija",
-"Files Versioning" => "FailÅ³ versijos",
-"Enable" => "Ä®jungti"
+"Could not revert: %s" => "Nepavyko atstatyti: %s",
+"success" => "pavyko",
+"File %s was reverted to version %s" => "Dokumentas %s buvo atstatytas Ä¯ versijÄ… %s",
+"failure" => "klaida",
+"File %s could not be reverted to version %s" => "Dokumento %s nepavyko atstatyti Ä¯ versijÄ… %s",
+"No old versions available" => "NÄ—ra senÅ³ versijÅ³",
+"No path specified" => "Nenurodytas kelias",
+"Versions" => "Versijos",
+"Revert a file to a previous version by clicking on its revert button" => "Atstatykite dokumentÄ… Ä¯ prieÅ¡ tai buvusiÄ… versijÄ… spausdami ant jo atstatymo mygtuko"
 );
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/sl.php b/apps/files_versions/l10n/sl.php
index b6ad6a1e9bb1f19615e8af948080d128afe34770..2df00fc8264e2f74f59fbdce3cd494b754312269 100644
--- a/apps/files_versions/l10n/sl.php
+++ b/apps/files_versions/l10n/sl.php
@@ -1,3 +1,11 @@
 <?php $TRANSLATIONS = array(
-"No old versions available" => "StarejÅ¡ih razliÄic ni na voljo"
+"Could not revert: %s" => "Ni mogoÄe povrniti: %s",
+"success" => "uspeÅ¡no",
+"File %s was reverted to version %s" => "Datoteka %s je povrnjena na razliÄico %s.",
+"failure" => "spodletelo",
+"File %s could not be reverted to version %s" => "Datoteke %s ni mogoÄe povrniti na razliÄico %s.",
+"No old versions available" => "Ni starejÅ¡ih razliÄic.",
+"No path specified" => "Ni doloÄene poti",
+"Versions" => "RazliÄice",
+"Revert a file to a previous version by clicking on its revert button" => "Povrni datoteko na predhodno razliÄico s klikom na gumb za povrnitev."
 );
diff --git a/apps/files_versions/l10n/sv.php b/apps/files_versions/l10n/sv.php
index 46e2c0f8bcf3db3616af8d82a23ddf06c750b7bb..bcd21bc599ce1eb1eb0f9857626be6c8ae4be513 100644
--- a/apps/files_versions/l10n/sv.php
+++ b/apps/files_versions/l10n/sv.php
@@ -6,5 +6,6 @@
 "File %s could not be reverted to version %s" => "Filen %s kunde inte Ã¥terstÃ¤llas till version %s",
 "No old versions available" => "Inga gamla versioner finns tillgÃ¤ngliga",
 "No path specified" => "Ingen sÃ¶kvÃ¤g angiven",
+"Versions" => "Versioner",
 "Revert a file to a previous version by clicking on its revert button" => "Ã…terstÃ¤ll en fil till en tidigare version genom att klicka pÃ¥ knappen"
 );
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/tr.php b/apps/files_versions/l10n/tr.php
index 745400d331c866257bfabed643675fa8d2e35ff7..40d276da807fde815eb3256246cae082164eb71b 100644
--- a/apps/files_versions/l10n/tr.php
+++ b/apps/files_versions/l10n/tr.php
@@ -6,5 +6,6 @@
 "File %s could not be reverted to version %s" => "Dosya %s, %s versiyonuna dÃ¶ndÃ¼rÃ¼lemedi.",
 "No old versions available" => "Eski versiyonlar mevcut deÄŸil.",
 "No path specified" => "Yama belirtilmemiÅŸ",
-"Versions" => "SÃ¼rÃ¼mler"
+"Versions" => "SÃ¼rÃ¼mler",
+"Revert a file to a previous version by clicking on its revert button" => "DosyanÄ±n Ã¶nceki sÃ¼rÃ¼mÃ¼ne geri dÃ¶nmek iÃ§in, deÄŸiÅŸiklikleri geri al butonuna tÄ±klayÄ±n"
 );
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_CN.GB2312.php b/apps/files_versions/l10n/zh_CN.GB2312.php
index d9e788033aaab1f995650b04f86b8db67de4f29b..a5285180e6c857eac565b8ba6740bdad3f12e098 100644
--- a/apps/files_versions/l10n/zh_CN.GB2312.php
+++ b/apps/files_versions/l10n/zh_CN.GB2312.php
@@ -1,5 +1,11 @@
 <?php $TRANSLATIONS = array(
-"History" => "åŽ†å²",
-"Files Versioning" => "æ–‡ä»¶ç‰ˆæœ¬",
-"Enable" => "å¯ç”¨"
+"Could not revert: %s" => "æ— æ³•æ¢å¤ï¼š%s",
+"success" => "æˆåŠŸ",
+"File %s was reverted to version %s" => "æ–‡ä»¶ %s å·²è¢«æ¢å¤ä¸º %s çš„ç‰ˆæœ¬",
+"failure" => "å¤±è´¥",
+"File %s could not be reverted to version %s" => "æ–‡ä»¶ %s æ— æ³•æ¢å¤ä¸º %s çš„ç‰ˆæœ¬",
+"No old versions available" => "æ²¡æœ‰å¯ç”¨çš„æ—§ç‰ˆæœ¬",
+"No path specified" => "æœªæŒ‡å®šè·¯å¾„",
+"Versions" => "ç‰ˆæœ¬",
+"Revert a file to a previous version by clicking on its revert button" => "è¯·ç‚¹å‡»â€œæ¢å¤â€æŒ‰é’®æŠŠæ–‡ä»¶æ¢å¤åˆ°æ—©å‰çš„ç‰ˆæœ¬"
 );
diff --git a/apps/files_versions/l10n/zh_HK.php b/apps/files_versions/l10n/zh_HK.php
new file mode 100644
index 0000000000000000000000000000000000000000..71bd3bbbd944449b811455a941564b3365253b2f
--- /dev/null
+++ b/apps/files_versions/l10n/zh_HK.php
@@ -0,0 +1,6 @@
+<?php $TRANSLATIONS = array(
+"success" => "æˆåŠŸ",
+"failure" => "å¤±æ•—",
+"No old versions available" => "æ²’æœ‰ä»¥å¾€ç‰ˆæœ¬",
+"Versions" => "ç‰ˆæœ¬"
+);
diff --git a/apps/files_versions/l10n/zh_TW.php b/apps/files_versions/l10n/zh_TW.php
index a7b496b37dbcdf613fe379e41cac880a060cc602..2ae9ce657ceec2d379c69eaab4ef5933900367c6 100644
--- a/apps/files_versions/l10n/zh_TW.php
+++ b/apps/files_versions/l10n/zh_TW.php
@@ -1,5 +1,11 @@
 <?php $TRANSLATIONS = array(
-"History" => "æ·å²",
-"Files Versioning" => "æª”æ¡ˆç‰ˆæœ¬åŒ–ä¸...",
-"Enable" => "å•Ÿç”¨"
+"Could not revert: %s" => "ç„¡æ³•é‚„åŽŸï¼š%s",
+"success" => "æˆåŠŸ",
+"File %s was reverted to version %s" => "æª”æ¡ˆ %s å·²è¢«å¾©åŽŸè‡³ç‰ˆæœ¬ %s",
+"failure" => "å¤±æ•—",
+"File %s could not be reverted to version %s" => "æª”æ¡ˆ %s ç„¡æ³•å¾©åŽŸè‡³ç‰ˆæœ¬ %s",
+"No old versions available" => "æ²’æœ‰èˆŠçš„ç‰ˆæœ¬",
+"No path specified" => "æ²’æœ‰æŒ‡å®šè·¯å¾‘",
+"Versions" => "ç‰ˆæœ¬",
+"Revert a file to a previous version by clicking on its revert button" => "æŒ‰ä¸€ä¸‹å¾©åŽŸçš„æŒ‰éˆ•å³å¯æŠŠæª”æ¡ˆå¾©åŽŸè‡³ä»¥å‰çš„ç‰ˆæœ¬"
 );
diff --git a/apps/files_versions/lib/capabilities.php b/apps/files_versions/lib/capabilities.php
new file mode 100644
index 0000000000000000000000000000000000000000..3251a07b6ae204f1af5a58cc876f9f38b50765a2
--- /dev/null
+++ b/apps/files_versions/lib/capabilities.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Copyright (c) 2013 Tom Needham <tom@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+ 
+namespace OCA\Files_Versions; 
+
+class Capabilities {
+	
+	public static function getCapabilities() {
+		return new \OC_OCS_Result(array(
+			'capabilities' => array(
+				'files' => array(
+					'versioning' => true,
+					),
+				),
+			));
+	}
+	
+}
\ No newline at end of file
diff --git a/apps/files_versions/lib/hooks.php b/apps/files_versions/lib/hooks.php
index 7891b20e92fd2a74e6a28c3cd18d00a1e3efd9db..f0082b301a36d8701b57d417b051f944eca8a02b 100644
--- a/apps/files_versions/lib/hooks.php
+++ b/apps/files_versions/lib/hooks.php
@@ -63,4 +63,18 @@ class Hooks {
 		}
 	}
 
+	/**
+	 * @brief clean up user specific settings if user gets deleted
+	 * @param array with uid
+	 *
+	 * This function is connected to the pre_deleteUser signal of OC_Users
+	 * to remove the used space for versions stored in the database
+	 */
+	public static function deleteUser_hook($params) {
+		if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
+			$uid = $params['uid'];
+			Storage::deleteUser($uid);
+			}
+	}
+
 }
diff --git a/apps/files_versions/lib/versions.php b/apps/files_versions/lib/versions.php
index 20611c61ec7a7b2ae9303279b6167a0798bd6534..5fdbef27743b8f719ef4971104e69be6fb72670e 100644
--- a/apps/files_versions/lib/versions.php
+++ b/apps/files_versions/lib/versions.php
@@ -53,7 +53,7 @@ class Storage {
 	 * @return mixed versions size or false if no versions size is stored
 	 */
 	private static function getVersionsSize($user) {
-		$query = \OC_DB::prepare('SELECT size FROM *PREFIX*files_versions WHERE user=?');
+		$query = \OC_DB::prepare('SELECT `size` FROM `*PREFIX*files_versions` WHERE `user`=?');
 		$result = $query->execute(array($user))->fetchAll();
 		
 		if ($result) {
@@ -70,9 +70,9 @@ class Storage {
 	 */
 	private static function setVersionsSize($user, $size) {
 		if ( self::getVersionsSize($user) === false) {
-			$query = \OC_DB::prepare('INSERT INTO *PREFIX*files_versions (size, user) VALUES (?, ?)');
+			$query = \OC_DB::prepare('INSERT INTO `*PREFIX*files_versions` (`size`, `user`) VALUES (?, ?)');
 		}else {
-			$query = \OC_DB::prepare('UPDATE *PREFIX*files_versions SET size=? WHERE user=?');
+			$query = \OC_DB::prepare('UPDATE `*PREFIX*files_versions` SET `size`=? WHERE `user`=?');
 		}
 		$query->execute(array($size, $user));
 	}
@@ -156,11 +156,18 @@ class Storage {
 	/**
 	 * rename versions of a file
 	 */
-	public static function rename($oldpath, $newpath) {
-		list($uid, $oldpath) = self::getUidAndFilename($oldpath);
-		list($uidn, $newpath) = self::getUidAndFilename($newpath);
+	public static function rename($old_path, $new_path) {
+		list($uid, $oldpath) = self::getUidAndFilename($old_path);
+		list($uidn, $newpath) = self::getUidAndFilename($new_path);
 		$versions_view = new \OC\Files\View('/'.$uid .'/files_versions');
 		$files_view = new \OC\Files\View('/'.$uid .'/files');
+		
+		// if the file already exists than it was a upload of a existing file
+		// over the web interface -> store() is the right function we need here
+		if ($files_view->file_exists($newpath)) {
+			return self::store($new_path);
+		}
+		
 		$abs_newpath = $versions_view->getLocalFile($newpath);
 
 		if ( $files_view->is_dir($oldpath) && $versions_view->is_dir($oldpath) ) {
@@ -177,11 +184,12 @@ 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
@@ -192,9 +200,9 @@ class Storage {
 			}
 
 			// 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 ) {
@@ -272,6 +280,18 @@ class Storage {
 
 	}
 
+
+	/**
+	 * @brief deletes used space for files versions in db if user was deleted
+	 *
+	 * @param type $uid id of deleted user
+	 * @return result of db delete operation
+	 */
+	public static function deleteUser($uid) {
+		$query = \OC_DB::prepare('DELETE FROM `*PREFIX*files_versions` WHERE `user`=?');
+		return $query->execute(array($uid));
+	}
+
 	/**
 	 * @brief get the size of all stored versions from a given user
 	 * @param $uid id from the user
@@ -359,12 +379,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);
 			}
@@ -378,15 +400,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..81eaa0404b759dbef6be6590521b08b47493ef52 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);
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/appinfo/version b/apps/user_ldap/appinfo/version
index e619108dd639e5f36f97f73ae82d8819bdbb20b0..60a2d3e96c80e344efb192a6536f018f6deef60a 100644
--- a/apps/user_ldap/appinfo/version
+++ b/apps/user_ldap/appinfo/version
@@ -1 +1 @@
-0.3.9.5
\ No newline at end of file
+0.4.0
\ No newline at end of file
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 efa5f8b4fe32d9f99eedc2c7231ce35661077568..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 {
@@ -139,6 +139,9 @@ class GROUP_LDAP extends lib\Access implements \OCP\GroupInterface {
 		if(!$this->enabled) {
 			return array();
 		}
+		if(!$this->groupExists($gid)) {
+			return array();
+		}
 		$cachekey = 'usersInGroup-'.$gid.'-'.$search.'-'.$limit.'-'.$offset;
 		// check for cache of the exact query
 		$groupUsers = $this->connection->getFromCache($cachekey);
@@ -154,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);
@@ -172,13 +175,13 @@ 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
 				$filter = $this->combineFilterWithAnd(array(
 					\OCP\Util::mb_str_replace('%uid', $member,
-						$this->connection>ldapLoginFilter, 'UTF-8'),
+						$this->connection->ldapLoginFilter, 'UTF-8'),
 					$this->getFilterPartForUserSearch($search)
 				));
 				$ldap_users = $this->fetchListOfUsers($filter, 'dn');
@@ -214,6 +217,12 @@ class GROUP_LDAP extends lib\Access implements \OCP\GroupInterface {
 	 * @returns array with display names (value) and user ids(key)
 	 */
 	public function displayNamesInGroup($gid, $search, $limit, $offset) {
+		if(!$this->enabled) {
+			return array();
+		}
+		if(!$this->groupExists($gid)) {
+			return array();
+		}
 		$users = $this->usersInGroup($gid, $search, $limit, $offset);
 		$displayNames = array();
 		foreach($users as $user) {
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..f47d49cf222a9142b433b55c9a58966b27f75dab 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(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 6217a6d4821ab8b27d01d03938134e5951beec78..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.",
@@ -48,22 +50,28 @@
 "Turn off SSL certificate validation." => "Schalte die SSL-ZertifikatsprÃ¼fung aus.",
 "If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Falls die Verbindung es erfordert, muss das SSL-Zertifikat des LDAP-Server importiert werden.",
 "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" => "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",
+"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",
+"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. Anderenfall trage ein LDAP/AD-Attribut ein.",
+"Test Configuration" => "Testkonfiguration",
 "Help" => "Hilfe"
 );
diff --git a/apps/user_ldap/l10n/de_DE.php b/apps/user_ldap/l10n/de_DE.php
index bff7b0312c7cbdb8002cee8c6e35ec5e81198c1e..de2dd118e594e403e0f88245aaa016f521f290c4 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> 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 ist nicht installiert, das Backend wird nicht funktionieren. Bitten Sie Ihren Systemadministrator das Modul zu installieren.",
+"<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 anonymen Zugriff lassen Sie DN und Passwort leer.",
+"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 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 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 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,11 +39,11 @@
 "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.",
+"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)",
@@ -50,26 +52,27 @@
 "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" => "Benutzer-Suche Eigenschaften",
+"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" => "Gruppen-Suche Eigenschaften",
+"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",
-"Quota Field" => "Kontingent Feld",
-"Quota Default" => "Kontingent Standard",
+"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 Heimatverzeichnis des Benutzers",
-"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Ohne Eingabe wird der Benutzername (Standard) verwendet. Anderenfall trage ein LDAP/AD-Attribut ein.",
+"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",
 "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 1f0f92e7ac495ac08a4a4c7780443375de79eddf..7c72cc8e63237e10dc4401f9c956a8ff74401ba6 100644
--- a/apps/user_ldap/l10n/es.php
+++ b/apps/user_ldap/l10n/es.php
@@ -7,6 +7,8 @@
 "Take over settings from recent server configuration?" => "Hacerse cargo de los ajustes de configuraciÃ³n del servidor reciente?",
 "Keep settings?" => "Mantener la configuraciÃ³n?",
 "Cannot add server configuration" => "No se puede aÃ±adir la configuraciÃ³n del servidor",
+"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?",
@@ -68,7 +70,10 @@
 "Quota Default" => "Cuota por defecto",
 "in bytes" => "en bytes",
 "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",
+"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 nombre de usuarios 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.",
 "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 b0e7ec12b21b94cfb535e23cc9767a8690dc5b4f..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?",
@@ -48,6 +50,7 @@
 "Turn off SSL certificate validation." => "Desactivar 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, importÃ¡ el certificado SSL del servidor LDAP en tu servidor ownCloud.",
 "Not recommended, use for testing only." => "No recomendado, sÃ³lo para pruebas.",
+"Cache Time-To-Live" => "Tiempo de vida del cachÃ©",
 "in seconds. A change empties the cache." => "en segundos. Cambiarlo vacÃa la cache.",
 "Directory Settings" => "ConfiguraciÃ³n de Directorio",
 "User Display Name Field" => "Campo de nombre de usuario a mostrar",
@@ -63,7 +66,12 @@
 "Group Search Attributes" => "Atributos de bÃºsqueda de grupo",
 "Group-Member association" => "AsociaciÃ³n Grupo-Miembro",
 "Special Attributes" => "Atributos Especiales",
+"Quota Field" => "Campo de cuota",
+"Quota Default" => "Cuota por defecto",
 "in bytes" => "en bytes",
+"Email Field" => "Campo de e-mail",
+"User Home Folder Naming Rule" => "Regla de nombre de los directorios de usuario",
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "VacÃo para el nombre de usuario (por defecto). En otro caso, especificÃ¡ un atributo LDAP/AD.",
+"Test Configuration" => "Probar configuraciÃ³n",
 "Help" => "Ayuda"
 );
diff --git a/apps/user_ldap/l10n/et_EE.php b/apps/user_ldap/l10n/et_EE.php
index 91eb38c7c5f7b90078958f2dad13fd73eb2e3ffe..39346def039f056196426f3f0965df2cb217b9c1 100644
--- a/apps/user_ldap/l10n/et_EE.php
+++ b/apps/user_ldap/l10n/et_EE.php
@@ -1,8 +1,28 @@
 <?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 seadistused?",
+"Cannot add server configuration" => "Ei suuda lisada serveri seadistust",
+"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.",
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Hoiatus:</b>PHP LDAP moodul pole paigaldatud ning LDAP kasutamine ei ole vÃµimalik. Palu oma sÃ¼steeihaldurit see paigaldada.",
+"Server configuration" => "Serveri seadistus",
+"Add Server Configuration" => "Lisa serveri seadistus",
 "Host" => "Host",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "Sa ei saa protokolli Ã¤ra jÃ¤tta, vÃ¤lja arvatud siis, kui sa nÃµuad SSL-Ã¼hendust. Sel juhul alusta eesliitega ldaps://",
 "Base DN" => "Baas DN",
+"One Base DN per line" => "Ãœks baas-DN rea kohta",
 "You can specify Base DN for users and groups in the Advanced tab" => "Sa saad kasutajate ja gruppide baas DN-i mÃ¤Ã¤rata lisavalikute vahekaardilt",
 "User DN" => "Kasutaja 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." => "Klientkasutaja DN, kellega seotakse, nt. uid=agent,dc=nÃ¤idis,dc=com. AnonÃ¼Ã¼mseks ligipÃ¤Ã¤suks jÃ¤ta DN ja parool tÃ¼hjaks.",
@@ -17,21 +37,53 @@
 "Group Filter" => "Grupi filter",
 "Defines the filter to apply, when retrieving groups." => "MÃ¤Ã¤rab gruppe hankides filtri, mida rakendatakse.",
 "without any placeholder, e.g. \"objectClass=posixGroup\"." => "ilma Ã¼hegi kohatÃ¤itjata, nt. \"objectClass=posixGroup\".",
+"Connection Settings" => "Ãœhenduse seaded",
+"Configuration Active" => "Seadistus aktiivne",
+"When unchecked, this configuration will be skipped." => "Kui mÃ¤rkimata, siis seadistust ei kasutata",
 "Port" => "Port",
-"Use TLS" => "Kasutaja TLS",
+"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) 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" => "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.",
 "If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Kui Ã¼hendus toimib ainult selle valikuga, siis impordi LDAP serveri SSL sertifikaat oma ownCloud serverisse.",
 "Not recommended, use for testing only." => "Pole soovitatav, kasuta ainult testimiseks.",
+"Cache Time-To-Live" => "Puhvri iga",
 "in seconds. A change empties the cache." => "sekundites. Muudatus tÃ¼hjendab vahemÃ¤lu.",
+"Directory Settings" => "Kataloogi seaded",
 "User Display Name Field" => "Kasutaja nÃ¤idatava nime vÃ¤li",
 "The LDAP attribute to use to generate the user`s ownCloud name." => "LDAP omadus, mida kasutatakse kasutaja ownCloudi nime loomiseks.",
 "Base User Tree" => "Baaskasutaja puu",
+"One User Base DN per line" => "Ãœks kasutajate baas-DN rea kohta",
+"User Search Attributes" => "Kasutaja otsingu atribuudid",
+"Optional; one attribute per line" => "Valikuline; Ã¼ks atribuut rea kohta",
 "Group Display Name Field" => "Grupi nÃ¤idatava nime vÃ¤li",
 "The LDAP attribute to use to generate the groups`s ownCloud name." => "LDAP omadus, mida kasutatakse ownCloudi grupi nime loomiseks.",
 "Base Group Tree" => "Baasgrupi puu",
+"One Group Base DN per line" => "Ãœks grupi baas-DN rea kohta",
+"Group Search Attributes" => "Grupi otsingu atribuudid",
 "Group-Member association" => "Grupiliikme seotus",
+"Special Attributes" => "Spetsiifilised atribuudid",
+"Quota Field" => "Mahupiirangu atribuut",
+"Quota Default" => "Vaikimisi mahupiirang",
 "in bytes" => "baitides",
+"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 7816ef7c6f724602d292b5bbe11084ca4c161e90..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,8 @@
 "Server configuration" => "Ù¾ÛŒÚ©Ø±Ø¨Ù†Ø¯ÛŒ Ø³Ø±ÙˆØ±",
 "Add Server Configuration" => "Ø§ÙØ²ÙˆØ¯Ù† Ù¾ÛŒÚ©Ø±Ø¨Ù†Ø¯ÛŒ Ø³Ø±ÙˆØ±",
 "Host" => "Ù…ÛŒØ²Ø¨Ø§Ù†ÛŒ",
-"Password" => "Ø±Ù…Ø² Ø¹Ø¨ÙˆØ±",
+"Password" => "Ú¯Ø°Ø±ÙˆØ§Ú˜Ù‡",
+"Group Filter" => "ÙÛŒÙ„ØªØ± Ú¯Ø±ÙˆÙ‡",
 "Port" => "Ø¯Ø±Ú¯Ø§Ù‡",
 "in bytes" => "Ø¯Ø± Ø¨Ø§ÛŒØª",
 "Help" => "Ø±Ø§Ù‡â€ŒÙ†Ù…Ø§"
diff --git a/apps/user_ldap/l10n/fi_FI.php b/apps/user_ldap/l10n/fi_FI.php
index bfbd6c78564b37b4e7a6f4ac58a21c757a1f8a8f..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",
@@ -40,6 +42,7 @@
 "Base Group Tree" => "Ryhmien juuri",
 "Group-Member association" => "RyhmÃ¤n ja jÃ¤senen assosiaatio (yhteys)",
 "in bytes" => "tavuissa",
+"Email Field" => "SÃ¤hkÃ¶postikenttÃ¤",
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "JÃ¤tÃ¤ tyhjÃ¤ksi kÃ¤yttÃ¤jÃ¤nimi (oletusasetus). Muutoin anna LDAP/AD-atribuutti.",
 "Help" => "Ohje"
 );
diff --git a/apps/user_ldap/l10n/fr.php b/apps/user_ldap/l10n/fr.php
index abe136356983e549bb928774fcd98a3680eb6ca8..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\"",
@@ -48,6 +52,7 @@
 "Turn off SSL certificate validation." => "DÃ©sactiver la validation du certificat SSL.",
 "If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Si la connexion ne fonctionne qu'avec cette option, importez le certificat SSL du serveur LDAP dans le serveur ownCloud.",
 "Not recommended, use for testing only." => "Non recommandÃ©, utilisation pour tests uniquement.",
+"Cache Time-To-Live" => "DurÃ©e de vie du cache",
 "in seconds. A change empties the cache." => "en secondes. Tout changement vide le cache.",
 "Directory Settings" => "ParamÃ¨tres du rÃ©pertoire",
 "User Display Name Field" => "Champ \"nom d'affichage\" de l'utilisateur",
@@ -63,7 +68,22 @@
 "Group Search Attributes" => "Recherche des attributs du groupe",
 "Group-Member association" => "Association groupe-membre",
 "Special Attributes" => "Attributs spÃ©ciaux",
-"in bytes" => "en octets",
+"Quota Field" => "Champ du quota",
+"Quota Default" => "Quota par dÃ©faut",
+"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..cbbcc69edebe75d7a494f60cbe6d3e8d4ff6665a 100644
--- a/apps/user_ldap/l10n/hu_HU.php
+++ b/apps/user_ldap/l10n/hu_HU.php
@@ -7,6 +7,7 @@
 "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",
+"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?",
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 5912789c85640cc78afcd098ec9ad1e52c8fd9c7..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.",
@@ -48,6 +50,7 @@
 "Turn off SSL certificate validation." => "matikan validasi sertivikat SSL",
 "If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Jika koneksi hanya bekerja dengan opsi ini, impor sertifikat SSL server LDAP dari server ownCloud anda.",
 "Not recommended, use for testing only." => "tidak disarankan, gunakan hanya untuk pengujian.",
+"Cache Time-To-Live" => "Gunakan Tembolok untuk Time-To-Live",
 "in seconds. A change empties the cache." => "dalam detik. perubahan mengosongkan cache",
 "Directory Settings" => "Pengaturan Direktori",
 "User Display Name Field" => "Bidang Tampilan Nama Pengguna",
@@ -63,7 +66,12 @@
 "Group Search Attributes" => "Atribut Pencarian Grup",
 "Group-Member association" => "asosiasi Anggota-Grup",
 "Special Attributes" => "Atribut Khusus",
+"Quota Field" => "Bidang Kuota",
+"Quota Default" => "Kuota Baku",
 "in bytes" => "dalam bytes",
+"Email Field" => "Bidang Email",
+"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.",
-"Help" => "bantuan"
+"Test Configuration" => "Uji Konfigurasi",
+"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 b31767fe93549df48e4612a6504e1ec277420a8d..8057f7c845550bdb99e486cf344c5dc9dca4b5c6 100644
--- a/apps/user_ldap/l10n/ka_GE.php
+++ b/apps/user_ldap/l10n/ka_GE.php
@@ -1,4 +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 34e9196b8d9b04e9c5a3461b4fea233f2be1bdea..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?",
@@ -48,6 +49,7 @@
 "Turn off SSL certificate validation." => "IzslÄ“gt SSL sertifikÄtu validÄ“Å¡anu.",
 "If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Ja savienojums darbojas ar Å¡o opciju, importÄ“ LDAP serveru SSL sertifikÄtu savÄ ownCloud serverÄ«.",
 "Not recommended, use for testing only." => "Nav ieteicams, izmanto tikai testÄ“Å¡anai!",
+"Cache Time-To-Live" => "KeÅ¡atmiÅ†as dzÄ«vlaiks",
 "in seconds. A change empties the cache." => "sekundÄ“s. IzmaiÅ†as iztukÅ¡os keÅ¡atmiÅ†u.",
 "Directory Settings" => "Direktorijas iestatÄ«jumi",
 "User Display Name Field" => "LietotÄja redzamÄ vÄrda lauks",
@@ -63,7 +65,12 @@
 "Group Search Attributes" => "Grupu meklÄ“Å¡anas atribÅ«ts",
 "Group-Member association" => "Grupu piederÄ«bas asociÄcija",
 "Special Attributes" => "ÄªpaÅ¡ie atribÅ«ti",
+"Quota Field" => "Kvotu lauks",
+"Quota Default" => "Kvotas noklusÄ“jums",
 "in bytes" => "baitos",
+"Email Field" => "E-pasta lauks",
+"User Home Folder Naming Rule" => "LietotÄja mÄjas mapes nosaukÅ¡anas kÄrtula",
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "AtstÄt tukÅ¡u lietotÄja vÄrdam (noklusÄ“juma). CitÄdi, norÄdi LDAP/AD atribÅ«tu.",
+"Test Configuration" => "Testa konfigurÄcija",
 "Help" => "PalÄ«dzÄ«ba"
 );
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..c935d387ccc51475f408cc117a7ed79521626926 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,13 @@
 "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",
+"Internal Username Attribute:" => "Interne gebruikersnaam attribuut:",
+"Override UUID detection" => "Negeren UUID detectie",
+"UUID Attribute:" => "UUID Attribuut:",
+"Username-LDAP User Mapping" => "Gebruikersnaam-LDAP gebruikers vertaling",
+"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..a7a831e3e57489dc970c472b0e80fdf29448e61c 100644
--- a/apps/user_ldap/l10n/pl.php
+++ b/apps/user_ldap/l10n/pl.php
@@ -3,10 +3,12 @@
 "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",
+"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?",
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..b31fe3775639988f304681a57f333769c6fa5bc1 100644
--- a/apps/user_ldap/l10n/sk_SK.php
+++ b/apps/user_ldap/l10n/sk_SK.php
@@ -7,6 +7,8 @@
 "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",
+"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?",
diff --git a/apps/user_ldap/l10n/sl.php b/apps/user_ldap/l10n/sl.php
index e1734a90780d661b5f8346820033e320d4df2c6e..1ade5d9b733f3ef7e8dcc11e4d9d8e2d2e6b4a92 100644
--- a/apps/user_ldap/l10n/sl.php
+++ b/apps/user_ldap/l10n/sl.php
@@ -1,16 +1,33 @@
 <?php $TRANSLATIONS = array(
+"Failed to delete the server configuration" => "Brisanje nastavitev streÅ¾nika je spodletelo.",
+"The configuration is valid and the connection could be established!" => "Nastavitev je veljavna, zato je povezavo mogoÄe vzpostaviti!",
+"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Nastavitev je veljavna, vendar pa je vez Bind spodletela. Preveriti je treba nastavitve streÅ¾nika in ustreznost poveril.",
+"The configuration is invalid. Please look in the ownCloud log for further details." => "Nastavitev je veljavna. VeÄ podrobnosti je zapisanih v dnevniku ownCloud.",
 "Deletion failed" => "Brisanje je spodletelo.",
-"<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>Opozorilo:</b> Aplikaciji user_ldap in user_webdavauth nista zdruÅ¾ljivi. Morda boste opazili nepriÄakovano obnaÅ¡anje sistema. Prosimo, prosite vaÅ¡ega skrbnika, da eno od aplikacij onemogoÄi.",
+"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?",
+"Confirm Deletion" => "Potrdi brisanje",
+"<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>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.",
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Opozorilo:</b> modul PHP LDAP mora biti nameÅ¡Äen, sicer vmesnik ne bo deloval. Paket je treba namestiti.",
+"Server configuration" => "Nastavitev streÅ¾nika",
+"Add Server Configuration" => "Dodaj nastavitve streÅ¾nika",
 "Host" => "Gostitelj",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "Protokol je lahko izpuÅ¡Äen, Äe ni posebej zahtevan SSL. V tem primeru se mora naslov zaÄeti z ldaps://",
 "Base DN" => "Osnovni DN",
-"You can specify Base DN for users and groups in the Advanced tab" => "Osnovni DN za uporabnike in skupine lahko doloÄite v zavihku Napredno",
+"One Base DN per line" => "En osnovni DN na vrstico",
+"You can specify Base DN for users and groups in the Advanced tab" => "Osnovni DN za uporabnike in skupine lahko doloÄite v zavihku naprednih moÅ¾nosti.",
 "User DN" => "Uporabnik 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 uporabnikovega odjemalca, s katerim naj se opravi vezava, npr. uid=agent,dc=example,dc=com. Za anonimni dostop sta polji DN in geslo prazni.",
+"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 uporabnikovega odjemalca, s katerim naj se opravi vezava, npr. uid=agent,dc=example,dc=com. Za brezimni dostop sta polji DN in geslo prazni.",
 "Password" => "Geslo",
-"For anonymous access, leave DN and Password empty." => "Za anonimni dostop sta polji DN in geslo prazni.",
+"For anonymous access, leave DN and Password empty." => "Za brezimni dostop sta polji DN in geslo prazni.",
 "User Login Filter" => "Filter prijav uporabnikov",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "DoloÄi filter, uporabljen pri prijavi. %%uid nadomesti uporabniÅ¡ko ime za prijavo.",
+"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "DoloÄi filter, uporabljen pri prijavi. %%uid nadomesti uporabniÅ¡ko ime v postopku prijave.",
 "use %%uid placeholder, e.g. \"uid=%%uid\"" => "Uporabite vsebnik %%uid, npr. \"uid=%%uid\".",
 "User List Filter" => "Filter seznama uporabnikov",
 "Defines the filter to apply, when retrieving users." => "DoloÄi filter za uporabo med pridobivanjem uporabnikov.",
@@ -18,21 +35,43 @@
 "Group Filter" => "Filter skupin",
 "Defines the filter to apply, when retrieving groups." => "DoloÄi filter za uporabo med pridobivanjem skupin.",
 "without any placeholder, e.g. \"objectClass=posixGroup\"." => "Brez katerekoli vsebnika, npr. \"objectClass=posixGroup\".",
+"Connection Settings" => "Nastavitve povezave",
+"Configuration Active" => "Dejavna nastavitev",
+"When unchecked, this configuration will be skipped." => "Neizbrana moÅ¾nost preskoÄi nastavitev.",
 "Port" => "Vrata",
+"Backup (Replica) Host" => "Varnostna kopija (replika) podatkov gostitelja",
+"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Podati je treba izbirno varnostno kopijo gostitelja. Ta mora biti natanÄna replika streÅ¾nika LDAP/AD.",
+"Backup (Replica) Port" => "Varnostna kopija (replika) podatka vrat",
+"Disable Main Server" => "OnemogoÄi glavni streÅ¾nik",
+"When switched on, ownCloud will only connect to the replica server." => "Ob priklopu bo streÅ¾nik ownCloud povezan le s kopijo (repliko) streÅ¾nika.",
 "Use TLS" => "Uporabi TLS",
+"Do not use it additionally for LDAPS connections, it will fail." => "StreÅ¾nika ni priporoÄljivo uporabljati za povezave LDAPS. Povezava bo spodletela.",
 "Case insensitve LDAP server (Windows)" => "StreÅ¾nik LDAP ne upoÅ¡teva velikosti Ärk (Windows)",
-"Turn off SSL certificate validation." => "OnemogoÄi potrditev veljavnosti potrdila SSL.",
-"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "V primeru, da povezava deluje le s to moÅ¾nostjo, uvozite potrdilo SSL iz streÅ¾nika LDAP na vaÅ¡ streÅ¾nik ownCloud.",
+"Turn off SSL certificate validation." => "OnemogoÄi doloÄanje veljavnosti potrdila SSL.",
+"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Kadar deluje povezava le s to moÅ¾nostjo, uvozite potrdilo SSL iz streÅ¾nika LDAP na vaÅ¡ streÅ¾nik ownCloud.",
 "Not recommended, use for testing only." => "Dejanje ni priporoÄeno; uporabljeno naj bo le za preizkuÅ¡anje delovanja.",
+"Cache Time-To-Live" => "Predpomni podatke TTL",
 "in seconds. A change empties the cache." => "v sekundah. Sprememba izprazni predpomnilnik.",
+"Directory Settings" => "Nastavitve mape",
 "User Display Name Field" => "Polje za uporabnikovo prikazano ime",
 "The LDAP attribute to use to generate the user`s ownCloud name." => "Atribut LDAP, uporabljen pri ustvarjanju uporabniÅ¡kih imen ownCloud.",
 "Base User Tree" => "Osnovno uporabniÅ¡ko drevo",
+"One User Base DN per line" => "Eno osnovno uporabniÅ¡ko ime DN na vrstico",
+"User Search Attributes" => "Uporabi atribute iskanja",
+"Optional; one attribute per line" => "Izbirno; en atribut na vrstico",
 "Group Display Name Field" => "Polje za prikazano ime skupine",
 "The LDAP attribute to use to generate the groups`s ownCloud name." => "Atribut LDAP, uporabljen pri ustvarjanju imen skupin ownCloud.",
 "Base Group Tree" => "Osnovno drevo skupine",
-"Group-Member association" => "Povezava Älana skupine",
+"One Group Base DN per line" => "Eno osnovno ime skupine DN na vrstico",
+"Group Search Attributes" => "Atributi iskanja skupine",
+"Group-Member association" => "Povezava Älan-skupina",
+"Special Attributes" => "Posebni atributi",
+"Quota Field" => "Polje koliÄinske omejitve",
+"Quota Default" => "Privzeta koliÄinska omejitev",
 "in bytes" => "v bajtih",
-"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Pustite prazno za uporabniÅ¡ko ime (privzeto). V nasprotnem primeru navedite atribut LDAP/AD.",
+"Email Field" => "Polje elektronske poÅ¡te",
+"User Home Folder Naming Rule" => "Pravila poimenovanja uporabniÅ¡ke osebne mape",
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Pustite prazno za uporabniÅ¡ko ime (privzeto), sicer navedite atribut LDAP/AD.",
+"Test Configuration" => "Preizkusne nastavitve",
 "Help" => "PomoÄ"
 );
diff --git a/apps/user_ldap/l10n/sq.php b/apps/user_ldap/l10n/sq.php
new file mode 100644
index 0000000000000000000000000000000000000000..12324b9f966cfe6fa5ea2caab20182dccafc39d4
--- /dev/null
+++ b/apps/user_ldap/l10n/sq.php
@@ -0,0 +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 12ecc7b1633c15ea469f48cbd7d0d619d26814af..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?",
@@ -48,6 +50,7 @@
 "Turn off SSL certificate validation." => "StÃ¤ng av verifiering av SSL-certifikat.",
 "If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Om anslutningen bara fungerar med det hÃ¤r alternativet, importera LDAP-serverns SSL-certifikat i din ownCloud-server.",
 "Not recommended, use for testing only." => "Rekommenderas inte, anvÃ¤nd bara fÃ¶r test. ",
+"Cache Time-To-Live" => "Cache Time-To-Live",
 "in seconds. A change empties the cache." => "i sekunder. En fÃ¶rÃ¤ndring tÃ¶mmer cache.",
 "Directory Settings" => "MappinstÃ¤llningar",
 "User Display Name Field" => "Attribut fÃ¶r anvÃ¤ndarnamn",
@@ -64,8 +67,11 @@
 "Group-Member association" => "Attribut fÃ¶r gruppmedlemmar",
 "Special Attributes" => "Specialattribut",
 "Quota Field" => "KvotfÃ¤lt",
+"Quota Default" => "Datakvot standard",
 "in bytes" => "i bytes",
 "Email Field" => "E-postfÃ¤lt",
+"User Home Folder Naming Rule" => "Namnregel fÃ¶r hemkatalog",
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "LÃ¤mnas tomt fÃ¶r anvÃ¤ndarnamn (standard). Ange annars ett LDAP/AD-attribut.",
+"Test Configuration" => "Testa konfigurationen",
 "Help" => "HjÃ¤lp"
 );
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
new file mode 100644
index 0000000000000000000000000000000000000000..3f047631cf70efdb246ea3fbd13df274b80d07b2
--- /dev/null
+++ b/apps/user_ldap/l10n/te.php
@@ -0,0 +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..c001fa99cecf8421a2be4274498c4509d6b87d71 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 uyunlama basarmadi ",
+"The configuration is valid and the connection could be established!" => "Uyunlama mantikli ve baglama yerlestirmek edebilmi.",
+"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Uyunlama gecerli, fakat Baglama yapamadi. Lutfen kontrol yapmak, eger bu iyi yerlertirdi. ",
+"The configuration is invalid. Please look in the ownCloud log for further details." => "Uyunma mantikli degil. Lutfen log daha kontrol yapmak. ",
 "Deletion failed" => "Silme baÅŸarÄ±sÄ±z oldu",
+"Take over settings from recent server configuration?" => "Parametri sonadan uyunlama cikarmak mi?",
 "Keep settings?" => "AyarlarÄ± kalsÄ±nmÄ±?",
+"Cannot add server configuration" => "Sunucu uyunlama birlemek edemen. ",
+"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?" => "Hakikatten, Sonuncu Funksyon durmak istiyor mi?",
 "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 d494945e2e45155c94a33fb46bafac9a34486278..7b8389227aec8bf927826bc2b722d104c97c3c2f 100644
--- a/apps/user_ldap/l10n/zh_CN.php
+++ b/apps/user_ldap/l10n/zh_CN.php
@@ -1,9 +1,26 @@
 <?php $TRANSLATIONS = array(
+"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" => "Base DN",
+"One Base DN per line" => "æ¯è¡Œä¸€ä¸ªåŸºæœ¬åˆ¤åˆ«å",
 "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\nå¦‚éœ€åŒ¿åè®¿é—®ï¼Œå°†DNå’Œå¯†ç ä¿ç•™ä¸ºç©º",
@@ -18,21 +35,43 @@
 "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æœåŠ¡å™¨(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." => "å¦‚æžœé“¾æŽ¥ä»…åœ¨æ¤é€‰é¡¹æ—¶å¯ç”¨ï¼Œåœ¨æ‚¨çš„ownCloudæœåŠ¡å™¨ä¸å¯¼å…¥LDAPæœåŠ¡å™¨çš„SSLè¯ä¹¦ã€‚",
 "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." => "ç”¨æ¥ç”Ÿæˆç”¨æˆ·çš„ownCloudåç§°çš„ LDAPå±žæ€§",
 "Base User Tree" => "åŸºç¡€ç”¨æˆ·æ ‘",
+"One User Base DN per line" => "æ¯è¡Œä¸€ä¸ªç”¨æˆ·åŸºå‡†åˆ¤åˆ«å",
+"User Search Attributes" => "ç”¨æˆ·æœç´¢å±žæ€§",
+"Optional; one attribute per line" => "å¯é€‰;æ¯è¡Œä¸€ä¸ªå±žæ€§",
 "Group Display Name Field" => "ç»„æ˜¾ç¤ºåç§°å—æ®µ",
 "The LDAP attribute to use to generate the groups`s ownCloud name." => "ç”¨æ¥ç”Ÿæˆç»„çš„ownCloudåç§°çš„LDAPå±žæ€§",
 "Base Group Tree" => "åŸºç¡€ç»„æ ‘",
+"One Group Base DN per line" => "æ¯è¡Œä¸€ä¸ªç¾¤ç»„åŸºå‡†åˆ¤åˆ«å",
+"Group Search Attributes" => "ç¾¤ç»„æœç´¢å±žæ€§",
 "Group-Member association" => "ç»„æˆå‘˜å…³è”",
+"Special Attributes" => "ç‰¹æ®Šå±žæ€§",
+"Quota Field" => "é…é¢å—æ®µ",
+"Quota Default" => "é»˜è®¤é…é¢",
 "in bytes" => "å—èŠ‚æ•°",
+"Email Field" => "ç”µé‚®å—æ®µ",
+"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/zh_HK.php b/apps/user_ldap/l10n/zh_HK.php
new file mode 100644
index 0000000000000000000000000000000000000000..ba55c4147905453e86c73a362a57fe7998dbe7a9
--- /dev/null
+++ b/apps/user_ldap/l10n/zh_HK.php
@@ -0,0 +1,7 @@
+<?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 a8cfd45bf4d630f3cd48ce35da40c00c3e082eca..a7611eb3e846690c0a69b8f90756ae625dcbb5de 100644
--- a/apps/user_ldap/lib/access.php
+++ b/apps/user_ldap/lib/access.php
@@ -62,7 +62,10 @@ abstract class Access {
 		$dn = $this->DNasBaseParameter($dn);
 		$rr = @ldap_read($cr, $dn, $filter, array($attr));
 		if(!is_resource($rr)) {
-			\OCP\Util::writeLog('user_ldap', 'readAttribute failed for DN '.$dn, \OCP\Util::DEBUG);
+			if(!empty($attr)) {
+				//do not throw this message on userExists check, irritates
+				\OCP\Util::writeLog('user_ldap', 'readAttribute failed for DN '.$dn, \OCP\Util::DEBUG);
+			}
 			//in case an error occurs , e.g. object does not exist
 			return false;
 		}
@@ -84,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') {
+				} elseif(strtolower($attr) === 'objectguid' || strtolower($attr) === 'guid') {
 					$values[] = $this->convertObjectGUID2Str($result[$attr][$i]);
 				} else {
 					$values[] = $result[$attr][$i];
@@ -314,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
@@ -459,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);
@@ -547,7 +562,7 @@ abstract class Access {
 
 		$sqlAdjustment = '';
 		$dbtype = \OCP\Config::getSystemValue('dbtype');
-		if($dbtype == 'mysql') {
+		if($dbtype === 'mysql') {
 			$sqlAdjustment = 'FROM DUAL';
 		}
 
@@ -571,7 +586,7 @@ abstract class Access {
 
 		$insRows = $res->numRows();
 
-		if($insRows == 0) {
+		if($insRows === 0) {
 			return false;
 		}
 
@@ -653,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);
@@ -721,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];
@@ -813,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;
@@ -854,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 '';
 			}
@@ -864,7 +879,7 @@ abstract class Access {
 				$filter[] = $attribute . '=' . $search;
 			}
 		}
-		if(count($filter) == 1) {
+		if(count($filter) === 1) {
 			return '('.$filter[0].')';
 		}
 		return $this->combineFilterWithOr($filter);
@@ -890,12 +905,18 @@ 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;
 		}
 
 		//for now, supported (known) attributes are entryUUID, nsuniqueid, objectGUID
-		$testAttributes = array('entryuuid', 'nsuniqueid', 'objectguid');
+		$testAttributes = array('entryuuid', 'nsuniqueid', 'objectguid', 'guid');
 
 		foreach($testAttributes as $attribute) {
 			\OCP\Util::writeLog('user_ldap', 'Testing '.$attribute.' as UUID attr', \OCP\Util::DEBUG);
@@ -1004,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;
@@ -1028,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 6643428afe4082429ad92fc0b1d22eb10cae07f6..ba4de1353412dbb6756a74f9de54d2cefaf4ea03 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)) {
@@ -212,7 +214,6 @@ class Connection {
 	 */
 	private function readConfiguration($force = false) {
 		if((!$this->configured || $force) && !is_null($this->configID)) {
-			$defaults = $this->getDefaults();
 			$v = 'getValue';
 			$this->config['ldapHost']       = $this->$v('ldap_host');
 			$this->config['ldapBackupHost'] = $this->$v('ldap_backup_host');
@@ -266,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();
 		}
@@ -291,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',
@@ -303,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;
 	}
@@ -322,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;
 			}
@@ -390,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 {
@@ -428,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',
@@ -441,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();
 			}
@@ -504,6 +512,10 @@ class Connection {
 			$configurationOK = false;
 		}
 
+		if(!empty($this->config['ldapExpertUUIDAttr'])) {
+			$this->config['ldapUuidAttribute'] = $this->config['ldapExpertUUIDAttr'];
+		}
+
 		return $configurationOK;
 	}
 
@@ -542,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'             => '',
 		);
 	}
 
@@ -589,12 +603,12 @@ class Connection {
 
 			$error = null;
 			//if LDAP server is not reachable, try the Backup (Replica!) Server
-			if((!$bindStatus && ($error == -1))
+			if((!$bindStatus && ($error === -1))
 				|| $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);
diff --git a/apps/user_ldap/lib/helper.php b/apps/user_ldap/lib/helper.php
index 308da3ef724237c280083ad1f0811e60c7bb3c8e..07d13a806a624fcff9982d38cb508afca3d4da01 100644
--- a/apps/user_ldap/lib/helper.php
+++ b/apps/user_ldap/lib/helper.php
@@ -51,7 +51,8 @@ class Helper {
 		$query = '
 			SELECT DISTINCT `configkey`
 			FROM `*PREFIX*appconfig`
-			WHERE `configkey` LIKE ?
+			WHERE `appid` = \'user_ldap\'
+				AND `configkey` LIKE ?
 		';
 		if($activeConfigurations) {
 			$query .= ' AND `configvalue` = \'1\'';
@@ -95,7 +96,32 @@ 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;
+		}
+
+		$query = \OCP\DB::prepare('TRUNCATE '.$table);
+		$res = $query->execute();
+
+		if(\OCP\DB::isError($res)) {
 			return false;
 		}
 
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 44a1947859805c5935b06e68d6cb53aa8ac8ccff..41e2926605e75f04af7702666485ade9ef696f34 100644
--- a/apps/user_ldap/user_ldap.php
+++ b/apps/user_ldap/user_ldap.php
@@ -180,6 +180,11 @@ class USER_LDAP extends lib\Access implements \OCP\UserInterface {
 	* @return boolean
 	*/
 	public function getHome($uid) {
+		// user Exists check required as it is not done in user proxy!
+		if(!$this->userExists($uid)) {
+			return false;
+		}
+
 		$cacheKey = 'getHome'.$uid;
 		if($this->connection->isCached($cacheKey)) {
 			return $this->connection->getFromCache($cacheKey);
@@ -192,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 {
@@ -217,6 +222,10 @@ class USER_LDAP extends lib\Access implements \OCP\UserInterface {
 	 * @return display name
 	 */
 	public function getDisplayName($uid) {
+		if(!$this->userExists($uid)) {
+			return false;
+		}
+
 		$cacheKey = 'getDisplayName'.$uid;
 		if(!is_null($displayName = $this->connection->getFromCache($cacheKey))) {
 			return $displayName;
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/ar.php b/apps/user_webdavauth/l10n/ar.php
index cf59cd2519ea756b490e34dca2054d8e6aa6a0fb..c17302f7bb105c8faacc41f5b0df751137f15e5b 100644
--- a/apps/user_webdavauth/l10n/ar.php
+++ b/apps/user_webdavauth/l10n/ar.php
@@ -1,3 +1,5 @@
 <?php $TRANSLATIONS = array(
-"URL: http://" => "Ø§Ù„Ø±Ø§Ø¨Ø·: http://"
+"WebDAV Authentication" => "ØªØ£ÙƒØ¯ Ø´Ø®ØµÙŠØ© Ø§Ù„ WebDAV",
+"URL: http://" => "Ø§Ù„Ø±Ø§Ø¨Ø·: http://",
+"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials."
 );
diff --git a/apps/user_webdavauth/l10n/bg_BG.php b/apps/user_webdavauth/l10n/bg_BG.php
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/de_DE.php b/apps/user_webdavauth/l10n/de_DE.php
index bd5d328e477cacf71815a0bd0ccddbc6691ec9c3..1aecfd29968080c9bb48525d360dadce0610adaf 100644
--- a/apps/user_webdavauth/l10n/de_DE.php
+++ b/apps/user_webdavauth/l10n/de_DE.php
@@ -1,5 +1,5 @@
 <?php $TRANSLATIONS = array(
-"WebDAV Authentication" => "WebDAV Authentifizierung",
+"WebDAV Authentication" => "WebDAV-Authentifizierung",
 "URL: http://" => "URL: http://",
 "ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloud sendet die Benutzerdaten an diese URL. Dieses Plugin prÃ¼ft die Antwort und wird die Statuscodes 401 und 403 als ungÃ¼ltige Daten und alle anderen Antworten als gÃ¼ltige Daten interpretieren."
 );
diff --git a/apps/user_webdavauth/l10n/et_EE.php b/apps/user_webdavauth/l10n/et_EE.php
index f4f7486035866c4b1693b4210d662ca23d8bde9c..a3b86224ac2f53bc105db5b3755d59d382963b7b 100644
--- a/apps/user_webdavauth/l10n/et_EE.php
+++ b/apps/user_webdavauth/l10n/et_EE.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
 "WebDAV Authentication" => "WebDAV autentimine",
-"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 saadab kasutajatunnused sellel aadressil. See vidin kontrollib vastust ning tuvastab HTTP vastuskoodid 401 ja 403 kui vigased, ning kÃµik teised vastused kui korrektsed kasutajatunnused."
 );
diff --git a/apps/user_webdavauth/l10n/ka_GE.php b/apps/user_webdavauth/l10n/ka_GE.php
new file mode 100644
index 0000000000000000000000000000000000000000..f475ea0b7374bf089369eeff0dd9ba2d5d06317c
--- /dev/null
+++ b/apps/user_webdavauth/l10n/ka_GE.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â€“áƒ–áƒ”. áƒ”áƒ¡ áƒžáƒšáƒáƒ’áƒ˜áƒœáƒ˜ áƒ¨áƒ”áƒáƒ›áƒáƒ¬áƒ›áƒ”áƒ‘áƒ¡ áƒžáƒáƒ¡áƒ£áƒ®áƒ¡ áƒ“áƒ áƒ›áƒáƒáƒ®áƒ“áƒ”áƒœáƒ¡ áƒ›áƒ˜áƒ¡ áƒ˜áƒœáƒ¢áƒ”áƒ áƒžáƒ áƒ”áƒ¢áƒáƒªáƒ˜áƒáƒ¡ HTTP áƒ¡áƒ¢áƒáƒ¢áƒ£áƒ¡áƒ™áƒáƒ“áƒ”áƒ‘áƒ¨áƒ˜ 401 áƒ“áƒ 403 áƒ“áƒáƒ£áƒ¨áƒ•áƒ”áƒ‘áƒ”áƒšáƒ˜ áƒ›áƒáƒœáƒáƒªáƒ”áƒ›áƒ”áƒ‘áƒ˜áƒ¡áƒ—áƒ•áƒ˜áƒ¡, áƒ®áƒáƒšáƒ áƒ¡áƒ®áƒ•áƒ áƒ“áƒáƒœáƒáƒ áƒ©áƒ”áƒœáƒ¡ áƒ“áƒáƒ¨áƒ•áƒ”áƒ‘áƒáƒ“áƒ˜ áƒ›áƒáƒœáƒáƒªáƒ”áƒ›áƒ”áƒ‘áƒ˜áƒ¡áƒ—áƒ•áƒ˜áƒ¡."
+);
diff --git a/apps/user_webdavauth/l10n/lt_LT.php b/apps/user_webdavauth/l10n/lt_LT.php
new file mode 100644
index 0000000000000000000000000000000000000000..8d0492ae487beb61ff302fdb5590a8d3ea6b5a1b
--- /dev/null
+++ b/apps/user_webdavauth/l10n/lt_LT.php
@@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"WebDAV Authentication" => "WebDAV autorizavimas",
+"URL: http://" => "Adresas: http://",
+"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloud iÅ¡siÅ³s naudotojo duomenis Ä¯ Å¡Ä¯ WWW adresÄ…. Å is Ä¯skiepis patikrins gautÄ… atsakymÄ… ir interpretuos HTTP bÅ«senos kodÄ… 401 ir 403 kaip negaliojanÄius duomenis, ir visus kitus gautus atsakymus kaip galiojanÄius duomenis. "
+);
diff --git a/apps/user_webdavauth/l10n/sl.php b/apps/user_webdavauth/l10n/sl.php
index 245a5101341d2a51e59b2cc0575b907f85eb3945..7c592723af680aaf9e96b75ac0681d4cce75af40 100644
--- a/apps/user_webdavauth/l10n/sl.php
+++ b/apps/user_webdavauth/l10n/sl.php
@@ -1,3 +1,5 @@
 <?php $TRANSLATIONS = array(
-"URL: http://" => "URL: http://"
+"WebDAV Authentication" => "Overitev WebDAV",
+"URL: http://" => "URL: http://",
+"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "Sistem ownCloud bo poslal uporabniÅ¡ka poverila na navedeni naslov URL. Ta vstavek preveri odziv in tolmaÄi kode stanja HTTP 401 in HTTP 403 kot spodletel odgovor in vse ostale odzive kot veljavna poverila."
 );
diff --git a/apps/user_webdavauth/l10n/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 79740561e5ad41e490f03c35b995e1c993a0dd6c..6f94b77ac5794f6a4eaba19d43b687e8b26643ca 100644
--- a/apps/user_webdavauth/l10n/zh_TW.php
+++ b/apps/user_webdavauth/l10n/zh_TW.php
@@ -1,3 +1,5 @@
 <?php $TRANSLATIONS = array(
-"WebDAV URL: http://" => "WebDAV ç¶²å€ http://"
+"WebDAV Authentication" => "WebDAV èªè‰",
+"URL: http://" => "ç¶²å€ï¼šhttp://",
+"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloud æœƒå°‡æŠŠç”¨æˆ¶çš„ç™»å…¥è³‡è¨Šç™¼é€åˆ°é€™å€‹ç¶²å€ä»¥å˜—è©¦ç™»å…¥ï¼Œä¸¦æª¢æŸ¥å›žæ‡‰ï¼Œ HTTP ç‹€æ…‹ç¢¼401å’Œ403è¦–ç‚ºç™»å…¥å¤±æ•—ï¼Œæ‰€æœ‰å…¶ä»–å›žæ‡‰è¦–ç‚ºç™»å…¥æˆåŠŸã€‚"
 );
diff --git a/autotest.sh b/autotest.sh
index fdf6d2fe098267dd414acd4b573f0b8fd5385d02..267815e96d82e147c86c6163791bfff5028db1dc 100755
--- a/autotest.sh
+++ b/autotest.sh
@@ -90,7 +90,12 @@ 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" == "pgsql" ] ; then
+		# no coverage with pg - causes segfault on ci.tmit.eu - reason unknown
+		phpunit --configuration phpunit-autotest.xml --log-junit autotest-results-$1.xml
+	else
+		phpunit --configuration phpunit-autotest.xml --log-junit autotest-results-$1.xml --coverage-clover autotest-clover-$1.xml --coverage-html coverage-html-$1
+	fi
 }
 
 #
diff --git a/config/config.sample.php b/config/config.sample.php
index ec61ceefd6cd27167c5ba1a472f68caac5c4d1e9..72834009201931033319d1e8e69b78ed5346bc00 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -56,10 +56,10 @@ $CONFIG = array(
 /* Theme to use for ownCloud */
 "theme" => "",
 
-/* Path to the 3rdparty directory */
+/* Path to the parent directory of the 3rdparty directory */
 "3rdpartyroot" => "",
 
-/* URL to the 3rdparty directory, as seen by the browser */
+/* URL to the parent directory of the 3rdparty directory, as seen by the browser */
 "3rdpartyurl" => "",
 
 /* Default app to load on login */
@@ -77,6 +77,9 @@ $CONFIG = array(
 /* URL of the appstore to use, server should understand OCS */
 "appstoreurl" => "http://api.apps.owncloud.com/v1",
 
+/* Domain name used by ownCloud for the sender mail address, e.g. no-reply@example.com */
+"mail_domain" => "example.com",
+
 /* Enable SMTP class debugging */
 "mail_smtpdebug" => false,
 
@@ -123,7 +126,10 @@ $CONFIG = array(
 /* Check if ownCloud is up to date */
 "updatechecker" => true,
 
-/* Place to log to, can be owncloud and syslog (owncloud is log menu item in admin menu) */
+/* Are we connected to the internet or are we running in a closed network? */
+"has_internet_connection" => true,
+
+	/* Place to log to, can be owncloud and syslog (owncloud is log menu item in admin menu) */
 "log_type" => "owncloud",
 
 /* File for the owncloud logger to log to, (default is ownloud.log in the data dir */
@@ -132,12 +138,20 @@ $CONFIG = array(
 /* Loglevel to start logging at. 0=DEBUG, 1=INFO, 2=WARN, 3=ERROR (default is WARN) */
 "loglevel" => "",
 
+/* Append All database query and parameters to the log file.
+ (whatch out, this option can increase the size of your log file)*/
+"log_query" => false,
+
 /* Lifetime of the remember login cookie, default is 15 days */
 "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/ajax/share.php b/core/ajax/share.php
index 9201b48cb954af5849b0b19334a376b37486a444..5854b65aa03161248d92125567aa0a55b8232258 100644
--- a/core/ajax/share.php
+++ b/core/ajax/share.php
@@ -95,12 +95,12 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
 
 			// setup the email
 			$subject = (string)$l->t('User %s shared a file with you', $displayName);
-			if ($type === 'dir')
+			if ($type === 'folder')
 				$subject = (string)$l->t('User %s shared a folder with you', $displayName);
 
 			$text = (string)$l->t('User %s shared the file "%s" with you. It is available for download here: %s',
 				array($displayName, $file, $link));
-			if ($type === 'dir')
+			if ($type === 'folder')
 				$text = (string)$l->t('User %s shared the folder "%s" with you. It is available for download here: %s',
 					array($displayName, $file, $link));
 
@@ -110,7 +110,7 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
 
 			// send it out now
 			try {
-				OCP\Util::sendMail($to_address, $to_address, $subject, $text, $from_address, $user);
+				OCP\Util::sendMail($to_address, $to_address, $subject, $text, $from_address, $displayName);
 				OCP\JSON::success();
 			} catch (Exception $exception) {
 				OCP\JSON::error(array('data' => array('message' => OC_Util::sanitizeHTML($exception->getMessage()))));
diff --git a/core/ajax/update.php b/core/ajax/update.php
index 8b20150d43248ae38ec263619a62719dfc8c09e2..6015a901eb795c24c424b3d0c02f4367c2dc344d 100644
--- a/core/ajax/update.php
+++ b/core/ajax/update.php
@@ -14,6 +14,10 @@ if (OC::checkUpgrade(false)) {
 	try {
 		$result = OC_DB::updateDbFromStructure(OC::$SERVERROOT.'/db_structure.xml');
 		$watcher->success('Updated database');
+
+		// do a file cache upgrade for users with files
+		// this can take loooooooooooooooooooooooong
+		__doFileCacheUpgrade($watcher);
 	} catch (Exception $exception) {
 		$watcher->failure($exception->getMessage());
 	}
@@ -26,6 +30,49 @@ if (OC::checkUpgrade(false)) {
 	$watcher->done();
 }
 
+/**
+ * The FileCache Upgrade routine
+ *
+ * @param UpdateWatcher $watcher
+ */
+function __doFileCacheUpgrade($watcher) {
+	try {
+		$query = \OC_DB::prepare('
+		SELECT DISTINCT `user`
+		FROM `*PREFIX*fscache`
+		');
+		$result = $query->execute();
+	} catch (\Exception $e) {
+		return;
+	}
+	$users = $result->fetchAll();
+	if(count($users) == 0) {
+		return;
+	}
+	$step = 100 / count($users);
+	$percentCompleted = 0;
+	$lastPercentCompletedOutput = 0;
+	$startInfoShown = false;
+	foreach($users as $userRow) {
+		$user = $userRow['user'];
+		\OC\Files\Filesystem::initMountPoints($user);
+		\OC\Files\Cache\Upgrade::doSilentUpgrade($user);
+		if(!$startInfoShown) {
+			//We show it only now, because otherwise Info about upgraded apps
+			//will appear between this and progress info
+			$watcher->success('Updating filecache, this may take really long...');
+			$startInfoShown = true;
+		}
+		$percentCompleted += $step;
+		$out = floor($percentCompleted);
+		if($out != $lastPercentCompletedOutput) {
+			$watcher->success('... '. $out.'% done ...');
+			$lastPercentCompletedOutput = $out;
+		}
+	}
+	$watcher->success('Updated filecache');
+}
+
 class UpdateWatcher {
 	/**
 	 * @var \OC_EventSource $eventSource;
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 0725e658965e1145c2ce524399417a13b609ad69..93f2cecbfe9aa6be82b76600304f0976cb6a81a9 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -12,7 +12,7 @@ table, td, th { vertical-align:middle; }
 a { border:0; color:#000; text-decoration:none;}
 a, a *, input, input *, select, .button span, li, label { cursor:pointer; }
 ul { list-style:none; }
-body { background:#fefefe; font:normal .8em/1.6em "Lucida Grande", Arial, Verdana, sans-serif; color:#000; }
+body { background:#fefefe; font:normal .8em/1.6em "Helvetica Neue",Helvetica,Arial,FreeSans,sans-serif; color:#000; }
 
 
 /* HEADERS */
@@ -23,13 +23,13 @@ body { background:#fefefe; font:normal .8em/1.6em "Lucida Grande", Arial, Verdan
 #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; }
@@ -38,9 +38,11 @@ filter:progid:DXImageTransform.Microsoft.gradient( startColorstr='#35537a', endC
 
 /* INPUTS */
 input[type="text"], input[type="password"], input[type="search"], input[type="number"], input[type="email"],
-textarea, select, button, .button, #quota, div.jp-progress, .pager li a {
+textarea, select,
+button, .button,
+#quota, div.jp-progress, .pager li a {
 	width:10em; margin:.3em; padding:.6em .5em .4em;
-	font-size:1em; font-family:Arial, Verdana, sans-serif;
+	font-size:1em;
 	background:#fff; color:#333; border:1px solid #ddd; outline:none;
 	-moz-box-shadow:0 1px 1px #fff, 0 2px 0 #bbb inset; -webkit-box-shadow:0 1px 1px #fff, 0 1px 0 #bbb inset; box-shadow:0 1px 1px #fff, 0 1px 0 #bbb inset;
 	-moz-border-radius:.5em; -webkit-border-radius:.5em; border-radius:.5em;
@@ -48,6 +50,7 @@ textarea, select, button, .button, #quota, div.jp-progress, .pager li a {
 input[type="hidden"] { height:0; width:0; }
 input[type="text"], input[type="password"], input[type="search"], input[type="number"], input[type="email"], 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"] {
 	-webkit-appearance:textfield; -moz-appearance:textfield;
@@ -74,18 +77,35 @@ input[type="checkbox"]:hover+label, input[type="checkbox"]:focus+label { color:#
 
 
 /* BUTTONS */
-input[type="submit"], input[type="button"], button, .button, #quota, div.jp-progress, select, .pager li a {
+input[type="submit"], input[type="button"],
+button, .button,
+#quota, div.jp-progress, select, .pager li a {
 	width:auto; padding:.4em;
 	background-color:rgba(240,240,240,.9); font-weight:bold; color:#555; text-shadow:rgba(255,255,255,.9) 0 1px 0; border:1px solid rgba(190,190,190,.9); cursor:pointer;
 	-moz-box-shadow:0 1px 1px rgba(255,255,255,.9), 0 1px 1px rgba(255,255,255,.9) inset; -webkit-box-shadow:0 1px 1px rgba(255,255,255,.9), 0 1px 1px rgba(255,255,255,.9) inset; box-shadow:0 1px 1px rgba(255,255,255,.9), 0 1px 1px rgba(255,255,255,.9) inset;
 	-moz-border-radius:.5em; -webkit-border-radius:.5em; border-radius:.5em;
 }
-input[type="submit"]:hover, input[type="submit"]:focus, input[type="button"]:hover, select:hover, select:focus, select:active, input[type="button"]:focus, .button:hover {
-	background:rgba(250,250,250,.9); color:#333;
+input[type="submit"]:hover, input[type="submit"]:focus,
+input[type="button"]:hover, input[type="button"]:focus,
+button:hover, button:focus,
+.button:hover, .button:focus,
+select:hover, select:focus, select:active {
+	background-color:rgba(250,250,250,.9);
+	color:#333;
 }
 input[type="submit"] img, input[type="button"] img, button img, .button img { cursor:pointer; }
 #header .button { border:none; -moz-box-shadow:none; -webkit-box-shadow:none; box-shadow:none; }
 
+/* disabled input fields and buttons */
+input:disabled, input:disabled:hover, input:disabled:focus,
+button:disabled, button:disabled:hover, button:disabled:focus,
+.button:disabled, .button:disabled:hover, .button:disabled:focus,
+a.disabled, a.disabled:hover, a.disabled:focus {
+	background: rgba(230,230,230,.9);
+	color: #999;
+	cursor: default;
+}
+
 /* Primary action button, use sparingly */
 .primary, input[type="submit"].primary, input[type="button"].primary, button.primary, .button.primary {
 	border:1px solid #1d2d44;
@@ -100,7 +120,7 @@ input[type="submit"] img, input[type="button"] img, button img, .button img { cu
 	}
 	.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;
 	}
 
@@ -201,13 +221,14 @@ 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 { position:absolute; right:1em; top:.8em; float:right; }
-#show, #personal-show { display:none; }
-#show + label { right:1em; top:1.25em!important; }
-#show:checked + label, #personal-show:checked + label { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=80)"; filter:alpha(opacity=80); opacity:.8; }
-#show + label, #personal-show + label {
+#show, #dbpassword { position:absolute; right:1em; top:.8em; float:right; }
+#show, #dbpassword, #personal-show { display:none; }
+#show + label, #dbpassword + label { right:1em; top:1.25em!important; }
+#show:checked + label, #dbpassword:checked + label, #personal-show:checked + label { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=80)"; filter:alpha(opacity=80); opacity:.8; }
+#show + label, #dbpassword + label, #personal-show + label {
 	position:absolute!important; height:14px; width:24px;
 	background-image:url("../img/actions/toggle.png"); background-repeat:no-repeat;
 	-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=30)"; filter:alpha(opacity=30); opacity:.3;
@@ -226,14 +247,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;
+/* 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;
 }
-fieldset.warning legend { color:#b94a48 !important; }
-fieldset.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; }
@@ -242,22 +273,48 @@ fieldset.warning a { color:#b94a48 !important; font-weight:bold; }
 
 /* NAVIGATION ------------------------------------------------------------- */
 #navigation {
-	position:fixed; top:3.5em; float:left; width:64px; padding:0; z-index:75; height:100%;
-	background:#383c43 url('../img/noise.png') repeat; border-right:1px #333 solid;
+	position:fixed; float:left; width:64px; padding-top:3.5em; z-index:75; height:100%;
+	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;
+	overflow:hidden; box-sizing:border-box; -moz-box-sizing:border-box;
 }
-#navigation:hover { overflow-y:auto; }
-#navigation a {
-	display:block; padding:8px 0 4px;
+#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
+	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 { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); opacity:1; }
-	#navigation .icon { display:block; width:32px; height:32px; margin:0 16px 0; }
+
+	/* 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;
+	}
 	#navigation li:first-child a { padding-top:16px; }
 
 
@@ -287,8 +344,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; }
@@ -311,27 +368,27 @@ 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 ---- */
-#dirtree {width:100%;}
-#filelist {height:270px; overflow:scroll; background-color:white; width:100%;}
+#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:120px; 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;}
-
+.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;}
+.ui-dialog {position:fixed !important;}
+span.ui-icon {float: left; margin: 3px 7px 30px 0;}
 
 /* ---- CATEGORIES ---- */
 #categoryform .scrollarea { position:absolute; left:10px; top:10px; right:10px; bottom:50px; overflow:auto; border:1px solid #ddd; background:#f8f8f8; }
@@ -343,7 +400,7 @@ a.bookmarklet { background-color:#ddd; border:1px solid #ccc; padding:5px;paddin
 #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; }
@@ -360,3 +417,212 @@ div.crumb { float:left; display:block; background:url('../img/breadcrumb.svg') n
 div.crumb:first-child { padding:10px 20px 10px 5px; }
 div.crumb.last { font-weight:bold; background:none; padding-right:10px; }
 div.crumb a{ padding: 0.9em 0 0.7em 0; }
+
+
+
+/* ---- APP STYLING ---- */
+#app {
+	height: 100%;
+	width: 100%;
+}
+
+/* Navigation: folder like structure */
+#app-navigation {
+	width: 250px;
+	height: 100%;
+	float: left;
+	padding-bottom: 32px;
+	-moz-box-sizing: border-box; box-sizing: border-box;
+	background-color: #f8f8f8;
+	border-right: 1px solid #ccc;
+}
+#app-navigation > ul {
+	height: 100%;
+	overflow: auto;
+	-moz-box-sizing: border-box; box-sizing: border-box;
+}
+#app-navigation li {
+	position: relative;
+	width: 100%;
+	-moz-box-sizing: border-box; box-sizing: border-box;
+	text-shadow: 0 1px 0 rgba(255,255,255,.9);
+}
+#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);
+}
+
+/* special rules for first-level entries and folders */
+#app-navigation > ul > li {
+	background-color: #eee;
+	border-top: 1px solid #fff;
+	border-bottom: 1px solid #ddd;
+}
+#app-navigation > ul > .active {
+	border-top: 1px solid #ccc;
+	border-bottom: 1px solid #ccc;
+}
+
+#app-navigation .with-icon a {
+	padding-left: 32px;
+	background-size: 16px 16px; background-position: 10px center; background-repeat: no-repeat;
+}
+
+#app-navigation li > a {
+	display: block;
+	width: 100%;
+	padding: 0 16px;
+	overflow: hidden;
+	-moz-box-sizing: border-box; box-sizing: border-box;
+	line-height: 32px;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+	color: #333;
+}
+#app-navigation li:hover > a {
+	background-color: #ddd;
+}
+#app-navigation > ul > li:hover {
+	border-top: 1px solid #ccc;
+	border-bottom: 1px solid #ccc;
+}
+
+#app-navigation .collapse {
+	display: none; /* hide collapse button intially */
+}
+#app-navigation .collapsible > .collapse {
+	position: absolute;
+	left: 6px;
+	top: 5px;
+	height: 16px;
+	width: 16px;
+	background: none; background-image: url('../img/actions/triangle-s.svg');
+	background-size: 16px 16px; background-repeat: no-repeat;
+	border: none;
+	border-radius: 0;
+	outline: none !important;
+	box-shadow: none;
+}
+#app-navigation .collapsible:hover > a {
+	background-image: none;
+}
+#app-navigation .collapsible:hover > .collapse {
+	display: block;
+}
+
+#app-navigation .collapsible .collapse {
+	-moz-transform: rotate(-90deg);
+	-webkit-transform: rotate(-90deg);
+	-ms-transform:rotate(-90deg);
+	-o-transform:rotate(-90deg);
+	transform: rotate(-90deg);
+}
+#app-navigation .collapsible.open .collapse {
+	-moz-transform: rotate(0);
+	-webkit-transform: rotate(0);
+	-ms-transform:rotate(0);
+	-o-transform:rotate(0);
+	transform: rotate(0);
+}
+
+/* Second level nesting for lists */
+#app-navigation > ul ul {
+	display: none;
+}
+#app-navigation > ul ul li > a {
+	padding-left: 32px;
+}
+#app-navigation > .with-icon ul li > a {
+	padding-left: 48px;
+	background-position: 24px center;
+}
+
+#app-navigation .open {
+	background-image: linear-gradient(top, rgb(238,238,238) 0%, rgb(245,245,245) 100%);
+	background-image: -o-linear-gradient(top, rgb(238,238,238) 0%, rgb(245,245,245) 100%);
+	background-image: -moz-linear-gradient(top, rgb(238,238,238) 0%, rgb(245,245,245) 100%);
+	background-image: -webkit-linear-gradient(top, rgb(238,238,238) 0%, rgb(245,245,245) 100%);
+	background-image: -ms-linear-gradient(top, rgb(238,238,238) 0%, rgb(245,245,245) 100%);
+}
+
+#app-navigation > ul .open:hover {
+	-moz-box-shadow: inset 0 0 3px #ccc; -webkit-box-shadow: inset 0 0 3px #ccc; box-shadow: inset 0 0 3px #ccc;
+	border-top: 1px solid #ccc;
+}
+
+#app-navigation > ul .open ul {
+	display: block;
+}
+
+/* drag and drop */
+#app-navigation .drag-and-drop {
+	-moz-transition: padding-bottom 500ms ease 0s;
+	-o-transition: padding-bottom 500ms ease 0s;
+	-webkit-transition: padding-bottom 500ms ease 0s;
+	-ms-transition: padding-bottom 500ms ease 0s;
+	transition: padding-bottom 500ms ease 0s;
+	padding-bottom: 40px;
+}
+#app-navigation .personalblock > legend { /* TODO @Raydiation: still needed? */
+	padding: 10px 0; margin: 0;
+}
+#app-navigation .error {
+	color: #dd1144;
+}
+
+
+
+/* Part where the content will be loaded into */
+#app-content {
+	height: 100%;
+	overflow-y: auto;
+}
+
+/* settings area */
+#app-settings {
+	position: fixed;
+	width: 249px;
+	bottom: 0;
+	border-top: 1px solid #ccc;
+}
+#app-settings-header {
+	background-color: #eee;
+}
+#app-settings-content {
+	display: none;
+	padding: 10px;
+	background-color: #eee;
+}
+#app-settings.open #app-settings-content {
+	display: block;
+}
+
+.settings-button {
+	display: block;
+	height: 32px;
+	width: 100%;
+	padding: 0;
+	margin: 0;
+	background-color: transparent; background-image: url('../img/actions/settings.svg');
+	background-position: 10px center; background-repeat: no-repeat;
+	box-shadow: none;
+	border: 0;
+	border-radius: 0;
+}
+.settings-button:hover {
+	background-color: #ddd;
+}
+
+/* icons */
+.folder-icon { background-image: url('../img/places/folder.svg'); }
+.delete-icon { background-image: url('../img/actions/delete.svg'); }
+.delete-icon:hover { background-image: url('../img/actions/delete-hover.svg'); }
+.edit-icon { background-image: url('../img/actions/rename.svg'); }
+
+/* buttons */
+button.loading {
+	background-image: url('../img/loading.gif');
+	background-position: right 10px center; background-repeat: no-repeat;
+	padding-right: 30px;
+}
diff --git a/core/js/compatibility.js b/core/js/compatibility.js
index 0cfeefab87128329f43dceb35c473fc806c70ca4..b690803ca7727c9214b8bc788d480afb4afd551d 100644
--- a/core/js/compatibility.js
+++ b/core/js/compatibility.js
@@ -1,3 +1,107 @@
+/**
+ * implement Object.create for browsers without native support
+ */
+if (typeof Object.create !== 'function') {
+	Object.create = function (o) {
+		function F() {}
+		F.prototype = o;
+		return new F();
+	};
+}
+
+/**
+ * implement Object.keys for browsers without native support
+ */
+if (typeof Object.keys !== 'function') {
+	Object.keys = function(o) {
+		if (o !== Object(o)) {
+			throw new TypeError('Object.keys called on a non-object');
+		}
+		var k=[],p;
+		for (p in o) {
+			if (Object.prototype.hasOwnProperty.call(o,p)) {
+				k.push(p);
+			}
+		}
+		return k;
+	}
+}
+
+/**
+ * implement Array.filter for browsers without native support
+ */
+if (!Array.prototype.filter) {
+	Array.prototype.filter = function(fun /*, thisp*/) {
+		var len = this.length >>> 0;
+		if (typeof fun !== "function"){
+			throw new TypeError();
+		}
+
+		var res = [];
+		var thisp = arguments[1];
+		for (var i = 0; i < len; i++) {
+			if (i in this) {
+				var val = this[i]; // in case fun mutates this
+				if (fun.call(thisp, val, i, this))
+					res.push(val);
+			}
+		}
+		return res;
+	};
+}
+
+/**
+ * implement Array.indexOf for browsers without native support
+ */
+if (!Array.prototype.indexOf){
+	Array.prototype.indexOf = function(elt /*, from*/)
+	{
+		var len = this.length;
+
+		var from = Number(arguments[1]) || 0;
+		from = (from < 0) ? Math.ceil(from) : Math.floor(from);
+		if (from < 0){
+			from += len;
+		}
+
+		for (; from < len; from++)
+		{
+			if (from in this && this[from] === elt){
+				return from;
+			}
+		}
+		return -1;
+	};
+}
+
+/**
+ * implement Array.map for browsers without native support
+ */
+if (!Array.prototype.map){
+	Array.prototype.map = function(fun /*, thisp */){
+		"use strict";
+
+		if (this === void 0 || this === null){
+			throw new TypeError();
+		}
+
+		var t = Object(this);
+		var len = t.length >>> 0;
+		if (typeof fun !== "function"){
+			throw new TypeError();
+		}
+
+		var res = new Array(len);
+		var thisp = arguments[1];
+		for (var i = 0; i < len; i++){
+			if (i in t){
+				res[i] = fun.call(thisp, t[i], i, t);
+			}
+		}
+
+		return res;
+	};
+}
 
 //https://developer.mozilla.org/en-US/docs/JavaScript/Reference/Global_Objects/Function/bind
 if (!Function.prototype.bind) {
@@ -29,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-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.infieldlabel.js b/core/js/jquery.infieldlabel.js
index c7daf61edd806892f6bbcdc5b961b51f08f21ffc..8a76da1b140f8257878f816dc05afef2ad900a5c 100644
--- a/core/js/jquery.infieldlabel.js
+++ b/core/js/jquery.infieldlabel.js
@@ -1,13 +1,14 @@
-/**
- * @license In-Field Label jQuery Plugin
- * http://fuelyourcoding.com/scripts/infield.html
+/*
+ * jquery.infieldlabel
+ * A simple jQuery plugin for adding labels that sit over a form field and fade away when the fields are populated.
+ * 
+ * Copyright (c) 2009 - 2013 Doug Neiner <doug@dougneiner.com> (http://code.dougneiner.com)
+ * Source: https://github.com/dcneiner/In-Field-Labels-jQuery-Plugin
+ * Dual licensed MIT or GPL
+ *   MIT (http://www.opensource.org/licenses/mit-license)
+ *   GPL (http://www.opensource.org/licenses/gpl-license)
  *
- * Copyright (c) 2009-2010 Doug Neiner
- * Dual licensed under the MIT and GPL licenses.
- * Uses the same license as jQuery, see:
- * http://docs.jquery.com/License
- *
- * @version 0.1.6
+ * @version 0.1.3
  */
 (function ($) {
 
@@ -27,15 +28,20 @@
     base.showing = true;
 
     base.init = function () {
+      var initialSet;
+
       // Merge supplied options with default options
       base.options = $.extend({}, $.InFieldLabels.defaultOptions, options);
 
-      // Check if the field is already filled in
+      // Check if the field is already filled in 
       // add a short delay to handle autocomplete
       setTimeout(function() {
         if (base.$field.val() !== "") {
           base.$label.hide();
           base.showing = false;
+        } else {
+          base.$label.show();
+          base.showing = true;
         }
       }, 200);
 
@@ -47,23 +53,28 @@
         // Use of a namespace (.infieldlabel) allows us to
         // unbind just this method later
         base.hideOnChange(e);
-      }).bind('paste', function (e) {
+      }).bind('paste', function () {
         // Since you can not paste an empty string we can assume
         // that the fieldis not empty and the label can be cleared.
         base.setOpacity(0.0);
-      }).change(function (e) {
+      }).change(function () {
         base.checkForEmpty();
       }).bind('onPropertyChange', function () {
         base.checkForEmpty();
       }).bind('keyup.infieldlabel', function () {
-        base.checkForEmpty()
+        base.checkForEmpty();
       });
-      setInterval(function(){
-          if(base.$field.val() != ""){
-               base.$label.hide();
-               base.showing = false;
-        };
-      },100);
+
+      if ( base.options.pollDuration > 0 ) {
+        initialSet = setInterval( function () {
+        if (base.$field.val() !== "") {
+          base.$label.hide();
+          base.showing = false;
+          clearInterval( initialSet );
+        }
+      }, base.options.pollDuration );
+
+      }
     };
 
     // If the label is currently showing
@@ -92,7 +103,7 @@
       }
     };
 
-    base.prepForShow = function (e) {
+    base.prepForShow = function () {
       if (!base.showing) {
         // Prepare for a animate in...
         base.$label.css({opacity: 0.0}).show();
@@ -127,37 +138,39 @@
 
   $.InFieldLabels.defaultOptions = {
     fadeOpacity: 0.5, // Once a field has focus, how transparent should the label be
-    fadeDuration: 300 // How long should it take to animate from 1.0 opacity to the fadeOpacity
+    fadeDuration: 300, // How long should it take to animate from 1.0 opacity to the fadeOpacity
+    pollDuration: 0, // If set to a number greater than zero, this will poll until content is detected in a field
+    enabledInputTypes: [ "text", "search", "tel", "url", "email", "password", "number", "textarea" ]
   };
 
 
   $.fn.inFieldLabels = function (options) {
+    var allowed_types = options && options.enabledInputTypes || $.InFieldLabels.defaultOptions.enabledInputTypes;
+
     return this.each(function () {
       // Find input or textarea based on for= attribute
       // The for attribute on the label must contain the ID
       // of the input or textarea element
-      var for_attr = $(this).attr('for'), $field;
+      var for_attr = $(this).attr('for'), field, restrict_type;
       if (!for_attr) {
         return; // Nothing to attach, since the for field wasn't used
       }
 
       // Find the referenced input or textarea element
-      $field = $(
-        "input#" + for_attr + "[type='text']," + 
-        "input#" + for_attr + "[type='search']," + 
-        "input#" + for_attr + "[type='tel']," + 
-        "input#" + for_attr + "[type='url']," + 
-        "input#" + for_attr + "[type='email']," + 
-        "input#" + for_attr + "[type='password']," + 
-        "textarea#" + for_attr
-      );
-
-      if ($field.length === 0) {
+      field = document.getElementById( for_attr );
+      if ( !field ) {
+        return; // No element found
+      }
+
+      // Restrict input type
+      restrict_type = $.inArray( field.type, allowed_types );
+
+      if ( restrict_type === -1 && field.nodeName !== "TEXTAREA" ) {
         return; // Again, nothing to attach
       } 
 
-      // Only create object for input[text], input[password], or textarea
-      (new $.InFieldLabels(this, $field[0], options));
+      // Only create object for matched input types and textarea
+      (new $.InFieldLabels(this, field, options));
     });
   };
 
diff --git a/core/js/js.js b/core/js/js.js
index 1a94215c27bf71b4ffeb598e0911ca40b8626fc3..3cb4d3dd151582915626c2363dc106b4a7de1fc3 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -439,52 +439,6 @@ if(typeof localStorage !=='undefined' && localStorage !== null){
 	};
 }
 
-/**
- * implement Array.filter for browsers without native support
- */
-if (!Array.prototype.filter) {
-	Array.prototype.filter = function(fun /*, thisp*/) {
-		var len = this.length >>> 0;
-		if (typeof fun !== "function"){
-			throw new TypeError();
-		}
-
-		var res = [];
-		var thisp = arguments[1];
-		for (var i = 0; i < len; i++) {
-			if (i in this) {
-				var val = this[i]; // in case fun mutates this
-				if (fun.call(thisp, val, i, this))
-					res.push(val);
-			}
-		}
-		return res;
-	};
-}
-/**
- * implement Array.indexOf for browsers without native support
- */
-if (!Array.prototype.indexOf){
-	Array.prototype.indexOf = function(elt /*, from*/)
-	{
-		var len = this.length;
-
-		var from = Number(arguments[1]) || 0;
-		from = (from < 0) ? Math.ceil(from) : Math.floor(from);
-		if (from < 0){
-			from += len;
-		}
-
-		for (; from < len; from++)
-		{
-			if (from in this && this[from] === elt){
-				return from;
-			}
-		}
-		return -1;
-	};
-}
-
 /**
  * check if the browser support svg images
  */
@@ -637,13 +591,26 @@ $(document).ready(function(){
 		}
 	});
 
-	// 'show password' checkbox
-	$('#password').showPassword();
-	$('#adminpass').showPassword();	
-	$('#pass2').showPassword();
+	var setShowPassword = function(input, label) {
+		input.showPassword().keyup(function(){
+			if (input.val().length == 0) {
+				label.hide();
+			}
+			else {
+				label.css("display", "inline").show();
+			}
+		});
+		label.hide();
+	};
+	setShowPassword($('#password'), $('label[for=show]'));
+	setShowPassword($('#adminpass'), $('label[for=show]'));
+	setShowPassword($('#pass2'), $('label[for=personal-show]'));
+	setShowPassword($('#dbpass'), $('label[for=dbpassword]'));
 
 	//use infield labels
-	$("label.infield").inFieldLabels();
+	$("label.infield").inFieldLabels({
+		pollDuration: 100
+	});
 
 	var checkShowCredentials = function() {
 		var empty = false;
@@ -702,32 +669,6 @@ $(document).ready(function(){
 	});
 });
 
-if (!Array.prototype.map){
-	Array.prototype.map = function(fun /*, thisp */){
-		"use strict";
-
-		if (this === void 0 || this === null){
-			throw new TypeError();
-		}
-
-		var t = Object(this);
-		var len = t.length >>> 0;
-		if (typeof fun !== "function"){
-			throw new TypeError();
-		}
-
-		var res = new Array(len);
-		var thisp = arguments[1];
-		for (var i = 0; i < len; i++){
-			if (i in t){
-				res[i] = fun.call(thisp, t[i], i, t);
-			}
-		}
-
-		return res;
-	};
-}
-
 /**
  * Filter Jquery selector by attribute value
  */
@@ -826,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 cfbca2833c7a64aed507ada1cf1472b55acb81e5..990c3f8bf38b19cedb8bfed7785864174971e681 100644
--- a/core/js/oc-dialogs.js
+++ b/core/js/oc-dialogs.js
@@ -27,75 +27,79 @@ var OCdialogs = {
 	* displays alert dialog
 	* @param text content of dialog
 	* @param title dialog title
-	* @param callback which will be triggered when user press OK
+	* @param callback which will be triggered when user presses OK
+	* @param modal make the dialog modal
 	*/
 	alert:function(text, title, callback, modal) {
-		var content = '<p><span class="ui-icon ui-icon-alert"></span>'+text+'</p>';
+		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);
 	},
 	/**
 	* displays info dialog
 	* @param text content of dialog
 	* @param title dialog title
-	* @param callback which will be triggered when user press OK
+	* @param callback which will be triggered when user presses OK
+	* @param modal make the dialog modal
 	*/
 	info:function(text, title, callback, modal) {
-		var content = '<p><span class="ui-icon ui-icon-info"></span>'+text+'</p>';
+		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);
 	},
 	/**
 	* displays confirmation dialog
 	* @param text content of dialog
 	* @param title dialog title
-	* @param callback which will be triggered when user press YES or NO (true or false would be passed to callback respectively)
+	* @param callback which will be triggered when user presses YES or NO (true or false would be passed to callback respectively)
+	* @param modal make the dialog modal
 	*/
 	confirm:function(text, title, callback, modal) {
-		var content = '<p><span class="ui-icon ui-icon-notice"></span>'+text+'</p>';
+		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 press OK (input text will be passed to callback)
+	* @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 content = '<p><span class="ui-icon ui-icon-pencil"></span>'+text+':<br/><input type="text" id="oc-dialog-prompt-input" value="'+default_value+'" style="width:90%"></p>';
-		OCdialogs.message(content, title, OCdialogs.PROMPT_DIALOG, OCdialogs.OK_CANCEL_BUTTONS, 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: 'dafault value'},...]
-	* select example 	var fields=[{text:'Test', name:'test', type:'select', options:[{text:'hallo',value:1},{text:'hallo1',value:2}] }];
+	* 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 press OK (user answers will be passed to callback in following format: [{name:'return name', value: 'user value'},...])
+	* @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, val){
-			content += '<tr><td>'+val.text+'</td><td>';
-			var type=val.type;
+		$.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="'+val.name+'"';
-				if (type == 'checkbox') {
-					if (val.value != undefined && val.value == true) {
-						content += ' checked="checked">';
-					} else {
-						content += '>';
-					}
-				} else if (type == 'text' || type == 'password' && val.value) {
-					content += ' value="'+val.value+'">';
+			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) + '"';
 				}
-			} else if (type == 'select') {
-				content += '<select name="'+val.name+'"';
-				if (val.value != undefined) {
-					content += ' value="'+val.value+'"';
+				content += '>';
+			} else if (type === 'select') {
+				content += '<select name="' + escapeHTML(field.name) + '"';
+				if (field.value !== undefined) {
+					content += ' value="' + escapeHTML(field.value) + '"';
 				}
 				content += '>';
-				$.each(val.options, function(index, valo){
-					content += '<option value="'+valo.value+'">'+valo.text+'</option>';
+				$.each(field.options, function(index, field_option){
+					content += '<option value="' + escapeHTML(field_option.value) + '">' + escapeHTML(field_option.text) + '</option>';
 				});
 				content += '</select>';
 			}
@@ -103,168 +107,320 @@ var OCdialogs = {
 
 		});
 		content += '</table>';
-		OCdialogs.message(content, title, OCdialogs.FORM_DIALOG, OCdialogs.OK_CANCEL_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 = [{
+			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++;
 	},
+	/**
+	 * show a file picker to pick a file from
+	 * @param title dialog title
+	 * @param callback which will be triggered when user presses Choose
+	 * @param multiselect whether it should be possible to select multiple files
+	 * @param mimetype_filter mimetype to filter by
+	 * @param modal make the dialog modal
+	*/
 	filepicker:function(title, callback, multiselect, mimetype_filter, modal) {
-		var c_name = 'oc-dialog-'+OCdialogs.dialogs_counter+'-content';
-		var c_id = '#'+c_name;
-		var d = '<div id="'+c_name+'" title="'+title+'"><select id="dirtree"><option value="0">'+OC.currentUser+'</option></select><div id="filelist"></div><div class="filepicker_loader"><img src="'+OC.filePath('gallery','img','loading.gif')+'"></div></div>';
-		if (!modal) modal = false; // Huh..
-		if (!multiselect) multiselect = false;
-		$('body').append(d);
-		$(c_id + ' #dirtree').focus(function() {
-			var t = $(this); 
-			t.data('oldval',  t.val())
-		}).change({dcid: c_id}, OC.dialogs.handleTreeListSelect);
-		$(c_id).ready(function(){
-			$.getJSON(OC.filePath('files', 'ajax', 'rawlist.php'), {mimetype: mimetype_filter} ,function(r) {
-				OC.dialogs.fillFilePicker(r, c_id, callback)
+		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 = '' };
+
+		$('body').append(dialog_div);
+
+		$(dialog_id).data('path', '/');
+
+		$(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);
+
 		// build buttons
-		var b = [{
-			text: t('core', 'Choose'), 
-			click: function(){
-				if (callback != undefined) {
-					var p;
-					if ($(c_id).data('multiselect') == true) {
-						p = [];
-						$(c_id+' .filepicker_element_selected .filename').each(function(i, elem) {
-							p.push(($(c_id).data('path')?$(c_id).data('path'):'')+'/'+$(elem).text());
-						});
-					} else {
-						var p = $(c_id).data('path');
-						if (p == undefined) p = '';
-						p = p+'/'+$(c_id+' .filepicker_element_selected .filename').text()
-					}
-					callback(p);
-					$(c_id).dialog('close');
+		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();
 				}
+				callback(datapath);
+				$(dialog_id).dialog('close');
 			}
-		},
-		{
+		};
+		var buttonlist = [{
+			text: t('core', 'Choose'), 
+			click: functionToCall
+			},
+			{
 			text: t('core', 'Cancel'), 
-			click: function(){$(c_id).dialog('close'); }}
-		];
-		$(c_id).dialog({width: ((4*$('body').width())/9), height: 400, modal: modal, buttons: b});
+			click: function(){$(dialog_id).dialog('close'); }
+		}];
+
+		$(dialog_id).dialog({
+			width: (4/9)*$(document).width(),
+			height: 420,
+			modal: modal,
+			buttons: buttonlist
+		});
 		OCdialogs.dialogs_counter++;
 	},
-	// guts, dont use, dont touch
+	/**
+	 * Displays raw dialog
+	 * You better use a wrapper instead ...
+	*/
 	message:function(content, title, dialog_type, buttons, callback, modal) {
-		var c_name = 'oc-dialog-'+OCdialogs.dialogs_counter+'-content';
-		var c_id = '#'+c_name;
-		var d = '<div id="'+c_name+'" title="'+title+'">'+content+'</div>';
-		if (modal == undefined) modal = false;
-		$('body').append(d);
-		var b = [];
+		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:
-				b[1] = {text: t('core', 'No'), click: function(){ if (callback != undefined) callback(false); $(c_id).dialog('close'); }};
-				b[0] = {text: t('core', 'Yes'), click: function(){ if (callback != undefined) callback(true); $(c_id).dialog('close');}};
+				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_CANCEL_BUTTONS:
-				b[1] = {text: t('core', 'Cancel'), click: function(){$(c_id).dialog('close'); }};
-			case OCdialogs.OK_BUTTON: // fallthrough
-				var f;
+			case OCdialogs.OK_BUTTON:
+				var functionToCall;
 				switch(dialog_type) {
 					case OCdialogs.ALERT_DIALOG:
-						f = function(){$(c_id).dialog('close'); if(callback) callback();};
+						functionToCall = function() {
+							$(dialog_id).dialog('close');
+							if(callback !== undefined) { callback() };
+						};
 					break;
 					case OCdialogs.PROMPT_DIALOG:
-						f = function(){OCdialogs.prompt_ok_handler(callback, c_id)};
-					break;
-					case OCdialogs.FORM_DIALOG:
-						f = function(){OCdialogs.form_ok_handler(callback, c_id)};
+						buttonlist[1] = {
+							text: t('core', 'Cancel'),
+							click: function() { $(dialog_id).dialog('close'); }
+						};
+						functionToCall = function() { OCdialogs.prompt_ok_handler(callback, dialog_id); };
 					break;
 				}
-				b[0] = {text: t('core', 'Ok'), click: f};
+				buttonlist[0] = {
+					text: t('core', 'Ok'),
+					click: functionToCall
+				};
 			break;
-		}
-		var possible_height = ($('tr', d).size()+1)*30;
-		$(c_id).dialog({width: 4*$(document).width()/9, height: possible_height + 120, modal: modal, buttons: b});
+		};
+
+		$(dialog_id).dialog({
+			width: (4/9) * $(document).width(),
+			height: 180,
+			modal: modal,
+			buttons: buttonlist
+		});
 		OCdialogs.dialogs_counter++;
 	},
-	// dialogs buttons types
-	YES_NO_BUTTONS: 70,
-	OK_BUTTONS: 71,
-	OK_CANCEL_BUTTONS: 72,
+	// dialog button types
+	YES_NO_BUTTONS:		70,
+	OK_BUTTONS:		71,
 	// dialogs types
-	ALERT_DIALOG: 80,
-	INFO_DIALOG: 81,
-	PROMPT_DIALOG: 82,
-	FORM_DIALOG: 83,
+	ALERT_DIALOG:	80,
+	INFO_DIALOG:	81,
+	FORM_DIALOG:	82,
+	// used to name each dialog
 	dialogs_counter: 0,
+
 	determineValue: function(element) {
-		switch ($(element).attr('type')) {
-			case 'checkbox': return element.checked;
+		if ( $(element).attr('type') === 'checkbox' ) {
+			return element.checked;
+		} else {
+			return $(element).val();
 		}
-		return $(element).val();
 	},
-	prompt_ok_handler: function(callback, c_id) { $(c_id).dialog('close'); if (callback != undefined) callback($(c_id + " input#oc-dialog-prompt-input").val()); },
-	form_ok_handler: function(callback, c_id) {
-		if (callback != undefined) {
-			var r = [];
-			var c = 0;
-			$(c_id + ' input, '+c_id+' select').each(function(i, elem) {
-				r[c] = {name: $(elem).attr('name'), value: OCdialogs.determineValue(elem)};
-				c++;
+
+	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) };
 			});
-			$(c_id).dialog('close');
-			callback(r);
+			$(dialog_id).dialog('close');
+			callback(valuelist);
 		} else {
-			$(c_id).dialog('close');
+			$(dialog_id).dialog('close');
 		}
 	},
-	fillFilePicker:function(r, dialog_content_id) {
-		var entry_template = '<div data-entryname="*ENTRYNAME*" data-dcid="'+dialog_content_id+'" data="*ENTRYTYPE*"><img src="*MIMETYPEICON*" style="margin-right:1em;"><span class="filename">*NAME*</span><div style="float:right;margin-right:1em;">*LASTMODDATE*</div></div>';
-		var names = '';
-		$.each(r.data, function(index, a) {
-			names += entry_template.replace('*LASTMODDATE*', OC.mtime2date(a.mtime)).replace('*NAME*', a.name).replace('*MIMETYPEICON*', a.mimetype_icon).replace('*ENTRYNAME*', a.name).replace('*ENTRYTYPE*', a.type);
+	/**
+	 * 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 = '';
+		var dirs = [];
+		var others = [];
+		$.each(request.data, function(index, file) {
+			if (file.type === 'dir') {
+				dirs.push(file);
+			} else {
+				others.push(file);
+			}
 		});
-		
-		$(dialog_content_id + ' #filelist').html(names).on('click', '[data="file"]', function() {
-			OC.dialogs.handlePickerClick(this, $(this).data('entryname'), $(this).data('dcid'));
+		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);
+		}
+
+		$(dialog_content_id + ' #filelist').html(files);
+		$('#filelist div').click(function() {
+			OCdialogs.handlePickerClick($(this), $(this).data('entryname'), dialog_content_id);
 		});
+
 		$(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));
+		});
+
+		$(dialog_id + ' #dirtree').html(paths);
+	},
+	/**
+	 * handle selection made in the tree list
+	*/
 	handleTreeListSelect:function(event) {
-		var newval = parseInt($(this).val());
-		var oldval = parseInt($(this).data('oldval'));
-		while (newval != oldval && oldval > 0) {
-			$('option:last', this).remove();
-			$('option:last', this).attr('selected','selected');
-			oldval--;
+		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() + '/');
 		}
-		var skip_first = true;
-		var path = '';
-		$(this).children().each(function(i, element) { 
-			if (skip_first) {
-				skip_first = false; 
-				return; 
-			}
-			path += '/'+$(element).text();
-		});
-		$(event.data.dcid).data('path', path);
 		$(event.data.dcid + ' .filepicker_loader').css('visibility', 'visible');
-		$.getJSON(OC.filePath('files', 'ajax', 'rawlist.php'), {dir: path, mimetype: $(event.data.dcid).data('mimetype')}, function(r){OC.dialogs.fillFilePicker(r, event.data.dcid)});
+		$.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) }
+		);
 	},
-	// this function is in early development state, please dont use it unlsess you know what you are doing
-	handlePickerClick:function(element, name, dcid) {
-		var p = $(dcid).data('path');
-		if (p == undefined) p = '';
-		p = p+'/'+name;
-		if ($(element).attr('data') == 'file'){
-			if ($(dcid).data('multiselect') != true) {
-				$(dcid+' .filepicker_element_selected').removeClass('filepicker_element_selected');
+	/**
+	 * go one directory up
+	*/
+	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) }
+			);
+		}
+	},
+	/**
+	 * 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');
 			}
 			$(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) }
+			);
 		}
-		$(dcid).data('path', p);
-		$(dcid + ' #dirtree option:last').removeAttr('selected');
-		var newval = parseInt($(dcid + ' #dirtree option:last').val())+1;
-		$(dcid + ' #dirtree').append('<option selected="selected" value="'+newval+'">'+name+'</option>');
-		$(dcid + ' .filepicker_loader').css('visibility', 'visible');
-		$.getJSON(OC.filePath('files', 'ajax', 'rawlist.php'), {dir: p, mimetype: $(dcid).data('mimetype')}, function(r){OC.dialogs.fillFilePicker(r, dcid)});
 	}
 };
diff --git a/core/js/oc-vcategories.js b/core/js/oc-vcategories.js
index 3e75767c49c6754557c952484b6c44dc812be058..c745dbc5fbdcd0a78d95efce8e041ea0b2b1c195 100644
--- a/core/js/oc-vcategories.js
+++ b/core/js/oc-vcategories.js
@@ -11,7 +11,7 @@ var OCCategories= {
 			try {
 				var jsondata = jQuery.parseJSON(response);
 				if(response.status == 'error') {
-					OC.dialogs.alert(response.data.message, 'Error');
+					OC.dialogs.alert(response.data.message, t('core', 'Error'));
 					return;
 				}
 			} catch(e) {
@@ -77,7 +77,7 @@ var OCCategories= {
 		if(jsondata.status == 'success') {
 			OCCategories._update(jsondata.data.categories);
 		} else {
-			OC.dialogs.alert(jsondata.data.message, 'Error');
+			OC.dialogs.alert(jsondata.data.message, t('core', 'Error'));
 		}
 	},
 	favorites:function(type, cb) {
@@ -107,7 +107,7 @@ var OCCategories= {
 				cb(jsondata);
 			} else {
 				if(jsondata.status !== 'success') {
-					OC.dialogs.alert(jsondata.data.message, 'Error');
+					OC.dialogs.alert(jsondata.data.message, t('core', 'Error'));
 				}
 			}
 		});
@@ -169,7 +169,7 @@ var OCCategories= {
 				if(jsondata.status === 'success') {
 					OCCategories._update(jsondata.data.categories);
 				} else {
-					OC.dialogs.alert(jsondata.data.message, 'Error');
+					OC.dialogs.alert(jsondata.data.message, t('core', 'Error'));
 				}
 			}
 		});
@@ -186,7 +186,7 @@ var OCCategories= {
 				if(jsondata.status === 'success') {
 					OCCategories._update(jsondata.data.categories);
 				} else {
-					OC.dialogs.alert(jsondata.data.message, 'Error');
+					OC.dialogs.alert(jsondata.data.message, t('core', 'Error'));
 				}
 			}
 		}).error(function(xhr){
@@ -196,7 +196,7 @@ var OCCategories= {
 				if(typeof cb == 'function') {
 					cb({status:'error', data:{message:errormessage}});
 				} else {
-					OC.dialogs.alert(errormessage);
+					OC.dialogs.alert(errormessage, t('core', 'Error'));
 				}
 			}
 		});
diff --git a/core/js/octemplate.js b/core/js/octemplate.js
new file mode 100644
index 0000000000000000000000000000000000000000..e032506c0b1b3c93f5d3a116a868fe2d581d02bf
--- /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') {
+				$.each(this.vars, function(key, val) {
+					if(typeof val === 'string') {
+						self.vars[key] = self.options.escapeFunction(val);
+					}
+				});
+			}
+
+			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/js/share.js b/core/js/share.js
index 34f24da4df746eeb788a104936888776210a2c96..36e4babedf9d98a16839018bf9d0231abbbd1814 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -10,8 +10,9 @@ OC.Share={
 		// Load all share icons
 		$.get(OC.filePath('core', 'ajax', 'share.php'), { fetch: 'getItemsSharedStatuses', itemType: itemType }, function(result) {
 			if (result && result.status === 'success') {
-				$.each(result.data, function(item, hasLink) {
-					OC.Share.statuses[item] = hasLink;
+				$.each(result.data, function(item, data) {
+					OC.Share.statuses[item] = data;
+					var hasLink = data['link'];
 					// Links override shared in terms of icon display
 					if (hasLink) {
 						var image = OC.imagePath('core', 'actions/public');
@@ -21,30 +22,33 @@ OC.Share={
 					if (itemType != 'file' && itemType != 'folder') {
 						$('a.share[data-item="'+item+'"]').css('background', 'url('+image+') no-repeat center');
 					} else {
-						var file = $('tr').filterAttr('data-file', OC.basename(item));
+						var file = $('tr').filterAttr('data-id', item);
 						if (file.length > 0) {
 							var action = $(file).find('.fileactions .action').filterAttr('data-action', 'Share');
 							var img = action.find('img').attr('src', image);
 							action.addClass('permanent');
 							action.html(' '+t('core', 'Shared')).prepend(img);
-						}
-						var dir = $('#dir').val();
-						if (dir.length > 1) {
-							var last = '';
-							var path = dir;
-							// Search for possible parent folders that are shared
-							while (path != last) {
-								if (path == item) {
-									var action = $('.fileactions .action').filterAttr('data-action', 'Share');
-									var img = action.find('img');
-									if (img.attr('src') != OC.imagePath('core', 'actions/public')) {
-										img.attr('src', image);
-										action.addClass('permanent');
-										action.html(' '+t('core', 'Shared')).prepend(img);
+						} else {
+							var dir = $('#dir').val();
+							if (dir.length > 1) {
+								var last = '';
+								var path = dir;
+								// Search for possible parent folders that are shared
+								while (path != last) {
+									if (path == data['path']) {
+										var actions = $('.fileactions .action').filterAttr('data-action', 'Share');
+										$.each(actions, function(index, action) {
+											var img = $(action).find('img');
+											if (img.attr('src') != OC.imagePath('core', 'actions/public')) {
+												img.attr('src', image);
+												$(action).addClass('permanent');
+												$(action).html(' '+t('core', 'Shared')).prepend(img);
+											}
+										});
 									}
+									last = path;
+									path = OC.Share.dirname(path);
 								}
-								last = path;
-								path = OC.Share.dirname(path);
 							}
 						}
 					}
@@ -53,15 +57,6 @@ OC.Share={
 		});
 	},
 	updateIcon:function(itemType, itemSource) {
-		if (itemType == 'file' || itemType == 'folder') {
-			var file = $('tr').filterAttr('data-id', String(itemSource));
-			var filename = file.data('file');
-			if ($('#dir').val() == '/') {
-				itemSource = $('#dir').val() + filename;
-			} else {
-				itemSource = $('#dir').val() + '/' + filename;
-			}
-		}
 		var shares = false;
 		var link = false;
 		var image = OC.imagePath('core', 'actions/share');
@@ -83,18 +78,21 @@ OC.Share={
 		if (itemType != 'file' && itemType != 'folder') {
 			$('a.share[data-item="'+itemSource+'"]').css('background', 'url('+image+') no-repeat center');
 		} else {
-			var action = $(file).find('.fileactions .action').filterAttr('data-action', 'Share');
-			var img = action.find('img').attr('src', image);
-			if (shares) {
-				action.addClass('permanent');
-				action.html(' '+t('core', 'Shared')).prepend(img);
-			} else {
-				action.removeClass('permanent');
-				action.html(' '+t('core', 'Share')).prepend(img);
+			var file = $('tr').filterAttr('data-id', String(itemSource));
+			if (file.length > 0) {
+				var action = $(file).find('.fileactions .action').filterAttr('data-action', 'Share');
+				var img = action.find('img').attr('src', image);
+				if (shares) {
+					action.addClass('permanent');
+					action.html(' '+ escapeHTML(t('core', 'Shared'))).prepend(img);
+				} else {
+					action.removeClass('permanent');
+					action.html(' '+ escapeHTML(t('core', 'Share'))).prepend(img);
+				}
 			}
 		}
 		if (shares) {
-			OC.Share.statuses[itemSource] = link;
+			OC.Share.statuses[itemSource]['link'] = link;
 		} else {
 			delete OC.Share.statuses[itemSource];
 		}
@@ -102,21 +100,7 @@ OC.Share={
 	loadItem:function(itemType, itemSource) {
 		var data = '';
 		var checkReshare = true;
-		// Switch file sources to path to check if status is set
-		if (itemType == 'file' || itemType == 'folder') {
-			var filename = $('tr').filterAttr('data-id', String(itemSource)).data('file');
-			if ($('#dir').val() == '/') {
-				var item = $('#dir').val() + filename;
-			} else {
-				var item = $('#dir').val() + '/' + filename;
-			}
-			if (item.substring(0, 8) != '/Shared/') {
-				checkReshare = false;
-			}
-		} else {
-			var item = itemSource;
-		}
-		if (typeof OC.Share.statuses[item] === 'undefined') {
+		if (typeof OC.Share.statuses[itemSource] === 'undefined') {
 			// NOTE: Check does not always work and misses some shares, fix later
 			checkShares = true;
 		} else {
@@ -149,14 +133,14 @@ OC.Share={
 					callback();
 				}
 			} else {
-				OC.dialogs.alert(t('core', 'Error'), t('core', 'Error while unsharing'));
+				OC.dialogs.alert(t('core', 'Error while unsharing'), t('core', 'Error'));
 			}
 		});
 	},
 	setPermissions:function(itemType, itemSource, shareType, shareWith, permissions) {
 		$.post(OC.filePath('core', 'ajax', 'share.php'), { action: 'setPermissions', itemType: itemType, itemSource: itemSource, shareType: shareType, shareWith: shareWith, permissions: permissions }, function(result) {
 			if (!result || result.status !== 'success') {
-				OC.dialogs.alert(t('core', 'Error'), t('core', 'Error while changing permissions'));
+				OC.dialogs.alert(t('core', 'Error while changing permissions'), t('core', 'Error'));
 			}
 		});
 	},
@@ -251,7 +235,18 @@ OC.Share={
 				});
 				return false;
 			}
-			});
+			})
+			// customize internal _renderItem function to display groups and users differently
+			.data("ui-autocomplete")._renderItem = function( ul, item ) {
+				var insert = $( "<a>" ).text( item.label );
+				if(item.label.length > 8 && item.label.substr(item.label.length-8) === ' (group)') {
+					// current label is group - wrap "strong" element
+					insert = insert.wrapInner('<strong>');
+				}
+				return $( "<li>" )
+					.append( insert )
+					.appendTo( ul );
+			};
 		} else {
 			html += '<input id="shareWith" type="text" placeholder="'+t('core', 'Resharing is not allowed')+'" style="width:90%;" disabled="disabled"/>';
 			html += '</div>';
@@ -287,7 +282,7 @@ OC.Share={
 			}
 			var collectionList = $('#shareWithList li').filterAttr('data-collection', item);
 			if (collectionList.length > 0) {
-				$(collectionList).append(', '+shareWith);
+				$(collectionList).append(', '+shareWithDisplayName);
 			} else {
 				var html = '<li style="clear: both;" data-collection="'+item+'">'+t('core', 'Shared in {item} with {user}', {'item': item, user: shareWithDisplayName})+'</li>';
 				$('#shareWithList').prepend(html);
@@ -399,7 +394,7 @@ OC.Share={
 }
 
 $(document).ready(function() {
-	
+
 	if(typeof monthNames != 'undefined'){
 		$.datepicker.setDefaults({
 			monthNames: monthNames,
@@ -437,7 +432,7 @@ $(document).ready(function() {
 
 	$(this).click(function(event) {
 		var target = $(event.target);
-		var isMatched = !target.is('.drop, .ui-datepicker-next, .ui-datepicker-prev, .ui-icon') 
+		var isMatched = !target.is('.drop, .ui-datepicker-next, .ui-datepicker-prev, .ui-icon')
 			&& !target.closest('#ui-datepicker-div').length;
 		if (OC.Share.droppedDown && isMatched && $('#dropdown').has(event.target).length === 0) {
 			OC.Share.hideDropDown();
@@ -579,19 +574,19 @@ $(document).ready(function() {
 			var itemSource = $('#dropdown').data('item-source');
 			$.post(OC.filePath('core', 'ajax', 'share.php'), { action: 'setExpirationDate', itemType: itemType, itemSource: itemSource, date: '' }, function(result) {
 				if (!result || result.status !== 'success') {
-					OC.dialogs.alert(t('core', 'Error'), t('core', 'Error unsetting expiration date'));
+					OC.dialogs.alert(t('core', 'Error unsetting expiration date'), t('core', 'Error'));
 				}
 				$('#expirationDate').hide();
 			});
 		}
 	});
-	
+
 	$(document).on('change', '#dropdown #expirationDate', function() {
 		var itemType = $('#dropdown').data('item-type');
 		var itemSource = $('#dropdown').data('item-source');
 		$.post(OC.filePath('core', 'ajax', 'share.php'), { action: 'setExpirationDate', itemType: itemType, itemSource: itemSource, date: $(this).val() }, function(result) {
 			if (!result || result.status !== 'success') {
-				OC.dialogs.alert(t('core', 'Error'), t('core', 'Error setting expiration date'));
+				OC.dialogs.alert(t('core', 'Error setting expiration date'), t('core', 'Error'));
 			}
 		});
 	});
diff --git a/core/l10n/ar.php b/core/l10n/ar.php
index 67514723e751300960b42add4329728088c9860b..587e59695caf2534ddefe40fd6f8ae3450f00f1e 100644
--- a/core/l10n/ar.php
+++ b/core/l10n/ar.php
@@ -1,6 +1,16 @@
 <?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 Ù„Ù… ÙŠØ¯Ø®Ù„",
+"Error adding %s to favorites." => "Ø®Ø·Ø£ ÙÙŠ Ø§Ø¶Ø§ÙØ© %s Ø§Ù„Ù‰ Ø§Ù„Ù…ÙØ¶Ù„Ø©",
 "No categories selected for deletion." => "Ù„Ù… ÙŠØªÙ… Ø§Ø®ØªÙŠØ§Ø± ÙØ¦Ø© Ù„Ù„ØØ°Ù",
+"Error removing %s from favorites." => "Ø®Ø·Ø£ ÙÙŠ ØØ°Ù %s Ù…Ù† Ø§Ù„Ù…ÙØ¶Ù„Ø©",
 "Sunday" => "Ø§Ù„Ø§ØØ¯",
 "Monday" => "Ø§Ù„Ø£Ø«Ù†ÙŠÙ†",
 "Tuesday" => "Ø§Ù„Ø«Ù„Ø§Ø«Ø§Ø¡",
@@ -20,17 +30,30 @@
 "October" => "ØªØ´Ø±ÙŠÙ† Ø§Ù„Ø§ÙˆÙ„",
 "November" => "ØªØ´Ø±ÙŠÙ† Ø§Ù„Ø«Ø§Ù†ÙŠ",
 "December" => "ÙƒØ§Ù†ÙˆÙ† Ø§Ù„Ø§ÙˆÙ„",
-"Settings" => "ØªØ¹Ø¯ÙŠÙ„Ø§Øª",
+"Settings" => "Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª",
 "seconds ago" => "Ù…Ù†Ø° Ø«ÙˆØ§Ù†ÙŠ",
 "1 minute ago" => "Ù…Ù†Ø° Ø¯Ù‚ÙŠÙ‚Ø©",
 "{minutes} minutes ago" => "{minutes} Ù…Ù†Ø° Ø¯Ù‚Ø§Ø¦Ù‚",
+"1 hour ago" => "Ù‚Ø¨Ù„ Ø³Ø§Ø¹Ø© Ù…Ø¶Øª",
+"{hours} hours ago" => "{hours} Ø³Ø§Ø¹Ø© Ù…Ø¶Øª",
 "today" => "Ø§Ù„ÙŠÙˆÙ…",
-"Choose" => "Ø§Ø®ØªÙŠØ§Ø±",
+"yesterday" => "ÙŠÙˆÙ… Ø£Ù…Ø³",
+"{days} days ago" => "{days} ÙŠÙˆÙ… Ø³Ø§Ø¨Ù‚",
+"last month" => "Ø§Ù„Ø´Ù‡Ø± Ø§Ù„Ù…Ø§Ø¶ÙŠ",
+"{months} months ago" => "{months} Ø´Ù‡Ø± Ù…Ø¶Øª",
+"months ago" => "Ø´Ù‡Ø± Ù…Ø¶Ù‰",
+"last year" => "Ø§Ù„Ø³Ù†Ø©Ø§Ù„Ù…Ø§Ø¶ÙŠØ©",
+"years ago" => "Ø³Ù†Ø© Ù…Ø¶Øª",
+"Ok" => "Ù…ÙˆØ§ÙÙ‚",
 "Cancel" => "Ø§Ù„ØºØ§Ø¡",
-"No" => "Ù„Ø§",
+"Choose" => "Ø§Ø®ØªÙŠØ§Ø±",
 "Yes" => "Ù†Ø¹Ù…",
-"Ok" => "Ù…ÙˆØ§ÙÙ‚",
+"No" => "Ù„Ø§",
+"The object type is not specified." => "Ù†ÙˆØ¹ Ø§Ù„Ø¹Ù†ØµØ± ØºÙŠØ± Ù…ØØ¯Ø¯.",
 "Error" => "Ø®Ø·Ø£",
+"The app name is not specified." => "Ø§Ø³Ù… Ø§Ù„ØªØ·Ø¨ÙŠÙ‚ ØºÙŠØ± Ù…ØØ¯Ø¯.",
+"The required file {file} is not installed!" => "Ø§Ù„Ù…Ù„Ù Ø§Ù„Ù…Ø·Ù„ÙˆØ¨ {file} ØºÙŠØ± Ù…Ù†ØµÙ‘Ø¨.",
+"Shared" => "Ù…Ø´Ø§Ø±Ùƒ",
 "Share" => "Ø´Ø§Ø±Ùƒ",
 "Error while sharing" => "ØØµÙ„ Ø®Ø·Ø£ Ø¹Ù†Ø¯ Ø¹Ù…Ù„ÙŠØ© Ø§Ù„Ù…Ø´Ø§Ø±ÙƒØ©",
 "Error while unsharing" => "ØØµÙ„ Ø®Ø·Ø£ Ø¹Ù†Ø¯ Ø¹Ù…Ù„ÙŠØ© Ø¥Ø²Ø§Ù„Ø© Ø§Ù„Ù…Ø´Ø§Ø±ÙƒØ©",
@@ -40,7 +63,9 @@
 "Share with" => "Ø´Ø§Ø±Ùƒ Ù…Ø¹",
 "Share with link" => "Ø´Ø§Ø±Ùƒ Ù…Ø¹ Ø±Ø§Ø¨Ø·",
 "Password protect" => "ØÙ…Ø§ÙŠØ© ÙƒÙ„Ù…Ø© Ø§Ù„Ø³Ø±",
-"Password" => "ÙƒÙ„Ù…Ø© Ø§Ù„Ø³Ø±",
+"Password" => "ÙƒÙ„Ù…Ø© Ø§Ù„Ù…Ø±ÙˆØ±",
+"Email link to person" => "Ø§Ø±Ø³Ù„ Ø§Ù„Ø±Ø§Ø¨Ø· Ø¨Ø§Ù„Ø¨Ø±ÙŠØ¯ Ø§Ù„Ù‰ ØµØ¯ÙŠÙ‚",
+"Send" => "Ø£Ø±Ø³Ù„",
 "Set expiration date" => "ØªØ¹ÙŠÙŠÙ† ØªØ§Ø±ÙŠØ® Ø¥Ù†ØªÙ‡Ø§Ø¡ Ø§Ù„ØµÙ„Ø§ØÙŠØ©",
 "Expiration date" => "ØªØ§Ø±ÙŠØ® Ø¥Ù†ØªÙ‡Ø§Ø¡ Ø§Ù„ØµÙ„Ø§ØÙŠØ©",
 "Share via email:" => "Ù…Ø´Ø§Ø±ÙƒØ© Ø¹Ø¨Ø± Ø§Ù„Ø¨Ø±ÙŠØ¯ Ø§Ù„Ø¥Ù„ÙƒØªØ±ÙˆÙ†ÙŠ:",
@@ -57,30 +82,37 @@
 "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" => "Ø¥Ø¹Ø§Ø¯Ø© ØªØ¹ÙŠÙŠÙ† ÙƒÙ„Ù…Ø© Ø³Ø± 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.",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Ù„Ø§ ÙŠÙˆØ¬Ø¯ Ù…ÙˆÙ„Ù‘Ø¯ Ø£Ø±Ù‚Ø§Ù… Ø¹Ø´ÙˆØ§Ø¦ÙŠØ© ØŒ Ø§Ù„Ø±Ø¬Ø§Ø¡ ØªÙØ¹ÙŠÙ„ Ø§Ù„Ù€ PHP OpenSSL extension.",
+"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\">documentation</a>.",
 "Create an <strong>admin account</strong>" => "Ø£Ø¶Ù </strong>Ù…Ø³ØªØ®Ø¯Ù… Ø±Ø¦ÙŠØ³ÙŠ <strong>",
-"Advanced" => "Ø®ÙŠØ§Ø±Ø§Øª Ù…ØªÙ‚Ø¯Ù…Ø©",
+"Advanced" => "ØªØ¹Ø¯ÙŠÙ„Ø§Øª Ù…ØªÙ‚Ø¯Ù…Ù‡",
 "Data folder" => "Ù…Ø¬Ù„Ø¯ Ø§Ù„Ù…Ø¹Ù„ÙˆÙ…Ø§Øª",
 "Configure the database" => "Ø£Ø³Ø³ Ù‚Ø§Ø¹Ø¯Ø© Ø§Ù„Ø¨ÙŠØ§Ù†Ø§Øª",
 "will be used" => "Ø³ÙŠØªÙ… Ø§Ø³ØªØ®Ø¯Ù…Ù‡",
@@ -90,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!" => "Ù‚Ø¯ ÙŠÙƒÙˆÙ† ØØ³Ø§Ø¨Ùƒ ÙÙŠ Ø®Ø·Ø± Ø¥Ù† Ù„Ù… ØªÙ‚Ù… Ø¨Ø¥Ø¹Ø§Ø¯Ø© ØªØ¹ÙŠÙŠÙ† ÙƒÙ„Ù…Ø© Ø§Ù„Ø³Ø± ØØ¯ÙŠØ«Ø§Ù‹",
@@ -98,6 +130,8 @@
 "Lost your password?" => "Ù‡Ù„ Ù†Ø³ÙŠØª ÙƒÙ„Ù…Ø© Ø§Ù„Ø³Ø±ØŸ",
 "remember" => "ØªØ°ÙƒØ±",
 "Log in" => "Ø£Ø¯Ø®Ù„",
+"Alternative Logins" => "Ø§Ø³Ù…Ø§Ø¡ Ø¯Ø®ÙˆÙ„ Ø¨Ø¯ÙŠÙ„Ø©",
 "prev" => "Ø§Ù„Ø³Ø§Ø¨Ù‚",
-"next" => "Ø§Ù„ØªØ§Ù„ÙŠ"
+"next" => "Ø§Ù„ØªØ§Ù„ÙŠ",
+"Updating ownCloud to version %s, this may take a while." => "Ø¬Ø§Ø±ÙŠ ØªØØ¯ÙŠØ« Owncloud Ø§Ù„Ù‰ Ø§ØµØ¯Ø§Ø± %s , Ù‚Ø¯ ÙŠØ³ØªØºØ±Ù‚ Ù‡Ø°Ø§ Ø¨Ø¹Ø¶ Ø§Ù„ÙˆÙ‚Øª."
 );
diff --git a/core/l10n/bg_BG.php b/core/l10n/bg_BG.php
index f2320f1340ee0e533f56c20fa39dc9749ebf33ce..74e28bf29001bc8fd4afa825d14525b2fbe8e6ea 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 Ð¼Ð¸Ð½ÑƒÑ‚Ð°",
@@ -8,15 +28,45 @@
 "last month" => "Ð¿Ð¾ÑÐ»ÐµÐ´Ð½Ð¸ÑÑ‚ Ð¼ÐµÑÐµÑ†",
 "last year" => "Ð¿Ð¾ÑÐ»ÐµÐ´Ð½Ð°Ñ‚Ð° Ð³Ð¾Ð´Ð¸Ð½Ð°",
 "years ago" => "Ð¿Ð¾ÑÐ»ÐµÐ´Ð½Ð¸Ñ‚Ðµ Ð³Ð¾Ð´Ð¸Ð½Ð¸",
+"Ok" => "Ð”Ð¾Ð±Ñ€Ðµ",
+"Cancel" => "ÐžÑ‚ÐºÐ°Ð·",
+"Yes" => "Ð”Ð°",
+"No" => "ÐÐµ",
 "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..63a80edad383e7b041a749b444273af380943fd8 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,23 +31,23 @@
 "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" => "à¦¬à§‡à¦›à§‡ à¦¨à¦¿à¦¨",
+"Ok" => "à¦¤à¦¥à¦¾à¦¸à§à¦¤à§",
 "Cancel" => "à¦¬à¦¾à¦¤à¦¿à¦°",
-"No" => "à¦¨à¦¾",
+"Choose" => "à¦¬à§‡à¦›à§‡ à¦¨à¦¿à¦¨",
 "Yes" => "à¦¹à§à¦¯à¦¾à¦",
-"Ok" => "à¦¤à¦¥à¦¾à¦¸à§à¦¤à§",
+"No" => "à¦¨à¦¾",
 "The object type is not specified." => "à¦…à¦¬à¦œà§‡à¦•à§à¦Ÿà§‡à¦° à¦§à¦°à¦£à¦Ÿà¦¿ à¦¸à§à¦¨à¦¿à¦°à§à¦¦à¦¿à¦·à§à¦Ÿ à¦¨à§Ÿà¥¤",
 "Error" => "à¦¸à¦®à¦¸à§à¦¯à¦¾",
 "The app name is not specified." => "à¦…à§à¦¯à¦¾à¦ªà§‡à¦° à¦¨à¦¾à¦®à¦Ÿà¦¿  à¦¸à§à¦¨à¦¿à¦°à§à¦¦à¦¿à¦·à§à¦Ÿ à¦¨à§Ÿà¥¤",
@@ -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 3837ceb0f9233b129afe1baad37041e5b668a3eb..a1430d547f5a9afcc27a233f26893eec5510dff4 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",
@@ -44,11 +44,11 @@
 "months ago" => "mesos enrere",
 "last year" => "l'any passat",
 "years ago" => "anys enrere",
-"Choose" => "Escull",
+"Ok" => "D'acord",
 "Cancel" => "CancelÂ·la",
-"No" => "No",
+"Choose" => "Escull",
 "Yes" => "SÃ",
-"Ok" => "D'acord",
+"No" => "No",
 "The object type is not specified." => "No s'ha especificat el tipus d'objecte.",
 "Error" => "Error",
 "The app name is not specified." => "No s'ha especificat el nom de l'aplicaciÃ³.",
@@ -88,9 +88,9 @@
 "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,13 +100,15 @@
 "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",
 "Edit categories" => "Edita les categories",
 "Add" => "Afegeix",
 "Security Warning" => "AvÃs de seguretat",
+"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "La versiÃ³ de PHP que useu Ã©s vulnerable a l'atac per NULL Byte (CVE-2006-7243)",
+"Please update your PHP installation to use ownCloud securely." => "Actualitzeu la instalÂ·laciÃ³ de PHP per usar ownCloud de forma segura.",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "No estÃ  disponible el generador de nombres aleatoris segurs, habiliteu l'extensiÃ³ de PHP OpenSSL.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Sense un generador de nombres aleatoris segurs un atacant podria predir els senyals per restablir la contrasenya i prendre-us el compte.",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "La carpeta de dades i els seus fitxers probablement sÃ³n accessibles des d'internet perquÃ¨ el fitxer .htaccess no funciona.",
@@ -123,6 +125,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 afd55d42bf4b1ea4758225216028b6e7dda0782b..be354386e10c46ad55e520d73bf293678cb979d2 100644
--- a/core/l10n/cs_CZ.php
+++ b/core/l10n/cs_CZ.php
@@ -39,16 +39,16 @@
 "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",
+"Ok" => "Ok",
 "Cancel" => "ZruÅ¡it",
-"No" => "Ne",
+"Choose" => "Vybrat",
 "Yes" => "Ano",
-"Ok" => "Ok",
+"No" => "Ne",
 "The object type is not specified." => "NenÃ urÄen typ objektu.",
 "Error" => "Chyba",
 "The app name is not specified." => "NenÃ urÄen nÃ¡zev aplikace.",
@@ -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",
@@ -107,6 +107,8 @@
 "Edit categories" => "Upravit kategorie",
 "Add" => "PÅ™idat",
 "Security Warning" => "BezpeÄnostnÃ upozornÄ›nÃ",
+"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Verze vaÅ¡eho PHP je napadnutelnÃ¡ pomocÃ techniky \"NULL Byte\" (CVE-2006-7243)",
+"Please update your PHP installation to use ownCloud securely." => "Aktualizujte prosÃm vaÅ¡i instanci PHP pro bezpeÄnÃ© pouÅ¾ÃvÃ¡nÃ ownCloud.",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "NenÃ dostupnÃ½ Å¾Ã¡dnÃ½ bezpeÄnÃ½ generÃ¡tor nÃ¡hodnÃ½ch ÄÃsel. Povolte, prosÃm, rozÅ¡ÃÅ™enÃ OpenSSL v PHP.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Bez bezpeÄnÃ©ho generÃ¡toru nÃ¡hodnÃ½ch ÄÃsel mÅ¯Å¾e ÃºtoÄnÃk pÅ™edpovÄ›dÄ›t token pro obnovu hesla a pÅ™evzÃt kontrolu nad VaÅ¡Ãm ÃºÄtem.",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "VÃ¡Å¡ adresÃ¡Å™ s daty a soubory jsou dostupnÃ© z internetu, protoÅ¾e soubor .htaccess nefunguje.",
@@ -122,13 +124,14 @@
 "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.",
 "Please change your password to secure your account again." => "ZmÄ›Åˆte, prosÃm, svÃ© heslo pro opÄ›tovnÃ© zabezpeÄenÃ VaÅ¡eho ÃºÄtu.",
 "Lost your password?" => "Ztratili jste svÃ© heslo?",
-"remember" => "zapamatovat si",
+"remember" => "zapamatovat",
 "Log in" => "PÅ™ihlÃ¡sit",
 "Alternative Logins" => "AlternativnÃ pÅ™ihlÃ¡Å¡enÃ",
 "prev" => "pÅ™edchozÃ",
diff --git a/core/l10n/cy_GB.php b/core/l10n/cy_GB.php
new file mode 100644
index 0000000000000000000000000000000000000000..a874d43965d05e5915e0d5c61abd097aae686cc0
--- /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",
+"Ok" => "Iawn",
+"Cancel" => "Diddymu",
+"Choose" => "Dewisiwch",
+"Yes" => "Ie",
+"No" => "Na",
+"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 6d982aac2a91bafe39f8b1f2bf7f1246c623c3ca..43b2f4f840a16d603f2de155ba6d88a58aa45c62 100644
--- a/core/l10n/da.php
+++ b/core/l10n/da.php
@@ -44,11 +44,11 @@
 "months ago" => "mÃ¥neder siden",
 "last year" => "sidste Ã¥r",
 "years ago" => "Ã¥r siden",
+"Ok" => "OK",
+"Cancel" => "Annuller",
 "Choose" => "VÃ¦lg",
-"Cancel" => "Fortryd",
-"No" => "Nej",
 "Yes" => "Ja",
-"Ok" => "OK",
+"No" => "Nej",
 "The object type is not specified." => "Objekttypen er ikke angivet.",
 "Error" => "Fejl",
 "The app name is not specified." => "Den app navn er ikke angivet.",
@@ -89,15 +89,13 @@
 "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}",
 "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",
@@ -107,6 +105,8 @@
 "Edit categories" => "Rediger kategorier",
 "Add" => "TilfÃ¸j",
 "Security Warning" => "Sikkerhedsadvarsel",
+"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Din PHP-version er sÃ¥rbar overfor et NULL Byte angreb (CVE-2006-7243)",
+"Please update your PHP installation to use ownCloud securely." => "Opdater venligs din PHP-installation for at kunne bruge ownCloud sikkert.",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Ingen sikker tilfÃ¦ldighedsgenerator til tal er tilgÃ¦ngelig. Aktiver venligst OpenSSL udvidelsen.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Uden en sikker tilfÃ¦ldighedsgenerator til tal kan en angriber mÃ¥ske gÃ¦tte dit gendan kodeord og overtage din konto",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Dine data mappe og filer er sandsynligvis tilgÃ¦ngelige fra internettet fordi .htaccess filen ikke virker.",
diff --git a/core/l10n/de.php b/core/l10n/de.php
index e60f061ff3c120dce602053fd7ced913edbe272a..b53bda109ddaeeec9a47147572132e91440bdd8d 100644
--- a/core/l10n/de.php
+++ b/core/l10n/de.php
@@ -44,11 +44,11 @@
 "months ago" => "Vor Monaten",
 "last year" => "Letztes Jahr",
 "years ago" => "Vor Jahren",
-"Choose" => "AuswÃ¤hlen",
+"Ok" => "OK",
 "Cancel" => "Abbrechen",
-"No" => "Nein",
+"Choose" => "AuswÃ¤hlen",
 "Yes" => "Ja",
-"Ok" => "OK",
+"No" => "Nein",
 "The object type is not specified." => "Der Objekttyp ist nicht angegeben.",
 "Error" => "Fehler",
 "The app name is not specified." => "Der App-Name ist nicht angegeben.",
@@ -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,18 +99,20 @@
 "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",
 "Edit categories" => "Kategorien bearbeiten",
 "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.",
 "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",
@@ -122,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 9a975ddcb8700f62ad9745bca86c1cd8fd3a09cc..7e9b64193c6f8809d62b10dc12cc1cc3d834ff96 100644
--- a/core/l10n/de_DE.php
+++ b/core/l10n/de_DE.php
@@ -5,7 +5,7 @@
 "User %s shared the folder \"%s\" with you. It is available for download here: %s" => "%s hat den Ordner \"%s\" mit Ihnen geteilt. Er ist hier zum Download verfÃ¼gbar: %s",
 "Category type not provided." => "Kategorie nicht angegeben.",
 "No category to add?" => "Keine Kategorie hinzuzufÃ¼gen?",
-"This category already exists: %s" => "Die Kategorie '%s' existiert bereits.",
+"This category already exists: %s" => "Die nachfolgende Kategorie existiert bereits: %s",
 "Object type not provided." => "Objekttyp nicht angegeben.",
 "%s ID not provided." => "%s ID nicht angegeben.",
 "Error adding %s to favorites." => "Fehler beim HinzufÃ¼gen von %s zu den Favoriten.",
@@ -44,19 +44,19 @@
 "months ago" => "Vor Monaten",
 "last year" => "Letztes Jahr",
 "years ago" => "Vor Jahren",
-"Choose" => "AuswÃ¤hlen",
+"Ok" => "OK",
 "Cancel" => "Abbrechen",
-"No" => "Nein",
+"Choose" => "AuswÃ¤hlen",
 "Yes" => "Ja",
-"Ok" => "OK",
+"No" => "Nein",
 "The object type is not specified." => "Der Objekttyp ist nicht angegeben.",
 "Error" => "Fehler",
 "The app name is not specified." => "Der App-Name ist nicht angegeben.",
-"The required file {file} is not installed!" => "Die benÃ¶tigte Datei {file} ist nicht installiert.",
+"The required file {file} is not installed!" => "Die benÃ¶tigte Datei {file} ist nicht installiert!",
 "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.",
@@ -66,7 +66,7 @@
 "Password" => "Passwort",
 "Email link to person" => "Link per E-Mail verschicken",
 "Send" => "Senden",
-"Set expiration date" => "Setze ein Ablaufdatum",
+"Set expiration date" => "Ein Ablaufdatum setzen",
 "Expiration date" => "Ablaufdatum",
 "Share via email:" => "Mittels einer E-Mail teilen:",
 "No people found" => "Niemand gefunden",
@@ -79,7 +79,7 @@
 "update" => "aktualisieren",
 "delete" => "lÃ¶schen",
 "share" => "teilen",
-"Password protected" => "Durch ein Passwort geschÃ¼tzt",
+"Password protected" => "PasswortgeschÃ¼tzt",
 "Error unsetting expiration date" => "Fehler beim Entfernen des Ablaufdatums",
 "Error setting expiration date" => "Fehler beim Setzen des Ablaufdatums",
 "Sending ..." => "Sende ...",
@@ -88,25 +88,27 @@
 "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." => "E-Mail zum ZurÃ¼cksetzen des Passworts gesendet.",
-"Request failed!" => "Die Anfrage schlug fehl!",
 "Username" => "Benutzername",
-"Request reset" => "Beantrage ZurÃ¼cksetzung",
+"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 nicht gefunden",
-"Edit categories" => "Kategorien bearbeiten",
+"Cloud not found" => "Cloud wurde nicht gefunden",
+"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",
+"Please update your PHP installation to use ownCloud securely." => "Bitte bringen Sie Ihre PHP Version 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 aktivieren Sie 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 Ihr Konto zu Ã¼bernehmen.",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Ihr Datenverzeichnis und Ihre Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert.",
@@ -123,8 +125,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 62d12569337314cd7cc6b2920c387fd59423b91b..dbe0d0ee3d65412a08366a4ed351ddafaf8c2177 100644
--- a/core/l10n/el.php
+++ b/core/l10n/el.php
@@ -44,11 +44,11 @@
 "months ago" => "Î¼Î®Î½ÎµÏ‚ Ï€ÏÎ¹Î½",
 "last year" => "Ï„ÎµÎ»ÎµÏ…Ï„Î±Î¯Î¿ Ï‡ÏÏŒÎ½Î¿",
 "years ago" => "Ï‡ÏÏŒÎ½Î¹Î± Ï€ÏÎ¹Î½",
-"Choose" => "Î•Ï€Î¹Î»ÎÎ¾Ï„Îµ",
+"Ok" => "ÎŸÎº",
 "Cancel" => "Î†ÎºÏ…ÏÎ¿",
-"No" => "ÎŒÏ‡Î¹",
+"Choose" => "Î•Ï€Î¹Î»ÎÎ¾Ï„Îµ",
 "Yes" => "ÎÎ±Î¹",
-"Ok" => "ÎŸÎº",
+"No" => "ÎŒÏ‡Î¹",
 "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" => "Î£ÎµÎ»Î¯Î´Î± ÎµÎ¹ÏƒÏŒÎ´Î¿Ï…",
@@ -107,6 +107,8 @@
 "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." => "ÎŸ ÎºÎ±Ï„Î¬Î»Î¿Î³Î¿Ï‚ Î´ÎµÎ´Î¿Î¼ÎÎ½Ï‰Î½ ÎºÎ±Î¹ Ï„Î± Î±ÏÏ‡ÎµÎ¯Î± ÏƒÎ±Ï‚ ÎµÎ¯Î½Î±Î¹ Ï€Î¹Î¸Î±Î½ÏŒ Ï€ÏÎ¿ÏƒÎ²Î¬ÏƒÎ¹Î¼Î± Î±Ï€ÏŒ Ï„Î¿ internet Î³Î¹Î±Ï„Î¯ Î´ÎµÎ½ Î´Î¿Ï…Î»ÎµÏÎµÎ¹ Ï„Î¿ Î±ÏÏ‡ÎµÎ¯Î¿ .htaccess.",
@@ -122,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..1889de1ea23ea8d38ea5e4479bde6aa304afa371 100644
--- a/core/l10n/eo.php
+++ b/core/l10n/eo.php
@@ -43,11 +43,11 @@
 "months ago" => "monatoj antaÅe",
 "last year" => "lastajare",
 "years ago" => "jaroj antaÅe",
-"Choose" => "Elekti",
+"Ok" => "Akcepti",
 "Cancel" => "Nuligi",
-"No" => "Ne",
+"Choose" => "Elekti",
 "Yes" => "Jes",
-"Ok" => "Akcepti",
+"No" => "Ne",
 "The object type is not specified." => "Ne indikiÄis tipo de la objekto.",
 "Error" => "Eraro",
 "The app name is not specified." => "Ne indikiÄis nomo de la aplikaÄµo.",
@@ -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 5f4a2d6b724dd61d4ece0905fc5de816f3227ae4..d99ac861cea5fc0fef17f45eb05ca9e819695e75 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,20 @@
 "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",
+"Ok" => "Aceptar",
 "Cancel" => "Cancelar",
-"No" => "No",
+"Choose" => "Seleccionar",
 "Yes" => "SÃ",
-"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.",
+"No" => "No",
+"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 +68,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,34 +84,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 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",
@@ -122,13 +124,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 dcbae5c1e94ff0cf62aad86eb6405d43e2c5ed8b..8f77843708779a4ff1488b99587cf06d58a7097b 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",
@@ -44,11 +44,11 @@
 "months ago" => "meses atrÃ¡s",
 "last year" => "el aÃ±o pasado",
 "years ago" => "aÃ±os atrÃ¡s",
-"Choose" => "Elegir",
+"Ok" => "Aceptar",
 "Cancel" => "Cancelar",
-"No" => "No",
+"Choose" => "Elegir",
 "Yes" => "SÃ",
-"Ok" => "Aceptar",
+"No" => "No",
 "The object type is not specified." => "El tipo de objeto no esta especificado. ",
 "Error" => "Error",
 "The app name is not specified." => "El nombre de la aplicaciÃ³n no esta especificado.",
@@ -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,24 +89,24 @@
 "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",
 "Edit categories" => "Editar categorÃas",
 "Add" => "Agregar",
 "Security Warning" => "Advertencia de seguridad",
+"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "La versiÃ³n de PHP que tenÃ©s, es vulnerable al ataque de byte NULL (CVE-2006-7243)",
+"Please update your PHP installation to use ownCloud securely." => "ActualizÃ¡ tu instalaciÃ³n de PHP para usar ownCloud de manera segura.",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "No hay disponible ningÃºn generador de nÃºmeros aleatorios seguro. Por favor habilitÃ¡ la extensiÃ³n OpenSSL de PHP.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Sin un generador de nÃºmeros aleatorios seguro un atacante podrÃa predecir los tokens de reinicio de tu contraseÃ±a y tomar control de tu cuenta.",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Tu directorio de datos y tus archivos probablemente son accesibles a travÃ©s de internet, ya que el archivo .htaccess no estÃ¡ funcionando.",
@@ -122,7 +122,7 @@
 "Database tablespace" => "Espacio de tablas de la base de datos",
 "Database host" => "Host de la base de datos",
 "Finish setup" => "Completar la instalaciÃ³n",
-"web services under your control" => "servicios web 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 de75b3f6f1638dde26d39bc2312b2890243de025..79d3024f0145cc7ecf6ea807ebcf184d38369cdd 100644
--- a/core/l10n/et_EE.php
+++ b/core/l10n/et_EE.php
@@ -1,6 +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 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 kataloogi \"%s\". See on allalaadimiseks saadaval siin: %s",
+"Category type not provided." => "Kategooria tÃ¼Ã¼p puudub.",
 "No category to add?" => "Pole kategooriat, mida lisada?",
+"This category already exists: %s" => "See kategooria on juba olemas: %s",
+"Object type not provided." => "Objekti tÃ¼Ã¼b 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",
 "Sunday" => "PÃ¼hapÃ¤ev",
 "Monday" => "EsmaspÃ¤ev",
 "Tuesday" => "TeisipÃ¤ev",
@@ -25,33 +35,43 @@
 "1 minute ago" => "1 minut tagasi",
 "{minutes} minutes ago" => "{minutes} minutit tagasi",
 "1 hour ago" => "1 tund tagasi",
+"{hours} hours ago" => "{hours} tundi tagasi",
 "today" => "tÃ¤na",
 "yesterday" => "eile",
 "{days} days ago" => "{days} pÃ¤eva tagasi",
 "last month" => "viimasel kuul",
+"{months} months ago" => "{months} kuud tagasi",
 "months ago" => "kuu tagasi",
 "last year" => "viimasel aastal",
 "years ago" => "aastat tagasi",
-"Choose" => "Vali",
+"Ok" => "Ok",
 "Cancel" => "Loobu",
-"No" => "Ei",
+"Choose" => "Vali",
 "Yes" => "Jah",
-"Ok" => "Ok",
+"No" => "Ei",
+"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 required file {file} is not installed!" => "Vajalikku faili {file} pole paigaldatud!",
+"Shared" => "Jagatud",
 "Share" => "Jaga",
 "Error while sharing" => "Viga jagamisel",
 "Error while unsharing" => "Viga jagamise lÃµpetamisel",
 "Error while changing permissions" => "Viga Ãµiguste muutmisel",
+"Shared with you and the group {group} by {owner}" => "Jagatud sinu ja {group} grupiga {owner} poolt",
 "Shared with you by {owner}" => "Sinuga jagas {owner}",
 "Share with" => "Jaga",
 "Share with link" => "Jaga lingiga",
 "Password protect" => "Parooliga kaitstud",
 "Password" => "Parool",
+"Email link to person" => "Saada link isikule e-postiga",
+"Send" => "Saada",
 "Set expiration date" => "MÃ¤Ã¤ra aegumise kuupÃ¤ev",
 "Expiration date" => "Aegumise kuupÃ¤ev",
 "Share via email:" => "Jaga e-postiga:",
 "No people found" => "Ãœhtegi inimest ei leitud",
 "Resharing is not allowed" => "Edasijagamine pole lubatud",
+"Shared in {item} with {user}" => "Jagatud {item} kasutajaga {user}",
 "Unshare" => "LÃµpeta jagamine",
 "can edit" => "saab muuta",
 "access control" => "ligipÃ¤Ã¤sukontroll",
@@ -62,20 +82,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",
+"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 aadressil.<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",
@@ -83,8 +107,14 @@
 "Edit categories" => "Muuda kategooriaid",
 "Add" => "Lisa",
 "Security Warning" => "Turvahoiatus",
+"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Sinu PHP versioon on haavatav NULL Baidi (CVE-2006-7243) rÃ¼nnakuga.",
+"Please update your PHP installation to use ownCloud securely." => "Palun uuenda oma paigaldatud PHP-d tagamaks ownCloudi turvalisus.",
+"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>.",
 "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",
@@ -94,7 +124,8 @@
 "Database tablespace" => "Andmebaasi tabeliruum",
 "Database host" => "Andmebaasi host",
 "Finish setup" => "LÃµpeta seadistamine",
-"web services under your control" => "veebiteenused sinu kontrolli all",
+"web services under your control" => "veebitenused 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!",
@@ -102,6 +133,8 @@
 "Lost your password?" => "Kaotasid oma parooli?",
 "remember" => "pea meeles",
 "Log in" => "Logi sisse",
+"Alternative Logins" => "Alternatiivsed meldimised",
 "prev" => "eelm",
-"next" => "jÃ¤rgm"
+"next" => "jÃ¤rgm",
+"Updating ownCloud to version %s, this may take a while." => "Uuendan ownCloudi versioonile %s. LÃ¤heb pisut aega."
 );
diff --git a/core/l10n/eu.php b/core/l10n/eu.php
index 834af44b382b375a813ae6bf6eed93d746339614..9c9d28133cf0a360fd329f36416ac2e04709bb38 100644
--- a/core/l10n/eu.php
+++ b/core/l10n/eu.php
@@ -44,11 +44,11 @@
 "months ago" => "hilabete",
 "last year" => "joan den urtean",
 "years ago" => "urte",
-"Choose" => "Aukeratu",
+"Ok" => "Ados",
 "Cancel" => "Ezeztatu",
-"No" => "Ez",
+"Choose" => "Aukeratu",
 "Yes" => "Bai",
-"Ok" => "Ados",
+"No" => "Ez",
 "The object type is not specified." => "Objetu mota ez dago zehaztuta.",
 "Error" => "Errorea",
 "The app name is not specified." => "App izena ez dago zehaztuta.",
@@ -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,13 +98,15 @@
 "Personal" => "Pertsonala",
 "Users" => "Erabiltzaileak",
 "Apps" => "Aplikazioak",
-"Admin" => "Kudeatzailea",
+"Admin" => "Admin",
 "Help" => "Laguntza",
 "Access forbidden" => "Sarrera debekatuta",
 "Cloud not found" => "Ez da hodeia aurkitu",
 "Edit categories" => "Editatu kategoriak",
 "Add" => "Gehitu",
 "Security Warning" => "Segurtasun abisua",
+"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Zure PHP bertsioa NULL Byte erasoak (CVE-2006-7243) mendera dezake.",
+"Please update your PHP installation to use ownCloud securely." => "Mesedez eguneratu zure PHP instalazioa ownCloud modu seguru batean erabiltzeko.",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Ez dago hausazko zenbaki sortzaile segururik eskuragarri, mesedez gatiu PHP OpenSSL extensioa.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Hausazko zenbaki sortzaile segururik gabe erasotzaile batek pasahitza berrezartzeko kodeak iragarri ditzake eta zure kontuaz jabetu.",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Zure data karpeta eta fitxategiak interneten bidez eskuragarri egon daitezke .htaccess fitxategia ez delako funtzionatzen ari.",
diff --git a/core/l10n/fa.php b/core/l10n/fa.php
index 2420ee67df5493a89d1a486cc9e7c1c922140819..ff73e80448332cf05764b7d8452f16f93df400ec 100644
--- a/core/l10n/fa.php
+++ b/core/l10n/fa.php
@@ -44,17 +44,17 @@
 "months ago" => "Ù…Ø§Ù‡â€ŒÙ‡Ø§ÛŒ Ù‚Ø¨Ù„",
 "last year" => "Ø³Ø§Ù„ Ù‚Ø¨Ù„",
 "years ago" => "Ø³Ø§Ù„â€ŒÙ‡Ø§ÛŒ Ù‚Ø¨Ù„",
-"Choose" => "Ø§Ù†ØªØ®Ø§Ø¨ Ú©Ø±Ø¯Ù†",
+"Ok" => "Ù‚Ø¨ÙˆÙ„",
 "Cancel" => "Ù…Ù†ØµØ±Ù Ø´Ø¯Ù†",
-"No" => "Ù†Ù‡",
+"Choose" => "Ø§Ù†ØªØ®Ø§Ø¨ Ú©Ø±Ø¯Ù†",
 "Yes" => "Ø¨Ù„Ù‡",
-"Ok" => "Ù‚Ø¨ÙˆÙ„",
+"No" => "Ù†Ù‡",
 "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,28 +89,30 @@
 "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)",
+"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." => "ÙØ§ÛŒÙ„Ù‡Ø§ Ùˆ ÙÙ‡Ø±Ø³Øª Ù‡Ø§ÛŒ Ø¯Ø§Ø¯Ù‡ Ù‡Ø§ÛŒ Ø´Ù…Ø§ Ù‚Ø§Ø¨Ù„ Ø§Ø² Ø§ÛŒÙ†ØªØ±Ù†Øª Ù‚Ø§Ø¨Ù„ Ø¯Ø³ØªØ±Ø³ÛŒ Ù‡Ø³ØªÙ†Ø¯ØŒ Ú†ÙˆÙ†Ú©Ù‡ ÙØ§ÛŒÙ„ 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" => "Ø§Ø³ØªÙØ§Ø¯Ù‡ Ø®ÙˆØ§Ù‡Ø¯ Ø´Ø¯",
@@ -120,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!" => "Ø§Ú¯Ø± Ø´Ù…Ø§ Ø§Ø®ÛŒØ±Ø§ Ø±Ù…Ø²Ø¹Ø¨ÙˆØ± Ø±Ø§ ØªØºÛŒÛŒØ± Ù†Ø¯Ø§Ø¯Ù‡ Ø§ÛŒØ¯ØŒ ØØ³Ø§Ø¨ Ø´Ù…Ø§ Ø¯Ø± Ù…Ø¹Ø±Ø¶ Ø®Ø·Ø± Ù…ÛŒ Ø¨Ø§Ø´Ø¯ !",
@@ -128,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/fi.php b/core/l10n/fi.php
new file mode 100644
index 0000000000000000000000000000000000000000..655d544d393f04ca042d997719c3a775bdc49cb2
--- /dev/null
+++ b/core/l10n/fi.php
@@ -0,0 +1,4 @@
+<?php $TRANSLATIONS = array(
+"Settings" => "asetukset",
+"Username" => "KÃ¤yttÃ¤jÃ¤tunnus"
+);
diff --git a/core/l10n/fi_FI.php b/core/l10n/fi_FI.php
index 1b412510e0a391ec3181016a34fa855186efb150..3f50e814845fb00d8a3d5ef0dae24651ea1047b4 100644
--- a/core/l10n/fi_FI.php
+++ b/core/l10n/fi_FI.php
@@ -3,29 +3,31 @@
 "User %s shared a folder with you" => "KÃ¤yttÃ¤jÃ¤ %s jakoi kansion kanssasi",
 "User %s shared the file \"%s\" with you. It is available for download here: %s" => "KÃ¤yttÃ¤jÃ¤ %s jakoi tiedoston \"%s\" kanssasi. Se on ladattavissa tÃ¤Ã¤ltÃ¤: %s",
 "User %s shared the folder \"%s\" with you. It is available for download here: %s" => "KÃ¤yttÃ¤jÃ¤ %s jakoi kansion \"%s\" kanssasi. Se on ladattavissa tÃ¤Ã¤ltÃ¤: %s",
+"Category type not provided." => "Luokan tyyppiÃ¤ ei mÃ¤Ã¤ritelty.",
 "No category to add?" => "Ei lisÃ¤ttÃ¤vÃ¤Ã¤ luokkaa?",
+"This category already exists: %s" => "Luokka on jo olemassa: %s",
 "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",
@@ -40,14 +42,15 @@
 "months ago" => "kuukautta sitten",
 "last year" => "viime vuonna",
 "years ago" => "vuotta sitten",
-"Choose" => "Valitse",
+"Ok" => "Ok",
 "Cancel" => "Peru",
-"No" => "Ei",
+"Choose" => "Valitse",
 "Yes" => "KyllÃ¤",
-"Ok" => "Ok",
+"No" => "Ei",
 "Error" => "Virhe",
 "The app name is not specified." => "Sovelluksen nimeÃ¤ ei ole mÃ¤Ã¤ritelty.",
 "The required file {file} is not installed!" => "Vaadittua tiedostoa {file} ei ole asennettu!",
+"Shared" => "Jaettu",
 "Share" => "Jaa",
 "Error while sharing" => "Virhe jaettaessa",
 "Error while unsharing" => "Virhe jakoa peruttaessa",
@@ -82,24 +85,25 @@
 "ownCloud password reset" => "ownCloud-salasanan nollaus",
 "Use the following link to reset your password: {link}" => "Voit palauttaa salasanasi seuraavassa osoitteessa: {link}",
 "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",
 "Edit categories" => "Muokkaa luokkia",
 "Add" => "LisÃ¤Ã¤",
 "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>",
@@ -121,6 +125,7 @@
 "Lost your password?" => "Unohditko salasanasi?",
 "remember" => "muista",
 "Log in" => "Kirjaudu sisÃ¤Ã¤n",
+"Alternative Logins" => "Vaihtoehtoiset kirjautumiset",
 "prev" => "edellinen",
 "next" => "seuraava",
 "Updating ownCloud to version %s, this may take a while." => "PÃ¤ivitetÃ¤Ã¤n ownCloud versioon %s, tÃ¤mÃ¤ saattaa kestÃ¤Ã¤ hetken."
diff --git a/core/l10n/fr.php b/core/l10n/fr.php
index f6ad077d268d7803cf3f96bf5ad913b334c8f9a3..84ea35abcf20f3dbd84d3480181527ade6834acb 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",
@@ -44,11 +44,11 @@
 "months ago" => "il y a plusieurs mois",
 "last year" => "l'annÃ©e derniÃ¨re",
 "years ago" => "il y a plusieurs annÃ©es",
-"Choose" => "Choisir",
+"Ok" => "Ok",
 "Cancel" => "Annuler",
-"No" => "Non",
+"Choose" => "Choisir",
 "Yes" => "Oui",
-"Ok" => "Ok",
+"No" => "Non",
 "The object type is not specified." => "Le type d'objet n'est pas spÃ©cifiÃ©.",
 "Error" => "Erreur",
 "The app name is not specified." => "Le nom de l'application n'est pas spÃ©cifiÃ©.",
@@ -88,25 +88,27 @@
 "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)",
+"Please update your PHP installation to use ownCloud securely." => "Veuillez mettre Ã  jour votre installation PHP pour utiliser ownCloud de faÃ§on sÃ©curisÃ©e.",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Aucun gÃ©nÃ©rateur de nombre alÃ©atoire sÃ©curisÃ© n'est disponible, veuillez activer l'extension PHP OpenSSL",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Sans gÃ©nÃ©rateur de nombre alÃ©atoire sÃ©curisÃ©, un attaquant peut Ãªtre en mesure de prÃ©dire les jetons de rÃ©initialisation du mot de passe, et ainsi prendre le contrÃ´le de votre compte utilisateur.",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Votre rÃ©pertoire data est certainement accessible depuis l'internet car le fichier .htaccess ne semble pas fonctionner",
@@ -123,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 194c28e7cfbea90996336cd57b12682df0c58076..7269e79274460b996dc8c2d5d21b604154dd3778 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",
@@ -44,11 +44,11 @@
 "months ago" => "meses atrÃ¡s",
 "last year" => "Ãºltimo ano",
 "years ago" => "anos atrÃ¡s",
-"Choose" => "Escoller",
+"Ok" => "Aceptar",
 "Cancel" => "Cancelar",
-"No" => "Non",
+"Choose" => "Escoller",
 "Yes" => "Si",
-"Ok" => "Aceptar",
+"No" => "Non",
 "The object type is not specified." => "Non se especificou o tipo de obxecto.",
 "Error" => "Erro",
 "The app name is not specified." => "Non se especificou o nome do aplicativo.",
@@ -88,9 +88,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,13 +100,15 @@
 "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)",
+"Please update your PHP installation to use ownCloud securely." => "Actualice a instalaciÃ³n de PHP para empregar ownCloud de xeito seguro.",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Non hai un xerador de nÃºmeros ao chou dispoÃ±Ãbel. Active o engadido de OpenSSL para PHP.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Sen un xerador seguro de nÃºmeros ao chou poderÃa acontecer que predicindo as cadeas de texto de reinicio de contrasinais se afagan coa sÃºa conta.",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "O seu directorio de datos e os ficheiros probabelmente sexan accesÃbeis desde a Internet xa que o ficheiro .htaccess non estÃ¡ a traballar.",
@@ -123,6 +125,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..25603360741181054416632edf673dd9ecf323cb 100644
--- a/core/l10n/he.php
+++ b/core/l10n/he.php
@@ -44,11 +44,11 @@
 "months ago" => "×—×•×“×©×™×",
 "last year" => "×©× ×” ×©×¢×‘×¨×”",
 "years ago" => "×©× ×™×",
-"Choose" => "×‘×—×™×¨×”",
+"Ok" => "×‘×¡×“×¨",
 "Cancel" => "×‘×™×˜×•×œ",
-"No" => "×œ×",
+"Choose" => "×‘×—×™×¨×”",
 "Yes" => "×›×Ÿ",
-"Ok" => "×‘×¡×“×¨",
+"No" => "×œ×",
 "The object type is not specified." => "×¡×•×’ ×”×¤×¨×™×˜ ×œ× ×¦×•×™×Ÿ.",
 "Error" => "×©×’×™××”",
 "The app name is not specified." => "×©× ×”×™×™×©×•× ×œ× ×¦×•×™×Ÿ.",
@@ -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..e79e71d4b2de985f28db76e120ececea0acf8d67 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",
@@ -28,12 +28,12 @@
 "months ago" => "mjeseci",
 "last year" => "proÅ¡lu godinu",
 "years ago" => "godina",
-"Choose" => "Izaberi",
+"Ok" => "U redu",
 "Cancel" => "Odustani",
-"No" => "Ne",
+"Choose" => "Izaberi",
 "Yes" => "Da",
-"Ok" => "U redu",
-"Error" => "PogreÅ¡ka",
+"No" => "Ne",
+"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 e8fcdeeca11af6c29f9575b43f86d6d5dddac407..4c44404fbc67c28faf2ce0d0a6cb84f378fe04d4 100644
--- a/core/l10n/hu_HU.php
+++ b/core/l10n/hu_HU.php
@@ -44,11 +44,11 @@
 "months ago" => "tÃ¶bb hÃ³napja",
 "last year" => "tavaly",
 "years ago" => "tÃ¶bb Ã©ve",
+"Ok" => "Ok",
+"Cancel" => "MÃ©gsem",
 "Choose" => "VÃ¡lasszon",
-"Cancel" => "MÃ©gse",
-"No" => "Nem",
 "Yes" => "Igen",
-"Ok" => "Ok",
+"No" => "Nem",
 "The object type is not specified." => "Az objektum tÃpusa nincs megadva.",
 "Error" => "Hiba",
 "The app name is not specified." => "Az alkalmazÃ¡s neve nincs megadva.",
@@ -88,25 +88,27 @@
 "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Ã³",
 "Edit categories" => "KategÃ³riÃ¡k szerkesztÃ©se",
 "Add" => "HozzÃ¡adÃ¡s",
 "Security Warning" => "BiztonsÃ¡gi figyelmeztetÃ©s",
+"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Az Ã–n PHP verziÃ³ja sebezhetÅ‘ a NULL bÃ¡jtos tÃ¡madÃ¡ssal szemben (CVE-2006-7243)",
+"Please update your PHP installation to use ownCloud securely." => "KÃ©rjÃ¼k frissÃtse a telepÃtett PHP csomagjait, hogy biztonsÃ¡gos legyen az ownCloud szolgÃ¡ltatÃ¡sa.",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Nem Ã©rhetÅ‘ el megfelelÅ‘ vÃ©letlenszÃ¡m-generÃ¡tor, telepÃteni kellene a PHP OpenSSL kiegÃ©szÃtÃ©sÃ©t.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "MegfelelÅ‘ vÃ©letlenszÃ¡m-generÃ¡tor hiÃ¡nyÃ¡ban egy tÃ¡madÃ³ szÃ¡ndÃ©kÃº idegen kÃ©pes lehet megjÃ³solni a jelszÃ³visszaÃ¡llÃtÃ³ tokent, Ã©s Ã–n helyett belÃ©pni.",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Az adatkÃ¶nyvtÃ¡r Ã©s a benne levÅ‘ Ã¡llomÃ¡nyok valÃ³szÃnÅ±leg kÃ¶zvetlenÃ¼l is elÃ©rhetÅ‘k az internetrÅ‘l, mert a .htaccess Ã¡llomÃ¡ny nem Ã©rvÃ©nyesÃ¼l.",
@@ -123,6 +125,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 0be3ef20fb5b3ce2953ffce8b4227b59483641f4..984822af1e36f7dec79d9f042a24af22d4aacbae 100644
--- a/core/l10n/id.php
+++ b/core/l10n/id.php
@@ -1,19 +1,23 @@
 <?php $TRANSLATIONS = array(
+"User %s shared a file with you" => "%s berbagi berkas dengan Anda",
+"User %s shared a folder with you" => "%s berbagi folder dengan Anda",
+"User %s shared the file \"%s\" with you. It is available for download here: %s" => "%s berbagi berkas \"%s\" dengan Anda. Silakan unduh di sini: %s",
+"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "%s berbagi folder \"%s\" dengan Anda. Silakan unduh di sini: %s",
 "Category type not provided." => "Tipe kategori tidak diberikan.",
 "No category to add?" => "Tidak ada kategori yang akan ditambahkan?",
 "This category already exists: %s" => "Kategori ini sudah ada: %s",
-"Object type not provided." => "Tipe obyek tidak diberikan.",
-"%s ID not provided." => "%s ID tidak diberikan.",
-"Error adding %s to favorites." => "Kesalahan menambah %s ke favorit",
-"No categories selected for deletion." => "Tidak ada kategori terpilih untuk penghapusan.",
-"Error removing %s from favorites." => "Kesalahan menghapus %s dari favorit",
-"Sunday" => "minggu",
-"Monday" => "senin",
-"Tuesday" => "selasa",
-"Wednesday" => "rabu",
-"Thursday" => "kamis",
-"Friday" => "jumat",
-"Saturday" => "sabtu",
+"Object type not provided." => "Tipe objek tidak diberikan.",
+"%s ID not provided." => "ID %s tidak diberikan.",
+"Error adding %s to favorites." => "Galat ketika menambah %s ke favorit",
+"No categories selected for deletion." => "Tidak ada kategori terpilih untuk dihapus.",
+"Error removing %s from favorites." => "Galat ketika menghapus %s dari favorit",
+"Sunday" => "Minggu",
+"Monday" => "Senin",
+"Tuesday" => "Selasa",
+"Wednesday" => "Rabu",
+"Thursday" => "Kamis",
+"Friday" => "Jumat",
+"Saturday" => "Sabtu",
 "January" => "Januari",
 "February" => "Februari",
 "March" => "Maret",
@@ -24,11 +28,11 @@
 "August" => "Agustus",
 "September" => "September",
 "October" => "Oktober",
-"November" => "Nopember",
+"November" => "November",
 "December" => "Desember",
 "Settings" => "Setelan",
 "seconds ago" => "beberapa detik yang lalu",
-"1 minute ago" => "1 menit lalu",
+"1 minute ago" => "1 menit yang lalu",
 "{minutes} minutes ago" => "{minutes} menit yang lalu",
 "1 hour ago" => "1 jam yang lalu",
 "{hours} hours ago" => "{hours} jam yang lalu",
@@ -40,85 +44,94 @@
 "months ago" => "beberapa bulan lalu",
 "last year" => "tahun kemarin",
 "years ago" => "beberapa tahun lalu",
-"Choose" => "pilih",
-"Cancel" => "Batalkan",
-"No" => "Tidak",
-"Yes" => "Ya",
 "Ok" => "Oke",
-"Error" => "gagal",
-"Shared" => "Terbagi",
-"Share" => "Bagi",
-"Error while sharing" => "gagal ketika membagikan",
-"Error while unsharing" => "gagal ketika membatalkan pembagian",
-"Error while changing permissions" => "gagal ketika merubah perijinan",
-"Shared with you and the group {group} by {owner}" => "dibagikan dengan anda dan grup {group} oleh {owner}",
-"Shared with you by {owner}" => "dibagikan dengan anda oleh {owner}",
-"Share with" => "bagikan dengan",
-"Share with link" => "bagikan dengan tautan",
-"Password protect" => "lindungi dengan kata kunci",
-"Password" => "Password",
-"Email link to person" => "Email link ini ke orang",
+"Cancel" => "Batal",
+"Choose" => "Pilih",
+"Yes" => "Ya",
+"No" => "Tidak",
+"The object type is not specified." => "Tipe objek tidak ditentukan.",
+"Error" => "Galat",
+"The app name is not specified." => "Nama aplikasi tidak ditentukan.",
+"The required file {file} is not installed!" => "Berkas {file} yang dibutuhkan tidak terpasang!",
+"Shared" => "Dibagikan",
+"Share" => "Bagikan",
+"Error while sharing" => "Galat ketika membagikan",
+"Error while unsharing" => "Galat ketika membatalkan pembagian",
+"Error while changing permissions" => "Galat ketika mengubah izin",
+"Shared with you and the group {group} by {owner}" => "Dibagikan dengan Anda dan grup {group} oleh {owner}",
+"Shared with you by {owner}" => "Dibagikan dengan Anda oleh {owner}",
+"Share with" => "Bagikan dengan",
+"Share with link" => "Bagikan lewat tautan",
+"Password protect" => "Lindungi dengan sandi",
+"Password" => "Sandi",
+"Email link to person" => "Emailkan tautan ini ke orang",
 "Send" => "Kirim",
-"Set expiration date" => "set tanggal kadaluarsa",
-"Expiration date" => "tanggal kadaluarsa",
-"Share via email:" => "berbagi memlalui surel:",
-"No people found" => "tidak ada orang ditemukan",
-"Resharing is not allowed" => "berbagi ulang tidak diperbolehkan",
-"Shared in {item} with {user}" => "dibagikan dalam {item} dengan {user}",
-"Unshare" => "batalkan berbagi",
-"can edit" => "dapat merubah",
+"Set expiration date" => "Setel tanggal kedaluwarsa",
+"Expiration date" => "Tanggal kedaluwarsa",
+"Share via email:" => "Bagian lewat email:",
+"No people found" => "Tidak ada orang ditemukan",
+"Resharing is not allowed" => "Berbagi ulang tidak diizinkan",
+"Shared in {item} with {user}" => "Dibagikan dalam {item} dengan {user}",
+"Unshare" => "Batalkan berbagi",
+"can edit" => "dapat mengedit",
 "access control" => "kontrol akses",
-"create" => "buat baru",
-"update" => "baharui",
+"create" => "buat",
+"update" => "perbarui",
 "delete" => "hapus",
 "share" => "bagikan",
-"Password protected" => "dilindungi kata kunci",
-"Error unsetting expiration date" => "gagal melepas tanggal kadaluarsa",
-"Error setting expiration date" => "gagal memasang tanggal kadaluarsa",
-"Sending ..." => "Sedang mengirim ...",
+"Password protected" => "Dilindungi sandi",
+"Error unsetting expiration date" => "Galat ketika menghapus tanggal kedaluwarsa",
+"Error setting expiration date" => "Galat ketika menyetel tanggal kedaluwarsa",
+"Sending ..." => "Mengirim ...",
 "Email sent" => "Email terkirim",
-"The update was successful. Redirecting you to ownCloud now." => "Update sukses. Membawa anda ke ownCloud sekarang.",
-"ownCloud password reset" => "reset password ownCloud",
-"Use the following link to reset your password: {link}" => "Gunakan tautan berikut untuk mereset password anda: {link}",
-"You will receive a link to reset your password via Email." => "Anda akan mendapatkan link untuk mereset password anda lewat Email.",
-"Request failed!" => "Permintaan gagal!",
-"Username" => "Username",
-"Request reset" => "Meminta reset",
-"Your password was reset" => "Password anda telah direset",
-"To login page" => "Ke halaman login",
-"New password" => "Password baru",
-"Reset password" => "Reset password",
+"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Pembaruan gagal. Silakan laporkan masalah ini ke <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">komunitas ownCloud</a>.",
+"The update was successful. Redirecting you to ownCloud now." => "Pembaruan sukses. Anda akan diarahkan ulang ke ownCloud.",
+"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.",
+"Username" => "Nama pengguna",
+"Request reset" => "Ajukan penyetelan ulang",
+"Your password was reset" => "Sandi Anda telah disetel ulang",
+"To login page" => "Ke halaman masuk",
+"New password" => "Sandi baru",
+"Reset password" => "Setel ulang sandi",
 "Personal" => "Pribadi",
 "Users" => "Pengguna",
 "Apps" => "Aplikasi",
 "Admin" => "Admin",
 "Help" => "Bantuan",
-"Access forbidden" => "Akses Ditiadakan",
+"Access forbidden" => "Akses ditolak",
 "Cloud not found" => "Cloud tidak ditemukan",
 "Edit categories" => "Edit kategori",
-"Add" => "Tambahkan",
-"Security Warning" => "peringatan keamanan",
-"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "tanpa generator angka acak, penyerang mungkin dapat menebak token reset kata kunci dan mengambil alih akun anda.",
+"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.",
+"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Generator acak yang aman tidak tersedia, silakan aktifkan ekstensi OpenSSL pada PHP.",
+"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Tanpa generator acak, penyerang mungkin dapat menebak token penyetelan sandi dan mengambil alih akun Anda.",
+"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" => "Konfigurasi database",
+"Configure the database" => "Konfigurasikan basis data",
 "will be used" => "akan digunakan",
-"Database user" => "Pengguna database",
-"Database password" => "Password database",
-"Database name" => "Nama database",
-"Database tablespace" => "tablespace basis data",
-"Database host" => "Host database",
+"Database user" => "Pengguna basis data",
+"Database password" => "Sandi basis data",
+"Database name" => "Nama basis data",
+"Database tablespace" => "Tablespace basis data",
+"Database host" => "Host basis data",
 "Finish setup" => "Selesaikan instalasi",
-"web services under your control" => "web service dibawah kontrol anda",
+"web services under your control" => "layanan web dalam kontrol Anda",
 "Log out" => "Keluar",
-"Automatic logon rejected!" => "login otomatis ditolak!",
-"If you did not change your password recently, your account may be compromised!" => "apabila anda tidak merubah kata kunci belakangan ini, akun anda dapat di gunakan orang lain!",
-"Please change your password to secure your account again." => "mohon ubah kata kunci untuk mengamankan akun anda",
-"Lost your password?" => "Lupa password anda?",
-"remember" => "selalu login",
+"Automatic logon rejected!" => "Masuk otomatis ditolak!",
+"If you did not change your password recently, your account may be compromised!" => "Jika tidak pernah mengubah sandi Anda baru-baru ini, akun Anda mungkin dalam bahaya!",
+"Please change your password to secure your account again." => "Mohon ubah sandi Anda untuk mengamankan kembali akun Anda.",
+"Lost your password?" => "Lupa sandi?",
+"remember" => "selalu masuk",
 "Log in" => "Masuk",
-"Alternative Logins" => "Login dengan cara lain",
-"prev" => "sebelum",
-"next" => "selanjutnya"
+"Alternative Logins" => "Cara Alternatif untuk Masuk",
+"prev" => "sebelumnya",
+"next" => "selanjutnya",
+"Updating ownCloud to version %s, this may take a while." => "Memperbarui ownCloud ke versi %s, prosesnya akan berlangsung beberapa saat."
 );
diff --git a/core/l10n/is.php b/core/l10n/is.php
index 997a582d22867cb4f4285f0114ac20574802232b..d30d8bca11b518f61f19491c79c0e3525a050d77 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,12 +42,12 @@
 "{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",
-"Choose" => "Veldu",
+"years ago" => "einhverjum Ã¡rum",
+"Ok" => "Ã lagi",
 "Cancel" => "HÃ¦tta viÃ°",
-"No" => "Nei",
+"Choose" => "Veldu",
 "Yes" => "JÃ¡",
-"Ok" => "Ã lagi",
+"No" => "Nei",
 "The object type is not specified." => "Tegund ekki tilgreind",
 "Error" => "Villa",
 "The app name is not specified." => "Nafn forrits ekki tilgreint",
@@ -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 e8bd848bfeec1a402f7f58cd9acaea2700401969..15fba6ec7d324d8bec9f637b673641fd5d8dcb1a 100644
--- a/core/l10n/it.php
+++ b/core/l10n/it.php
@@ -44,11 +44,11 @@
 "months ago" => "mesi fa",
 "last year" => "anno scorso",
 "years ago" => "anni fa",
-"Choose" => "Scegli",
+"Ok" => "Ok",
 "Cancel" => "Annulla",
-"No" => "No",
+"Choose" => "Scegli",
 "Yes" => "SÃ¬",
-"Ok" => "Ok",
+"No" => "No",
 "The object type is not specified." => "Il tipo di oggetto non Ã¨ specificato.",
 "Error" => "Errore",
 "The app name is not specified." => "Il nome dell'applicazione non Ã¨ specificato.",
@@ -77,8 +77,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 +88,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,15 +104,17 @@
 "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)",
+"Please update your PHP installation to use ownCloud securely." => "Aggiorna la tua installazione di PHP per utilizzare ownCloud in modo sicuro.",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Non Ã¨ disponibile alcun generatore di numeri casuali sicuro. Abilita l'estensione OpenSSL di PHP",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Senza un generatore di numeri casuali sicuro, un malintenzionato potrebbe riuscire a individuare i token di ripristino delle password e impossessarsi del tuo account.",
 "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",
@@ -123,6 +125,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 2a69275e33419d77d27c7a5fc70a80a3a31bd141..783fe288ba3be9c69d5bbb28a9a157dc97b0ced4 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 æ™‚é–“å‰",
@@ -44,11 +44,11 @@
 "months ago" => "æœˆå‰",
 "last year" => "ä¸€å¹´å‰",
 "years ago" => "å¹´å‰",
-"Choose" => "é¸æŠž",
+"Ok" => "OK",
 "Cancel" => "ã‚ãƒ£ãƒ³ã‚»ãƒ«",
-"No" => "ã„ã„ãˆ",
+"Choose" => "é¸æŠž",
 "Yes" => "ã¯ã„",
-"Ok" => "OK",
+"No" => "ã„ã„ãˆ",
 "The object type is not specified." => "ã‚ªãƒ–ã‚¸ã‚§ã‚¯ã‚¿ã‚¤ãƒ—ãŒæŒ‡å®šã•ã‚Œã¦ã„ã¾ã›ã‚“ã€‚",
 "Error" => "ã‚¨ãƒ©ãƒ¼",
 "The app name is not specified." => "ã‚¢ãƒ—ãƒªåãŒã—ã¦ã„ã•ã‚Œã¦ã„ã¾ã›ã‚“ã€‚",
@@ -88,27 +88,29 @@
 "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" => "è¦‹ã¤ã‹ã‚Šã¾ã›ã‚“",
 "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." => "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>ã‚’ä½œæˆã—ã¦ãã ã•ã„",
@@ -122,7 +124,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 4cdada58d906443a4c2c19faf6607163794c5fdf..fd2e512654fa6dc85e0e7230970f0863d876aabc 100644
--- a/core/l10n/ka_GE.php
+++ b/core/l10n/ka_GE.php
@@ -1,6 +1,16 @@
 <?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" => "áƒ¡áƒáƒ›áƒ¨áƒáƒ‘áƒáƒ—áƒ˜",
@@ -24,33 +34,45 @@
 "seconds ago" => "áƒ¬áƒáƒ›áƒ˜áƒ¡ áƒ¬áƒ˜áƒœ",
 "1 minute ago" => "1 áƒ¬áƒ£áƒ—áƒ˜áƒ¡ áƒ¬áƒ˜áƒœ",
 "{minutes} minutes ago" => "{minutes} áƒ¬áƒ£áƒ—áƒ˜áƒ¡ áƒ¬áƒ˜áƒœ",
+"1 hour ago" => "1 áƒ¡áƒáƒáƒ—áƒ˜áƒ¡ áƒ¬áƒ˜áƒœ",
+"{hours} hours ago" => "{hours} áƒ¡áƒáƒáƒ—áƒ˜áƒ¡ áƒ¬áƒ˜áƒœ",
 "today" => "áƒ“áƒ¦áƒ”áƒ¡",
 "yesterday" => "áƒ’áƒ£áƒ¨áƒ˜áƒœ",
 "{days} days ago" => "{days} áƒ“áƒ¦áƒ˜áƒ¡ áƒ¬áƒ˜áƒœ",
 "last month" => "áƒ’áƒáƒ¡áƒ£áƒš áƒ—áƒ•áƒ”áƒ¨áƒ˜",
+"{months} months ago" => "{months} áƒ—áƒ•áƒ˜áƒ¡ áƒ¬áƒ˜áƒœ",
 "months ago" => "áƒ—áƒ•áƒ˜áƒ¡ áƒ¬áƒ˜áƒœ",
 "last year" => "áƒ‘áƒáƒšáƒ áƒ¬áƒ”áƒšáƒ¡",
 "years ago" => "áƒ¬áƒšáƒ˜áƒ¡ áƒ¬áƒ˜áƒœ",
-"Choose" => "áƒáƒ áƒ©áƒ”áƒ•áƒ",
+"Ok" => "áƒ“áƒ˜áƒáƒ®",
 "Cancel" => "áƒ£áƒáƒ áƒ§áƒáƒ¤áƒ",
-"No" => "áƒáƒ áƒ",
+"Choose" => "áƒáƒ áƒ©áƒ”áƒ•áƒ",
 "Yes" => "áƒ™áƒ˜",
-"Ok" => "áƒ“áƒ˜áƒáƒ®",
+"No" => "áƒáƒ áƒ",
+"The object type is not specified." => "áƒáƒ‘áƒ˜áƒ”áƒ¥áƒ¢áƒ˜áƒ¡ áƒ¢áƒ˜áƒžáƒ˜ áƒáƒ  áƒáƒ áƒ˜áƒ¡ áƒ›áƒ˜áƒ—áƒ˜áƒ—áƒ”áƒ‘áƒ£áƒšáƒ˜.",
 "Error" => "áƒ¨áƒ”áƒªáƒ“áƒáƒ›áƒ",
+"The app name is not specified." => "áƒáƒžáƒšáƒ˜áƒ™áƒáƒªáƒ˜áƒ˜áƒ¡ áƒ¡áƒáƒ®áƒ”áƒšáƒ˜ áƒáƒ  áƒáƒ áƒ˜áƒ¡ áƒ›áƒ˜áƒ—áƒ˜áƒ—áƒ”áƒ‘áƒ£áƒšáƒ˜.",
+"The required file {file} is not installed!" => "áƒ›áƒáƒ—áƒ®áƒáƒ•áƒœáƒ˜áƒšáƒ˜ áƒ¤áƒáƒ˜áƒšáƒ˜  {file} áƒáƒ  áƒáƒ áƒ˜áƒ¡ áƒ“áƒáƒ˜áƒœáƒ¡áƒ¢áƒáƒšáƒ˜áƒ áƒ”áƒ‘áƒ£áƒšáƒ˜.",
+"Shared" => "áƒ’áƒáƒ–áƒ˜áƒáƒ áƒ”áƒ‘áƒ£áƒšáƒ˜",
 "Share" => "áƒ’áƒáƒ–áƒ˜áƒáƒ áƒ”áƒ‘áƒ",
 "Error while sharing" => "áƒ¨áƒ”áƒªáƒ“áƒáƒ›áƒ áƒ’áƒáƒ–áƒ˜áƒáƒ áƒ”áƒ‘áƒ˜áƒ¡ áƒ“áƒ áƒáƒ¡",
 "Error while unsharing" => "áƒ¨áƒ”áƒªáƒ“áƒáƒ›áƒ áƒ’áƒáƒ–áƒ˜áƒáƒ áƒ”áƒ‘áƒ˜áƒ¡ áƒ’áƒáƒ£áƒ¥áƒ›áƒ”áƒ‘áƒ˜áƒ¡ áƒ“áƒ áƒáƒ¡",
 "Error while changing permissions" => "áƒ¨áƒ”áƒªáƒ“áƒáƒ›áƒ áƒ“áƒáƒ¨áƒ•áƒ”áƒ‘áƒ˜áƒ¡ áƒªáƒ•áƒšáƒ˜áƒšáƒ”áƒ‘áƒ˜áƒ¡ áƒ“áƒ áƒáƒ¡",
-"Share with" => "áƒ’áƒáƒ£áƒ–áƒ˜áƒáƒ áƒ”",
+"Shared with you and the group {group} by {owner}" => "áƒ’áƒáƒ–áƒ˜áƒáƒ áƒ“áƒ áƒ—áƒ¥áƒ•áƒ”áƒœáƒ—áƒ•áƒ˜áƒ¡ áƒ“áƒ áƒ¯áƒ’áƒ£áƒ¤áƒ˜áƒ¡áƒ—áƒ•áƒ˜áƒ¡ {group}, {owner}â€“áƒ˜áƒ¡ áƒ›áƒ˜áƒ”áƒ ",
+"Shared with you by {owner}" => "áƒ’áƒáƒ–áƒ˜áƒáƒ áƒ“áƒ áƒ—áƒ¥áƒ•áƒ”áƒœáƒ—áƒ•áƒ˜áƒ¡ {owner}â€“áƒ˜áƒ¡ áƒ›áƒ˜áƒ”áƒ ",
+"Share with" => "áƒ’áƒáƒáƒ–áƒ˜áƒáƒ áƒ” áƒ¨áƒ”áƒ›áƒ“áƒ”áƒ’áƒ˜áƒ—:",
 "Share with link" => "áƒ’áƒáƒ£áƒ–áƒ˜áƒáƒ áƒ” áƒšáƒ˜áƒœáƒ™áƒ˜áƒ—",
 "Password protect" => "áƒžáƒáƒ áƒáƒšáƒ˜áƒ— áƒ“áƒáƒªáƒ•áƒ",
 "Password" => "áƒžáƒáƒ áƒáƒšáƒ˜",
+"Email link to person" => "áƒšáƒ˜áƒœáƒ™áƒ˜áƒ¡ áƒžáƒ˜áƒ áƒáƒ•áƒœáƒ”áƒ‘áƒ˜áƒ¡ áƒ˜áƒ›áƒ”áƒ˜áƒšáƒ–áƒ” áƒ’áƒáƒ’áƒ–áƒáƒ•áƒœáƒ",
+"Send" => "áƒ’áƒáƒ’áƒ–áƒáƒ•áƒœáƒ",
 "Set expiration date" => "áƒ›áƒ˜áƒ£áƒ—áƒ˜áƒ—áƒ” áƒ•áƒáƒ“áƒ˜áƒ¡ áƒ’áƒáƒ¡áƒ•áƒšáƒ˜áƒ¡ áƒ“áƒ áƒ",
 "Expiration date" => "áƒ•áƒáƒ“áƒ˜áƒ¡ áƒ’áƒáƒ¡áƒ•áƒšáƒ˜áƒ¡ áƒ“áƒ áƒ",
 "Share via email:" => "áƒ’áƒáƒáƒ–áƒ˜áƒáƒ áƒ” áƒ›áƒ”áƒ˜áƒšáƒ–áƒ”",
 "No people found" => "áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒ”áƒšáƒ˜ áƒáƒ  áƒáƒ áƒ˜áƒ¡ áƒœáƒáƒžáƒáƒ•áƒœáƒ˜",
 "Resharing is not allowed" => "áƒ›áƒ”áƒáƒ áƒ”áƒ¯áƒ”áƒ  áƒ’áƒáƒ–áƒ˜áƒáƒ áƒ”áƒ‘áƒ áƒáƒ  áƒáƒ áƒ˜áƒ¡ áƒ“áƒáƒ¨áƒ•áƒ”áƒ‘áƒ£áƒšáƒ˜",
-"Unshare" => "áƒ’áƒáƒ–áƒ˜áƒáƒ áƒ”áƒ‘áƒ˜áƒ¡ áƒ›áƒáƒ®áƒ¡áƒœáƒ",
+"Shared in {item} with {user}" => "áƒ’áƒáƒ–áƒ˜áƒáƒ áƒ“áƒ {item}â€“áƒ¨áƒ˜  {user}â€“áƒ˜áƒ¡ áƒ›áƒ˜áƒ”áƒ ",
+"Unshare" => "áƒ’áƒáƒ£áƒ–áƒ˜áƒáƒ áƒ”áƒ‘áƒáƒ“áƒ˜",
 "can edit" => "áƒ¨áƒ”áƒ’áƒ˜áƒ«áƒšáƒ˜áƒ áƒ¨áƒ”áƒªáƒ•áƒšáƒ",
 "access control" => "áƒ“áƒáƒ¨áƒ•áƒ”áƒ‘áƒ˜áƒ¡ áƒ™áƒáƒœáƒ¢áƒ áƒáƒšáƒ˜",
 "create" => "áƒ¨áƒ”áƒ¥áƒ›áƒœáƒ",
@@ -60,29 +82,37 @@
 "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" => "ownCloud áƒžáƒáƒ áƒáƒšáƒ˜áƒ¡ áƒ¨áƒ”áƒªáƒ•áƒšáƒ",
 "Use the following link to reset your password: {link}" => "áƒ’áƒáƒ›áƒáƒ˜áƒ§áƒ”áƒœáƒ” áƒ¨áƒ”áƒ›áƒ“áƒ”áƒ’áƒ˜ áƒšáƒ˜áƒœáƒ™áƒ˜ áƒžáƒáƒ áƒáƒšáƒ˜áƒ¡ áƒ¨áƒ”áƒ¡áƒáƒªáƒ•áƒšáƒ”áƒšáƒáƒ“: {link}",
 "You will receive a link to reset your password via Email." => "áƒ—áƒ¥áƒ•áƒ”áƒœ áƒ›áƒáƒ’áƒ˜áƒ•áƒáƒ— áƒžáƒáƒ áƒáƒšáƒ˜áƒ¡ áƒ¨áƒ”áƒ¡áƒáƒªáƒ•áƒšáƒ”áƒšáƒ˜ áƒšáƒ˜áƒœáƒ™áƒ˜ áƒ›áƒ”áƒ˜áƒšáƒ–áƒ”",
-"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" => "áƒ¦áƒ áƒ£áƒ‘áƒ”áƒšáƒ˜ áƒáƒ  áƒáƒ áƒ¡áƒ”áƒ‘áƒáƒ‘áƒ¡",
 "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." => "áƒ˜áƒ›áƒ˜áƒ¡áƒáƒ—áƒ•áƒ˜áƒ¡ áƒ áƒáƒ› áƒ’áƒáƒ›áƒáƒ˜áƒ§áƒ”áƒœáƒáƒ— 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." => "áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ data áƒ“áƒ˜áƒ áƒ”áƒ¥áƒ¢áƒáƒ áƒ˜áƒ áƒ“áƒ áƒ¤áƒáƒ˜áƒšáƒ”áƒ‘áƒ˜ áƒ“áƒáƒ¨áƒ•áƒ”áƒ‘áƒáƒ“áƒ˜áƒ áƒ˜áƒœáƒ¢áƒ”áƒ áƒœáƒ”áƒ¢áƒ¨áƒ˜ áƒ áƒáƒ“áƒ’áƒáƒœ  .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" => "Advanced",
+"Advanced" => "áƒ“áƒáƒ›áƒáƒ¢áƒ”áƒ‘áƒ˜áƒ—áƒ˜ áƒ¤áƒ£áƒœáƒ¥áƒªáƒ˜áƒ”áƒ‘áƒ˜",
 "Data folder" => "áƒ›áƒáƒœáƒáƒªáƒ”áƒ›áƒ—áƒ áƒ¡áƒáƒ¥áƒáƒ¦áƒáƒšáƒ“áƒ”",
 "Configure the database" => "áƒ›áƒáƒœáƒáƒªáƒ”áƒ›áƒ—áƒ áƒ‘áƒáƒ–áƒ˜áƒ¡ áƒ™áƒáƒœáƒ¤áƒ˜áƒ’áƒ£áƒ áƒ˜áƒ áƒ”áƒ‘áƒ",
 "will be used" => "áƒ’áƒáƒ›áƒáƒ§áƒ”áƒœáƒ”áƒ‘áƒ£áƒšáƒ˜ áƒ˜áƒ¥áƒœáƒ”áƒ‘áƒ",
@@ -92,12 +122,16 @@
 "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!" => "áƒ—áƒ£ áƒ—áƒ¥áƒ•áƒ”áƒœ áƒáƒ  áƒ¨áƒ”áƒªáƒ•áƒšáƒ˜áƒ— áƒžáƒáƒ áƒáƒšáƒ¡, áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ áƒáƒœáƒ’áƒáƒ áƒ˜áƒ¨áƒ˜ áƒ¨áƒ”áƒ˜áƒ«áƒšáƒ”áƒ‘áƒ áƒ˜áƒ§áƒáƒ¡ áƒ“áƒáƒ¨áƒ•áƒ”áƒ‘áƒáƒ“áƒ˜ áƒ¡áƒ®áƒ•áƒ”áƒ‘áƒ˜áƒ¡áƒ—áƒ•áƒ˜áƒ¡",
+"Please change your password to secure your account again." => "áƒ’áƒ—áƒ®áƒáƒ•áƒ— áƒ¨áƒ”áƒªáƒ•áƒáƒšáƒáƒ— áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ áƒžáƒáƒ áƒáƒšáƒ˜, áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ áƒáƒœáƒ’áƒáƒ áƒ˜áƒ¨áƒ˜áƒ¡ áƒ“áƒáƒ¡áƒáƒªáƒáƒ•áƒáƒ“.",
 "Lost your password?" => "áƒ“áƒáƒ’áƒáƒ•áƒ˜áƒ¬áƒ§áƒ“áƒáƒ— áƒžáƒáƒ áƒáƒšáƒ˜?",
 "remember" => "áƒ“áƒáƒ›áƒáƒ®áƒ¡áƒáƒ•áƒ áƒ”áƒ‘áƒ",
 "Log in" => "áƒ¨áƒ”áƒ¡áƒ•áƒšáƒ",
+"Alternative Logins" => "áƒáƒšáƒ¢áƒ”áƒ áƒœáƒáƒ¢áƒ˜áƒ£áƒšáƒ˜ Loginâ€“áƒ˜",
 "prev" => "áƒ¬áƒ˜áƒœáƒ",
-"next" => "áƒ¨áƒ”áƒ›áƒ“áƒ”áƒ’áƒ˜"
+"next" => "áƒ¨áƒ”áƒ›áƒ“áƒ”áƒ’áƒ˜",
+"Updating ownCloud to version %s, this may take a while." => "ownCloudâ€“áƒ˜áƒ¡ áƒ’áƒáƒœáƒáƒ®áƒšáƒ”áƒ‘áƒ %sâ€“áƒ•áƒ”áƒ áƒ¡áƒ˜áƒáƒ›áƒ“áƒ”. áƒ”áƒ¡ áƒ›áƒáƒ˜áƒ—áƒ®áƒáƒ•áƒ¡ áƒ’áƒáƒ áƒ™áƒ•áƒ”áƒ£áƒš áƒ“áƒ áƒáƒ¡."
 );
diff --git a/core/l10n/ko.php b/core/l10n/ko.php
index 408afa372b7e5393fd96b806575a693cce679a96..08713edaee1b310d411a7b5d018177442d8b8180 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" => "ì›”ìš”ì¼",
@@ -43,11 +44,11 @@
 "months ago" => "ê°œì›” ì „",
 "last year" => "ìž‘ë…„",
 "years ago" => "ë…„ ì „",
-"Choose" => "ì„ íƒ",
+"Ok" => "ìŠ¹ë½",
 "Cancel" => "ì·¨ì†Œ",
-"No" => "ì•„ë‹ˆìš”",
+"Choose" => "ì„ íƒ",
 "Yes" => "ì˜ˆ",
-"Ok" => "ìŠ¹ë½",
+"No" => "ì•„ë‹ˆìš”",
 "The object type is not specified." => "ê°ì²´ ìœ í˜•ì´ ì§€ì •ë˜ì§€ ì•Šì•˜ìŠµë‹ˆë‹¤.",
 "Error" => "ì˜¤ë¥˜",
 "The app name is not specified." => "ì•± ì´ë¦„ì´ ì§€ì •ë˜ì§€ ì•Šì•˜ìŠµë‹ˆë‹¤.",
@@ -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..f2277445f9cbc524d9baf886472ea48a5df2ab41 100644
--- a/core/l10n/lb.php
+++ b/core/l10n/lb.php
@@ -28,11 +28,11 @@
 "months ago" => "MÃ©int hier",
 "last year" => "LÃ¤scht Joer",
 "years ago" => "Joren hier",
-"Choose" => "Auswielen",
+"Ok" => "OK",
 "Cancel" => "Ofbriechen",
-"No" => "Nee",
+"Choose" => "Auswielen",
 "Yes" => "Jo",
-"Ok" => "OK",
+"No" => "Nee",
 "Error" => "Fehler",
 "Share" => "Deelen",
 "Password" => "Passwuert",
@@ -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..85b76fe6948c4fbad7c6c63d71295fb030792625 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",
@@ -31,11 +33,11 @@
 "months ago" => "prieÅ¡ mÄ—nesÄ¯",
 "last year" => "praeitais metais",
 "years ago" => "prieÅ¡ metus",
-"Choose" => "Pasirinkite",
+"Ok" => "Gerai",
 "Cancel" => "AtÅ¡aukti",
-"No" => "Ne",
+"Choose" => "Pasirinkite",
 "Yes" => "Taip",
-"Ok" => "Gerai",
+"No" => "Ne",
 "Error" => "Klaida",
 "Share" => "Dalintis",
 "Error while sharing" => "Klaida, dalijimosi metu",
@@ -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 9e3f169b2f4e191c0013b6b5098a9fdab452abac..18af82e4e3637f0f8e54e7480fd11d0de1616367 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",
@@ -44,11 +44,11 @@
 "months ago" => "mÄ“neÅ¡us atpakaÄ¼",
 "last year" => "gÄjuÅ¡ajÄ gadÄ",
 "years ago" => "gadus atpakaÄ¼",
-"Choose" => "IzvÄ“lieties",
+"Ok" => "Labi",
 "Cancel" => "Atcelt",
-"No" => "NÄ“",
+"Choose" => "IzvÄ“lieties",
 "Yes" => "JÄ",
-"Ok" => "Labi",
+"No" => "NÄ“",
 "The object type is not specified." => "Nav norÄdÄ«ts objekta tips.",
 "Error" => "KÄ¼Å«da",
 "The app name is not specified." => "Nav norÄdÄ«ts lietotnes nosaukums.",
@@ -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",
@@ -122,7 +120,7 @@
 "Database tablespace" => "DatubÄzes tabulas telpa",
 "Database host" => "DatubÄzes serveris",
 "Finish setup" => "Pabeigt iestatÄ«Å¡anu",
-"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Ä",
 "Log out" => "IzrakstÄ«ties",
 "Automatic logon rejected!" => "AutomÄtiskÄ ierakstÄ«Å¡anÄs ir noraidÄ«ta!",
 "If you did not change your password recently, your account may be compromised!" => "Ja neesat pÄ“dÄ“jÄ laikÄ mainÄ«jis paroli, iespÄ“jams, ka jÅ«su konts ir kompromitÄ“ts.",
diff --git a/core/l10n/mk.php b/core/l10n/mk.php
index d9da76690044bf29efb97a5b91d13941ede40714..a6c06e4780acd54a8c34e69ec8836b3960065357 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} Ð¼Ð¸Ð½ÑƒÑ‚Ð¸",
@@ -43,11 +43,11 @@
 "months ago" => "Ð¿Ñ€ÐµÐ´ Ð¼ÐµÑÐµÑ†Ð¸",
 "last year" => "Ð¼Ð¸Ð½Ð°Ñ‚Ð°Ñ‚Ð° Ð³Ð¾Ð´Ð¸Ð½Ð°",
 "years ago" => "Ð¿Ñ€ÐµÐ´ Ð³Ð¾Ð´Ð¸Ð½Ð¸",
-"Choose" => "Ð˜Ð·Ð±ÐµÑ€Ð¸",
+"Ok" => "Ð’Ð¾ Ñ€ÐµÐ´",
 "Cancel" => "ÐžÑ‚ÐºÐ°Ð¶Ð¸",
-"No" => "ÐÐµ",
+"Choose" => "Ð˜Ð·Ð±ÐµÑ€Ð¸",
 "Yes" => "Ð”Ð°",
-"Ok" => "Ð’Ð¾ Ñ€ÐµÐ´",
+"No" => "ÐÐµ",
 "The object type is not specified." => "ÐÐµ Ðµ ÑÐ¿ÐµÑ†Ð¸Ñ„Ð¸Ñ†Ð¸Ñ€Ð°Ð½ Ñ‚Ð¸Ð¿Ð¾Ñ‚ Ð½Ð° Ð¾Ð±Ñ˜ÐµÐºÑ‚.",
 "Error" => "Ð“Ñ€ÐµÑˆÐºÐ°",
 "The app name is not specified." => "Ð˜Ð¼ÐµÑ‚Ð¾ Ð½Ð° Ð°Ð¿Ð»Ð¸ÐºÐ°Ñ†Ð¸Ñ˜Ð°Ñ‚Ð° Ð½Ðµ Ðµ ÑÐ¿ÐµÑ†Ð¸Ñ„Ð¸Ñ†Ð¸Ñ€Ð°Ð½Ð¾.",
@@ -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..70581ff7693174f22f5040f6ee31b87f91d4684c 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",
@@ -21,10 +21,10 @@
 "November" => "November",
 "December" => "Disember",
 "Settings" => "Tetapan",
+"Ok" => "Ok",
 "Cancel" => "Batal",
-"No" => "Tidak",
 "Yes" => "Ya",
-"Ok" => "Ok",
+"No" => "Tidak",
 "Error" => "Ralat",
 "Share" => "Kongsi",
 "Password" => "Kata laluan",
@@ -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..ef8be954ede180a0a0a2d2097fbbb6d326e87fc7 100644
--- a/core/l10n/my_MM.php
+++ b/core/l10n/my_MM.php
@@ -21,11 +21,11 @@
 "last month" => "á€•á€¼á€®á€¸á€á€²á€·á€žá€±á€¬á€œ",
 "last year" => "á€™á€”á€¾á€…á€ºá€€",
 "years ago" => "á€”á€¾á€…á€º á€¡á€›á€„á€ºá€€",
-"Choose" => "á€›á€½á€±á€¸á€á€»á€šá€º",
+"Ok" => "á€¡á€á€¯á€€á€±",
 "Cancel" => "á€•á€šá€ºá€–á€»á€€á€ºá€™á€Šá€º",
-"No" => "á€™á€Ÿá€¯á€á€ºá€˜á€°á€¸",
+"Choose" => "á€›á€½á€±á€¸á€á€»á€šá€º",
 "Yes" => "á€Ÿá€¯á€á€º",
-"Ok" => "á€¡á€á€¯á€€á€±",
+"No" => "á€™á€Ÿá€¯á€á€ºá€˜á€°á€¸",
 "Password" => "á€…á€€á€¬á€¸á€á€¾á€€á€º",
 "Set expiration date" => "á€žá€€á€ºá€á€™á€ºá€¸á€€á€¯á€”á€ºá€†á€¯á€¶á€¸á€™á€Šá€·á€ºá€›á€€á€ºá€žá€á€ºá€™á€¾á€á€ºá€™á€Šá€º",
 "Expiration date" => "á€žá€€á€ºá€á€™á€ºá€¸á€€á€¯á€”á€ºá€†á€¯á€¶á€¸á€™á€Šá€·á€ºá€›á€€á€º",
diff --git a/core/l10n/nb_NO.php b/core/l10n/nb_NO.php
index 340625449eeb1704929977ffc9a0161df37245ae..6efb31a7def74c3d1cd6c5e8c6965a1957fe7d2f 100644
--- a/core/l10n/nb_NO.php
+++ b/core/l10n/nb_NO.php
@@ -34,11 +34,11 @@
 "months ago" => "mÃ¥neder siden",
 "last year" => "forrige Ã¥r",
 "years ago" => "Ã¥r siden",
-"Choose" => "Velg",
+"Ok" => "Ok",
 "Cancel" => "Avbryt",
-"No" => "Nei",
+"Choose" => "Velg",
 "Yes" => "Ja",
-"Ok" => "Ok",
+"No" => "Nei",
 "Error" => "Feil",
 "Share" => "Del",
 "Error while sharing" => "Feil under deling",
@@ -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 6daa9227904591d52a2568b27a76910c0cf7bda7..7e823b2e61d7d4eb9edea56dccbb91bdb13cda25 100644
--- a/core/l10n/nl.php
+++ b/core/l10n/nl.php
@@ -44,11 +44,11 @@
 "months ago" => "maanden geleden",
 "last year" => "vorig jaar",
 "years ago" => "jaar geleden",
+"Ok" => "Ok",
+"Cancel" => "Annuleer",
 "Choose" => "Kies",
-"Cancel" => "Annuleren",
-"No" => "Nee",
 "Yes" => "Ja",
-"Ok" => "Ok",
+"No" => "Nee",
 "The object type is not specified." => "Het object type is niet gespecificeerd.",
 "Error" => "Fout",
 "The app name is not specified." => "De app naam is niet gespecificeerd.",
@@ -75,7 +75,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 +88,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,9 +104,11 @@
 "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)",
+"Please update your PHP installation to use ownCloud securely." => "Werk uw PHP installatie bij om ownCloud veilig te kunnen gebruiken.",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Er kon geen willekeurig nummer worden gegenereerd. Zet de PHP OpenSSL extentie aan.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Zonder random nummer generator is het mogelijk voor een aanvaller om de reset tokens van wachtwoorden te voorspellen. Dit kan leiden tot het inbreken op uw account.",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Uw gegevensdirectory en bestanden zijn vermoedelijk bereikbaar vanaf het internet omdat het .htaccess bestand niet werkt.",
@@ -123,6 +125,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..d11ff92fa88a75016a1c982f8ed661f7932ddba8 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",
+"Ok" => "Greitt",
+"Cancel" => "Avbryt",
+"Choose" => "Vel",
+"Yes" => "Ja",
+"No" => "Nei",
+"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..a384b0315bbc0d5aa2da653e9a0f7eca445ff18c 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",
@@ -29,11 +29,11 @@
 "months ago" => "meses  a",
 "last year" => "an passat",
 "years ago" => "ans a",
+"Ok" => "D'accÃ²rdi",
+"Cancel" => "Annula",
 "Choose" => "CausÃs",
-"Cancel" => "Anulla",
-"No" => "Non",
 "Yes" => "Ã’c",
-"Ok" => "D'accÃ²rdi",
+"No" => "Non",
 "Error" => "Error",
 "Share" => "Parteja",
 "Error while sharing" => "Error al partejar",
@@ -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 4914ec66918ca8fac55f1633e104ab6cceb6e4a3..5c8434984cf7f9323e9e5d1ee2f6aa132afc5111 100644
--- a/core/l10n/pl.php
+++ b/core/l10n/pl.php
@@ -44,11 +44,11 @@
 "months ago" => "miesiÄ™cy temu",
 "last year" => "w zeszÅ‚ym roku",
 "years ago" => "lat temu",
-"Choose" => "Wybierz",
+"Ok" => "OK",
 "Cancel" => "Anuluj",
-"No" => "Nie",
+"Choose" => "Wybierz",
 "Yes" => "Tak",
-"Ok" => "OK",
+"No" => "Nie",
 "The object type is not specified." => "Nie okreÅ›lono typu obiektu.",
 "Error" => "BÅ‚Ä…d",
 "The app name is not specified." => "Nie okreÅ›lono nazwy aplikacji.",
@@ -88,9 +88,8 @@
 "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}",
+"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",
@@ -107,6 +106,8 @@
 "Edit categories" => "Edytuj kategorie",
 "Add" => "Dodaj",
 "Security Warning" => "OstrzeÅ¼enie o zabezpieczeniach",
+"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "TwÃ³ja wersja PHP jest naraÅ¼ona na NULL Byte attack (CVE-2006-7243)",
+"Please update your PHP installation to use ownCloud securely." => "ProszÄ™ uaktualnij swojÄ… instalacje PHP, aby uÅ¼ywaÄ‡ ownCloud bezpiecznie.",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Bezpieczny generator liczb losowych jest niedostÄ™pny. WÅ‚Ä…cz rozszerzenie OpenSSL w PHP.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Bez bezpiecznego generatora liczb losowych, osoba atakujÄ…ca moÅ¼e przewidzieÄ‡ token resetujÄ…cy hasÅ‚o i przejÄ…Ä‡ kontrolÄ™ nad twoim kontem.",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "TwÃ³j katalog danych i pliki sÄ… prawdopodobnie dostÄ™pne z poziomu internetu, poniewaÅ¼ plik .htaccess nie dziaÅ‚a.",
@@ -122,7 +123,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 15a3c997b0fde86ccd7ab7b56dfc2718e8cdb516..b52a9bb508aabe034ea308addf099cf08849f508 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",
@@ -44,11 +44,11 @@
 "months ago" => "meses atrÃ¡s",
 "last year" => "Ãºltimo ano",
 "years ago" => "anos atrÃ¡s",
-"Choose" => "Escolha",
+"Ok" => "Ok",
 "Cancel" => "Cancelar",
-"No" => "NÃ£o",
+"Choose" => "Escolha",
 "Yes" => "Sim",
-"Ok" => "Ok",
+"No" => "NÃ£o",
 "The object type is not specified." => "O tipo de objeto nÃ£o foi especificado.",
 "Error" => "Erro",
 "The app name is not specified." => "O nome do app nÃ£o foi especificado.",
@@ -88,10 +88,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 +99,7 @@
 "Reset password" => "Redefinir senha",
 "Personal" => "Pessoal",
 "Users" => "UsuÃ¡rios",
-"Apps" => "Apps",
+"Apps" => "AplicaÃ§Ãµes",
 "Admin" => "Admin",
 "Help" => "Ajuda",
 "Access forbidden" => "Acesso proibido",
@@ -107,6 +107,8 @@
 "Edit categories" => "Editar categorias",
 "Add" => "Adicionar",
 "Security Warning" => "Aviso de SeguranÃ§a",
+"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Sua versÃ£o do PHP estÃ¡ vulnerÃ¡vel ao ataque NULL Byte (CVE-2006-7243)",
+"Please update your PHP installation to use ownCloud securely." => "Por favor atualize sua instalaÃ§Ã£o do PHP para utilizar o ownCloud de forma segura.",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Nenhum gerador de nÃºmero aleatÃ³rio de seguranÃ§a disponÃvel. Habilite a extensÃ£o OpenSSL do PHP.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Sem um gerador de nÃºmero aleatÃ³rio de seguranÃ§a, um invasor pode ser capaz de prever os sÃmbolos de redefiniÃ§Ã£o de senhas e assumir sua conta.",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Seu diretÃ³rio de dados e arquivos sÃ£o provavelmente acessÃveis pela internet, porque o .htaccess nÃ£o funciona.",
@@ -123,6 +125,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 28d6506bd3384dd7a82d77a007dc51022c96a3b1..1084fc618f775d9f9e954b3ab3f3a6f39a80c4d5 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",
@@ -44,11 +44,11 @@
 "months ago" => "meses atrÃ¡s",
 "last year" => "ano passado",
 "years ago" => "anos atrÃ¡s",
-"Choose" => "Escolha",
+"Ok" => "Ok",
 "Cancel" => "Cancelar",
-"No" => "NÃ£o",
+"Choose" => "Escolha",
 "Yes" => "Sim",
-"Ok" => "Ok",
+"No" => "NÃ£o",
 "The object type is not specified." => "O tipo de objecto nÃ£o foi especificado",
 "Error" => "Erro",
 "The app name is not specified." => "O nome da aplicaÃ§Ã£o nÃ£o foi especificado",
@@ -63,7 +63,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 +88,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",
@@ -107,6 +107,8 @@
 "Edit categories" => "Editar categorias",
 "Add" => "Adicionar",
 "Security Warning" => "Aviso de SeguranÃ§a",
+"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "A sua versÃ£o do PHP Ã© vulnerÃ¡vel ao ataque Byte Null (CVE-2006-7243)",
+"Please update your PHP installation to use ownCloud securely." => "Por favor atualize a sua versÃ£o PHP instalada para usar o ownCloud com seguranÃ§a.",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "NÃ£o existe nenhum gerador seguro de nÃºmeros aleatÃ³rios, por favor, active a extensÃ£o OpenSSL no PHP.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Sem nenhum gerador seguro de nÃºmeros aleatÃ³rios, uma pessoa mal intencionada pode prever a sua password, reiniciar as seguranÃ§as adicionais e tomar conta da sua conta. ",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "A pasta de dados do ownCloud e os respectivos ficheiros, estarÃ£o provavelmente acessÃveis a partir da internet, pois o ficheiros .htaccess nÃ£o funciona.",
@@ -123,6 +125,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..36ee8ab4b6c45947480e4aec7ae282b375179f18 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",
@@ -43,15 +44,16 @@
 "months ago" => "luni Ã®n urmÄƒ",
 "last year" => "ultimul an",
 "years ago" => "ani Ã®n urmÄƒ",
-"Choose" => "Alege",
+"Ok" => "Ok",
 "Cancel" => "Anulare",
-"No" => "Nu",
+"Choose" => "Alege",
 "Yes" => "Da",
-"Ok" => "Ok",
+"No" => "Nu",
 "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 2ca4eeb47775f6abe5bcd1bf3cb5d54ef18a1440..43dd398119d094df1020da1198a5de38e990f168 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} Ð¼Ð¸Ð½ÑƒÑ‚ Ð½Ð°Ð·Ð°Ð´",
@@ -44,11 +44,11 @@
 "months ago" => "Ð½ÐµÑÐºÐ¾Ð»ÑŒÐºÐ¾ Ð¼ÐµÑÑÑ†ÐµÐ² Ð½Ð°Ð·Ð°Ð´",
 "last year" => "Ð² Ð¿Ñ€Ð¾ÑˆÐ»Ð¾Ð¼ Ð³Ð¾Ð´Ñƒ",
 "years ago" => "Ð½ÐµÑÐºÐ¾Ð»ÑŒÐºÐ¾ Ð»ÐµÑ‚ Ð½Ð°Ð·Ð°Ð´",
+"Ok" => "ÐžÐº",
+"Cancel" => "ÐžÑ‚Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ",
 "Choose" => "Ð’Ñ‹Ð±Ñ€Ð°Ñ‚ÑŒ",
-"Cancel" => "ÐžÑ‚Ð¼ÐµÐ½Ð°",
-"No" => "ÐÐµÑ‚",
 "Yes" => "Ð”Ð°",
-"Ok" => "ÐžÐº",
+"No" => "ÐÐµÑ‚",
 "The object type is not specified." => "Ð¢Ð¸Ð¿ Ð¾Ð±ÑŠÐµÐºÑ‚Ð° Ð½Ðµ ÑƒÐºÐ°Ð·Ð°Ð½",
 "Error" => "ÐžÑˆÐ¸Ð±ÐºÐ°",
 "The app name is not specified." => "Ð˜Ð¼Ñ Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð½Ðµ ÑƒÐºÐ°Ð·Ð°Ð½Ð¾",
@@ -88,9 +88,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,13 +100,15 @@
 "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)",
+"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 +124,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..d43ee8cf5425bc62e672bf1785137b73e5bc516b 100644
--- a/core/l10n/ru_RU.php
+++ b/core/l10n/ru_RU.php
@@ -1,137 +1,4 @@
 <?php $TRANSLATIONS = array(
-"User %s shared a file with you" => "ÐŸÐ¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒ %s Ð¾Ñ‚ÐºÑ€Ñ‹Ð» Ð’Ð°Ð¼ Ð´Ð¾ÑÑ‚ÑƒÐ¿ Ðº Ñ„Ð°Ð¹Ð»Ñƒ",
-"User %s shared a folder with you" => "ÐŸÐ¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒ %s Ð¾Ñ‚ÐºÑ€Ñ‹Ð» Ð’Ð°Ð¼ Ð´Ð¾ÑÑ‚ÑƒÐ¿ Ðº Ð¿Ð°Ð¿ÐºÐµ",
-"User %s shared the file \"%s\" with you. It is available for download here: %s" => "ÐŸÐ¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒ %s Ð¾Ñ‚ÐºÑ€Ñ‹Ð» Ð’Ð°Ð¼ Ð´Ð¾ÑÑ‚ÑƒÐ¿ Ðº Ñ„Ð°Ð¹Ð»Ñƒ \"%s\". ÐžÐ½ Ð´Ð¾ÑÑ‚ÑƒÐ¿ÐµÐ½ Ð´Ð»Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸ Ð·Ð´ÐµÑÑŒ: %s",
-"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "ÐŸÐ¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒ %s Ð¾Ñ‚ÐºÑ€Ñ‹Ð» Ð’Ð°Ð¼ Ð´Ð¾ÑÑ‚ÑƒÐ¿ Ðº Ð¿Ð°Ð¿ÐºÐµ \"%s\". ÐžÐ½Ð° Ð´Ð¾ÑÑ‚ÑƒÐ¿ÐµÐ½Ð° Ð´Ð»Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸ Ð·Ð´ÐµÑÑŒ: %s",
-"Category type not provided." => "Ð¢Ð¸Ð¿ ÐºÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ð¸ Ð½Ðµ Ð¿Ñ€ÐµÐ´Ð¾ÑÑ‚Ð°Ð²Ð»ÐµÐ½.",
-"No category to add?" => "ÐÐµÑ‚ ÐºÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ð¸ Ð´Ð»Ñ Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ñ?",
-"This category already exists: %s" => "ÐÑ‚Ð° ÐºÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ ÑƒÐ¶Ðµ ÑÑƒÑ‰ÐµÑÑ‚Ð²ÑƒÐµÑ‚: %s",
-"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, ÑÑ‚Ð¾ Ð¼Ð¾Ð¶ÐµÑ‚ Ð·Ð°Ð½ÑÑ‚ÑŒ Ð½ÐµÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ðµ Ð²Ñ€ÐµÐ¼Ñ."
+"Error" => "ÐžÑˆÐ¸Ð±ÐºÐ°"
 );
diff --git a/core/l10n/si_LK.php b/core/l10n/si_LK.php
index eaafca2f3f6008478f4e63f7230b6bdec973c2f9..c1e8ba37ed9e5f412a7d4e0520f93c4faa9213fb 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" => "à¶…à¶¯",
@@ -28,17 +28,17 @@
 "months ago" => "à¶¸à·à·ƒ à¶šà·“à¶´à¶ºà¶šà¶§ à¶´à·™à¶»",
 "last year" => "à¶´à·™à¶» à¶…à·€à·”à¶»à·”à¶¯à·Šà¶¯à·š",
 "years ago" => "à¶…à·€à·”à¶»à·”à¶¯à·” à¶šà·“à¶´à¶ºà¶šà¶§ à¶´à·™à¶»",
-"Choose" => "à¶à·à¶»à¶±à·Šà¶±",
+"Ok" => "à·„à¶»à·’",
 "Cancel" => "à¶‘à¶´à·",
-"No" => "à¶±à·à·„à·",
+"Choose" => "à¶à·à¶»à¶±à·Šà¶±",
 "Yes" => "à¶”à·€à·Š",
-"Ok" => "à·„à¶»à·’",
+"No" => "à¶‘à¶´à·",
 "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 7e32dac57e41de2ed26c5b2f759f73a96f9a6cdb..6a2d0aa5eced5dfe8bb6bae81f79fe80d62abb64 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",
@@ -44,11 +44,11 @@
 "months ago" => "pred mesiacmi",
 "last year" => "minulÃ½ rok",
 "years ago" => "pred rokmi",
-"Choose" => "VÃ½ber",
+"Ok" => "Ok",
 "Cancel" => "ZruÅ¡iÅ¥",
-"No" => "Nie",
+"Choose" => "VÃ½ber",
 "Yes" => "Ãno",
-"Ok" => "Ok",
+"No" => "Nie",
 "The object type is not specified." => "NeÅ¡pecifikovanÃ½ typ objektu.",
 "Error" => "Chyba",
 "The app name is not specified." => "NeÅ¡pecifikovanÃ© meno aplikÃ¡cie.",
@@ -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,13 +100,15 @@
 "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)",
+"Please update your PHP installation to use ownCloud securely." => "Aktualizujte prosÃm VaÅ¡u inÅ¡tanciu PHP pre bezpeÄnÃ© pouÅ¾Ãvanie ownCloud.",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Nie je dostupnÃ½ Å¾iadny bezpeÄnÃ½ generÃ¡tor nÃ¡hodnÃ½ch ÄÃsel, prosÃm, povoÄ¾te rozÅ¡Ãrenie OpenSSL v PHP.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Bez bezpeÄnÃ©ho generÃ¡tora nÃ¡hodnÃ½ch ÄÃsel mÃ´Å¾e ÃºtoÄnÃk predpovedaÅ¥ token pre obnovu hesla a prevziaÅ¥ kontrolu nad vaÅ¡Ãm kontom.",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "VÃ¡Å¡ prieÄinok s dÃ¡tami a sÃºbormi je dostupnÃ½ z internetu, lebo sÃºbor .htaccess nefunguje.",
@@ -122,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 2b5b02191ec875ee5cf54046739aa1a5d11e97f6..2854807130665f3862f5ea3731ae023481123846 100644
--- a/core/l10n/sl.php
+++ b/core/l10n/sl.php
@@ -1,15 +1,16 @@
 <?php $TRANSLATIONS = array(
-"User %s shared a file with you" => "Uporanik %s je dal datoteko v souporabo z vami",
-"User %s shared a folder with you" => "Uporanik %s je dal mapo v souporabo z vami",
-"User %s shared the file \"%s\" with you. It is available for download here: %s" => "Uporanik %s je dal datoteko \"%s\" v souporabo z vami. Prenesete jo lahko tukaj: %s",
-"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Uporanik %s je dal mapo \"%s\" v souporabo z vami. Prenesete je lahko tukaj: %s",
+"User %s shared a file with you" => "Uporabnik %s je omogoÄil souporabo datoteke",
+"User %s shared a folder with you" => "Uporabnik %s je omogoÄil souporabo mape",
+"User %s shared the file \"%s\" with you. It is available for download here: %s" => "Uporabnik %s je omogoÄil souporabo datoteke \"%s\". Prejmete jo lahko preko povezave: %s",
+"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Uporabnik %s je omogoÄil souporabo mape \"%s\". Prejmete jo lahko preko povezave: %s",
 "Category type not provided." => "Vrsta kategorije ni podana.",
-"No category to add?" => "Ni kategorije za dodajanje?",
+"No category to add?" => "Ali ni kategorije za dodajanje?",
+"This category already exists: %s" => "Kategorija Å¾e obstaja: %s",
 "Object type not provided." => "Vrsta predmeta ni podana.",
-"%s ID not provided." => "%s ID ni podan.",
-"Error adding %s to favorites." => "Napaka pri dodajanju %s med priljubljene.",
+"%s ID not provided." => "ID %s ni podan.",
+"Error adding %s to favorites." => "Napaka dodajanja %s med priljubljene predmete.",
 "No categories selected for deletion." => "Za izbris ni izbrana nobena kategorija.",
-"Error removing %s from favorites." => "Napaka pri odstranjevanju %s iz priljubljenih.",
+"Error removing %s from favorites." => "Napaka odstranjevanja %s iz priljubljenih predmetov.",
 "Sunday" => "nedelja",
 "Monday" => "ponedeljek",
 "Tuesday" => "torek",
@@ -33,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",
@@ -43,15 +44,16 @@
 "months ago" => "mesecev nazaj",
 "last year" => "lansko leto",
 "years ago" => "let nazaj",
-"Choose" => "Izbor",
+"Ok" => "V redu",
 "Cancel" => "PrekliÄi",
-"No" => "Ne",
+"Choose" => "Izbor",
 "Yes" => "Da",
-"Ok" => "V redu",
+"No" => "Ne",
 "The object type is not specified." => "Vrsta predmeta ni podana.",
 "Error" => "Napaka",
-"The app name is not specified." => "Ime aplikacije ni podano.",
+"The app name is not specified." => "Ime programa ni podano.",
 "The required file {file} is not installed!" => "Zahtevana datoteka {file} ni nameÅ¡Äena!",
+"Shared" => "V souporabi",
 "Share" => "Souporaba",
 "Error while sharing" => "Napaka med souporabo",
 "Error while unsharing" => "Napaka med odstranjevanjem souporabe",
@@ -59,37 +61,39 @@
 "Shared with you and the group {group} by {owner}" => "V souporabi z vami in skupino {group}. Lastnik je {owner}.",
 "Shared with you by {owner}" => "V souporabi z vami. Lastnik je {owner}.",
 "Share with" => "OmogoÄi souporabo z",
-"Share with link" => "OmogoÄi souporabo s povezavo",
+"Share with link" => "OmogoÄi souporabo preko povezave",
 "Password protect" => "ZaÅ¡Äiti z geslom",
 "Password" => "Geslo",
-"Email link to person" => "Posreduj povezavo po e-poÅ¡ti",
+"Email link to person" => "Posreduj povezavo po elektronski poÅ¡ti",
 "Send" => "PoÅ¡lji",
 "Set expiration date" => "Nastavi datum preteka",
 "Expiration date" => "Datum preteka",
 "Share via email:" => "Souporaba preko elektronske poÅ¡te:",
 "No people found" => "Ni najdenih uporabnikov",
-"Resharing is not allowed" => "Ponovna souporaba ni omogoÄena",
+"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",
 "update" => "posodobi",
-"delete" => "izbriÅ¡e",
+"delete" => "izbriÅ¡i",
 "share" => "doloÄi souporabo",
 "Password protected" => "ZaÅ¡Äiteno z geslom",
 "Error unsetting expiration date" => "Napaka brisanja datuma preteka",
 "Error setting expiration date" => "Napaka med nastavljanjem datuma preteka",
-"Sending ..." => "PoÅ¡iljam ...",
-"Email sent" => "E-poÅ¡ta je bila poslana",
-"ownCloud password reset" => "Ponastavitev gesla ownCloud",
-"Use the following link to reset your password: {link}" => "Uporabite naslednjo povezavo za ponastavitev gesla: {link}",
+"Sending ..." => "PoÅ¡iljanje ...",
+"Email sent" => "Elektronska poÅ¡ta je poslana",
+"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Posodobitev ni uspela. PoÅ¡ljite poroÄilo o napaki na sistemu <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud</a>.",
+"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." => "E-poÅ¡ta za ponastavitev je bila poslana.",
-"Request failed!" => "Zahtevek je spodletel!",
-"Username" => "UporabniÅ¡ko Ime",
-"Request reset" => "Zahtevaj ponastavitev",
-"Your password was reset" => "Geslo je ponastavljeno",
+"Username" => "UporabniÅ¡ko ime",
+"Request reset" => "Zahtevaj ponovno nastavitev",
+"Your password was reset" => "Geslo je ponovno nastavljeno",
 "To login page" => "Na prijavno stran",
 "New password" => "Novo geslo",
 "Reset password" => "Ponastavi geslo",
@@ -103,27 +107,34 @@
 "Edit categories" => "Uredi kategorije",
 "Add" => "Dodaj",
 "Security Warning" => "Varnostno opozorilo",
-"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Na voljo ni varnega generatorja nakljuÄnih Å¡tevil. Prosimo, Äe omogoÄite PHP OpenSSL razÅ¡iritev.",
-"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Brez varnega generatorja nakljuÄnih Å¡tevil lahko napadalec napove Å¾etone za ponastavitev gesla, kar mu omogoÄa, da prevzame vaÅ¡ â€‹â€‹raÄun.",
+"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Uporabljena razliÄica PHP je ranljiva za napad NULL Byte (CVE-2006-7243)",
+"Please update your PHP installation to use ownCloud securely." => "PriporoÄeno je posodobiti namestitev PHP in varno uporabljati oblak ownCloud",
+"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Na voljo ni nobenega varnega ustvarjalnika nakljuÄnih Å¡tevil. OmogoÄiti je treba razÅ¡iritev PHP OpenSSL.",
+"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Brez varnega ustvarjalnika nakljuÄnih Å¡tevil je mogoÄe napovedati Å¾etone za ponastavitev gesla, s Äimer je mogoÄe prevzeti nadzor nad raÄunom.",
+"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Podatkovna mapa in datoteke so najverjetneje javno dostopni preko interneta, saj datoteka .htaccess ni ustrezno nastavljena.",
+"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>." => "Navodila, kako pravilno namestiti streÅ¾nik, so na straneh <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">dokumentacije</a>.",
 "Create an <strong>admin account</strong>" => "Ustvari <strong>skrbniÅ¡ki raÄun</strong>",
 "Advanced" => "Napredne moÅ¾nosti",
-"Data folder" => "Mapa s podatki",
+"Data folder" => "Podatkovna mapa",
 "Configure the database" => "Nastavi podatkovno zbirko",
 "will be used" => "bo uporabljen",
-"Database user" => "Uporabnik zbirke",
+"Database user" => "Uporabnik podatkovne zbirke",
 "Database password" => "Geslo podatkovne zbirke",
 "Database name" => "Ime podatkovne zbirke",
 "Database tablespace" => "Razpredelnica podatkovne zbirke",
 "Database host" => "Gostitelj podatkovne zbirke",
-"Finish setup" => "DokonÄaj namestitev",
+"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!" => "ÄŒe vaÅ¡ega gesla niste nedavno spremenili, je vaÅ¡ raÄun lahko ogroÅ¾en!",
+"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!",
 "Please change your password to secure your account again." => "Spremenite geslo za izboljÅ¡anje zaÅ¡Äite raÄuna.",
 "Lost your password?" => "Ali ste pozabili geslo?",
-"remember" => "Zapomni si me",
+"remember" => "zapomni si",
 "Log in" => "Prijava",
+"Alternative Logins" => "Druge prijavne moÅ¾nosti",
 "prev" => "nazaj",
-"next" => "naprej"
+"next" => "naprej",
+"Updating ownCloud to version %s, this may take a while." => "Posodabljanje sistema ownCloud na razliÄico %s je lahko dolgotrajno."
 );
diff --git a/core/l10n/sq.php b/core/l10n/sq.php
new file mode 100644
index 0000000000000000000000000000000000000000..8769a833e180cc07d066449d138f7769a07d26ca
--- /dev/null
+++ b/core/l10n/sq.php
@@ -0,0 +1,139 @@
+<?php $TRANSLATIONS = array(
+"User %s shared a file with you" => "PÃ«rdoruesi %s ndau me ju njÃ« skedar",
+"User %s shared a folder with you" => "PÃ«rdoruesi %s ndau me ju njÃ« dosje",
+"User %s shared the file \"%s\" with you. It is available for download here: %s" => "PÃ«rdoruesi %s ndau me ju skedarin \"%s\". Ky skedar Ã«shtÃ« gati pÃ«r shkarkim nga kÃ«tu: %s",
+"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "PÃ«rdoruesi %s ndau me ju dosjen \"%s\". Kjo dosje Ã«shtÃ« gati pÃ«r shkarkim nga kÃ«to: %s",
+"Category type not provided." => "Mungon tipi i kategorisÃ«.",
+"No category to add?" => "AsnjÃ« kategori pÃ«r tÃ« shtuar?",
+"This category already exists: %s" => "Kjo kategori tashmÃ« ekziston: %s",
+"Object type not provided." => "Mungon tipi i objektit.",
+"%s ID not provided." => "Mungon ID-ja e %s.",
+"Error adding %s to favorites." => "Veprim i gabuar gjatÃ« shtimit tÃ« %s tek tÃ« parapÃ«lqyerat.",
+"No categories selected for deletion." => "Nuk selektuar pÃ«r tu eliminuar asnjÃ« kategori.",
+"Error removing %s from favorites." => "Veprim i gabuar gjatÃ« heqjes sÃ« %s nga tÃ« parapÃ«lqyerat.",
+"Sunday" => "E djelÃ«",
+"Monday" => "E hÃ«nÃ«",
+"Tuesday" => "E martÃ«",
+"Wednesday" => "E mÃ«rkurÃ«",
+"Thursday" => "E enjte",
+"Friday" => "E premte",
+"Saturday" => "E shtunÃ«",
+"January" => "Janar",
+"February" => "Shkurt",
+"March" => "Mars",
+"April" => "Prill",
+"May" => "Maj",
+"June" => "Qershor",
+"July" => "Korrik",
+"August" => "Gusht",
+"September" => "Shtator",
+"October" => "Tetor",
+"November" => "NÃ«ntor",
+"December" => "Dhjetor",
+"Settings" => "Parametra",
+"seconds ago" => "sekonda mÃ« parÃ«",
+"1 minute ago" => "1 minutÃ« mÃ« parÃ«",
+"{minutes} minutes ago" => "{minutes} minuta mÃ« parÃ«",
+"1 hour ago" => "1 orÃ« mÃ« parÃ«",
+"{hours} hours ago" => "{hours} orÃ« mÃ« parÃ«",
+"today" => "sot",
+"yesterday" => "dje",
+"{days} days ago" => "{days} ditÃ« mÃ« parÃ«",
+"last month" => "muajin e shkuar",
+"{months} months ago" => "{months} muaj mÃ« parÃ«",
+"months ago" => "muaj mÃ« parÃ«",
+"last year" => "vitin e shkuar",
+"years ago" => "vite mÃ« parÃ«",
+"Ok" => "NÃ« rregull",
+"Cancel" => "Anulo",
+"Choose" => "Zgjidh",
+"Yes" => "Po",
+"No" => "Jo",
+"The object type is not specified." => "Nuk Ã«shtÃ« specifikuar tipi i objektit.",
+"Error" => "Veprim i gabuar",
+"The app name is not specified." => "Nuk Ã«shtÃ« specifikuar emri i app-it.",
+"The required file {file} is not installed!" => "Skedari i nevojshÃ«m {file} nuk Ã«shtÃ« i instaluar!",
+"Shared" => "NdarÃ«",
+"Share" => "Nda",
+"Error while sharing" => "Veprim i gabuar gjatÃ« ndarjes",
+"Error while unsharing" => "Veprim i gabuar gjatÃ« heqjes sÃ« ndarjes",
+"Error while changing permissions" => "Veprim i gabuar gjatÃ« ndryshimit tÃ« lejeve",
+"Shared with you and the group {group} by {owner}" => "NdarÃ« me ju dhe me grupin {group} nga {owner}",
+"Shared with you by {owner}" => "NdarÃ« me ju nga {owner}",
+"Share with" => "Nda me",
+"Share with link" => "Nda me lidhje",
+"Password protect" => "Mbro me kod",
+"Password" => "Kodi",
+"Email link to person" => "DÃ«rgo email me lidhjen",
+"Send" => "DÃ«rgo",
+"Set expiration date" => "Cakto datÃ«n e pÃ«rfundimit",
+"Expiration date" => "Data e pÃ«rfundimit",
+"Share via email:" => "Nda me email:",
+"No people found" => "Nuk u gjet asnjÃ« person",
+"Resharing is not allowed" => "Rindarja nuk lejohet",
+"Shared in {item} with {user}" => "NdarÃ« nÃ« {item} me {user}",
+"Unshare" => "Hiq ndarjen",
+"can edit" => "mund tÃ« ndryshosh",
+"access control" => "kontrollimi i hyrjeve",
+"create" => "krijo",
+"update" => "azhurno",
+"delete" => "elimino",
+"share" => "nda",
+"Password protected" => "Mbrojtur me kod",
+"Error unsetting expiration date" => "Veprim i gabuar gjatÃ« heqjes sÃ« datÃ«s sÃ« pÃ«rfundimit",
+"Error setting expiration date" => "Veprim i gabuar gjatÃ« caktimit tÃ« datÃ«s sÃ« pÃ«rfundimit",
+"Sending ..." => "Duke dÃ«rguar...",
+"Email sent" => "Email-i u dÃ«rgua",
+"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Azhurnimi dÃ«shtoi. Ju lutemi njoftoni pÃ«r kÃ«tÃ« problem <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">komunitetin ownCloud</a>.",
+"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.",
+"Username" => "PÃ«rdoruesi",
+"Request reset" => "BÃ«j kÃ«rkesÃ« pÃ«r rivendosjen",
+"Your password was reset" => "Kodi yt u rivendos",
+"To login page" => "Tek faqja e hyrjes",
+"New password" => "Kodi i ri",
+"Reset password" => "Rivendos kodin",
+"Personal" => "Personale",
+"Users" => "PÃ«rdoruesit",
+"Apps" => "App",
+"Admin" => "Admin",
+"Help" => "NdihmÃ«",
+"Access forbidden" => "Ndalohet hyrja",
+"Cloud not found" => "Cloud-i nuk u gjet",
+"Edit categories" => "Ndrysho kategoritÃ«",
+"Add" => "Shto",
+"Security Warning" => "ParalajmÃ«rim sigurie",
+"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Versioni juaj i PHP-sÃ« Ã«shtÃ« i cÃ«nueshÃ«m nga sulmi NULL Byte (CVE-2006-7243)",
+"Please update your PHP installation to use ownCloud securely." => "Ju lutem azhurnoni instalimin tuaj tÃ« PHP-sÃ« qÃ« tÃ« pÃ«rdorni ownCloud-in nÃ« mÃ«nyrÃ« tÃ« sigurt.",
+"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Nuk disponohet asnjÃ« krijues numrash tÃ« rastÃ«sishÃ«m, ju lutem aktivizoni shtesÃ«n PHP OpenSSL.",
+"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Pa njÃ« krijues numrash tÃ« rastÃ«sishÃ«m tÃ« sigurt njÃ« person i huaj mund tÃ« jetÃ« nÃ« gjendje tÃ« parashikojÃ« kodin dhe tÃ« marri llogarinÃ« tuaj.",
+"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Dosja dhe skedarÃ«t e tÃ« dhÃ«nave tuaja mbase janÃ« tÃ« arritshme nga interneti sepse skedari .htaccess nuk po punon.",
+"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>." => "PÃ«r mÃ« shumÃ« informacion mbi konfigurimin e duhur tÃ« serverit tuaj, ju lutem shikoni <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">dokumentacionin</a>.",
+"Create an <strong>admin account</strong>" => "Krijo njÃ« <strong>llogari administruesi</strong>",
+"Advanced" => "TÃ« pÃ«rparuara",
+"Data folder" => "Emri i dosjes",
+"Configure the database" => "Konfiguro database-in",
+"will be used" => "do tÃ« pÃ«rdoret",
+"Database user" => "PÃ«rdoruesi i database-it",
+"Database password" => "Kodi i database-it",
+"Database name" => "Emri i database-it",
+"Database tablespace" => "Tablespace-i i database-it",
+"Database host" => "Pozicioni (host) i database-it",
+"Finish setup" => "Mbaro setup-in",
+"web services under your control" => "shÃ«rbime web nÃ«n kontrollin tÃ«nd",
+"Log out" => "Dalje",
+"Automatic logon rejected!" => "Hyrja automatike u refuzua!",
+"If you did not change your password recently, your account may be compromised!" => "Nqse nuk keni ndryshuar kodin kohÃ«t e fundit, llogaria juaj mund tÃ« jetÃ« komprometuar.",
+"Please change your password to secure your account again." => "Ju lutemi, ndryshoni kodin pÃ«r ta siguruar pÃ«rsÃ«ri llogarinÃ« tuaj.",
+"Lost your password?" => "Ke humbur kodin?",
+"remember" => "kujto",
+"Log in" => "Hyrje",
+"Alternative Logins" => "Hyrje alternative",
+"prev" => "mbrapa",
+"next" => "para",
+"Updating ownCloud to version %s, this may take a while." => "Po azhurnoj ownCloud-in me versionin %s. Mund tÃ« zgjasi pak."
+);
diff --git a/core/l10n/sr.php b/core/l10n/sr.php
index 557cb6a8aba0ba8865f03a4f28a3c4d52962129f..2329dc49b1723ef601a853bc8c767ee6a6bd3e11 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} Ð¼Ð¸Ð½ÑƒÑ‚Ð°",
@@ -41,16 +41,16 @@
 "months ago" => "Ð¼ÐµÑÐµÑ†Ð¸ Ñ€Ð°Ð½Ð¸Ñ˜Ðµ",
 "last year" => "Ð¿Ñ€Ð¾ÑˆÐ»Ðµ Ð³Ð¾Ð´Ð¸Ð½Ðµ",
 "years ago" => "Ð³Ð¾Ð´Ð¸Ð½Ð° Ñ€Ð°Ð½Ð¸Ñ˜Ðµ",
-"Choose" => "ÐžÐ´Ð°Ð±ÐµÑ€Ð¸",
+"Ok" => "Ð£ Ñ€ÐµÐ´Ñƒ",
 "Cancel" => "ÐžÑ‚ÐºÐ°Ð¶Ð¸",
-"No" => "ÐÐµ",
+"Choose" => "ÐžÐ´Ð°Ð±ÐµÑ€Ð¸",
 "Yes" => "Ð”Ð°",
-"Ok" => "Ð£ Ñ€ÐµÐ´Ñƒ",
+"No" => "ÐÐµ",
 "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 590f2f3c846d741ab1a8da8e4d62728c545f6456..26bcebdf6c58f113eb9e25e74dc2e379c708bf26 100644
--- a/core/l10n/sv.php
+++ b/core/l10n/sv.php
@@ -44,11 +44,11 @@
 "months ago" => "mÃ¥nader sedan",
 "last year" => "fÃ¶rra Ã¥ret",
 "years ago" => "Ã¥r sedan",
-"Choose" => "VÃ¤lj",
+"Ok" => "Ok",
 "Cancel" => "Avbryt",
-"No" => "Nej",
+"Choose" => "VÃ¤lj",
 "Yes" => "Ja",
-"Ok" => "Ok",
+"No" => "Nej",
 "The object type is not specified." => "Objekttypen Ã¤r inte specificerad.",
 "Error" => "Fel",
 "The app name is not specified." => " Namnet pÃ¥ appen Ã¤r inte specificerad.",
@@ -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,15 +102,17 @@
 "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)",
+"Please update your PHP installation to use ownCloud securely." => "Uppdatera din PHP-installation fÃ¶r att anvÃ¤nda ownCloud sÃ¤kert.",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Ingen sÃ¤ker slumptalsgenerator finns tillgÃ¤nglig. Du bÃ¶r aktivera PHP OpenSSL-tillÃ¤gget.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Utan en sÃ¤ker slumptalsgenerator kan angripare fÃ¥ mÃ¶jlighet att fÃ¶rutsÃ¤ga lÃ¶senordsÃ¥terstÃ¤llningar och ta Ã¶ver ditt konto.",
 "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..b01f8df945ee22ee6357d8ddb4fb59feb02dec41 100644
--- a/core/l10n/ta_LK.php
+++ b/core/l10n/ta_LK.php
@@ -39,11 +39,11 @@
 "months ago" => "à®®à®¾à®¤à®™à¯à®•à®³à¯à®•à¯à®•à¯ à®®à¯à®©à¯",
 "last year" => "à®•à®Ÿà®¨à¯à®¤ à®µà®°à¯à®Ÿà®®à¯",
 "years ago" => "à®µà®°à¯à®Ÿà®™à¯à®•à®³à¯à®•à¯à®•à¯ à®®à¯à®©à¯",
-"Choose" => "à®¤à¯†à®°à®¿à®µà¯à®šà¯†à®¯à¯à®• ",
+"Ok" => "à®šà®°à®¿",
 "Cancel" => "à®‡à®°à®¤à¯à®¤à¯ à®šà¯†à®¯à¯à®•",
-"No" => "à®‡à®²à¯à®²à¯ˆ",
+"Choose" => "à®¤à¯†à®°à®¿à®µà¯à®šà¯†à®¯à¯à®• ",
 "Yes" => "à®†à®®à¯",
-"Ok" => "à®šà®°à®¿",
+"No" => "à®‡à®²à¯à®²à¯ˆ",
 "The object type is not specified." => "à®ªà¯Šà®°à¯à®³à¯ à®µà®•à¯ˆ à®•à¯à®±à®¿à®ªà¯à®ªà®¿à®Ÿà®ªà¯à®ªà®Ÿà®µà®¿à®²à¯à®²à¯ˆ.",
 "Error" => "à®µà®´à¯",
 "The app name is not specified." => "à®šà¯†à®¯à®²à®¿ à®ªà¯†à®¯à®°à¯ à®•à¯à®±à®¿à®ªà¯à®ªà®¿à®Ÿà®ªà¯à®ªà®Ÿà®µà®¿à®²à¯à®²à¯ˆ.",
@@ -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
new file mode 100644
index 0000000000000000000000000000000000000000..040ab9b550e81740deb2f06af26b5c4a7d94339e
--- /dev/null
+++ b/core/l10n/te.php
@@ -0,0 +1,52 @@
+<?php $TRANSLATIONS = array(
+"This category already exists: %s" => "à°ˆ à°µà°°à±à°—à°‚ à°‡à°ªà±à°ªà°Ÿà°¿à°•à±‡ à°‰à°‚à°¦à°¿: %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" => "{minutes} à°¨à°¿à°®à°¿à°·à°¾à°² à°•à±à°°à°¿à°¤à°‚",
+"1 hour ago" => "1 à°—à°‚à°Ÿ à°•à±à°°à°¿à°¤à°‚",
+"{hours} hours ago" => "{hours} à°—à°‚à°Ÿà°² à°•à±à°°à°¿à°¤à°‚",
+"today" => "à°ˆà°°à±‹à°œà±",
+"yesterday" => "à°¨à°¿à°¨à±à°¨",
+"{days} days ago" => "{days} à°°à±‹à°œà±à°² à°•à±à°°à°¿à°¤à°‚",
+"last month" => "à°ªà±‹à°¯à°¿à°¨ à°¨à±†à°²",
+"{months} months ago" => "{months} à°¨à±†à°²à°² à°•à±à°°à°¿à°¤à°‚",
+"months ago" => "à°¨à±†à°²à°² à°•à±à°°à°¿à°¤à°‚",
+"last year" => "à°ªà±‹à°¯à°¿à°¨ à°¸à°‚à°µà°¤à±à°¸à°°à°‚",
+"years ago" => "à°¸à°‚à°µà°¤à±à°¸à°°à°¾à°² à°•à±à°°à°¿à°¤à°‚",
+"Ok" => "à°¸à°°à±‡",
+"Cancel" => "à°°à°¦à±à°¦à±à°šà±‡à°¯à°¿",
+"Yes" => "à°…à°µà±à°¨à±",
+"No" => "à°•à°¾à°¦à±",
+"Error" => "à°ªà±Šà°°à°ªà°¾à°Ÿà±",
+"Password" => "à°¸à°‚à°•à±‡à°¤à°ªà°¦à°‚",
+"Send" => "à°ªà°‚à°ªà°¿à°‚à°šà±",
+"Expiration date" => "à°•à°¾à°²à°‚ à°šà±†à°²à±à°²à± à°¤à±‡à°¦à±€",
+"delete" => "à°¤à±Šà°²à°—à°¿à°‚à°šà±",
+"Username" => "à°µà°¾à°¡à±à°•à°°à°¿ à°ªà±‡à°°à±",
+"New password" => "à°•à±Šà°¤à±à°¤ à°¸à°‚à°•à±‡à°¤à°ªà°¦à°‚",
+"Users" => "à°µà°¾à°¡à±à°•à°°à±à°²à±",
+"Help" => "à°¸à°¹à°¾à°¯à°‚",
+"Add" => "à°šà±‡à°°à±à°šà±",
+"Log out" => "à°¨à°¿à°·à±à°•à±à°°à°®à°¿à°‚à°šà±",
+"Lost your password?" => "à°®à±€ à°¸à°‚à°•à±‡à°¤à°ªà°¦à°‚ à°ªà±‹à°¯à°¿à°‚à°¦à°¾?"
+);
diff --git a/core/l10n/th_TH.php b/core/l10n/th_TH.php
index 560c150066c2977bef212a13fa7d90cc007d5fd5..1114726434c367ad2f16c39c885a4d2ae13a8f0e 100644
--- a/core/l10n/th_TH.php
+++ b/core/l10n/th_TH.php
@@ -43,13 +43,13 @@
 "months ago" => "à¹€à¸”à¸·à¸à¸™ à¸—à¸µà¹ˆà¸œà¹ˆà¸²à¸™à¸¡à¸²",
 "last year" => "à¸›à¸µà¸—à¸µà¹ˆà¹à¸¥à¹‰à¸§",
 "years ago" => "à¸›à¸µ à¸—à¸µà¹ˆà¸œà¹ˆà¸²à¸™à¸¡à¸²",
-"Choose" => "à¹€à¸¥à¸·à¸à¸",
+"Ok" => "à¸•à¸à¸¥à¸‡",
 "Cancel" => "à¸¢à¸à¹€à¸¥à¸´à¸",
-"No" => "à¹„à¸¡à¹ˆà¸•à¸à¸¥à¸‡",
+"Choose" => "à¹€à¸¥à¸·à¸à¸",
 "Yes" => "à¸•à¸à¸¥à¸‡",
-"Ok" => "à¸•à¸à¸¥à¸‡",
+"No" => "à¹„à¸¡à¹ˆà¸•à¸à¸¥à¸‡",
 "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 9d9ff0e7ebabeacc9294c87a0cef5cbdeea58cc1..29a6e7a286fcbc08b884e7a187d08b41df242a56 100644
--- a/core/l10n/tr.php
+++ b/core/l10n/tr.php
@@ -44,11 +44,11 @@
 "months ago" => "ay Ã¶nce",
 "last year" => "geÃ§en yÄ±l",
 "years ago" => "yÄ±l Ã¶nce",
-"Choose" => "seÃ§",
+"Ok" => "Tamam",
 "Cancel" => "Ä°ptal",
-"No" => "HayÄ±r",
+"Choose" => "seÃ§",
 "Yes" => "Evet",
-"Ok" => "Tamam",
+"No" => "HayÄ±r",
 "The object type is not specified." => "Nesne tÃ¼rÃ¼ belirtilmemiÅŸ.",
 "Error" => "Hata",
 "The app name is not specified." => "uygulama adÄ± belirtilmedi.",
@@ -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,12 +101,14 @@
 "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",
 "Add" => "Ekle",
 "Security Warning" => "GÃ¼venlik Uyarisi",
+"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "PHP sÃ¼rÃ¼mÃ¼nÃ¼z NULL Byte saldÄ±rÄ±sÄ±na aÃ§Ä±k (CVE-2006-7243)",
+"Please update your PHP installation to use ownCloud securely." => "ownCloud'u gÃ¼venli olarak kullanmak iÃ§in, lÃ¼tfen PHP kurulumunuzu gÃ¼ncelleyin.",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "GÃ¼venli rasgele sayÄ± Ã¼reticisi bulunamadÄ±. LÃ¼tfen PHP OpenSSL eklentisini etkinleÅŸtirin.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "GÃ¼venli rasgele sayÄ± Ã¼reticisi olmadan saldÄ±rganlar parola sÄ±fÄ±rlama simgelerini tahmin edip hesabÄ±nÄ±zÄ± ele geÃ§irebilir.",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Veri klasÃ¶rÃ¼nÃ¼z ve dosyalarÄ±nÄ±z .htaccess dosyasÄ± Ã§alÄ±ÅŸmadÄ±ÄŸÄ± iÃ§in internet'ten eriÅŸime aÃ§Ä±k.",
@@ -122,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..4727e37debdcdf93a49590166207ac1243cb3fd5
--- /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" => "ØªÛˆÙ†ÛˆÚ¯ÛˆÙ†",
+"Ok" => "Ø¬Û•Ø²Ù…Ù„Û•",
+"Cancel" => "Û‹Ø§Ø² ÙƒÛ•Ú†",
+"Yes" => "Ú¾Û•Ø¦Û•",
+"No" => "ÙŠØ§Ù‚",
+"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..a9e4117a61934753cfef45c0d1d0c4012e5d470e 100644
--- a/core/l10n/uk.php
+++ b/core/l10n/uk.php
@@ -44,11 +44,11 @@
 "months ago" => "Ð¼Ñ–ÑÑÑ†Ñ– Ñ‚Ð¾Ð¼Ñƒ",
 "last year" => "Ð¼Ð¸Ð½ÑƒÐ»Ð¾Ð³Ð¾ Ñ€Ð¾ÐºÑƒ",
 "years ago" => "Ñ€Ð¾ÐºÐ¸ Ñ‚Ð¾Ð¼Ñƒ",
-"Choose" => "ÐžÐ±Ñ€Ð°Ñ‚Ð¸",
+"Ok" => "Ok",
 "Cancel" => "Ð’Ñ–Ð´Ð¼Ñ–Ð½Ð¸Ñ‚Ð¸",
-"No" => "ÐÑ–",
+"Choose" => "ÐžÐ±Ñ€Ð°Ñ‚Ð¸",
 "Yes" => "Ð¢Ð°Ðº",
-"Ok" => "Ok",
+"No" => "ÐÑ–",
 "The object type is not specified." => "ÐÐµ Ð²Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¾ Ñ‚Ð¸Ð¿ Ð¾Ð±'Ñ”ÐºÑ‚Ñƒ.",
 "Error" => "ÐŸÐ¾Ð¼Ð¸Ð»ÐºÐ°",
 "The app name is not specified." => "ÐÐµ Ð²Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¾ Ñ–Ð¼'Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¸.",
@@ -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..544d041e48f6b272970d1c3f1281a696bacf2797 100644
--- a/core/l10n/ur_PK.php
+++ b/core/l10n/ur_PK.php
@@ -14,11 +14,11 @@
 "November" => "Ù†ÙˆÙ…Ø¨Ø±",
 "December" => "Ø¯Ø³Ù…Ø¨Ø±",
 "Settings" => "Ø³ÛŒÙ¹ÛŒÙ†Ú¯Ø²",
-"Choose" => "Ù…Ù†ØªØ®Ø¨ Ú©Ø±ÛŒÚº",
+"Ok" => "Ø§ÙˆÚ©Û’",
 "Cancel" => "Ù…Ù†Ø³ÙˆØ® Ú©Ø±ÛŒÚº",
-"No" => "Ù†ÛÛŒÚº",
+"Choose" => "Ù…Ù†ØªØ®Ø¨ Ú©Ø±ÛŒÚº",
 "Yes" => "ÛØ§Úº",
-"Ok" => "Ø§ÙˆÚ©Û’",
+"No" => "Ù†ÛÛŒÚº",
 "Error" => "Ø§ÛŒØ±Ø±",
 "Error while sharing" => "Ø´Ø¦ÛŒØ±Ù†Ú¯ Ú©Û’ Ø¯ÙˆØ±Ø§Ù† Ø§ÛŒØ±Ø±",
 "Error while unsharing" => "Ø´Ø¦ÛŒØ±Ù†Ú¯ Ø®ØªÙ… Ú©Ø±Ù†Û’  Ú©Û’ Ø¯ÙˆØ±Ø§Ù† Ø§ÛŒØ±Ø±",
diff --git a/core/l10n/vi.php b/core/l10n/vi.php
index f03c58f34919aea91001b9860ef36bac668a5ddf..31c4a37545c03eec652ec40d01e9aa5e2d7b3213 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",
@@ -44,11 +44,11 @@
 "months ago" => "thÃ¡ng trÆ°á»›c",
 "last year" => "nÄƒm trÆ°á»›c",
 "years ago" => "nÄƒm trÆ°á»›c",
-"Choose" => "Chá»n",
+"Ok" => "Äá»“ng Ã½",
 "Cancel" => "Há»§y",
-"No" => "KhÃ´ng",
+"Choose" => "Chá»n",
 "Yes" => "CÃ³",
-"Ok" => "Äá»“ng Ã½",
+"No" => "KhÃ´ng",
 "The object type is not specified." => "Loáº¡i Ä‘á»‘i tÆ°á»£ng khÃ´ng Ä‘Æ°á»£c chá»‰ Ä‘á»‹nh.",
 "Error" => "Lá»—i",
 "The app name is not specified." => "TÃªn á»©ng dá»¥ng khÃ´ng Ä‘Æ°á»£c chá»‰ Ä‘á»‹nh.",
@@ -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 57f0e96378ca47168f1b8db39297468bf204c4f4..7e98d69b64207c53598318d96e72e3ca1cf9320c 100644
--- a/core/l10n/zh_CN.GB2312.php
+++ b/core/l10n/zh_CN.GB2312.php
@@ -1,6 +1,13 @@
 <?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?" => "æ²¡æœ‰åˆ†ç±»æ·»åŠ äº†?",
-"No categories selected for deletion." => "æ²¡æœ‰é€‰è€…è¦åˆ é™¤çš„åˆ†ç±».",
+"This category already exists: %s" => "æ¤åˆ†ç±»å·²å˜åœ¨ï¼š%s",
+"Object type not provided." => "æœªé€‰æ‹©å¯¹è±¡ç±»åž‹ã€‚",
+"No categories selected for deletion." => "æ²¡æœ‰é€‰ä¸è¦åˆ é™¤çš„åˆ†ç±»ã€‚",
 "Sunday" => "æ˜ŸæœŸå¤©",
 "Monday" => "æ˜ŸæœŸä¸€",
 "Tuesday" => "æ˜ŸæœŸäºŒ",
@@ -24,19 +31,26 @@
 "seconds ago" => "ç§’å‰",
 "1 minute ago" => "1 åˆ†é’Ÿå‰",
 "{minutes} minutes ago" => "{minutes} åˆ†é’Ÿå‰",
+"1 hour ago" => "1å°æ—¶å‰",
+"{hours} hours ago" => "{hours}å°æ—¶å‰",
 "today" => "ä»Šå¤©",
 "yesterday" => "æ˜¨å¤©",
 "{days} days ago" => "{days} å¤©å‰",
 "last month" => "ä¸Šä¸ªæœˆ",
+"{months} months ago" => "{months}æœˆå‰",
 "months ago" => "æœˆå‰",
 "last year" => "åŽ»å¹´",
 "years ago" => "å¹´å‰",
-"Choose" => "é€‰æ‹©",
+"Ok" => "å¥½çš„",
 "Cancel" => "å–æ¶ˆ",
-"No" => "å¦",
+"Choose" => "é€‰æ‹©",
 "Yes" => "æ˜¯",
-"Ok" => "å¥½çš„",
-"Error" => "é”™è¯¯",
+"No" => "å¦",
+"The object type is not specified." => "æœªæŒ‡å®šå¯¹è±¡ç±»åž‹ã€‚",
+"Error" => "å‡ºé”™",
+"The app name is not specified." => "æœªæŒ‡å®šåº”ç”¨åç§°ã€‚",
+"The required file {file} is not installed!" => "æœªå®‰è£…æ‰€éœ€è¦çš„æ–‡ä»¶ {file} ï¼",
+"Shared" => "å·²åˆ†äº«",
 "Share" => "åˆ†äº«",
 "Error while sharing" => "åˆ†äº«å‡ºé”™",
 "Error while unsharing" => "å–æ¶ˆåˆ†äº«å‡ºé”™",
@@ -47,6 +61,8 @@
 "Share with link" => "åˆ†äº«é“¾æŽ¥",
 "Password protect" => "å¯†ç ä¿æŠ¤",
 "Password" => "å¯†ç ",
+"Email link to person" => "é¢å‘ä¸ªäººçš„ç”µåé‚®ä»¶é“¾æŽ¥",
+"Send" => "å‘é€",
 "Set expiration date" => "è®¾ç½®å¤±æ•ˆæ—¥æœŸ",
 "Expiration date" => "å¤±æ•ˆæ—¥æœŸ",
 "Share via email:" => "é€šè¿‡ç”µåé‚®ä»¶åˆ†äº«ï¼š",
@@ -63,29 +79,34 @@
 "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ç¤¾åŒº</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." => "é‡ç½®é‚®ä»¶å·²å‘é€ã€‚",
-"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" => "äº‘ æ²¡æœ‰è¢«æ‰¾åˆ°",
 "Edit categories" => "ç¼–è¾‘åˆ†ç±»",
 "Add" => "æ·»åŠ ",
 "Security Warning" => "å®‰å…¨è¦å‘Š",
+"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æ–‡ä»¶æ— æ•ˆï¼Œæ‚¨çš„æ•°æ®æ–‡ä»¶å¤¹åŠæ–‡ä»¶å¯èƒ½å¯ä»¥åœ¨äº’è”ç½‘ä¸Šè®¿é—®ã€‚",
+"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" => "æ•°æ®å˜æ”¾æ–‡ä»¶å¤¹",
@@ -97,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!" => "å¦‚æžœæ‚¨æœ€è¿‘æ²¡æœ‰ä¿®æ”¹æ‚¨çš„å¯†ç ï¼Œé‚£æ‚¨çš„å¸å·å¯èƒ½è¢«æ”»å‡»äº†ï¼",
@@ -105,6 +126,8 @@
 "Lost your password?" => "å¿˜è®°å¯†ç ?",
 "remember" => "å¤‡å¿˜",
 "Log in" => "ç™»é™†",
+"Alternative Logins" => "å¤‡é€‰ç™»å½•",
 "prev" => "åŽé€€",
-"next" => "å‰è¿›"
+"next" => "å‰è¿›",
+"Updating ownCloud to version %s, this may take a while." => "ownCloudæ£åœ¨å‡çº§è‡³ %s ç‰ˆï¼Œè¿™å¯èƒ½éœ€è¦ä¸€ç‚¹æ—¶é—´ã€‚"
 );
diff --git a/core/l10n/zh_CN.php b/core/l10n/zh_CN.php
index 6a2c2e35a48cec5ee09f5694e8c6bd30ac3603dd..c37f7b2602b73419ab888211c77d1a0d9485ddb2 100644
--- a/core/l10n/zh_CN.php
+++ b/core/l10n/zh_CN.php
@@ -5,6 +5,7 @@
 "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æ—¶å‡ºé”™ã€‚",
@@ -43,23 +44,23 @@
 "months ago" => "æœˆå‰",
 "last year" => "åŽ»å¹´",
 "years ago" => "å¹´å‰",
-"Choose" => "é€‰æ‹©(&C)...",
+"Ok" => "å¥½",
 "Cancel" => "å–æ¶ˆ",
-"No" => "å¦",
+"Choose" => "é€‰æ‹©(&C)...",
 "Yes" => "æ˜¯",
-"Ok" => "å¥½",
+"No" => "å¦",
 "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" => "å¯†ç ",
@@ -83,11 +84,13 @@
 "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 ç¤¾åŒº</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}",
+"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" => "æ‚¨çš„å¯†ç å·²é‡ç½®",
@@ -97,15 +100,19 @@
 "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 å¹¶æœªæ£å¸¸å·¥ä½œã€‚",
+"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" => "æ•°æ®ç›®å½•",
@@ -117,7 +124,8 @@
 "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!" => "å¦‚æžœæ‚¨æ²¡æœ‰æœ€è¿‘ä¿®æ”¹æ‚¨çš„å¯†ç ï¼Œæ‚¨çš„å¸æˆ·å¯èƒ½ä¼šå—åˆ°å½±å“ï¼",
@@ -125,6 +133,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/zh_HK.php b/core/l10n/zh_HK.php
index f55da4d3ef9769274124787b5e14e3e9f9106afd..c4f4009517794fd1e9c305d064ba577508b12e05 100644
--- a/core/l10n/zh_HK.php
+++ b/core/l10n/zh_HK.php
@@ -1,3 +1,88 @@
 <?php $TRANSLATIONS = array(
-"You are logged out." => "ä½ å·²ç™»å‡ºã€‚"
+"Sunday" => "æ˜ŸæœŸæ—¥",
+"Monday" => "æ˜ŸæœŸä¸€",
+"Tuesday" => "æ˜ŸæœŸäºŒ",
+"Wednesday" => "æ˜ŸæœŸä¸‰",
+"Thursday" => "æ˜ŸæœŸå››",
+"Friday" => "æ˜ŸæœŸäº”",
+"Saturday" => "æ˜ŸæœŸå…",
+"January" => "ä¸€æœˆ",
+"February" => "äºŒæœˆ",
+"March" => "ä¸‰æœˆ",
+"April" => "å››æœˆ",
+"May" => "äº”æœˆ",
+"June" => "å…æœˆ",
+"July" => "ä¸ƒæœˆ",
+"August" => "å…«æœˆ",
+"September" => "ä¹æœˆ",
+"October" => "åæœˆ",
+"November" => "åä¸€æœˆ",
+"December" => "åäºŒæœˆ",
+"Settings" => "è¨å®š",
+"today" => "ä»Šæ—¥",
+"yesterday" => "æ˜¨æ—¥",
+"last month" => "å‰ä¸€æœˆ",
+"months ago" => "å€‹æœˆä¹‹å‰",
+"Ok" => "OK",
+"Cancel" => "å–æ¶ˆ",
+"Yes" => "Yes",
+"No" => "No",
+"Error" => "éŒ¯èª¤",
+"Shared" => "å·²åˆ†äº«",
+"Share" => "åˆ†äº«",
+"Error while sharing" => "åˆ†äº«æ™‚ç™¼ç”ŸéŒ¯èª¤",
+"Error while unsharing" => "å–æ¶ˆåˆ†äº«æ™‚ç™¼ç”ŸéŒ¯èª¤",
+"Error while changing permissions" => "æ›´æ”¹æ¬Šé™æ™‚ç™¼ç”ŸéŒ¯èª¤",
+"Shared with you and the group {group} by {owner}" => "{owner}èˆ‡ä½ åŠç¾¤çµ„çš„åˆ†äº«",
+"Shared with you by {owner}" => "{owner}èˆ‡ä½ çš„åˆ†äº«",
+"Share with" => "åˆ†äº«",
+"Share with link" => "ä»¥é€£çµåˆ†äº«",
+"Password protect" => "å¯†ç¢¼ä¿è·",
+"Password" => "å¯†ç¢¼",
+"Send" => "å‚³é€",
+"Set expiration date" => "è¨å®šåˆ†äº«æœŸé™",
+"Expiration date" => "åˆ†äº«æœŸé™",
+"Share via email:" => "ä»¥é›»éƒµåˆ†äº«",
+"No people found" => "æ‰¾ä¸åˆ°",
+"Unshare" => "å–æ¶ˆåˆ†äº«",
+"create" => "æ–°å¢ž",
+"update" => "æ›´æ–°",
+"delete" => "åˆªé™¤",
+"share" => "åˆ†äº«",
+"Password protected" => "å¯†ç¢¼ä¿è·",
+"Sending ..." => "å‚³é€ä¸",
+"Email sent" => "éƒµä»¶å·²å‚³",
+"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." => "ä½ å°‡æ”¶åˆ°ä¸€å°é›»éƒµ",
+"Username" => "ç”¨æˆ¶åç¨±",
+"Request reset" => "é‡è¨",
+"Your password was reset" => "ä½ çš„å¯†ç¢¼å·²è¢«é‡è¨",
+"To login page" => "å‰å¾€ç™»å…¥ç‰ˆé¢",
+"New password" => "æ–°å¯†ç¢¼",
+"Reset password" => "é‡è¨å¯†ç¢¼",
+"Personal" => "å€‹äºº",
+"Users" => "ç”¨æˆ¶",
+"Apps" => "è»Ÿä»¶",
+"Admin" => "ç®¡ç†",
+"Help" => "å¹«åŠ©",
+"Cloud not found" => "æœªæ‰¾åˆ°Cloud",
+"Add" => "åŠ å…¥",
+"Create an <strong>admin account</strong>" => "å»ºç«‹ç®¡ç†å“¡å¸³æˆ¶",
+"Advanced" => "é€²éšŽ",
+"Configure the database" => "è¨å®šè³‡æ–™åº«",
+"will be used" => "å°‡è¢«ä½¿ç”¨",
+"Database user" => "è³‡æ–™åº«å¸³æˆ¶",
+"Database password" => "è³‡æ–™åº«å¯†ç¢¼",
+"Database name" => "è³‡æ–™åº«åç¨±",
+"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" => "ç™»å…¥",
+"prev" => "å‰ä¸€æ¥",
+"next" => "ä¸‹ä¸€æ¥",
+"Updating ownCloud to version %s, this may take a while." => "ownCloud (ver. %s)æ›´æ–°ä¸, è«‹è€å¿ƒç‰ä¾¯"
 );
diff --git a/core/l10n/zh_TW.php b/core/l10n/zh_TW.php
index 765aeb34eaced645745b28eadd1b56f60809fd80..6537e6dff075d1460c9d11a49baab7793296b9e7 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" => "æ˜¨å¤©",
@@ -44,11 +44,11 @@
 "months ago" => "å¹¾å€‹æœˆå‰",
 "last year" => "åŽ»å¹´",
 "years ago" => "å¹¾å¹´å‰",
-"Choose" => "é¸æ“‡",
+"Ok" => "å¥½",
 "Cancel" => "å–æ¶ˆ",
-"No" => "No",
-"Yes" => "Yes",
-"Ok" => "Ok",
+"Choose" => "é¸æ“‡",
+"Yes" => "æ˜¯",
+"No" => "å¦",
 "The object type is not specified." => "æœªæŒ‡å®šç‰©ä»¶é¡žåž‹ã€‚",
 "Error" => "éŒ¯èª¤",
 "The app name is not specified." => "æ²’æœ‰æŒ‡å®š app åç¨±ã€‚",
@@ -68,7 +68,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,31 +82,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 ã€‚",
 "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 è¨å®šä¸¦æœªç”Ÿæ•ˆã€‚",
@@ -122,11 +124,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/setup.php b/core/setup.php
index 77eed5376d6ccc10961ad7693a885dc9ec843d9f..40e30db533aaca594be9586975a22eeadebd22b1 100644
--- a/core/setup.php
+++ b/core/setup.php
@@ -18,6 +18,10 @@ $hasPostgreSQL = is_callable('pg_connect');
 $hasOracle = is_callable('oci_connect');
 $hasMSSQL = is_callable('sqlsrv_connect');
 $datadir = OC_Config::getValue('datadirectory', OC::$SERVERROOT.'/data');
+$vulnerableToNullByte = false;
+if(@file_exists(__FILE__."\0Nullbyte")) { // Check if the used PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)
+	$vulnerableToNullByte = true;
+} 
 
 // Protect data directory here, so we can test if the protection is working
 OC_Setup::protectDataDirectory();
@@ -31,6 +35,7 @@ $opts = array(
 	'directory' => $datadir,
 	'secureRNG' => OC_Util::secureRNG_available(),
 	'htaccessWorking' => OC_Util::ishtaccessworking(),
+	'vulnerableToNullByte' => $vulnerableToNullByte,
 	'errors' => array(),
 );
 
diff --git a/core/templates/installation.php b/core/templates/installation.php
index 842686932c77f92947ea63b8c32a635027cc0539..de7ff8c168cfbafd4e1c1dbb1656671fd5ed6055 100644
--- a/core/templates/installation.php
+++ b/core/templates/installation.php
@@ -19,6 +19,13 @@
 		<?php endforeach; ?>
 	</ul>
 	<?php endif; ?>
+	<?php if($_['vulnerableToNullByte']): ?>
+	<fieldset class="warning">
+		<legend><strong><?php p($l->t('Security Warning'));?></strong></legend>
+		<p><?php p($l->t('Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)'));?><br/>
+		<?php p($l->t('Please update your PHP installation to use ownCloud securely.'));?></p>
+	</fieldset>
+	<?php endif; ?>
 	<?php if(!$_['secureRNG']): ?>
 	<fieldset class="warning">
 		<legend><strong><?php p($l->t('Security Warning'));?></strong></legend>
@@ -56,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>
@@ -131,9 +139,11 @@
 					value="<?php p(OC_Helper::init_var('dbuser')); ?>" autocomplete="off" />
 			</p>
 			<p class="infield groupmiddle">
-				<label for="dbpass" class="infield"><?php p($l->t( 'Database password' )); ?></label>
-				<input type="password" name="dbpass" id="dbpass" placeholder=""
+				<input type="password" name="dbpass" id="dbpass" placeholder="" data-typetoggle="#dbpassword" 
 					value="<?php p(OC_Helper::init_var('dbpass')); ?>" />
+				<label for="dbpass" class="infield"><?php p($l->t( 'Database password' )); ?></label>
+				<input type="checkbox" id="dbpassword" name="dbpassword" />
+				<label for="dbpassword"></label>
 			</p>
 			<p class="infield groupmiddle">
 				<label for="dbname" class="infield"><?php p($l->t( 'Database name' )); ?></label>
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 982efb412b6e1ca61e920eb6ac66b6252fe7abfa..6e49149b0ae43491542c34336590bb989f92c3a2 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.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-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" />
@@ -32,13 +32,16 @@
 	<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"
 				src="<?php print_unescaped(image_path('', 'logo-wide.svg')); ?>" alt="ownCloud" /></a>
 
 			<ul id="settings" class="svg">
-				<span id="expand">
+				<span id="expand" tabindex="0" role="link">
 					<span id="expandDisplayName"><?php  p(trim($_['user_displayname']) != '' ? $_['user_displayname'] : $_['user_uid']) ?></span>
 					<img class="svg" src="<?php print_unescaped(image_path('', 'actions/caret.svg')); ?>" />
 				</span>
@@ -75,7 +78,9 @@
 						<a href="<?php print_unescaped($entry['href']); ?>" title=""
 							<?php if( $entry['active'] ): ?> class="active"<?php endif; ?>>
 							<img class="icon svg" src="<?php print_unescaped($entry['icon']); ?>"/>
-							<?php p($entry['name']); ?>
+							<span>
+								<?php p($entry['name']); ?>
+							</span>
 						</a>
 					</li>
 				<?php endforeach; ?>
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/cron.php b/cron.php
index a202ca60bad7ac93bcad6c3f68a8f1c6de0523f3..7c875843c7545adc8e1463a111a74ad94c560929 100644
--- a/cron.php
+++ b/cron.php
@@ -21,7 +21,7 @@
 */
 
 // 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,12 +30,12 @@ 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( !TemporaryCronClass::$sent ) {
 		if( OC::$CLI ) {
 			echo 'Unexpected error!'.PHP_EOL;
 		}
@@ -48,6 +48,8 @@ function handleUnexpectedShutdown() {
 $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 );
@@ -62,7 +64,7 @@ OC_Helper::cleanTmpNoClean();
 // Exit if background jobs are disabled!
 $appmode = OC_BackgroundJob::getExecutionType();
 if( $appmode == 'none' ) {
-	my_temporary_cron_class::$sent = true;
+	TemporaryCronClass::$sent = true;
 	if( OC::$CLI ) {
 		echo 'Background Jobs are disabled!'.PHP_EOL;
 	}
@@ -74,7 +76,7 @@ if( $appmode == 'none' ) {
 
 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' ) {
@@ -83,15 +85,15 @@ if( OC::$CLI ) {
 	}
 
 	// 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 );
 	}
 
 	// Create a lock file
-	touch( my_temporary_cron_class::$lockfile );
+	touch( TemporaryCronClass::$lockfile );
 
 	// Work
 	OC_BackgroundJob_Worker::doAllSteps();
@@ -110,5 +112,5 @@ else{
 }
 
 // done!
-my_temporary_cron_class::$sent = true;
+TemporaryCronClass::$sent = true;
 exit();
diff --git a/db_structure.xml b/db_structure.xml
index 37db7d0596810c2c339b3312828299ce55360a6b..b96d48364193ccb960b0bc06fcbefafea2eb66fc 100644
--- a/db_structure.xml
+++ b/db_structure.xml
@@ -37,6 +37,8 @@
 
 			<index>
 				<name>appconfig_appid_key_index</name>
+				<primary>true</primary>
+				<unique>true</unique>
 				<field>
 					<name>appid</name>
 					<sorting>ascending</sorting>
@@ -134,6 +136,7 @@
 
 			<index>
 				<name>file_map_lp_index</name>
+				<primary>true</primary>
 				<unique>true</unique>
 				<field>
 					<name>logic_path_hash</name>
@@ -387,6 +390,7 @@
 			<index>
 				<name>id_user_index</name>
 				<unique>true</unique>
+				<primary>true</primary>
 				<field>
 					<name>fileid</name>
 					<sorting>ascending</sorting>
@@ -423,6 +427,20 @@
 				<length>64</length>
 			</field>
 
+			<index>
+				<name>gu_gid_uid_index</name>
+				<primary>true</primary>
+				<unique>true</unique>
+				<field>
+					<name>gid</name>
+					<sorting>ascending</sorting>
+				</field>
+				<field>
+					<name>uid</name>
+					<sorting>ascending</sorting>
+				</field>
+			</index>
+
 		</declaration>
 
 	</table>
@@ -456,6 +474,20 @@
 				</field>
 			</index>
 
+			<index>
+				<name>ga_gid_uid_index</name>
+				<primary>true</primary>
+				<unique>true</unique>
+				<field>
+					<name>gid</name>
+					<sorting>ascending</sorting>
+				</field>
+				<field>
+					<name>uid</name>
+					<sorting>ascending</sorting>
+				</field>
+			</index>
+
 		</declaration>
 
 	</table>
@@ -604,6 +636,8 @@
 
 			<index>
 				<name>pref_userid_appid_key_index</name>
+				<primary>true</primary>
+				<unique>true</unique>
 				<field>
 					<name>userid</name>
 					<sorting>ascending</sorting>
@@ -628,6 +662,15 @@
 
 		<declaration>
 
+			<field>
+				<name>id</name>
+				<autoincrement>1</autoincrement>
+				<type>integer</type>
+				<default>0</default>
+				<notnull>true</notnull>
+				<length>4</length>
+			</field>
+
 			<field>
 				<name>userid</name>
 				<type>text</type>
@@ -659,6 +702,14 @@
 				<length>255</length>
 			</field>
 
+			<index>
+				<name>property_index</name>
+				<field>
+					<name>userid</name>
+					<sorting>ascending</sorting>
+				</field>
+			</index>
+
 		</declaration>
 
 	</table>
@@ -867,7 +918,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 b0c9bf67feb8d26e4c58bc034d3f8c4c665e1af8..75c2b8c54c5eee80aea36e71a5da3955a521f7e1 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-02-09 00:12+0100\n"
-"PO-Revision-Date: 2013-02-08 23:12+0000\n"
+"POT-Creation-Date: 2013-04-30 01:57+0200\n"
+"PO-Revision-Date: 2013-04-29 23:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
 "MIME-Version: 1.0\n"
@@ -18,24 +17,24 @@ msgstr ""
 "Language: af_ZA\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:85
+#: ajax/share.php:97
 #, php-format
 msgid "User %s shared a file with you"
 msgstr ""
 
-#: ajax/share.php:87
+#: ajax/share.php:99
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr ""
 
-#: ajax/share.php:89
+#: 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:91
+#: ajax/share.php:104
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -81,156 +80,156 @@ msgstr ""
 msgid "Error removing %s from favorites."
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:34
 msgid "Sunday"
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:35
 msgid "Monday"
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Tuesday"
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:37
 msgid "Wednesday"
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:38
 msgid "Thursday"
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:39
 msgid "Friday"
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:40
 msgid "Saturday"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:45
 msgid "January"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:46
 msgid "February"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:47
 msgid "March"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:48
 msgid "April"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:49
 msgid "May"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:50
 msgid "June"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:51
 msgid "July"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:52
 msgid "August"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:53
 msgid "September"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:54
 msgid "October"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:55
 msgid "November"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:56
 msgid "December"
 msgstr ""
 
-#: js/js.js:284
+#: js/js.js:286
 msgid "Settings"
 msgstr "Instellings"
 
-#: js/js.js:764
+#: js/js.js:718
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:765
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:766
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:767
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:768
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:769
+#: js/js.js:723
 msgid "today"
 msgstr ""
 
-#: js/js.js:770
+#: js/js.js:724
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:771
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:772
+#: js/js.js:726
 msgid "last month"
 msgstr ""
 
-#: js/js.js:773
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:774
+#: js/js.js:728
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:775
+#: js/js.js:729
 msgid "last year"
 msgstr ""
 
-#: js/js.js:776
+#: js/js.js:730
 msgid "years ago"
 msgstr ""
 
-#: js/oc-dialogs.js:126
-msgid "Choose"
+#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
+msgid "Ok"
 msgstr ""
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
 msgid "Cancel"
 msgstr ""
 
-#: js/oc-dialogs.js:162
-msgid "No"
+#: js/oc-dialogs.js:185
+msgid "Choose"
 msgstr ""
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:215
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:180
-msgid "Ok"
+#: js/oc-dialogs.js:222
+msgid "No"
 msgstr ""
 
 #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
@@ -238,9 +237,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:152 js/share.js:159 js/share.js:571
-#: js/share.js:583
+#: 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 ""
 
@@ -252,127 +253,127 @@ msgstr ""
 msgid "The required file {file} is not installed!"
 msgstr ""
 
-#: js/share.js:29 js/share.js:43 js/share.js:90 js/share.js:93
-msgid "Share"
+#: js/share.js:30 js/share.js:45 js/share.js:87
+msgid "Shared"
 msgstr ""
 
-#: js/share.js:29 js/share.js:43 js/share.js:90 js/share.js:93
-msgid "Shared"
+#: js/share.js:90
+msgid "Share"
 msgstr ""
 
-#: js/share.js:141 js/share.js:611
+#: js/share.js:125 js/share.js:617
 msgid "Error while sharing"
 msgstr ""
 
-#: js/share.js:152
+#: js/share.js:136
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:159
+#: js/share.js:143
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:168
+#: js/share.js:152
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:170
+#: js/share.js:154
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:175
+#: js/share.js:159
 msgid "Share with"
 msgstr ""
 
-#: js/share.js:180
+#: js/share.js:164
 msgid "Share with link"
 msgstr ""
 
-#: js/share.js:183
+#: js/share.js:167
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:185 templates/installation.php:44 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Wagwoord"
 
-#: js/share.js:189
+#: js/share.js:173
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:190
+#: js/share.js:174
 msgid "Send"
 msgstr ""
 
-#: js/share.js:194
+#: js/share.js:178
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:195
+#: js/share.js:179
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:227
+#: js/share.js:211
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:229
+#: js/share.js:213
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:256
+#: js/share.js:251
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:292
+#: js/share.js:287
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:313
+#: js/share.js:308
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:325
+#: js/share.js:320
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:327
+#: js/share.js:322
 msgid "access control"
 msgstr ""
 
-#: js/share.js:330
+#: js/share.js:325
 msgid "create"
 msgstr ""
 
-#: js/share.js:333
+#: js/share.js:328
 msgid "update"
 msgstr ""
 
-#: js/share.js:336
+#: js/share.js:331
 msgid "delete"
 msgstr ""
 
-#: js/share.js:339
+#: js/share.js:334
 msgid "share"
 msgstr ""
 
-#: js/share.js:373 js/share.js:558
+#: js/share.js:368 js/share.js:564
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:571
+#: js/share.js:577
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:583
+#: js/share.js:589
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:598
+#: js/share.js:604
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:609
+#: js/share.js:615
 msgid "Email sent"
 msgstr ""
 
@@ -387,7 +388,7 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:47
+#: lostpassword/controller.php:48
 msgid "ownCloud password reset"
 msgstr ""
 
@@ -395,24 +396,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:39
-#: 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"
 
@@ -468,115 +472,130 @@ msgstr ""
 msgid "Add"
 msgstr ""
 
-#: templates/installation.php:23 templates/installation.php:30
+#: 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:25
+#: 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:31
+#: 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:32
+#: 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:36
+#: templates/installation.php:44
 msgid "Create an <strong>admin account</strong>"
 msgstr "Skep `n <strong>admin-rekening</strong>"
 
-#: templates/installation.php:52
+#: templates/installation.php:62
 msgid "Advanced"
 msgstr "Gevorderd"
 
-#: templates/installation.php:54
+#: templates/installation.php:64
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:61
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "Stel databasis op"
 
-#: templates/installation.php:66 templates/installation.php:77
-#: templates/installation.php:87 templates/installation.php:97
+#: 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:109
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "Databasis-gebruiker"
 
-#: templates/installation.php:113
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "Databasis-wagwoord"
 
-#: templates/installation.php:117
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "Databasis naam"
 
-#: templates/installation.php:125
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:131
+#: templates/installation.php:166
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:136
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "Maak opstelling klaar"
 
-#: templates/layout.guest.php:33
+#: templates/layout.guest.php:40
 msgid "web services under your control"
 msgstr "webdienste onder jou beheer"
 
-#: templates/layout.user.php:48
+#: 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 "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 e864f4fc420285ec07719bbc2affce4a890935dc..a1b17ff718f0f191975c193f3e034da95211c144 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-03-04 00:06+0100\n"
-"PO-Revision-Date: 2013-03-03 23:06+0000\n"
+"POT-Creation-Date: 2013-05-15 01:59+0200\n"
+"PO-Revision-Date: 2013-05-15 00:00+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
 "MIME-Version: 1.0\n"
@@ -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 ""
@@ -70,59 +66,70 @@ msgstr ""
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:10
+#: 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 ""
 
-#: js/fileactions.js:127 templates/index.php:92 templates/index.php:93
+#: 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/files.js:292 js/files.js:408
-#: js/files.js:439
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:251
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:323
+#: 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 ""
@@ -145,77 +152,77 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:225
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:262
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:262
-msgid "Upload Error"
-msgstr ""
-
-#: js/files.js:273
-msgid "Close"
+#: js/files.js:277
+msgid "Not enough space available"
 msgstr ""
 
-#: js/files.js:312
-msgid "1 file uploading"
-msgstr ""
-
-#: js/files.js:315 js/files.js:370 js/files.js:385
-msgid "{count} files uploading"
-msgstr ""
-
-#: js/files.js:388 js/files.js:423
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:497
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:570
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:575
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:953 templates/index.php:68
+#: 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:954 templates/index.php:79
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr ""
 
-#: js/files.js:955 templates/index.php:81
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:974
+#: js/files.js:898
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:976
+#: js/files.js:900
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:984
+#: js/files.js:908
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:986
+#: 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 ""
@@ -268,45 +275,45 @@ msgstr ""
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:42
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:48
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:53
+#: templates/index.php:54
 msgid "You donâ€™t have write permissions here."
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:74
+#: templates/index.php:75
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:86 templates/index.php:87
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr ""
 
-#: templates/index.php:106
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:108
+#: 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:113
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:116
+#: 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..36aa676dfba57b519cb0842051fea78701ccc227 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-04-26 10:00+0200\n"
+"PO-Revision-Date: 2013-04-26 08:01+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_external.po b/l10n/af_ZA/files_external.po
index d8d3d0197b653027605df01cc367b13c38844dc9..661213122b635b4468547419ee96ed100a15d9c5 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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..268f465228f8b0345380c7181277d8ac1f8cd5c6 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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 ab00b3efd96780ac1409f6633e0f35f2ff3409f5..b98068957e76a74a04b7f2c9b34cd44bcd2e12b0 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-03-08 00:25+0100\n"
-"PO-Revision-Date: 2013-03-07 23:25+0000\n"
+"POT-Creation-Date: 2013-04-26 10:00+0200\n"
+"PO-Revision-Date: 2013-04-26 08:01+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,12 +17,12 @@ msgstr ""
 "Language: af_ZA\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:40
+#: ajax/delete.php:42
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
 
-#: ajax/undelete.php:41
+#: ajax/undelete.php:42
 #, php-format
 msgid "Couldn't restore %s"
 msgstr ""
@@ -31,6 +31,10 @@ msgstr ""
 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 ""
diff --git a/l10n/af_ZA/files_versions.po b/l10n/af_ZA/files_versions.po
index cf1a612ba6ed129afd9e8319b3984db150301695..d21eec3f1e4441a3956054659adafd8daf973d2e 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-04-26 10:00+0200\n"
+"PO-Revision-Date: 2013-04-26 08: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"
@@ -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 5c1a70c23db1a60a631074dbf025af37e6522eda..cd9b771d4709b5b5122587a336ac01acb0d993c9 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-02-27 14:35+0100\n"
-"PO-Revision-Date: 2013-02-27 13:35+0000\n"
+"POT-Creation-Date: 2013-04-28 01:57+0200\n"
+"PO-Revision-Date: 2013-04-27 23:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
 "MIME-Version: 1.0\n"
@@ -41,19 +41,19 @@ msgstr "Toepassings"
 msgid "Admin"
 msgstr "Admin"
 
-#: files.php:202
+#: files.php:209
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:203
+#: files.php:210
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:204 files.php:231
+#: files.php:211 files.php:244
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:228
+#: files.php:241
 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,72 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:128 setup.php:320 setup.php:365
+#: setup.php:132 setup.php:325 setup.php:370
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:129 setup.php:152 setup.php:229
+#: setup.php:133 setup.php:156 setup.php:234
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:151 setup.php:453 setup.php:520
+#: setup.php:155 setup.php:458 setup.php:525
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:228
+#: setup.php:233
 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: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:583 setup.php:592 setup.php:600 setup.php:609
+#: setup.php:615
 #, 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:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
+#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
+#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:299
+#: setup.php:304
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:300
+#: setup.php:305
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:305
+#: setup.php:310
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:306
+#: setup.php:311
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:579 setup.php:611
+#: setup.php:584 setup.php:616
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:631
+#: setup.php:636
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:849
+#: setup.php:858
 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:859
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
@@ -239,19 +235,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 f1cfa82d304c0af4053d275fc378e255024ba401..641b7e82fc2b57477452d6c0d15d2e3bd8e28e1b 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-02-27 14:35+0100\n"
-"PO-Revision-Date: 2013-02-27 13:35+0000\n"
+"POT-Creation-Date: 2013-04-27 02:17+0200\n"
+"PO-Revision-Date: 2013-04-26 08: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"
@@ -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 ""
 
@@ -92,7 +96,7 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: js/apps.js:36 js/apps.js:64
+#: js/apps.js:36 js/apps.js:64 js/apps.js:83
 msgid "Enable"
 msgstr ""
 
@@ -100,68 +104,68 @@ msgstr ""
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:84
-msgid "Updating...."
+#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+msgid "Error"
 msgstr ""
 
-#: js/apps.js:87
-msgid "Error while updating app"
+#: js/apps.js:90
+msgid "Updating...."
 msgstr ""
 
-#: js/apps.js:87
-msgid "Error"
+#: js/apps.js:93
+msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:90
+#: js/apps.js:96
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr ""
 
-#: js/users.js:30
+#: js/users.js:43
 msgid "deleted"
 msgstr ""
 
-#: js/users.js:30
+#: js/users.js:43
 msgid "undo"
 msgstr ""
 
-#: js/users.js:62
+#: js/users.js:75
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:75 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: templates/users.php:103
 msgid "Groups"
 msgstr ""
 
-#: js/users.js:78 templates/users.php:82 templates/users.php:119
+#: js/users.js:91 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:111 templates/users.php:155
 msgid "Delete"
 msgstr ""
 
-#: js/users.js:191
+#: js/users.js:262
 msgid "add group"
 msgstr ""
 
-#: js/users.js:352
+#: js/users.js:414
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:353 js/users.js:359 js/users.js:374
+#: js/users.js:415 js/users.js:421 js/users.js:436
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:358
+#: js/users.js:420
 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,15 +316,19 @@ msgstr ""
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:230 templates/personal.php:102
+#: templates/admin.php:228
+msgid "Less"
+msgstr ""
+
+#: templates/admin.php:235 templates/personal.php:105
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:233 templates/personal.php:105
+#: templates/admin.php:238 templates/personal.php:108
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -391,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:77
 msgid "Password"
 msgstr "Wagwoord"
 
@@ -415,82 +423,70 @@ msgstr "Nuwe wagwoord"
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:76
 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:75
 msgid "Login Name"
 msgstr ""
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr ""
 
-#: templates/users.php:35
+#: templates/users.php:33
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:39 templates/users.php:133
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:57 templates/users.php:148
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:84
+#: templates/users.php:82
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:95
+#: templates/users.php:93
 msgid "change display name"
 msgstr ""
 
-#: templates/users.php:99
+#: templates/users.php:97
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:134
+#: templates/users.php:128
 msgid "Default"
 msgstr ""
diff --git a/l10n/af_ZA/user_ldap.po b/l10n/af_ZA/user_ldap.po
index 982e4b399ca20a313537b497e87601c044010a5c..9c44d57d8fcb6952b9efb30eccde691ed09fb0f6 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-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-17 00:04+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
 "MIME-Version: 1.0\n"
@@ -17,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..bb29159478ce7b7443eef28281d59c000a71ec69 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-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+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 a937cafae05ea9698aefc0e4943f2d798fc9aaa3..06a57952442a0b22d528e51829efe9f53130547a 100644
--- a/l10n/ar/core.po
+++ b/l10n/ar/core.po
@@ -3,14 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <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-02-22 00:06+0100\n"
-"PO-Revision-Date: 2013-02-20 23:20+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10: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"
@@ -19,33 +17,33 @@ 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/share.php:85
+#: ajax/share.php:97
 #, php-format
 msgid "User %s shared a file with you"
-msgstr ""
+msgstr "Ø§Ù„Ù…Ø³ØªØ®Ø¯Ù… %s Ù‚Ø§Ù… Ø¨Ù…Ø´Ø§Ø±ÙƒØ© Ù…Ù„Ù Ù…Ø¹Ùƒ"
 
-#: ajax/share.php:87
+#: ajax/share.php:99
 #, php-format
 msgid "User %s shared a folder with you"
-msgstr ""
+msgstr "Ø§Ù„Ù…Ø³ØªØ®Ø¯Ù…  %s Ù‚Ø§Ù… Ø¨Ù…Ø´Ø§Ø±ÙƒØ© Ù…Ø¬Ù„Ø¯ Ù…Ø¹Ùƒ"
 
-#: ajax/share.php:89
+#: ajax/share.php:101
 #, php-format
 msgid ""
 "User %s shared the file \"%s\" with you. It is available for download here: "
 "%s"
-msgstr ""
+msgstr "Ø§Ù„Ù…Ø³ØªØ®Ø¯Ù…  %s  Ù‚Ø§Ù… Ø¨Ù…Ø´Ø§Ø±ÙƒØ© Ø§Ù„Ù…Ù„Ù  \"%s\"  Ù…Ø¹Ùƒ . Ø§Ù„Ù…Ù„Ù Ù…ØªØ§Ø Ù„Ù„ØªØÙ…ÙŠÙ„ Ù…Ù† Ù‡Ù†Ø§ : %s"
 
-#: ajax/share.php:91
+#: ajax/share.php:104
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
 "here: %s"
-msgstr ""
+msgstr "Ø§Ù„Ù…Ø³ØªØ®Ø¯Ù…  %s  Ù‚Ø§Ù… Ø¨Ù…Ø´Ø§Ø±ÙƒØ© Ø§Ù„Ù…Ø¬Ù„Ø¯  \"%s\"  Ù…Ø¹Ùƒ . Ø§Ù„Ù…Ø¬Ù„Ø¯ Ù…ØªØ§Ø Ù„Ù„ØªØÙ…ÙŠÙ„ Ù…Ù† Ù‡Ù†Ø§ : %s"
 
 #: 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?"
@@ -54,24 +52,24 @@ 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
 #: 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 ""
+msgstr "Ø±Ù‚Ù…  %s Ù„Ù… ÙŠØ¯Ø®Ù„"
 
 #: ajax/vcategories/addToFavorites.php:35
 #, php-format
 msgid "Error adding %s to favorites."
-msgstr ""
+msgstr "Ø®Ø·Ø£ ÙÙŠ Ø§Ø¶Ø§ÙØ© %s Ø§Ù„Ù‰ Ø§Ù„Ù…ÙØ¶Ù„Ø©"
 
 #: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
 msgid "No categories selected for deletion."
@@ -80,313 +78,315 @@ msgstr "Ù„Ù… ÙŠØªÙ… Ø§Ø®ØªÙŠØ§Ø± ÙØ¦Ø© Ù„Ù„ØØ°Ù"
 #: ajax/vcategories/removeFromFavorites.php:35
 #, php-format
 msgid "Error removing %s from favorites."
-msgstr ""
+msgstr "Ø®Ø·Ø£ ÙÙŠ ØØ°Ù %s Ù…Ù† Ø§Ù„Ù…ÙØ¶Ù„Ø©"
 
-#: js/config.php:32
+#: js/config.php:34
 msgid "Sunday"
 msgstr "Ø§Ù„Ø§ØØ¯"
 
-#: js/config.php:32
+#: js/config.php:35
 msgid "Monday"
 msgstr "Ø§Ù„Ø£Ø«Ù†ÙŠÙ†"
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Tuesday"
 msgstr "Ø§Ù„Ø«Ù„Ø§Ø«Ø§Ø¡"
 
-#: js/config.php:32
+#: js/config.php:37
 msgid "Wednesday"
 msgstr "Ø§Ù„Ø§Ø±Ø¨Ø¹Ø§Ø¡"
 
-#: js/config.php:32
+#: js/config.php:38
 msgid "Thursday"
 msgstr "Ø§Ù„Ø®Ù…ÙŠØ³"
 
-#: js/config.php:32
+#: js/config.php:39
 msgid "Friday"
 msgstr "Ø§Ù„Ø¬Ù…Ø¹Ù‡"
 
-#: js/config.php:32
+#: js/config.php:40
 msgid "Saturday"
 msgstr "Ø§Ù„Ø³Ø¨Øª"
 
-#: js/config.php:33
+#: js/config.php:45
 msgid "January"
 msgstr "ÙƒØ§Ù†ÙˆÙ† Ø§Ù„Ø«Ø§Ù†ÙŠ"
 
-#: js/config.php:33
+#: js/config.php:46
 msgid "February"
 msgstr "Ø´Ø¨Ø§Ø·"
 
-#: js/config.php:33
+#: js/config.php:47
 msgid "March"
 msgstr "Ø¢Ø°Ø§Ø±"
 
-#: js/config.php:33
+#: js/config.php:48
 msgid "April"
 msgstr "Ù†ÙŠØ³Ø§Ù†"
 
-#: js/config.php:33
+#: js/config.php:49
 msgid "May"
 msgstr "Ø£ÙŠØ§Ø±"
 
-#: js/config.php:33
+#: js/config.php:50
 msgid "June"
 msgstr "ØØ²ÙŠØ±Ø§Ù†"
 
-#: js/config.php:33
+#: js/config.php:51
 msgid "July"
 msgstr "ØªÙ…ÙˆØ²"
 
-#: js/config.php:33
+#: js/config.php:52
 msgid "August"
 msgstr "Ø¢Ø¨"
 
-#: js/config.php:33
+#: js/config.php:53
 msgid "September"
 msgstr "Ø£ÙŠÙ„ÙˆÙ„"
 
-#: js/config.php:33
+#: js/config.php:54
 msgid "October"
 msgstr "ØªØ´Ø±ÙŠÙ† Ø§Ù„Ø§ÙˆÙ„"
 
-#: js/config.php:33
+#: js/config.php:55
 msgid "November"
 msgstr "ØªØ´Ø±ÙŠÙ† Ø§Ù„Ø«Ø§Ù†ÙŠ"
 
-#: js/config.php:33
+#: js/config.php:56
 msgid "December"
 msgstr "ÙƒØ§Ù†ÙˆÙ† Ø§Ù„Ø§ÙˆÙ„"
 
 #: js/js.js:286
 msgid "Settings"
-msgstr "ØªØ¹Ø¯ÙŠÙ„Ø§Øª"
+msgstr "Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª"
 
-#: js/js.js:767
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "Ù…Ù†Ø° Ø«ÙˆØ§Ù†ÙŠ"
 
-#: js/js.js:768
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "Ù…Ù†Ø° Ø¯Ù‚ÙŠÙ‚Ø©"
 
-#: js/js.js:769
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr "{minutes} Ù…Ù†Ø° Ø¯Ù‚Ø§Ø¦Ù‚"
 
-#: js/js.js:770
+#: js/js.js:721
 msgid "1 hour ago"
-msgstr ""
+msgstr "Ù‚Ø¨Ù„ Ø³Ø§Ø¹Ø© Ù…Ø¶Øª"
 
-#: js/js.js:771
+#: js/js.js:722
 msgid "{hours} hours ago"
-msgstr ""
+msgstr "{hours} Ø³Ø§Ø¹Ø© Ù…Ø¶Øª"
 
-#: js/js.js:772
+#: js/js.js:723
 msgid "today"
 msgstr "Ø§Ù„ÙŠÙˆÙ…"
 
-#: js/js.js:773
+#: js/js.js:724
 msgid "yesterday"
-msgstr ""
+msgstr "ÙŠÙˆÙ… Ø£Ù…Ø³"
 
-#: js/js.js:774
+#: js/js.js:725
 msgid "{days} days ago"
-msgstr ""
+msgstr "{days} ÙŠÙˆÙ… Ø³Ø§Ø¨Ù‚"
 
-#: js/js.js:775
+#: js/js.js:726
 msgid "last month"
-msgstr ""
+msgstr "Ø§Ù„Ø´Ù‡Ø± Ø§Ù„Ù…Ø§Ø¶ÙŠ"
 
-#: js/js.js:776
+#: js/js.js:727
 msgid "{months} months ago"
-msgstr ""
+msgstr "{months} Ø´Ù‡Ø± Ù…Ø¶Øª"
 
-#: js/js.js:777
+#: js/js.js:728
 msgid "months ago"
-msgstr ""
+msgstr "Ø´Ù‡Ø± Ù…Ø¶Ù‰"
 
-#: js/js.js:778
+#: js/js.js:729
 msgid "last year"
-msgstr ""
+msgstr "Ø§Ù„Ø³Ù†Ø©Ø§Ù„Ù…Ø§Ø¶ÙŠØ©"
 
-#: js/js.js:779
+#: js/js.js:730
 msgid "years ago"
-msgstr ""
+msgstr "Ø³Ù†Ø© Ù…Ø¶Øª"
 
-#: js/oc-dialogs.js:126
-msgid "Choose"
-msgstr "Ø§Ø®ØªÙŠØ§Ø±"
+#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
+msgid "Ok"
+msgstr "Ù…ÙˆØ§ÙÙ‚"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
 msgid "Cancel"
 msgstr "Ø§Ù„ØºØ§Ø¡"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "Ù„Ø§"
+#: js/oc-dialogs.js:185
+msgid "Choose"
+msgstr "Ø§Ø®ØªÙŠØ§Ø±"
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:215
 msgid "Yes"
 msgstr "Ù†Ø¹Ù…"
 
-#: js/oc-dialogs.js:180
-msgid "Ok"
-msgstr "Ù…ÙˆØ§ÙÙ‚"
+#: js/oc-dialogs.js:222
+msgid "No"
+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:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:582
-#: js/share.js:594
+#: 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 ""
+msgstr "Ø§Ø³Ù… Ø§Ù„ØªØ·Ø¨ÙŠÙ‚ ØºÙŠØ± Ù…ØØ¯Ø¯."
 
 #: js/oc-vcategories.js:194
 msgid "The required file {file} is not installed!"
-msgstr ""
+msgstr "Ø§Ù„Ù…Ù„Ù Ø§Ù„Ù…Ø·Ù„ÙˆØ¨ {file} ØºÙŠØ± Ù…Ù†ØµÙ‘Ø¨."
 
-#: js/share.js:29 js/share.js:43 js/share.js:90
+#: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
-msgstr ""
+msgstr "Ù…Ø´Ø§Ø±Ùƒ"
 
-#: js/share.js:93
+#: js/share.js:90
 msgid "Share"
 msgstr "Ø´Ø§Ø±Ùƒ"
 
-#: js/share.js:141 js/share.js:622
+#: js/share.js:125 js/share.js:617
 msgid "Error while sharing"
 msgstr "ØØµÙ„ Ø®Ø·Ø£ Ø¹Ù†Ø¯ Ø¹Ù…Ù„ÙŠØ© Ø§Ù„Ù…Ø´Ø§Ø±ÙƒØ©"
 
-#: js/share.js:152
+#: js/share.js:136
 msgid "Error while unsharing"
 msgstr "ØØµÙ„ Ø®Ø·Ø£ Ø¹Ù†Ø¯ Ø¹Ù…Ù„ÙŠØ© Ø¥Ø²Ø§Ù„Ø© Ø§Ù„Ù…Ø´Ø§Ø±ÙƒØ©"
 
-#: js/share.js:159
+#: js/share.js:143
 msgid "Error while changing permissions"
 msgstr "ØØµÙ„ Ø®Ø·Ø£ Ø¹Ù†Ø¯ Ø¹Ù…Ù„ÙŠØ© Ø¥Ø¹Ø§Ø¯Ø© ØªØ¹ÙŠÙŠÙ† Ø§Ù„ØªØµØ±ÙŠØ Ø¨Ø§Ù„ØªÙˆØµÙ„"
 
-#: js/share.js:168
+#: js/share.js:152
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Ø´ÙˆØ±Ùƒ Ù…Ø¹Ùƒ ÙˆÙ…Ø¹ Ø§Ù„Ù…Ø¬Ù…ÙˆØ¹Ø© {group} Ù…Ù† Ù‚Ø¨Ù„ {owner}"
 
-#: js/share.js:170
+#: js/share.js:154
 msgid "Shared with you by {owner}"
 msgstr "Ø´ÙˆØ±Ùƒ Ù…Ø¹Ùƒ Ù…Ù† Ù‚Ø¨Ù„ {owner}"
 
-#: js/share.js:175
+#: js/share.js:159
 msgid "Share with"
 msgstr "Ø´Ø§Ø±Ùƒ Ù…Ø¹"
 
-#: js/share.js:180
+#: js/share.js:164
 msgid "Share with link"
 msgstr "Ø´Ø§Ø±Ùƒ Ù…Ø¹ Ø±Ø§Ø¨Ø·"
 
-#: js/share.js:183
+#: js/share.js:167
 msgid "Password protect"
 msgstr "ØÙ…Ø§ÙŠØ© ÙƒÙ„Ù…Ø© Ø§Ù„Ø³Ø±"
 
-#: js/share.js:185 templates/installation.php:44 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
-msgstr "ÙƒÙ„Ù…Ø© Ø§Ù„Ø³Ø±"
+msgstr "ÙƒÙ„Ù…Ø© Ø§Ù„Ù…Ø±ÙˆØ±"
 
-#: js/share.js:189
+#: js/share.js:173
 msgid "Email link to person"
-msgstr ""
+msgstr "Ø§Ø±Ø³Ù„ Ø§Ù„Ø±Ø§Ø¨Ø· Ø¨Ø§Ù„Ø¨Ø±ÙŠØ¯ Ø§Ù„Ù‰ ØµØ¯ÙŠÙ‚"
 
-#: js/share.js:190
+#: js/share.js:174
 msgid "Send"
-msgstr ""
+msgstr "Ø£Ø±Ø³Ù„"
 
-#: js/share.js:194
+#: js/share.js:178
 msgid "Set expiration date"
 msgstr "ØªØ¹ÙŠÙŠÙ† ØªØ§Ø±ÙŠØ® Ø¥Ù†ØªÙ‡Ø§Ø¡ Ø§Ù„ØµÙ„Ø§ØÙŠØ©"
 
-#: js/share.js:195
+#: js/share.js:179
 msgid "Expiration date"
 msgstr "ØªØ§Ø±ÙŠØ® Ø¥Ù†ØªÙ‡Ø§Ø¡ Ø§Ù„ØµÙ„Ø§ØÙŠØ©"
 
-#: js/share.js:227
+#: js/share.js:211
 msgid "Share via email:"
 msgstr "Ù…Ø´Ø§Ø±ÙƒØ© Ø¹Ø¨Ø± Ø§Ù„Ø¨Ø±ÙŠØ¯ Ø§Ù„Ø¥Ù„ÙƒØªØ±ÙˆÙ†ÙŠ:"
 
-#: js/share.js:229
+#: js/share.js:213
 msgid "No people found"
 msgstr "Ù„Ù… ÙŠØªÙ… Ø§Ù„Ø¹Ø«ÙˆØ± Ø¹Ù„Ù‰ Ø£ÙŠ Ø´Ø®Øµ"
 
-#: js/share.js:256
+#: js/share.js:251
 msgid "Resharing is not allowed"
 msgstr "Ù„Ø§ ÙŠØ³Ù…Ø Ø¨Ø¹Ù…Ù„ÙŠØ© Ø¥Ø¹Ø§Ø¯Ø© Ø§Ù„Ù…Ø´Ø§Ø±ÙƒØ©"
 
-#: js/share.js:292
+#: js/share.js:287
 msgid "Shared in {item} with {user}"
 msgstr "Ø´ÙˆØ±Ùƒ ÙÙŠ {item} Ù…Ø¹ {user}"
 
-#: js/share.js:313
+#: js/share.js:308
 msgid "Unshare"
 msgstr "Ø¥Ù„ØºØ§Ø¡ Ù…Ø´Ø§Ø±ÙƒØ©"
 
-#: js/share.js:325
+#: js/share.js:320
 msgid "can edit"
 msgstr "Ø§Ù„ØªØØ±ÙŠØ± Ù…Ø³Ù…ÙˆØ"
 
-#: js/share.js:327
+#: js/share.js:322
 msgid "access control"
 msgstr "Ø¶Ø¨Ø· Ø§Ù„ÙˆØµÙˆÙ„"
 
-#: js/share.js:330
+#: js/share.js:325
 msgid "create"
 msgstr "Ø¥Ù†Ø´Ø§Ø¡"
 
-#: js/share.js:333
+#: js/share.js:328
 msgid "update"
 msgstr "ØªØØ¯ÙŠØ«"
 
-#: js/share.js:336
+#: js/share.js:331
 msgid "delete"
 msgstr "ØØ°Ù"
 
-#: js/share.js:339
+#: js/share.js:334
 msgid "share"
 msgstr "Ù…Ø´Ø§Ø±ÙƒØ©"
 
-#: js/share.js:373 js/share.js:569
+#: js/share.js:368 js/share.js:564
 msgid "Password protected"
 msgstr "Ù…ØÙ…ÙŠ Ø¨ÙƒÙ„Ù…Ø© Ø§Ù„Ø³Ø±"
 
-#: js/share.js:582
+#: js/share.js:577
 msgid "Error unsetting expiration date"
 msgstr "ØØµÙ„ Ø®Ø·Ø£ Ø¹Ù†Ø¯ Ø¹Ù…Ù„ÙŠØ© Ø¥Ø²Ø§Ù„Ø© ØªØ§Ø±ÙŠØ® Ø¥Ù†ØªÙ‡Ø§Ø¡ Ø§Ù„ØµÙ„Ø§ØÙŠØ©"
 
-#: js/share.js:594
+#: js/share.js:589
 msgid "Error setting expiration date"
 msgstr "ØØµÙ„ Ø®Ø·Ø£ Ø¹Ù†Ø¯ Ø¹Ù…Ù„ÙŠØ© ØªØ¹ÙŠÙŠÙ† ØªØ§Ø±ÙŠØ® Ø¥Ù†ØªÙ‡Ø§Ø¡ Ø§Ù„ØµÙ„Ø§ØÙŠØ©"
 
-#: js/share.js:609
+#: js/share.js:604
 msgid "Sending ..."
-msgstr ""
+msgstr "Ø¬Ø§Ø±ÙŠ Ø§Ù„Ø§Ø±Ø³Ø§Ù„ ..."
 
-#: js/share.js:620
+#: 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 ""
+msgstr "ØØµÙ„ Ø®Ø·Ø£ ÙÙŠ Ø¹Ù…Ù„ÙŠØ© Ø§Ù„ØªØØ¯ÙŠØ«, ÙŠØ±Ø¬Ù‰ Ø§Ø±Ø³Ø§Ù„ ØªÙ‚Ø±ÙŠØ± Ø¨Ù‡Ø°Ù‡ Ø§Ù„Ù…Ø´ÙƒÙ„Ø© Ø§Ù„Ù‰ <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 ""
+msgstr "ØªÙ… Ø§Ù„ØªØØ¯ÙŠØ« Ø¨Ù†Ø¬Ø§Ø , ÙŠØªÙ… Ø§Ø¹Ø§Ø¯Ø© ØªÙˆØ¬ÙŠÙ‡Ùƒ Ø§Ù„Ø§Ù† Ø§Ù„Ù‰ Owncloud"
 
 #: lostpassword/controller.php:48
 msgid "ownCloud password reset"
@@ -396,24 +396,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:39
-#: 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 "Ø·Ù„Ø¨ ØªØ¹Ø¯ÙŠÙ„"
 
@@ -427,7 +430,7 @@ msgstr "Ø§Ù„Ù‰ ØµÙØØ© Ø§Ù„Ø¯Ø®ÙˆÙ„"
 
 #: lostpassword/templates/resetpassword.php:8
 msgid "New password"
-msgstr "ÙƒÙ„Ù…Ø© Ø³Ø± Ø¬Ø¯ÙŠØ¯Ø©"
+msgstr "ÙƒÙ„Ù…Ø§Øª Ø³Ø± Ø¬Ø¯ÙŠØ¯Ø©"
 
 #: lostpassword/templates/resetpassword.php:11
 msgid "Reset password"
@@ -435,11 +438,11 @@ msgstr "ØªØ¹Ø¯ÙŠÙ„ ÙƒÙ„Ù…Ø© Ø§Ù„Ø³Ø±"
 
 #: strings.php:5
 msgid "Personal"
-msgstr "Ø®ØµÙˆØµÙŠØ§Øª"
+msgstr "Ø´Ø®ØµÙŠ"
 
 #: strings.php:6
 msgid "Users"
-msgstr "Ø§Ù„Ù…Ø³ØªØ®Ø¯Ù…"
+msgstr "Ø§Ù„Ù…Ø³ØªØ®Ø¯Ù…ÙŠÙ†"
 
 #: strings.php:7
 msgid "Apps"
@@ -447,7 +450,7 @@ msgstr "Ø§Ù„ØªØ·Ø¨ÙŠÙ‚Ø§Øª"
 
 #: strings.php:8
 msgid "Admin"
-msgstr "Ù…Ø³ØªØ®Ø¯Ù… Ø±Ø¦ÙŠØ³ÙŠ"
+msgstr "Ø§Ù„Ù…Ø¯ÙŠØ±"
 
 #: strings.php:9
 msgid "Help"
@@ -467,119 +470,134 @@ msgstr "Ø¹Ø¯Ù„ Ø§Ù„ÙØ¦Ø§Øª"
 
 #: templates/edit_categories_dialog.php:16
 msgid "Add"
-msgstr "Ø£Ø¯Ø®Ù„"
+msgstr "Ø§Ø¶Ù"
 
-#: templates/installation.php:23 templates/installation.php:30
+#: 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 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
+
+#: templates/installation.php:26
+msgid "Please update your PHP installation to use ownCloud securely."
+msgstr "Please update your PHP installation to use ownCloud securely."
+
+#: templates/installation.php:32
 msgid ""
 "No secure random number generator is available, please enable the PHP "
 "OpenSSL extension."
 msgstr "Ù„Ø§ ÙŠÙˆØ¬Ø¯ Ù…ÙˆÙ„Ù‘Ø¯ Ø£Ø±Ù‚Ø§Ù… Ø¹Ø´ÙˆØ§Ø¦ÙŠØ© ØŒ Ø§Ù„Ø±Ø¬Ø§Ø¡ ØªÙØ¹ÙŠÙ„ Ø§Ù„Ù€ PHP OpenSSL extension."
 
-#: templates/installation.php:25
+#: 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:31
+#: 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 "Ù…Ø¬Ù„Ø¯Ø§Øª Ø§Ù„Ø¨ÙŠØ§Ù†Ø§Øª ÙˆØ§Ù„Ù…Ù„ÙØ§Øª Ø§Ù„Ø®Ø§ØµØ© Ù‚Ø¯ ØªÙƒÙˆÙ† Ù‚Ø§Ø¨Ù„Ø© Ù„Ù„ÙˆØµÙˆÙ„ Ø§Ù„ÙŠÙ‡Ø§ Ø¹Ù† Ø·Ø±ÙŠÙ‚ Ø´Ø¨ÙƒØ© Ø§Ù„Ø§Ù†ØªØ±Ù†Øª ÙˆØ°Ù„Ùƒ Ø¨Ø³Ø¨Ø¨ Ø§Ù† Ù…Ù„Ù .htaccess  Ù„Ø§ ÙŠØ¹Ù…Ù„ Ø¨Ø´ÙƒÙ„ ØµØÙŠØ."
 
-#: templates/installation.php:32
+#: 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\">documentation</a>."
 
-#: templates/installation.php:36
+#: templates/installation.php:44
 msgid "Create an <strong>admin account</strong>"
 msgstr "Ø£Ø¶Ù </strong>Ù…Ø³ØªØ®Ø¯Ù… Ø±Ø¦ÙŠØ³ÙŠ <strong>"
 
-#: templates/installation.php:52
+#: templates/installation.php:62
 msgid "Advanced"
-msgstr "Ø®ÙŠØ§Ø±Ø§Øª Ù…ØªÙ‚Ø¯Ù…Ø©"
+msgstr "ØªØ¹Ø¯ÙŠÙ„Ø§Øª Ù…ØªÙ‚Ø¯Ù…Ù‡"
 
-#: templates/installation.php:54
+#: templates/installation.php:64
 msgid "Data folder"
 msgstr "Ù…Ø¬Ù„Ø¯ Ø§Ù„Ù…Ø¹Ù„ÙˆÙ…Ø§Øª"
 
-#: templates/installation.php:61
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "Ø£Ø³Ø³ Ù‚Ø§Ø¹Ø¯Ø© Ø§Ù„Ø¨ÙŠØ§Ù†Ø§Øª"
 
-#: templates/installation.php:66 templates/installation.php:77
-#: templates/installation.php:87 templates/installation.php:97
+#: 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:109
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "Ù…Ø³ØªØ®Ø¯Ù… Ù‚Ø§Ø¹Ø¯Ø© Ø§Ù„Ø¨ÙŠØ§Ù†Ø§Øª"
 
-#: templates/installation.php:113
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "ÙƒÙ„Ù…Ø© Ø³Ø± Ù…Ø³ØªØ®Ø¯Ù… Ù‚Ø§Ø¹Ø¯Ø© Ø§Ù„Ø¨ÙŠØ§Ù†Ø§Øª"
 
-#: templates/installation.php:117
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "Ø¥Ø³Ù… Ù‚Ø§Ø¹Ø¯Ø© Ø§Ù„Ø¨ÙŠØ§Ù†Ø§Øª"
 
-#: templates/installation.php:125
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "Ù…Ø³Ø§ØØ© Ø¬Ø¯ÙˆÙ„ Ù‚Ø§Ø¹Ø¯Ø© Ø§Ù„Ø¨ÙŠØ§Ù†Ø§Øª"
 
-#: templates/installation.php:131
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "Ø®Ø§Ø¯Ù… Ù‚Ø§Ø¹Ø¯Ø© Ø§Ù„Ø¨ÙŠØ§Ù†Ø§Øª"
 
-#: templates/installation.php:136
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "Ø§Ù†Ù‡Ø§Ø¡ Ø§Ù„ØªØ¹Ø¯ÙŠÙ„Ø§Øª"
 
-#: templates/layout.guest.php:33
+#: templates/layout.guest.php:40
 msgid "web services under your control"
-msgstr "Ø®Ø¯Ù…Ø§Øª Ø§Ù„ÙˆØ¨ ØªØØª ØªØµØ±ÙÙƒ"
+msgstr "Ø®Ø¯Ù…Ø§Øª Ø§Ù„Ø´Ø¨ÙƒØ© ØªØØª Ø³ÙŠØ·Ø±ØªÙƒ"
 
-#: templates/layout.user.php:48
+#: 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 ""
+msgstr "Ø§Ø³Ù…Ø§Ø¡ Ø¯Ø®ÙˆÙ„ Ø¨Ø¯ÙŠÙ„Ø©"
 
 #: templates/part.pagenavi.php:3
 msgid "prev"
@@ -592,4 +610,4 @@ msgstr "Ø§Ù„ØªØ§Ù„ÙŠ"
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
-msgstr ""
+msgstr "Ø¬Ø§Ø±ÙŠ ØªØØ¯ÙŠØ« Owncloud Ø§Ù„Ù‰ Ø§ØµØ¯Ø§Ø± %s , Ù‚Ø¯ ÙŠØ³ØªØºØ±Ù‚ Ù‡Ø°Ø§ Ø¨Ø¹Ø¶ Ø§Ù„ÙˆÙ‚Øª."
diff --git a/l10n/ar/files.po b/l10n/ar/files.po
index 62e5779a43a2c7a3c34f17237466a5330c5be399..0136882b8728fae099564a31af6e39c85a616384 100644
--- a/l10n/ar/files.po
+++ b/l10n/ar/files.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <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-03-04 00:06+0100\n"
-"PO-Revision-Date: 2013-03-03 23:06+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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"
@@ -21,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"
@@ -43,7 +38,7 @@ msgstr "ØªÙ… ØªØ±ÙÙŠØ¹ Ø§Ù„Ù…Ù„ÙØ§Øª Ø¨Ù†Ø¬Ø§Ø."
 #: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
-msgstr ""
+msgstr "ØØ¬Ù… Ø§Ù„Ù…Ù„Ù Ø§Ù„Ù…Ø±ÙÙˆØ¹ ØªØ¬Ø§ÙˆØ² Ù‚ÙŠÙ…Ø©  upload_max_filesize Ø§Ù„Ù…ÙˆØ¬ÙˆØ¯Ø© ÙÙŠ Ù…Ù„Ù php.ini "
 
 #: ajax/upload.php:29
 msgid ""
@@ -65,165 +60,176 @@ msgstr "Ø§Ù„Ù…Ø¬Ù„Ø¯ Ø§Ù„Ù…Ø¤Ù‚Øª ØºÙŠØ± Ù…ÙˆØ¬ÙˆØ¯"
 
 #: ajax/upload.php:33
 msgid "Failed to write to disk"
-msgstr ""
+msgstr "Ø®Ø·Ø£ ÙÙŠ Ø§Ù„ÙƒØªØ§Ø¨Ø© Ø¹Ù„Ù‰ Ø§Ù„Ù‚Ø±Øµ Ø§Ù„ØµÙ„Ø¨"
 
 #: ajax/upload.php:51
 msgid "Not enough storage available"
-msgstr ""
+msgstr "Ù„Ø§ ÙŠÙˆØ¬Ø¯ Ù…Ø³Ø§ØØ© ØªØ®Ø²ÙŠÙ†ÙŠØ© ÙƒØ§ÙÙŠØ©"
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
-msgstr ""
+msgstr "Ù…Ø³Ø§Ø± ØºÙŠØ± ØµØÙŠØ."
 
-#: appinfo/app.php:10
+#: 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:92 templates/index.php:93
+#: 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 ""
+msgstr "Ø¥Ø¹Ø§Ø¯Ø© ØªØ³Ù…ÙŠÙ‡"
 
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
-#: js/files.js:439
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
-msgstr ""
+msgstr "Ù‚ÙŠØ¯ Ø§Ù„Ø§Ù†ØªØ¸Ø§Ø±"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
-msgstr ""
+msgstr "{new_name} Ù…ÙˆØ¬ÙˆØ¯ Ù…Ø³Ø¨Ù‚Ø§"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
-msgstr ""
+msgstr "Ø§Ø³ØªØ¨Ø¯Ø§Ù„"
 
-#: js/filelist.js:251
+#: js/filelist.js:259
 msgid "suggest name"
-msgstr ""
+msgstr "Ø§Ù‚ØªØ±Ø Ø¥Ø³Ù…"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
-msgstr ""
+msgstr "Ø¥Ù„ØºØ§Ø¡"
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
-msgstr ""
+msgstr "Ø§Ø³ØªØ¨Ø¯Ù„ {new_name}  Ø¨Ù€  {old_name}"
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "undo"
-msgstr ""
+msgstr "ØªØ±Ø§Ø¬Ø¹"
 
-#: js/filelist.js:323
+#: 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 ""
+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 ""
+msgstr "Ù…Ø³Ø§ØØªÙƒ Ø§Ù„ØªØ®Ø²ÙŠÙ†ÙŠØ© Ø§Ù…ØªÙ„Ø£Øª ØªÙ‚Ø±ÙŠØ¨Ø§ "
 
-#: js/files.js:225
+#: 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:262
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr ""
+msgstr "ÙØ´Ù„ ÙÙŠ Ø±ÙØ¹ Ù…Ù„ÙØ§ØªÙƒ , Ø¥Ù…Ø§ Ø£Ù†Ù‡Ø§ Ù…Ø¬Ù„Ø¯ Ø£Ùˆ ØØ¬Ù…Ù‡Ø§ 0 Ø¨Ø§ÙŠØª"
 
-#: js/files.js:262
-msgid "Upload Error"
+#: js/files.js:277
+msgid "Not enough space available"
 msgstr ""
 
-#: js/files.js:273
-msgid "Close"
-msgstr "Ø¥ØºÙ„Ù‚"
-
-#: js/files.js:312
-msgid "1 file uploading"
-msgstr ""
-
-#: js/files.js:315 js/files.js:370 js/files.js:385
-msgid "{count} files uploading"
-msgstr ""
-
-#: js/files.js:388 js/files.js:423
+#: js/files.js:317
 msgid "Upload cancelled."
-msgstr ""
+msgstr "ØªÙ… Ø¥Ù„ØºØ§Ø¡ Ø¹Ù…Ù„ÙŠØ© Ø±ÙØ¹ Ø§Ù„Ù…Ù„ÙØ§Øª ."
 
-#: js/files.js:497
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
-msgstr ""
+msgstr "Ø¹Ù…Ù„ÙŠØ© Ø±ÙØ¹ Ø§Ù„Ù…Ù„ÙØ§Øª Ù‚ÙŠØ¯ Ø§Ù„ØªÙ†ÙÙŠØ°. Ø§ØºÙ„Ø§Ù‚ Ø§Ù„ØµÙØØ© Ø³ÙˆÙ ÙŠÙ„ØºÙŠ Ø¹Ù…Ù„ÙŠØ© Ø±ÙØ¹ Ø§Ù„Ù…Ù„ÙØ§Øª."
 
-#: js/files.js:570
+#: js/files.js:486
 msgid "URL cannot be empty."
-msgstr ""
+msgstr "Ø¹Ù†ÙˆØ§Ù† Ø§Ù„ URL  Ù„Ø§ ÙŠØ¬ÙˆØ² Ø£Ù† ÙŠÙƒÙˆÙ† ÙØ§Ø±ØºØ§."
 
-#: js/files.js:575
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr ""
+msgstr "Ø¥Ø³Ù… Ù…Ø¬Ù„Ø¯ ØºÙŠØ± ØµØÙŠØ. Ø§Ø³ØªØ®Ø¯Ø§Ù… Ù…ØµØ·Ù„Ø \"Shared\" Ù…ØØ¬ÙˆØ² Ù„Ù„Ù†Ø¸Ø§Ù…"
 
-#: js/files.js:953 templates/index.php:68
+#: 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 "Ø§Ù„Ø§Ø³Ù…"
+msgstr "Ø§Ø³Ù…"
 
-#: js/files.js:954 templates/index.php:79
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "ØØ¬Ù…"
 
-#: js/files.js:955 templates/index.php:81
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Ù…Ø¹Ø¯Ù„"
 
-#: js/files.js:974
+#: js/files.js:898
 msgid "1 folder"
-msgstr ""
+msgstr "Ù…Ø¬Ù„Ø¯ Ø¹Ø¯Ø¯ 1"
 
-#: js/files.js:976
+#: js/files.js:900
 msgid "{count} folders"
-msgstr ""
+msgstr "{count} Ù…Ø¬Ù„Ø¯Ø§Øª"
 
-#: js/files.js:984
+#: js/files.js:908
 msgid "1 file"
-msgstr ""
+msgstr "Ù…Ù„Ù ÙˆØ§ØØ¯"
 
-#: js/files.js:986
+#: 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"
-msgstr ""
+msgstr "Ø§Ù„ØªØ¹Ø§Ù…Ù„ Ù…Ø¹ Ø§Ù„Ù…Ù„Ù"
 
 #: templates/admin.php:7
 msgid "Maximum upload size"
@@ -231,23 +237,23 @@ 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 ""
+msgstr "ØªÙØ¹ÙŠÙ„ Ø®Ø§ØµÙŠØ© ØªØÙ…ÙŠÙ„ Ù…Ù„ÙØ§Øª ZIP"
 
 #: templates/admin.php:20
 msgid "0 is unlimited"
-msgstr ""
+msgstr "0 = ØºÙŠØ± Ù…ØØ¯ÙˆØ¯"
 
 #: templates/admin.php:22
 msgid "Maximum input size for ZIP files"
-msgstr ""
+msgstr "Ø§Ù„ØØ¯ Ø§Ù„Ø£Ù‚ØµÙ‰ Ø§Ù„Ù…Ø³Ù…ÙˆØ Ø¨Ù‡ Ù„Ù…Ù„ÙØ§Øª ZIP"
 
 #: templates/admin.php:26
 msgid "Save"
@@ -267,50 +273,50 @@ msgstr "Ù…Ø¬Ù„Ø¯"
 
 #: templates/index.php:14
 msgid "From link"
-msgstr ""
+msgstr "Ù…Ù† Ø±Ø§Ø¨Ø·"
 
-#: templates/index.php:40
+#: templates/index.php:42
 msgid "Deleted files"
-msgstr ""
+msgstr "ØØ°Ù Ø§Ù„Ù…Ù„ÙØ§Øª"
 
-#: templates/index.php:46
+#: templates/index.php:48
 msgid "Cancel upload"
-msgstr ""
+msgstr "Ø¥Ù„ØºØ§Ø¡ Ø±ÙØ¹ Ø§Ù„Ù…Ù„ÙØ§Øª"
 
-#: templates/index.php:53
+#: templates/index.php:54
 msgid "You donâ€™t have write permissions here."
-msgstr ""
+msgstr "Ù„Ø§ ØªÙ…Ù„Ùƒ ØµÙ„Ø§ØÙŠØ§Øª Ø§Ù„ÙƒØªØ§Ø¨Ø© Ù‡Ù†Ø§."
 
-#: templates/index.php:60
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Ù„Ø§ ÙŠÙˆØ¬Ø¯ Ø´ÙŠØ¡ Ù‡Ù†Ø§. Ø¥Ø±ÙØ¹ Ø¨Ø¹Ø¶ Ø§Ù„Ù…Ù„ÙØ§Øª!"
 
-#: templates/index.php:74
+#: templates/index.php:75
 msgid "Download"
 msgstr "ØªØÙ…ÙŠÙ„"
 
-#: templates/index.php:86 templates/index.php:87
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Ø¥Ù„ØºØ§Ø¡ Ù…Ø´Ø§Ø±ÙƒØ©"
 
-#: templates/index.php:106
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "ØØ¬Ù… Ø§Ù„ØªØ±ÙÙŠØ¹ Ø£Ø¹Ù„Ù‰ Ù…Ù† Ø§Ù„Ù…Ø³Ù…ÙˆØ"
 
-#: templates/index.php:108
+#: 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:113
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
-msgstr ""
+msgstr "ÙŠØ±Ø¬Ù‰ Ø§Ù„Ø§Ù†ØªØ¸Ø§Ø± , Ø¬Ø§Ø±ÙŠ ÙØØµ Ø§Ù„Ù…Ù„ÙØ§Øª ."
 
-#: templates/index.php:116
+#: templates/index.php:117
 msgid "Current scanning"
-msgstr ""
+msgstr "Ø§Ù„ÙØØµ Ø§Ù„ØØ§Ù„ÙŠ"
 
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
-msgstr ""
+msgstr "ØªØØ¯ÙŠØ« Ø°Ø§ÙƒØ±Ø© Ø§Ù„ØªØ®Ø²ÙŠÙ† Ø§Ù„Ù…Ø¤Ù‚Øª(Ø§Ù„ÙƒØ§Ø´)  Ø§Ù„Ø®Ø§ØµØ© Ø¨Ù…Ù„ÙØ§Øª Ø§Ù„Ù†Ø¸Ø§Ù… ..."
diff --git a/l10n/ar/files_encryption.po b/l10n/ar/files_encryption.po
index 66040076539c337ca76b3e821c9538edf6e4a641..cde78c5cd1ba3ea5b1c14a8551d34a118aa83236 100644
--- a/l10n/ar/files_encryption.po
+++ b/l10n/ar/files_encryption.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <hussein-atef@hotmail.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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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"
@@ -24,15 +23,15 @@ msgstr "Ø§Ù„ØªØ´ÙÙŠØ±"
 
 #: templates/settings-personal.php:7
 msgid "File encryption is enabled."
-msgstr ""
+msgstr "ØªØ´ÙÙŠØ± Ø§Ù„Ù…Ù„ÙØ§Øª ÙØ¹Ø§Ù„."
 
 #: templates/settings-personal.php:11
 msgid "The following file types will not be encrypted:"
-msgstr ""
+msgstr "Ø§Ù„Ù…Ù„ÙØ§Øª Ø§Ù„Ø§ØªÙŠØ© Ù„Ù† ÙŠØªÙ… ØªØ´ÙÙŠØ±Ù‡Ø§:"
 
 #: templates/settings.php:7
 msgid "Exclude the following file types from encryption:"
-msgstr ""
+msgstr "Ø¥Ø³ØªØ«Ù†Ø§Ø¡ Ø£Ù†ÙˆØ§Ø¹ Ø§Ù„Ù…Ù„ÙØ§Øª Ø§Ù„Ø§ØªÙŠØ© Ù…Ù† Ø§Ù„ØªØ´ÙÙŠØ±: "
 
 #: templates/settings.php:12
 msgid "None"
diff --git a/l10n/ar/files_external.po b/l10n/ar/files_external.po
index d7c1d01ac437892069d65c18ae63a89393858f02..6ba8fd6540ce3ae55bf921773bf98f19c4afd3cd 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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..58288103c145534aa5440df134cb2e8804ae8f49 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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 e15d676d00fd52bc8120a887f416c9e3cc924db3..de67c217d33b3556dce2ab1a23880ff34fc62bc1 100644
--- a/l10n/ar/files_trashbin.po
+++ b/l10n/ar/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-08 00:25+0100\n"
-"PO-Revision-Date: 2013-03-07 23:25+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -17,27 +17,31 @@ 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/delete.php:40
+#: ajax/delete.php:42
 #, php-format
 msgid "Couldn't delete %s permanently"
-msgstr ""
+msgstr "ØªØ¹Ø°Ù‘Ø± ØØ°Ù%s Ø¨Ø´ÙƒÙ„ Ø¯Ø§Ø¦Ù…"
 
-#: ajax/undelete.php:41
+#: ajax/undelete.php:42
 #, php-format
 msgid "Couldn't restore %s"
-msgstr ""
+msgstr "ØªØ¹Ø°Ù‘Ø± Ø§Ø³ØªØ±Ø¬Ø§Ø¹ %s "
 
 #: js/trash.js:7 js/trash.js:96
 msgid "perform restore operation"
-msgstr ""
+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 ""
+msgstr "ØØ°Ù Ø¨Ø´ÙƒÙ„ Ø¯Ø§Ø¦Ù…"
 
 #: js/trash.js:121
 msgid "Delete permanently"
-msgstr ""
+msgstr "ØØ°Ù Ø¨Ø´ÙƒÙ„ Ø¯Ø§Ø¦Ù…"
 
 #: js/trash.js:174 templates/index.php:17
 msgid "Name"
@@ -45,31 +49,31 @@ msgstr "Ø§Ø³Ù…"
 
 #: js/trash.js:175 templates/index.php:27
 msgid "Deleted"
-msgstr ""
+msgstr "ØªÙ… Ø§Ù„ØØ°Ù"
 
 #: js/trash.js:184
 msgid "1 folder"
-msgstr ""
+msgstr "Ù…Ø¬Ù„Ø¯ Ø¹Ø¯Ø¯ 1"
 
 #: js/trash.js:186
 msgid "{count} folders"
-msgstr ""
+msgstr "{count} Ù…Ø¬Ù„Ø¯Ø§Øª"
 
 #: js/trash.js:194
 msgid "1 file"
-msgstr ""
+msgstr "Ù…Ù„Ù ÙˆØ§ØØ¯"
 
 #: js/trash.js:196
 msgid "{count} files"
-msgstr ""
+msgstr "{count} Ù…Ù„ÙØ§Øª"
 
 #: templates/index.php:9
 msgid "Nothing in here. Your trash bin is empty!"
-msgstr ""
+msgstr "Ù„Ø§ ÙŠÙˆØ¬Ø¯ Ø´ÙŠØ¡ Ù‡Ù†Ø§. Ø³Ù„Ø© Ø§Ù„Ù…Ù‡Ù…Ù„Ø§Øª Ø®Ø§Ù„ÙŠÙ‡."
 
 #: templates/index.php:20 templates/index.php:22
 msgid "Restore"
-msgstr ""
+msgstr "Ø§Ø³ØªØ¹ÙŠØ¯"
 
 #: templates/index.php:30 templates/index.php:31
 msgid "Delete"
@@ -77,4 +81,4 @@ msgstr "Ø¥Ù„ØºØ§Ø¡"
 
 #: templates/part.breadcrumb.php:9
 msgid "Deleted Files"
-msgstr ""
+msgstr "Ø§Ù„Ù…Ù„ÙØ§Øª Ø§Ù„Ù…ØØ°ÙˆÙÙ‡"
diff --git a/l10n/ar/files_versions.po b/l10n/ar/files_versions.po
index c086e82cd3196102a8f8ca536ddd92f42d5e8af3..58b505fc60e8905c2dc4be06b879ecda89e98a3a 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:30+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 f30930423780db12b32e0d4fd730d33381e85f9c..c05edd40e02001af34414ac348539b02a22686c3 100644
--- a/l10n/ar/lib.po
+++ b/l10n/ar/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-27 14:35+0100\n"
-"PO-Revision-Date: 2013-02-27 13:35+0000\n"
+"POT-Creation-Date: 2013-04-28 01:57+0200\n"
+"PO-Revision-Date: 2013-04-27 23:57+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"
@@ -27,7 +27,7 @@ msgstr "Ø´Ø®ØµÙŠ"
 
 #: app.php:373
 msgid "Settings"
-msgstr "ØªØ¹Ø¯ÙŠÙ„Ø§Øª"
+msgstr "Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª"
 
 #: app.php:385
 msgid "Users"
@@ -35,35 +35,35 @@ msgstr "Ø§Ù„Ù…Ø³ØªØ®Ø¯Ù…ÙŠÙ†"
 
 #: app.php:398
 msgid "Apps"
-msgstr ""
+msgstr "Ø§Ù„ØªØ·Ø¨ÙŠÙ‚Ø§Øª"
 
 #: app.php:406
 msgid "Admin"
-msgstr ""
+msgstr "Ø§Ù„Ù…Ø¯ÙŠØ±"
 
-#: files.php:202
+#: files.php:209
 msgid "ZIP download is turned off."
-msgstr ""
+msgstr "ØªØÙ…ÙŠÙ„ Ù…Ù„ÙØ§Øª ZIP Ù…ØªÙˆÙ‚Ù"
 
-#: files.php:203
+#: files.php:210
 msgid "Files need to be downloaded one by one."
-msgstr ""
+msgstr "Ø§Ù„Ù…Ù„ÙØ§Øª Ø¨ØØ§Ø¬Ø© Ø§Ù„Ù‰ Ø§Ù† ÙŠØªÙ… ØªØÙ…ÙŠÙ„Ù‡Ø§ ÙˆØ§ØØ¯ ØªÙ„Ùˆ Ø§Ù„Ø§Ø®Ø±"
 
-#: files.php:204 files.php:231
+#: files.php:211 files.php:244
 msgid "Back to Files"
-msgstr ""
+msgstr "Ø§Ù„Ø¹ÙˆØ¯Ø© Ø§Ù„Ù‰ Ø§Ù„Ù…Ù„ÙØ§Øª"
 
-#: files.php:228
+#: files.php:241
 msgid "Selected files too large to generate zip file."
-msgstr ""
+msgstr "Ø§Ù„Ù…Ù„ÙØ§Øª Ø§Ù„Ù…ØØ¯Ø¯Ø© ÙƒØ¨ÙŠØ±Ø© Ø¬Ø¯Ø§ Ù„ÙŠØªÙ… Ø¶ØºØ·Ù‡Ø§ ÙÙŠ Ù…Ù„Ù zip"
 
 #: helper.php:228
 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"
@@ -71,7 +71,7 @@ msgstr "Ù„Ù… ÙŠØªÙ… Ø§Ù„ØªØ£ÙƒØ¯ Ù…Ù† Ø§Ù„Ø´Ø®ØµÙŠØ© Ø¨Ù†Ø¬Ø§Ø"
 
 #: json.php:51
 msgid "Token expired. Please reload page."
-msgstr ""
+msgstr "Ø§Ù†ØªÙ‡Øª ØµÙ„Ø§ØÙŠØ© Ø§Ù„ÙƒÙ„Ù…Ø© , ÙŠØ±Ø¬Ù‰ Ø§Ø¹Ø§Ø¯Ø© ØªØÙ…ÙŠÙ„ Ø§Ù„ØµÙØØ©"
 
 #: search/provider/file.php:17 search/provider/file.php:35
 msgid "Files"
@@ -83,109 +83,105 @@ msgstr "Ù…Ø¹Ù„ÙˆÙ…Ø§Øª Ø¥Ø¶Ø§ÙÙŠØ©"
 
 #: search/provider/file.php:29
 msgid "Images"
-msgstr ""
+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:128 setup.php:320 setup.php:365
+#: setup.php:132 setup.php:325 setup.php:370
 msgid "PostgreSQL username and/or password not valid"
-msgstr ""
+msgstr "Ø§Ø³Ù… Ø§Ù„Ù…Ø³ØªØ®Ø¯Ù… / Ø£Ùˆ ÙƒÙ„Ù…Ø© Ø§Ù„Ù…Ø±ÙˆØ± Ø§Ù„Ø®Ø§ØµØ© Ø¨Ù€PostgreSQL ØºÙŠØ± ØµØÙŠØØ©"
 
-#: setup.php:129 setup.php:152 setup.php:229
+#: setup.php:133 setup.php:156 setup.php:234
 msgid "You need to enter either an existing account or the administrator."
-msgstr ""
+msgstr "Ø§Ù†Øª Ø¨ØØ§Ø¬Ø© Ù„ÙƒØªØ§Ø¨Ø© Ø§Ø³Ù… Ù…Ø³ØªØ®Ø¯Ù… Ù…ÙˆØ¬ÙˆØ¯ Ø£Ùˆ ØØ³Ø§Ø¨ Ø§Ù„Ù…Ø¯ÙŠØ±."
 
-#: setup.php:151 setup.php:453 setup.php:520
+#: setup.php:155 setup.php:458 setup.php:525
 msgid "Oracle username and/or password not valid"
-msgstr ""
+msgstr "Ø§Ø³Ù… Ø§Ù„Ù…Ø³ØªØ®Ø¯Ù…  Ùˆ/Ø£Ùˆ  ÙƒÙ„Ù…Ø© Ø§Ù„Ù…Ø±ÙˆØ± Ù„Ù†Ø¸Ø§Ù… Oracle ØºÙŠØ± ØµØÙŠØ"
 
-#: setup.php:228
+#: setup.php:233
 msgid "MySQL username and/or password not valid"
-msgstr ""
+msgstr "Ø§Ø³Ù… Ø§Ù„Ù…Ø³ØªØ®Ø¯Ù…  Ùˆ/Ø£Ùˆ  ÙƒÙ„Ù…Ø© Ø§Ù„Ù…Ø±ÙˆØ± Ù„Ù†Ø¸Ø§Ù… MySQL ØºÙŠØ± ØµØÙŠØ"
 
-#: 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: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:583 setup.php:592 setup.php:600 setup.php:609
+#: setup.php:615
 #, php-format
 msgid "DB Error: \"%s\""
-msgstr ""
+msgstr "Ø®Ø·Ø£ ÙÙŠ Ù‚ÙˆØ§Ø¹Ø¯ Ø§Ù„Ø¨ÙŠØ§Ù†Ø§Øª : \"%s\""
 
-#: 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:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
+#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
+#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
 #, php-format
 msgid "Offending command was: \"%s\""
-msgstr ""
+msgstr "Ø§Ù„Ø£Ù…Ø± Ø§Ù„Ù…Ø®Ø§Ù„Ù ÙƒØ§Ù† : \"%s\""
 
-#: setup.php:299
+#: setup.php:304
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
-msgstr ""
+msgstr "Ø£Ø³Ù… Ø§Ù„Ù…Ø³ØªØ®Ø¯Ù…  '%s'@'localhost' Ø§Ù„Ø®Ø§Øµ Ø¨Ù€ MySQL Ù…ÙˆØ¬ÙˆØ¯ Ù…Ø³Ø¨Ù‚Ø§"
 
-#: setup.php:300
+#: setup.php:305
 msgid "Drop this user from MySQL"
-msgstr ""
+msgstr "Ø§ØØ°Ù Ø§Ø³Ù… Ø§Ù„Ù…Ø³ØªØ®Ø¯Ù… Ù‡Ø°Ø§ Ù…Ù† Ø§Ù„Ù€ MySQL"
 
-#: setup.php:305
+#: setup.php:310
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
-msgstr ""
+msgstr "Ø£Ø³Ù… Ø§Ù„Ù…Ø³ØªØ®Ø¯Ù…  '%s'@'%%' Ø§Ù„Ø®Ø§Øµ Ø¨Ù€ MySQL Ù…ÙˆØ¬ÙˆØ¯ Ù…Ø³Ø¨Ù‚Ø§"
 
-#: setup.php:306
+#: setup.php:311
 msgid "Drop this user from MySQL."
-msgstr ""
+msgstr "Ø§ØØ°Ù Ø§Ø³Ù… Ø§Ù„Ù…Ø³ØªØ®Ø¯Ù… Ù‡Ø°Ø§ Ù…Ù† Ø§Ù„Ù€ MySQL."
 
-#: setup.php:579 setup.php:611
+#: setup.php:584 setup.php:616
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
-msgstr ""
+msgstr "Ø§Ù„Ø£Ù…Ø± Ø§Ù„Ù…Ø®Ø§Ù„Ù ÙƒØ§Ù† : \"%s\", Ø§Ø³Ù… Ø§Ù„Ù…Ø³ØªØ®Ø¯Ù… : %s, ÙƒÙ„Ù…Ø© Ø§Ù„Ù…Ø±ÙˆØ±: %s"
 
-#: setup.php:631
+#: setup.php:636
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
-msgstr ""
+msgstr "Ø§Ø³Ù… Ø§Ù„Ù…Ø³ØªØ®Ø¯Ù…  Ùˆ/Ø£Ùˆ  ÙƒÙ„Ù…Ø© Ø§Ù„Ù…Ø±ÙˆØ± Ù„Ù†Ø¸Ø§Ù… MS SQL ØºÙŠØ± ØµØÙŠØ : %s"
 
-#: setup.php:849
+#: setup.php:858
 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:850
+#: setup.php:859
 #, 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"
@@ -198,16 +194,16 @@ msgstr "Ù…Ù†Ø° Ø¯Ù‚ÙŠÙ‚Ø©"
 #: template.php:115
 #, php-format
 msgid "%d minutes ago"
-msgstr ""
+msgstr "%d Ø¯Ù‚ÙŠÙ‚Ø© Ù…Ø¶Øª"
 
 #: template.php:116
 msgid "1 hour ago"
-msgstr ""
+msgstr "Ù‚Ø¨Ù„ Ø³Ø§Ø¹Ø© Ù…Ø¶Øª"
 
 #: template.php:117
 #, php-format
 msgid "%d hours ago"
-msgstr ""
+msgstr "%d Ø³Ø§Ø¹Ø© Ù…Ø¶Øª"
 
 #: template.php:118
 msgid "today"
@@ -215,44 +211,31 @@ msgstr "Ø§Ù„ÙŠÙˆÙ…"
 
 #: template.php:119
 msgid "yesterday"
-msgstr ""
+msgstr "ÙŠÙˆÙ… Ø£Ù…Ø³"
 
 #: template.php:120
 #, php-format
 msgid "%d days ago"
-msgstr ""
+msgstr "%d ÙŠÙˆÙ… Ù…Ø¶Ù‰"
 
 #: template.php:121
 msgid "last month"
-msgstr ""
+msgstr "Ø§Ù„Ø´Ù‡Ø± Ø§Ù„Ù…Ø§Ø¶ÙŠ"
 
 #: template.php:122
 #, php-format
 msgid "%d months ago"
-msgstr ""
+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 ""
-
-#: 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 ""
+msgstr "ØªØ¹Ø°Ø± Ø§Ù„Ø¹Ø«ÙˆØ± Ø¹Ù„Ù‰ Ø§Ù„Ù…Ø¬Ù„Ø¯ \"%s\""
diff --git a/l10n/ar/settings.po b/l10n/ar/settings.po
index bf92440de5e23e76588b888d1fbd1f7f51dcba16..e0f912c9bab6e7c074675573280ea3001ddc126b 100644
--- a/l10n/ar/settings.po
+++ b/l10n/ar/settings.po
@@ -3,15 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <icewind1991@gmail.com>, 2012.
-#   <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-02-27 14:35+0100\n"
-"PO-Revision-Date: 2013-02-27 13:35+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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"
@@ -24,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 "Ù„Ù… ÙŠØªÙ… Ø§Ù„ØªØ£ÙƒØ¯ Ù…Ù† Ø§Ù„Ø´Ø®ØµÙŠØ© Ø¨Ù†Ø¬Ø§Ø"
 
-#: 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 "Ø§Ù„Ù…Ø¬Ù…ÙˆØ¹Ø© Ù…ÙˆØ¬ÙˆØ¯Ø© Ù…Ø³Ø¨Ù‚Ø§Ù‹"
@@ -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"
@@ -85,86 +86,86 @@ msgstr "ÙØ´Ù„ Ø¥Ø²Ø§Ù„Ø© Ø§Ù„Ù…Ø³ØªØ®Ø¯Ù… Ù…Ù† Ø§Ù„Ù…Ø¬Ù…ÙˆØ¹Ø© %s"
 
 #: ajax/updateapp.php:14
 msgid "Couldn't update app."
-msgstr ""
+msgstr "ØªØ¹Ø°Ø± ØªØØ¯ÙŠØ« Ø§Ù„ØªØ·Ø¨ÙŠÙ‚."
 
 #: js/apps.js:30
 msgid "Update to {appversion}"
-msgstr ""
+msgstr "ØªÙ… Ø§Ù„ØªØØ¯ÙŠØ« Ø§Ù„Ù‰ "
 
 #: js/apps.js:36 js/apps.js:76
 msgid "Disable"
 msgstr "Ø¥ÙŠÙ‚Ø§Ù"
 
-#: js/apps.js:36 js/apps.js:64
+#: 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:84
-msgid "Updating...."
-msgstr ""
+msgstr "Ø§Ù„Ø±Ø¬Ø§Ø¡ Ø§Ù„Ø§Ù†ØªØ¸Ø§Ø± ..."
 
-#: js/apps.js:87
-msgid "Error while updating app"
-msgstr ""
-
-#: js/apps.js:87
+#: 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 ""
+msgstr "ØªÙ… Ø§Ù„ØªØØ¯ÙŠØ« Ø¨Ù†Ø¬Ø§Ø"
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
-msgstr "ØÙØ¸"
+msgstr "Ø¬Ø§Ø±ÙŠ Ø§Ù„ØÙØ¸..."
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "deleted"
-msgstr ""
+msgstr "ØªÙ… Ø§Ù„ØØ°Ù"
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "undo"
-msgstr ""
+msgstr "ØªØ±Ø§Ø¬Ø¹"
 
-#: js/users.js:62
+#: js/users.js:79
 msgid "Unable to remove user"
-msgstr ""
+msgstr "ØªØ¹Ø°Ø± ØØ°Ù Ø§Ù„Ù…Ø³ØªØ®Ø¯Ù…"
 
-#: js/users.js:75 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
+#: templates/users.php:103
 msgid "Groups"
 msgstr "Ù…Ø¬Ù…ÙˆØ¹Ø§Øª"
 
-#: js/users.js:78 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr "Ù…Ø¯ÙŠØ± Ø§Ù„Ù…Ø¬Ù…ÙˆØ¹Ø©"
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
-msgstr "ØØ°Ù"
+msgstr "Ø¥Ù„ØºØ§Ø¡"
 
-#: js/users.js:191
+#: js/users.js:269
 msgid "add group"
-msgstr ""
+msgstr "Ø§Ø¶Ø§ÙØ© Ù…Ø¬Ù…ÙˆØ¹Ø©"
 
-#: js/users.js:352
+#: js/users.js:420
 msgid "A valid username must be provided"
-msgstr ""
+msgstr "ÙŠØ¬Ø¨ Ø§Ø¯Ø®Ø§Ù„ Ø§Ø³Ù… Ù…Ø³ØªØ®Ø¯Ù… ØµØÙŠØ"
 
-#: js/users.js:353 js/users.js:359 js/users.js:374
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
-msgstr ""
+msgstr "ØØµÙ„ Ø®Ø·Ø£ Ø§Ø«Ù†Ø§Ø¡ Ø§Ù†Ø´Ø§Ø¡ Ù…Ø³ØªØ®Ø¯Ù…"
 
-#: js/users.js:358
+#: js/users.js:426
 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__"
 
@@ -179,36 +180,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 "Ù…Ø¬Ù„Ø¯Ø§Øª data  ÙˆÙ…Ù„ÙØ§ØªÙƒ Ù‚Ø¯ ØªÙƒÙˆÙ† Ù‚Ø§Ø¨Ù„Ø© Ù„Ù„ÙˆØµÙˆÙ„ Ø§Ù„ÙŠÙ‡Ø§ Ø¹Ù† Ø·Ø±ÙŠÙ‚ Ø´Ø¨ÙƒØ© Ø§Ù„Ø§Ù†ØªØ±Ù†Øª. Ù…Ù„Ù .htaccess Ø§Ù„Ø°ÙŠ ÙˆÙØ±ØªÙ‡ Owncloud Ù„Ø§ ÙŠØ¹Ù…Ù„ . Ù†Ù‚ØªØ±Ø Ø£Ù† ØªÙ‚ÙˆÙ… Ø¨Ø§Ø¹Ø¯Ø§Ø¯ Ø®Ø§Ø¯Ù…Ùƒ Ø¨Ø·Ø±ÙŠÙ‚Ø© ØªØ¬Ø¹Ù„ Ù…Ø¬Ù„Ø¯ data ØºÙŠØ± Ù‚Ø§Ø¨Ù„ Ù„Ù„ÙˆØµÙˆÙ„ Ø§Ù„ÙŠÙ‡ Ø¹Ù† Ø·Ø±ÙŠÙ‚ Ø§Ù„Ø§Ù†ØªØ±Ù†Øª Ø£Ùˆ Ø£Ù† ØªÙ‚ÙˆÙ… Ø¨ØªØºÙŠÙŠØ± Ù…Ø³Ø§Ø±Ù‡ Ø§Ù„Ù‰ Ø®Ø§Ø±Ø¬ Ù…Ø³Ø§Ø± Ù…Ø¬Ù„Ø¯ Ø§Ù„ØµÙØØ§Øª Ø§Ù„Ø§ÙØªØ±Ø§Ø¶ÙŠ document root Ø§Ù„Ø®Ø§Øµ Ø¨Ø®Ø§Ø¯Ù… Ø§Ù„ÙˆÙŠØ¨ ."
 
 #: 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 "Ù…ÙˆØ¯ÙŠÙ„  'fileinfo' Ø§Ù„Ø®Ø§Øµ Ø¨Ø§Ù„Ù€PHP  Ù…ÙÙ‚ÙˆØ¯ . Ù†ÙˆØµÙŠ Ø¨ØªÙØ¹ÙŠÙ„ Ù‡Ø°Ø§ Ø§Ù„Ù…ÙˆØ¯ÙŠÙ„ Ù„Ù„ØØµÙˆÙ„ Ø¹Ù„Ù‰ Ø£ÙØ¶Ù„ Ø§Ù„Ù†ØªØ§Ø¦Ø¬ Ù…Ø¹ Ø®Ø§ØµÙŠØ© Ø§Ù„ØªØÙ‚Ù‚ "
 
 #: templates/admin.php:58
 msgid "Locale not working"
-msgstr ""
+msgstr "Ø§Ù„Ù„ØºÙ‡ Ù„Ø§ ØªØ¹Ù…Ù„"
 
 #: templates/admin.php:63
 #, php-format
@@ -216,11 +217,11 @@ msgid ""
 "This ownCloud server can't set system locale to %s. This means that there "
 "might be problems with certain characters in file names. We strongly suggest"
 " to install the required packages on your system to support %s."
-msgstr ""
+msgstr "Ù„Ù… ÙŠØªÙ…ÙƒÙ† Ø®Ø§Ø¯Ù… ownCloud Ù‡Ø°Ø§ ÙƒÙ… Ø¶Ø¨Ø· Ù„ØºØ© Ø§Ù„Ù†Ø¸Ø§Ù… Ø§Ù„Ù‰ %s . Ù‡Ø°Ø§ ÙŠØ¹Ù†ÙŠ Ø§Ù†Ù‡ Ù‚Ø¯ ÙŠÙƒÙˆÙ† Ù‡Ù†Ø§Ùƒ Ø£Ø®Ø·Ø§Ø¡ ÙÙŠ Ø§Ø³Ù…Ø§Ø¡ Ø§Ù„Ù…Ù„ÙØ§Øª. Ù†ØÙ† Ù†ÙˆØµÙŠ Ø§Ù† ØªÙ‚ÙˆÙ… Ø¨ØªØ±ÙƒÙŠØ¨ Ø§Ù„ØØ²Ù… Ø§Ù„Ù„Ø§Ø²Ù…Ø© Ù„Ø¯Ø¹Ù… %s Ø¹Ù„Ù‰ Ù†Ø¸Ø§Ù…Ùƒ . "
 
 #: templates/admin.php:75
 msgid "Internet connection not working"
-msgstr ""
+msgstr "Ø§Ù„Ø§ØªØµØ§Ù„ Ø¨Ø§Ù„Ø§Ù†ØªØ±Ù†Øª Ù„Ø§ ÙŠØ¹Ù…Ù„"
 
 #: templates/admin.php:78
 msgid ""
@@ -230,100 +231,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 "Ø®Ø§Ø¯Ù… Ø§Ù„Ù€ Owncloud  Ù‡Ø°Ø§ ØºÙŠØ± Ù…ØªØµÙ„ Ø¨Ø§Ù„Ø§Ù†ØªØ±Ù†Øª. Ù‡Ø°Ø§ ÙŠØ¹Ù†ÙŠ Ø£Ù† Ø¨Ø¹Ø¶ Ø§Ù„Ù…ÙŠØ²Ø§Øª Ù…Ø«Ù„ Ø§Ù„Ø±Ø¨Ø· Ø¨ÙˆØØ¯Ø© ØªØ®Ø²ÙŠÙ†ÙŠØ© Ø®Ø§Ø±Ø¬ÙŠÙ‡, Ø§Ù„ØªÙ†Ø¨ÙŠÙ‡Ø§Øª Ø§Ù„Ø®Ø§ØµØ© Ø¨Ø§Ù„ØªØØ¯ÙŠØ«Ø§Øª Ø£Ùˆ ØªØ±ÙƒÙŠØ¨ ØªØ·Ø¨ÙŠÙ‚Ø§Øª Ù…Ù† Ù…ØµØ§Ø¯Ø± Ø®Ø§Ø±Ø¬ÙŠØ© Ù„Ù† ÙŠØ¹Ù…Ù„ . ÙƒÙ…Ø§ Ø§Ù† Ø§Ù„ÙˆØµÙˆÙ„ Ø§Ù„Ù‰ Ø§Ù„Ù…Ù„ÙØ§Øª Ù…Ù† Ø®Ø§Ø±Ø¬ Ø§Ù„Ø®Ø§Ø¯Ù… ÙˆØ§Ø±Ø³Ø§Ù„ Ø±Ø³Ø§Ø¦Ù„ Ø§Ù„Ø¨Ø±ÙŠØ¯ Ø§Ù„ØªÙ†Ø¨ÙŠÙ‡ÙŠØ© Ù„Ù† ØªØ¹Ù…Ù„ Ø£ÙŠØ¶Ø§ . Ù†Ù‚ØªØ±Ø Ø£Ù† ØªÙØ¹Ù„ Ø®Ø¯Ù…Ø© Ø§Ù„Ø§Ù†ØªØ±Ù†Øª ÙÙŠ Ù‡Ø°Ø§ Ø§Ù„Ø®Ø§Ø¯Ù… Ø§Ø°Ø§ Ø£Ø±Ø¯Øª Ø§Ù† ØªØ³ØªÙÙŠØ¯ Ù…Ù† ÙƒØ§ÙØ© Ù…ÙŠØ²Ø§Øª Owncloud"
 
 #: templates/admin.php:92
 msgid "Cron"
-msgstr ""
+msgstr "Ù…Ø¬Ø¯ÙˆÙ„"
 
 #: templates/admin.php:101
 msgid "Execute one task with each page loaded"
-msgstr ""
+msgstr "Ù‚Ù… Ø¨ØªÙ†ÙÙŠØ° Ù…Ù‡Ù…Ø© ÙˆØ§ØØ¯Ø© Ù…Ø¹ ÙƒÙ„ ØµÙØØ© ØªÙ… ØªØÙ…ÙŠÙ„Ù‡Ø§"
 
 #: templates/admin.php:111
 msgid ""
 "cron.php is registered at a webcron service. Call the cron.php page in the "
 "owncloud root once a minute over http."
-msgstr ""
+msgstr "cron.php Ù…Ø³Ø¬Ù„Ø© ÙÙŠ Ø®Ø¯Ù…Ø© webcron . Ù‚Ù… Ø¨Ø§Ø³ØªØ¯Ø¹Ø§Ø¡ ØµÙØØ© cron.php Ø§Ù„Ù…ÙˆØ¬ÙˆØ¯Ø© ÙÙŠ owncloud root Ù…Ø±Ù‡ ÙƒÙ„ Ø¯Ù‚ÙŠÙ‚Ø© Ø¹Ù† Ø·Ø±ÙŠÙ‚ Ø¨Ø±ÙˆØªÙˆÙƒÙˆÙ„ 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  Ø¹Ù† Ø·Ø±ÙŠÙ‚ system 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"
-msgstr ""
+msgstr "ØÙ…Ø§ÙŠØ©"
 
 #: templates/admin.php:181
 msgid "Enforce HTTPS"
-msgstr ""
+msgstr "ÙØ±Ø¶ HTTPS"
 
 #: templates/admin.php:182
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
-msgstr ""
+msgstr "Ø§Ø¬Ø¨Ø§Ø± Ø§Ù„Ù…Ø³ØªØ®Ø¯Ù… Ø¨Ø§Ù„Ø§ØªØµØ§Ù„ Ù…Ø¹ Owncloud  Ø¹Ù† Ø·Ø±ÙŠÙ‚ Ø§ØªØµØ§Ù„ Ù…Ø´ÙØ±"
 
 #: templates/admin.php:185
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
-msgstr ""
+msgstr "Ø§Ù„Ø±Ø¬Ø§Ø¡ Ø§Ù„Ø§ØªØµØ§Ù„ Ù…Ø¹ Ø®Ø§Ø¯Ù… Owncloud  Ù‡Ø°Ø§ Ø¹Ù† Ø·Ø±ÙŠÙ‚ HTTPS Ù„ØªÙØ¹ÙŠÙ„ Ø£Ùˆ ØªØ¹Ø·ÙŠÙ„ Ø§Ø¬Ø¨Ø§Ø± Ø§Ù„Ø¯Ø®ÙˆÙ„ Ø¨Ø§Ø³ØªØ®Ø¯Ø§Ù… "
 
 #: 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:230 templates/personal.php:102
+#: templates/admin.php:228
+msgid "Less"
+msgstr "Ø£Ù‚Ù„"
+
+#: templates/admin.php:235 templates/personal.php:105
 msgid "Version"
 msgstr "Ø¥ØµØ¯Ø§Ø±"
 
-#: templates/admin.php:233 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 "
@@ -388,15 +393,15 @@ msgstr "ØªÙ… Ø¥Ø³ØªÙ‡Ù„Ø§Ùƒ <strong>%s</strong> Ù…Ù† Ø§Ù„Ù…ØªÙˆÙØ± <strong>%s</
 
 #: 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:77
 msgid "Password"
-msgstr "ÙƒÙ„Ù…Ø§Øª Ø§Ù„Ø³Ø±"
+msgstr "ÙƒÙ„Ù…Ø© Ø§Ù„Ù…Ø±ÙˆØ±"
 
 #: templates/personal.php:38
 msgid "Your password was changed"
@@ -418,82 +423,70 @@ msgstr "ÙƒÙ„Ù…Ø§Øª Ø³Ø± Ø¬Ø¯ÙŠØ¯Ø©"
 msgid "Change password"
 msgstr "Ø¹Ø¯Ù„ ÙƒÙ„Ù…Ø© Ø§Ù„Ø³Ø±"
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:76
 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 "Ø§Ø³Ù… Ø§Ù„ØØ³Ø§Ø¨"
 
-#: templates/personal.php:70
+#: templates/personal.php:68
 msgid "Email"
-msgstr "Ø§Ù„Ø¹Ù†ÙˆØ§Ù† Ø§Ù„Ø¨Ø±ÙŠØ¯ÙŠ"
+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 "WebDAV"
 
-#: templates/personal.php:93
+#: templates/personal.php:96
 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:75
 msgid "Login Name"
-msgstr ""
+msgstr "Ø§Ø³Ù… Ø§Ù„Ø¯Ø®ÙˆÙ„"
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr "Ø§Ù†Ø´Ø¦"
 
-#: templates/users.php:35
+#: templates/users.php:33
 msgid "Default Storage"
-msgstr ""
+msgstr "ÙˆØØ¯Ø© Ø§Ù„ØªØ®Ø²ÙŠÙ† Ø§Ù„Ø§ÙØªØ±Ø§Ø¶ÙŠØ©"
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:39 templates/users.php:133
 msgid "Unlimited"
-msgstr ""
+msgstr "ØºÙŠØ± Ù…ØØ¯ÙˆØ¯"
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:57 templates/users.php:148
 msgid "Other"
 msgstr "Ø´ÙŠØ¡ Ø¢Ø®Ø±"
 
-#: templates/users.php:84
+#: templates/users.php:82
 msgid "Storage"
-msgstr ""
+msgstr "ÙˆØØ¯Ø© Ø§Ù„ØªØ®Ø²ÙŠÙ†"
 
-#: templates/users.php:95
+#: templates/users.php:93
 msgid "change display name"
-msgstr ""
+msgstr "ØªØºÙŠÙŠØ± Ø§Ø³Ù… Ø§Ù„ØØ³Ø§Ø¨"
 
-#: templates/users.php:99
+#: templates/users.php:97
 msgid "set new password"
-msgstr ""
+msgstr "Ø§Ø¹Ø¯Ø§Ø¯ ÙƒÙ„Ù…Ø© Ù…Ø±ÙˆØ± Ø¬Ø¯ÙŠØ¯Ø©"
 
-#: templates/users.php:134
+#: templates/users.php:128
 msgid "Default"
-msgstr ""
+msgstr "Ø§ÙØªØ±Ø§Ø¶ÙŠ"
diff --git a/l10n/ar/user_ldap.po b/l10n/ar/user_ldap.po
index e9c5205c1558b1047a223e6bbd5b2bf7d1e153dc..459d3c4da53bfa3ccaa273bd5f9f76a3fa59a7ed 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-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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 92180c70e7e732243150b61d63008667f99d7c42..7defa1d4b06c9eb4e5a7015e5bb45b6dc8f484c4 100644
--- a/l10n/ar/user_webdavauth.po
+++ b/l10n/ar/user_webdavauth.po
@@ -5,12 +5,13 @@
 # Translators:
 #   <hussein-atef@hotmail.com>, 2012.
 #   <shiningmoon25@gmail.com>, 2012.
+#  <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-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -21,15 +22,15 @@ msgstr ""
 
 #: templates/settings.php:3
 msgid "WebDAV Authentication"
-msgstr ""
+msgstr "ØªØ£ÙƒØ¯ Ø´Ø®ØµÙŠØ© Ø§Ù„ WebDAV"
 
 #: templates/settings.php:4
 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 "
 "credentials, and all other responses as valid credentials."
-msgstr ""
+msgstr "ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials."
diff --git a/l10n/be/core.po b/l10n/be/core.po
index dcb31520cd14ed450359645c8828c93ea38e980d..b35189b41aeac7c6009100e89583a18b5382e8ed 100644
--- a/l10n/be/core.po
+++ b/l10n/be/core.po
@@ -3,14 +3,13 @@
 # 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-02-17 00:25+0100\n"
-"PO-Revision-Date: 2013-02-16 19:10+0000\n"
-"Last-Translator: Ð¡Ñ‘Ð¼ÐºÐ° Ð“Ð°Ð²Ñ€Ð¸Ð»ÐµÐ½ÐºÐ¾ <2507496@gmail.com>\n"
+"POT-Creation-Date: 2013-04-30 01:57+0200\n"
+"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,24 +17,24 @@ 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/share.php:85
+#: ajax/share.php:97
 #, php-format
 msgid "User %s shared a file with you"
 msgstr ""
 
-#: ajax/share.php:87
+#: ajax/share.php:99
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr ""
 
-#: ajax/share.php:89
+#: 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:91
+#: ajax/share.php:104
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -81,79 +80,79 @@ msgstr ""
 msgid "Error removing %s from favorites."
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:34
 msgid "Sunday"
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:35
 msgid "Monday"
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Tuesday"
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:37
 msgid "Wednesday"
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:38
 msgid "Thursday"
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:39
 msgid "Friday"
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:40
 msgid "Saturday"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:45
 msgid "January"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:46
 msgid "February"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:47
 msgid "March"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:48
 msgid "April"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:49
 msgid "May"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:50
 msgid "June"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:51
 msgid "July"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:52
 msgid "August"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:53
 msgid "September"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:54
 msgid "October"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:55
 msgid "November"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:56
 msgid "December"
 msgstr ""
 
@@ -161,76 +160,76 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:767
+#: js/js.js:718
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:768
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:769
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:770
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:771
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:772
+#: js/js.js:723
 msgid "today"
 msgstr ""
 
-#: js/js.js:773
+#: js/js.js:724
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:774
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:775
+#: js/js.js:726
 msgid "last month"
 msgstr ""
 
-#: js/js.js:776
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:777
+#: js/js.js:728
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:778
+#: js/js.js:729
 msgid "last year"
 msgstr ""
 
-#: js/js.js:779
+#: js/js.js:730
 msgid "years ago"
 msgstr ""
 
-#: js/oc-dialogs.js:126
-msgid "Choose"
+#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
+msgid "Ok"
 msgstr ""
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
 msgid "Cancel"
 msgstr ""
 
-#: js/oc-dialogs.js:162
-msgid "No"
+#: js/oc-dialogs.js:185
+msgid "Choose"
 msgstr ""
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:215
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:180
-msgid "Ok"
+#: js/oc-dialogs.js:222
+msgid "No"
 msgstr ""
 
 #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
@@ -238,9 +237,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:152 js/share.js:159 js/share.js:582
-#: js/share.js:594
+#: 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 ""
 
@@ -252,127 +253,127 @@ msgstr ""
 msgid "The required file {file} is not installed!"
 msgstr ""
 
-#: js/share.js:29 js/share.js:43 js/share.js:90
+#: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr ""
 
-#: js/share.js:93
+#: js/share.js:90
 msgid "Share"
 msgstr ""
 
-#: js/share.js:141 js/share.js:622
+#: js/share.js:125 js/share.js:617
 msgid "Error while sharing"
 msgstr ""
 
-#: js/share.js:152
+#: js/share.js:136
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:159
+#: js/share.js:143
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:168
+#: js/share.js:152
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:170
+#: js/share.js:154
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:175
+#: js/share.js:159
 msgid "Share with"
 msgstr ""
 
-#: js/share.js:180
+#: js/share.js:164
 msgid "Share with link"
 msgstr ""
 
-#: js/share.js:183
+#: js/share.js:167
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:185 templates/installation.php:44 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr ""
 
-#: js/share.js:189
+#: js/share.js:173
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:190
+#: js/share.js:174
 msgid "Send"
 msgstr ""
 
-#: js/share.js:194
+#: js/share.js:178
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:195
+#: js/share.js:179
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:227
+#: js/share.js:211
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:229
+#: js/share.js:213
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:256
+#: js/share.js:251
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:292
+#: js/share.js:287
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:313
+#: js/share.js:308
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:325
+#: js/share.js:320
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:327
+#: js/share.js:322
 msgid "access control"
 msgstr ""
 
-#: js/share.js:330
+#: js/share.js:325
 msgid "create"
 msgstr ""
 
-#: js/share.js:333
+#: js/share.js:328
 msgid "update"
 msgstr ""
 
-#: js/share.js:336
+#: js/share.js:331
 msgid "delete"
 msgstr ""
 
-#: js/share.js:339
+#: js/share.js:334
 msgid "share"
 msgstr ""
 
-#: js/share.js:373 js/share.js:569
+#: js/share.js:368 js/share.js:564
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:582
+#: js/share.js:577
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:594
+#: js/share.js:589
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:609
+#: js/share.js:604
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:620
+#: js/share.js:615
 msgid "Email sent"
 msgstr ""
 
@@ -387,7 +388,7 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:47
+#: lostpassword/controller.php:48
 msgid "ownCloud password reset"
 msgstr ""
 
@@ -395,24 +396,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:39
-#: 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,115 +472,130 @@ msgstr ""
 msgid "Add"
 msgstr ""
 
-#: templates/installation.php:23 templates/installation.php:30
+#: 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:25
+#: 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:31
+#: 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:32
+#: 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:36
+#: templates/installation.php:44
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
-#: templates/installation.php:52
+#: templates/installation.php:62
 msgid "Advanced"
 msgstr "Ð”Ð°ÑÐ²ÐµÐ´Ñ‡Ð°Ð½Ñ‹"
 
-#: templates/installation.php:54
+#: templates/installation.php:64
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:61
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:66 templates/installation.php:77
-#: templates/installation.php:87 templates/installation.php:97
+#: 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:109
+#: templates/installation.php:137
 msgid "Database user"
 msgstr ""
 
-#: templates/installation.php:113
+#: templates/installation.php:144
 msgid "Database password"
 msgstr ""
 
-#: templates/installation.php:117
+#: templates/installation.php:149
 msgid "Database name"
 msgstr ""
 
-#: templates/installation.php:125
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:131
+#: templates/installation.php:166
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:136
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "Ð—Ð°Ð²ÑÑ€ÑˆÑ‹Ñ†ÑŒ ÑžÑÑ‚Ð°Ð½Ð¾ÑžÐºÑƒ."
 
-#: templates/layout.guest.php:33
+#: templates/layout.guest.php:40
 msgid "web services under your control"
 msgstr ""
 
-#: templates/layout.user.php:48
+#: 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 5c01708ef4db86195177a8cbc7c2a10f546630a9..de9d057f6ad8ca2e0351137561f271797b5ca6c3 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-03-04 00:06+0100\n"
-"PO-Revision-Date: 2013-03-03 23:06+0000\n"
+"POT-Creation-Date: 2013-05-15 01:59+0200\n"
+"PO-Revision-Date: 2013-05-15 00:00+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
 "MIME-Version: 1.0\n"
@@ -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 ""
@@ -70,59 +66,70 @@ msgstr ""
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:10
+#: 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 ""
 
-#: js/fileactions.js:127 templates/index.php:92 templates/index.php:93
+#: 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/files.js:292 js/files.js:408
-#: js/files.js:439
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:251
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:323
+#: 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 ""
@@ -145,77 +152,77 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:225
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:262
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:262
-msgid "Upload Error"
-msgstr ""
-
-#: js/files.js:273
-msgid "Close"
+#: js/files.js:277
+msgid "Not enough space available"
 msgstr ""
 
-#: js/files.js:312
-msgid "1 file uploading"
-msgstr ""
-
-#: js/files.js:315 js/files.js:370 js/files.js:385
-msgid "{count} files uploading"
-msgstr ""
-
-#: js/files.js:388 js/files.js:423
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:497
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:570
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:575
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:953 templates/index.php:68
+#: 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:954 templates/index.php:79
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr ""
 
-#: js/files.js:955 templates/index.php:81
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:974
+#: js/files.js:898
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:976
+#: js/files.js:900
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:984
+#: js/files.js:908
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:986
+#: 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 ""
@@ -268,45 +275,45 @@ msgstr ""
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:42
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:48
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:53
+#: templates/index.php:54
 msgid "You donâ€™t have write permissions here."
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:74
+#: templates/index.php:75
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:86 templates/index.php:87
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr ""
 
-#: templates/index.php:106
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:108
+#: 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:113
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:116
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr ""
 
diff --git a/l10n/be/files_encryption.po b/l10n/be/files_encryption.po
index f1aff43a6c5a1683710bcbe11a050e005d481451..e69ef2d14dc0cb9ab78c358e33ba5e4c3ce08034 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-04-26 10:00+0200\n"
+"PO-Revision-Date: 2013-04-26 08:01+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/be/files_external.po b/l10n/be/files_external.po
index 016c8149190f930e448856d5afa9ba1afc6280ef..142d2eff37ff768bf4001e63dd8f7c71c632b3a2 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-04-26 10:00+0200\n"
+"PO-Revision-Date: 2013-04-26 08:01+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..03a80d8b42d804bcfdf0adf143fe5d7e905fc15a 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-04-26 10:00+0200\n"
+"PO-Revision-Date: 2013-04-26 08:01+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 79e1f2ab9e49b142891dd54e32c9f6d119b2cfae..1953d1cd3db311ecd50f845e4946d377e5ebee6c 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-03-08 00:25+0100\n"
-"PO-Revision-Date: 2013-03-07 23:25+0000\n"
+"POT-Creation-Date: 2013-04-26 10:00+0200\n"
+"PO-Revision-Date: 2013-04-26 08:01+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,12 +17,12 @@ 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/delete.php:40
+#: ajax/delete.php:42
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
 
-#: ajax/undelete.php:41
+#: ajax/undelete.php:42
 #, php-format
 msgid "Couldn't restore %s"
 msgstr ""
@@ -31,6 +31,10 @@ msgstr ""
 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 ""
diff --git a/l10n/be/files_versions.po b/l10n/be/files_versions.po
index 8b4294e5f202ba0032637496d0b30c6a677aea8c..e194db5f43375e0603810062ca7dfe915321f9a6 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-04-26 10:00+0200\n"
+"PO-Revision-Date: 2013-04-26 08: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"
@@ -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..284f8eeb6a7bba1678fcf13ec754009c4acee3ed 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-04-28 01:57+0200\n"
+"PO-Revision-Date: 2013-04-27 23:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
 "MIME-Version: 1.0\n"
@@ -41,19 +41,19 @@ msgstr ""
 msgid "Admin"
 msgstr ""
 
-#: files.php:202
+#: files.php:209
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:203
+#: files.php:210
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:204 files.php:231
+#: files.php:211 files.php:244
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:228
+#: files.php:241
 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,72 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:128 setup.php:320 setup.php:365
+#: setup.php:132 setup.php:325 setup.php:370
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:129 setup.php:152 setup.php:229
+#: setup.php:133 setup.php:156 setup.php:234
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:151 setup.php:453 setup.php:520
+#: setup.php:155 setup.php:458 setup.php:525
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:228
+#: setup.php:233
 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: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:583 setup.php:592 setup.php:600 setup.php:609
+#: setup.php:615
 #, 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:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
+#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
+#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:299
+#: setup.php:304
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:300
+#: setup.php:305
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:305
+#: setup.php:310
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:306
+#: setup.php:311
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:579 setup.php:611
+#: setup.php:584 setup.php:616
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:631
+#: setup.php:636
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:849
+#: setup.php:858
 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:859
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
@@ -239,19 +235,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 22ae916f22aafbce6068102e85bb9022550a5264..9da698983180b35b7e5d911b7e2455ad0ef2b07b 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-02-27 14:35+0100\n"
-"PO-Revision-Date: 2013-02-27 13:35+0000\n"
+"POT-Creation-Date: 2013-04-26 10:00+0200\n"
+"PO-Revision-Date: 2013-04-26 08:00+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
 "MIME-Version: 1.0\n"
@@ -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 ""
 
@@ -92,7 +96,7 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: js/apps.js:36 js/apps.js:64
+#: js/apps.js:36 js/apps.js:64 js/apps.js:83
 msgid "Enable"
 msgstr ""
 
@@ -100,64 +104,64 @@ msgstr ""
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:84
-msgid "Updating...."
+#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+msgid "Error"
 msgstr ""
 
-#: js/apps.js:87
-msgid "Error while updating app"
+#: js/apps.js:90
+msgid "Updating...."
 msgstr ""
 
-#: js/apps.js:87
-msgid "Error"
+#: js/apps.js:93
+msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:90
+#: js/apps.js:96
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:99
+#: js/personal.js:115
 msgid "Saving..."
 msgstr ""
 
-#: js/users.js:30
+#: js/users.js:43
 msgid "deleted"
 msgstr ""
 
-#: js/users.js:30
+#: js/users.js:43
 msgid "undo"
 msgstr ""
 
-#: js/users.js:62
+#: js/users.js:75
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:75 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: templates/users.php:103
 msgid "Groups"
 msgstr ""
 
-#: js/users.js:78 templates/users.php:82 templates/users.php:119
+#: js/users.js:91 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:111 templates/users.php:155
 msgid "Delete"
 msgstr ""
 
-#: js/users.js:191
+#: js/users.js:262
 msgid "add group"
 msgstr ""
 
-#: js/users.js:352
+#: js/users.js:414
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:353 js/users.js:359 js/users.js:374
+#: js/users.js:415 js/users.js:421 js/users.js:436
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:358
+#: js/users.js:420
 msgid "A valid password must be provided"
 msgstr ""
 
@@ -312,15 +316,19 @@ msgstr ""
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:230 templates/personal.php:102
+#: templates/admin.php:228
+msgid "Less"
+msgstr ""
+
+#: templates/admin.php:235 templates/personal.php:100
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:233 templates/personal.php:105
+#: templates/admin.php:238 templates/personal.php:103
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -391,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:77
 msgid "Password"
 msgstr ""
 
@@ -415,82 +423,70 @@ msgstr ""
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:76
 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:84
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:91
+#: templates/personal.php:89
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:93
+#: templates/personal.php:91
 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:75
 msgid "Login Name"
 msgstr ""
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr ""
 
-#: templates/users.php:35
+#: templates/users.php:33
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:39 templates/users.php:133
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:57 templates/users.php:148
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:84
+#: templates/users.php:82
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:95
+#: templates/users.php:93
 msgid "change display name"
 msgstr ""
 
-#: templates/users.php:99
+#: templates/users.php:97
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:134
+#: templates/users.php:128
 msgid "Default"
 msgstr ""
diff --git a/l10n/be/user_ldap.po b/l10n/be/user_ldap.po
index c807e563d2863707e585c93ed0c4157762bd51ea..b922f51102f49c601ea0839fcc795e632d011b54 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-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-17 00:04+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..9e0304b10bc8e81f89232ee3c7986573be82eff3 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-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+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 4b1cd9d3cbc56197aea322beaf773102eed01dec..7d6092b5f47cb278f35cbf9562473396b5e91b7f 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-02-22 00:06+0100\n"
-"PO-Revision-Date: 2013-02-20 23:20+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10: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"
@@ -21,24 +17,24 @@ msgstr ""
 "Language: bg_BG\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:85
+#: ajax/share.php:97
 #, php-format
 msgid "User %s shared a file with you"
 msgstr ""
 
-#: ajax/share.php:87
+#: ajax/share.php:99
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr ""
 
-#: ajax/share.php:89
+#: 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:91
+#: ajax/share.php:104
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -77,173 +73,175 @@ 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 ""
 
-#: js/config.php:32
+#: js/config.php:34
 msgid "Sunday"
-msgstr ""
+msgstr "ÐÐµÐ´ÐµÐ»Ñ"
 
-#: js/config.php:32
+#: js/config.php:35
 msgid "Monday"
-msgstr ""
+msgstr "ÐŸÐ¾Ð½ÐµÐ´ÐµÐ»Ð½Ð¸Ðº"
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Tuesday"
-msgstr ""
+msgstr "Ð’Ñ‚Ð¾Ñ€Ð½Ð¸Ðº"
 
-#: js/config.php:32
+#: js/config.php:37
 msgid "Wednesday"
-msgstr ""
+msgstr "Ð¡Ñ€ÑÐ´Ð°"
 
-#: js/config.php:32
+#: js/config.php:38
 msgid "Thursday"
-msgstr ""
+msgstr "Ð§ÐµÑ‚Ð²ÑŠÑ€Ñ‚ÑŠÐº"
 
-#: js/config.php:32
+#: js/config.php:39
 msgid "Friday"
-msgstr ""
+msgstr "ÐŸÐµÑ‚ÑŠÐº"
 
-#: js/config.php:32
+#: js/config.php:40
 msgid "Saturday"
-msgstr ""
+msgstr "Ð¡ÑŠÐ±Ð¾Ñ‚Ð°"
 
-#: js/config.php:33
+#: js/config.php:45
 msgid "January"
-msgstr ""
+msgstr "Ð¯Ð½ÑƒÐ°Ñ€Ð¸"
 
-#: js/config.php:33
+#: js/config.php:46
 msgid "February"
-msgstr ""
+msgstr "Ð¤ÐµÐ²Ñ€ÑƒÐ°Ñ€Ð¸"
 
-#: js/config.php:33
+#: js/config.php:47
 msgid "March"
-msgstr ""
+msgstr "ÐœÐ°Ñ€Ñ‚"
 
-#: js/config.php:33
+#: js/config.php:48
 msgid "April"
-msgstr ""
+msgstr "ÐÐ¿Ñ€Ð¸Ð»"
 
-#: js/config.php:33
+#: js/config.php:49
 msgid "May"
-msgstr ""
+msgstr "ÐœÐ°Ð¹"
 
-#: js/config.php:33
+#: js/config.php:50
 msgid "June"
-msgstr ""
+msgstr "Ð®Ð½Ð¸"
 
-#: js/config.php:33
+#: js/config.php:51
 msgid "July"
-msgstr ""
+msgstr "Ð®Ð»Ð¸"
 
-#: js/config.php:33
+#: js/config.php:52
 msgid "August"
-msgstr ""
+msgstr "ÐÐ²Ð³ÑƒÑÑ‚"
 
-#: js/config.php:33
+#: js/config.php:53
 msgid "September"
-msgstr ""
+msgstr "Ð¡ÐµÐ¿Ñ‚ÐµÐ¼Ð²Ñ€Ð¸"
 
-#: js/config.php:33
+#: js/config.php:54
 msgid "October"
-msgstr ""
+msgstr "ÐžÐºÑ‚Ð¾Ð¼Ð²Ñ€Ð¸"
 
-#: js/config.php:33
+#: js/config.php:55
 msgid "November"
-msgstr ""
+msgstr "ÐÐ¾ÐµÐ¼Ð²Ñ€Ð¸"
 
-#: js/config.php:33
+#: js/config.php:56
 msgid "December"
-msgstr ""
+msgstr "Ð”ÐµÐºÐµÐ¼Ð²Ñ€Ð¸"
 
 #: js/js.js:286
 msgid "Settings"
 msgstr "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸"
 
-#: js/js.js:767
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "Ð¿Ñ€ÐµÐ´Ð¸ ÑÐµÐºÑƒÐ½Ð´Ð¸"
 
-#: js/js.js:768
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "Ð¿Ñ€ÐµÐ´Ð¸ 1 Ð¼Ð¸Ð½ÑƒÑ‚Ð°"
 
-#: js/js.js:769
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:770
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr "Ð¿Ñ€ÐµÐ´Ð¸ 1 Ñ‡Ð°Ñ"
 
-#: js/js.js:771
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:772
+#: js/js.js:723
 msgid "today"
 msgstr "Ð´Ð½ÐµÑ"
 
-#: js/js.js:773
+#: js/js.js:724
 msgid "yesterday"
 msgstr "Ð²Ñ‡ÐµÑ€Ð°"
 
-#: js/js.js:774
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:775
+#: js/js.js:726
 msgid "last month"
 msgstr "Ð¿Ð¾ÑÐ»ÐµÐ´Ð½Ð¸ÑÑ‚ Ð¼ÐµÑÐµÑ†"
 
-#: js/js.js:776
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:777
+#: js/js.js:728
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:778
+#: js/js.js:729
 msgid "last year"
 msgstr "Ð¿Ð¾ÑÐ»ÐµÐ´Ð½Ð°Ñ‚Ð° Ð³Ð¾Ð´Ð¸Ð½Ð°"
 
-#: js/js.js:779
+#: js/js.js:730
 msgid "years ago"
 msgstr "Ð¿Ð¾ÑÐ»ÐµÐ´Ð½Ð¸Ñ‚Ðµ Ð³Ð¾Ð´Ð¸Ð½Ð¸"
 
-#: js/oc-dialogs.js:126
-msgid "Choose"
-msgstr ""
+#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
+msgid "Ok"
+msgstr "Ð”Ð¾Ð±Ñ€Ðµ"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
 msgid "Cancel"
-msgstr ""
+msgstr "ÐžÑ‚ÐºÐ°Ð·"
 
-#: js/oc-dialogs.js:162
-msgid "No"
+#: js/oc-dialogs.js:185
+msgid "Choose"
 msgstr ""
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:215
 msgid "Yes"
-msgstr ""
+msgstr "Ð”Ð°"
 
-#: js/oc-dialogs.js:180
-msgid "Ok"
-msgstr ""
+#: js/oc-dialogs.js:222
+msgid "No"
+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:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:582
-#: js/share.js:594
+#: 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 "Ð“Ñ€ÐµÑˆÐºÐ°"
 
@@ -255,127 +253,127 @@ msgstr ""
 msgid "The required file {file} is not installed!"
 msgstr ""
 
-#: js/share.js:29 js/share.js:43 js/share.js:90
+#: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr ""
 
-#: js/share.js:93
+#: js/share.js:90
 msgid "Share"
 msgstr "Ð¡Ð¿Ð¾Ð´ÐµÐ»ÑÐ½Ðµ"
 
-#: js/share.js:141 js/share.js:622
+#: js/share.js:125 js/share.js:617
 msgid "Error while sharing"
 msgstr ""
 
-#: js/share.js:152
+#: js/share.js:136
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:159
+#: js/share.js:143
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:168
+#: js/share.js:152
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:170
+#: js/share.js:154
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:175
+#: js/share.js:159
 msgid "Share with"
-msgstr ""
+msgstr "Ð¡Ð¿Ð¾Ð´ÐµÐ»ÐµÐ½Ð¾ Ñ"
 
-#: js/share.js:180
+#: js/share.js:164
 msgid "Share with link"
 msgstr ""
 
-#: js/share.js:183
+#: js/share.js:167
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:185 templates/installation.php:44 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "ÐŸÐ°Ñ€Ð¾Ð»Ð°"
 
-#: js/share.js:189
+#: js/share.js:173
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:190
+#: js/share.js:174
 msgid "Send"
 msgstr ""
 
-#: js/share.js:194
+#: js/share.js:178
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:195
+#: js/share.js:179
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:227
+#: js/share.js:211
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:229
+#: js/share.js:213
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:256
+#: js/share.js:251
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:292
+#: js/share.js:287
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:313
+#: js/share.js:308
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:325
+#: js/share.js:320
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:327
+#: js/share.js:322
 msgid "access control"
 msgstr ""
 
-#: js/share.js:330
+#: js/share.js:325
 msgid "create"
-msgstr ""
+msgstr "ÑÑŠÐ·Ð´Ð°Ð²Ð°Ð½Ðµ"
 
-#: js/share.js:333
+#: js/share.js:328
 msgid "update"
 msgstr ""
 
-#: js/share.js:336
+#: js/share.js:331
 msgid "delete"
 msgstr ""
 
-#: js/share.js:339
+#: js/share.js:334
 msgid "share"
 msgstr ""
 
-#: js/share.js:373 js/share.js:569
+#: js/share.js:368 js/share.js:564
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:582
+#: js/share.js:577
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:594
+#: js/share.js:589
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:609
+#: js/share.js:604
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:620
+#: js/share.js:615
 msgid "Email sent"
 msgstr ""
 
@@ -398,30 +396,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:39
-#: 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"
@@ -433,7 +434,7 @@ msgstr "ÐÐ¾Ð²Ð° Ð¿Ð°Ñ€Ð¾Ð»Ð°"
 
 #: lostpassword/templates/resetpassword.php:11
 msgid "Reset password"
-msgstr ""
+msgstr "ÐÑƒÐ»Ð¸Ñ€Ð°Ð½Ðµ Ð½Ð° Ð¿Ð°Ñ€Ð¾Ð»Ð°"
 
 #: strings.php:5
 msgid "Personal"
@@ -457,139 +458,154 @@ 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"
 msgstr "Ð”Ð¾Ð±Ð°Ð²ÑÐ½Ðµ"
 
-#: templates/installation.php:23 templates/installation.php:30
+#: 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:25
+#: 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:31
+#: 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:32
+#: 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:36
+#: templates/installation.php:44
 msgid "Create an <strong>admin account</strong>"
-msgstr ""
+msgstr "Ð¡ÑŠÐ·Ð´Ð°Ð²Ð°Ð½Ðµ Ð½Ð° <strong>Ð°Ð´Ð¼Ð¸Ð½ Ð¿Ñ€Ð¾Ñ„Ð¸Ð»</strong>"
 
-#: templates/installation.php:52
+#: templates/installation.php:62
 msgid "Advanced"
-msgstr ""
+msgstr "Ð Ð°Ð·ÑˆÐ¸Ñ€ÐµÐ½Ð¾"
 
-#: templates/installation.php:54
+#: templates/installation.php:64
 msgid "Data folder"
-msgstr ""
+msgstr "Ð”Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ð·Ð° Ð´Ð°Ð½Ð½Ð¸"
 
-#: templates/installation.php:61
+#: templates/installation.php:74
 msgid "Configure the database"
-msgstr ""
+msgstr "ÐšÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð¸Ñ€Ð°Ð½Ðµ Ð½Ð° Ð±Ð°Ð·Ð°Ñ‚Ð°"
 
-#: templates/installation.php:66 templates/installation.php:77
-#: templates/installation.php:87 templates/installation.php:97
+#: 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:109
+#: templates/installation.php:137
 msgid "Database user"
-msgstr ""
+msgstr "ÐŸÐ¾Ñ‚Ñ€ÐµÐ±Ð¸Ñ‚ÐµÐ» Ð·Ð° Ð±Ð°Ð·Ð°Ñ‚Ð°"
 
-#: templates/installation.php:113
+#: templates/installation.php:144
 msgid "Database password"
-msgstr ""
+msgstr "ÐŸÐ°Ñ€Ð¾Ð»Ð° Ð·Ð° Ð±Ð°Ð·Ð°Ñ‚Ð°"
 
-#: templates/installation.php:117
+#: templates/installation.php:149
 msgid "Database name"
-msgstr ""
+msgstr "Ð˜Ð¼Ðµ Ð½Ð° Ð±Ð°Ð·Ð°Ñ‚Ð°"
 
-#: templates/installation.php:125
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:131
+#: templates/installation.php:166
 msgid "Database host"
-msgstr ""
+msgstr "Ð¥Ð¾ÑÑ‚ Ð·Ð° Ð±Ð°Ð·Ð°Ñ‚Ð°"
 
-#: templates/installation.php:136
+#: templates/installation.php:172
 msgid "Finish setup"
-msgstr ""
+msgstr "Ð—Ð°Ð²ÑŠÑ€ÑˆÐ²Ð°Ð½Ðµ Ð½Ð° Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸Ñ‚Ðµ"
 
-#: templates/layout.guest.php:33
+#: templates/layout.guest.php:40
 msgid "web services under your control"
 msgstr "ÑƒÐµÐ± ÑƒÑÐ»ÑƒÐ³Ð¸ Ð¿Ð¾Ð´ Ð’Ð°Ñˆ ÐºÐ¾Ð½Ñ‚Ñ€Ð¾Ð»"
 
-#: templates/layout.user.php:48
-msgid "Log out"
+#: templates/layout.user.php:36
+#, php-format
+msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/login.php:10
+#: templates/layout.user.php:61
+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 a7013ebbba82e32282fe3b674b4091db32e37828..160de033ba5fb52dddf19666708e94d966f31e6b 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-03-04 00:06+0100\n"
-"PO-Revision-Date: 2013-03-03 23:06+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10: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,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"
@@ -72,59 +66,70 @@ msgstr "Ð’ÑŠÐ·Ð½Ð¸ÐºÐ½Ð° Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼ Ð¿Ñ€Ð¸ Ð·Ð°Ð¿Ð¸Ñ Ð² Ð´Ð¸ÑÐºÐ°"
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr "ÐÐµÐ²Ð°Ð»Ð¸Ð´Ð½Ð° Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ."
 
-#: appinfo/app.php:10
+#: 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 "Ð˜Ð·Ñ‚Ñ€Ð¸Ð²Ð°Ð½Ðµ Ð·Ð°Ð²Ð¸Ð½Ð°Ð³Ð¸"
 
-#: js/fileactions.js:127 templates/index.php:92 templates/index.php:93
+#: 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/files.js:292 js/files.js:408
-#: js/files.js:439
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "Ð§Ð°ÐºÐ°Ñ‰Ð¾"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "Ð¿Ñ€ÐµÐ¿Ð¾ÐºÑ€Ð¸Ð²Ð°Ð½Ðµ"
 
-#: js/filelist.js:251
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "Ð¾Ñ‚ÐºÐ°Ð·"
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "undo"
 msgstr "Ð²ÑŠÐ·Ñ‚Ð°Ð½Ð¾Ð²ÑÐ²Ð°Ð½Ðµ"
 
-#: js/filelist.js:323
+#: 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 ""
@@ -147,77 +152,77 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:225
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:262
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:262
-msgid "Upload Error"
-msgstr "Ð’ÑŠÐ·Ð½Ð¸ÐºÐ½Ð° Ð³Ñ€ÐµÑˆÐºÐ° Ð¿Ñ€Ð¸ ÐºÐ°Ñ‡Ð²Ð°Ð½ÐµÑ‚Ð¾"
-
-#: js/files.js:273
-msgid "Close"
-msgstr "Ð—Ð°Ñ‚Ð²Ð¾Ñ€Ð¸"
-
-#: js/files.js:312
-msgid "1 file uploading"
+#: js/files.js:277
+msgid "Not enough space available"
 msgstr ""
 
-#: js/files.js:315 js/files.js:370 js/files.js:385
-msgid "{count} files uploading"
-msgstr ""
-
-#: js/files.js:388 js/files.js:423
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "ÐšÐ°Ñ‡Ð²Ð°Ð½ÐµÑ‚Ð¾ Ðµ ÑÐ¿Ñ€ÑÐ½Ð¾."
 
-#: js/files.js:497
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:570
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:575
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:953 templates/index.php:68
+#: 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:954 templates/index.php:79
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Ð Ð°Ð·Ð¼ÐµÑ€"
 
-#: js/files.js:955 templates/index.php:81
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "ÐŸÑ€Ð¾Ð¼ÐµÐ½ÐµÐ½Ð¾"
 
-#: js/files.js:974
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 Ð¿Ð°Ð¿ÐºÐ°"
 
-#: js/files.js:976
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} Ð¿Ð°Ð¿ÐºÐ¸"
 
-#: js/files.js:984
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 Ñ„Ð°Ð¹Ð»"
 
-#: js/files.js:986
+#: 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 "ÐšÐ°Ñ‡Ð²Ð°Ð½Ðµ"
@@ -270,45 +275,45 @@ msgstr "ÐŸÐ°Ð¿ÐºÐ°"
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:42
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:48
 msgid "Cancel upload"
 msgstr "Ð¡Ð¿Ñ€Ð¸ ÐºÐ°Ñ‡Ð²Ð°Ð½ÐµÑ‚Ð¾"
 
-#: templates/index.php:53
+#: templates/index.php:54
 msgid "You donâ€™t have write permissions here."
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "ÐÑÐ¼Ð° Ð½Ð¸Ñ‰Ð¾ Ñ‚ÑƒÐº. ÐšÐ°Ñ‡ÐµÑ‚Ðµ Ð½ÐµÑ‰Ð¾."
 
-#: templates/index.php:74
+#: templates/index.php:75
 msgid "Download"
 msgstr "Ð˜Ð·Ñ‚ÐµÐ³Ð»ÑÐ½Ðµ"
 
-#: templates/index.php:86 templates/index.php:87
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr ""
 
-#: templates/index.php:106
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "Ð¤Ð°Ð¹Ð»ÑŠÑ‚ ÐºÐ¾Ð¹Ñ‚Ð¾ ÑÑ‚Ðµ Ð¸Ð·Ð±Ñ€Ð°Ð»Ð¸ Ð·Ð° ÐºÐ°Ñ‡Ð²Ð°Ð½Ðµ Ðµ Ð¿Ñ€ÐµÐºÐ°Ð»ÐµÐ½Ð¾ Ð³Ð¾Ð»ÑÐ¼"
 
-#: templates/index.php:108
+#: 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:113
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
-msgstr ""
+msgstr "Ð¤Ð°Ð¹Ð»Ð¾Ð²ÐµÑ‚Ðµ ÑÐµ Ð¿Ñ€ÐµÑ‚ÑŠÑ€ÑÐ²Ð°Ñ‚, Ð¸Ð·Ñ‡Ð°ÐºÐ°Ð¹Ñ‚Ðµ."
 
-#: templates/index.php:116
+#: 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..859b65c0eb2b2ed2144c481250615af06cad59f6 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/bg_BG/files_external.po b/l10n/bg_BG/files_external.po
index 0113c0ba14f31c82fc914b66b9885043b3b3abbf..8c95fe66a347271938ac2ddd6a795305661e0e35 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-02-28 00:04+0100\n"
-"PO-Revision-Date: 2013-02-27 23:04+0000\n"
+"POT-Creation-Date: 2013-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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: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 "Ð’ÑŠÐ½ÑˆÐ½Ð¾ Ñ…Ñ€Ð°Ð½Ð¸Ð»Ð¸Ñ‰Ðµ"
 
 #: 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..156d054e77bc5263a426481c467636fc8c00f167 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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 794a8d34f60e021c87c0686efe31c4ea70545773..76a4f6c92688d10bec5719a974f33e404dcfd2f6 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-03-08 00:25+0100\n"
-"PO-Revision-Date: 2013-03-07 23:25+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -19,12 +17,12 @@ msgstr ""
 "Language: bg_BG\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:40
+#: ajax/delete.php:42
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "ÐÐµÐ²ÑŠÐ·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¸Ð·Ñ‚Ñ€Ð¸Ð²Ð°Ð½Ðµ Ð½Ð° %s Ð·Ð°Ð²Ð¸Ð½Ð°Ð³Ð¸"
 
-#: ajax/undelete.php:41
+#: ajax/undelete.php:42
 #, php-format
 msgid "Couldn't restore %s"
 msgstr "ÐÐµÐ²ÑŠÐ·Ð¼Ð¾Ð¶Ð½Ð¾ Ð²ÑŠÐ·Ñ‚Ð°Ð½Ð¾Ð²ÑÐ²Ð°Ð½Ðµ Ð½Ð° %s"
@@ -33,6 +31,10 @@ msgstr "ÐÐµÐ²ÑŠÐ·Ð¼Ð¾Ð¶Ð½Ð¾ Ð²ÑŠÐ·Ñ‚Ð°Ð½Ð¾Ð²ÑÐ²Ð°Ð½Ðµ Ð½Ð° %s"
 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 "Ð¸Ð·Ñ‚Ñ€Ð¸Ð²Ð°Ð½Ðµ Ð½Ð° Ñ„Ð°Ð¹Ð»Ð° Ð·Ð°Ð²Ð¸Ð½Ð°Ð³Ð¸"
@@ -79,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..d01c393db1e25f107508a7d9f012bebee1297951 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:30+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 62eed2e5d4d40ed1c6953d9d087f168e772a79ae..5ba599532f7be8a0d083034d9dcc87e53449539a 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-03-04 00:06+0100\n"
-"PO-Revision-Date: 2013-03-03 16:50+0000\n"
-"Last-Translator: Kiril <neohidra@gmail.com>\n"
+"POT-Creation-Date: 2013-04-28 01:57+0200\n"
+"PO-Revision-Date: 2013-04-27 23:57+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"
@@ -43,19 +41,19 @@ msgstr "ÐŸÑ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ"
 msgid "Admin"
 msgstr "ÐÐ´Ð¼Ð¸Ð½"
 
-#: files.php:202
+#: files.php:209
 msgid "ZIP download is turned off."
 msgstr "Ð˜Ð·Ñ‚ÐµÐ³Ð»ÑÐ½ÐµÑ‚Ð¾ ÐºÐ°Ñ‚Ð¾ ZIP Ðµ Ð¸Ð·ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¾."
 
-#: files.php:203
+#: files.php:210
 msgid "Files need to be downloaded one by one."
 msgstr "Ð¤Ð°Ð¹Ð»Ð¾Ð²ÐµÑ‚Ðµ Ñ‚Ñ€ÑÐ±Ð²Ð° Ð´Ð° ÑÐµ Ð¸Ð·Ñ‚ÐµÐ³Ð»ÑÑ‚ ÐµÐ´Ð¸Ð½ Ð¿Ð¾ ÐµÐ´Ð¸Ð½."
 
-#: files.php:204 files.php:231
+#: files.php:211 files.php:244
 msgid "Back to Files"
 msgstr "ÐÐ°Ð·Ð°Ð´ ÐºÑŠÐ¼ Ñ„Ð°Ð¹Ð»Ð¾Ð²ÐµÑ‚Ðµ"
 
-#: files.php:228
+#: files.php:241
 msgid "Selected files too large to generate zip file."
 msgstr "Ð˜Ð·Ð±Ñ€Ð°Ð½Ð¸Ñ‚Ðµ Ñ„Ð°Ð¹Ð»Ð¾Ð²Ðµ ÑÐ° Ð¿Ñ€ÐµÐºÐ°Ð»ÐµÐ½Ð¾ Ð³Ð¾Ð»ÐµÐ¼Ð¸ Ð·Ð° Ð³ÐµÐ½ÐµÑ€Ð¸Ñ€Ð°Ð½ÐµÑ‚Ð¾ Ð½Ð° ZIP Ð°Ñ€Ñ…Ð¸Ð²."
 
@@ -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,72 @@ msgstr "%s, Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð´Ð° Ð¿Ð¾Ð»Ð·Ð²Ð°Ñ‚Ðµ Ñ‚Ð¾Ñ‡ÐºÐ¸ Ð² Ð¸Ð¼ÐµÑ‚Ð¾ Ð½
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:128 setup.php:320 setup.php:365
+#: setup.php:132 setup.php:325 setup.php:370
 msgid "PostgreSQL username and/or password not valid"
 msgstr "ÐÐµÐ²Ð°Ð»Ð¸Ð´Ð½Ð¾ PostgreSQL Ð¿Ð¾Ñ‚Ñ€ÐµÐ±Ð¸Ñ‚ÐµÐ»ÑÐºÐ¾ Ð¸Ð¼Ðµ Ð¸/Ð¸Ð»Ð¸ Ð¿Ð°Ñ€Ð¾Ð»Ð°"
 
-#: setup.php:129 setup.php:152 setup.php:229
+#: setup.php:133 setup.php:156 setup.php:234
 msgid "You need to enter either an existing account or the administrator."
 msgstr "ÐÐµÐ¾Ð±Ñ…Ð¾Ð´Ð¸Ð¼Ð¾ Ðµ Ð´Ð° Ð²Ð»ÐµÐ·ÐµÑ‚Ðµ Ð² Ð²ÑÑŠÑ‰ÐµÑÑ‚Ð²ÑƒÐ²Ð°Ñ‰ Ð°ÐºÐ°ÑƒÐ½Ñ‚ Ð¸Ð»Ð¸ ÐºÐ°Ñ‚Ð¾ Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑ‚Ñ€Ð°Ñ‚Ð¾Ñ€Ð°"
 
-#: setup.php:151 setup.php:453 setup.php:520
+#: setup.php:155 setup.php:458 setup.php:525
 msgid "Oracle username and/or password not valid"
 msgstr "ÐÐµÐ²Ð°Ð»Ð¸Ð´Ð½Ð¾ Oracle Ð¿Ð¾Ñ‚Ñ€ÐµÐ±Ð¸Ñ‚ÐµÐ»ÑÐºÐ¾ Ð¸Ð¼Ðµ Ð¸/Ð¸Ð»Ð¸ Ð¿Ð°Ñ€Ð¾Ð»Ð°"
 
-#: setup.php:228
+#: setup.php:233
 msgid "MySQL username and/or password not valid"
 msgstr "ÐÐµÐ²Ð°Ð»Ð¸Ð´Ð½Ð¾ MySQL Ð¿Ð¾Ñ‚Ñ€ÐµÐ±Ð¸Ñ‚ÐµÐ»ÑÐºÐ¾ Ð¸Ð¼Ðµ Ð¸/Ð¸Ð»Ð¸ Ð¿Ð°Ñ€Ð¾Ð»Ð°"
 
-#: 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: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:583 setup.php:592 setup.php:600 setup.php:609
+#: setup.php:615
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Ð“Ñ€ÐµÑˆÐºÐ° Ð² Ð±Ð°Ð·Ð°Ñ‚Ð° Ð¾Ñ‚ Ð´Ð°Ð½Ð½Ð¸: \"%s\""
 
-#: 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:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
+#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
+#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:299
+#: setup.php:304
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "MySQL Ð¿Ð¾Ñ‚Ñ€ÐµÐ±Ð¸Ñ‚ÐµÐ»ÑÑ‚ '%s'@'localhost' Ð²ÐµÑ‡Ðµ ÑÑŠÑ‰ÐµÑÑ‚Ð²ÑƒÐ²Ð°"
 
-#: setup.php:300
+#: setup.php:305
 msgid "Drop this user from MySQL"
 msgstr "Ð˜Ð·Ñ‚Ñ€Ð¸Ð²Ð°Ð½Ðµ Ð½Ð° Ð¿Ð¾Ñ‚Ñ€ÐµÐ±Ð¸Ñ‚ÐµÐ»Ñ Ð¾Ñ‚ MySQL"
 
-#: setup.php:305
+#: setup.php:310
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "MySQL Ð¿Ð¾Ñ‚Ñ€ÐµÐ±Ð¸Ñ‚ÐµÐ»ÑÑ‚  '%s'@'%%' Ð²ÐµÑ‡Ðµ ÑÑŠÑ‰ÐµÑÑ‚Ð²ÑƒÐ²Ð°."
 
-#: setup.php:306
+#: setup.php:311
 msgid "Drop this user from MySQL."
 msgstr "Ð˜Ð·Ñ‚Ñ€Ð¸Ð²Ð°Ð½Ðµ Ð½Ð° Ð¿Ð¾Ñ‚Ñ€ÐµÐ±Ð¸Ñ‚ÐµÐ»Ñ Ð¾Ñ‚ MySQL."
 
-#: setup.php:579 setup.php:611
+#: setup.php:584 setup.php:616
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:631
+#: setup.php:636
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr "ÐÐµÐ²Ð°Ð»Ð¸Ð´Ð½Ð¾ MS SQL Ð¿Ð¾Ñ‚Ñ€ÐµÐ±Ð¸Ñ‚ÐµÐ»ÑÐºÐ¾ Ð¸Ð¼Ðµ Ð¸/Ð¸Ð»Ð¸ Ð¿Ð°Ñ€Ð¾Ð»Ð°: %s"
 
-#: setup.php:849
+#: setup.php:858
 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:859
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "ÐœÐ¾Ð»Ñ Ð½Ð°Ð¿Ñ€Ð°Ð²ÐµÑ‚Ðµ Ð¿Ð¾Ð²Ñ‚Ð¾Ñ€Ð½Ð° ÑÐ¿Ñ€Ð°Ð²ÐºÐ° Ñ <a href='%s'>Ñ€ÑŠÐºÐ¾Ð²Ð¾Ð´ÑÑ‚Ð²Ð¾Ñ‚Ð¾ Ð·Ð° Ð¸Ð½ÑÑ‚Ð°Ð»Ð¸Ñ€Ð°Ð½Ðµ</a>."
@@ -241,19 +235,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 4a17d6cb1fdfb1ffec288143af01c22a83db07a1..e6d0abbf8598fd50f2409e0a3e5b49720d8e62c3 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-03-04 00:06+0100\n"
-"PO-Revision-Date: 2013-03-03 16:20+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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,13 +90,13 @@ msgstr ""
 
 #: js/apps.js:30
 msgid "Update to {appversion}"
-msgstr ""
+msgstr "ÐžÐ±Ð½Ð¾Ð²ÑÐ²Ð°Ð½Ðµ Ð´Ð¾ {appversion}"
 
 #: js/apps.js:36 js/apps.js:76
 msgid "Disable"
 msgstr "Ð˜Ð·ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¾"
 
-#: js/apps.js:36 js/apps.js:64
+#: js/apps.js:36 js/apps.js:64 js/apps.js:83
 msgid "Enable"
 msgstr "Ð’ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¾"
 
@@ -103,68 +104,68 @@ msgstr "Ð’ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¾"
 msgid "Please wait...."
 msgstr "ÐœÐ¾Ð»Ñ Ð¿Ð¾Ñ‡Ð°ÐºÐ°Ð¹Ñ‚Ðµ...."
 
-#: js/apps.js:84
+#: 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:87
+#: js/apps.js:93
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:87
-msgid "Error"
-msgstr "Ð“Ñ€ÐµÑˆÐºÐ°"
-
-#: js/apps.js:90
+#: js/apps.js:96
 msgid "Updated"
 msgstr "ÐžÐ±Ð½Ð¾Ð²ÐµÐ½Ð¾"
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr "Ð—Ð°Ð¿Ð¸ÑÐ²Ð°Ð½Ðµ..."
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "deleted"
 msgstr "Ð¸Ð·Ñ‚Ñ€Ð¸Ñ‚Ð¾"
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "undo"
 msgstr "Ð²ÑŠÐ·Ñ‚Ð°Ð½Ð¾Ð²ÑÐ²Ð°Ð½Ðµ"
 
-#: js/users.js:62
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:75 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
+#: templates/users.php:103
 msgid "Groups"
 msgstr "Ð“Ñ€ÑƒÐ¿Ð¸"
 
-#: js/users.js:78 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "Ð˜Ð·Ñ‚Ñ€Ð¸Ð²Ð°Ð½Ðµ"
 
-#: js/users.js:191
+#: js/users.js:269
 msgid "add group"
-msgstr ""
+msgstr "Ð½Ð¾Ð²Ð° Ð³Ñ€ÑƒÐ¿Ð°"
 
-#: js/users.js:352
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:353 js/users.js:359 js/users.js:374
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:358
+#: js/users.js:426
 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,15 +316,19 @@ msgstr ""
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
 msgstr "ÐžÑ‰Ðµ"
 
-#: templates/admin.php:230 templates/personal.php:102
+#: templates/admin.php:228
+msgid "Less"
+msgstr "ÐŸÐ¾-Ð¼Ð°Ð»ÐºÐ¾"
+
+#: templates/admin.php:235 templates/personal.php:105
 msgid "Version"
 msgstr "Ð’ÐµÑ€ÑÐ¸Ñ"
 
-#: templates/admin.php:233 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 "
@@ -394,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:77
 msgid "Password"
 msgstr "ÐŸÐ°Ñ€Ð¾Ð»Ð°"
 
@@ -418,82 +423,70 @@ msgstr "ÐÐ¾Ð²Ð° Ð¿Ð°Ñ€Ð¾Ð»Ð°"
 msgid "Change password"
 msgstr "ÐŸÑ€Ð¾Ð¼ÑÐ½Ð° Ð½Ð° Ð¿Ð°Ñ€Ð¾Ð»Ð°Ñ‚Ð°"
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:76
 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 "E-mail"
 
-#: templates/personal.php:72
+#: templates/personal.php:70
 msgid "Your email address"
 msgstr "Ð’Ð°ÑˆÐ¸Ñ email Ð°Ð´Ñ€ÐµÑ"
 
-#: templates/personal.php:73
+#: templates/personal.php:71
 msgid "Fill in an email address to enable password recovery"
-msgstr ""
+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 "WebDAV"
 
-#: 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:75
 msgid "Login Name"
 msgstr "ÐŸÐ¾Ñ‚Ñ€ÐµÐ±Ð¸Ñ‚ÐµÐ»"
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr "Ð¡ÑŠÐ·Ð´Ð°Ð²Ð°Ð½Ðµ"
 
-#: templates/users.php:35
+#: templates/users.php:33
 msgid "Default Storage"
 msgstr "Ð¥Ñ€Ð°Ð½Ð¸Ð»Ð¸Ñ‰Ðµ Ð¿Ð¾ Ð¿Ð¾Ð´Ñ€Ð°Ð·Ð±Ð¸Ñ€Ð°Ð½Ðµ"
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:39 templates/users.php:133
 msgid "Unlimited"
 msgstr "ÐÐµÐ¾Ð³Ñ€Ð°Ð½Ð¸Ñ‡ÐµÐ½Ð¾"
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:57 templates/users.php:148
 msgid "Other"
 msgstr "Ð”Ñ€ÑƒÐ³Ð¸"
 
-#: templates/users.php:84
+#: templates/users.php:82
 msgid "Storage"
 msgstr "Ð¥Ñ€Ð°Ð½Ð¸Ð»Ð¸Ñ‰Ðµ"
 
-#: templates/users.php:95
+#: templates/users.php:93
 msgid "change display name"
 msgstr ""
 
-#: templates/users.php:99
+#: templates/users.php:97
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:134
+#: templates/users.php:128
 msgid "Default"
 msgstr "ÐŸÐ¾ Ð¿Ð¾Ð´Ñ€Ð°Ð·Ð±Ð¸Ñ€Ð°Ð½Ðµ"
diff --git a/l10n/bg_BG/user_ldap.po b/l10n/bg_BG/user_ldap.po
index 43ed372ee085a76bda2fe35e74711485eda09585..0859379edb34647066a9c9b7d3c2adf51abfbca1 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-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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..2d321a7650492e476586ca23d6625cb71259122b 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-04-24 01:57+0200\n"
+"PO-Revision-Date: 2013-04-23 09:40+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 4bac9a5d5fb4884248655187d3c3e7d8d46967cc..ffb1faa6bd9a883afc707686efd513ac60fd6ae2 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-02-22 00:06+0100\n"
-"PO-Revision-Date: 2013-02-20 23:20+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10: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"
@@ -19,24 +17,24 @@ msgstr ""
 "Language: bn_BD\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:85
+#: ajax/share.php:97
 #, php-format
 msgid "User %s shared a file with you"
 msgstr "%s à¦¨à¦¾à¦®à§‡à¦° à¦¬à§à¦¯à¦¬à¦¹à¦¾à¦°à¦•à¦¾à¦°à¦¿ à¦†à¦ªà¦¨à¦¾à¦° à¦¸à¦¾à¦¥à§‡ à¦à¦•à¦Ÿà¦¾ à¦«à¦¾à¦‡à¦² à¦à¦¾à¦—à¦¾à¦à¦¾à¦—à¦¿ à¦•à¦°à§‡à¦›à§‡à¦¨"
 
-#: ajax/share.php:87
+#: ajax/share.php:99
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr "%s à¦¨à¦¾à¦®à§‡à¦° à¦¬à§à¦¯à¦¬à¦¹à¦¾à¦°à¦•à¦¾à¦°à¦¿ à¦†à¦ªà¦¨à¦¾à¦° à¦¸à¦¾à¦¥à§‡ à¦à¦•à¦Ÿà¦¾ à¦«à§‹à¦²à§à¦¡à¦¾à¦° à¦à¦¾à¦—à¦¾à¦à¦¾à¦—à¦¿ à¦•à¦°à§‡à¦›à§‡à¦¨"
 
-#: ajax/share.php:89
+#: ajax/share.php:101
 #, php-format
 msgid ""
 "User %s shared the file \"%s\" with you. It is available for download here: "
 "%s"
 msgstr "%s à¦¨à¦¾à¦®à§‡à¦° à¦¬à§à¦¯à¦¬à¦¹à¦¾à¦°à¦•à¦¾à¦°à§€ \"%s\" à¦«à¦¾à¦‡à¦²à¦Ÿà¦¿ à¦†à¦ªà¦¨à¦¾à¦° à¦¸à¦¾à¦¥à§‡ à¦à¦¾à¦—à¦¾à¦à¦¾à¦—à¦¿ à¦•à¦°à§‡à¦›à§‡à¦¨à¥¤ à¦à¦Ÿà¦¿ à¦à¦–à¦¨ à¦à¦–à¦¾à¦¨à§‡ à¦¡à¦¾à¦‰à¦¨à¦²à§‹à¦¡ à¦•à¦°à¦¾à¦° à¦œà¦¨à§à¦¯ à¦¸à§à¦²à¦à¦ƒ %s"
 
-#: ajax/share.php:91
+#: ajax/share.php:104
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -75,86 +73,86 @@ 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
 msgid "Error removing %s from favorites."
 msgstr "à¦ªà§à¦°à¦¿à§Ÿ à¦¥à§‡à¦•à§‡ %s à¦¸à¦°à¦¿à§Ÿà§‡ à¦«à§‡à¦²à¦¤à§‡ à¦¸à¦®à¦¸à§à¦¯à¦¾ à¦¦à§‡à¦–à¦¾ à¦¦à¦¿à§Ÿà§‡à¦›à§‡à¥¤"
 
-#: js/config.php:32
+#: js/config.php:34
 msgid "Sunday"
 msgstr "à¦°à¦¬à¦¿à¦¬à¦¾à¦°"
 
-#: js/config.php:32
+#: js/config.php:35
 msgid "Monday"
 msgstr "à¦¸à§‹à¦®à¦¬à¦¾à¦°"
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Tuesday"
 msgstr "à¦®à¦™à§à¦—à¦²à¦¬à¦¾à¦°"
 
-#: js/config.php:32
+#: js/config.php:37
 msgid "Wednesday"
 msgstr "à¦¬à§à¦§à¦¬à¦¾à¦°"
 
-#: js/config.php:32
+#: js/config.php:38
 msgid "Thursday"
-msgstr "à¦¬à§ƒà¦¹à¦·à§à¦ªà¦¤à¦¿à¦¬à¦¾à¦°"
+msgstr "à¦¬à§ƒà¦¹à¦¸à§à¦ªà¦¤à¦¿à¦¬à¦¾à¦°"
 
-#: js/config.php:32
+#: js/config.php:39
 msgid "Friday"
 msgstr "à¦¶à§à¦•à§à¦°à¦¬à¦¾à¦°"
 
-#: js/config.php:32
+#: js/config.php:40
 msgid "Saturday"
 msgstr "à¦¶à¦¨à¦¿à¦¬à¦¾à¦°"
 
-#: js/config.php:33
+#: js/config.php:45
 msgid "January"
 msgstr "à¦œà¦¾à¦¨à§à§Ÿà¦¾à¦°à¦¿"
 
-#: js/config.php:33
+#: js/config.php:46
 msgid "February"
 msgstr "à¦«à§‡à¦¬à§à¦°à§à§Ÿà¦¾à¦°à¦¿"
 
-#: js/config.php:33
+#: js/config.php:47
 msgid "March"
 msgstr "à¦®à¦¾à¦°à§à¦š"
 
-#: js/config.php:33
+#: js/config.php:48
 msgid "April"
 msgstr "à¦à¦ªà§à¦°à¦¿à¦²"
 
-#: js/config.php:33
+#: js/config.php:49
 msgid "May"
 msgstr "à¦®à§‡"
 
-#: js/config.php:33
+#: js/config.php:50
 msgid "June"
 msgstr "à¦œà§à¦¨"
 
-#: js/config.php:33
+#: js/config.php:51
 msgid "July"
 msgstr "à¦œà§à¦²à¦¾à¦‡"
 
-#: js/config.php:33
+#: js/config.php:52
 msgid "August"
 msgstr "à¦…à¦—à¦¾à¦·à§à¦Ÿ"
 
-#: js/config.php:33
+#: js/config.php:53
 msgid "September"
 msgstr "à¦¸à§‡à¦ªà§à¦Ÿà§‡à¦®à§à¦¬à¦°"
 
-#: js/config.php:33
+#: js/config.php:54
 msgid "October"
 msgstr "à¦…à¦•à§à¦Ÿà§‹à¦¬à¦°"
 
-#: js/config.php:33
+#: js/config.php:55
 msgid "November"
 msgstr "à¦¨à¦à§‡à¦®à§à¦¬à¦°"
 
-#: js/config.php:33
+#: js/config.php:56
 msgid "December"
 msgstr "à¦¡à¦¿à¦¸à§‡à¦®à§à¦¬à¦°"
 
@@ -162,86 +160,88 @@ msgstr "à¦¡à¦¿à¦¸à§‡à¦®à§à¦¬à¦°"
 msgid "Settings"
 msgstr "à¦¨à¦¿à§Ÿà¦¾à¦®à¦•à¦¸à¦®à§‚à¦¹"
 
-#: js/js.js:767
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "à¦¸à§‡à¦•à§‡à¦¨à§à¦¡ à¦ªà§‚à¦°à§à¦¬à§‡"
 
-#: js/js.js:768
+#: js/js.js:719
 msgid "1 minute ago"
-msgstr "1 à¦®à¦¿à¦¨à¦¿à¦Ÿ à¦ªà§‚à¦°à§à¦¬à§‡"
+msgstr "à§§ à¦®à¦¿à¦¨à¦¿à¦Ÿ à¦ªà§‚à¦°à§à¦¬à§‡"
 
-#: js/js.js:769
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr "{minutes} à¦®à¦¿à¦¨à¦¿à¦Ÿ à¦ªà§‚à¦°à§à¦¬à§‡"
 
-#: js/js.js:770
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr "1 à¦˜à¦¨à§à¦Ÿà¦¾ à¦ªà§‚à¦°à§à¦¬à§‡"
 
-#: js/js.js:771
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr "{hours} à¦˜à¦¨à§à¦Ÿà¦¾ à¦ªà§‚à¦°à§à¦¬à§‡"
 
-#: js/js.js:772
+#: js/js.js:723
 msgid "today"
 msgstr "à¦†à¦œ"
 
-#: js/js.js:773
+#: js/js.js:724
 msgid "yesterday"
 msgstr "à¦—à¦¤à¦•à¦¾à¦²"
 
-#: js/js.js:774
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr "{days} à¦¦à¦¿à¦¨ à¦ªà§‚à¦°à§à¦¬à§‡"
 
-#: js/js.js:775
+#: js/js.js:726
 msgid "last month"
-msgstr "à¦—à¦¤à¦®à¦¾à¦¸"
+msgstr "à¦—à¦¤ à¦®à¦¾à¦¸"
 
-#: js/js.js:776
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr "{months} à¦®à¦¾à¦¸ à¦ªà§‚à¦°à§à¦¬à§‡"
 
-#: js/js.js:777
+#: js/js.js:728
 msgid "months ago"
 msgstr "à¦®à¦¾à¦¸ à¦ªà§‚à¦°à§à¦¬à§‡"
 
-#: js/js.js:778
+#: js/js.js:729
 msgid "last year"
 msgstr "à¦—à¦¤ à¦¬à¦›à¦°"
 
-#: js/js.js:779
+#: js/js.js:730
 msgid "years ago"
 msgstr "à¦¬à¦›à¦° à¦ªà§‚à¦°à§à¦¬à§‡"
 
-#: js/oc-dialogs.js:126
-msgid "Choose"
-msgstr "à¦¬à§‡à¦›à§‡ à¦¨à¦¿à¦¨"
+#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
+msgid "Ok"
+msgstr "à¦¤à¦¥à¦¾à¦¸à§à¦¤à§"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
 msgid "Cancel"
 msgstr "à¦¬à¦¾à¦¤à¦¿à¦°"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "à¦¨à¦¾"
+#: js/oc-dialogs.js:185
+msgid "Choose"
+msgstr "à¦¬à§‡à¦›à§‡ à¦¨à¦¿à¦¨"
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:215
 msgid "Yes"
 msgstr "à¦¹à§à¦¯à¦¾à¦"
 
-#: js/oc-dialogs.js:180
-msgid "Ok"
-msgstr "à¦¤à¦¥à¦¾à¦¸à§à¦¤à§"
+#: js/oc-dialogs.js:222
+msgid "No"
+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:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:582
-#: js/share.js:594
+#: 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 "à¦¸à¦®à¦¸à§à¦¯à¦¾"
 
@@ -253,127 +253,127 @@ msgstr "à¦…à§à¦¯à¦¾à¦ªà§‡à¦° à¦¨à¦¾à¦®à¦Ÿà¦¿  à¦¸à§à¦¨à¦¿à¦°à§à¦¦à¦¿à¦·à§à¦Ÿ
 msgid "The required file {file} is not installed!"
 msgstr "à¦†à¦¬à¦¶à§à¦¯à¦¿à¦• {file} à¦Ÿà¦¿ à¦¸à¦‚à¦¸à§à¦¥à¦¾à¦ªà¦¿à¦¤ à¦¨à§‡à¦‡ !"
 
-#: js/share.js:29 js/share.js:43 js/share.js:90
+#: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr "à¦à¦¾à¦—à¦¾à¦à¦¾à¦—à¦¿à¦•à§ƒà¦¤"
 
-#: js/share.js:93
+#: js/share.js:90
 msgid "Share"
 msgstr "à¦à¦¾à¦—à¦¾à¦à¦¾à¦—à¦¿ à¦•à¦°"
 
-#: js/share.js:141 js/share.js:622
+#: js/share.js:125 js/share.js:617
 msgid "Error while sharing"
 msgstr "à¦à¦¾à¦—à¦¾à¦à¦¾à¦—à¦¿ à¦•à¦°à¦¤à§‡ à¦¸à¦®à¦¸à§à¦¯à¦¾ à¦¦à§‡à¦–à¦¾ à¦¦à¦¿à§Ÿà§‡à¦›à§‡  "
 
-#: js/share.js:152
+#: js/share.js:136
 msgid "Error while unsharing"
 msgstr "à¦à¦¾à¦—à¦¾à¦à¦¾à¦—à¦¿ à¦¬à¦¾à¦¤à¦¿à¦² à¦•à¦°à¦¤à§‡ à¦¸à¦®à¦¸à§à¦¯à¦¾ à¦¦à§‡à¦–à¦¾ à¦¦à¦¿à§Ÿà§‡à¦›à§‡"
 
-#: js/share.js:159
+#: js/share.js:143
 msgid "Error while changing permissions"
 msgstr "à¦…à¦¨à§à¦®à¦¤à¦¿à¦¸à¦®à§‚à¦¹  à¦ªà¦°à¦¿à¦¬à¦°à§à¦¤à¦¨ à¦•à¦°à¦¤à§‡ à¦¸à¦®à¦¸à§à¦¯à¦¾ à¦¦à§‡à¦–à¦¾ à¦¦à¦¿à§Ÿà§‡à¦›à§‡"
 
-#: js/share.js:168
+#: js/share.js:152
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "{owner} à¦†à¦ªà¦¨à¦¾à¦° à¦à¦¬à¦‚ {group} à¦—à§‹à¦·à§à¦ à§€à¦° à¦¸à¦¾à¦¥à§‡ à¦à¦¾à¦—à¦¾à¦à¦¾à¦—à¦¿ à¦•à¦°à§‡à¦›à§‡à¦¨"
 
-#: js/share.js:170
+#: js/share.js:154
 msgid "Shared with you by {owner}"
 msgstr "{owner} à¦†à¦ªà¦¨à¦¾à¦° à¦¸à¦¾à¦¥à§‡ à¦à¦¾à¦—à¦¾à¦à¦¾à¦—à¦¿ à¦•à¦°à§‡à¦›à§‡à¦¨"
 
-#: js/share.js:175
+#: js/share.js:159
 msgid "Share with"
 msgstr "à¦¯à¦¾à¦¦à§‡à¦° à¦¸à¦¾à¦¥à§‡ à¦à¦¾à¦—à¦¾à¦à¦¾à¦—à¦¿ à¦•à¦°à¦¾ à¦¹à§Ÿà§‡à¦›à§‡"
 
-#: js/share.js:180
+#: js/share.js:164
 msgid "Share with link"
 msgstr "à¦²à¦¿à¦‚à¦•à§‡à¦° à¦¸à¦¾à¦¥à§‡ à¦à¦¾à¦—à¦¾à¦à¦¾à¦—à¦¿ à¦•à¦°"
 
-#: js/share.js:183
+#: js/share.js:167
 msgid "Password protect"
 msgstr "à¦•à§‚à¦Ÿà¦¶à¦¬à§à¦¦ à¦¸à§à¦°à¦•à§à¦·à¦¿à¦¤"
 
-#: js/share.js:185 templates/installation.php:44 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "à¦•à§‚à¦Ÿà¦¶à¦¬à§à¦¦"
 
-#: js/share.js:189
+#: js/share.js:173
 msgid "Email link to person"
 msgstr "à¦¬à§à¦¯à¦•à§à¦¤à¦¿à¦° à¦¸à¦¾à¦¥à§‡ à¦‡-à¦®à§‡à¦‡à¦² à¦¯à§à¦•à§à¦¤ à¦•à¦°"
 
-#: js/share.js:190
+#: js/share.js:174
 msgid "Send"
 msgstr "à¦ªà¦¾à¦ à¦¾à¦“"
 
-#: js/share.js:194
+#: js/share.js:178
 msgid "Set expiration date"
 msgstr "à¦®à§‡à§Ÿà¦¾à¦¦à§‹à¦¤à§à¦¤à§€à¦°à§à¦£ à¦¹à¦“à§Ÿà¦¾à¦° à¦¤à¦¾à¦°à¦¿à¦– à¦¨à¦¿à¦°à§à¦§à¦¾à¦°à¦£ à¦•à¦°à§à¦¨"
 
-#: js/share.js:195
+#: js/share.js:179
 msgid "Expiration date"
 msgstr "à¦®à§‡à§Ÿà¦¾à¦¦à§‹à¦¤à§à¦¤à§€à¦°à§à¦£ à¦¹à¦“à§Ÿà¦¾à¦° à¦¤à¦¾à¦°à¦¿à¦–"
 
-#: js/share.js:227
+#: js/share.js:211
 msgid "Share via email:"
 msgstr "à¦‡-à¦®à§‡à¦‡à¦²à§‡à¦° à¦®à¦¾à¦§à§à¦¯à¦®à§‡ à¦à¦¾à¦—à¦¾à¦à¦¾à¦—à¦¿ à¦•à¦°à§à¦¨à¦ƒ"
 
-#: js/share.js:229
+#: js/share.js:213
 msgid "No people found"
 msgstr "à¦•à§‹à¦¨ à¦¬à§à¦¯à¦•à§à¦¤à¦¿ à¦–à§à¦à¦œà§‡ à¦ªà¦¾à¦“à§Ÿà¦¾ à¦—à§‡à¦² à¦¨à¦¾"
 
-#: js/share.js:256
+#: js/share.js:251
 msgid "Resharing is not allowed"
 msgstr "à¦ªà§‚à¦¨à¦ƒà¦°à¦¾à§Ÿ à¦à¦¾à¦—à¦¾à¦à¦¾à¦—à¦¿ à¦…à¦¨à§à¦®à§‹à¦¦à¦¿à¦¤ à¦¨à§Ÿ"
 
-#: js/share.js:292
+#: js/share.js:287
 msgid "Shared in {item} with {user}"
 msgstr "{user} à¦à¦° à¦¸à¦¾à¦¥à§‡ {item} à¦à¦¾à¦—à¦¾à¦à¦¾à¦—à¦¿ à¦•à¦°à¦¾ à¦¹à§Ÿà§‡à¦›à§‡"
 
-#: js/share.js:313
+#: js/share.js:308
 msgid "Unshare"
-msgstr "à¦à¦¾à¦—à¦¾à¦à¦¾à¦—à¦¿ à¦¬à¦¾à¦¤à¦¿à¦² à¦•à¦°"
+msgstr "à¦à¦¾à¦—à¦¾à¦à¦¾à¦—à¦¿ à¦¬à¦¾à¦¤à¦¿à¦² "
 
-#: js/share.js:325
+#: js/share.js:320
 msgid "can edit"
 msgstr "à¦¸à¦®à§à¦ªà¦¾à¦¦à¦¨à¦¾ à¦•à¦°à¦¤à§‡ à¦ªà¦¾à¦°à¦¬à§‡à¦¨"
 
-#: js/share.js:327
+#: js/share.js:322
 msgid "access control"
 msgstr "à¦…à¦§à¦¿à¦—à¦®à§à¦¯à¦¤à¦¾ à¦¨à¦¿à§Ÿà¦¨à§à¦¤à§à¦°à¦£"
 
-#: js/share.js:330
+#: js/share.js:325
 msgid "create"
 msgstr "à¦¤à§ˆà¦°à§€ à¦•à¦°à§à¦¨"
 
-#: js/share.js:333
+#: js/share.js:328
 msgid "update"
 msgstr "à¦ªà¦°à¦¿à¦¬à¦°à§à¦§à¦¨ à¦•à¦°"
 
-#: js/share.js:336
+#: js/share.js:331
 msgid "delete"
 msgstr "à¦®à§à¦›à§‡ à¦«à§‡à¦²"
 
-#: js/share.js:339
+#: js/share.js:334
 msgid "share"
 msgstr "à¦à¦¾à¦—à¦¾à¦à¦¾à¦—à¦¿ à¦•à¦°"
 
-#: js/share.js:373 js/share.js:569
+#: js/share.js:368 js/share.js:564
 msgid "Password protected"
 msgstr "à¦•à§‚à¦Ÿà¦¶à¦¬à§à¦¦à¦¦à§à¦¬à¦¾à¦°à¦¾ à¦¸à§à¦°à¦•à§à¦·à¦¿à¦¤"
 
-#: js/share.js:582
+#: js/share.js:577
 msgid "Error unsetting expiration date"
 msgstr "à¦®à§‡à§Ÿà¦¾à¦¦à§‹à¦¤à§à¦¤à§€à¦°à§à¦£ à¦¹à¦“à§Ÿà¦¾à¦° à¦¤à¦¾à¦°à¦¿à¦– à¦¨à¦¿à¦°à§à¦§à¦¾à¦°à¦£ à¦¬à¦¾à¦¤à¦¿à¦² à¦•à¦°à¦¤à§‡ à¦¸à¦®à¦¸à§à¦¯à¦¾ à¦¦à§‡à¦–à¦¾ à¦¦à¦¿à§Ÿà§‡à¦›à§‡"
 
-#: js/share.js:594
+#: js/share.js:589
 msgid "Error setting expiration date"
 msgstr "à¦®à§‡à§Ÿà¦¾à¦¦à§‹à¦¤à§à¦¤à§€à¦°à§à¦£ à¦¹à¦“à§Ÿà¦¾à¦° à¦¤à¦¾à¦°à¦¿à¦– à¦¨à¦¿à¦°à§à¦§à¦¾à¦°à¦£ à¦•à¦°à¦¤à§‡ à¦¸à¦®à¦¸à§à¦¯à¦¾ à¦¦à§‡à¦–à¦¾ à¦¦à¦¿à§Ÿà§‡à¦›à§‡"
 
-#: js/share.js:609
+#: js/share.js:604
 msgid "Sending ..."
 msgstr "à¦ªà¦¾à¦ à¦¾à¦¨à§‹ à¦¹à¦šà§à¦›à§‡......"
 
-#: js/share.js:620
+#: js/share.js:615
 msgid "Email sent"
 msgstr "à¦‡-à¦®à§‡à¦‡à¦² à¦ªà¦¾à¦ à¦¾à¦¨à§‹ à¦¹à§Ÿà§‡à¦›à§‡"
 
@@ -396,24 +396,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:39
-#: 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 "à¦…à¦¨à§à¦°à§‹à¦§ à¦ªà§‚à¦¨à¦ƒà¦¨à¦¿à¦°à§à¦§à¦¾à¦°à¦£"
 
@@ -443,7 +446,7 @@ msgstr "à¦¬à§à¦¯à¦¬à¦¹à¦¾à¦°à¦•à¦¾à¦°à§€"
 
 #: strings.php:7
 msgid "Apps"
-msgstr "à¦…à§à¦¯à¦¾à¦ªà¦¸"
+msgstr "à¦…à§à¦¯à¦¾à¦ª"
 
 #: strings.php:8
 msgid "Admin"
@@ -469,115 +472,130 @@ msgstr "à¦•à§à¦¯à¦¾à¦Ÿà§‡à¦—à¦°à¦¿ à¦¸à¦®à§à¦ªà¦¾à¦¦à¦¨à¦¾"
 msgid "Add"
 msgstr "à¦¯à§‹à¦— à¦•à¦°"
 
-#: templates/installation.php:23 templates/installation.php:30
+#: 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:25
+#: 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:31
+#: 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:32
+#: 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:36
+#: templates/installation.php:44
 msgid "Create an <strong>admin account</strong>"
 msgstr "<strong>à¦ªà§à¦°à¦¶à¦¾à¦¸à¦• à¦à¦•à¦¾à¦‰à¦¨à§à¦Ÿ</strong> à¦¤à§ˆà¦°à§€ à¦•à¦°à§à¦¨"
 
-#: templates/installation.php:52
+#: templates/installation.php:62
 msgid "Advanced"
 msgstr "à¦¸à§à¦šà¦¾à¦°à§"
 
-#: templates/installation.php:54
+#: templates/installation.php:64
 msgid "Data folder"
 msgstr "à¦¡à¦¾à¦Ÿà¦¾ à¦«à§‹à¦²à§à¦¡à¦¾à¦° "
 
-#: templates/installation.php:61
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "à¦¡à¦¾à¦Ÿà¦¾à¦¬à§‡à¦š à¦•à¦¨à¦«à¦¿à¦—à¦¾à¦° à¦•à¦°à§à¦¨"
 
-#: templates/installation.php:66 templates/installation.php:77
-#: templates/installation.php:87 templates/installation.php:97
+#: 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:109
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "à¦¡à¦¾à¦Ÿà¦¾à¦¬à§‡à¦œ à¦¬à§à¦¯à¦¬à¦¹à¦¾à¦°à¦•à¦¾à¦°à§€"
 
-#: templates/installation.php:113
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "à¦¡à¦¾à¦Ÿà¦¾à¦¬à§‡à¦œ à¦•à§‚à¦Ÿà¦¶à¦¬à§à¦¦"
 
-#: templates/installation.php:117
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "à¦¡à¦¾à¦Ÿà¦¾à¦¬à§‡à¦œà§‡à¦° à¦¨à¦¾à¦®"
 
-#: templates/installation.php:125
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "à¦¡à¦¾à¦Ÿà¦¾à¦¬à§‡à¦œ à¦Ÿà§‡à¦¬à¦²à¦¸à§à¦ªà§‡à¦¸"
 
-#: templates/installation.php:131
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "à¦¡à¦¾à¦Ÿà¦¾à¦¬à§‡à¦œ à¦¹à§‹à¦¸à§à¦Ÿ"
 
-#: templates/installation.php:136
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "à¦¸à§‡à¦Ÿà¦†à¦ª à¦¸à§à¦¸à¦®à§à¦ªà¦¨à§à¦¨ à¦•à¦°"
 
-#: templates/layout.guest.php:33
+#: templates/layout.guest.php:40
 msgid "web services under your control"
-msgstr "à¦“à§Ÿà§‡à¦¬ à¦¸à¦¾à¦°à§à¦à¦¿à¦¸à§‡à¦° à¦¨à¦¿à§Ÿà¦¨à§à¦¤à§à¦°à¦£ à¦†à¦ªà¦¨à¦¾à¦° à¦¹à¦¾à¦¤à§‡à¦° à¦®à§à¦ à§‹à§Ÿ"
+msgstr "à¦“à§Ÿà§‡à¦¬ à¦¸à¦¾à¦°à§à¦à¦¿à¦¸ à¦†à¦ªà¦¨à¦¾à¦° à¦¹à¦¾à¦¤à§‡à¦° à¦®à§à¦ à§‹à§Ÿ"
+
+#: templates/layout.user.php:36
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr ""
 
-#: templates/layout.user.php:48
+#: 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/bn_BD/files.po b/l10n/bn_BD/files.po
index 3b17926554c5ff5b603b4ba54e5b2c6397595cee..25a098953cf92e260064c85664954ee74d0d814f 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-03-04 00:06+0100\n"
-"PO-Revision-Date: 2013-03-03 23:06+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10: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"
@@ -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"
@@ -71,59 +66,70 @@ msgstr "à¦¡à¦¿à¦¸à§à¦•à§‡ à¦²à¦¿à¦–à¦¤à§‡ à¦¬à§à¦¯à¦°à§à¦¥"
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr "à¦à§à¦² à¦¡à¦¿à¦°à§‡à¦•à§à¦Ÿà¦°à¦¿"
 
-#: appinfo/app.php:10
+#: 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 ""
 
-#: js/fileactions.js:127 templates/index.php:92 templates/index.php:93
+#: 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/files.js:292 js/files.js:408
-#: js/files.js:439
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "à¦®à§à¦²à¦¤à§à¦¬à¦¿"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} à¦Ÿà¦¿ à¦¬à¦¿à¦¦à§à¦¯à¦®à¦¾à¦¨"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "à¦ªà§à¦°à¦¤à¦¿à¦¸à§à¦¥à¦¾à¦ªà¦¨"
 
-#: js/filelist.js:251
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "à¦¨à¦¾à¦® à¦¸à§à¦ªà¦¾à¦°à¦¿à¦¶ à¦•à¦°à§à¦¨"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "à¦¬à¦¾à¦¤à¦¿à¦²"
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "{new_name} à¦•à§‡ {old_name} à¦¨à¦¾à¦®à§‡ à¦ªà§à¦°à¦¤à¦¿à¦¸à§à¦¥à¦¾à¦ªà¦¨ à¦•à¦°à¦¾ à¦¹à§Ÿà§‡à¦›à§‡"
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "undo"
 msgstr "à¦•à§à¦°à¦¿à§Ÿà¦¾ à¦ªà§à¦°à¦¤à§à¦¯à¦¾à¦¹à¦¾à¦°"
 
-#: js/filelist.js:323
+#: 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 "à¦Ÿà¦¿ à¦à¦•à¦Ÿà¦¿ à¦…à¦¨à¦¨à§à¦®à§‹à¦¦à¦¿à¦¤ à¦¨à¦¾à¦®à¥¤"
@@ -146,77 +152,77 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:225
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:262
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "à¦†à¦ªà¦¨à¦¾à¦° à¦«à¦¾à¦‡à¦²à¦Ÿà¦¿ à¦†à¦ªà¦²à§‹à¦¡ à¦•à¦°à¦¾ à¦¸à¦®à§à¦à¦¬ à¦¹à¦²à§‹ à¦¨à¦¾, à¦•à§‡à¦¨à¦¨à¦¾ à¦à¦Ÿà¦¿ à¦¹à§Ÿ à¦à¦•à¦Ÿà¦¿ à¦«à§‹à¦²à§à¦¡à¦¾à¦° à¦•à¦¿à¦‚à¦¬à¦¾ à¦à¦° à¦†à¦•à¦¾à¦° à§¦ à¦¬à¦¾à¦‡à¦Ÿ"
 
-#: js/files.js:262
-msgid "Upload Error"
-msgstr "à¦†à¦ªà¦²à§‹à¦¡ à¦•à¦°à¦¤à§‡ à¦¸à¦®à¦¸à§à¦¯à¦¾ "
-
-#: js/files.js:273
-msgid "Close"
-msgstr "à¦¬à¦¨à§à¦§"
+#: js/files.js:277
+msgid "Not enough space available"
+msgstr "à¦¯à¦¥à§‡à¦·à§à¦  à¦ªà¦°à¦¿à¦®à¦¾à¦£ à¦¸à§à¦¥à¦¾à¦¨ à¦¨à§‡à¦‡"
 
-#: js/files.js:312
-msgid "1 file uploading"
-msgstr "à§§à¦Ÿà¦¿ à¦«à¦¾à¦‡à¦² à¦†à¦ªà¦²à§‹à¦¡ à¦•à¦°à¦¾ à¦¹à¦šà§à¦›à§‡"
-
-#: js/files.js:315 js/files.js:370 js/files.js:385
-msgid "{count} files uploading"
-msgstr "{count} à¦Ÿà¦¿ à¦«à¦¾à¦‡à¦² à¦†à¦ªà¦²à§‹à¦¡ à¦•à¦°à¦¾ à¦¹à¦šà§à¦›à§‡"
-
-#: js/files.js:388 js/files.js:423
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "à¦†à¦ªà¦²à§‹à¦¡ à¦¬à¦¾à¦¤à¦¿à¦² à¦•à¦°à¦¾ à¦¹à§Ÿà§‡à¦›à§‡à¥¤"
 
-#: js/files.js:497
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "à¦«à¦¾à¦‡à¦² à¦†à¦ªà¦²à§‹à¦¡ à¦šà¦²à¦®à¦¾à¦¨à¥¤ à¦à¦‡ à¦ªà§ƒà¦·à§à¦ à¦¾ à¦ªà¦°à¦¿à¦¤à§à¦¯à¦¾à¦— à¦•à¦°à¦²à§‡ à¦†à¦ªà¦²à§‹à¦¡ à¦¬à¦¾à¦¤à¦¿à¦² à¦•à¦°à¦¾ à¦¹à¦¬à§‡à¥¤"
 
-#: js/files.js:570
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "URL à¦«à¦¾à¦à¦•à¦¾ à¦°à¦¾à¦–à¦¾ à¦¯à¦¾à¦¬à§‡ à¦¨à¦¾à¥¤"
 
-#: js/files.js:575
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "à¦«à§‹à¦²à§à¦¡à¦¾à¦°à§‡à¦° à¦¨à¦¾à¦®à¦Ÿà¦¿ à¦¸à¦ à¦¿à¦• à¦¨à§Ÿà¥¤ 'à¦à¦¾à¦—à¦¾à¦à¦¾à¦—à¦¿ à¦•à¦°à¦¾' à¦¶à§à¦§à§à¦®à¦¾à¦¤à§à¦° Owncloud  à¦à¦° à¦œà¦¨à§à¦¯ à¦¸à¦‚à¦°à¦•à§à¦·à¦¿à¦¤à¥¤"
 
-#: js/files.js:953 templates/index.php:68
+#: 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 "à¦¨à¦¾à¦®"
+msgstr "à¦°à¦¾à¦®"
 
-#: js/files.js:954 templates/index.php:79
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "à¦†à¦•à¦¾à¦°"
 
-#: js/files.js:955 templates/index.php:81
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "à¦ªà¦°à¦¿à¦¬à¦°à§à¦¤à¦¿à¦¤"
 
-#: js/files.js:974
+#: js/files.js:898
 msgid "1 folder"
 msgstr "à§§à¦Ÿà¦¿ à¦«à§‹à¦²à§à¦¡à¦¾à¦°"
 
-#: js/files.js:976
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} à¦Ÿà¦¿ à¦«à§‹à¦²à§à¦¡à¦¾à¦°"
 
-#: js/files.js:984
+#: js/files.js:908
 msgid "1 file"
 msgstr "à§§à¦Ÿà¦¿ à¦«à¦¾à¦‡à¦²"
 
-#: js/files.js:986
+#: 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 "à¦†à¦ªà¦²à§‹à¦¡"
@@ -251,7 +257,7 @@ msgstr "ZIP à¦«à¦¾à¦‡à¦²à§‡à¦° à¦‡à¦¨à¦ªà§à¦Ÿà§‡à¦° à¦¸à¦°à§à¦¬à§‹à¦šà§à¦š 
 
 #: templates/admin.php:26
 msgid "Save"
-msgstr "à¦¸à¦‚à¦°à¦•à§à¦·à¦¨ à¦•à¦°"
+msgstr "à¦¸à¦‚à¦°à¦•à§à¦·à¦£"
 
 #: templates/index.php:7
 msgid "New"
@@ -269,45 +275,45 @@ msgstr "à¦«à§‹à¦²à§à¦¡à¦¾à¦°"
 msgid "From link"
 msgstr " à¦²à¦¿à¦‚à¦• à¦¥à§‡à¦•à§‡"
 
-#: templates/index.php:40
+#: templates/index.php:42
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:48
 msgid "Cancel upload"
 msgstr "à¦†à¦ªà¦²à§‹à¦¡ à¦¬à¦¾à¦¤à¦¿à¦² à¦•à¦°"
 
-#: templates/index.php:53
+#: templates/index.php:54
 msgid "You donâ€™t have write permissions here."
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "à¦à¦–à¦¾à¦¨à§‡ à¦•à¦¿à¦›à§à¦‡ à¦¨à§‡à¦‡à¥¤ à¦•à¦¿à¦›à§ à¦†à¦ªà¦²à§‹à¦¡ à¦•à¦°à§à¦¨ !"
 
-#: templates/index.php:74
+#: templates/index.php:75
 msgid "Download"
 msgstr "à¦¡à¦¾à¦‰à¦¨à¦²à§‹à¦¡"
 
-#: templates/index.php:86 templates/index.php:87
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "à¦à¦¾à¦—à¦¾à¦à¦¾à¦—à¦¿ à¦¬à¦¾à¦¤à¦¿à¦² "
 
-#: templates/index.php:106
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "à¦†à¦ªà¦²à§‹à¦¡à§‡à¦° à¦†à¦•à¦¾à¦°à¦Ÿà¦¿ à¦…à¦¨à§‡à¦• à¦¬à§œ"
 
-#: templates/index.php:108
+#: 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:113
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "à¦«à¦¾à¦‡à¦²à¦—à§à¦²à§‹ à¦¸à§à¦•à§à¦¯à¦¾à¦¨ à¦•à¦°à¦¾ à¦¹à¦šà§à¦›à§‡, à¦¦à§Ÿà¦¾ à¦•à¦°à§‡ à¦…à¦ªà§‡à¦•à§à¦·à¦¾ à¦•à¦°à§à¦¨à¥¤"
 
-#: templates/index.php:116
+#: 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..a2ee8c0db4d8b645d7cb84b1deb7c5868b921341 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/bn_BD/files_external.po b/l10n/bn_BD/files_external.po
index d0c094dd70b12e340154829641b968e450e60c9c..910f1b7be0442908f205ed9c59becc7289fbf621 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-02-28 00:04+0100\n"
-"PO-Revision-Date: 2013-02-27 23:04+0000\n"
+"POT-Creation-Date: 2013-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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: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/bn_BD/files_sharing.po b/l10n/bn_BD/files_sharing.po
index 55a97e9d95cc3b6b59099a078178e94d73ec069e..32181f41e112b3fdcdb6f48af2da79f2aad3ce7c 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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 d4cfe626a62b961a19c02223c2495e08d1f33160..01a16157903317756301ac17b8cfcef0d78289e2 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-03-08 00:25+0100\n"
-"PO-Revision-Date: 2013-03-07 23:25+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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,12 +17,12 @@ msgstr ""
 "Language: bn_BD\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:40
+#: ajax/delete.php:42
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
 
-#: ajax/undelete.php:41
+#: ajax/undelete.php:42
 #, php-format
 msgid "Couldn't restore %s"
 msgstr ""
@@ -31,6 +31,10 @@ msgstr ""
 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 ""
diff --git a/l10n/bn_BD/files_versions.po b/l10n/bn_BD/files_versions.po
index 446a2d3471cbb16ae0b862435f561fccf9389813..2edd5f1a35a71e337a4fcfead8c60db01469f4b8 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:30+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 27e8d80e84f0c397e306d16cb9b9cf7453d87188..6ba334e04d2adb3afe1d712a209a2c99845a2e00 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-02-27 14:35+0100\n"
-"PO-Revision-Date: 2013-02-27 13:36+0000\n"
+"POT-Creation-Date: 2013-04-28 01:57+0200\n"
+"PO-Revision-Date: 2013-04-27 23:57+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"
@@ -31,7 +31,7 @@ msgstr "à¦¨à¦¿à§Ÿà¦¾à¦®à¦•à¦¸à¦®à§‚à¦¹"
 
 #: app.php:385
 msgid "Users"
-msgstr "à¦¬à§à¦¯à¦à¦¹à¦¾à¦°à¦•à¦¾à¦°à§€"
+msgstr "à¦¬à§à¦¯à¦¬à¦¹à¦¾à¦°à¦•à¦¾à¦°à§€"
 
 #: app.php:398
 msgid "Apps"
@@ -39,21 +39,21 @@ msgstr "à¦…à§à¦¯à¦¾à¦ª"
 
 #: app.php:406
 msgid "Admin"
-msgstr "à¦ªà§à¦°à¦¶à¦¾à¦¸à¦•"
+msgstr "à¦ªà§à¦°à¦¶à¦¾à¦¸à¦¨"
 
-#: files.php:202
+#: files.php:209
 msgid "ZIP download is turned off."
 msgstr "ZIP à¦¡à¦¾à¦‰à¦¨à¦²à§‹à¦¡ à¦¬à¦¨à§à¦§ à¦•à¦°à¦¾ à¦†à¦›à§‡à¥¤"
 
-#: files.php:203
+#: files.php:210
 msgid "Files need to be downloaded one by one."
 msgstr "à¦«à¦¾à¦‡à¦²à¦—à§à¦²à§‹ à¦à¦•à§‡ à¦à¦•à§‡ à¦¡à¦¾à¦‰à¦¨à¦²à§‹à¦¡ à¦•à¦°à¦¾ à¦†à¦¬à¦¶à§à¦¯à¦•à¥¤"
 
-#: files.php:204 files.php:231
+#: files.php:211 files.php:244
 msgid "Back to Files"
 msgstr "à¦«à¦¾à¦‡à¦²à§‡ à¦«à¦¿à¦°à§‡ à¦šà¦²"
 
-#: files.php:228
+#: files.php:241
 msgid "Selected files too large to generate zip file."
 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,72 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:128 setup.php:320 setup.php:365
+#: setup.php:132 setup.php:325 setup.php:370
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:129 setup.php:152 setup.php:229
+#: setup.php:133 setup.php:156 setup.php:234
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:151 setup.php:453 setup.php:520
+#: setup.php:155 setup.php:458 setup.php:525
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:228
+#: setup.php:233
 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: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:583 setup.php:592 setup.php:600 setup.php:609
+#: setup.php:615
 #, 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:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
+#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
+#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:299
+#: setup.php:304
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:300
+#: setup.php:305
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:305
+#: setup.php:310
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:306
+#: setup.php:311
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:579 setup.php:611
+#: setup.php:584 setup.php:616
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:631
+#: setup.php:636
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:849
+#: setup.php:858
 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:859
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
@@ -239,19 +235,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 609d01de0bf9aaf096fd8beec865ec65d2c8801d..e0081ad76a21fd8ec4f392f6a145a916f4f3c910 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-02-27 14:35+0100\n"
-"PO-Revision-Date: 2013-02-27 13:35+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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"
@@ -93,7 +96,7 @@ msgstr ""
 msgid "Disable"
 msgstr "à¦¨à¦¿à¦·à§à¦•à§à¦°à¦¿à§Ÿ"
 
-#: js/apps.js:36 js/apps.js:64
+#: js/apps.js:36 js/apps.js:64 js/apps.js:83
 msgid "Enable"
 msgstr "à¦¸à¦•à§à¦°à¦¿à§Ÿ "
 
@@ -101,68 +104,68 @@ msgstr "à¦¸à¦•à§à¦°à¦¿à§Ÿ "
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:84
+#: 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:87
+#: js/apps.js:93
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:87
-msgid "Error"
-msgstr "à¦¸à¦®à¦¸à§à¦¯à¦¾"
-
-#: js/apps.js:90
+#: js/apps.js:96
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr "à¦¸à¦‚à¦°à¦•à§à¦·à¦£ à¦•à¦°à¦¾ à¦¹à¦šà§à¦›à§‡.."
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "deleted"
 msgstr ""
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "undo"
 msgstr "à¦•à§à¦°à¦¿à§Ÿà¦¾ à¦ªà§à¦°à¦¤à§à¦¯à¦¾à¦¹à¦¾à¦°"
 
-#: js/users.js:62
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:75 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
+#: templates/users.php:103
 msgid "Groups"
 msgstr "à¦—à§‹à¦·à§à¦ à§€à¦¸à¦®à§‚à¦¹"
 
-#: js/users.js:78 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr "à¦—à§‹à¦·à§à¦ à§€ à¦ªà§à¦°à¦¶à¦¾à¦¸à¦•"
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
-msgstr "à¦®à§à¦›à§‡ à¦«à§‡à¦²"
+msgstr "à¦®à§à¦›à§‡"
 
-#: js/users.js:191
+#: js/users.js:269
 msgid "add group"
 msgstr ""
 
-#: js/users.js:352
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:353 js/users.js:359 js/users.js:374
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:358
+#: js/users.js:426
 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,15 +316,19 @@ msgstr ""
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
 msgstr "à¦¬à§‡à¦¶à§€"
 
-#: templates/admin.php:230 templates/personal.php:102
+#: templates/admin.php:228
+msgid "Less"
+msgstr "à¦•à¦®"
+
+#: templates/admin.php:235 templates/personal.php:105
 msgid "Version"
 msgstr "à¦à¦¾à¦°à§à¦¸à¦¨"
 
-#: templates/admin.php:233 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 "
@@ -392,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:77
 msgid "Password"
 msgstr "à¦•à§‚à¦Ÿà¦¶à¦¬à§à¦¦"
 
@@ -416,82 +423,70 @@ msgstr "à¦¨à¦¤à§à¦¨ à¦•à§‚à¦Ÿà¦¶à¦¬à§à¦¦"
 msgid "Change password"
 msgstr "à¦•à§‚à¦Ÿà¦¶à¦¬à§à¦¦ à¦ªà¦°à¦¿à¦¬à¦°à§à¦¤à¦¨ à¦•à¦°à§à¦¨"
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:76
 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 "à¦‡-à¦®à§‡à¦‡à¦² "
+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 "WebDAV"
 
-#: templates/personal.php:93
+#: templates/personal.php:96
 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:75
 msgid "Login Name"
 msgstr ""
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr "à¦¤à§ˆà¦°à§€ à¦•à¦°"
 
-#: templates/users.php:35
+#: templates/users.php:33
 msgid "Default Storage"
 msgstr "à¦ªà§‚à¦°à§à¦¬à¦¨à¦¿à¦°à§à¦§à¦¾à¦°à¦¿à¦¤ à¦¸à¦‚à¦°à¦•à§à¦·à¦£à¦¾à¦—à¦¾à¦°"
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:39 templates/users.php:133
 msgid "Unlimited"
 msgstr "à¦…à¦¸à§€à¦®"
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:57 templates/users.php:148
 msgid "Other"
 msgstr "à¦…à¦¨à§à¦¯à¦¾à¦¨à§à¦¯"
 
-#: templates/users.php:84
+#: templates/users.php:82
 msgid "Storage"
 msgstr "à¦¸à¦‚à¦°à¦•à§à¦·à¦£à¦¾à¦—à¦¾à¦°"
 
-#: templates/users.php:95
+#: templates/users.php:93
 msgid "change display name"
 msgstr ""
 
-#: templates/users.php:99
+#: templates/users.php:97
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:134
+#: templates/users.php:128
 msgid "Default"
 msgstr "à¦ªà§‚à¦°à§à¦¬à¦¨à¦¿à¦°à§à¦§à¦¾à¦°à¦¿à¦¤"
diff --git a/l10n/bn_BD/user_ldap.po b/l10n/bn_BD/user_ldap.po
index 57c372738472efeb1fae338ea2f9801848b36ed6..470c3d630bbc91d0e7f34a298c5b9432f571daef 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-02 00:03+0100\n"
-"PO-Revision-Date: 2013-03-01 23:04+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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: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 "SSL à¦†à¦¬à¦¶à§à¦¯à¦•  à¦¨à¦¾ à¦¹à¦²à§‡  à¦†à¦ªà¦¨à¦¿ à¦à¦‡ à¦ªà§à¦°à¦Ÿà§‹à¦•à¦²à¦Ÿà¦¿ à¦®à§à¦›à§‡ à¦«à§‡à¦²à¦¤à§‡ à¦ªà¦¾à¦°à§‡à¦¨ à¥¤ à¦à¦°à¦ªà¦° à¦¶à§à¦°à§ à¦•à¦°à§à¦¨ à¦à¦Ÿà¦¾ à¦¦à¦¿à§Ÿà§‡ ldaps://"
 
-#: templates/settings.php:26
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "à¦à¦¿à¦¤à§à¦¤à¦¿  DN"
 
-#: 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 "à¦¸à§à¦šà¦¾à¦°à§ à¦Ÿà§à¦¯à¦…à¦¬à§‡ à¦—à¦¿à§Ÿà§‡ à¦†à¦ªà¦¨à¦¿ à¦¬à§à¦¯à¦¬à¦¹à¦¾à¦°à¦•à¦¾à¦°à¦¿ à¦à¦¬à¦‚ à¦—à§‹à¦·à§à¦ à§€à¦¸à¦®à§‚à¦¹à§‡à¦° à¦œà¦¨à§à¦¯ à¦à¦¿à¦¤à§à¦¤à¦¿ DN à¦¨à¦¿à¦°à§à¦§à¦¾à¦°à¦£ à¦•à¦°à¦¤à§‡ à¦ªà¦¾à¦°à§‡à¦¨à¥¤"
 
-#: templates/settings.php:30
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "à¦¬à§à¦¯à¦¬à¦¹à¦¾à¦°à¦•à¦¾à¦°à¦¿  DN"
 
-#: 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 "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: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 "à¦…à¦œà§à¦žà¦¾à¦¤à¦•à§à¦²à¦¶à§€à¦² à¦…à¦§à¦¿à¦—à¦®à¦¨à§‡à¦° à¦œà¦¨à§à¦¯ DN à¦à¦¬à¦‚ à¦•à§‚à¦Ÿà¦¶à¦¬à§à¦¦à¦Ÿà¦¿ à¦«à¦¾à¦à¦•à¦¾ à¦°à¦¾à¦–à§à¦¨à¥¤"
 
-#: 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 "à¦ªà§à¦°à¦¬à§‡à¦¶à§‡à¦°  à¦šà§‡à¦·à§à¦Ÿà¦¾ à¦•à¦°à¦¾à¦° à¦¸à¦®à§Ÿ à¦ªà§à¦°à¦¯à§‹à¦œà§à¦¯ à¦›à¦¾à¦à¦•à¦¨à§€à¦Ÿà¦¿ à¦¨à¦¿à¦°à§à¦§à¦¾à¦°à¦£ à¦•à¦°à¦¬à§‡à¥¤ à¦ªà§à¦°à¦¬à§‡à¦¶à§‡à¦° à¦¸à¦®à§Ÿ à¦¬à§à¦¯à¦¬à¦¹à¦¾à¦°à¦•à¦¾à¦°à§€ à¦¨à¦¾à¦®à¦Ÿà¦¿ %%uid  à¦¦à¦¿à§Ÿà§‡ à¦ªà§à¦°à¦¤à¦¿à¦¸à§à¦¥à¦¾à¦ªà¦¿à¦¤ à¦¹à¦¬à§‡à¥¤"
 
-#: templates/settings.php:41
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "%%uid à¦¸à§à¦¥à¦¾à¦¨à¦§à¦¾à¦°à¦• à¦¬à§à¦¯à¦¬à¦¹à¦¾à¦° à¦•à¦°à§à¦¨, à¦‰à¦¦à¦¾à¦¹à¦°à¦£à¦ƒ  \"uid=%%uid\""
 
-#: 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 "à¦•à§‹à¦¨ à¦¸à§à¦¥à¦¾à¦¨à¦§à¦¾à¦°à¦• à¦¬à§à¦¯à¦¤à§€à¦¤, à¦¯à§‡à¦®à¦¨à¦ƒ \"objectClass=person\"à¥¤"
 
-#: 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 "à¦•à§‹à¦¨ à¦¸à§à¦¥à¦¾à¦¨ à¦§à¦¾à¦°à¦• à¦¬à§à¦¯à¦¤à§€à¦¤, à¦‰à¦¦à¦¾à¦¹à¦°à¦£à¦ƒ\"objectClass=posixGroup\"à¥¤"
 
-#: 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 "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 "à¦¬à¦°à§à¦£ à¦…à¦¸à¦‚à¦¬à§‡à¦¦à§€ LDAP  à¦¸à¦¾à¦°à§à¦à¦¾à¦° (à¦‰à¦‡à¦¨à§à¦¡à§‹à¦œ)"
 
-#: templates/settings.php:64
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "SSL à¦¸à¦¨à¦¦à¦ªà¦¤à§à¦° à¦¯à¦¾à¦šà¦¾à¦‡à¦•à¦°à¦£ à¦¬à¦¨à§à¦§ à¦°à¦¾à¦•à¥¤"
 
-#: 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 "à¦¶à§à¦§à§à¦®à¦¾à¦¤à§à¦° à¦¯à¦¦à¦¿ à¦à¦‡ à¦¬à¦¿à¦•à¦²à§à¦ªà¦Ÿà¦¿ à¦¬à§à¦¯à¦¬à¦¹à¦¾à¦° à¦•à¦°à§‡à¦‡ à¦¸à¦‚à¦¯à§‹à¦— à¦•à¦¾à¦°à§à¦¯à¦•à¦°à§€ à¦¹à§Ÿ à¦¤à¦¬à§‡ à¦†à¦ªà¦¨à¦¾à¦° ownCloud à¦¸à¦¾à¦°à§à¦à¦¾à¦°à§‡ LDAP à¦¸à¦¾à¦°à§à¦à¦¾à¦°à§‡à¦° SSL à¦¸à¦¨à¦¦à¦ªà¦¤à§à¦°à¦Ÿà¦¿ à¦†à¦®à¦¦à¦¾à¦¨à¦¿ à¦•à¦°à§à¦¨à¥¤"
 
-#: 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 "à¦¬à§à¦¯à¦¬à¦¹à¦¾à¦°à¦•à¦¾à¦°à§€à¦° ownCloud à¦¨à¦¾à¦® à¦¤à§ˆà¦°à¦¿ à¦•à¦°à¦¾à¦° à¦œà¦¨à§à¦¯ à¦¬à§à¦¯à¦à¦¹à§ƒà¦¤ LDAP à¦¬à§ˆà¦¶à¦¿à¦·à§à¦Ÿà§à¦¯à¥¤"
 
-#: 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 "à¦—à§‹à¦·à§à¦ à§€à¦° ownCloud à¦¨à¦¾à¦® à¦¤à§ˆà¦°à¦¿ à¦•à¦°à¦¾à¦° à¦œà¦¨à§à¦¯ à¦¬à§à¦¯à¦à¦¹à§ƒà¦¤ LDAP à¦¬à§ˆà¦¶à¦¿à¦·à§à¦Ÿà§à¦¯à¥¤"
 
-#: 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 "à¦¬à§à¦¯à¦¬à¦¹à¦¾à¦°à¦•à¦¾à¦°à§€ à¦¨à¦¾à¦®à§‡à¦° à¦œà¦¨à§à¦¯ à¦«à¦¾à¦à¦•à¦¾ à¦°à¦¾à¦–à§à¦¨ (à¦ªà§‚à¦°à§à¦¬à¦¨à¦¿à¦°à§à¦§à¦¾à¦°à¦¿à¦¤)à¥¤ à¦…à¦¨à§à¦¯à¦¥à¦¾à§Ÿ, LDAP/AD à¦¬à§ˆà¦¶à¦¿à¦·à§à¦Ÿà§à¦¯ à¦¨à¦¿à¦°à§à¦§à¦¾à¦°à¦£ à¦•à¦°à§à¦¨à¥¤"
 
-#: 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/bn_BD/user_webdavauth.po b/l10n/bn_BD/user_webdavauth.po
index 6bf9079f19bb0285006dd7aa490cbdde3efaed66..e5c329e580b76d124bcc1e24e841e7192d959e8b 100644
--- a/l10n/bn_BD/user_webdavauth.po
+++ b/l10n/bn_BD/user_webdavauth.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
 "MIME-Version: 1.0\n"
@@ -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 1ec21d10858ec0b824f7d7be77eaf9509ad29ec1..fe0bd380dad289493f24d90a4e81a07322cb99a3 100644
--- a/l10n/ca/core.po
+++ b/l10n/ca/core.po
@@ -3,17 +3,14 @@
 # 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
 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: 2013-02-26 08:40+0000\n"
-"Last-Translator: aseques <sacoo2@hotmail.com>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10: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"
@@ -162,88 +159,90 @@ msgstr "Desembre"
 
 #: js/js.js:286
 msgid "Settings"
-msgstr "Arranjament"
+msgstr "ConfiguraciÃ³"
 
-#: js/js.js:768
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "segons enrere"
 
-#: js/js.js:769
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "fa 1 minut"
 
-#: js/js.js:770
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr "fa {minutes} minuts"
 
-#: js/js.js:771
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr "fa 1 hora"
 
-#: js/js.js:772
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr "fa {hours} hores"
 
-#: js/js.js:773
+#: js/js.js:723
 msgid "today"
 msgstr "avui"
 
-#: js/js.js:774
+#: js/js.js:724
 msgid "yesterday"
 msgstr "ahir"
 
-#: js/js.js:775
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr "fa {days} dies"
 
-#: js/js.js:776
+#: js/js.js:726
 msgid "last month"
 msgstr "el mes passat"
 
-#: js/js.js:777
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr "fa {months} mesos"
 
-#: js/js.js:778
+#: js/js.js:728
 msgid "months ago"
 msgstr "mesos enrere"
 
-#: js/js.js:779
+#: js/js.js:729
 msgid "last year"
 msgstr "l'any passat"
 
-#: js/js.js:780
+#: js/js.js:730
 msgid "years ago"
 msgstr "anys enrere"
 
-#: js/oc-dialogs.js:126
-msgid "Choose"
-msgstr "Escull"
+#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
+msgid "Ok"
+msgstr "D'acord"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
 msgid "Cancel"
 msgstr "CancelÂ·la"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "No"
+#: js/oc-dialogs.js:185
+msgid "Choose"
+msgstr "Escull"
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:215
 msgid "Yes"
 msgstr "SÃ"
 
-#: js/oc-dialogs.js:180
-msgid "Ok"
-msgstr "D'acord"
+#: js/oc-dialogs.js:222
+msgid "No"
+msgstr "No"
 
 #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
 #: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
 msgid "The object type is not specified."
 msgstr "No s'ha especificat el tipus d'objecte."
 
-#: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:582
-#: js/share.js:594
+#: 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 "Error"
 
@@ -255,127 +254,127 @@ msgstr "No s'ha especificat el nom de l'aplicaciÃ³."
 msgid "The required file {file} is not installed!"
 msgstr "El fitxer requerit {file} no estÃ  instalÂ·lat!"
 
-#: js/share.js:29 js/share.js:43 js/share.js:90
+#: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr "Compartit"
 
-#: js/share.js:93
+#: js/share.js:90
 msgid "Share"
 msgstr "Comparteix"
 
-#: js/share.js:141 js/share.js:622
+#: js/share.js:125 js/share.js:617
 msgid "Error while sharing"
 msgstr "Error en compartir"
 
-#: js/share.js:152
+#: js/share.js:136
 msgid "Error while unsharing"
 msgstr "Error en deixar de compartir"
 
-#: js/share.js:159
+#: js/share.js:143
 msgid "Error while changing permissions"
 msgstr "Error en canviar els permisos"
 
-#: js/share.js:168
+#: js/share.js:152
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Compartit amb vos i amb el grup {group} per {owner}"
 
-#: js/share.js:170
+#: js/share.js:154
 msgid "Shared with you by {owner}"
 msgstr "Compartit amb vos per {owner}"
 
-#: js/share.js:175
+#: js/share.js:159
 msgid "Share with"
 msgstr "Comparteix amb"
 
-#: js/share.js:180
+#: js/share.js:164
 msgid "Share with link"
 msgstr "Comparteix amb enllaÃ§"
 
-#: js/share.js:183
+#: js/share.js:167
 msgid "Password protect"
 msgstr "Protegir amb contrasenya"
 
-#: js/share.js:185 templates/installation.php:47 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Contrasenya"
 
-#: js/share.js:189
+#: js/share.js:173
 msgid "Email link to person"
 msgstr "EnllaÃ§ per correu electrÃ³nic amb la persona"
 
-#: js/share.js:190
+#: js/share.js:174
 msgid "Send"
 msgstr "Envia"
 
-#: js/share.js:194
+#: js/share.js:178
 msgid "Set expiration date"
 msgstr "Estableix la data d'expiraciÃ³"
 
-#: js/share.js:195
+#: js/share.js:179
 msgid "Expiration date"
 msgstr "Data d'expiraciÃ³"
 
-#: js/share.js:227
+#: js/share.js:211
 msgid "Share via email:"
 msgstr "Comparteix per correu electrÃ²nic"
 
-#: js/share.js:229
+#: js/share.js:213
 msgid "No people found"
 msgstr "No s'ha trobat ningÃº"
 
-#: js/share.js:256
+#: js/share.js:251
 msgid "Resharing is not allowed"
 msgstr "No es permet compartir de nou"
 
-#: js/share.js:292
+#: js/share.js:287
 msgid "Shared in {item} with {user}"
 msgstr "Compartit en {item} amb {user}"
 
-#: js/share.js:313
+#: js/share.js:308
 msgid "Unshare"
 msgstr "Deixa de compartir"
 
-#: js/share.js:325
+#: js/share.js:320
 msgid "can edit"
 msgstr "pot editar"
 
-#: js/share.js:327
+#: js/share.js:322
 msgid "access control"
 msgstr "control d'accÃ©s"
 
-#: js/share.js:330
+#: js/share.js:325
 msgid "create"
 msgstr "crea"
 
-#: js/share.js:333
+#: js/share.js:328
 msgid "update"
 msgstr "actualitza"
 
-#: js/share.js:336
+#: js/share.js:331
 msgid "delete"
 msgstr "elimina"
 
-#: js/share.js:339
+#: js/share.js:334
 msgid "share"
 msgstr "comparteix"
 
-#: js/share.js:373 js/share.js:569
+#: js/share.js:368 js/share.js:564
 msgid "Password protected"
 msgstr "Protegeix amb contrasenya"
 
-#: js/share.js:582
+#: js/share.js:577
 msgid "Error unsetting expiration date"
 msgstr "Error en eliminar la data d'expiraciÃ³"
 
-#: js/share.js:594
+#: js/share.js:589
 msgid "Error setting expiration date"
 msgstr "Error en establir la data d'expiraciÃ³"
 
-#: js/share.js:609
+#: js/share.js:604
 msgid "Sending ..."
 msgstr "Enviant..."
 
-#: js/share.js:620
+#: js/share.js:615
 msgid "Email sent"
 msgstr "El correu electrÃ³nic s'ha enviat"
 
@@ -398,24 +397,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:41
-#: 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Ã³"
 
@@ -449,7 +451,7 @@ msgstr "Aplicacions"
 
 #: strings.php:8
 msgid "Admin"
-msgstr "Administrador"
+msgstr "AdministraciÃ³"
 
 #: strings.php:9
 msgid "Help"
@@ -472,115 +474,129 @@ msgid "Add"
 msgstr "Afegeix"
 
 #: templates/installation.php:24 templates/installation.php:31
+#: templates/installation.php:38
 msgid "Security Warning"
 msgstr "AvÃs de seguretat"
 
 #: templates/installation.php:25
+msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
+msgstr "La versiÃ³ de PHP que useu Ã©s vulnerable a l'atac per NULL Byte (CVE-2006-7243)"
+
+#: templates/installation.php:26
+msgid "Please update your PHP installation to use ownCloud securely."
+msgstr "Actualitzeu la instalÂ·laciÃ³ de PHP per usar ownCloud de forma segura."
+
+#: templates/installation.php:32
 msgid ""
 "No secure random number generator is available, please enable the PHP "
 "OpenSSL extension."
 msgstr "No estÃ  disponible el generador de nombres aleatoris segurs, habiliteu l'extensiÃ³ de PHP OpenSSL."
 
-#: 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 "Sense un generador de nombres aleatoris segurs un atacant podria predir els senyals per restablir la contrasenya i prendre-us el compte."
 
-#: 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 "La carpeta de dades i els seus fitxers probablement sÃ³n accessibles des d'internet perquÃ¨ el fitxer .htaccess no funciona."
 
-#: templates/installation.php:33
+#: 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 "Per mÃ©s informaciÃ³ sobre com configurar correctament el servidor, mireu la <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentaciÃ³</a>."
 
-#: templates/installation.php:37
+#: templates/installation.php:44
 msgid "Create an <strong>admin account</strong>"
 msgstr "Crea un <strong>compte d'administrador</strong>"
 
-#: templates/installation.php:55
+#: templates/installation.php:62
 msgid "Advanced"
 msgstr "AvanÃ§at"
 
-#: templates/installation.php:57
+#: templates/installation.php:64
 msgid "Data folder"
 msgstr "Carpeta de dades"
 
-#: templates/installation.php:66
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "Configura la base de dades"
 
-#: templates/installation.php:71 templates/installation.php:83
-#: templates/installation.php:94 templates/installation.php:105
-#: templates/installation.php:117
+#: 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:129
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "Usuari de la base de dades"
 
-#: templates/installation.php:134
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "Contrasenya de la base de dades"
 
-#: templates/installation.php:139
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "Nom de la base de dades"
 
-#: templates/installation.php:149
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "Espai de taula de la base de dades"
 
-#: templates/installation.php:156
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "Ordinador central de la base de dades"
 
-#: templates/installation.php:162
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "Acaba la configuraciÃ³"
 
-#: templates/layout.guest.php:35
+#: templates/layout.guest.php:40
 msgid "web services under your control"
 msgstr "controleu els vostres serveis web"
 
-#: templates/layout.user.php:53
+#: templates/layout.user.php:36
+#, 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:61
 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 688af1f9c4983aad6a2dbdb0ce8d053d716513fa..cf8af961c902da558bb76248c31579d3413068a9 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-03-04 00:06+0100\n"
-"PO-Revision-Date: 2013-03-03 23:06+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10: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"
@@ -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"
@@ -77,59 +67,70 @@ msgstr "Ha fallat en escriure al disc"
 msgid "Not enough storage available"
 msgstr "No hi ha prou espai disponible"
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr "Directori no vÃ lid."
 
-#: appinfo/app.php:10
+#: appinfo/app.php:12
 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:92 templates/index.php:93
+#: 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/files.js:292 js/files.js:408
-#: js/files.js:439
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
-msgstr "Pendents"
+msgstr "Pendent"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} ja existeix"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "substitueix"
 
-#: js/filelist.js:251
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "sugereix un nom"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "cancelÂ·la"
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "s'ha substituÃ¯t {old_name} per {new_name}"
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "undo"
 msgstr "desfÃ©s"
 
-#: js/filelist.js:323
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr "executa d'operaciÃ³ d'esborrar"
 
+#: js/filelist.js:413
+msgid "1 file uploading"
+msgstr "1 fitxer pujant"
+
+#: js/filelist.js:416 js/filelist.js:470
+msgid "files uploading"
+msgstr "fitxers pujant"
+
 #: js/files.js:52
 msgid "'.' is an invalid file name."
 msgstr "'.' Ã©s un nom no vÃ lid per un fitxer."
@@ -152,77 +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:225
+#: 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:262
+#: 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:262
-msgid "Upload Error"
-msgstr "Error en la pujada"
-
-#: js/files.js:273
-msgid "Close"
-msgstr "Tanca"
-
-#: js/files.js:312
-msgid "1 file uploading"
-msgstr "1 fitxer pujant"
-
-#: js/files.js:315 js/files.js:370 js/files.js:385
-msgid "{count} files uploading"
-msgstr "{count} fitxers en pujada"
+#: js/files.js:277
+msgid "Not enough space available"
+msgstr "No hi ha prou espai disponible"
 
-#: js/files.js:388 js/files.js:423
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "La pujada s'ha cancelÂ·lat."
 
-#: js/files.js:497
+#: 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:570
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "La URL no pot ser buida"
 
-#: js/files.js:575
+#: 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:953 templates/index.php:68
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+msgid "Error"
+msgstr "Error"
+
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Nom"
 
-#: js/files.js:954 templates/index.php:79
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Mida"
 
-#: js/files.js:955 templates/index.php:81
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Modificat"
 
-#: js/files.js:974
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 carpeta"
 
-#: js/files.js:976
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} carpetes"
 
-#: js/files.js:984
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 fitxer"
 
-#: js/files.js:986
+#: 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"
@@ -261,7 +262,7 @@ msgstr "Desa"
 
 #: templates/index.php:7
 msgid "New"
-msgstr "Nou"
+msgstr "Nova"
 
 #: templates/index.php:10
 msgid "Text file"
@@ -275,45 +276,45 @@ msgstr "Carpeta"
 msgid "From link"
 msgstr "Des d'enllaÃ§"
 
-#: templates/index.php:40
+#: templates/index.php:42
 msgid "Deleted files"
 msgstr "Fitxers esborrats"
 
-#: templates/index.php:46
+#: templates/index.php:48
 msgid "Cancel upload"
 msgstr "CancelÂ·la la pujada"
 
-#: templates/index.php:53
+#: templates/index.php:54
 msgid "You donâ€™t have write permissions here."
 msgstr "No teniu permisos d'escriptura aquÃ."
 
-#: templates/index.php:60
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Res per aquÃ. Pugeu alguna cosa!"
 
-#: templates/index.php:74
+#: templates/index.php:75
 msgid "Download"
 msgstr "Baixa"
 
-#: templates/index.php:86 templates/index.php:87
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Deixa de compartir"
 
-#: templates/index.php:106
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "La pujada Ã©s massa gran"
 
-#: templates/index.php:108
+#: 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:113
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "S'estan escanejant els fitxers, espereu"
 
-#: templates/index.php:116
+#: 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..98fd3185f0b3070ad598e3f1371ccd8e82d8c085 100644
--- a/l10n/ca/files_encryption.po
+++ b/l10n/ca/files_encryption.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.
+# 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"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-03 02:02+0200\n"
+"PO-Revision-Date: 2013-05-02 10:40+0000\n"
+"Last-Translator: Jordi Vilalta Prat <jvprat@jvprat.com>\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"
@@ -21,19 +20,19 @@ msgstr ""
 
 #: templates/settings-personal.php:4 templates/settings.php:5
 msgid "Encryption"
-msgstr "Encriptatge"
+msgstr "Xifrat"
 
 #: templates/settings-personal.php:7
 msgid "File encryption is enabled."
-msgstr "L'encriptaciÃ³ de fitxers estÃ  activada."
+msgstr "El xifrat de fitxers estÃ  activat."
 
 #: templates/settings-personal.php:11
 msgid "The following file types will not be encrypted:"
-msgstr "Els tipus de fitxers segÃ¼ents no s'encriptaran:"
+msgstr "Els tipus de fitxers segÃ¼ents no es xifraran:"
 
 #: templates/settings.php:7
 msgid "Exclude the following file types from encryption:"
-msgstr "Exclou els tipus de fitxers segÃ¼ents de l'encriptatge:"
+msgstr "Exclou els tipus de fitxers segÃ¼ents del xifratge:"
 
 #: templates/settings.php:12
 msgid "None"
diff --git a/l10n/ca/files_external.po b/l10n/ca/files_external.po
index 6d6e1c8e23ada298d8c3eea5f2cf07e6c4a8ca11..ae9bf2ab8ae5c8c8f21a1974eb28140a84d197d6 100644
--- a/l10n/ca/files_external.po
+++ b/l10n/ca/files_external.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.
+# rogerc <rcalvoi@yahoo.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 11:20+0000\n"
+"POT-Creation-Date: 2013-05-01 01:59+0200\n"
+"PO-Revision-Date: 2013-04-30 21:50+0000\n"
 "Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\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: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 "<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: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 "<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..d23fa033638ad60e80726010fdf65544a44037b2 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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 cc147c1f7ffa0d9680bfe3ec9ef9d56749bae234..af988ccbae9dec150e115fca93c49b387e52e63d 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-03-08 00:25+0100\n"
-"PO-Revision-Date: 2013-03-07 23:25+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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"
@@ -18,12 +17,12 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:40
+#: ajax/delete.php:42
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "No s'ha pogut esborrar permanentment %s"
 
-#: ajax/undelete.php:41
+#: ajax/undelete.php:42
 #, php-format
 msgid "Couldn't restore %s"
 msgstr "No s'ha pogut restaurar %s"
@@ -32,6 +31,10 @@ msgstr "No s'ha pogut restaurar %s"
 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
+msgid "Error"
+msgstr "Error"
+
 #: js/trash.js:34
 msgid "delete file permanently"
 msgstr "esborra el fitxer permanentment"
@@ -78,4 +81,4 @@ msgstr "Esborra"
 
 #: templates/part.breadcrumb.php:9
 msgid "Deleted Files"
-msgstr ""
+msgstr "Fitxers eliminats"
diff --git a/l10n/ca/files_versions.po b/l10n/ca/files_versions.po
index 8aeff6e34cd440b4c48d685cbf63d66ca90c6a79..624a5da1e1d292c5dc59e44d8d9def28e34dc50c 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:30+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 1786fbe663c1fd83fe600309110ab93a056c31a8..9225ebad500f385318796428e94026add05367a0 100644
--- a/l10n/ca/lib.po
+++ b/l10n/ca/lib.po
@@ -3,15 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  <rcalvoi@yahoo.com>, 2013.
-#   <rcalvoi@yahoo.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 11:20+0000\n"
-"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
+"POT-Creation-Date: 2013-04-28 01:57+0200\n"
+"PO-Revision-Date: 2013-04-27 23:57+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,19 +41,19 @@ msgstr "Aplicacions"
 msgid "Admin"
 msgstr "AdministraciÃ³"
 
-#: files.php:202
+#: files.php:209
 msgid "ZIP download is turned off."
 msgstr "La baixada en ZIP estÃ  desactivada."
 
-#: files.php:203
+#: files.php:210
 msgid "Files need to be downloaded one by one."
 msgstr "Els fitxers s'han de baixar d'un en un."
 
-#: files.php:204 files.php:231
+#: files.php:211 files.php:244
 msgid "Back to Files"
 msgstr "Torna a Fitxers"
 
-#: files.php:228
+#: files.php:241
 msgid "Selected files too large to generate zip file."
 msgstr "Els fitxers seleccionats son massa grans per generar un fitxer zip."
 
@@ -95,10 +93,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 +113,72 @@ 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:128 setup.php:320 setup.php:365
+#: setup.php:132 setup.php:325 setup.php:370
 msgid "PostgreSQL username and/or password not valid"
 msgstr "Nom d'usuari i/o contrasenya PostgreSQL no vÃ lids"
 
-#: setup.php:129 setup.php:152 setup.php:229
+#: setup.php:133 setup.php:156 setup.php:234
 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:151 setup.php:453 setup.php:520
+#: setup.php:155 setup.php:458 setup.php:525
 msgid "Oracle username and/or password not valid"
 msgstr "Nom d'usuari i/o contrasenya Oracle no vÃ lids"
 
-#: setup.php:228
+#: setup.php:233
 msgid "MySQL username and/or password not valid"
 msgstr "Nom d'usuari i/o contrasenya MySQL no vÃ lids"
 
-#: 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: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:583 setup.php:592 setup.php:600 setup.php:609
+#: setup.php:615
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Error DB: \"%s\""
 
-#: 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:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
+#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
+#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "L'ordre en conflicte Ã©s: \"%s\""
 
-#: setup.php:299
+#: setup.php:304
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "L'usuari MySQL '%s'@'localhost' ja existeix."
 
-#: setup.php:300
+#: setup.php:305
 msgid "Drop this user from MySQL"
 msgstr "Elimina aquest usuari de MySQL"
 
-#: setup.php:305
+#: setup.php:310
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "L'usuari MySQL '%s'@'%%' ja existeix"
 
-#: setup.php:306
+#: setup.php:311
 msgid "Drop this user from MySQL."
 msgstr "Elimina aquest usuari de MySQL."
 
-#: setup.php:579 setup.php:611
+#: setup.php:584 setup.php:616
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "L'ordre en conflicte Ã©s: \"%s\", nom: %s, contrasenya: %s"
 
-#: setup.php:631
+#: setup.php:636
 #, 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:849
+#: setup.php:858
 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:850
+#: setup.php:859
 #, 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 +233,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 6db4edeb8bb9798dc8c9035cc2a0452a46d2d684..0d6054fa5b6b50777bf47c6142d299b58f03eb97 100644
--- a/l10n/ca/settings.po
+++ b/l10n/ca/settings.po
@@ -3,19 +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-2012.
+# rogerc, 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 11:20+0000\n"
-"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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 +22,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 +69,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"
@@ -98,76 +97,76 @@ msgstr "Actualitza a {appversion}"
 msgid "Disable"
 msgstr "Desactiva"
 
-#: js/apps.js:36 js/apps.js:64
+#: 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...."
 msgstr "Espereu..."
 
-#: js/apps.js:84
+#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+msgid "Error"
+msgstr "Error"
+
+#: js/apps.js:90
 msgid "Updating...."
 msgstr "Actualitzant..."
 
-#: js/apps.js:87
+#: js/apps.js:93
 msgid "Error while updating app"
 msgstr "Error en actualitzar l'aplicaciÃ³"
 
-#: js/apps.js:87
-msgid "Error"
-msgstr "Error"
-
-#: js/apps.js:90
+#: js/apps.js:96
 msgid "Updated"
 msgstr "Actualitzada"
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
-msgstr "S'estÃ  desant..."
+msgstr "Desant..."
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "deleted"
 msgstr "esborrat"
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "undo"
 msgstr "desfÃ©s"
 
-#: js/users.js:62
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr "No s'ha pogut eliminar l'usuari"
 
-#: js/users.js:75 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
+#: templates/users.php:103
 msgid "Groups"
 msgstr "Grups"
 
-#: js/users.js:78 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr "Grup Admin"
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
-msgstr "Suprimeix"
+msgstr "Esborra"
 
-#: js/users.js:191
+#: js/users.js:269
 msgid "add group"
 msgstr "afegeix grup"
 
-#: js/users.js:352
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr "Heu de facilitar un nom d'usuari vÃ lid"
 
-#: js/users.js:353 js/users.js:359 js/users.js:374
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr "Error en crear l'usuari"
 
-#: js/users.js:358
+#: js/users.js:426
 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,15 +317,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:230 templates/personal.php:102
+#: templates/admin.php:228
+msgid "Less"
+msgstr "Menys"
+
+#: templates/admin.php:235 templates/personal.php:105
 msgid "Version"
 msgstr "VersiÃ³"
 
-#: templates/admin.php:233 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 "
@@ -397,7 +400,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:77
 msgid "Password"
 msgstr "Contrasenya"
 
@@ -421,82 +424,70 @@ 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:76
 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:68
 msgid "Email"
 msgstr "Correu electrÃ²nic"
 
-#: templates/personal.php:72
+#: templates/personal.php:70
 msgid "Your email address"
 msgstr "Correu electrÃ²nic"
 
-#: templates/personal.php:73
+#: templates/personal.php:71
 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:77 templates/personal.php:78
 msgid "Language"
 msgstr "Idioma"
 
-#: templates/personal.php:86
+#: templates/personal.php:89
 msgid "Help translate"
 msgstr "Ajudeu-nos amb la traducciÃ³"
 
-#: templates/personal.php:91
+#: templates/personal.php:94
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:93
+#: templates/personal.php:96
 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:75
 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:33
 msgid "Default Storage"
 msgstr "Emmagatzemament per defecte"
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:39 templates/users.php:133
 msgid "Unlimited"
 msgstr "IlÂ·limitat"
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:57 templates/users.php:148
 msgid "Other"
 msgstr "Un altre"
 
-#: templates/users.php:84
+#: templates/users.php:82
 msgid "Storage"
 msgstr "Emmagatzemament"
 
-#: templates/users.php:95
+#: templates/users.php:93
 msgid "change display name"
 msgstr "canvia el nom a mostrar"
 
-#: templates/users.php:99
+#: templates/users.php:97
 msgid "set new password"
 msgstr "estableix nova contrasenya"
 
-#: templates/users.php:134
+#: templates/users.php:128
 msgid "Default"
 msgstr "Per defecte"
diff --git a/l10n/ca/user_ldap.po b/l10n/ca/user_ldap.po
index 9aae404b6d88b85714d66ffa2aee018bce96c92a..b664c8a830623e55d1f01c605766fa7d8c5d28da 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-04 00:06+0100\n"
-"PO-Revision-Date: 2013-03-03 15:00+0000\n"
-"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 11:00+0000\n"
+"Last-Translator: rogerc\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -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:18
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr "Afegeix la configuraciÃ³ del servidor"
 
-#: templates/settings.php:23
+#: templates/settings.php:37
 msgid "Host"
-msgstr "MÃ quina"
+msgstr "Equip remot"
 
-#: templates/settings.php:25
+#: 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:26
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "DN Base"
 
-#: templates/settings.php:27
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr "Una DN Base per lÃnia"
 
-#: templates/settings.php:28
+#: 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:30
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "DN Usuari"
 
-#: 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 "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:33
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Contrasenya"
 
-#: templates/settings.php:36
+#: 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:37
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "Filtre d'inici de sessiÃ³ d'usuari"
 
-#: 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 "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:41
+#: 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:42
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Llista de filtres d'usuari"
 
-#: templates/settings.php:45
+#: 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:46
+#: 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:47
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "Filtre de grup"
 
-#: templates/settings.php:50
+#: 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:51
+#: 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:55
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr "Arranjaments de connexiÃ³"
 
-#: templates/settings.php:57
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr "ConfiguraciÃ³ activa"
 
-#: templates/settings.php:57
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr "Si estÃ  desmarcat, aquesta configuraciÃ³ s'ometrÃ ."
 
-#: templates/settings.php:58
+#: templates/settings.php:72
 msgid "Port"
 msgstr "Port"
 
-#: templates/settings.php:59
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr "MÃ quina de cÃ²pia de serguretat (rÃ¨plica)"
 
-#: 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 "Afegiu una mÃ quina de cÃ²pia de seguretat opcional. Ha de ser una rÃ¨plica del servidor LDAP/AD principal."
 
-#: templates/settings.php:60
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr "Port de la cÃ²pia de seguretat (rÃ¨plica)"
 
-#: templates/settings.php:61
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr "Desactiva el servidor principal"
 
-#: templates/settings.php:61
+#: 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:62
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "Usa TLS"
 
-#: templates/settings.php:62
+#: 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:63
+#: 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:64
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "Desactiva la validaciÃ³ de certificat SSL."
 
-#: 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 "Si la connexiÃ³ nomÃ©s funciona amb aquesta opciÃ³, importeu el certificat SSL del servidor LDAP en el vostre servidor ownCloud."
 
-#: templates/settings.php:64
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "No recomanat, Ãºs nomÃ©s per proves."
 
-#: templates/settings.php:65
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr "MemÃ²ria de cau Time-To-Live"
 
-#: templates/settings.php:65
+#: 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:67
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr "Arranjaments de carpetes"
 
-#: templates/settings.php:69
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr "Camp per mostrar el nom d'usuari"
 
-#: templates/settings.php:69
+#: 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:70
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "Arbre base d'usuaris"
 
-#: templates/settings.php:70
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr "Una DN Base d'Usuari per lÃnia"
 
-#: templates/settings.php:71
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr "Atributs de cerca d'usuari"
 
-#: templates/settings.php:71 templates/settings.php:74
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr "Opcional; Un atribut per lÃnia"
 
-#: templates/settings.php:72
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr "Camp per mostrar el nom del grup"
 
-#: templates/settings.php:72
+#: 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:73
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "Arbre base de grups"
 
-#: templates/settings.php:73
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr "Una DN Base de Grup per lÃnia"
 
-#: templates/settings.php:74
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr "Atributs de cerca de grup"
 
-#: templates/settings.php:75
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr "AssociaciÃ³ membres-grup"
 
-#: templates/settings.php:77
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr "Atributs especials"
 
-#: templates/settings.php:79
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr "Camp de quota"
 
-#: templates/settings.php:80
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr "Quota per defecte"
 
-#: templates/settings.php:80
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr "en bytes"
 
-#: templates/settings.php:81
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr "Camp de correu electrÃ²nic"
 
-#: templates/settings.php:82
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr "Norma per anomenar la carpeta arrel d'usuari"
 
-#: templates/settings.php:82
+#: 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:86
+#: 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:86
+#: templates/settings.php:111
 msgid "Help"
 msgstr "Ajuda"
diff --git a/l10n/ca/user_webdavauth.po b/l10n/ca/user_webdavauth.po
index bd7df15438f42dbfd1dc3219f0fcd09768d8f727..bcde4299fd412857b476dfc90bbd06072997040a 100644
--- a/l10n/ca/user_webdavauth.po
+++ b/l10n/ca/user_webdavauth.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-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-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+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 b8c1d4424b37e0a4bdd0bb919891316613bb4534..48fbe83a662e6b5b2ce26d71f295937f6fdcdeb4 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-02-22 00:06+0100\n"
-"PO-Revision-Date: 2013-02-20 23:20+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
 "Last-Translator: TomÃ¡Å¡ ChvÃ¡tal <tomas.chvatal@gmail.com>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
@@ -21,24 +18,24 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: ajax/share.php:85
+#: ajax/share.php:97
 #, php-format
 msgid "User %s shared a file with you"
 msgstr "UÅ¾ivatel %s s vÃ¡mi sdÃlÃ soubor"
 
-#: ajax/share.php:87
+#: ajax/share.php:99
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr "UÅ¾ivatel %s s vÃ¡mi sdÃlÃ sloÅ¾ku"
 
-#: ajax/share.php:89
+#: ajax/share.php:101
 #, php-format
 msgid ""
 "User %s shared the file \"%s\" with you. It is available for download here: "
 "%s"
 msgstr "UÅ¾ivatel %s s vÃ¡mi sdÃlÃ soubor \"%s\". MÅ¯Å¾ete jej stÃ¡hnout zde: %s"
 
-#: ajax/share.php:91
+#: ajax/share.php:104
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -84,79 +81,79 @@ msgstr "Å½Ã¡dnÃ© kategorie nebyly vybrÃ¡ny ke smazÃ¡nÃ."
 msgid "Error removing %s from favorites."
 msgstr "Chyba pÅ™i odebÃrÃ¡nÃ %s z oblÃbenÃ½ch."
 
-#: js/config.php:32
+#: js/config.php:34
 msgid "Sunday"
 msgstr "NedÄ›le"
 
-#: js/config.php:32
+#: js/config.php:35
 msgid "Monday"
 msgstr "PondÄ›lÃ"
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Tuesday"
 msgstr "ÃšterÃ½"
 
-#: js/config.php:32
+#: js/config.php:37
 msgid "Wednesday"
 msgstr "StÅ™eda"
 
-#: js/config.php:32
+#: js/config.php:38
 msgid "Thursday"
 msgstr "ÄŒtvrtek"
 
-#: js/config.php:32
+#: js/config.php:39
 msgid "Friday"
 msgstr "PÃ¡tek"
 
-#: js/config.php:32
+#: js/config.php:40
 msgid "Saturday"
 msgstr "Sobota"
 
-#: js/config.php:33
+#: js/config.php:45
 msgid "January"
 msgstr "Leden"
 
-#: js/config.php:33
+#: js/config.php:46
 msgid "February"
 msgstr "Ãšnor"
 
-#: js/config.php:33
+#: js/config.php:47
 msgid "March"
 msgstr "BÅ™ezen"
 
-#: js/config.php:33
+#: js/config.php:48
 msgid "April"
 msgstr "Duben"
 
-#: js/config.php:33
+#: js/config.php:49
 msgid "May"
 msgstr "KvÄ›ten"
 
-#: js/config.php:33
+#: js/config.php:50
 msgid "June"
 msgstr "ÄŒerven"
 
-#: js/config.php:33
+#: js/config.php:51
 msgid "July"
 msgstr "ÄŒervenec"
 
-#: js/config.php:33
+#: js/config.php:52
 msgid "August"
 msgstr "Srpen"
 
-#: js/config.php:33
+#: js/config.php:53
 msgid "September"
 msgstr "ZÃ¡Å™Ã"
 
-#: js/config.php:33
+#: js/config.php:54
 msgid "October"
 msgstr "Å˜Ãjen"
 
-#: js/config.php:33
+#: js/config.php:55
 msgid "November"
 msgstr "Listopad"
 
-#: js/config.php:33
+#: js/config.php:56
 msgid "December"
 msgstr "Prosinec"
 
@@ -164,86 +161,88 @@ msgstr "Prosinec"
 msgid "Settings"
 msgstr "NastavenÃ"
 
-#: js/js.js:767
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "pÅ™ed pÃ¡r vteÅ™inami"
 
-#: js/js.js:768
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "pÅ™ed minutou"
 
-#: js/js.js:769
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr "pÅ™ed {minutes} minutami"
 
-#: js/js.js:770
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr "pÅ™ed hodinou"
 
-#: js/js.js:771
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr "pÅ™ed {hours} hodinami"
 
-#: js/js.js:772
+#: js/js.js:723
 msgid "today"
 msgstr "dnes"
 
-#: js/js.js:773
+#: js/js.js:724
 msgid "yesterday"
 msgstr "vÄera"
 
-#: js/js.js:774
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr "pÅ™ed {days} dny"
 
-#: js/js.js:775
+#: js/js.js:726
 msgid "last month"
-msgstr "minulÃ½ mesÃc"
+msgstr "minulÃ½ mÄ›sÃc"
 
-#: js/js.js:776
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr "pÅ™ed {months} mÄ›sÃci"
 
-#: js/js.js:777
+#: js/js.js:728
 msgid "months ago"
 msgstr "pÅ™ed mÄ›sÃci"
 
-#: js/js.js:778
+#: js/js.js:729
 msgid "last year"
 msgstr "minulÃ½ rok"
 
-#: js/js.js:779
+#: js/js.js:730
 msgid "years ago"
 msgstr "pÅ™ed lety"
 
-#: js/oc-dialogs.js:126
-msgid "Choose"
-msgstr "Vybrat"
+#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
+msgid "Ok"
+msgstr "Ok"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
 msgid "Cancel"
 msgstr "ZruÅ¡it"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "Ne"
+#: js/oc-dialogs.js:185
+msgid "Choose"
+msgstr "Vybrat"
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:215
 msgid "Yes"
 msgstr "Ano"
 
-#: js/oc-dialogs.js:180
-msgid "Ok"
-msgstr "Ok"
+#: js/oc-dialogs.js:222
+msgid "No"
+msgstr "Ne"
 
 #: 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 "NenÃ urÄen typ objektu."
 
-#: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:582
-#: js/share.js:594
+#: 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 "Chyba"
 
@@ -255,127 +254,127 @@ msgstr "NenÃ urÄen nÃ¡zev aplikace."
 msgid "The required file {file} is not installed!"
 msgstr "PoÅ¾adovanÃ½ soubor {file} nenÃ nainstalovÃ¡n."
 
-#: js/share.js:29 js/share.js:43 js/share.js:90
+#: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr "SdÃlenÃ©"
 
-#: js/share.js:93
+#: js/share.js:90
 msgid "Share"
 msgstr "SdÃlet"
 
-#: js/share.js:141 js/share.js:622
+#: js/share.js:125 js/share.js:617
 msgid "Error while sharing"
 msgstr "Chyba pÅ™i sdÃlenÃ"
 
-#: js/share.js:152
+#: js/share.js:136
 msgid "Error while unsharing"
 msgstr "Chyba pÅ™i ruÅ¡enÃ sdÃlenÃ"
 
-#: js/share.js:159
+#: js/share.js:143
 msgid "Error while changing permissions"
 msgstr "Chyba pÅ™i zmÄ›nÄ› oprÃ¡vnÄ›nÃ"
 
-#: js/share.js:168
+#: js/share.js:152
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "S VÃ¡mi a skupinou {group} sdÃlÃ {owner}"
 
-#: js/share.js:170
+#: js/share.js:154
 msgid "Shared with you by {owner}"
 msgstr "S VÃ¡mi sdÃlÃ {owner}"
 
-#: js/share.js:175
+#: js/share.js:159
 msgid "Share with"
 msgstr "SdÃlet s"
 
-#: js/share.js:180
+#: js/share.js:164
 msgid "Share with link"
 msgstr "SdÃlet s odkazem"
 
-#: js/share.js:183
+#: js/share.js:167
 msgid "Password protect"
 msgstr "ChrÃ¡nit heslem"
 
-#: js/share.js:185 templates/installation.php:44 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Heslo"
 
-#: js/share.js:189
+#: js/share.js:173
 msgid "Email link to person"
 msgstr "Odeslat osobÄ› odkaz e-mailem"
 
-#: js/share.js:190
+#: js/share.js:174
 msgid "Send"
 msgstr "Odeslat"
 
-#: js/share.js:194
+#: js/share.js:178
 msgid "Set expiration date"
 msgstr "Nastavit datum vyprÅ¡enÃ platnosti"
 
-#: js/share.js:195
+#: js/share.js:179
 msgid "Expiration date"
 msgstr "Datum vyprÅ¡enÃ platnosti"
 
-#: js/share.js:227
+#: js/share.js:211
 msgid "Share via email:"
 msgstr "SdÃlet e-mailem:"
 
-#: js/share.js:229
+#: js/share.js:213
 msgid "No people found"
 msgstr "Å½Ã¡dnÃ lidÃ© nenalezeni"
 
-#: js/share.js:256
+#: js/share.js:251
 msgid "Resharing is not allowed"
 msgstr "SdÃlenÃ jiÅ¾ sdÃlenÃ© poloÅ¾ky nenÃ povoleno"
 
-#: js/share.js:292
+#: js/share.js:287
 msgid "Shared in {item} with {user}"
 msgstr "SdÃleno v {item} s {user}"
 
-#: js/share.js:313
+#: js/share.js:308
 msgid "Unshare"
 msgstr "ZruÅ¡it sdÃlenÃ"
 
-#: js/share.js:325
+#: js/share.js:320
 msgid "can edit"
 msgstr "lze upravovat"
 
-#: js/share.js:327
+#: js/share.js:322
 msgid "access control"
 msgstr "Å™ÃzenÃ pÅ™Ãstupu"
 
-#: js/share.js:330
+#: js/share.js:325
 msgid "create"
 msgstr "vytvoÅ™it"
 
-#: js/share.js:333
+#: js/share.js:328
 msgid "update"
 msgstr "aktualizovat"
 
-#: js/share.js:336
+#: js/share.js:331
 msgid "delete"
 msgstr "smazat"
 
-#: js/share.js:339
+#: js/share.js:334
 msgid "share"
 msgstr "sdÃlet"
 
-#: js/share.js:373 js/share.js:569
+#: js/share.js:368 js/share.js:564
 msgid "Password protected"
 msgstr "ChrÃ¡nÄ›no heslem"
 
-#: js/share.js:582
+#: js/share.js:577
 msgid "Error unsetting expiration date"
 msgstr "Chyba pÅ™i odstraÅˆovÃ¡nÃ data vyprÅ¡enÃ platnosti"
 
-#: js/share.js:594
+#: js/share.js:589
 msgid "Error setting expiration date"
 msgstr "Chyba pÅ™i nastavenÃ data vyprÅ¡enÃ platnosti"
 
-#: js/share.js:609
+#: js/share.js:604
 msgid "Sending ..."
-msgstr "OdesÃlÃ¡m..."
+msgstr "OdesÃlÃ¡m ..."
 
-#: js/share.js:620
+#: js/share.js:615
 msgid "Email sent"
 msgstr "E-mail odeslÃ¡n"
 
@@ -398,24 +397,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:39
-#: 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"
 
@@ -471,115 +473,130 @@ msgstr "Upravit kategorie"
 msgid "Add"
 msgstr "PÅ™idat"
 
-#: templates/installation.php:23 templates/installation.php:30
+#: templates/installation.php:24 templates/installation.php:31
+#: templates/installation.php:38
 msgid "Security Warning"
 msgstr "BezpeÄnostnÃ upozornÄ›nÃ"
 
-#: templates/installation.php:24
+#: templates/installation.php:25
+msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
+msgstr "Verze vaÅ¡eho PHP je napadnutelnÃ¡ pomocÃ techniky \"NULL Byte\" (CVE-2006-7243)"
+
+#: templates/installation.php:26
+msgid "Please update your PHP installation to use ownCloud securely."
+msgstr "Aktualizujte prosÃm vaÅ¡i instanci PHP pro bezpeÄnÃ© pouÅ¾ÃvÃ¡nÃ ownCloud."
+
+#: templates/installation.php:32
 msgid ""
 "No secure random number generator is available, please enable the PHP "
 "OpenSSL extension."
 msgstr "NenÃ dostupnÃ½ Å¾Ã¡dnÃ½ bezpeÄnÃ½ generÃ¡tor nÃ¡hodnÃ½ch ÄÃsel. Povolte, prosÃm, rozÅ¡ÃÅ™enÃ OpenSSL v PHP."
 
-#: templates/installation.php:25
+#: 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 "Bez bezpeÄnÃ©ho generÃ¡toru nÃ¡hodnÃ½ch ÄÃsel mÅ¯Å¾e ÃºtoÄnÃk pÅ™edpovÄ›dÄ›t token pro obnovu hesla a pÅ™evzÃt kontrolu nad VaÅ¡Ãm ÃºÄtem."
 
-#: templates/installation.php:31
+#: templates/installation.php:39
 msgid ""
 "Your data directory and files are probably accessible from the internet "
 "because the .htaccess file does not work."
 msgstr "VÃ¡Å¡ adresÃ¡Å™ s daty a soubory jsou dostupnÃ© z internetu, protoÅ¾e soubor .htaccess nefunguje."
 
-#: templates/installation.php:32
+#: 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 "Pro informace jak sprÃ¡vnÄ› nastavit vÃ¡Å¡ server se podÃvejte do <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">dokumentace</a>."
 
-#: templates/installation.php:36
+#: templates/installation.php:44
 msgid "Create an <strong>admin account</strong>"
 msgstr "VytvoÅ™it <strong>ÃºÄet sprÃ¡vce</strong>"
 
-#: templates/installation.php:52
+#: templates/installation.php:62
 msgid "Advanced"
 msgstr "PokroÄilÃ©"
 
-#: templates/installation.php:54
+#: templates/installation.php:64
 msgid "Data folder"
 msgstr "SloÅ¾ka s daty"
 
-#: templates/installation.php:61
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "Nastavit databÃ¡zi"
 
-#: templates/installation.php:66 templates/installation.php:77
-#: templates/installation.php:87 templates/installation.php:97
+#: 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:109
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "UÅ¾ivatel databÃ¡ze"
 
-#: templates/installation.php:113
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "Heslo databÃ¡ze"
 
-#: templates/installation.php:117
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "NÃ¡zev databÃ¡ze"
 
-#: templates/installation.php:125
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "TabulkovÃ½ prostor databÃ¡ze"
 
-#: templates/installation.php:131
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "Hostitel databÃ¡ze"
 
-#: templates/installation.php:136
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "DokonÄit nastavenÃ"
 
-#: templates/layout.guest.php:33
+#: 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:48
+#: templates/layout.user.php:36
+#, 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:61
 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 si"
+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 5aaad214447a06cb81dda987aae4124e8e907d94..f164d728365d6c1c3687008a5ba0bd5732f0c62f 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-03-05 00:18+0100\n"
-"PO-Revision-Date: 2013-03-04 07:30+0000\n"
-"Last-Translator: TomÃ¡Å¡ ChvÃ¡tal <tomas.chvatal@gmail.com>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10: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"
@@ -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"
@@ -73,59 +66,70 @@ msgstr "ZÃ¡pis na disk selhal"
 msgid "Not enough storage available"
 msgstr "Nedostatek dostupnÃ©ho ÃºloÅ¾nÃ©ho prostoru"
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr "NeplatnÃ½ adresÃ¡Å™"
 
-#: appinfo/app.php:10
+#: appinfo/app.php:12
 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:92 templates/index.php:93
+#: 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/files.js:292 js/files.js:408
-#: js/files.js:439
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
-msgstr "ÄŒekajÃcÃ"
+msgstr "NevyÅ™ÃzenÃ©"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} jiÅ¾ existuje"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "nahradit"
 
-#: js/filelist.js:251
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "navrhnout nÃ¡zev"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "zruÅ¡it"
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "nahrazeno {new_name} s {old_name}"
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "undo"
 msgstr "zpÄ›t"
 
-#: js/filelist.js:323
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr "provÃ©st smazÃ¡nÃ"
 
+#: js/filelist.js:413
+msgid "1 file uploading"
+msgstr "odesÃlÃ¡ se 1 soubor"
+
+#: js/filelist.js:416 js/filelist.js:470
+msgid "files uploading"
+msgstr "soubory se odesÃlajÃ"
+
 #: js/files.js:52
 msgid "'.' is an invalid file name."
 msgstr "'.' je neplatnÃ½m nÃ¡zvem souboru."
@@ -148,77 +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:225
+#: 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:262
+#: 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:262
-msgid "Upload Error"
-msgstr "Chyba odesÃlÃ¡nÃ"
+#: js/files.js:277
+msgid "Not enough space available"
+msgstr "Nedostatek dostupnÃ©ho mÃsta"
 
-#: js/files.js:273
-msgid "Close"
-msgstr "ZavÅ™Ãt"
-
-#: js/files.js:312
-msgid "1 file uploading"
-msgstr "odesÃlÃ¡ se 1 soubor"
-
-#: js/files.js:315 js/files.js:370 js/files.js:385
-msgid "{count} files uploading"
-msgstr "odesÃlÃ¡m {count} souborÅ¯"
-
-#: js/files.js:388 js/files.js:423
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "OdesÃlÃ¡nÃ zruÅ¡eno."
 
-#: js/files.js:497
+#: 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:570
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "URL nemÅ¯Å¾e bÃ½t prÃ¡zdnÃ¡"
 
-#: js/files.js:575
+#: 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:953 templates/index.php:68
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+msgid "Error"
+msgstr "Chyba"
+
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "NÃ¡zev"
 
-#: js/files.js:954 templates/index.php:79
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Velikost"
 
-#: js/files.js:955 templates/index.php:81
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
-msgstr "ZmÄ›nÄ›no"
+msgstr "Upraveno"
 
-#: js/files.js:974
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 sloÅ¾ka"
 
-#: js/files.js:976
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} sloÅ¾ky"
 
-#: js/files.js:984
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 soubor"
 
-#: js/files.js:986
+#: 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"
@@ -271,45 +275,45 @@ msgstr "SloÅ¾ka"
 msgid "From link"
 msgstr "Z odkazu"
 
-#: templates/index.php:40
+#: templates/index.php:42
 msgid "Deleted files"
 msgstr "OdstranÄ›nÃ© soubory"
 
-#: templates/index.php:46
+#: templates/index.php:48
 msgid "Cancel upload"
 msgstr "ZruÅ¡it odesÃlÃ¡nÃ"
 
-#: templates/index.php:53
+#: templates/index.php:54
 msgid "You donâ€™t have write permissions here."
 msgstr "NemÃ¡te zde prÃ¡va zÃ¡pisu."
 
-#: templates/index.php:60
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Å½Ã¡dnÃ½ obsah. Nahrajte nÄ›co."
 
-#: templates/index.php:74
+#: templates/index.php:75
 msgid "Download"
 msgstr "StÃ¡hnout"
 
-#: templates/index.php:86 templates/index.php:87
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "ZruÅ¡it sdÃlenÃ"
 
-#: templates/index.php:106
+#: 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:108
+#: 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:113
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Soubory se prohledÃ¡vajÃ, prosÃm Äekejte."
 
-#: templates/index.php:116
+#: 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..af7d094cfbfcbcac9c27737d1ce8bf8f5a01ae6e 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/cs_CZ/files_external.po b/l10n/cs_CZ/files_external.po
index 0ceaf20e9638d08722a81b2cfcda2c3aa504af53..62dc51cbd58dd90784e3c262d4f063a93c120b4a 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-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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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: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 "<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: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 "<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..b26c3b61d684b609c980d0abdb7b4417c39459d3 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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 95843b88dec8d1a3e9ee2d8c784ebb321ed674f0..ce5f4e645f190e15316a8deb0bbf390f57a48214 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-03-08 00:25+0100\n"
-"PO-Revision-Date: 2013-03-07 23:25+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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"
@@ -18,12 +17,12 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: ajax/delete.php:40
+#: ajax/delete.php:42
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "Nelze trvale odstranit %s"
 
-#: ajax/undelete.php:41
+#: ajax/undelete.php:42
 #, php-format
 msgid "Couldn't restore %s"
 msgstr "Nelze obnovit %s"
@@ -32,6 +31,10 @@ msgstr "Nelze obnovit %s"
 msgid "perform restore operation"
 msgstr "provÃ©st obnovu"
 
+#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+msgid "Error"
+msgstr "Chyba"
+
 #: js/trash.js:34
 msgid "delete file permanently"
 msgstr "trvale odstranit soubor"
@@ -78,4 +81,4 @@ msgstr "Smazat"
 
 #: templates/part.breadcrumb.php:9
 msgid "Deleted Files"
-msgstr ""
+msgstr "SmazanÃ© soubory"
diff --git a/l10n/cs_CZ/files_versions.po b/l10n/cs_CZ/files_versions.po
index 30a2abc5e8006cfab92f105ef2c81068294bd99f..03e51b990abead3fad91e187ea547f6ee8ca7b38 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:30+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 140c9dcd5fde4c183643c1634ce474731dfb12e6..ae5d9d8705556b2c3426fd4061ec7c6171de5475 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-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-04-28 01:57+0200\n"
+"PO-Revision-Date: 2013-04-27 23:57+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"
@@ -43,19 +41,19 @@ msgstr "Aplikace"
 msgid "Admin"
 msgstr "Administrace"
 
-#: files.php:202
+#: files.php:209
 msgid "ZIP download is turned off."
 msgstr "StahovÃ¡nÃ ZIPu je vypnuto."
 
-#: files.php:203
+#: files.php:210
 msgid "Files need to be downloaded one by one."
 msgstr "Soubory musÃ bÃ½t stahovÃ¡ny jednotlivÄ›."
 
-#: files.php:204 files.php:231
+#: files.php:211 files.php:244
 msgid "Back to Files"
 msgstr "ZpÄ›t k souborÅ¯m"
 
-#: files.php:228
+#: files.php:241
 msgid "Selected files too large to generate zip file."
 msgstr "VybranÃ© soubory jsou pÅ™ÃliÅ¡ velkÃ© pro vytvoÅ™enÃ zip souboru."
 
@@ -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,83 @@ 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:128 setup.php:320 setup.php:365
+#: setup.php:132 setup.php:325 setup.php:370
 msgid "PostgreSQL username and/or password not valid"
 msgstr "UÅ¾ivatelskÃ© jmÃ©no, Äi heslo PostgreSQL nenÃ platnÃ©"
 
-#: setup.php:129 setup.php:152 setup.php:229
+#: setup.php:133 setup.php:156 setup.php:234
 msgid "You need to enter either an existing account or the administrator."
 msgstr "MusÃte zadat existujÃcÃ ÃºÄet, Äi sprÃ¡vce."
 
-#: setup.php:151 setup.php:453 setup.php:520
+#: setup.php:155 setup.php:458 setup.php:525
 msgid "Oracle username and/or password not valid"
 msgstr "UÅ¾ivatelskÃ© jmÃ©no, Äi heslo Oracle nenÃ platnÃ©"
 
-#: setup.php:228
+#: setup.php:233
 msgid "MySQL username and/or password not valid"
 msgstr "UÅ¾ivatelskÃ© jmÃ©no, Äi heslo MySQL nenÃ platnÃ©"
 
-#: 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: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:583 setup.php:592 setup.php:600 setup.php:609
+#: setup.php:615
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Chyba DB: \"%s\""
 
-#: 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:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
+#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
+#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "PodezÅ™elÃ½ pÅ™Ãkaz byl: \"%s\""
 
-#: setup.php:299
+#: setup.php:304
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "UÅ¾ivatel '%s'@'localhost' jiÅ¾ v MySQL existuje."
 
-#: setup.php:300
+#: setup.php:305
 msgid "Drop this user from MySQL"
 msgstr "Zahodit uÅ¾ivatele z MySQL"
 
-#: setup.php:305
+#: setup.php:310
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "UÅ¾ivatel '%s'@'%%' jiÅ¾ v MySQL existuje"
 
-#: setup.php:306
+#: setup.php:311
 msgid "Drop this user from MySQL."
 msgstr "Zahodit uÅ¾ivatele z MySQL."
 
-#: setup.php:579 setup.php:611
+#: setup.php:584 setup.php:616
 #, 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:631
+#: setup.php:636
 #, 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:849
+#: setup.php:858
 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:850
+#: setup.php:859
 #, 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 +229,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 83e4c17fbf72fd890cccf4797cdf46d56d5f8b91..9af35dfb216e8d9616e6dda2d4956717cd329caf 100644
--- a/l10n/cs_CZ/settings.po
+++ b/l10n/cs_CZ/settings.po
@@ -3,19 +3,13 @@
 # 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-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-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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"
@@ -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"
 
@@ -98,7 +96,7 @@ msgstr "Aktualizovat na {appversion}"
 msgid "Disable"
 msgstr "ZakÃ¡zat"
 
-#: js/apps.js:36 js/apps.js:64
+#: js/apps.js:36 js/apps.js:64 js/apps.js:83
 msgid "Enable"
 msgstr "Povolit"
 
@@ -106,68 +104,68 @@ msgstr "Povolit"
 msgid "Please wait...."
 msgstr "ÄŒekejte prosÃm..."
 
-#: js/apps.js:84
+#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+msgid "Error"
+msgstr "Chyba"
+
+#: js/apps.js:90
 msgid "Updating...."
 msgstr "Aktualizuji..."
 
-#: js/apps.js:87
+#: js/apps.js:93
 msgid "Error while updating app"
 msgstr "Chyba pÅ™i aktualizaci aplikace"
 
-#: js/apps.js:87
-msgid "Error"
-msgstr "Chyba"
-
-#: js/apps.js:90
+#: js/apps.js:96
 msgid "Updated"
 msgstr "AktualizovÃ¡no"
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr "UklÃ¡dÃ¡m..."
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "deleted"
 msgstr "smazÃ¡no"
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "undo"
 msgstr "zpÄ›t"
 
-#: js/users.js:62
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr "Nelze odebrat uÅ¾ivatele"
 
-#: js/users.js:75 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
+#: templates/users.php:103
 msgid "Groups"
 msgstr "Skupiny"
 
-#: js/users.js:78 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr "SprÃ¡va skupiny"
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "Smazat"
 
-#: js/users.js:191
+#: js/users.js:269
 msgid "add group"
 msgstr "pÅ™idat skupinu"
 
-#: js/users.js:352
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr "MusÃte zadat platnÃ© uÅ¾ivatelskÃ© jmÃ©no"
 
-#: js/users.js:353 js/users.js:359 js/users.js:374
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr "Chyba pÅ™i vytvÃ¡Å™enÃ uÅ¾iatele"
 
-#: js/users.js:358
+#: js/users.js:426
 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,15 +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:230 templates/personal.php:102
+#: templates/admin.php:228
+msgid "Less"
+msgstr "MÃ©nÄ›"
+
+#: templates/admin.php:235 templates/personal.php:105
 msgid "Version"
 msgstr "Verze"
 
-#: templates/admin.php:233 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 "
@@ -397,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:77
 msgid "Password"
 msgstr "Heslo"
 
@@ -421,82 +423,70 @@ 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:76
 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:68
 msgid "Email"
 msgstr "E-mail"
 
-#: templates/personal.php:72
+#: templates/personal.php:70
 msgid "Your email address"
 msgstr "VaÅ¡e e-mailovÃ¡ adresa"
 
-#: templates/personal.php:73
+#: templates/personal.php:71
 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:77 templates/personal.php:78
 msgid "Language"
 msgstr "Jazyk"
 
-#: templates/personal.php:86
+#: templates/personal.php:89
 msgid "Help translate"
 msgstr "Pomoci s pÅ™ekladem"
 
-#: templates/personal.php:91
+#: templates/personal.php:94
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:93
+#: templates/personal.php:96
 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:75
 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:33
 msgid "Default Storage"
 msgstr "VÃ½chozÃ ÃºloÅ¾iÅ¡tÄ›"
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:39 templates/users.php:133
 msgid "Unlimited"
 msgstr "NeomezenÄ›"
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:57 templates/users.php:148
 msgid "Other"
-msgstr "JinÃ¡"
+msgstr "JinÃ½"
 
-#: templates/users.php:84
+#: templates/users.php:82
 msgid "Storage"
 msgstr "ÃšloÅ¾iÅ¡tÄ›"
 
-#: templates/users.php:95
+#: templates/users.php:93
 msgid "change display name"
 msgstr "zmÄ›nit zobrazovanÃ© jmÃ©no"
 
-#: templates/users.php:99
+#: templates/users.php:97
 msgid "set new password"
 msgstr "nastavit novÃ© heslo"
 
-#: templates/users.php:134
+#: templates/users.php:128
 msgid "Default"
 msgstr "VÃ½chozÃ"
diff --git a/l10n/cs_CZ/user_ldap.po b/l10n/cs_CZ/user_ldap.po
index cd9f8f378273f8666c84613523ecca1e73ddb7c1..70baa024a098015384176b2ce130aa9577d8bad2 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-05 00:18+0100\n"
-"PO-Revision-Date: 2013-03-04 12:20+0000\n"
-"Last-Translator: TomÃ¡Å¡ ChvÃ¡tal <tomas.chvatal@gmail.com>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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:18
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr "PÅ™idat nastavenÃ serveru"
 
-#: templates/settings.php:23
+#: templates/settings.php:37
 msgid "Host"
 msgstr "PoÄÃtaÄ"
 
-#: templates/settings.php:25
+#: 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:26
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "ZÃ¡kladnÃ DN"
 
-#: templates/settings.php:27
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr "Jedna zÃ¡kladnÃ DN na Å™Ã¡dku"
 
-#: templates/settings.php:28
+#: 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:30
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "UÅ¾ivatelskÃ© DN"
 
-#: 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 "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:33
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Heslo"
 
-#: templates/settings.php:36
+#: 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:37
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "Filtr pÅ™ihlÃ¡Å¡enÃ uÅ¾ivatelÅ¯"
 
-#: 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 "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:41
+#: 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:42
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Filtr uÅ¾ivatelskÃ½ch seznamÅ¯"
 
-#: templates/settings.php:45
+#: 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:46
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "bez zÃ¡stupnÃ½ch znakÅ¯, napÅ™. \"objectClass=person\"."
 
-#: templates/settings.php:47
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "Filtr skupin"
 
-#: templates/settings.php:50
+#: 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:51
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "bez zÃ¡stupnÃ½ch znakÅ¯, napÅ™. \"objectClass=posixGroup\"."
 
-#: templates/settings.php:55
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr "NastavenÃ spojenÃ"
 
-#: templates/settings.php:57
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr "NastavenÃ aktivnÃ"
 
-#: templates/settings.php:57
+#: 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:58
+#: templates/settings.php:72
 msgid "Port"
 msgstr "Port"
 
-#: templates/settings.php:59
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr "ZÃ¡loÅ¾nÃ (kopie) hostitel"
 
-#: 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 "Zadejte volitelnÃ©ho zÃ¡loÅ¾nÃho hostitele. MusÃ to bÃ½t kopie hlavnÃho serveru LDAP/AD."
 
-#: templates/settings.php:60
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr "ZÃ¡loÅ¾nÃ (kopie) port"
 
-#: templates/settings.php:61
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr "ZakÃ¡zat hlavnÃ serveru"
 
-#: templates/settings.php:61
+#: 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:62
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "PouÅ¾Ãt TLS"
 
-#: templates/settings.php:62
+#: 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:63
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "LDAP server nerozliÅ¡ujÃcÃ velikost znakÅ¯ (Windows)"
 
-#: templates/settings.php:64
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "Vypnout ovÄ›Å™ovÃ¡nÃ SSL certifikÃ¡tu."
 
-#: 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 "Pokud pÅ™ipojenÃ pracuje pouze s touto moÅ¾nostÃ, tak importujte SSL certifikÃ¡t SSL serveru do VaÅ¡eho serveru ownCloud"
 
-#: templates/settings.php:64
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "NenÃ doporuÄeno, pouze pro testovacÃ ÃºÄely."
 
-#: templates/settings.php:65
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr "TTL vyrovnÃ¡vacÃ pamÄ›ti"
 
-#: templates/settings.php:65
+#: 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:67
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr "NastavenÃ adresÃ¡Å™e"
 
-#: templates/settings.php:69
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr "Pole pro zobrazovanÃ© jmÃ©no uÅ¾ivatele"
 
-#: templates/settings.php:69
+#: 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:70
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "ZÃ¡kladnÃ uÅ¾ivatelskÃ½ strom"
 
-#: templates/settings.php:70
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr "Jedna uÅ¾ivatelskÃ¡ zÃ¡kladnÃ DN na Å™Ã¡dku"
 
-#: templates/settings.php:71
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr "Atributy vyhledÃ¡vÃ¡nÃ uÅ¾ivatelÅ¯"
 
-#: templates/settings.php:71 templates/settings.php:74
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr "VolitelnÃ©, atribut na Å™Ã¡dku"
 
-#: templates/settings.php:72
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr "Pole pro zobrazenÃ jmÃ©na skupiny"
 
-#: templates/settings.php:72
+#: 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:73
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "ZÃ¡kladnÃ skupinovÃ½ strom"
 
-#: templates/settings.php:73
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr "Jedna skupinovÃ¡ zÃ¡kladnÃ DN na Å™Ã¡dku"
 
-#: templates/settings.php:74
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr "Atributy vyhledÃ¡vÃ¡nÃ skupin"
 
-#: templates/settings.php:75
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr "Asociace Älena skupiny"
 
-#: templates/settings.php:77
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr "SpeciÃ¡lnÃ atributy"
 
-#: templates/settings.php:79
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr "Pole pro kvÃ³tu"
 
-#: templates/settings.php:80
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr "VÃ½chozÃ kvÃ³ta"
 
-#: templates/settings.php:80
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr "v bajtech"
 
-#: templates/settings.php:81
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr "Pole e-mailu"
 
-#: templates/settings.php:82
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr "Pravidlo pojmenovÃ¡nÃ domovskÃ© sloÅ¾ky uÅ¾ivatele"
 
-#: templates/settings.php:82
+#: 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: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 "VyzkouÅ¡et nastavenÃ"
 
-#: templates/settings.php:86
+#: 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..a7466ca6bf10e8f3fa66a7aefd4f2aa32eb02704 100644
--- a/l10n/cs_CZ/user_webdavauth.po
+++ b/l10n/cs_CZ/user_webdavauth.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-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-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+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..2afb7a5ea8e8c7a5fc2255b3b905bf22cd0f7096
--- /dev/null
+++ b/l10n/cy_GB/core.po
@@ -0,0 +1,614 @@
+# 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-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10: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/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 js/oc-dialogs.js:247
+msgid "Ok"
+msgstr "Iawn"
+
+#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+msgid "Cancel"
+msgstr "Diddymu"
+
+#: js/oc-dialogs.js:185
+msgid "Choose"
+msgstr "Dewisiwch"
+
+#: js/oc-dialogs.js:215
+msgid "Yes"
+msgstr "Ie"
+
+#: js/oc-dialogs.js:222
+msgid "No"
+msgstr "Na"
+
+#: 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:36
+#, 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:61
+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..32f11d2044621816e542f6d44f1736a4c05752ad
--- /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-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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..0d6bc4131fda5510e85737f69702425750c8cd8a
--- /dev/null
+++ b/l10n/cy_GB/files_encryption.po
@@ -0,0 +1,39 @@
+# 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-01 01:59+0200\n"
+"PO-Revision-Date: 2013-04-30 15:40+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/settings-personal.php:4 templates/settings.php:5
+msgid "Encryption"
+msgstr "Amgryptiad"
+
+#: templates/settings-personal.php:7
+msgid "File encryption is enabled."
+msgstr "Galluogwyd amgryptio ffeiliau."
+
+#: templates/settings-personal.php:11
+msgid "The following file types will not be encrypted:"
+msgstr "Ni fydd ffeiliau o'r math yma'n cael eu hamgryptio:"
+
+#: templates/settings.php:7
+msgid "Exclude the following file types from encryption:"
+msgstr "Eithrio'r mathau canlynol o ffeiliau rhag cael eu hamgryptio:"
+
+#: templates/settings.php:12
+msgid "None"
+msgstr "Dim"
diff --git a/l10n/cy_GB/files_external.po b/l10n/cy_GB/files_external.po
new file mode 100644
index 0000000000000000000000000000000000000000..08d181aa3b1e71886458cdd25b9f0874da46609d
--- /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-05-01 01:59+0200\n"
+"PO-Revision-Date: 2013-04-30 15:20+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..8a848fc501098746ea886a269c917c51f2098e73
--- /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-05-01 01:59+0200\n"
+"PO-Revision-Date: 2013-04-30 14:47+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..e1cc6bccb954455f199e1543cc0808d8c7369d86
--- /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-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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:96
+msgid "perform restore operation"
+msgstr "gweithrediad adfer"
+
+#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+msgid "Error"
+msgstr "Gwall"
+
+#: js/trash.js:34
+msgid "delete file permanently"
+msgstr "dileu ffeil yn barhaol"
+
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr "Dileu'n barhaol"
+
+#: js/trash.js:174 templates/index.php:17
+msgid "Name"
+msgstr "Enw"
+
+#: js/trash.js:175 templates/index.php:27
+msgid "Deleted"
+msgstr "Wedi dileu"
+
+#: js/trash.js:184
+msgid "1 folder"
+msgstr "1 blygell"
+
+#: js/trash.js:186
+msgid "{count} folders"
+msgstr "{count} plygell"
+
+#: js/trash.js:194
+msgid "1 file"
+msgstr "1 ffeil"
+
+#: js/trash.js:196
+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..2d178293a3ace068fca6b03485a44634b8a082c6
--- /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-04-26 10:00+0200\n"
+"PO-Revision-Date: 2013-04-26 08:02+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..b0dbdfec6ce4e22d6aea32a1e25eb84d1c579f86
--- /dev/null
+++ b/l10n/cy_GB/lib.po
@@ -0,0 +1,241 @@
+# 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-01 02:00+0200\n"
+"PO-Revision-Date: 2013-04-30 14:46+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:349
+msgid "Help"
+msgstr "Cymorth"
+
+#: app.php:362
+msgid "Personal"
+msgstr "Personol"
+
+#: app.php:373
+msgid "Settings"
+msgstr "Gosodiadau"
+
+#: app.php:385
+msgid "Users"
+msgstr "Defnyddwyr"
+
+#: app.php:398
+msgid "Apps"
+msgstr "Pecynnau"
+
+#: app.php:406
+msgid "Admin"
+msgstr "Gweinyddu"
+
+#: files.php:209
+msgid "ZIP download is turned off."
+msgstr "Mae llwytho ZIP wedi ei ddiffodd."
+
+#: files.php:210
+msgid "Files need to be downloaded one by one."
+msgstr "Mae angen llwytho ffeiliau i lawr fesul un."
+
+#: files.php:211 files.php:244
+msgid "Back to Files"
+msgstr "NÃ´l i Ffeiliau"
+
+#: files.php:241
+msgid "Selected files too large to generate zip file."
+msgstr "Mae'r ffeiliau ddewiswyd yn rhy fawr i gynhyrchu ffeil zip."
+
+#: helper.php:228
+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:325 setup.php:370
+msgid "PostgreSQL username and/or password not valid"
+msgstr "Enw a/neu gyfrinair PostgreSQL annilys"
+
+#: setup.php:133 setup.php:156 setup.php:234
+msgid "You need to enter either an existing account or the administrator."
+msgstr "Rhaid i chi naill ai gyflwyno cyfrif presennol neu'r gweinyddwr."
+
+#: setup.php:155 setup.php:458 setup.php:525
+msgid "Oracle username and/or password not valid"
+msgstr "Enw a/neu gyfrinair Oracle annilys"
+
+#: setup.php:233
+msgid "MySQL username and/or password not valid"
+msgstr "Enw a/neu gyfrinair MySQL annilys"
+
+#: 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:583 setup.php:592 setup.php:600 setup.php:609
+#: setup.php:615
+#, php-format
+msgid "DB Error: \"%s\""
+msgstr "Gwall DB: \"%s\""
+
+#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
+#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
+#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#, php-format
+msgid "Offending command was: \"%s\""
+msgstr "Y gorchymyn wnaeth beri tramgwydd oedd: \"%s\""
+
+#: setup.php:304
+#, php-format
+msgid "MySQL user '%s'@'localhost' exists already."
+msgstr "Defnyddiwr MySQL '%s'@'localhost' yn bodoli eisoes."
+
+#: setup.php:305
+msgid "Drop this user from MySQL"
+msgstr "Gollwng y defnyddiwr hwn o MySQL"
+
+#: setup.php:310
+#, php-format
+msgid "MySQL user '%s'@'%%' already exists"
+msgstr "Defnyddiwr MySQL '%s'@'%%' eisoes yn bodoli"
+
+#: setup.php:311
+msgid "Drop this user from MySQL."
+msgstr "Gollwng y defnyddiwr hwn o MySQL."
+
+#: setup.php:584 setup.php:616
+#, 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:636
+#, php-format
+msgid "MS SQL username and/or password not valid: %s"
+msgstr "Enw a/neu gyfrinair MS SQL annilys: %s"
+
+#: setup.php:858
+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:859
+#, 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..3d0b6fb4d4f54b9a22d5611356bf6fdbac62f446
--- /dev/null
+++ b/l10n/cy_GB/settings.po
@@ -0,0 +1,492 @@
+# 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-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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:78
+#: templates/users.php:103
+msgid "Groups"
+msgstr "Grwpiau"
+
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
+msgid "Group Admin"
+msgstr ""
+
+#: js/users.js:115 templates/users.php:155
+msgid "Delete"
+msgstr "Dileu"
+
+#: js/users.js:269
+msgid "add group"
+msgstr ""
+
+#: js/users.js:420
+msgid "A valid username must be provided"
+msgstr ""
+
+#: js/users.js:421 js/users.js:427 js/users.js:442
+msgid "Error creating user"
+msgstr ""
+
+#: js/users.js:426
+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: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:77
+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:76
+msgid "Display Name"
+msgstr ""
+
+#: templates/personal.php:68
+msgid "Email"
+msgstr "E-bost"
+
+#: 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:75
+msgid "Login Name"
+msgstr ""
+
+#: templates/users.php:30
+msgid "Create"
+msgstr ""
+
+#: templates/users.php:33
+msgid "Default Storage"
+msgstr ""
+
+#: templates/users.php:39 templates/users.php:133
+msgid "Unlimited"
+msgstr ""
+
+#: templates/users.php:57 templates/users.php:148
+msgid "Other"
+msgstr "Arall"
+
+#: templates/users.php:82
+msgid "Storage"
+msgstr ""
+
+#: templates/users.php:93
+msgid "change display name"
+msgstr ""
+
+#: templates/users.php:97
+msgid "set new password"
+msgstr ""
+
+#: templates/users.php:128
+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..193441f938a93310a92d06ff15479ebe80176723
--- /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-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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..38625a8e005ab34d1314f5918504845cea120ef0
--- /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-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
+"MIME-Version: 1.0\n"
+"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 78d2ab1b2a7c043b3734b88e580011e7591bc4f0..a7b1bd9925c16c6546f0cf501c0b78a66d1cc975 100644
--- a/l10n/da/core.po
+++ b/l10n/da/core.po
@@ -3,23 +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.
-#   <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.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-22 00:06+0100\n"
-"PO-Revision-Date: 2013-02-20 23:20+0000\n"
-"Last-Translator: Frederik Lassen <frederiklassen@gmail.com>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10: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 +17,24 @@ msgstr ""
 "Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:85
+#: ajax/share.php:97
 #, php-format
 msgid "User %s shared a file with you"
 msgstr "Bruger %s delte en fil med dig"
 
-#: ajax/share.php:87
+#: ajax/share.php:99
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr "Bruger %s delte en mappe med dig"
 
-#: ajax/share.php:89
+#: ajax/share.php:101
 #, php-format
 msgid ""
 "User %s shared the file \"%s\" with you. It is available for download here: "
 "%s"
 msgstr "Bruger %s delte filen \"%s\" med dig. Den kan hentes her: %s"
 
-#: ajax/share.php:91
+#: ajax/share.php:104
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -90,79 +80,79 @@ msgstr "Ingen kategorier valgt"
 msgid "Error removing %s from favorites."
 msgstr "Fejl ved fjernelse af %s fra favoritter."
 
-#: js/config.php:32
+#: js/config.php:34
 msgid "Sunday"
 msgstr "SÃ¸ndag"
 
-#: js/config.php:32
+#: js/config.php:35
 msgid "Monday"
 msgstr "Mandag"
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Tuesday"
 msgstr "Tirsdag"
 
-#: js/config.php:32
+#: js/config.php:37
 msgid "Wednesday"
 msgstr "Onsdag"
 
-#: js/config.php:32
+#: js/config.php:38
 msgid "Thursday"
 msgstr "Torsdag"
 
-#: js/config.php:32
+#: js/config.php:39
 msgid "Friday"
 msgstr "Fredag"
 
-#: js/config.php:32
+#: js/config.php:40
 msgid "Saturday"
 msgstr "LÃ¸rdag"
 
-#: js/config.php:33
+#: js/config.php:45
 msgid "January"
 msgstr "Januar"
 
-#: js/config.php:33
+#: js/config.php:46
 msgid "February"
 msgstr "Februar"
 
-#: js/config.php:33
+#: js/config.php:47
 msgid "March"
 msgstr "Marts"
 
-#: js/config.php:33
+#: js/config.php:48
 msgid "April"
 msgstr "April"
 
-#: js/config.php:33
+#: js/config.php:49
 msgid "May"
 msgstr "Maj"
 
-#: js/config.php:33
+#: js/config.php:50
 msgid "June"
 msgstr "Juni"
 
-#: js/config.php:33
+#: js/config.php:51
 msgid "July"
 msgstr "Juli"
 
-#: js/config.php:33
+#: js/config.php:52
 msgid "August"
 msgstr "August"
 
-#: js/config.php:33
+#: js/config.php:53
 msgid "September"
 msgstr "September"
 
-#: js/config.php:33
+#: js/config.php:54
 msgid "October"
 msgstr "Oktober"
 
-#: js/config.php:33
+#: js/config.php:55
 msgid "November"
 msgstr "November"
 
-#: js/config.php:33
+#: js/config.php:56
 msgid "December"
 msgstr "December"
 
@@ -170,86 +160,88 @@ msgstr "December"
 msgid "Settings"
 msgstr "Indstillinger"
 
-#: js/js.js:767
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "sekunder siden"
 
-#: js/js.js:768
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "1 minut siden"
 
-#: js/js.js:769
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr "{minutes} minutter siden"
 
-#: js/js.js:770
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr "1 time siden"
 
-#: js/js.js:771
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr "{hours} timer siden"
 
-#: js/js.js:772
+#: js/js.js:723
 msgid "today"
 msgstr "i dag"
 
-#: js/js.js:773
+#: js/js.js:724
 msgid "yesterday"
 msgstr "i gÃ¥r"
 
-#: js/js.js:774
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr "{days} dage siden"
 
-#: js/js.js:775
+#: js/js.js:726
 msgid "last month"
 msgstr "sidste mÃ¥ned"
 
-#: js/js.js:776
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr "{months} mÃ¥neder siden"
 
-#: js/js.js:777
+#: js/js.js:728
 msgid "months ago"
 msgstr "mÃ¥neder siden"
 
-#: js/js.js:778
+#: js/js.js:729
 msgid "last year"
 msgstr "sidste Ã¥r"
 
-#: js/js.js:779
+#: js/js.js:730
 msgid "years ago"
 msgstr "Ã¥r siden"
 
-#: js/oc-dialogs.js:126
-msgid "Choose"
-msgstr "VÃ¦lg"
+#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
+msgid "Ok"
+msgstr "OK"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
 msgid "Cancel"
-msgstr "Fortryd"
+msgstr "Annuller"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "Nej"
+#: js/oc-dialogs.js:185
+msgid "Choose"
+msgstr "VÃ¦lg"
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:215
 msgid "Yes"
 msgstr "Ja"
 
-#: js/oc-dialogs.js:180
-msgid "Ok"
-msgstr "OK"
+#: js/oc-dialogs.js:222
+msgid "No"
+msgstr "Nej"
 
 #: 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 "Objekttypen er ikke angivet."
 
-#: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:582
-#: js/share.js:594
+#: 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 "Fejl"
 
@@ -261,127 +253,127 @@ msgstr "Den app navn er ikke angivet."
 msgid "The required file {file} is not installed!"
 msgstr "Den krÃ¦vede fil {file} er ikke installeret!"
 
-#: js/share.js:29 js/share.js:43 js/share.js:90
+#: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr "Delt"
 
-#: js/share.js:93
+#: js/share.js:90
 msgid "Share"
 msgstr "Del"
 
-#: js/share.js:141 js/share.js:622
+#: js/share.js:125 js/share.js:617
 msgid "Error while sharing"
 msgstr "Fejl under deling"
 
-#: js/share.js:152
+#: js/share.js:136
 msgid "Error while unsharing"
 msgstr "Fejl under annullering af deling"
 
-#: js/share.js:159
+#: js/share.js:143
 msgid "Error while changing permissions"
 msgstr "Fejl under justering af rettigheder"
 
-#: js/share.js:168
+#: js/share.js:152
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Delt med dig og gruppen {group} af {owner}"
 
-#: js/share.js:170
+#: js/share.js:154
 msgid "Shared with you by {owner}"
 msgstr "Delt med dig af {owner}"
 
-#: js/share.js:175
+#: js/share.js:159
 msgid "Share with"
 msgstr "Del med"
 
-#: js/share.js:180
+#: js/share.js:164
 msgid "Share with link"
 msgstr "Del med link"
 
-#: js/share.js:183
+#: js/share.js:167
 msgid "Password protect"
 msgstr "Beskyt med adgangskode"
 
-#: js/share.js:185 templates/installation.php:44 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Kodeord"
 
-#: js/share.js:189
+#: js/share.js:173
 msgid "Email link to person"
 msgstr "E-mail link til person"
 
-#: js/share.js:190
+#: js/share.js:174
 msgid "Send"
 msgstr "Send"
 
-#: js/share.js:194
+#: js/share.js:178
 msgid "Set expiration date"
 msgstr "VÃ¦lg udlÃ¸bsdato"
 
-#: js/share.js:195
+#: js/share.js:179
 msgid "Expiration date"
 msgstr "UdlÃ¸bsdato"
 
-#: js/share.js:227
+#: js/share.js:211
 msgid "Share via email:"
 msgstr "Del via email:"
 
-#: js/share.js:229
+#: js/share.js:213
 msgid "No people found"
 msgstr "Ingen personer fundet"
 
-#: js/share.js:256
+#: js/share.js:251
 msgid "Resharing is not allowed"
 msgstr "Videredeling ikke tilladt"
 
-#: js/share.js:292
+#: js/share.js:287
 msgid "Shared in {item} with {user}"
 msgstr "Delt i {item} med {user}"
 
-#: js/share.js:313
+#: js/share.js:308
 msgid "Unshare"
 msgstr "Fjern deling"
 
-#: js/share.js:325
+#: js/share.js:320
 msgid "can edit"
 msgstr "kan redigere"
 
-#: js/share.js:327
+#: js/share.js:322
 msgid "access control"
 msgstr "Adgangskontrol"
 
-#: js/share.js:330
+#: js/share.js:325
 msgid "create"
 msgstr "opret"
 
-#: js/share.js:333
+#: js/share.js:328
 msgid "update"
 msgstr "opdater"
 
-#: js/share.js:336
+#: js/share.js:331
 msgid "delete"
 msgstr "slet"
 
-#: js/share.js:339
+#: js/share.js:334
 msgid "share"
 msgstr "del"
 
-#: js/share.js:373 js/share.js:569
+#: js/share.js:368 js/share.js:564
 msgid "Password protected"
 msgstr "Beskyttet med adgangskode"
 
-#: js/share.js:582
+#: js/share.js:577
 msgid "Error unsetting expiration date"
 msgstr "Fejl ved fjernelse af udlÃ¸bsdato"
 
-#: js/share.js:594
+#: js/share.js:589
 msgid "Error setting expiration date"
 msgstr "Fejl under sÃ¦tning af udlÃ¸bsdato"
 
-#: js/share.js:609
+#: js/share.js:604
 msgid "Sending ..."
 msgstr "Sender ..."
 
-#: js/share.js:620
+#: js/share.js:615
 msgid "Email sent"
 msgstr "E-mail afsendt"
 
@@ -404,24 +396,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 ""
 
-#: 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 ""
 
-#: 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:39
-#: 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"
 
@@ -443,7 +438,7 @@ msgstr "Nulstil kodeord"
 
 #: strings.php:5
 msgid "Personal"
-msgstr "Personlig"
+msgstr "Personligt"
 
 #: strings.php:6
 msgid "Users"
@@ -477,115 +472,130 @@ msgstr "Rediger kategorier"
 msgid "Add"
 msgstr "TilfÃ¸j"
 
-#: templates/installation.php:23 templates/installation.php:30
+#: templates/installation.php:24 templates/installation.php:31
+#: templates/installation.php:38
 msgid "Security Warning"
 msgstr "Sikkerhedsadvarsel"
 
-#: templates/installation.php:24
+#: templates/installation.php:25
+msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
+msgstr "Din PHP-version er sÃ¥rbar overfor et NULL Byte angreb (CVE-2006-7243)"
+
+#: templates/installation.php:26
+msgid "Please update your PHP installation to use ownCloud securely."
+msgstr "Opdater venligs din PHP-installation for at kunne bruge ownCloud sikkert."
+
+#: templates/installation.php:32
 msgid ""
 "No secure random number generator is available, please enable the PHP "
 "OpenSSL extension."
 msgstr "Ingen sikker tilfÃ¦ldighedsgenerator til tal er tilgÃ¦ngelig. Aktiver venligst OpenSSL udvidelsen."
 
-#: templates/installation.php:25
+#: 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 "Uden en sikker tilfÃ¦ldighedsgenerator til tal kan en angriber mÃ¥ske gÃ¦tte dit gendan kodeord og overtage din konto"
 
-#: templates/installation.php:31
+#: templates/installation.php:39
 msgid ""
 "Your data directory and files are probably accessible from the internet "
 "because the .htaccess file does not work."
 msgstr "Dine data mappe og filer er sandsynligvis tilgÃ¦ngelige fra internettet fordi .htaccess filen ikke virker."
 
-#: templates/installation.php:32
+#: 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 "For at vide mere om hvordan du konfigurerer din server ordentligt, se venligst <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">dokumentationen</a>."
 
-#: templates/installation.php:36
+#: templates/installation.php:44
 msgid "Create an <strong>admin account</strong>"
 msgstr "Opret en <strong>administratorkonto</strong>"
 
-#: templates/installation.php:52
+#: templates/installation.php:62
 msgid "Advanced"
 msgstr "Avanceret"
 
-#: templates/installation.php:54
+#: templates/installation.php:64
 msgid "Data folder"
 msgstr "Datamappe"
 
-#: templates/installation.php:61
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "Konfigurer databasen"
 
-#: templates/installation.php:66 templates/installation.php:77
-#: templates/installation.php:87 templates/installation.php:97
+#: 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:109
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "Databasebruger"
 
-#: templates/installation.php:113
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "Databasekodeord"
 
-#: templates/installation.php:117
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "Navn pÃ¥ database"
 
-#: templates/installation.php:125
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "Database tabelplads"
 
-#: templates/installation.php:131
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "Databasehost"
 
-#: templates/installation.php:136
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "Afslut opsÃ¦tning"
 
-#: templates/layout.guest.php:33
+#: templates/layout.guest.php:40
 msgid "web services under your control"
 msgstr "Webtjenester under din kontrol"
 
-#: templates/layout.user.php:48
+#: 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 "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 7d64d326b93d1e8788d65168ed1dafd5da0f70b0..36c60585d27b8372225c43dfdcdd175fe8ce6575 100644
--- a/l10n/da/files.po
+++ b/l10n/da/files.po
@@ -3,23 +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>, 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-03-05 00:18+0100\n"
-"PO-Revision-Date: 2013-03-04 18:10+0000\n"
-"Last-Translator: cronner <cronner@gmail.com>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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"
@@ -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"
@@ -80,59 +66,70 @@ msgstr "Fejl ved skrivning til disk."
 msgid "Not enough storage available"
 msgstr "Der er ikke nok plads til rÃ¥dlighed"
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr "Ugyldig mappe."
 
-#: appinfo/app.php:10
+#: 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 "Slet permanent"
 
-#: js/fileactions.js:127 templates/index.php:92 templates/index.php:93
+#: 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/files.js:292 js/files.js:408
-#: js/files.js:439
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "Afventer"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} eksisterer allerede"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "erstat"
 
-#: js/filelist.js:251
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "foreslÃ¥ navn"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "fortryd"
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "erstattede {new_name} med {old_name}"
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "undo"
 msgstr "fortryd"
 
-#: js/filelist.js:323
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr "udfÃ¸r slet operation"
 
+#: js/filelist.js:413
+msgid "1 file uploading"
+msgstr "1 fil uploades"
+
+#: js/filelist.js:416 js/filelist.js:470
+msgid "files uploading"
+msgstr "uploader filer"
+
 #: js/files.js:52
 msgid "'.' is an invalid file name."
 msgstr "'.' er et ugyldigt filnavn."
@@ -155,77 +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:225
+#: 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:262
+#: 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:262
-msgid "Upload Error"
-msgstr "Fejl ved upload"
+#: js/files.js:277
+msgid "Not enough space available"
+msgstr "ikke nok tilgÃ¦ngelig ledig plads "
 
-#: js/files.js:273
-msgid "Close"
-msgstr "Luk"
-
-#: js/files.js:312
-msgid "1 file uploading"
-msgstr "1 fil uploades"
-
-#: js/files.js:315 js/files.js:370 js/files.js:385
-msgid "{count} files uploading"
-msgstr "{count} filer uploades"
-
-#: js/files.js:388 js/files.js:423
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "Upload afbrudt."
 
-#: js/files.js:497
+#: 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:570
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "URLen kan ikke vÃ¦re tom."
 
-#: js/files.js:575
+#: 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:953 templates/index.php:68
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+msgid "Error"
+msgstr "Fejl"
+
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Navn"
 
-#: js/files.js:954 templates/index.php:79
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "StÃ¸rrelse"
 
-#: js/files.js:955 templates/index.php:81
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Ã†ndret"
 
-#: js/files.js:974
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 mappe"
 
-#: js/files.js:976
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} mapper"
 
-#: js/files.js:984
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 fil"
 
-#: js/files.js:986
+#: 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"
@@ -278,45 +275,45 @@ msgstr "Mappe"
 msgid "From link"
 msgstr "Fra link"
 
-#: templates/index.php:40
+#: templates/index.php:42
 msgid "Deleted files"
 msgstr "Slettede filer"
 
-#: templates/index.php:46
+#: templates/index.php:48
 msgid "Cancel upload"
 msgstr "Fortryd upload"
 
-#: templates/index.php:53
+#: templates/index.php:54
 msgid "You donâ€™t have write permissions here."
 msgstr "Du har ikke skriverettigheder her."
 
-#: templates/index.php:60
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Her er tomt. Upload noget!"
 
-#: templates/index.php:74
+#: templates/index.php:75
 msgid "Download"
 msgstr "Download"
 
-#: templates/index.php:86 templates/index.php:87
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Fjern deling"
 
-#: templates/index.php:106
+#: templates/index.php:107
 msgid "Upload too large"
-msgstr "Upload for stor"
+msgstr "Upload er for stor"
 
-#: templates/index.php:108
+#: 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:113
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Filerne bliver indlÃ¦st, vent venligst."
 
-#: templates/index.php:116
+#: 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..9d253656f2dc15add4209dcf2df166bb477e8325 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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/files_external.po b/l10n/da/files_external.po
index c69d31f708be39cd979c38aac1eabb8c2ed170c4..85d11b63bf13934a35ae98db118ecb1f48be2ed5 100644
--- a/l10n/da/files_external.po
+++ b/l10n/da/files_external.po
@@ -3,15 +3,12 @@
 # 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>, 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-01 00:05+0100\n"
-"PO-Revision-Date: 2013-02-27 23:20+0000\n"
+"POT-Creation-Date: 2013-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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"
@@ -40,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: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 "<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: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 "<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"
@@ -63,7 +67,7 @@ msgstr "Mappenavn"
 
 #: templates/settings.php:10
 msgid "External storage"
-msgstr ""
+msgstr "Eksternt lager"
 
 #: templates/settings.php:11
 msgid "Configuration"
@@ -79,7 +83,7 @@ msgstr "Kan anvendes"
 
 #: templates/settings.php:33
 msgid "Add storage"
-msgstr ""
+msgstr "TilfÃ¸j lager"
 
 #: templates/settings.php:90
 msgid "None set"
diff --git a/l10n/da/files_sharing.po b/l10n/da/files_sharing.po
index 99b2cdf8e9cf2670d5bcb11647979c8432ea6e8c..39cc42941ec6cd3c481ac481e912258f78576ed6 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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 4c32d1c2f550b552857cbb44d0f3342d2ba67dbb..05219a3d197831822e6c6479dd1ae1f4a8cf1a76 100644
--- a/l10n/da/files_trashbin.po
+++ b/l10n/da/files_trashbin.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# 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-03-08 00:25+0100\n"
-"PO-Revision-Date: 2013-03-07 23:25+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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"
@@ -18,12 +17,12 @@ msgstr ""
 "Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:40
+#: ajax/delete.php:42
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "Kunne ikke slette %s permanent"
 
-#: ajax/undelete.php:41
+#: ajax/undelete.php:42
 #, php-format
 msgid "Couldn't restore %s"
 msgstr "Kunne ikke gendanne %s"
@@ -32,6 +31,10 @@ msgstr "Kunne ikke gendanne %s"
 msgid "perform restore operation"
 msgstr "udfÃ¸r gendannelsesoperation"
 
+#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+msgid "Error"
+msgstr "Fejl"
+
 #: js/trash.js:34
 msgid "delete file permanently"
 msgstr "slet fil permanent"
@@ -78,4 +81,4 @@ msgstr "Slet"
 
 #: templates/part.breadcrumb.php:9
 msgid "Deleted Files"
-msgstr ""
+msgstr "Slettede filer"
diff --git a/l10n/da/files_versions.po b/l10n/da/files_versions.po
index 6b6ab2ac91f3c355a8d2171d5c7b81289c13c6f6..4dcf5e81f4484ebd928afa98c20c531d2bfd35f5 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:30+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 a8476f00b378838d409eea48ccd93bb432fca1e2..ac8b6efab1dc473ca57b79bc72ca2bdf1e3f7b4b 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-03-05 00:18+0100\n"
-"PO-Revision-Date: 2013-03-04 18:10+0000\n"
-"Last-Translator: cronner <cronner@gmail.com>\n"
+"POT-Creation-Date: 2013-04-28 01:57+0200\n"
+"PO-Revision-Date: 2013-04-27 23:57+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"
@@ -28,7 +23,7 @@ msgstr "HjÃ¦lp"
 
 #: app.php:362
 msgid "Personal"
-msgstr "Personlig"
+msgstr "Personligt"
 
 #: app.php:373
 msgid "Settings"
@@ -46,19 +41,19 @@ msgstr "Apps"
 msgid "Admin"
 msgstr "Admin"
 
-#: files.php:202
+#: files.php:209
 msgid "ZIP download is turned off."
 msgstr "ZIP-download er slÃ¥et fra."
 
-#: files.php:203
+#: files.php:210
 msgid "Files need to be downloaded one by one."
 msgstr "Filer skal downloades en for en."
 
-#: files.php:204 files.php:231
+#: files.php:211 files.php:244
 msgid "Back to Files"
 msgstr "Tilbage til Filer"
 
-#: files.php:228
+#: files.php:241
 msgid "Selected files too large to generate zip file."
 msgstr "De markerede filer er for store til at generere en ZIP-fil."
 
@@ -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,72 @@ msgstr "%s du mÃ¥ ikke bruge punktummer i databasenavnet."
 msgid "%s set the database host."
 msgstr "%s sÃ¦t database vÃ¦rten."
 
-#: setup.php:128 setup.php:320 setup.php:365
+#: setup.php:132 setup.php:325 setup.php:370
 msgid "PostgreSQL username and/or password not valid"
 msgstr "PostgreSQL brugernavn og/eller kodeord er ikke gyldigt."
 
-#: setup.php:129 setup.php:152 setup.php:229
+#: setup.php:133 setup.php:156 setup.php:234
 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:151 setup.php:453 setup.php:520
+#: setup.php:155 setup.php:458 setup.php:525
 msgid "Oracle username and/or password not valid"
 msgstr "Oracle brugernavn og/eller kodeord er ikke gyldigt."
 
-#: setup.php:228
+#: setup.php:233
 msgid "MySQL username and/or password not valid"
 msgstr "MySQL brugernavn og/eller kodeord er ikke gyldigt."
 
-#: 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: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:583 setup.php:592 setup.php:600 setup.php:609
+#: setup.php:615
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Databasefejl: \"%s\""
 
-#: 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:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
+#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
+#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "Fejlende kommando var: \"%s\""
 
-#: setup.php:299
+#: setup.php:304
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "MySQL brugeren '%s'@'localhost' eksisterer allerede."
 
-#: setup.php:300
+#: setup.php:305
 msgid "Drop this user from MySQL"
 msgstr "Slet denne bruger fra MySQL"
 
-#: setup.php:305
+#: setup.php:310
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "MySQL brugeren '%s'@'%%' eksisterer allerede."
 
-#: setup.php:306
+#: setup.php:311
 msgid "Drop this user from MySQL."
 msgstr "Slet denne bruger fra MySQL"
 
-#: setup.php:579 setup.php:611
+#: setup.php:584 setup.php:616
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Fejlende kommando var: \"%s\", navn: %s, password: %s"
 
-#: setup.php:631
+#: setup.php:636
 #, 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:849
+#: setup.php:858
 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:850
+#: setup.php:859
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Dobbelttjek venligst <a href='%s'>installations vejledningerne</a>."
@@ -216,11 +207,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 +220,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 +229,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 57f9c33b59981a105d86ccd4efd70d60c1d8640a..0d668d9af378d4ae8ecf7bc955ea093c8084708f 100644
--- a/l10n/da/settings.po
+++ b/l10n/da/settings.po
@@ -3,25 +3,14 @@
 # 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-03-07 00:16+0100\n"
-"PO-Revision-Date: 2013-03-06 11:50+0000\n"
-"Last-Translator: Morten Juhl-Johansen ZÃ¶lde-FejÃ©r <morten@writtenandread.net>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"Last-Translator: Ole Holm Frandsen <froksen@gmail.com>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -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"
 
@@ -104,7 +97,7 @@ msgstr "OpdatÃ©r til {appversion}"
 msgid "Disable"
 msgstr "Deaktiver"
 
-#: js/apps.js:36 js/apps.js:64
+#: js/apps.js:36 js/apps.js:64 js/apps.js:83
 msgid "Enable"
 msgstr "Aktiver"
 
@@ -112,68 +105,68 @@ msgstr "Aktiver"
 msgid "Please wait...."
 msgstr "Vent venligst..."
 
-#: js/apps.js:84
+#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+msgid "Error"
+msgstr "Fejl"
+
+#: js/apps.js:90
 msgid "Updating...."
 msgstr "Opdaterer...."
 
-#: js/apps.js:87
+#: js/apps.js:93
 msgid "Error while updating app"
 msgstr "Der opstod en fejl under app opgraderingen"
 
-#: js/apps.js:87
-msgid "Error"
-msgstr "Fejl"
-
-#: js/apps.js:90
+#: js/apps.js:96
 msgid "Updated"
 msgstr "Opdateret"
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr "Gemmer..."
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "deleted"
 msgstr "Slettet"
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "undo"
 msgstr "fortryd"
 
-#: js/users.js:62
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr "Kan ikke fjerne bruger"
 
-#: js/users.js:75 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
+#: templates/users.php:103
 msgid "Groups"
 msgstr "Grupper"
 
-#: js/users.js:78 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr "Gruppe Administrator"
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "Slet"
 
-#: js/users.js:191
+#: js/users.js:269
 msgid "add group"
 msgstr "TilfÃ¸j gruppe"
 
-#: js/users.js:352
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr "Et gyldigt brugernavn skal angives"
 
-#: js/users.js:353 js/users.js:359 js/users.js:374
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr "Fejl ved oprettelse af bruger"
 
-#: js/users.js:358
+#: js/users.js:426
 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,15 +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:230 templates/personal.php:102
+#: templates/admin.php:228
+msgid "Less"
+msgstr "Mindre"
+
+#: templates/admin.php:235 templates/personal.php:105
 msgid "Version"
 msgstr "Version"
 
-#: templates/admin.php:233 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 "
@@ -401,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:77
 msgid "Password"
 msgstr "Kodeord"
 
@@ -421,88 +418,76 @@ 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:76
 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:68
 msgid "Email"
-msgstr "Email"
+msgstr "E-mail"
 
-#: templates/personal.php:72
+#: templates/personal.php:70
 msgid "Your email address"
 msgstr "Din emailadresse"
 
-#: templates/personal.php:73
+#: templates/personal.php:71
 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:77 templates/personal.php:78
 msgid "Language"
 msgstr "Sprog"
 
-#: templates/personal.php:86
+#: templates/personal.php:89
 msgid "Help translate"
 msgstr "HjÃ¦lp med oversÃ¦ttelsen"
 
-#: templates/personal.php:91
+#: templates/personal.php:94
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:93
+#: templates/personal.php:96
 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:75
 msgid "Login Name"
 msgstr "Loginnavn"
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr "Ny"
 
-#: templates/users.php:35
+#: templates/users.php:33
 msgid "Default Storage"
 msgstr "Standard opbevaring"
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:39 templates/users.php:133
 msgid "Unlimited"
 msgstr "UbegrÃ¦nset"
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:57 templates/users.php:148
 msgid "Other"
 msgstr "Andet"
 
-#: templates/users.php:84
+#: templates/users.php:82
 msgid "Storage"
 msgstr "Opbevaring"
 
-#: templates/users.php:95
+#: templates/users.php:93
 msgid "change display name"
 msgstr "skift skÃ¦rmnavn"
 
-#: templates/users.php:99
+#: templates/users.php:97
 msgid "set new password"
 msgstr "skift kodeord"
 
-#: templates/users.php:134
+#: templates/users.php:128
 msgid "Default"
 msgstr "Standard"
diff --git a/l10n/da/user_ldap.po b/l10n/da/user_ldap.po
index 156ff3fec5f7e0125e737ce3094532011617d6f1..0d1223e9653659932a72b0d2b2559ab4bc8c9850 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-02 00:03+0100\n"
-"PO-Revision-Date: 2013-03-01 23:04+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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:18
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:37
 msgid "Host"
 msgstr "Host"
 
-#: templates/settings.php:25
+#: 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:26
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "Base DN"
 
-#: 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 "You can specify Base DN for users and groups in the Advanced tab"
 
-#: templates/settings.php:30
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "Bruger DN"
 
-#: 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 "Kodeord"
 
-#: templates/settings.php:36
+#: 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:37
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "Bruger Login Filter"
 
-#: 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 "Brugerliste Filter"
 
-#: templates/settings.php:45
+#: 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: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 "Gruppe Filter"
 
-#: templates/settings.php:50
+#: 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: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 "Port"
 
-#: 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 "Brug 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 "Deaktiver SSL certifikat validering"
 
-#: 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 "Anbefales ikke, brug kun for at teste."
 
-#: 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 "User Display Name Field"
 
-#: 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 "Base Bruger TrÃ¦"
 
-#: 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 "Base Group Tree"
 
-#: 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 "Group-Member association"
 
-#: 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 "i bytes"
 
-#: 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 "HjÃ¦lp"
diff --git a/l10n/da/user_webdavauth.po b/l10n/da/user_webdavauth.po
index 32a2a3729ab90af29dd57d91636c64ec99146674..0590c136e9223905d37dd25657ab132c72a4f9c9 100644
--- a/l10n/da/user_webdavauth.po
+++ b/l10n/da/user_webdavauth.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-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-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -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 7439a612da66ed035fee8fb432abc83e76daf2cc..dbe7d0f5ad512fed0377f6498297767b1f9ccdb8 100644
--- a/l10n/de/core.po
+++ b/l10n/de/core.po
@@ -3,29 +3,15 @@
 # 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-02-22 00:06+0100\n"
-"PO-Revision-Date: 2013-02-20 23:20+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
 "Last-Translator: Marcel KÃ¼hlhorn <susefan93@gmx.de>\n"
 "Language-Team: German <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
@@ -34,24 +20,24 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:85
+#: ajax/share.php:97
 #, php-format
 msgid "User %s shared a file with you"
 msgstr "Der Nutzer %s hat eine Datei mit Dir geteilt"
 
-#: ajax/share.php:87
+#: ajax/share.php:99
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr "%s hat ein Verzeichnis mit Dir geteilt"
 
-#: ajax/share.php:89
+#: ajax/share.php:101
 #, php-format
 msgid ""
 "User %s shared the file \"%s\" with you. It is available for download here: "
 "%s"
 msgstr "%s hat die Datei \"%s\" mit Dir geteilt. Sie ist hier zum Download verfÃ¼gbar: %s"
 
-#: ajax/share.php:91
+#: ajax/share.php:104
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -97,79 +83,79 @@ msgstr "Es wurde keine Kategorien zum LÃ¶schen ausgewÃ¤hlt."
 msgid "Error removing %s from favorites."
 msgstr "Fehler beim Entfernen von %s von den Favoriten."
 
-#: js/config.php:32
+#: js/config.php:34
 msgid "Sunday"
 msgstr "Sonntag"
 
-#: js/config.php:32
+#: js/config.php:35
 msgid "Monday"
 msgstr "Montag"
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Tuesday"
 msgstr "Dienstag"
 
-#: js/config.php:32
+#: js/config.php:37
 msgid "Wednesday"
 msgstr "Mittwoch"
 
-#: js/config.php:32
+#: js/config.php:38
 msgid "Thursday"
 msgstr "Donnerstag"
 
-#: js/config.php:32
+#: js/config.php:39
 msgid "Friday"
 msgstr "Freitag"
 
-#: js/config.php:32
+#: js/config.php:40
 msgid "Saturday"
 msgstr "Samstag"
 
-#: js/config.php:33
+#: js/config.php:45
 msgid "January"
 msgstr "Januar"
 
-#: js/config.php:33
+#: js/config.php:46
 msgid "February"
 msgstr "Februar"
 
-#: js/config.php:33
+#: js/config.php:47
 msgid "March"
 msgstr "MÃ¤rz"
 
-#: js/config.php:33
+#: js/config.php:48
 msgid "April"
 msgstr "April"
 
-#: js/config.php:33
+#: js/config.php:49
 msgid "May"
 msgstr "Mai"
 
-#: js/config.php:33
+#: js/config.php:50
 msgid "June"
 msgstr "Juni"
 
-#: js/config.php:33
+#: js/config.php:51
 msgid "July"
 msgstr "Juli"
 
-#: js/config.php:33
+#: js/config.php:52
 msgid "August"
 msgstr "August"
 
-#: js/config.php:33
+#: js/config.php:53
 msgid "September"
 msgstr "September"
 
-#: js/config.php:33
+#: js/config.php:54
 msgid "October"
 msgstr "Oktober"
 
-#: js/config.php:33
+#: js/config.php:55
 msgid "November"
 msgstr "November"
 
-#: js/config.php:33
+#: js/config.php:56
 msgid "December"
 msgstr "Dezember"
 
@@ -177,86 +163,88 @@ msgstr "Dezember"
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: js/js.js:767
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "Gerade eben"
 
-#: js/js.js:768
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "vor einer Minute"
 
-#: js/js.js:769
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr "Vor {minutes} Minuten"
 
-#: js/js.js:770
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr "Vor einer Stunde"
 
-#: js/js.js:771
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr "Vor {hours} Stunden"
 
-#: js/js.js:772
+#: js/js.js:723
 msgid "today"
 msgstr "Heute"
 
-#: js/js.js:773
+#: js/js.js:724
 msgid "yesterday"
 msgstr "Gestern"
 
-#: js/js.js:774
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr "Vor {days} Tag(en)"
 
-#: js/js.js:775
+#: js/js.js:726
 msgid "last month"
 msgstr "Letzten Monat"
 
-#: js/js.js:776
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr "Vor {months} Monaten"
 
-#: js/js.js:777
+#: js/js.js:728
 msgid "months ago"
 msgstr "Vor Monaten"
 
-#: js/js.js:778
+#: js/js.js:729
 msgid "last year"
 msgstr "Letztes Jahr"
 
-#: js/js.js:779
+#: js/js.js:730
 msgid "years ago"
 msgstr "Vor Jahren"
 
-#: js/oc-dialogs.js:126
-msgid "Choose"
-msgstr "AuswÃ¤hlen"
+#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
+msgid "Ok"
+msgstr "OK"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "Nein"
+#: js/oc-dialogs.js:185
+msgid "Choose"
+msgstr "AuswÃ¤hlen"
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:215
 msgid "Yes"
 msgstr "Ja"
 
-#: js/oc-dialogs.js:180
-msgid "Ok"
-msgstr "OK"
+#: js/oc-dialogs.js:222
+msgid "No"
+msgstr "Nein"
 
 #: 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 "Der Objekttyp ist nicht angegeben."
 
-#: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:582
-#: js/share.js:594
+#: 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 "Fehler"
 
@@ -268,127 +256,127 @@ msgstr "Der App-Name ist nicht angegeben."
 msgid "The required file {file} is not installed!"
 msgstr "Die benÃ¶tigte Datei {file} ist nicht installiert."
 
-#: js/share.js:29 js/share.js:43 js/share.js:90
+#: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr "Geteilt"
 
-#: js/share.js:93
+#: js/share.js:90
 msgid "Share"
 msgstr "Teilen"
 
-#: js/share.js:141 js/share.js:622
+#: js/share.js:125 js/share.js:617
 msgid "Error while sharing"
 msgstr "Fehler beim Teilen"
 
-#: js/share.js:152
+#: js/share.js:136
 msgid "Error while unsharing"
-msgstr "Fehler beim Aufheben der Teilung"
+msgstr "Fehler beim Aufheben der Freigabe"
 
-#: js/share.js:159
+#: js/share.js:143
 msgid "Error while changing permissions"
 msgstr "Fehler beim Ã„ndern der Rechte"
 
-#: js/share.js:168
+#: js/share.js:152
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "{owner} hat dies mit Dir und der Gruppe {group} geteilt"
 
-#: js/share.js:170
+#: js/share.js:154
 msgid "Shared with you by {owner}"
 msgstr "{owner} hat dies mit Dir geteilt"
 
-#: js/share.js:175
+#: js/share.js:159
 msgid "Share with"
 msgstr "Teilen mit"
 
-#: js/share.js:180
+#: js/share.js:164
 msgid "Share with link"
 msgstr "Ãœber einen Link freigegeben"
 
-#: js/share.js:183
+#: js/share.js:167
 msgid "Password protect"
 msgstr "Passwortschutz"
 
-#: js/share.js:185 templates/installation.php:44 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Passwort"
 
-#: js/share.js:189
+#: js/share.js:173
 msgid "Email link to person"
 msgstr "Link per E-Mail verschicken"
 
-#: js/share.js:190
+#: js/share.js:174
 msgid "Send"
 msgstr "Senden"
 
-#: js/share.js:194
+#: js/share.js:178
 msgid "Set expiration date"
 msgstr "Setze ein Ablaufdatum"
 
-#: js/share.js:195
+#: js/share.js:179
 msgid "Expiration date"
 msgstr "Ablaufdatum"
 
-#: js/share.js:227
+#: js/share.js:211
 msgid "Share via email:"
 msgstr "Ãœber eine E-Mail teilen:"
 
-#: js/share.js:229
+#: js/share.js:213
 msgid "No people found"
 msgstr "Niemand gefunden"
 
-#: js/share.js:256
+#: js/share.js:251
 msgid "Resharing is not allowed"
 msgstr "Weiterverteilen ist nicht erlaubt"
 
-#: js/share.js:292
+#: js/share.js:287
 msgid "Shared in {item} with {user}"
 msgstr "FÃ¼r {user} in {item} freigegeben"
 
-#: js/share.js:313
+#: js/share.js:308
 msgid "Unshare"
 msgstr "Freigabe aufheben"
 
-#: js/share.js:325
+#: js/share.js:320
 msgid "can edit"
 msgstr "kann bearbeiten"
 
-#: js/share.js:327
+#: js/share.js:322
 msgid "access control"
 msgstr "Zugriffskontrolle"
 
-#: js/share.js:330
+#: js/share.js:325
 msgid "create"
 msgstr "erstellen"
 
-#: js/share.js:333
+#: js/share.js:328
 msgid "update"
 msgstr "aktualisieren"
 
-#: js/share.js:336
+#: js/share.js:331
 msgid "delete"
 msgstr "lÃ¶schen"
 
-#: js/share.js:339
+#: js/share.js:334
 msgid "share"
 msgstr "teilen"
 
-#: js/share.js:373 js/share.js:569
+#: js/share.js:368 js/share.js:564
 msgid "Password protected"
 msgstr "Durch ein Passwort geschÃ¼tzt"
 
-#: js/share.js:582
+#: js/share.js:577
 msgid "Error unsetting expiration date"
-msgstr "Fehler beim entfernen des Ablaufdatums"
+msgstr "Fehler beim Entfernen des Ablaufdatums"
 
-#: js/share.js:594
+#: js/share.js:589
 msgid "Error setting expiration date"
 msgstr "Fehler beim Setzen des Ablaufdatums"
 
-#: js/share.js:609
+#: js/share.js:604
 msgid "Sending ..."
 msgstr "Sende ..."
 
-#: js/share.js:620
+#: js/share.js:615
 msgid "Email sent"
 msgstr "E-Mail wurde verschickt"
 
@@ -397,11 +385,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"
@@ -411,24 +399,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:39
-#: 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"
 
@@ -458,11 +449,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"
@@ -484,115 +475,130 @@ msgstr "Kategorien bearbeiten"
 msgid "Add"
 msgstr "HinzufÃ¼gen"
 
-#: templates/installation.php:23 templates/installation.php:30
+#: templates/installation.php:24 templates/installation.php:31
+#: templates/installation.php:38
 msgid "Security Warning"
 msgstr "Sicherheitswarnung"
 
-#: templates/installation.php:24
+#: templates/installation.php:25
+msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
+msgstr "Deine PHP Version ist durch die NULL Byte Attacke (CVE-2006-7243) angreifbar"
+
+#: 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."
+
+#: templates/installation.php:32
 msgid ""
 "No secure random number generator is available, please enable the PHP "
 "OpenSSL extension."
 msgstr "Es ist kein sicherer Zufallszahlengenerator verfÃ¼gbar, bitte aktiviere die PHP-Erweiterung fÃ¼r OpenSSL."
 
-#: templates/installation.php:25
+#: 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 "Ohne einen sicheren Zufallszahlengenerator sind Angreifer in der Lage die Tokens fÃ¼r das ZurÃ¼cksetzen der PasswÃ¶rter vorherzusehen und Konten  zu Ã¼bernehmen."
 
-#: templates/installation.php:31
+#: templates/installation.php:39
 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:32
+#: 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:36
+#: templates/installation.php:44
 msgid "Create an <strong>admin account</strong>"
 msgstr "<strong>Administrator-Konto</strong> anlegen"
 
-#: templates/installation.php:52
+#: templates/installation.php:62
 msgid "Advanced"
 msgstr "Fortgeschritten"
 
-#: templates/installation.php:54
+#: templates/installation.php:64
 msgid "Data folder"
 msgstr "Datenverzeichnis"
 
-#: templates/installation.php:61
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "Datenbank einrichten"
 
-#: templates/installation.php:66 templates/installation.php:77
-#: templates/installation.php:87 templates/installation.php:97
+#: 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:109
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "Datenbank-Benutzer"
 
-#: templates/installation.php:113
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "Datenbank-Passwort"
 
-#: templates/installation.php:117
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "Datenbank-Name"
 
-#: templates/installation.php:125
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "Datenbank-Tablespace"
 
-#: templates/installation.php:131
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "Datenbank-Host"
 
-#: templates/installation.php:136
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "Installation abschlieÃŸen"
 
-#: templates/layout.guest.php:33
+#: 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:48
+#: templates/layout.user.php:36
+#, 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:61
 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 12c0a5d450438b6ecce1b7ff686e2b0125c6bcc7..2a33c07223709ffe0f03bdc55565ea6b7339fe84 100644
--- a/l10n/de/files.po
+++ b/l10n/de/files.po
@@ -3,33 +3,13 @@
 # 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.
-#  <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-03-05 00:18+0100\n"
-"PO-Revision-Date: 2013-03-04 13:20+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: German <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
@@ -41,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"
@@ -58,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 ""
@@ -69,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"
@@ -89,61 +65,72 @@ 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:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr "UngÃ¼ltiges Verzeichnis."
 
-#: appinfo/app.php:10
+#: appinfo/app.php:12
 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:92 templates/index.php:93
+#: 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/files.js:292 js/files.js:408
-#: js/files.js:439
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "Ausstehend"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} existiert bereits"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "ersetzen"
 
-#: js/filelist.js:251
+#: js/filelist.js:259
 msgid "suggest name"
-msgstr "Name vorschlagen"
+msgstr "Namen vorschlagen"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "abbrechen"
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "{old_name} ersetzt durch {new_name}"
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "undo"
 msgstr "rÃ¼ckgÃ¤ngig machen"
 
-#: js/filelist.js:323
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr "LÃ¶schvorgang ausfÃ¼hren"
 
+#: js/filelist.js:413
+msgid "1 file uploading"
+msgstr "1 Datei wird hochgeladen"
+
+#: js/filelist.js:416 js/filelist.js:470
+msgid "files uploading"
+msgstr "Dateien werden hoch geladen"
+
 #: js/files.js:52
 msgid "'.' is an invalid file name."
 msgstr "'.' ist kein gÃ¼ltiger Dateiname."
@@ -160,83 +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:225
+#: 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:262
+#: 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."
-
-#: js/files.js:262
-msgid "Upload Error"
-msgstr "Fehler beim Upload"
-
-#: js/files.js:273
-msgid "Close"
-msgstr "SchlieÃŸen"
+msgstr "Deine Datei kann nicht hochgeladen werden, weil es sich um einen Ordner handelt oder 0 Bytes groÃŸ ist."
 
-#: js/files.js:312
-msgid "1 file uploading"
-msgstr "Eine Datei wird hoch geladen"
-
-#: js/files.js:315 js/files.js:370 js/files.js:385
-msgid "{count} files uploading"
-msgstr "{count} Dateien werden hochgeladen"
+#: js/files.js:277
+msgid "Not enough space available"
+msgstr "Nicht genug Speicherplatz verfÃ¼gbar"
 
-#: js/files.js:388 js/files.js:423
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "Upload abgebrochen."
 
-#: js/files.js:497
+#: 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:570
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "Die URL darf nicht leer sein."
 
-#: js/files.js:575
+#: 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:953 templates/index.php:68
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+msgid "Error"
+msgstr "Fehler"
+
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Name"
 
-#: js/files.js:954 templates/index.php:79
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "GrÃ¶ÃŸe"
 
-#: js/files.js:955 templates/index.php:81
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
-msgstr "Bearbeitet"
+msgstr "GeÃ¤ndert"
 
-#: js/files.js:974
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 Ordner"
 
-#: js/files.js:976
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} Ordner"
 
-#: js/files.js:984
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 Datei"
 
-#: js/files.js:986
+#: 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"
@@ -289,45 +276,45 @@ msgstr "Ordner"
 msgid "From link"
 msgstr "Von einem Link"
 
-#: templates/index.php:40
+#: templates/index.php:42
 msgid "Deleted files"
 msgstr "GelÃ¶schte Dateien"
 
-#: templates/index.php:46
+#: templates/index.php:48
 msgid "Cancel upload"
 msgstr "Upload abbrechen"
 
-#: templates/index.php:53
+#: 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:60
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Alles leer. Lade etwas hoch!"
 
-#: templates/index.php:74
+#: templates/index.php:75
 msgid "Download"
 msgstr "Herunterladen"
 
-#: templates/index.php:86 templates/index.php:87
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
-msgstr "Nicht mehr freigeben"
+msgstr "Freigabe aufheben"
 
-#: templates/index.php:106
+#: templates/index.php:107
 msgid "Upload too large"
-msgstr "Upload zu groÃŸ"
+msgstr "Der Upload ist zu groÃŸ"
 
-#: templates/index.php:108
+#: 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:113
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Dateien werden gescannt, bitte warten."
 
-#: templates/index.php:116
+#: 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..caaaa81d2b36575e20a96696cd7819478d4c7e4e 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-12 02:01+0200\n"
+"PO-Revision-Date: 2013-05-06 21:54+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"
@@ -37,4 +35,4 @@ msgstr "SchlieÃŸe die folgenden Dateitypen von der VerschlÃ¼sselung aus:"
 
 #: templates/settings.php:12
 msgid "None"
-msgstr "Keine"
+msgstr "Nichts"
diff --git a/l10n/de/files_external.po b/l10n/de/files_external.po
index 92f1eafd18f3d72141aa0aca780fcd87c1d27e90..aaa2995382cbb8fa8d8dffd97cbed44a2666c413 100644
--- a/l10n/de/files_external.po
+++ b/l10n/de/files_external.po
@@ -3,19 +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.
-# 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-01 00:05+0100\n"
-"PO-Revision-Date: 2013-02-28 12:40+0000\n"
-"Last-Translator: stefanniedermann <stefan.niedermann@googlemail.com>\n"
+"POT-Creation-Date: 2013-05-12 02:01+0200\n"
+"PO-Revision-Date: 2013-05-06 21:55+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"
@@ -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: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 "<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: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 "<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..3b551c20312333770f296fb63b9b57316848405a 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-05-12 02:01+0200\n"
+"PO-Revision-Date: 2013-05-09 19:50+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 ceb8a6faea1a5724564edcbcc8e4e2afef538830..fb1fdac41420de74325502891698719d19484df2 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-03-08 00:25+0100\n"
-"PO-Revision-Date: 2013-03-07 23:25+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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"
@@ -21,12 +17,12 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:40
+#: ajax/delete.php:42
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "Konnte %s nicht dauerhaft lÃ¶schen"
 
-#: ajax/undelete.php:41
+#: ajax/undelete.php:42
 #, php-format
 msgid "Couldn't restore %s"
 msgstr "Konnte %s nicht wiederherstellen"
@@ -35,13 +31,17 @@ msgstr "Konnte %s nicht wiederherstellen"
 msgid "perform restore operation"
 msgstr "Wiederherstellung ausfÃ¼hren"
 
+#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+msgid "Error"
+msgstr "Fehler"
+
 #: js/trash.js:34
 msgid "delete file permanently"
 msgstr "Datei dauerhaft lÃ¶schen"
 
 #: js/trash.js:121
 msgid "Delete permanently"
-msgstr "Permanent lÃ¶schen"
+msgstr "EndgÃ¼ltig lÃ¶schen"
 
 #: js/trash.js:174 templates/index.php:17
 msgid "Name"
@@ -81,4 +81,4 @@ msgstr "LÃ¶schen"
 
 #: templates/part.breadcrumb.php:9
 msgid "Deleted Files"
-msgstr ""
+msgstr "GelÃ¶schte Dateien"
diff --git a/l10n/de/files_versions.po b/l10n/de/files_versions.po
index b6bf0c7c870f5fe3cd4d3e2a8f53d94969620e59..921aba68c41dc4a0a3e50d5f30c8439e6673cca2 100644
--- a/l10n/de/files_versions.po
+++ b/l10n/de/files_versions.po
@@ -3,20 +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>, 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-01 00:05+0100\n"
-"PO-Revision-Date: 2013-02-28 12:40+0000\n"
-"Last-Translator: stefanniedermann <stefan.niedermann@googlemail.com>\n"
+"POT-Creation-Date: 2013-05-12 02:01+0200\n"
+"PO-Revision-Date: 2013-05-06 21:59+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"
@@ -47,11 +40,11 @@ msgstr "Fehlgeschlagen"
 msgid "File %s could not be reverted to version %s"
 msgstr "Datei %s konnte nicht auf Version %s zurÃ¼ckgesetzt werden"
 
-#: history.php:68
+#: history.php:69
 msgid "No old versions available"
 msgstr "Keine Ã¤lteren Versionen verfÃ¼gbar"
 
-#: history.php:73
+#: history.php:74
 msgid "No path specified"
 msgstr "Kein Pfad angegeben"
 
diff --git a/l10n/de/lib.po b/l10n/de/lib.po
index df1831ecb505a783450ca0e09cc8a34eeea48c84..417ce173f3e59415b3d5f5c0eb34ab4029c94d31 100644
--- a/l10n/de/lib.po
+++ b/l10n/de/lib.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>, 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-03-01 00:05+0100\n"
-"PO-Revision-Date: 2013-02-28 12:40+0000\n"
-"Last-Translator: stefanniedermann <stefan.niedermann@googlemail.com>\n"
+"POT-Creation-Date: 2013-05-12 02:02+0200\n"
+"PO-Revision-Date: 2013-05-06 22:00+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"
@@ -49,21 +40,21 @@ msgstr "Apps"
 
 #: app.php:406
 msgid "Admin"
-msgstr "Administrator"
+msgstr "Administration"
 
-#: files.php:202
+#: files.php:207
 msgid "ZIP download is turned off."
 msgstr "Der ZIP-Download ist deaktiviert."
 
-#: files.php:203
+#: files.php:208
 msgid "Files need to be downloaded one by one."
 msgstr "Die Dateien mÃ¼ssen einzeln heruntergeladen werden."
 
-#: files.php:204 files.php:231
+#: files.php:209 files.php:242
 msgid "Back to Files"
 msgstr "ZurÃ¼ck zu \"Dateien\""
 
-#: files.php:228
+#: files.php:239
 msgid "Selected files too large to generate zip file."
 msgstr "Die gewÃ¤hlten Dateien sind zu groÃŸ, um eine ZIP-Datei zu erstellen."
 
@@ -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,75 @@ msgstr "%s Der Datenbank-Name darf keine Punkte enthalten"
 msgid "%s set the database host."
 msgstr "%s setze den Datenbank-Host"
 
-#: setup.php:128 setup.php:320 setup.php:365
+#: setup.php:132 setup.php:325 setup.php:370
 msgid "PostgreSQL username and/or password not valid"
 msgstr "PostgreSQL Benutzername und/oder Passwort ungÃ¼ltig"
 
-#: setup.php:129 setup.php:152 setup.php:229
+#: setup.php:133 setup.php:156 setup.php:234
 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:151 setup.php:453 setup.php:520
+#: setup.php:155 setup.php:458 setup.php:525
 msgid "Oracle username and/or password not valid"
 msgstr "Oracle Benutzername und/oder Passwort ungÃ¼ltig"
 
-#: setup.php:228
+#: setup.php:233
 msgid "MySQL username and/or password not valid"
 msgstr "MySQL Benutzername und/oder Passwort ungÃ¼ltig"
 
-#: 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: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:583 setup.php:592 setup.php:600 setup.php:609
+#: setup.php:615
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "DB Fehler: \"%s\""
 
-#: 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:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
+#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
+#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "Fehlerhafter Befehl war: \"%s\""
 
-#: setup.php:299
+#: setup.php:304
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "MySQL Benutzer '%s'@'localhost' existiert bereits."
 
-#: setup.php:300
+#: setup.php:305
 msgid "Drop this user from MySQL"
 msgstr "LÃ¶sche diesen Benutzer von MySQL"
 
-#: setup.php:305
+#: setup.php:310
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "MySQL Benutzer '%s'@'%%' existiert bereits"
 
-#: setup.php:306
+#: setup.php:311
 msgid "Drop this user from MySQL."
 msgstr "LÃ¶sche diesen Benutzer aus MySQL."
 
-#: setup.php:579 setup.php:611
+#: setup.php:584 setup.php:616
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Fehlerhafter Befehl war: \"%s\", Name: %s, Passwort: %s"
 
-#: setup.php:631
+#: setup.php:636
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr "MS SQL Benutzername und/oder Password ungÃ¼ltig: %s"
 
-#: setup.php:849
+#: setup.php:858
 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:850
+#: setup.php:859
 #, 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 +190,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 +236,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 76f41d6da2a406c2b5cb9f280f19afd5e63c5f3f..d161a392cc8c8012d1ed39b4375934e4768acd98 100644
--- a/l10n/de/settings.po
+++ b/l10n/de/settings.po
@@ -3,32 +3,15 @@
 # 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.
-#  <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-03-01 00:05+0100\n"
-"PO-Revision-Date: 2013-02-28 08:40+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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"
@@ -40,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"
 
@@ -83,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"
@@ -101,17 +88,17 @@ msgstr "Der Benutzer konnte nicht aus der Gruppe %s entfernt werden"
 
 #: ajax/updateapp.php:14
 msgid "Couldn't update app."
-msgstr "Die App konnte nicht geupdated werden."
+msgstr "Die App konnte nicht aktualisiert werden."
 
 #: js/apps.js:30
 msgid "Update to {appversion}"
-msgstr "Update zu {appversion}"
+msgstr "Aktualisiere zu {appversion}"
 
 #: js/apps.js:36 js/apps.js:76
 msgid "Disable"
 msgstr "Deaktivieren"
 
-#: js/apps.js:36 js/apps.js:64
+#: js/apps.js:36 js/apps.js:64 js/apps.js:83
 msgid "Enable"
 msgstr "Aktivieren"
 
@@ -119,68 +106,68 @@ msgstr "Aktivieren"
 msgid "Please wait...."
 msgstr "Bitte warten..."
 
-#: js/apps.js:84
+#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+msgid "Error"
+msgstr "Fehler"
+
+#: js/apps.js:90
 msgid "Updating...."
-msgstr "Update..."
+msgstr "Aktualisierung..."
 
-#: js/apps.js:87
+#: js/apps.js:93
 msgid "Error while updating app"
 msgstr "Fehler beim Aktualisieren der App"
 
-#: js/apps.js:87
-msgid "Error"
-msgstr "Fehler"
-
-#: js/apps.js:90
+#: js/apps.js:96
 msgid "Updated"
-msgstr "Geupdated"
+msgstr "Aktualisiert"
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr "Speichern..."
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "deleted"
 msgstr "gelÃ¶scht"
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "undo"
 msgstr "rÃ¼ckgÃ¤ngig machen"
 
-#: js/users.js:62
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr "Benutzer konnte nicht entfernt werden."
 
-#: js/users.js:75 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
+#: templates/users.php:103
 msgid "Groups"
 msgstr "Gruppen"
 
-#: js/users.js:78 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr "Gruppenadministrator"
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "LÃ¶schen"
 
-#: js/users.js:191
+#: js/users.js:269
 msgid "add group"
 msgstr "Gruppe hinzufÃ¼gen"
 
-#: js/users.js:352
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr "Es muss ein gÃ¼ltiger Benutzername angegeben werden"
 
-#: js/users.js:353 js/users.js:359 js/users.js:374
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
-msgstr "Beim anlegen des Benutzers ist ein Fehler aufgetreten"
+msgstr "Beim Anlegen des Benutzers ist ein Fehler aufgetreten"
 
-#: js/users.js:358
+#: js/users.js:426
 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)"
 
@@ -210,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"
@@ -232,7 +219,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 "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."
+msgstr "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."
 
 #: templates/admin.php:75
 msgid "Internet connection not working"
@@ -246,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"
@@ -278,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"
@@ -321,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"
@@ -331,15 +318,19 @@ msgstr "Log"
 msgid "Log level"
 msgstr "Loglevel"
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
 msgstr "Mehr"
 
-#: templates/admin.php:230 templates/personal.php:102
+#: templates/admin.php:228
+msgid "Less"
+msgstr "Weniger"
+
+#: templates/admin.php:235 templates/personal.php:105
 msgid "Version"
 msgstr "Version"
 
-#: templates/admin.php:233 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 "
@@ -371,7 +362,7 @@ msgstr "<span class=\"licence\"></span>-lizenziert von <span class=\"author\"></
 
 #: templates/apps.php:38
 msgid "Update"
-msgstr "Update durchfÃ¼hren"
+msgstr "Aktualisierung durchfÃ¼hren"
 
 #: templates/help.php:4
 msgid "User Documentation"
@@ -410,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:77
 msgid "Password"
 msgstr "Passwort"
 
@@ -434,82 +425,70 @@ msgstr "Neues Passwort"
 msgid "Change password"
 msgstr "Passwort Ã¤ndern"
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:76
 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:68
 msgid "Email"
 msgstr "E-Mail"
 
-#: templates/personal.php:72
+#: templates/personal.php:70
 msgid "Your email address"
 msgstr "Deine E-Mail-Adresse"
 
-#: templates/personal.php:73
+#: templates/personal.php:71
 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:77 templates/personal.php:78
 msgid "Language"
 msgstr "Sprache"
 
-#: templates/personal.php:86
+#: templates/personal.php:89
 msgid "Help translate"
 msgstr "Hilf bei der Ãœbersetzung"
 
-#: templates/personal.php:91
+#: templates/personal.php:94
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:93
+#: templates/personal.php:96
 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:75
 msgid "Login Name"
 msgstr "Loginname"
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr "Anlegen"
 
-#: templates/users.php:35
+#: templates/users.php:33
 msgid "Default Storage"
 msgstr "Standard-Speicher"
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:39 templates/users.php:133
 msgid "Unlimited"
 msgstr "Unbegrenzt"
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:57 templates/users.php:148
 msgid "Other"
 msgstr "Andere"
 
-#: templates/users.php:84
+#: templates/users.php:82
 msgid "Storage"
 msgstr "Speicher"
 
-#: templates/users.php:95
+#: templates/users.php:93
 msgid "change display name"
 msgstr "Anzeigenamen Ã¤ndern"
 
-#: templates/users.php:99
+#: templates/users.php:97
 msgid "set new password"
 msgstr "Neues Passwort setzen"
 
-#: templates/users.php:134
+#: templates/users.php:128
 msgid "Default"
 msgstr "Standard"
diff --git a/l10n/de/user_ldap.po b/l10n/de/user_ldap.po
index f11912dee7c7ffe64805b836b91521e150772efb..be5f6d9eb1be7dda6a4ab75dbc9ce4e653f9a9d7 100644
--- a/l10n/de/user_ldap.po
+++ b/l10n/de/user_ldap.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>, 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-02 00:03+0100\n"
-"PO-Revision-Date: 2013-03-01 23:04+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: German <translations@owncloud.org>\n"
 "MIME-Version: 1.0\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:18
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr "Serverkonfiguration hinzufÃ¼gen"
 
-#: templates/settings.php:23
+#: templates/settings.php:37
 msgid "Host"
 msgstr "Host"
 
-#: templates/settings.php:25
+#: 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:26
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "Basis-DN"
 
-#: templates/settings.php:27
+#: 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:28
+#: 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:30
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "Benutzer-DN"
 
-#: 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 "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:33
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Passwort"
 
-#: templates/settings.php:36
+#: 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:37
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "Benutzer-Login-Filter"
 
-#: 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 "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:41
+#: 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:42
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Benutzer-Filter-Liste"
 
-#: templates/settings.php:45
+#: 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:46
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "ohne Platzhalter, z.B.: \"objectClass=person\""
 
-#: templates/settings.php:47
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "Gruppen-Filter"
 
-#: templates/settings.php:50
+#: 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:51
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "ohne Platzhalter, z.B.: \"objectClass=posixGroup\""
 
-#: templates/settings.php:55
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr "Verbindungseinstellungen"
 
-#: templates/settings.php:57
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr "Konfiguration aktiv"
 
-#: templates/settings.php:57
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr "Konfiguration wird Ã¼bersprungen wenn deaktiviert"
 
-#: templates/settings.php:58
+#: templates/settings.php:72
 msgid "Port"
 msgstr "Port"
 
-#: templates/settings.php:59
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr "Backup Host (Kopie)"
 
-#: 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 "Gib einen optionalen Backup Host an. Es muss sich um eine Kopie des Haupt LDAP/AD Servers handeln."
 
-#: templates/settings.php:60
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr "Backup Port"
 
-#: templates/settings.php:61
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr "Hauptserver deaktivieren"
 
-#: templates/settings.php:61
+#: 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:62
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "Nutze TLS"
 
-#: templates/settings.php:62
+#: 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:63
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "LDAP-Server (Windows: GroÃŸ- und Kleinschreibung bleibt unbeachtet)"
 
-#: templates/settings.php:64
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "Schalte die SSL-ZertifikatsprÃ¼fung aus."
 
-#: 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 "Falls die Verbindung es erfordert, muss das SSL-Zertifikat des LDAP-Server importiert werden."
 
-#: templates/settings.php:64
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "Nicht empfohlen, nur zu Testzwecken."
 
-#: templates/settings.php:65
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
-msgstr ""
+msgstr "Speichere Time-To-Live zwischen"
 
-#: templates/settings.php:65
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr "in Sekunden. Eine Ã„nderung leert den Cache."
 
-#: templates/settings.php:67
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr "Ordnereinstellungen"
 
-#: templates/settings.php:69
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr "Feld fÃ¼r den Anzeigenamen des Benutzers"
 
-#: templates/settings.php:69
+#: 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:70
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "Basis-Benutzerbaum"
 
-#: templates/settings.php:70
+#: 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:71
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr "Benutzersucheigenschaften"
 
-#: templates/settings.php:71 templates/settings.php:74
+#: 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:72
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr "Feld fÃ¼r den Anzeigenamen der Gruppe"
 
-#: templates/settings.php:72
+#: 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:73
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "Basis-Gruppenbaum"
 
-#: templates/settings.php:73
+#: 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:74
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr "Gruppensucheigenschaften"
 
-#: templates/settings.php:75
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr "Assoziation zwischen Gruppe und Benutzer"
 
-#: templates/settings.php:77
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr "Spezielle Eigenschaften"
 
-#: templates/settings.php:79
+#: templates/settings.php:93
 msgid "Quota Field"
-msgstr ""
+msgstr "Kontingent Feld"
 
-#: templates/settings.php:80
+#: templates/settings.php:94
 msgid "Quota Default"
-msgstr ""
+msgstr "Standard Kontingent"
 
-#: templates/settings.php:80
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr "in Bytes"
 
-#: templates/settings.php:81
+#: templates/settings.php:95
 msgid "Email Field"
-msgstr ""
+msgstr "E-Mail Feld"
 
-#: templates/settings.php:82
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
-msgstr ""
+msgstr "Benennungsregel fÃ¼r das Home-Verzeichnis des Benutzers"
 
-#: templates/settings.php:82
+#: 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:86
-msgid "Test Configuration"
+#: templates/settings.php:101
+msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:86
+#: 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:111
 msgid "Help"
 msgstr "Hilfe"
diff --git a/l10n/de/user_webdavauth.po b/l10n/de/user_webdavauth.po
index d2653f16859cdda6d2cbb70cb80e18a285696976..a756a0d8570bd4070761fadd94c8dd1595f3aeaf 100644
--- a/l10n/de/user_webdavauth.po
+++ b/l10n/de/user_webdavauth.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-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-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: German <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/de_DE/core.po b/l10n/de_DE/core.po
index c0688e3ecc43d50089327468261f6412c5542a17..f6939d83e5ea522daf42898f2f4220728ceb1c68 100644
--- a/l10n/de_DE/core.po
+++ b/l10n/de_DE/core.po
@@ -3,33 +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.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-02-22 00:06+0100\n"
-"PO-Revision-Date: 2013-02-20 23:20+0000\n"
-"Last-Translator: Marcel KÃ¼hlhorn <susefan93@gmx.de>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+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"
@@ -37,24 +21,24 @@ msgstr ""
 "Language: de_DE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:85
+#: ajax/share.php:97
 #, php-format
 msgid "User %s shared a file with you"
 msgstr "Der Nutzer %s hat eine Datei mit Ihnen geteilt"
 
-#: ajax/share.php:87
+#: ajax/share.php:99
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr "%s hat einen Ordner mit Ihnen geteilt"
 
-#: ajax/share.php:89
+#: ajax/share.php:101
 #, php-format
 msgid ""
 "User %s shared the file \"%s\" with you. It is available for download here: "
 "%s"
 msgstr "%s hat die Datei \"%s\" mit Ihnen geteilt. Sie ist hier zum Download verfÃ¼gbar: %s"
 
-#: ajax/share.php:91
+#: ajax/share.php:104
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -72,7 +56,7 @@ msgstr "Keine Kategorie hinzuzufÃ¼gen?"
 #: ajax/vcategories/add.php:37
 #, php-format
 msgid "This category already exists: %s"
-msgstr "Die Kategorie '%s' existiert bereits."
+msgstr "Die nachfolgende Kategorie existiert bereits: %s"
 
 #: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
 #: ajax/vcategories/favorites.php:24
@@ -100,79 +84,79 @@ msgstr "Es wurden keine Kategorien zum LÃ¶schen ausgewÃ¤hlt."
 msgid "Error removing %s from favorites."
 msgstr "Fehler beim Entfernen von %s von den Favoriten."
 
-#: js/config.php:32
+#: js/config.php:34
 msgid "Sunday"
 msgstr "Sonntag"
 
-#: js/config.php:32
+#: js/config.php:35
 msgid "Monday"
 msgstr "Montag"
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Tuesday"
 msgstr "Dienstag"
 
-#: js/config.php:32
+#: js/config.php:37
 msgid "Wednesday"
 msgstr "Mittwoch"
 
-#: js/config.php:32
+#: js/config.php:38
 msgid "Thursday"
 msgstr "Donnerstag"
 
-#: js/config.php:32
+#: js/config.php:39
 msgid "Friday"
 msgstr "Freitag"
 
-#: js/config.php:32
+#: js/config.php:40
 msgid "Saturday"
 msgstr "Samstag"
 
-#: js/config.php:33
+#: js/config.php:45
 msgid "January"
 msgstr "Januar"
 
-#: js/config.php:33
+#: js/config.php:46
 msgid "February"
 msgstr "Februar"
 
-#: js/config.php:33
+#: js/config.php:47
 msgid "March"
 msgstr "MÃ¤rz"
 
-#: js/config.php:33
+#: js/config.php:48
 msgid "April"
 msgstr "April"
 
-#: js/config.php:33
+#: js/config.php:49
 msgid "May"
 msgstr "Mai"
 
-#: js/config.php:33
+#: js/config.php:50
 msgid "June"
 msgstr "Juni"
 
-#: js/config.php:33
+#: js/config.php:51
 msgid "July"
 msgstr "Juli"
 
-#: js/config.php:33
+#: js/config.php:52
 msgid "August"
 msgstr "August"
 
-#: js/config.php:33
+#: js/config.php:53
 msgid "September"
 msgstr "September"
 
-#: js/config.php:33
+#: js/config.php:54
 msgid "October"
 msgstr "Oktober"
 
-#: js/config.php:33
+#: js/config.php:55
 msgid "November"
 msgstr "November"
 
-#: js/config.php:33
+#: js/config.php:56
 msgid "December"
 msgstr "Dezember"
 
@@ -180,86 +164,88 @@ msgstr "Dezember"
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: js/js.js:767
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "Gerade eben"
 
-#: js/js.js:768
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "Vor 1 Minute"
 
-#: js/js.js:769
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr "Vor {minutes} Minuten"
 
-#: js/js.js:770
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr "Vor einer Stunde"
 
-#: js/js.js:771
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr "Vor {hours} Stunden"
 
-#: js/js.js:772
+#: js/js.js:723
 msgid "today"
 msgstr "Heute"
 
-#: js/js.js:773
+#: js/js.js:724
 msgid "yesterday"
 msgstr "Gestern"
 
-#: js/js.js:774
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr "Vor {days} Tag(en)"
 
-#: js/js.js:775
+#: js/js.js:726
 msgid "last month"
 msgstr "Letzten Monat"
 
-#: js/js.js:776
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr "Vor {months} Monaten"
 
-#: js/js.js:777
+#: js/js.js:728
 msgid "months ago"
 msgstr "Vor Monaten"
 
-#: js/js.js:778
+#: js/js.js:729
 msgid "last year"
 msgstr "Letztes Jahr"
 
-#: js/js.js:779
+#: js/js.js:730
 msgid "years ago"
 msgstr "Vor Jahren"
 
-#: js/oc-dialogs.js:126
-msgid "Choose"
-msgstr "AuswÃ¤hlen"
+#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
+msgid "Ok"
+msgstr "OK"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "Nein"
+#: js/oc-dialogs.js:185
+msgid "Choose"
+msgstr "AuswÃ¤hlen"
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:215
 msgid "Yes"
 msgstr "Ja"
 
-#: js/oc-dialogs.js:180
-msgid "Ok"
-msgstr "OK"
+#: js/oc-dialogs.js:222
+msgid "No"
+msgstr "Nein"
 
 #: 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 "Der Objekttyp ist nicht angegeben."
 
-#: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:582
-#: js/share.js:594
+#: 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 "Fehler"
 
@@ -269,129 +255,129 @@ msgstr "Der App-Name ist nicht angegeben."
 
 #: js/oc-vcategories.js:194
 msgid "The required file {file} is not installed!"
-msgstr "Die benÃ¶tigte Datei {file} ist nicht installiert."
+msgstr "Die benÃ¶tigte Datei {file} ist nicht installiert!"
 
-#: js/share.js:29 js/share.js:43 js/share.js:90
+#: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr "Geteilt"
 
-#: js/share.js:93
+#: js/share.js:90
 msgid "Share"
 msgstr "Teilen"
 
-#: js/share.js:141 js/share.js:622
+#: js/share.js:125 js/share.js:617
 msgid "Error while sharing"
 msgstr "Fehler beim Teilen"
 
-#: js/share.js:152
+#: js/share.js:136
 msgid "Error while unsharing"
-msgstr "Fehler bei der Aufhebung der Teilung"
+msgstr "Fehler beim Aufheben der Freigabe"
 
-#: js/share.js:159
+#: js/share.js:143
 msgid "Error while changing permissions"
 msgstr "Fehler bei der Ã„nderung der Rechte"
 
-#: js/share.js:168
+#: js/share.js:152
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Von {owner} mit Ihnen und der Gruppe {group} geteilt."
 
-#: js/share.js:170
+#: js/share.js:154
 msgid "Shared with you by {owner}"
 msgstr "Von {owner} mit Ihnen geteilt."
 
-#: js/share.js:175
+#: js/share.js:159
 msgid "Share with"
 msgstr "Teilen mit"
 
-#: js/share.js:180
+#: js/share.js:164
 msgid "Share with link"
 msgstr "Ãœber einen Link teilen"
 
-#: js/share.js:183
+#: js/share.js:167
 msgid "Password protect"
 msgstr "Passwortschutz"
 
-#: js/share.js:185 templates/installation.php:44 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Passwort"
 
-#: js/share.js:189
+#: js/share.js:173
 msgid "Email link to person"
 msgstr "Link per E-Mail verschicken"
 
-#: js/share.js:190
+#: js/share.js:174
 msgid "Send"
 msgstr "Senden"
 
-#: js/share.js:194
+#: js/share.js:178
 msgid "Set expiration date"
-msgstr "Setze ein Ablaufdatum"
+msgstr "Ein Ablaufdatum setzen"
 
-#: js/share.js:195
+#: js/share.js:179
 msgid "Expiration date"
 msgstr "Ablaufdatum"
 
-#: js/share.js:227
+#: js/share.js:211
 msgid "Share via email:"
 msgstr "Mittels einer E-Mail teilen:"
 
-#: js/share.js:229
+#: js/share.js:213
 msgid "No people found"
 msgstr "Niemand gefunden"
 
-#: js/share.js:256
+#: js/share.js:251
 msgid "Resharing is not allowed"
 msgstr "Das Weiterverteilen ist nicht erlaubt"
 
-#: js/share.js:292
+#: js/share.js:287
 msgid "Shared in {item} with {user}"
 msgstr "Freigegeben in {item} von {user}"
 
-#: js/share.js:313
+#: js/share.js:308
 msgid "Unshare"
 msgstr "Freigabe aufheben"
 
-#: js/share.js:325
+#: js/share.js:320
 msgid "can edit"
 msgstr "kann bearbeiten"
 
-#: js/share.js:327
+#: js/share.js:322
 msgid "access control"
 msgstr "Zugriffskontrolle"
 
-#: js/share.js:330
+#: js/share.js:325
 msgid "create"
 msgstr "erstellen"
 
-#: js/share.js:333
+#: js/share.js:328
 msgid "update"
 msgstr "aktualisieren"
 
-#: js/share.js:336
+#: js/share.js:331
 msgid "delete"
 msgstr "lÃ¶schen"
 
-#: js/share.js:339
+#: js/share.js:334
 msgid "share"
 msgstr "teilen"
 
-#: js/share.js:373 js/share.js:569
+#: js/share.js:368 js/share.js:564
 msgid "Password protected"
-msgstr "Durch ein Passwort geschÃ¼tzt"
+msgstr "PasswortgeschÃ¼tzt"
 
-#: js/share.js:582
+#: js/share.js:577
 msgid "Error unsetting expiration date"
 msgstr "Fehler beim Entfernen des Ablaufdatums"
 
-#: js/share.js:594
+#: js/share.js:589
 msgid "Error setting expiration date"
 msgstr "Fehler beim Setzen des Ablaufdatums"
 
-#: js/share.js:609
+#: js/share.js:604
 msgid "Sending ..."
 msgstr "Sende ..."
 
-#: js/share.js:620
+#: js/share.js:615
 msgid "Email sent"
 msgstr "Email gesendet"
 
@@ -414,26 +400,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 "E-Mail zum ZurÃ¼cksetzen des Passworts 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:39
-#: 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"
+msgstr "ZurÃ¼cksetzung anfordern"
 
 #: lostpassword/templates/resetpassword.php:4
 msgid "Your password was reset"
@@ -461,11 +450,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"
@@ -477,125 +466,140 @@ msgstr "Zugriff verboten"
 
 #: templates/404.php:12
 msgid "Cloud not found"
-msgstr "Cloud nicht gefunden"
+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"
 msgstr "HinzufÃ¼gen"
 
-#: templates/installation.php:23 templates/installation.php:30
+#: templates/installation.php:24 templates/installation.php:31
+#: templates/installation.php:38
 msgid "Security Warning"
 msgstr "Sicherheitshinweis"
 
-#: templates/installation.php:24
+#: templates/installation.php:25
+msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
+msgstr "Ihre PHP Version ist durch die NULL Byte Attacke (CVE-2006-7243) angreifbar"
+
+#: templates/installation.php:26
+msgid "Please update your PHP installation to use ownCloud securely."
+msgstr "Bitte bringen Sie Ihre PHP Version auf den neuesten Stand um ownCloud sicher nutzen zu kÃ¶nnen."
+
+#: templates/installation.php:32
 msgid ""
 "No secure random number generator is available, please enable the PHP "
 "OpenSSL extension."
 msgstr "Es ist kein sicherer Zufallszahlengenerator verfÃ¼gbar, bitte aktivieren Sie die PHP-Erweiterung fÃ¼r OpenSSL."
 
-#: templates/installation.php:25
+#: 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 "Ohne einen sicheren Zufallszahlengenerator sind Angreifer in der Lage, die Tokens fÃ¼r das ZurÃ¼cksetzen der PasswÃ¶rter vorherzusehen und Ihr Konto zu Ã¼bernehmen."
 
-#: templates/installation.php:31
+#: templates/installation.php:39
 msgid ""
 "Your data directory and files are probably accessible from the internet "
 "because the .htaccess file does not work."
 msgstr "Ihr Datenverzeichnis und Ihre Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert."
 
-#: templates/installation.php:32
+#: 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."
 
-#: templates/installation.php:36
+#: templates/installation.php:44
 msgid "Create an <strong>admin account</strong>"
 msgstr "<strong>Administrator-Konto</strong> anlegen"
 
-#: templates/installation.php:52
+#: templates/installation.php:62
 msgid "Advanced"
 msgstr "Fortgeschritten"
 
-#: templates/installation.php:54
+#: templates/installation.php:64
 msgid "Data folder"
 msgstr "Datenverzeichnis"
 
-#: templates/installation.php:61
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "Datenbank einrichten"
 
-#: templates/installation.php:66 templates/installation.php:77
-#: templates/installation.php:87 templates/installation.php:97
+#: 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:109
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "Datenbank-Benutzer"
 
-#: templates/installation.php:113
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "Datenbank-Passwort"
 
-#: templates/installation.php:117
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "Datenbank-Name"
 
-#: templates/installation.php:125
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "Datenbank-Tablespace"
 
-#: templates/installation.php:131
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "Datenbank-Host"
 
-#: templates/installation.php:136
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "Installation abschlieÃŸen"
 
-#: templates/layout.guest.php:33
+#: templates/layout.guest.php:40
 msgid "web services under your control"
 msgstr "Web-Services unter Ihrer Kontrolle"
 
-#: templates/layout.user.php:48
+#: templates/layout.user.php:36
+#, 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:61
 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 0b1891ce18210995cb2c72d68768b6ca9d74d8f9..9dc61128593c3da89eeb4ea37e3015b50d04739b 100644
--- a/l10n/de_DE/files.po
+++ b/l10n/de_DE/files.po
@@ -3,38 +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.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-03-06 00:07+0100\n"
-"PO-Revision-Date: 2013-03-05 21:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
 "Last-Translator: a.tangemann <a.tangemann@web.de>\n"
 "Language-Team: German (Germany) <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
@@ -46,24 +23,20 @@ msgstr ""
 #: ajax/move.php:17
 #, php-format
 msgid "Could not move %s - File with this name already exists"
-msgstr "Konnte %s nicht verschieben - 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 "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 ""
@@ -74,19 +47,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 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"
@@ -96,58 +69,69 @@ msgstr "Fehler beim Schreiben auf die Festplatte"
 msgid "Not enough storage available"
 msgstr "Nicht genug Speicher vorhanden."
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr "UngÃ¼ltiges Verzeichnis."
 
-#: appinfo/app.php:10
+#: appinfo/app.php:12
 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:92 templates/index.php:93
+#: 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/files.js:292 js/files.js:408
-#: js/files.js:439
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "Ausstehend"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} existiert bereits"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "ersetzen"
 
-#: js/filelist.js:251
+#: js/filelist.js:259
 msgid "suggest name"
-msgstr "Name vorschlagen"
+msgstr "Namen vorschlagen"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "abbrechen"
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "{old_name} wurde ersetzt durch {new_name}"
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "undo"
 msgstr "rÃ¼ckgÃ¤ngig machen"
 
-#: js/filelist.js:323
+#: js/filelist.js:331
 msgid "perform delete operation"
-msgstr "fÃ¼hre das LÃ¶schen aus"
+msgstr "LÃ¶schvorgang ausfÃ¼hren"
+
+#: js/filelist.js:413
+msgid "1 file uploading"
+msgstr "1 Datei wird hochgeladen"
+
+#: js/filelist.js:416 js/filelist.js:470
+msgid "files uploading"
+msgstr "Dateien werden hoch geladen"
 
 #: js/files.js:52
 msgid "'.' is an invalid file name."
@@ -165,83 +149,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 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:225
+#: 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:262
+#: 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."
-
-#: js/files.js:262
-msgid "Upload Error"
-msgstr "Fehler beim Upload"
+msgstr "Ihre Datei kann nicht hochgeladen werden, weil es sich um einen Ordner handelt oder 0 Bytes groÃŸ ist."
 
-#: js/files.js:273
-msgid "Close"
-msgstr "SchlieÃŸen"
+#: js/files.js:277
+msgid "Not enough space available"
+msgstr "Nicht genÃ¼gend Speicherplatz verfÃ¼gbar"
 
-#: js/files.js:312
-msgid "1 file uploading"
-msgstr "1 Datei wird hochgeladen"
-
-#: js/files.js:315 js/files.js:370 js/files.js:385
-msgid "{count} files uploading"
-msgstr "{count} Dateien wurden hochgeladen"
-
-#: js/files.js:388 js/files.js:423
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "Upload abgebrochen."
 
-#: js/files.js:497
+#: 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:570
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "Die URL darf nicht leer sein."
 
-#: js/files.js:575
+#: 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:953 templates/index.php:68
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+msgid "Error"
+msgstr "Fehler"
+
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Name"
 
-#: js/files.js:954 templates/index.php:79
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "GrÃ¶ÃŸe"
 
-#: js/files.js:955 templates/index.php:81
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
-msgstr "Bearbeitet"
+msgstr "GeÃ¤ndert"
 
-#: js/files.js:974
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 Ordner"
 
-#: js/files.js:976
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} Ordner"
 
-#: js/files.js:984
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 Datei"
 
-#: js/files.js:986
+#: 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"
@@ -294,48 +278,48 @@ msgstr "Ordner"
 msgid "From link"
 msgstr "Von einem Link"
 
-#: templates/index.php:40
+#: templates/index.php:42
 msgid "Deleted files"
 msgstr "GelÃ¶schte Dateien"
 
-#: templates/index.php:46
+#: templates/index.php:48
 msgid "Cancel upload"
 msgstr "Upload abbrechen"
 
-#: templates/index.php:53
+#: templates/index.php:54
 msgid "You donâ€™t have write permissions here."
 msgstr "Sie haben hier keine Schreib-Berechtigungen."
 
-#: templates/index.php:60
+#: 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:74
+#: templates/index.php:75
 msgid "Download"
 msgstr "Herunterladen"
 
-#: templates/index.php:86 templates/index.php:87
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
-msgstr "Nicht mehr freigeben"
+msgstr "Freigabe aufheben"
 
-#: templates/index.php:106
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "Der Upload ist zu groÃŸ"
 
-#: templates/index.php:108
+#: 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:113
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Dateien werden gescannt, bitte warten."
 
-#: templates/index.php:116
+#: 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..6630efe37753be7a36e869471a2b504c0d4ef90d 100644
--- a/l10n/de_DE/files_encryption.po
+++ b/l10n/de_DE/files_encryption.po
@@ -3,19 +3,13 @@
 # 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.
 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-05-12 02:01+0200\n"
+"PO-Revision-Date: 2013-05-06 21:54+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"
@@ -41,4 +35,4 @@ msgstr "Die folgenden Dateitypen von der VerschlÃ¼sselung ausnehmen:"
 
 #: templates/settings.php:12
 msgid "None"
-msgstr "Keine"
+msgstr "Nichts"
diff --git a/l10n/de_DE/files_external.po b/l10n/de_DE/files_external.po
index aaa3056fbb6dc94b4420d56d0e71003cd0500690..7646967a4f957c2828e646601db79345735245f3 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-06 00:07+0100\n"
-"PO-Revision-Date: 2013-03-05 21:25+0000\n"
-"Last-Translator: a.tangemann <a.tangemann@web.de>\n"
+"POT-Creation-Date: 2013-05-12 02:01+0200\n"
+"PO-Revision-Date: 2013-05-06 22:00+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: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 "<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: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 "<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..5a9782beebe32d34baaae908c750cf85aeb63025 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-05-12 02:01+0200\n"
+"PO-Revision-Date: 2013-05-06 21:57+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 447c37a5ed12a3d7a3483280071fdf39044ba866..4cdafce67390f593073a3402d821a9dcf1edd804 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-03-08 00:25+0100\n"
-"PO-Revision-Date: 2013-03-07 23:25+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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"
@@ -24,12 +17,12 @@ msgstr ""
 "Language: de_DE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:40
+#: ajax/delete.php:42
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "Konnte %s nicht dauerhaft lÃ¶schen"
 
-#: ajax/undelete.php:41
+#: ajax/undelete.php:42
 #, php-format
 msgid "Couldn't restore %s"
 msgstr "Konnte %s nicht wiederherstellen"
@@ -38,6 +31,10 @@ msgstr "Konnte %s nicht wiederherstellen"
 msgid "perform restore operation"
 msgstr "Wiederherstellung ausfÃ¼hren"
 
+#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+msgid "Error"
+msgstr "Fehler"
+
 #: js/trash.js:34
 msgid "delete file permanently"
 msgstr "Datei dauerhaft lÃ¶schen"
@@ -84,4 +81,4 @@ msgstr "LÃ¶schen"
 
 #: templates/part.breadcrumb.php:9
 msgid "Deleted Files"
-msgstr ""
+msgstr "GelÃ¶schte Dateien"
diff --git a/l10n/de_DE/files_versions.po b/l10n/de_DE/files_versions.po
index 67694eac279c4cbd5909d1b960632af2fff8ea56..4218653d90afc783ce4487f67fad9af127c538f8 100644
--- a/l10n/de_DE/files_versions.po
+++ b/l10n/de_DE/files_versions.po
@@ -3,21 +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>, 2013.
-#   <niko@nik-o-mat.de>, 2012.
-#  <robert.neumann01@gmail.com>, 2013.
-#  <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-06 00:07+0100\n"
-"PO-Revision-Date: 2013-03-05 21:26+0000\n"
+"POT-Creation-Date: 2013-04-30 01:57+0200\n"
+"PO-Revision-Date: 2013-04-29 20:39+0000\n"
 "Last-Translator: a.tangemann <a.tangemann@web.de>\n"
 "Language-Team: German (Germany) <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
@@ -38,7 +29,7 @@ msgstr "Erfolgreich"
 #: history.php:42
 #, php-format
 msgid "File %s was reverted to version %s"
-msgstr "Die Datei %s wurde zur Version %s zurÃ¼ckgesetzt"
+msgstr "Die Datei %s wurde auf die Version %s zurÃ¼ckgesetzt"
 
 #: history.php:49
 msgid "failure"
@@ -47,7 +38,7 @@ msgstr "Fehlgeschlagen"
 #: history.php:51
 #, php-format
 msgid "File %s could not be reverted to version %s"
-msgstr "Die Datei %s konnte nicht zur Version %s zurÃ¼ckgesetzt werden"
+msgstr "Die Datei %s konnte nicht auf die Version %s zurÃ¼ckgesetzt werden"
 
 #: history.php:69
 msgid "No old versions available"
diff --git a/l10n/de_DE/lib.po b/l10n/de_DE/lib.po
index f6f092bc77e216fe7cb97affb1ffe40fa6e3a101..bcbe6b91ad29f65d4d78a24f1617c7d2fe532811 100644
--- a/l10n/de_DE/lib.po
+++ b/l10n/de_DE/lib.po
@@ -3,24 +3,13 @@
 # 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.
 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 21:30+0000\n"
-"Last-Translator: a.tangemann <a.tangemann@web.de>\n"
+"POT-Creation-Date: 2013-05-12 02:02+0200\n"
+"PO-Revision-Date: 2013-05-06 21:53+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"
@@ -52,19 +41,19 @@ msgstr "Apps"
 msgid "Admin"
 msgstr "Administrator"
 
-#: files.php:202
+#: files.php:207
 msgid "ZIP download is turned off."
 msgstr "Der ZIP-Download ist deaktiviert."
 
-#: files.php:203
+#: files.php:208
 msgid "Files need to be downloaded one by one."
 msgstr "Die Dateien mÃ¼ssen einzeln heruntergeladen werden."
 
-#: files.php:204 files.php:231
+#: files.php:209 files.php:242
 msgid "Back to Files"
 msgstr "ZurÃ¼ck zu \"Dateien\""
 
-#: files.php:228
+#: files.php:239
 msgid "Selected files too large to generate zip file."
 msgstr "Die gewÃ¤hlten Dateien sind zu groÃŸ, um eine ZIP-Datei zu erstellen."
 
@@ -104,10 +93,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 +113,75 @@ msgstr "%s Der Datenbank-Name darf keine Punkte enthalten"
 msgid "%s set the database host."
 msgstr "%s setze den Datenbank-Host"
 
-#: setup.php:128 setup.php:320 setup.php:365
+#: setup.php:132 setup.php:325 setup.php:370
 msgid "PostgreSQL username and/or password not valid"
 msgstr "PostgreSQL Benutzername und/oder Passwort ungÃ¼ltig"
 
-#: setup.php:129 setup.php:152 setup.php:229
+#: setup.php:133 setup.php:156 setup.php:234
 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:151 setup.php:453 setup.php:520
+#: setup.php:155 setup.php:458 setup.php:525
 msgid "Oracle username and/or password not valid"
 msgstr "Oracle Benutzername und/oder Passwort ungÃ¼ltig"
 
-#: setup.php:228
+#: setup.php:233
 msgid "MySQL username and/or password not valid"
 msgstr "MySQL Benutzername und/oder Passwort ungÃ¼ltig"
 
-#: 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: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:583 setup.php:592 setup.php:600 setup.php:609
+#: setup.php:615
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "DB Fehler: \"%s\""
 
-#: 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:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
+#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
+#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "Fehlerhafter Befehl war: \"%s\""
 
-#: setup.php:299
+#: setup.php:304
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "MySQL Benutzer '%s'@'localhost' existiert bereits."
 
-#: setup.php:300
+#: setup.php:305
 msgid "Drop this user from MySQL"
 msgstr "LÃ¶sche diesen Benutzer aus MySQL"
 
-#: setup.php:305
+#: setup.php:310
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "MySQL Benutzer '%s'@'%%' existiert bereits"
 
-#: setup.php:306
+#: setup.php:311
 msgid "Drop this user from MySQL."
 msgstr "LÃ¶sche diesen Benutzer aus MySQL."
 
-#: setup.php:579 setup.php:611
+#: setup.php:584 setup.php:616
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Fehlerhafter Befehl war: \"%s\", Name: %s, Passwort: %s"
 
-#: setup.php:631
+#: setup.php:636
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr "MS SQL Benutzername und/oder Passwort ungÃ¼ltig: %s"
 
-#: setup.php:849
+#: setup.php:858
 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:850
+#: setup.php:859
 #, 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 +189,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 +235,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 dada42976f105607b930b4f869891350e4cbf9ae..860895432a1711963ac7780e6282033c2f534f08 100644
--- a/l10n/de_DE/settings.po
+++ b/l10n/de_DE/settings.po
@@ -3,37 +3,16 @@
 # 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>, 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
+# 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-06 00:07+0100\n"
-"PO-Revision-Date: 2013-03-05 21:30+0000\n"
-"Last-Translator: a.tangemann <a.tangemann@web.de>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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"
@@ -45,12 +24,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"
 
@@ -88,7 +71,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"
@@ -106,7 +89,7 @@ msgstr "Der Benutzer konnte nicht aus der Gruppe %s entfernt werden"
 
 #: ajax/updateapp.php:14
 msgid "Couldn't update app."
-msgstr "Die App konnte nicht geupdated werden."
+msgstr "Die App konnte nicht aktualisiert werden."
 
 #: js/apps.js:30
 msgid "Update to {appversion}"
@@ -116,7 +99,7 @@ msgstr "Update zu {appversion}"
 msgid "Disable"
 msgstr "Deaktivieren"
 
-#: js/apps.js:36 js/apps.js:64
+#: js/apps.js:36 js/apps.js:64 js/apps.js:83
 msgid "Enable"
 msgstr "Aktivieren"
 
@@ -124,68 +107,68 @@ msgstr "Aktivieren"
 msgid "Please wait...."
 msgstr "Bitte warten...."
 
-#: js/apps.js:84
+#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+msgid "Error"
+msgstr "Fehler"
+
+#: js/apps.js:90
 msgid "Updating...."
 msgstr "Update..."
 
-#: js/apps.js:87
+#: js/apps.js:93
 msgid "Error while updating app"
 msgstr "Es ist ein Fehler wÃ¤hrend des Updates aufgetreten"
 
-#: js/apps.js:87
-msgid "Error"
-msgstr "Fehler"
-
-#: js/apps.js:90
+#: js/apps.js:96
 msgid "Updated"
 msgstr "Aktualisiert"
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr "Speichern..."
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "deleted"
 msgstr "gelÃ¶scht"
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "undo"
 msgstr "rÃ¼ckgÃ¤ngig machen"
 
-#: js/users.js:62
+#: js/users.js:79
 msgid "Unable to remove user"
-msgstr "Benutzer konnte nicht entfernt werden."
+msgstr "Der Benutzer konnte nicht entfernt werden."
 
-#: js/users.js:75 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
+#: templates/users.php:103
 msgid "Groups"
 msgstr "Gruppen"
 
-#: js/users.js:78 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr "Gruppenadministrator"
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "LÃ¶schen"
 
-#: js/users.js:191
+#: js/users.js:269
 msgid "add group"
 msgstr "Gruppe hinzufÃ¼gen"
 
-#: js/users.js:352
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr "Es muss ein gÃ¼ltiger Benutzername angegeben werden"
 
-#: js/users.js:353 js/users.js:359 js/users.js:374
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr "Beim Erstellen des Benutzers ist ein Fehler aufgetreten"
 
-#: js/users.js:358
+#: js/users.js:426
 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)"
 
@@ -210,12 +193,12 @@ msgstr "Einrichtungswarnung"
 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 konfiguriert 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."
 
 #: 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"
@@ -225,11 +208,11 @@ msgstr "Das Modul 'fileinfo' fehlt"
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
-msgstr "Das PHP-Modul 'fileinfo' fehlt. Wir empfehlen Ihnen dieses Modul zu aktivieren um die besten Resultate bei der Bestimmung der Dateitypen zu erzielen."
+msgstr "Das PHP-Modul 'fileinfo' fehlt. Wir empfehlen Ihnen dieses Modul zu aktivieren, um die besten Resultate bei der Bestimmung der Dateitypen zu erzielen."
 
 #: templates/admin.php:58
 msgid "Locale not working"
-msgstr "Lokalisierung funktioniert nicht"
+msgstr "Die Lokalisierung funktioniert nicht"
 
 #: templates/admin.php:63
 #, php-format
@@ -237,11 +220,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 "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."
+msgstr "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."
 
 #: templates/admin.php:75
 msgid "Internet connection not working"
-msgstr "Keine Netzwerkverbindung"
+msgstr "Keine Internetverbindung"
 
 #: templates/admin.php:78
 msgid ""
@@ -251,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 "Dieser ownCloud Server hat keine funktionierende Internetverbindung. 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 Internetverbindung fÃ¼r diesen Server zu aktivieren wenn Sie alle Funktionen von ownCloud nutzen wollen."
+msgstr "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."
 
 #: templates/admin.php:92
 msgid "Cron"
@@ -259,19 +242,19 @@ msgstr "Cron"
 
 #: templates/admin.php:101
 msgid "Execute one task with each page loaded"
-msgstr "FÃ¼hre eine Aufgabe bei jedem Laden der Seite aus"
+msgstr "Eine Aufgabe bei jedem Laden der Seite ausfÃ¼hren"
 
 #: 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 "cron.php ist bei einem Webcron-Service registriert. Die cron.php Seite im ownCloud Wurzelverzeichniss wird einmal pro Minute Ã¼ber http abgerufen."
+msgstr "cron.php ist bei einem Webcron-Service registriert. Die cron.php Seite im ownCloud-Wurzelverzeichniss wird einmal pro Minute Ã¼ber http abgerufen."
 
 #: 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 "Nutzen Sie den Cron Systemdienst. Rufen Sie die Datei cron.php im ownCloud Ordner einmal pro Minute Ã¼ber einen Cronjob auf."
+msgstr "Nutzen Sie den Cron-Systemdienst. Rufen Sie die Datei cron.php im ownCloud-Ordner einmal pro Minute Ã¼ber einen Cronjob auf."
 
 #: templates/admin.php:128
 msgid "Sharing"
@@ -283,7 +266,7 @@ msgstr "Share-API aktivieren"
 
 #: templates/admin.php:135
 msgid "Allow apps to use the Share API"
-msgstr "Erlaube es Anwendungen, die Share-API zu benutzen"
+msgstr "Anwendungen erlauben, die Share-API zu benutzen"
 
 #: templates/admin.php:142
 msgid "Allow links"
@@ -291,23 +274,23 @@ msgstr "Links erlauben"
 
 #: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
-msgstr "Erlaube es Benutzern, Items per Ã¶ffentlichem Link zu teilen"
+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"
-msgstr "Erlaubt Nutzern 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 Nutzern 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 Nutzern 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"
@@ -326,7 +309,7 @@ msgstr "Zwingt die Clients, sich Ã¼ber eine verschlÃ¼sselte Verbindung mit ownCl
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
-msgstr "Bitte verbinden Sie sich mit dieser ownCloud-Instanz per HTTPS um SSL-Erzwingung zu aktivieren oder deaktivieren."
+msgstr "Bitte verbinden Sie sich mit dieser ownCloud-Instanz per HTTPS, um SSL-Erzwingung zu aktivieren oder deaktivieren."
 
 #: templates/admin.php:195
 msgid "Log"
@@ -336,15 +319,19 @@ msgstr "Log"
 msgid "Log level"
 msgstr "Log-Level"
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
 msgstr "Mehr"
 
-#: templates/admin.php:230 templates/personal.php:102
+#: templates/admin.php:228
+msgid "Less"
+msgstr "Weniger"
+
+#: templates/admin.php:235 templates/personal.php:105
 msgid "Version"
 msgstr "Version"
 
-#: templates/admin.php:233 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 "
@@ -409,13 +396,13 @@ msgstr "Sie verwenden <strong>%s</strong> der verfÃ¼gbaren <strong>%s</strong>"
 
 #: templates/personal.php:15
 msgid "Get the apps to sync your files"
-msgstr "Installieren Sie die Anwendungen um Ihre Dateien zu synchronisieren"
+msgstr "Installieren Sie die Anwendungen, um Ihre Dateien zu synchronisieren"
 
 #: templates/personal.php:26
 msgid "Show First Run Wizard again"
-msgstr "Zeige den Einrichtungsassistenten erneut"
+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:77
 msgid "Password"
 msgstr "Passwort"
 
@@ -439,82 +426,70 @@ msgstr "Neues Passwort"
 msgid "Change password"
 msgstr "Passwort Ã¤ndern"
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:76
 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:68
 msgid "Email"
 msgstr "E-Mail"
 
-#: templates/personal.php:72
+#: templates/personal.php:70
 msgid "Your email address"
 msgstr "Ihre E-Mail-Adresse"
 
-#: templates/personal.php:73
+#: templates/personal.php:71
 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:77 templates/personal.php:78
 msgid "Language"
 msgstr "Sprache"
 
-#: templates/personal.php:86
+#: templates/personal.php:89
 msgid "Help translate"
 msgstr "Helfen Sie bei der Ãœbersetzung"
 
-#: templates/personal.php:91
+#: templates/personal.php:94
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:93
+#: templates/personal.php:96
 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:75
 msgid "Login Name"
 msgstr "Loginname"
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
-msgstr "Anlegen"
+msgstr "Erstellen"
 
-#: templates/users.php:35
+#: templates/users.php:33
 msgid "Default Storage"
 msgstr "Standard-Speicher"
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:39 templates/users.php:133
 msgid "Unlimited"
 msgstr "Unbegrenzt"
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:57 templates/users.php:148
 msgid "Other"
 msgstr "Andere"
 
-#: templates/users.php:84
+#: templates/users.php:82
 msgid "Storage"
 msgstr "Speicher"
 
-#: templates/users.php:95
+#: templates/users.php:93
 msgid "change display name"
 msgstr "Anzeigenamen Ã¤ndern"
 
-#: templates/users.php:99
+#: templates/users.php:97
 msgid "set new password"
 msgstr "Neues Passwort setzen"
 
-#: templates/users.php:134
+#: templates/users.php:128
 msgid "Default"
 msgstr "Standard"
diff --git a/l10n/de_DE/user_ldap.po b/l10n/de_DE/user_ldap.po
index c3bbb56e7172b660a0a13b807c2472a41fae3ba3..c0780d51b8e61add3dd68ceafe082eb2a660279e 100644
--- a/l10n/de_DE/user_ldap.po
+++ b/l10n/de_DE/user_ldap.po
@@ -3,25 +3,14 @@
 # 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>, 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
 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 21:40+0000\n"
+"POT-Creation-Date: 2013-05-19 01:58+0200\n"
+"PO-Revision-Date: 2013-05-18 22:00+0000\n"
 "Last-Translator: a.tangemann <a.tangemann@web.de>\n"
 "Language-Team: German (Germany) <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
@@ -30,9 +19,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!"
@@ -42,13 +35,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"
@@ -56,291 +49,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 ist nicht installiert, das Backend wird nicht funktionieren. Bitten Sie Ihren Systemadministrator das Modul zu installieren."
+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:18
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr "Serverkonfiguration hinzufÃ¼gen"
 
-#: templates/settings.php:23
+#: templates/settings.php:37
 msgid "Host"
 msgstr "Host"
 
-#: templates/settings.php:25
+#: 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:26
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "Basis-DN"
 
-#: templates/settings.php:27
+#: 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:28
+#: 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:30
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "Benutzer-DN"
 
-#: 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 "Der DN des Benutzers fÃ¼r LDAP-Bind, z.B.: uid=agent,dc=example,dc=com. FÃ¼r anonymen Zugriff lassen Sie DN und Passwort leer."
+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:33
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Passwort"
 
-#: templates/settings.php:36
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
-msgstr "Lassen Sie die Felder von DN und Passwort fÃ¼r anonymen Zugang leer."
+msgstr "Lassen Sie die Felder DN und Passwort fÃ¼r einen anonymen Zugang leer."
 
-#: templates/settings.php:37
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "Benutzer-Login-Filter"
 
-#: 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 "Bestimmt den angewendeten Filter, wenn eine Anmeldung versucht 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:41
+#: 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:42
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Benutzer-Filter-Liste"
 
-#: templates/settings.php:45
+#: 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:46
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "ohne Platzhalter, z.B.: \"objectClass=person\""
 
-#: templates/settings.php:47
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "Gruppen-Filter"
 
-#: templates/settings.php:50
+#: 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:51
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "ohne Platzhalter, z.B.: \"objectClass=posixGroup\""
 
-#: templates/settings.php:55
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr "Verbindungseinstellungen"
 
-#: templates/settings.php:57
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr "Konfiguration aktiv"
 
-#: templates/settings.php:57
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr "Wenn nicht angehakt, wird diese Konfiguration Ã¼bersprungen."
 
-#: templates/settings.php:58
+#: templates/settings.php:72
 msgid "Port"
 msgstr "Port"
 
-#: templates/settings.php:59
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
-msgstr "Back-Up (Replikation) Host"
+msgstr "Backup Host (Kopie)"
 
-#: 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 "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:60
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
-msgstr "Back-Up (Replikation) Port"
+msgstr "Backup Port"
 
-#: templates/settings.php:61
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr "Hauptserver deaktivieren"
 
-#: templates/settings.php:61
+#: 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:62
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "Nutze TLS"
 
-#: templates/settings.php:62
+#: 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:63
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "LDAP-Server (Windows: GroÃŸ- und Kleinschreibung bleibt unbeachtet)"
 
-#: templates/settings.php:64
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "Schalten Sie die SSL-ZertifikatsprÃ¼fung aus."
 
-#: 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 "Falls die Verbindung es erfordert, muss das SSL-Zertifikat des LDAP-Server importiert werden."
 
-#: templates/settings.php:64
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "Nicht empfohlen, nur zu Testzwecken."
 
-#: templates/settings.php:65
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr "Speichere Time-To-Live zwischen"
 
-#: templates/settings.php:65
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr "in Sekunden. Eine Ã„nderung leert den Cache."
 
-#: templates/settings.php:67
+#: templates/settings.php:81
 msgid "Directory Settings"
-msgstr "Verzeichniseinstellungen"
+msgstr "Ordnereinstellungen"
 
-#: templates/settings.php:69
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr "Feld fÃ¼r den Anzeigenamen des Benutzers"
 
-#: templates/settings.php:69
+#: 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:70
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "Basis-Benutzerbaum"
 
-#: templates/settings.php:70
+#: 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:71
+#: templates/settings.php:85
 msgid "User Search Attributes"
-msgstr "Benutzer-Suche Eigenschaften"
+msgstr "Benutzersucheigenschaften"
 
-#: templates/settings.php:71 templates/settings.php:74
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr "Optional; ein Attribut pro Zeile"
 
-#: templates/settings.php:72
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr "Feld fÃ¼r den Anzeigenamen der Gruppe"
 
-#: templates/settings.php:72
+#: 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:73
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "Basis-Gruppenbaum"
 
-#: templates/settings.php:73
+#: 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:74
+#: templates/settings.php:88
 msgid "Group Search Attributes"
-msgstr "Gruppen-Suche Eigenschaften"
+msgstr "Gruppensucheigenschaften"
 
-#: templates/settings.php:75
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr "Assoziation zwischen Gruppe und Benutzer"
 
-#: templates/settings.php:77
+#: templates/settings.php:91
 msgid "Special Attributes"
-msgstr "Besondere Eigenschaften"
+msgstr "Spezielle Eigenschaften"
 
-#: templates/settings.php:79
+#: templates/settings.php:93
 msgid "Quota Field"
-msgstr "Kontingent Feld"
+msgstr "Kontingent-Feld"
 
-#: templates/settings.php:80
+#: templates/settings.php:94
 msgid "Quota Default"
-msgstr "Kontingent Standard"
+msgstr "Standard-Kontingent"
 
-#: templates/settings.php:80
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr "in Bytes"
 
-#: templates/settings.php:81
+#: templates/settings.php:95
 msgid "Email Field"
-msgstr "E-Mail Feld"
+msgstr "E-Mail-Feld"
 
-#: templates/settings.php:82
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
-msgstr "Benennungsregel fÃ¼r das Heimatverzeichnis des Benutzers"
+msgstr "Benennungsregel fÃ¼r das Home-Verzeichnis des Benutzers"
 
-#: templates/settings.php:82
+#: 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."
+msgstr "Ohne Eingabe wird der Benutzername (Standard) verwendet. Anderenfalls tragen Sie bitte ein LDAP/AD-Attribut ein."
 
-#: templates/settings.php:86
+#: 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 ""
+
+#: 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:86
+#: 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 d9d63ec77e59d1bb84286bbcab9587b39a1a9231..05ec894d85d6caa360148af893d9f8bba8898694 100644
--- a/l10n/de_DE/user_webdavauth.po
+++ b/l10n/de_DE/user_webdavauth.po
@@ -6,14 +6,15 @@
 #   <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.
 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:13+0000\n"
-"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: German (Germany) <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,7 +24,7 @@ msgstr ""
 
 #: templates/settings.php:3
 msgid "WebDAV Authentication"
-msgstr "WebDAV Authentifizierung"
+msgstr "WebDAV-Authentifizierung"
 
 #: templates/settings.php:4
 msgid "URL: http://"
diff --git a/l10n/el/core.po b/l10n/el/core.po
index b3849cc5963f133650a42ccd9ee3cd9cfe03934e..adff3efe96089693b3de849453258982ffeae027 100644
--- a/l10n/el/core.po
+++ b/l10n/el/core.po
@@ -3,22 +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 <m.wasilis@yahoo.de>, 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-22 00:06+0100\n"
-"PO-Revision-Date: 2013-02-20 23:20+0000\n"
-"Last-Translator: Efstathios Iosifidis <iefstathios@gmail.com>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10: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"
@@ -26,24 +19,24 @@ msgstr ""
 "Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:85
+#: ajax/share.php:97
 #, php-format
 msgid "User %s shared a file with you"
 msgstr "ÎŸ Ï‡ÏÎ®ÏƒÏ„Î·Ï‚ %s Î´Î¹Î±Î¼Î¿Î¹ÏÎ¬ÏƒÏ„Î·ÎºÎµ ÎÎ½Î± Î±ÏÏ‡ÎµÎ¯Î¿ Î¼Îµ ÎµÏƒÎ¬Ï‚"
 
-#: ajax/share.php:87
+#: ajax/share.php:99
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr "ÎŸ Ï‡ÏÎ®ÏƒÏ„Î·Ï‚ %s Î´Î¹Î±Î¼Î¿Î¹ÏÎ¬ÏƒÏ„Î·ÎºÎµ ÎÎ½Î± Ï†Î¬ÎºÎµÎ»Î¿ Î¼Îµ ÎµÏƒÎ¬Ï‚"
 
-#: ajax/share.php:89
+#: ajax/share.php:101
 #, php-format
 msgid ""
 "User %s shared the file \"%s\" with you. It is available for download here: "
 "%s"
 msgstr "ÎŸ Ï‡ÏÎ®ÏƒÏ„Î·Ï‚ %s Î´Î¹Î±Î¼Î¿Î¹ÏÎ¬ÏƒÏ„Î·ÎºÎµ Ï„Î¿ Î±ÏÏ‡ÎµÎ¯Î¿ \"%s\" Î¼Î±Î¶Î¯ ÏƒÎ±Ï‚. Î•Î¯Î½Î±Î¹ Î´Î¹Î±Î¸ÎÏƒÎ¹Î¼Î¿ Î³Î¹Î± Î»Î®ÏˆÎ· ÎµÎ´ÏŽ: %s"
 
-#: ajax/share.php:91
+#: ajax/share.php:104
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -89,79 +82,79 @@ msgstr "Î”ÎµÎ½ ÎµÏ€Î¹Î»ÎÏ‡Ï„Î·ÎºÎ±Î½ ÎºÎ±Ï„Î·Î³Î¿ÏÎ¯ÎµÏ‚ Î³Î¹Î± Î´Î¹Î±Î³ÏÎ±Ï†
 msgid "Error removing %s from favorites."
 msgstr "Î£Ï†Î¬Î»Î¼Î± Î±Ï†Î±Î¯ÏÎµÏƒÎ·Ï‚ %s Î±Ï€ÏŒ Ï„Î± Î±Î³Î±Ï€Î·Î¼ÎÎ½Î±."
 
-#: js/config.php:32
+#: js/config.php:34
 msgid "Sunday"
 msgstr "ÎšÏ…ÏÎ¹Î±ÎºÎ®"
 
-#: js/config.php:32
+#: js/config.php:35
 msgid "Monday"
 msgstr "Î”ÎµÏ…Ï„ÎÏÎ±"
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Tuesday"
 msgstr "Î¤ÏÎ¯Ï„Î·"
 
-#: js/config.php:32
+#: js/config.php:37
 msgid "Wednesday"
 msgstr "Î¤ÎµÏ„Î¬ÏÏ„Î·"
 
-#: js/config.php:32
+#: js/config.php:38
 msgid "Thursday"
 msgstr "Î ÎÎ¼Ï€Ï„Î·"
 
-#: js/config.php:32
+#: js/config.php:39
 msgid "Friday"
 msgstr "Î Î±ÏÎ±ÏƒÎºÎµÏ…Î®"
 
-#: js/config.php:32
+#: js/config.php:40
 msgid "Saturday"
 msgstr "Î£Î¬Î²Î²Î±Ï„Î¿"
 
-#: js/config.php:33
+#: js/config.php:45
 msgid "January"
 msgstr "Î™Î±Î½Î¿Ï…Î¬ÏÎ¹Î¿Ï‚"
 
-#: js/config.php:33
+#: js/config.php:46
 msgid "February"
 msgstr "Î¦ÎµÎ²ÏÎ¿Ï…Î¬ÏÎ¹Î¿Ï‚"
 
-#: js/config.php:33
+#: js/config.php:47
 msgid "March"
 msgstr "ÎœÎ¬ÏÏ„Î¹Î¿Ï‚"
 
-#: js/config.php:33
+#: js/config.php:48
 msgid "April"
 msgstr "Î‘Ï€ÏÎ¯Î»Î¹Î¿Ï‚"
 
-#: js/config.php:33
+#: js/config.php:49
 msgid "May"
 msgstr "ÎœÎ¬ÏŠÎ¿Ï‚"
 
-#: js/config.php:33
+#: js/config.php:50
 msgid "June"
 msgstr "Î™Î¿ÏÎ½Î¹Î¿Ï‚"
 
-#: js/config.php:33
+#: js/config.php:51
 msgid "July"
 msgstr "Î™Î¿ÏÎ»Î¹Î¿Ï‚"
 
-#: js/config.php:33
+#: js/config.php:52
 msgid "August"
 msgstr "Î‘ÏÎ³Î¿Ï…ÏƒÏ„Î¿Ï‚"
 
-#: js/config.php:33
+#: js/config.php:53
 msgid "September"
 msgstr "Î£ÎµÏ€Ï„ÎÎ¼Î²ÏÎ¹Î¿Ï‚"
 
-#: js/config.php:33
+#: js/config.php:54
 msgid "October"
 msgstr "ÎŸÎºÏ„ÏŽÎ²ÏÎ¹Î¿Ï‚"
 
-#: js/config.php:33
+#: js/config.php:55
 msgid "November"
 msgstr "ÎÎ¿ÎÎ¼Î²ÏÎ¹Î¿Ï‚"
 
-#: js/config.php:33
+#: js/config.php:56
 msgid "December"
 msgstr "Î”ÎµÎºÎÎ¼Î²ÏÎ¹Î¿Ï‚"
 
@@ -169,86 +162,88 @@ msgstr "Î”ÎµÎºÎÎ¼Î²ÏÎ¹Î¿Ï‚"
 msgid "Settings"
 msgstr "Î¡Ï…Î¸Î¼Î¯ÏƒÎµÎ¹Ï‚"
 
-#: js/js.js:767
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "Î´ÎµÏ…Ï„ÎµÏÏŒÎ»ÎµÏ€Ï„Î± Ï€ÏÎ¹Î½"
 
-#: js/js.js:768
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "1 Î»ÎµÏ€Ï„ÏŒ Ï€ÏÎ¹Î½"
 
-#: js/js.js:769
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr "{minutes} Î»ÎµÏ€Ï„Î¬ Ï€ÏÎ¹Î½"
 
-#: js/js.js:770
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr "1 ÏŽÏÎ± Ï€ÏÎ¹Î½"
 
-#: js/js.js:771
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr "{hours} ÏŽÏÎµÏ‚ Ï€ÏÎ¹Î½"
 
-#: js/js.js:772
+#: js/js.js:723
 msgid "today"
 msgstr "ÏƒÎ®Î¼ÎµÏÎ±"
 
-#: js/js.js:773
+#: js/js.js:724
 msgid "yesterday"
 msgstr "Ï‡Ï„ÎµÏ‚"
 
-#: js/js.js:774
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr "{days} Î·Î¼ÎÏÎµÏ‚ Ï€ÏÎ¹Î½"
 
-#: js/js.js:775
+#: js/js.js:726
 msgid "last month"
 msgstr "Ï„ÎµÎ»ÎµÏ…Ï„Î±Î¯Î¿ Î¼Î®Î½Î±"
 
-#: js/js.js:776
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr "{months} Î¼Î®Î½ÎµÏ‚ Ï€ÏÎ¹Î½"
 
-#: js/js.js:777
+#: js/js.js:728
 msgid "months ago"
 msgstr "Î¼Î®Î½ÎµÏ‚ Ï€ÏÎ¹Î½"
 
-#: js/js.js:778
+#: js/js.js:729
 msgid "last year"
 msgstr "Ï„ÎµÎ»ÎµÏ…Ï„Î±Î¯Î¿ Ï‡ÏÏŒÎ½Î¿"
 
-#: js/js.js:779
+#: js/js.js:730
 msgid "years ago"
 msgstr "Ï‡ÏÏŒÎ½Î¹Î± Ï€ÏÎ¹Î½"
 
-#: js/oc-dialogs.js:126
-msgid "Choose"
-msgstr "Î•Ï€Î¹Î»ÎÎ¾Ï„Îµ"
+#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
+msgid "Ok"
+msgstr "ÎŸÎº"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
 msgid "Cancel"
 msgstr "Î†ÎºÏ…ÏÎ¿"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "ÎŒÏ‡Î¹"
+#: js/oc-dialogs.js:185
+msgid "Choose"
+msgstr "Î•Ï€Î¹Î»ÎÎ¾Ï„Îµ"
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:215
 msgid "Yes"
 msgstr "ÎÎ±Î¹"
 
-#: js/oc-dialogs.js:180
-msgid "Ok"
-msgstr "ÎŸÎº"
+#: js/oc-dialogs.js:222
+msgid "No"
+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:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:582
-#: js/share.js:594
+#: 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,127 +255,127 @@ msgstr "Î”ÎµÎ½ ÎºÎ±Î¸Î¿ÏÎ¯ÏƒÏ„Î·ÎºÎµ Ï„Î¿ ÏŒÎ½Î¿Î¼Î± Ï„Î·Ï‚ ÎµÏ†Î±ÏÎ¼Î¿Î³Î®Ï‚.
 msgid "The required file {file} is not installed!"
 msgstr "Î¤Î¿ Î±Ï€Î±Î¹Ï„Î¿ÏÎ¼ÎµÎ½Î¿ Î±ÏÏ‡ÎµÎ¯Î¿ {file} Î´ÎµÎ½ ÎµÎ³ÎºÎ±Ï„Î±ÏƒÏ„Î¬Î¸Î·ÎºÎµ!"
 
-#: js/share.js:29 js/share.js:43 js/share.js:90
+#: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr "ÎšÎ¿Î¹Î½ÏŒÏ‡ÏÎ·ÏƒÏ„Î±"
 
-#: js/share.js:93
+#: js/share.js:90
 msgid "Share"
 msgstr "Î”Î¹Î±Î¼Î¿Î¹ÏÎ±ÏƒÎ¼ÏŒÏ‚"
 
-#: js/share.js:141 js/share.js:622
+#: js/share.js:125 js/share.js:617
 msgid "Error while sharing"
 msgstr "Î£Ï†Î¬Î»Î¼Î± ÎºÎ±Ï„Î¬ Ï„Î¿Î½ Î´Î¹Î±Î¼Î¿Î¹ÏÎ±ÏƒÎ¼ÏŒ"
 
-#: js/share.js:152
+#: js/share.js:136
 msgid "Error while unsharing"
 msgstr "Î£Ï†Î¬Î»Î¼Î± ÎºÎ±Ï„Î¬ Ï„Î¿ ÏƒÏ„Î±Î¼Î¬Ï„Î·Î¼Î± Ï„Î¿Ï… Î´Î¹Î±Î¼Î¿Î¹ÏÎ±ÏƒÎ¼Î¿Ï"
 
-#: js/share.js:159
+#: js/share.js:143
 msgid "Error while changing permissions"
 msgstr "Î£Ï†Î¬Î»Î¼Î± ÎºÎ±Ï„Î¬ Ï„Î·Î½ Î±Î»Î»Î±Î³Î® Ï„Ï‰Î½ Î´Î¹ÎºÎ±Î¹Ï‰Î¼Î¬Ï„Ï‰Î½"
 
-#: js/share.js:168
+#: js/share.js:152
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Î”Î¹Î±Î¼Î¿Î¹ÏÎ¬ÏƒÏ„Î·ÎºÎµ Î¼Îµ ÏƒÎ±Ï‚ ÎºÎ±Î¹ Î¼Îµ Ï„Î·Î½ Î¿Î¼Î¬Î´Î± {group} Ï„Î¿Ï… {owner}"
 
-#: js/share.js:170
+#: js/share.js:154
 msgid "Shared with you by {owner}"
 msgstr "Î”Î¹Î±Î¼Î¿Î¹ÏÎ¬ÏƒÏ„Î·ÎºÎµ Î¼Îµ ÏƒÎ±Ï‚ Î±Ï€ÏŒ Ï„Î¿Î½ {owner}"
 
-#: js/share.js:175
+#: js/share.js:159
 msgid "Share with"
 msgstr "Î”Î¹Î±Î¼Î¿Î¹ÏÎ±ÏƒÎ¼ÏŒÏ‚ Î¼Îµ"
 
-#: js/share.js:180
+#: js/share.js:164
 msgid "Share with link"
 msgstr "Î”Î¹Î±Î¼Î¿Î¹ÏÎ±ÏƒÎ¼ÏŒÏ‚ Î¼Îµ ÏƒÏÎ½Î´ÎµÏƒÎ¼Î¿"
 
-#: js/share.js:183
+#: js/share.js:167
 msgid "Password protect"
 msgstr "Î ÏÎ¿ÏƒÏ„Î±ÏƒÎ¯Î± ÏƒÏ…Î½Î¸Î·Î¼Î±Ï„Î¹ÎºÎ¿Ï"
 
-#: js/share.js:185 templates/installation.php:44 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Î£Ï…Î½Î¸Î·Î¼Î±Ï„Î¹ÎºÏŒ"
 
-#: js/share.js:189
+#: js/share.js:173
 msgid "Email link to person"
 msgstr "Î‘Ï€Î¿ÏƒÏ„Î¿Î»Î® ÏƒÏ…Î½Î´ÎÏƒÎ¼Î¿Ï… Î¼Îµ email "
 
-#: js/share.js:190
+#: js/share.js:174
 msgid "Send"
 msgstr "Î‘Ï€Î¿ÏƒÏ„Î¿Î»Î®"
 
-#: js/share.js:194
+#: js/share.js:178
 msgid "Set expiration date"
 msgstr "ÎŸÏÎ¹ÏƒÎ¼ÏŒÏ‚ Î·Î¼. Î»Î®Î¾Î·Ï‚"
 
-#: js/share.js:195
+#: js/share.js:179
 msgid "Expiration date"
 msgstr "Î—Î¼ÎµÏÎ¿Î¼Î·Î½Î¯Î± Î»Î®Î¾Î·Ï‚"
 
-#: js/share.js:227
+#: js/share.js:211
 msgid "Share via email:"
 msgstr "Î”Î¹Î±Î¼Î¿Î¹ÏÎ±ÏƒÎ¼ÏŒÏ‚ Î¼ÎÏƒÏ‰ email:"
 
-#: js/share.js:229
+#: js/share.js:213
 msgid "No people found"
 msgstr "Î”ÎµÎ½ Î²ÏÎÎ¸Î·ÎºÎµ Î¬Î½Î¸ÏÏ‰Ï€Î¿Ï‚"
 
-#: js/share.js:256
+#: js/share.js:251
 msgid "Resharing is not allowed"
 msgstr "ÎžÎ±Î½Î±Î¼Î¿Î¹ÏÎ±ÏƒÎ¼ÏŒÏ‚ Î´ÎµÎ½ ÎµÏ€Î¹Ï„ÏÎÏ€ÎµÏ„Î±Î¹"
 
-#: js/share.js:292
+#: js/share.js:287
 msgid "Shared in {item} with {user}"
 msgstr "Î”Î¹Î±Î¼Î¿Î¹ÏÎ±ÏƒÎ¼ÏŒÏ‚ Ï„Î¿Ï… {item} Î¼Îµ Ï„Î¿Î½ {user}"
 
-#: js/share.js:313
+#: js/share.js:308
 msgid "Unshare"
 msgstr "Î£Ï„Î±Î¼Î¬Ï„Î·Î¼Î± Î´Î¹Î±Î¼Î¿Î¹ÏÎ±ÏƒÎ¼Î¿Ï"
 
-#: js/share.js:325
+#: js/share.js:320
 msgid "can edit"
 msgstr "Î´Ï…Î½Î±Ï„ÏŒÏ„Î·Ï„Î± Î±Î»Î»Î±Î³Î®Ï‚"
 
-#: js/share.js:327
+#: js/share.js:322
 msgid "access control"
 msgstr "ÎÎ»ÎµÎ³Ï‡Î¿Ï‚ Ï€ÏÏŒÏƒÎ²Î±ÏƒÎ·Ï‚"
 
-#: js/share.js:330
+#: js/share.js:325
 msgid "create"
 msgstr "Î´Î·Î¼Î¹Î¿Ï…ÏÎ³Î¯Î±"
 
-#: js/share.js:333
+#: js/share.js:328
 msgid "update"
 msgstr "ÎµÎ½Î·Î¼ÎÏÏ‰ÏƒÎ·"
 
-#: js/share.js:336
+#: js/share.js:331
 msgid "delete"
 msgstr "Î´Î¹Î±Î³ÏÎ±Ï†Î®"
 
-#: js/share.js:339
+#: js/share.js:334
 msgid "share"
 msgstr "Î´Î¹Î±Î¼Î¿Î¹ÏÎ±ÏƒÎ¼ÏŒÏ‚"
 
-#: js/share.js:373 js/share.js:569
+#: js/share.js:368 js/share.js:564
 msgid "Password protected"
 msgstr "Î ÏÎ¿ÏƒÏ„Î±ÏƒÎ¯Î± Î¼Îµ ÏƒÏ…Î½Î¸Î·Î¼Î±Ï„Î¹ÎºÏŒ"
 
-#: js/share.js:582
+#: js/share.js:577
 msgid "Error unsetting expiration date"
 msgstr "Î£Ï†Î¬Î»Î¼Î± ÎºÎ±Ï„Î¬ Ï„Î·Î½ Î´Î¹Î±Î³ÏÎ±Ï†Î® Ï„Î·Ï‚ Î·Î¼. Î»Î®Î¾Î·Ï‚"
 
-#: js/share.js:594
+#: js/share.js:589
 msgid "Error setting expiration date"
 msgstr "Î£Ï†Î¬Î»Î¼Î± ÎºÎ±Ï„Î¬ Ï„Î¿Î½ Î¿ÏÎ¹ÏƒÎ¼ÏŒ Î·Î¼. Î»Î®Î¾Î·Ï‚"
 
-#: js/share.js:609
+#: js/share.js:604
 msgid "Sending ..."
 msgstr "Î‘Ï€Î¿ÏƒÏ„Î¿Î»Î®..."
 
-#: js/share.js:620
+#: js/share.js:615
 msgid "Email sent"
 msgstr "Î¤Î¿ Email Î±Ï€ÎµÏƒÏ„Î¬Î»Î· "
 
@@ -403,24 +398,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:39
-#: 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 "Î•Ï€Î±Î½Î±Ï†Î¿ÏÎ¬ Î±Î¯Ï„Î·ÏƒÎ·Ï‚"
 
@@ -476,115 +474,130 @@ msgstr "Î•Ï€ÎµÎ¾ÎµÏÎ³Î±ÏƒÎ¯Î± ÎºÎ±Ï„Î·Î³Î¿ÏÎ¹ÏŽÎ½"
 msgid "Add"
 msgstr "Î ÏÎ¿ÏƒÎ¸Î®ÎºÎ·"
 
-#: templates/installation.php:23 templates/installation.php:30
+#: 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 "Î— PHP ÎµÎ¹Î½Î±Î¹ ÎµÏ…Î±Î»Ï‰Ï„Î· ÏƒÏ„Î·Î½ NULL Byte ÎµÏ€Î¹Î¸ÎµÏƒÎ· (CVE-2006-7243)"
+
+#: templates/installation.php:26
+msgid "Please update your PHP installation to use ownCloud securely."
+msgstr "Î Î±ÏÎ±ÎºÎ±Î»ÏŽ ÎµÎ½Î·Î¼ÎµÏÏŽÏƒÏ„Îµ Ï„Î·Î½ ÎµÎ³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ· PHP ÏƒÎ±Ï‚ ÏŽÏƒÏ„Îµ Î½Î± Ï‡ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¹Î®ÏƒÎµÏ„Îµ Î±ÏƒÏ†Î±Î»ÎÏƒÏ„ÎµÏÎ± Ï„Î¿ ownCloud."
+
+#: templates/installation.php:32
 msgid ""
 "No secure random number generator is available, please enable the PHP "
 "OpenSSL extension."
 msgstr "Î”ÎµÎ½ ÎµÎ¯Î½Î±Î¹ Î´Î¹Î±Î¸ÎÏƒÎ¹Î¼Î¿ Ï„Î¿ Ï€ÏÏŒÏƒÎ¸ÎµÏ„Î¿ Î´Î·Î¼Î¹Î¿Ï…ÏÎ³Î¯Î±Ï‚ Ï„Ï…Ï‡Î±Î¯Ï‰Î½ Î±ÏÎ¹Î¸Î¼ÏŽÎ½ Î±ÏƒÏ†Î±Î»ÎµÎ¯Î±Ï‚, Ï€Î±ÏÎ±ÎºÎ±Î»ÏŽ ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¹Î®ÏƒÏ„Îµ Ï„Î¿ Ï€ÏÏŒÏƒÎ¸ÎµÏ„Î¿ Ï„Î·Ï‚ PHP, OpenSSL."
 
-#: templates/installation.php:25
+#: 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:31
+#: templates/installation.php:39
 msgid ""
 "Your data directory and files are probably accessible from the internet "
 "because the .htaccess file does not work."
 msgstr "ÎŸ ÎºÎ±Ï„Î¬Î»Î¿Î³Î¿Ï‚ Î´ÎµÎ´Î¿Î¼ÎÎ½Ï‰Î½ ÎºÎ±Î¹ Ï„Î± Î±ÏÏ‡ÎµÎ¯Î± ÏƒÎ±Ï‚ ÎµÎ¯Î½Î±Î¹ Ï€Î¹Î¸Î±Î½ÏŒ Ï€ÏÎ¿ÏƒÎ²Î¬ÏƒÎ¹Î¼Î± Î±Ï€ÏŒ Ï„Î¿ internet Î³Î¹Î±Ï„Î¯ Î´ÎµÎ½ Î´Î¿Ï…Î»ÎµÏÎµÎ¹ Ï„Î¿ Î±ÏÏ‡ÎµÎ¯Î¿ .htaccess."
 
-#: templates/installation.php:32
+#: 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>."
 
-#: templates/installation.php:36
+#: templates/installation.php:44
 msgid "Create an <strong>admin account</strong>"
 msgstr "Î”Î·Î¼Î¹Î¿Ï…ÏÎ³Î®ÏƒÏ„Îµ ÎÎ½Î±Î½ <strong>Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼ÏŒ Î´Î¹Î±Ï‡ÎµÎ¹ÏÎ¹ÏƒÏ„Î®</strong>"
 
-#: templates/installation.php:52
+#: templates/installation.php:62
 msgid "Advanced"
 msgstr "Î“Î¹Î± Ï€ÏÎ¿Ï‡Ï‰ÏÎ·Î¼ÎÎ½Î¿Ï…Ï‚"
 
-#: templates/installation.php:54
+#: templates/installation.php:64
 msgid "Data folder"
 msgstr "Î¦Î¬ÎºÎµÎ»Î¿Ï‚ Î´ÎµÎ´Î¿Î¼ÎÎ½Ï‰Î½"
 
-#: templates/installation.php:61
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "Î¡ÏÎ¸Î¼Î¹ÏƒÎ· Ï„Î·Ï‚ Î²Î¬ÏƒÎ·Ï‚ Î´ÎµÎ´Î¿Î¼ÎÎ½Ï‰Î½"
 
-#: templates/installation.php:66 templates/installation.php:77
-#: templates/installation.php:87 templates/installation.php:97
+#: 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:109
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "Î§ÏÎ®ÏƒÏ„Î·Ï‚ Ï„Î·Ï‚ Î²Î¬ÏƒÎ·Ï‚ Î´ÎµÎ´Î¿Î¼ÎÎ½Ï‰Î½"
 
-#: templates/installation.php:113
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "Î£Ï…Î½Î¸Î·Î¼Î±Ï„Î¹ÎºÏŒ Î²Î¬ÏƒÎ·Ï‚ Î´ÎµÎ´Î¿Î¼ÎÎ½Ï‰Î½"
 
-#: templates/installation.php:117
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "ÎŒÎ½Î¿Î¼Î± Î²Î¬ÏƒÎ·Ï‚ Î´ÎµÎ´Î¿Î¼ÎÎ½Ï‰Î½"
 
-#: templates/installation.php:125
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "ÎšÎµÎ½Î¬ Î Î¹Î½Î¬ÎºÏ‰Î½ Î’Î¬ÏƒÎ·Ï‚ Î”ÎµÎ´Î¿Î¼ÎÎ½Ï‰Î½"
 
-#: templates/installation.php:131
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "Î”Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„Î®Ï‚ Î²Î¬ÏƒÎ·Ï‚ Î´ÎµÎ´Î¿Î¼ÎÎ½Ï‰Î½"
 
-#: templates/installation.php:136
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "ÎŸÎ»Î¿ÎºÎ»Î®ÏÏ‰ÏƒÎ· ÎµÎ³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ·Ï‚"
 
-#: templates/layout.guest.php:33
+#: templates/layout.guest.php:40
 msgid "web services under your control"
-msgstr "Î¥Ï€Î·ÏÎµÏƒÎ¯ÎµÏ‚ web Ï…Ï€ÏŒ Ï„Î¿Î½ ÎÎ»ÎµÎ³Ï‡ÏŒ ÏƒÎ±Ï‚"
+msgstr "Ï…Ï€Î·ÏÎµÏƒÎ¯ÎµÏ‚ Î´Î¹ÎºÏ„ÏÎ¿Ï… Ï…Ï€ÏŒ Ï„Î¿Î½ ÎÎ»ÎµÎ³Ï‡ÏŒ ÏƒÎ±Ï‚"
+
+#: templates/layout.user.php:36
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr ""
 
-#: templates/layout.user.php:48
+#: 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/el/files.po b/l10n/el/files.po
index 106ab0381c6ff190e6bb220651451dec4d56fc34..78423ef92849271ddc14ef062f4733c6885ccfd7 100644
--- a/l10n/el/files.po
+++ b/l10n/el/files.po
@@ -3,20 +3,12 @@
 # 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-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-2012.
-# Î“Î¹Î¬Î½Î½Î·Ï‚ Î‘Î½Î¸Ï…Î¼Î¯Î´Î·Ï‚ <yannanth@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-04 00:06+0100\n"
-"PO-Revision-Date: 2013-03-03 23:06+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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"
@@ -35,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 "Î”ÎµÎ½ Î±Î½ÎÎ²Î·ÎºÎµ ÎºÎ¬Ï€Î¿Î¹Î¿ Î±ÏÏ‡ÎµÎ¯Î¿. Î†Î³Î½Ï‰ÏƒÏ„Î¿ ÏƒÏ†Î¬Î»Î¼Î±"
@@ -50,13 +38,13 @@ 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 "Î¤Î¿ Î±ÏÏ‡ÎµÎ¯Î¿ Ï€Î¿Ï… ÎµÏƒÏ„Î¬Î»ÎµÎ¹ Ï…Ï€ÎµÏÎ²Î±Î¯Î½ÎµÎ¹ Ï„Î·Î½ Î¿Î´Î·Î³Î¯Î± Î¼ÎÎ³Î¹ÏƒÏ„Î¿Ï… ÎµÏ€Î¹Ï„ÏÎµÏ€Ï„Î¿Ï Î¼ÎµÎ³ÎÎ¸Î¿Ï…Ï‚ \"upload_max_filesize\" Ï„Î¿Ï… php.ini"
 
 #: ajax/upload.php:29
 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"
@@ -78,58 +66,69 @@ msgstr "Î‘Ï€Î¿Ï„Ï…Ï‡Î¯Î± ÎµÎ³Î³ÏÎ±Ï†Î®Ï‚ ÏƒÏ„Î¿ Î´Î¯ÏƒÎºÎ¿"
 msgid "Not enough storage available"
 msgstr "ÎœÎ· ÎµÏ€Î±ÏÎºÎ®Ï‚ Î´Î¹Î±Î¸ÎÏƒÎ¹Î¼Î¿Ï‚ Î±Ï€Î¿Î¸Î·ÎºÎµÏ…Ï„Î¹ÎºÏŒÏ‚ Ï‡ÏŽÏÎ¿Ï‚"
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr "ÎœÎ· ÎÎ³ÎºÏ…ÏÎ¿Ï‚ Ï†Î¬ÎºÎµÎ»Î¿Ï‚."
 
-#: appinfo/app.php:10
+#: 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 "ÎœÏŒÎ½Î¹Î¼Î· Î´Î¹Î±Î³ÏÎ±Ï†Î®"
 
-#: js/fileactions.js:127 templates/index.php:92 templates/index.php:93
+#: 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/files.js:292 js/files.js:408
-#: js/files.js:439
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "Î•ÎºÎºÏÎµÎ¼ÎµÎ¯"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} Ï…Ï€Î¬ÏÏ‡ÎµÎ¹ Î®Î´Î·"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "Î±Î½Ï„Î¹ÎºÎ±Ï„ÎÏƒÏ„Î·ÏƒÎµ"
 
-#: js/filelist.js:251
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "ÏƒÏ…Î½Î¹ÏƒÏ„ÏŽÎ¼ÎµÎ½Î¿ ÏŒÎ½Î¿Î¼Î±"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "Î±ÎºÏÏÏ‰ÏƒÎ·"
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "Î±Î½Ï„Î¹ÎºÎ±Ï„Î±ÏƒÏ„Î¬Î¸Î·ÎºÎµ Ï„Î¿ {new_name} Î¼Îµ {old_name}"
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "undo"
 msgstr "Î±Î½Î±Î¯ÏÎµÏƒÎ·"
 
-#: js/filelist.js:323
+#: js/filelist.js:331
 msgid "perform delete operation"
-msgstr "ÎµÎºÏ„ÎÎ»ÎµÏƒÎ· Î´Î¹Î±Î´Î¹ÎºÎ±ÏƒÎ¯Î± Î´Î¹Î±Î³ÏÎ±Ï†Î®Ï‚"
+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."
@@ -137,7 +136,7 @@ msgstr "'.' ÎµÎ¯Î½Î±Î¹ Î¼Î· ÎÎ³ÎºÏ…ÏÎ¿ ÏŒÎ½Î¿Î¼Î± Î±ÏÏ‡ÎµÎ¯Î¿Ï…."
 
 #: js/files.js:56
 msgid "File name cannot be empty."
-msgstr "Î¤Î¿ ÏŒÎ½Î¿Î¼Î± Î±ÏÏ‡ÎµÎ¯Î¿Ï… Î´ÎµÎ½ Ï€ÏÎÏ€ÎµÎ¹ Î½Î± ÎµÎ¯Î½Î±Î¹ ÎºÎµÎ½ÏŒ."
+msgstr "Î¤Î¿ ÏŒÎ½Î¿Î¼Î± Î±ÏÏ‡ÎµÎ¯Î¿Ï… Î´ÎµÎ½ Î¼Ï€Î¿ÏÎµÎ¯ Î½Î± ÎµÎ¯Î½Î±Î¹ ÎºÎµÎ½ÏŒ."
 
 #: js/files.js:64
 msgid ""
@@ -153,80 +152,80 @@ msgstr "ÎŸ Î±Ï€Î¿Î¸Î·ÎºÎµÏ…Ï„Î¹ÎºÏŒÏ‚ ÏƒÎ±Ï‚ Ï‡ÏŽÏÎ¿Ï‚ ÎµÎ¯Î½Î±Î¹ Î³ÎµÎ¼Î¬Ï„Î¿
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "ÎŸ Î±Ï€Î¿Î¸Î·ÎºÎµÏ…Ï„Î¹ÎºÏŒÏ‚ Ï‡ÏŽÏÎ¿Ï‚ ÎµÎ¯Î½Î±Î¹ ÏƒÏ‡ÎµÎ´ÏŒÎ½ Î³ÎµÎ¼Î¬Ï„Î¿Ï‚ ({usedSpacePercent}%)"
 
-#: js/files.js:225
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Î— Î»Î®ÏˆÎ· Ï€ÏÎ¿ÎµÏ„Î¿Î¹Î¼Î¬Î¶ÎµÏ„Î±Î¹. Î‘Ï…Ï„ÏŒ Î¼Ï€Î¿ÏÎµÎ¯ Î½Î± Ï€Î¬ÏÎµÎ¹ ÏŽÏÎ± ÎµÎ¬Î½ Ï„Î± Î±ÏÏ‡ÎµÎ¯Î± ÎÏ‡Î¿Ï…Î½ Î¼ÎµÎ³Î¬Î»Î¿ Î¼ÎÎ³ÎµÎ¸Î¿Ï‚."
 
-#: js/files.js:262
+#: 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:262
-msgid "Upload Error"
-msgstr "Î£Ï†Î¬Î»Î¼Î± Î‘Ï€Î¿ÏƒÏ„Î¿Î»Î®Ï‚"
-
-#: js/files.js:273
-msgid "Close"
-msgstr "ÎšÎ»ÎµÎ¯ÏƒÎ¹Î¼Î¿"
-
-#: js/files.js:312
-msgid "1 file uploading"
-msgstr "1 Î±ÏÏ‡ÎµÎ¯Î¿ Î±Î½ÎµÎ²Î±Î¯Î½ÎµÎ¹"
-
-#: js/files.js:315 js/files.js:370 js/files.js:385
-msgid "{count} files uploading"
-msgstr "{count} Î±ÏÏ‡ÎµÎ¯Î± Î±Î½ÎµÎ²Î±Î¯Î½Î¿Ï…Î½"
+#: js/files.js:277
+msgid "Not enough space available"
+msgstr "Î”ÎµÎ½ Ï…Ï€Î¬ÏÏ‡ÎµÎ¹ Î±ÏÎºÎµÏ„ÏŒÏ‚ Î´Î¹Î±Î¸ÎÏƒÎ¹Î¼Î¿Ï‚ Ï‡ÏŽÏÎ¿Ï‚"
 
-#: js/files.js:388 js/files.js:423
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "Î— Î±Ï€Î¿ÏƒÏ„Î¿Î»Î® Î±ÎºÏ…ÏÏŽÎ¸Î·ÎºÎµ."
 
-#: js/files.js:497
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Î— Î±Ï€Î¿ÏƒÏ„Î¿Î»Î® Ï„Î¿Ï… Î±ÏÏ‡ÎµÎ¯Î¿Ï… Î²ÏÎ¯ÏƒÎºÎµÏ„Î±Î¹ ÏƒÎµ ÎµÎ¾ÎÎ»Î¹Î¾Î·. Î¤Î¿ ÎºÎ»ÎµÎ¯ÏƒÎ¹Î¼Î¿ Ï„Î·Ï‚ ÏƒÎµÎ»Î¯Î´Î±Ï‚ Î¸Î± Î±ÎºÏ…ÏÏŽÏƒÎµÎ¹ Ï„Î·Î½ Î±Ï€Î¿ÏƒÏ„Î¿Î»Î®."
 
-#: js/files.js:570
+#: js/files.js:486
 msgid "URL cannot be empty."
-msgstr "Î— URL Î´ÎµÎ½ Ï€ÏÎÏ€ÎµÎ¹ Î½Î± ÎµÎ¯Î½Î±Î¹ ÎºÎµÎ½Î®."
+msgstr "Î— URL Î´ÎµÎ½ Î¼Ï€Î¿ÏÎµÎ¯ Î½Î± ÎµÎ¯Î½Î±Î¹ ÎºÎµÎ½Î®."
 
-#: js/files.js:575
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "ÎœÎ· ÎÎ³ÎºÏ…ÏÎ¿ ÏŒÎ½Î¿Î¼Î± Ï†Î±ÎºÎÎ»Î¿Ï…. Î— Ï‡ÏÎ®ÏƒÎ· Ï„Î¿Ï… 'ÎšÎ¿Î¹Î½ÏŒÏ‡ÏÎ·ÏƒÏ„Î¿Ï‚' Ï‡ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¹ÎµÎ¯Ï„Î±Î¹ Î±Ï€ÏŒ Î¿ Owncloud"
 
-#: js/files.js:953 templates/index.php:68
+#: 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:954 templates/index.php:79
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "ÎœÎÎ³ÎµÎ¸Î¿Ï‚"
 
-#: js/files.js:955 templates/index.php:81
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Î¤ÏÎ¿Ï€Î¿Ï€Î¿Î¹Î®Î¸Î·ÎºÎµ"
 
-#: js/files.js:974
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 Ï†Î¬ÎºÎµÎ»Î¿Ï‚"
 
-#: js/files.js:976
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} Ï†Î¬ÎºÎµÎ»Î¿Î¹"
 
-#: js/files.js:984
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 Î±ÏÏ‡ÎµÎ¯Î¿"
 
-#: js/files.js:986
+#: 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"
@@ -276,48 +275,48 @@ msgstr "Î¦Î¬ÎºÎµÎ»Î¿Ï‚"
 msgid "From link"
 msgstr "Î‘Ï€ÏŒ ÏƒÏÎ½Î´ÎµÏƒÎ¼Î¿"
 
-#: templates/index.php:40
+#: templates/index.php:42
 msgid "Deleted files"
 msgstr "Î”Î¹Î±Î³ÏÎ±Î¼Î¼ÎÎ½Î± Î±ÏÏ‡ÎµÎ¯Î±"
 
-#: templates/index.php:46
+#: templates/index.php:48
 msgid "Cancel upload"
 msgstr "Î‘ÎºÏÏÏ‰ÏƒÎ· Î±Ï€Î¿ÏƒÏ„Î¿Î»Î®Ï‚"
 
-#: templates/index.php:53
+#: templates/index.php:54
 msgid "You donâ€™t have write permissions here."
-msgstr ""
+msgstr "Î”ÎµÎ½ ÎÏ‡ÎµÏ„Îµ Î´Î¹ÎºÎ±Î¹ÏŽÎ¼Î±Ï„Î± ÎµÎ³Î³ÏÎ±Ï†Î®Ï‚ ÎµÎ´ÏŽ."
 
-#: templates/index.php:60
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
-msgstr "Î”ÎµÎ½ Ï…Ï€Î¬ÏÏ‡ÎµÎ¹ Ï„Î¯Ï€Î¿Ï„Î± ÎµÎ´ÏŽ. ÎœÎµÏ„Î±Ï†Î¿ÏÏ„ÏŽÏƒÏ„Îµ ÎºÎ¬Ï„Î¹!"
+msgstr "Î”ÎµÎ½ Ï…Ï€Î¬ÏÏ‡ÎµÎ¹ Ï„Î¯Ï€Î¿Ï„Î± ÎµÎ´ÏŽ. Î‘Î½ÎµÎ²Î¬ÏƒÏ„Îµ ÎºÎ¬Ï„Î¹!"
 
-#: templates/index.php:74
+#: templates/index.php:75
 msgid "Download"
 msgstr "Î›Î®ÏˆÎ·"
 
-#: templates/index.php:86 templates/index.php:87
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
-msgstr "Î”Î¹Î±ÎºÎ¿Ï€Î® ÎºÎ¿Î¹Î½Î®Ï‚ Ï‡ÏÎ®ÏƒÎ·Ï‚"
+msgstr "Î£Ï„Î±Î¼Î¬Ï„Î·Î¼Î± Î´Î¹Î±Î¼Î¿Î¹ÏÎ±ÏƒÎ¼Î¿Ï"
 
-#: templates/index.php:106
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "Î Î¿Î»Ï Î¼ÎµÎ³Î¬Î»Î¿ Î±ÏÏ‡ÎµÎ¯Î¿ Ï€ÏÎ¿Ï‚ Î±Ï€Î¿ÏƒÏ„Î¿Î»Î®"
 
-#: templates/index.php:108
+#: 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:113
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
-msgstr "Î¤Î± Î±ÏÏ‡ÎµÎ¯Î± ÏƒÎ±ÏÏŽÎ½Î¿Î½Ï„Î±Î¹, Ï€Î±ÏÎ±ÎºÎ±Î»ÏŽ Ï€ÎµÏÎ¹Î¼ÎÎ½ÎµÏ„Îµ"
+msgstr "Î¤Î± Î±ÏÏ‡ÎµÎ¯Î± ÏƒÎ±ÏÏŽÎ½Î¿Î½Ï„Î±Î¹, Ï€Î±ÏÎ±ÎºÎ±Î»ÏŽ Ï€ÎµÏÎ¹Î¼ÎÎ½ÎµÏ„Îµ."
 
-#: templates/index.php:116
+#: templates/index.php:117
 msgid "Current scanning"
-msgstr "Î¤ÏÎÏ‡Î¿Ï…ÏƒÎ± Î±Î½Î±Î¶Î®Ï„Î·ÏƒÎ· "
+msgstr "Î¤ÏÎÏ‡Î¿Ï…ÏƒÎ± Î±Î½Î¯Ï‡Î½ÎµÏ…ÏƒÎ·"
 
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
-msgstr "Î‘Î½Î±Î²Î¬Î¸Î¼Î¹ÏƒÎ· Î¼Î½Î®Î¼Î·Ï‚ cache Ï„Î¿Ï… ÏƒÏ…ÏƒÏ„Î®Î¼Î±Ï„Î¿Ï‚ Î±ÏÏ‡ÎµÎ¯Ï‰Î½..."
+msgstr "Î•Î½Î·Î¼ÎÏÏ‰ÏƒÎ· Ï„Î·Ï‚ Î¼Î½Î®Î¼Î·Ï‚ cache Ï„Î¿Ï… ÏƒÏ…ÏƒÏ„Î®Î¼Î±Ï„Î¿Ï‚ Î±ÏÏ‡ÎµÎ¯Ï‰Î½..."
diff --git a/l10n/el/files_encryption.po b/l10n/el/files_encryption.po
index 7196402db423993479cc1d90a1195bcb8ba24ea6..e3d818fc1b6cd199b84246cbb897805a090c67da 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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"
@@ -38,4 +35,4 @@ msgstr "Î•Î¾Î±Î¯ÏÎµÏƒÎ· Ï„Ï‰Î½ Ï€Î±ÏÎ±ÎºÎ¬Ï„Ï‰ Ï„ÏÏ€Ï‰Î½ Î±ÏÏ‡ÎµÎ¯Ï‰Î½ Î±Ï€
 
 #: templates/settings.php:12
 msgid "None"
-msgstr "ÎšÎ±Î¼Î¯Î±"
+msgstr "Î¤Î¯Ï€Î¿Ï„Î±"
diff --git a/l10n/el/files_external.po b/l10n/el/files_external.po
index 8eeb9b108c7d7a3e12f009bbc79a1af8ff408813..592955425a94de9e46cd68371945e7d1cc105f69 100644
--- a/l10n/el/files_external.po
+++ b/l10n/el/files_external.po
@@ -3,19 +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.
-# Î“Î¹Î¬Î½Î½Î·Ï‚ <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-03-01 00:05+0100\n"
-"PO-Revision-Date: 2013-02-27 23:20+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 17:40+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"
@@ -43,19 +38,26 @@ msgstr "Î Î±ÏÎ±ÎºÎ±Î»Î¿ÏÎ¼Îµ Î´ÏŽÏƒÏ„Îµ ÎÎ³ÎºÏ…ÏÎ¿ ÎºÎ»ÎµÎ¹Î´Î¯ Dropbox ÎºÎ±
 msgid "Error configuring Google Drive storage"
 msgstr "Î£Ï†Î¬Î»Î¼Î± ÏÏ…Î¸Î¼Î¯Î¶Ï‰Î½Ï„Î±Ï‚ Î±Ï€Î¿Î¸Î®ÎºÎµÏ…ÏƒÎ· Google Drive "
 
-#: 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 "<b>Î ÏÎ¿ÏƒÎ¿Ï‡Î®:</b> ÎŸ \"smbclient\" Î´ÎµÎ½ ÎµÎ³ÎºÎ±Ï„Î±ÏƒÏ„Î¬Î¸Î·ÎºÎµ. Î”ÎµÎ½ ÎµÎ¯Î½Î±Î¹ Î´Ï…Î½Î±Ï„Î® Î· Ï€ÏÎ¿ÏƒÎ¬ÏÏ„Î·ÏƒÎ· CIFS/SMB. Î Î±ÏÎ±ÎºÎ±Î»ÏŽ ÎµÎ½Î·Î¼ÎµÏÏŽÏƒÏ„Îµ Ï„Î¿Î½ Î´Î¹Î±Ï‡ÎµÎ¹ÏÎ¹ÏƒÏ„Î® ÏƒÏ…ÏƒÏ„Î®Î¼Î±Ï„Î¿Ï‚ Î½Î± Ï„Î¿ ÎµÎ³ÎºÎ±Ï„Î±ÏƒÏ„Î®ÏƒÎµÎ¹."
 
-#: 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 "<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 "Î•Î¾Ï‰Ï„ÎµÏÎ¹ÎºÏŒ Î‘Ï€Î¿Î¸Î·ÎºÎµÏ…Ï„Î¹ÎºÏŒ ÎœÎÏƒÎ¿"
@@ -66,7 +68,7 @@ msgstr "ÎŒÎ½Î¿Î¼Î± Ï†Î±ÎºÎÎ»Î¿Ï…"
 
 #: templates/settings.php:10
 msgid "External storage"
-msgstr ""
+msgstr "Î•Î¾Ï‰Ï„ÎµÏÎ¹ÎºÎ® Î±Ï€Î¿Î¸Î®ÎºÎµÏ…ÏƒÎ·"
 
 #: templates/settings.php:11
 msgid "Configuration"
@@ -82,7 +84,7 @@ msgstr "Î•Ï†Î±ÏÎ¼ÏŒÏƒÎ¹Î¼Î¿"
 
 #: templates/settings.php:33
 msgid "Add storage"
-msgstr ""
+msgstr "Î ÏÎ¿ÏƒÎ¸Î·ÎºÎ· Î±Ï€Î¿Î¸Î·ÎºÎµÏ…ÏƒÎ·Ï‚"
 
 #: templates/settings.php:90
 msgid "None set"
diff --git a/l10n/el/files_sharing.po b/l10n/el/files_sharing.po
index d5a761b6f70d7aeb251f93390ca0521b5d8d4384..793338e63d51ada745c6d4140211b64777761696 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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 e47d9c1615725a1c3dad10770a34e0fac91cc3ae..05b9266f9e1379c19c0967488532694cbd2f17eb 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-03-08 00:25+0100\n"
-"PO-Revision-Date: 2013-03-07 23:25+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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"
@@ -18,12 +17,12 @@ msgstr ""
 "Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:40
+#: ajax/delete.php:42
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "Î‘Î´ÏÎ½Î±Ï„Î· Î· Î¼ÏŒÎ½Î¹Î¼Î· Î´Î¹Î±Î³ÏÎ±Ï†Î® Ï„Î¿Ï… %s"
 
-#: ajax/undelete.php:41
+#: ajax/undelete.php:42
 #, php-format
 msgid "Couldn't restore %s"
 msgstr "Î‘Î´Ï…Î½Î±Î¼Î¯Î± ÎµÏ€Î±Î½Î±Ï†Î¿ÏÎ¬Ï‚ %s"
@@ -32,6 +31,10 @@ msgstr "Î‘Î´Ï…Î½Î±Î¼Î¯Î± ÎµÏ€Î±Î½Î±Ï†Î¿ÏÎ¬Ï‚ %s"
 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 "Î¼ÏŒÎ½Î¹Î¼Î· Î´Î¹Î±Î³ÏÎ±Ï†Î® Î±ÏÏ‡ÎµÎ¯Î¿Ï…"
@@ -78,4 +81,4 @@ msgstr "Î”Î¹Î±Î³ÏÎ±Ï†Î®"
 
 #: templates/part.breadcrumb.php:9
 msgid "Deleted Files"
-msgstr ""
+msgstr "Î”Î¹Î±Î³ÏÎ±Î¼Î¼ÎÎ½Î± Î‘ÏÏ‡ÎµÎ¯Î±"
diff --git a/l10n/el/files_versions.po b/l10n/el/files_versions.po
index bd9ae0b92a4f3e539b1864c84dd83b9ee1fab193..12369ab3d423b1becbea60b8a4bb166592ee9bbb 100644
--- a/l10n/el/files_versions.po
+++ b/l10n/el/files_versions.po
@@ -3,15 +3,12 @@
 # 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.
 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:30+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"
@@ -43,17 +40,17 @@ msgstr "Î±Ï€Î¿Ï„Ï…Ï‡Î¯Î±"
 msgid "File %s could not be reverted to version %s"
 msgstr "Î¤Î¿ Î±ÏÏ‡ÎµÎ¯Î¿ %s Î´ÎµÎ½ ÎµÎ¯Î½Î±Î¹ Î´Ï…Î½Î±Ï„ÏŒ Î½Î± ÎµÏ€Î±Î½Î±Ï†ÎµÏÎ¸ÎµÎ¯ ÏƒÏ„Î·Î½ ÎÎºÎ´Î¿ÏƒÎ· %s"
 
-#: 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/el/lib.po b/l10n/el/lib.po
index c7a31d5a585ab51272f8f9ce00e6429189e1117c..aa1aed6797dda23c88d5ef1dce27eea2eb32488b 100644
--- a/l10n/el/lib.po
+++ b/l10n/el/lib.po
@@ -3,16 +3,12 @@
 # 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.
 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:35+0000\n"
+"POT-Creation-Date: 2013-04-28 01:57+0200\n"
+"PO-Revision-Date: 2013-04-27 23:57+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"
@@ -45,19 +41,19 @@ msgstr "Î•Ï†Î±ÏÎ¼Î¿Î³ÎÏ‚"
 msgid "Admin"
 msgstr "Î”Î¹Î±Ï‡ÎµÎ¹ÏÎ¹ÏƒÏ„Î®Ï‚"
 
-#: files.php:202
+#: files.php:209
 msgid "ZIP download is turned off."
 msgstr "Î— Î»Î®ÏˆÎ· ZIP Î±Ï€ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¹Î®Î¸Î·ÎºÎµ."
 
-#: files.php:203
+#: files.php:210
 msgid "Files need to be downloaded one by one."
 msgstr "Î¤Î± Î±ÏÏ‡ÎµÎ¯Î± Ï€ÏÎÏ€ÎµÎ¹ Î½Î± Î»Î·Ï†Î¸Î¿ÏÎ½ ÎÎ½Î±-ÎÎ½Î±."
 
-#: files.php:204 files.php:231
+#: files.php:211 files.php:244
 msgid "Back to Files"
 msgstr "Î Î¯ÏƒÏ‰ ÏƒÏ„Î± Î‘ÏÏ‡ÎµÎ¯Î±"
 
-#: files.php:228
+#: files.php:241
 msgid "Selected files too large to generate zip file."
 msgstr "Î¤Î± ÎµÏ€Î¹Î»ÎµÎ³Î¼ÎÎ½Î± Î±ÏÏ‡ÎµÎ¯Î± ÎµÎ¯Î½Î±Î¹ Î¼ÎµÎ³Î¬Î»Î± ÏŽÏƒÏ„Îµ Î½Î± Î´Î·Î¼Î¹Î¿Ï…ÏÎ³Î·Î¸ÎµÎ¯ Î±ÏÏ‡ÎµÎ¯Î¿ zip."
 
@@ -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."
@@ -119,74 +111,74 @@ msgstr "%s Î¼Î¬Î»Î»Î¿Î½ Î´ÎµÎ½ Ï‡ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¹ÎµÎ¯Ï„Îµ Ï„ÎµÎ»ÎµÎ¯ÎµÏ‚ ÏƒÏ„
 #: setup.php:64
 #, php-format
 msgid "%s set the database host."
-msgstr ""
+msgstr "%s ÏÏ…Î¸Î¼Î¯ÏƒÎ· Ï„Î¿Ï… ÎºÎµÎ½Ï„ÏÎ¹ÎºÏŒÏ… Ï…Ï€Î¿Î»Î¿Î³Î¹ÏƒÏ„Î® Î²Î¬ÏƒÎ·Ï‚ Î´ÎµÎ´Î¿Î¼ÎÎ½Ï‰Î½. "
 
-#: setup.php:128 setup.php:320 setup.php:365
+#: setup.php:132 setup.php:325 setup.php:370
 msgid "PostgreSQL username and/or password not valid"
 msgstr "ÎœÎ· ÎÎ³ÎºÏ…ÏÎ¿Ï‚ Ï‡ÏÎ®ÏƒÏ„Î·Ï‚ ÎºÎ±Î¹/Î® ÏƒÏ…Î½Î¸Î·Î¼Î±Ï„Î¹ÎºÏŒ Ï„Î·Ï‚ PostgreSQL"
 
-#: setup.php:129 setup.php:152 setup.php:229
+#: setup.php:133 setup.php:156 setup.php:234
 msgid "You need to enter either an existing account or the administrator."
 msgstr "Î§ÏÎµÎ¹Î¬Î¶ÎµÏ„Î±Î¹ Î½Î± ÎµÎ¹ÏƒÎ¬Î³ÎµÏ„Îµ ÎµÎ¯Ï„Îµ ÎÎ½Î±Î½ Ï…Ï€Î¬ÏÏ‡Î¿Î½ Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼ÏŒ Î® Ï„Î¿Ï… Î´Î¹Î±Ï‡ÎµÎ¹ÏÎ¹ÏƒÏ„Î®."
 
-#: setup.php:151 setup.php:453 setup.php:520
+#: setup.php:155 setup.php:458 setup.php:525
 msgid "Oracle username and/or password not valid"
 msgstr "ÎœÎ· ÎÎ³ÎºÏ…ÏÎ¿Ï‚ Ï‡ÏÎ®ÏƒÏ„Î·Ï‚ ÎºÎ±Î¹/Î® ÏƒÏ…Î½Î¸Î·Î¼Î±Ï„Î¹ÎºÏŒ Ï„Î·Ï‚ Oracle"
 
-#: setup.php:228
+#: setup.php:233
 msgid "MySQL username and/or password not valid"
 msgstr "ÎœÎ· ÎÎ³ÎºÏ…ÏÎ¿Ï‚ Ï‡ÏÎ®ÏƒÏ„Î·Ï‚ ÎºÎ±Î¹/Î® ÏƒÏ…Î½Î¸Î·Î¼Î±Ï„Î¹ÎºÏŒ Ï„Î·Ï‚ MySQL"
 
-#: 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: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:583 setup.php:592 setup.php:600 setup.php:609
+#: setup.php:615
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Î£Ï†Î¬Î»Î¼Î± Î’Î¬ÏƒÎ·Ï‚ Î”ÎµÎ´Î¿Î¼ÎÎ½Ï‰Î½: \"%s\""
 
-#: 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:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
+#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
+#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
 #, php-format
 msgid "Offending command was: \"%s\""
-msgstr ""
+msgstr "Î— ÎµÎ½Ï„Î¿Î»Î· Ï€Î±ÏÎ±Î²Î±Ï„Î¹ÎºÎ¿Ï„Î·Ï„Î±Ï‚ Î·Ï„Î±Î½: \"%s\""
 
-#: setup.php:299
+#: setup.php:304
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "Î¥Ï€Î¬ÏÏ‡ÎµÎ¹ Î®Î´Î· Î¿ Ï‡ÏÎ®ÏƒÏ„Î·Ï‚ '%s'@'localhost' Ï„Î·Ï‚ MySQL."
 
-#: setup.php:300
+#: setup.php:305
 msgid "Drop this user from MySQL"
 msgstr "Î‘Ï€ÏŒÏÏÎ¹ÏˆÎ· Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… Ï‡ÏÎ®ÏƒÏ„Î· Î±Ï€ÏŒ Ï„Î·Î½ MySQL"
 
-#: setup.php:305
+#: setup.php:310
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "ÎŸ Ï‡ÏÎ®ÏƒÏ„Î·Ï‚ '%s'@'%%' Ï„Î·Ï‚ MySQL Ï…Ï€Î¬ÏÏ‡ÎµÎ¹ Î®Î´Î·"
 
-#: setup.php:306
+#: setup.php:311
 msgid "Drop this user from MySQL."
 msgstr "Î‘Ï€ÏŒÏÏÎ¹ÏˆÎ· Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… Ï‡ÏÎ®ÏƒÏ„Î· Î±Ï€ÏŒ Ï„Î·Î½ MySQL"
 
-#: setup.php:579 setup.php:611
+#: setup.php:584 setup.php:616
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
-msgstr ""
+msgstr "Î— ÎµÎ½Ï„Î¿Î»Î· Ï€Î±ÏÎ±Î²Î±Ï„Î¹ÎºÎ¿Ï„Î·Ï„Î±Ï‚ Î·Ï„Î±Î½: \"%s\", Î¿Î½Î¿Î¼Î±: %s, ÎºÏ‰Î´Î¹ÎºÎ¿Ï‚: %s"
 
-#: setup.php:631
+#: setup.php:636
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
-msgstr ""
+msgstr "Î¤Î¿ ÏŒÎ½Î¿Î¼Î± Ï‡ÏÎ®ÏƒÏ„Î· ÎºÎ±Î¹/Î® Î¿ ÎºÏ‰Î´Î¹ÎºÏŒÏ‚ Ï„Î·Ï‚ MS SQL Î´ÎµÎ½ ÎµÎ¯Î½Î±Î¹ ÎÎ³ÎºÏ…ÏÎ±: %s"
 
-#: setup.php:849
+#: setup.php:858
 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:850
+#: setup.php:859
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Î•Î»ÎÎ³Î¾Ï„Îµ Î¾Î±Î½Î¬ Ï„Î¹Ï‚ <a href='%s'>Î¿Î´Î·Î³Î¯ÎµÏ‚ ÎµÎ³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ·Ï‚</a>."
@@ -219,7 +211,7 @@ msgstr "ÏƒÎ®Î¼ÎµÏÎ±"
 
 #: template.php:119
 msgid "yesterday"
-msgstr "Ï‡Î¸ÎÏ‚"
+msgstr "Ï‡Ï„ÎµÏ‚"
 
 #: template.php:120
 #, php-format
@@ -228,7 +220,7 @@ msgstr "%d Î·Î¼ÎÏÎµÏ‚ Ï€ÏÎ¹Î½"
 
 #: template.php:121
 msgid "last month"
-msgstr "Ï„Î¿Î½ Ï€ÏÎ¿Î·Î³Î¿ÏÎ¼ÎµÎ½Î¿ Î¼Î®Î½Î±"
+msgstr "Ï„ÎµÎ»ÎµÏ…Ï„Î±Î¯Î¿ Î¼Î®Î½Î±"
 
 #: template.php:122
 #, php-format
@@ -237,25 +229,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 57cd5917caf6d19c39f9a56bade153365ce6d198..9103a1e0fc4ca310b1aef01353362d04d7c834fe 100644
--- a/l10n/el/settings.po
+++ b/l10n/el/settings.po
@@ -3,26 +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.
-# Î“Î¹Î¬Î½Î½Î·Ï‚ Î‘Î½Î¸Ï…Î¼Î¯Î´Î·Ï‚ <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-02-27 14:35+0100\n"
-"PO-Revision-Date: 2013-02-27 13:35+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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"
@@ -34,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 "Î”ÎµÎ½ ÎµÎ¯Î½Î±Î¹ Î´Ï…Î½Î±Ï„Î® Î· Î±Î»Î»Î±Î³Î® Ï„Î¿Ï… Î¿Î½ÏŒÎ¼Î±Ï„Î¿Ï‚ ÎµÎ¼Ï†Î¬Î½Î¹ÏƒÎ·Ï‚"
 
@@ -105,7 +97,7 @@ msgstr "Î•Î½Î·Î¼ÎÏÏ‰ÏƒÎ· ÏƒÎµ {appversion}"
 msgid "Disable"
 msgstr "Î‘Ï€ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¯Î·ÏƒÎ·"
 
-#: js/apps.js:36 js/apps.js:64
+#: js/apps.js:36 js/apps.js:64 js/apps.js:83
 msgid "Enable"
 msgstr "Î•Î½ÎµÏÎ³Î¿Ï€Î¿Î¯Î·ÏƒÎ·"
 
@@ -113,68 +105,68 @@ msgstr "Î•Î½ÎµÏÎ³Î¿Ï€Î¿Î¯Î·ÏƒÎ·"
 msgid "Please wait...."
 msgstr "Î Î±ÏÎ±ÎºÎ±Î»ÏŽ Ï€ÎµÏÎ¹Î¼ÎÎ½ÎµÏ„Îµ..."
 
-#: js/apps.js:84
+#: 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:87
+#: js/apps.js:93
 msgid "Error while updating app"
 msgstr "Î£Ï†Î¬Î»Î¼Î± ÎºÎ±Ï„Î¬ Ï„Î·Î½ ÎµÎ½Î·Î¼ÎÏÏ‰ÏƒÎ· Ï„Î·Ï‚ ÎµÏ†Î±ÏÎ¼Î¿Î³Î®Ï‚"
 
-#: js/apps.js:87
-msgid "Error"
-msgstr "Î£Ï†Î¬Î»Î¼Î±"
-
-#: js/apps.js:90
+#: js/apps.js:96
 msgid "Updated"
 msgstr "Î•Î½Î·Î¼ÎµÏÏŽÎ¸Î·ÎºÎµ"
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
-msgstr "Î‘Ï€Î¿Î¸Î®ÎºÎµÏ…ÏƒÎ·..."
+msgstr "Î“Î¯Î½ÎµÏ„Î±Î¹ Î±Ï€Î¿Î¸Î®ÎºÎµÏ…ÏƒÎ·..."
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "deleted"
 msgstr "Î´Î¹Î±Î³ÏÎ¬Ï†Î·ÎºÎµ"
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "undo"
 msgstr "Î±Î½Î±Î¯ÏÎµÏƒÎ·"
 
-#: js/users.js:62
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr "Î‘Î´Ï…Î½Î±Î¼Î¯Î± Î±Ï†Î±Î¯ÏÎµÏƒÎ· Ï‡ÏÎ®ÏƒÏ„Î·"
 
-#: js/users.js:75 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
+#: templates/users.php:103
 msgid "Groups"
 msgstr "ÎŸÎ¼Î¬Î´ÎµÏ‚"
 
-#: js/users.js:78 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr "ÎŸÎ¼Î¬Î´Î± Î”Î¹Î±Ï‡ÎµÎ¹ÏÎ¹ÏƒÏ„ÏŽÎ½"
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "Î”Î¹Î±Î³ÏÎ±Ï†Î®"
 
-#: js/users.js:191
+#: js/users.js:269
 msgid "add group"
 msgstr "Ï€ÏÎ¿ÏƒÎ¸Î®ÎºÎ· Î¿Î¼Î¬Î´Î±Ï‚"
 
-#: js/users.js:352
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr "Î ÏÎÏ€ÎµÎ¹ Î½Î± Î´Î¿Î¸ÎµÎ¯ ÎÎ³ÎºÏ…ÏÎ¿ ÏŒÎ½Î¿Î¼Î± Ï‡ÏÎ®ÏƒÏ„Î·"
 
-#: js/users.js:353 js/users.js:359 js/users.js:374
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr "Î£Ï†Î¬Î»Î¼Î± Î´Î·Î¼Î¹Î¿Ï…ÏÎ³Î¯Î±Ï‚ Ï‡ÏÎ®ÏƒÏ„Î·"
 
-#: js/users.js:358
+#: js/users.js:426
 msgid "A valid password must be provided"
 msgstr "Î ÏÎÏ€ÎµÎ¹ Î½Î± Î´Î¿Î¸ÎµÎ¯ ÎÎ³ÎºÏ…ÏÎ¿ ÏƒÏ…Î½Î¸Î·Î¼Î±Ï„Î¹ÎºÏŒ"
 
-#: personal.php:29 personal.php:30
+#: personal.php:35 personal.php:36
 msgid "__language_name__"
 msgstr "__ÏŒÎ½Î¿Î¼Î±_Î³Î»ÏŽÏƒÏƒÎ±Ï‚__"
 
@@ -208,13 +200,13 @@ msgstr "Î•Î»ÎÎ³Î¾Ï„Îµ Î¾Î±Î½Î¬ Ï„Î¹Ï‚ <a href='%s'>Î¿Î´Î·Î³Î¯ÎµÏ‚ ÎµÎ³ÎºÎ±Ï„Î¬
 
 #: 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"
@@ -226,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"
@@ -240,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 Î´ÎµÎ½ ÎÏ‡ÎµÎ¹ ÏƒÏÎ½Î´ÎµÏƒÎ· ÏƒÏ„Î¿ Î”Î¹Î±Î´Î¯ÎºÏ„Ï…Î¿. Î‘Ï…Ï„ÏŒ ÏƒÎ·Î¼Î±Î¯Î½ÎµÎ¹ ÏŒÏ„Î¹ Î¿ÏÎ¹ÏƒÎ¼ÎÎ½Î± Î±Ï€ÏŒ Ï„Î± Ï‡Î±ÏÎ±ÎºÏ„Î·ÏÎ¹ÏƒÏ„Î¹ÎºÎ¬ Î³Î½Ï‰ÏÎ¯ÏƒÎ¼Î±Ï„Î± ÏŒÏ€Ï‰Ï‚ Î· Ï„Î¿Ï€Î¿Î¸ÎÏ„Î·ÏƒÎ· ÎµÎ¾Ï‰Ï„ÎµÏÎ¹ÎºÎ®Ï‚ Î±Ï€Î¿Î¸Î®ÎºÎµÏ…ÏƒÎ·Ï‚, Î¿Î¹ ÎºÎ¿Î¹Î½Î¿Ï€Î¿Î¹Î®ÏƒÎµÎ¹Ï‚ ÏƒÏ‡ÎµÏ„Î¹ÎºÎ¬ Î¼Îµ Î±Î½Î±Î½ÎµÏ‰ÏƒÎµÎ¹Ï‚, Î® ÎµÎ³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ· 3Ï‰Î½ ÎµÏ†Î±ÏÎ¼Î¿Î³ÎÏ‚ Î´ÎµÎ½ Î»ÎµÎ¹Ï„Î¿Ï…ÏÎ³Î¿ÏÎ½.  Î— Ï€ÏÏŒÏƒÎ²Î±ÏƒÎ· ÏƒÎµ Î±ÏÏ‡ÎµÎ¯Î± ÎºÎ±Î¹ Î· Î±Ï€Î¿ÏƒÏ„Î¿Î»Î® Î¼Î·Î½Ï…Î¼Î¬Ï„Ï‰Î½ Î·Î»ÎµÎºÏ„ÏÎ¿Î½Î¹ÎºÎ¿Ï Ï„Î±Ï‡Ï…Î´ÏÎ¿Î¼ÎµÎ¯Î¿Ï… Î¼Ï€Î¿ÏÎµÎ¯ ÎµÏ€Î¯ÏƒÎ·Ï‚ Î½Î± Î¼Î·Î½ Î»ÎµÎ¹Ï„Î¿Ï…ÏÎ³ÎµÎ¯. Î£Î±Ï‚ Ï€ÏÎ¿Ï„ÎµÎ¯Î½Î¿Ï…Î¼Îµ Î½Î± ÏƒÏÎ½Î´ÎµÎ¸ÎµÎ¹Ï„Îµ ÏƒÏ„Î¿ Î´Î¹Î±Î´Î¹ÎºÏ„Ï…Î¿ Î±Ï…Ï„ÏŒ Ï„Î¿Î½ Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„Î®, ÎµÎ¬Î½ Î¸ÎÎ»ÎµÏ„Îµ Î½Î± ÎÏ‡ÎµÏ„Îµ ÏŒÎ»Î± Ï„Î± Ï‡Î±ÏÎ±ÎºÏ„Î·ÏÎ¹ÏƒÏ„Î¹ÎºÎ¬ Ï„Î¿Ï… ownCloud."
 
 #: templates/admin.php:92
 msgid "Cron"
@@ -315,7 +307,7 @@ msgstr "Î•Ï€Î¹Î²Î¿Î»Î® ÏƒÏ„Î¿Ï…Ï‚ Ï€ÎµÎ»Î¬Ï„ÎµÏ‚ Î½Î± ÏƒÏ…Î½Î´ÎµÎ¸Î¿ÏÎ½ ÏƒÏ„Î¿
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
-msgstr ""
+msgstr "Î Î±ÏÎ±ÎºÎ±Î»ÏŽ ÏƒÏ…Î½Î´ÎµÎ¸ÎµÎ¯Ï„Îµ Î¼Îµ Ï„Î¿ ownCloud Î¼ÎÏƒÏ‰ HTTPS Î³Î¹Î± Î½Î± ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¹Î®ÏƒÎµÏ„Îµ Î® Î½Î± Î±Ï€ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¹Î®ÏƒÎµÏ„Îµ Ï„Î·Î½ ÎµÏ€Î¹Î²Î¿Î»Î® SSL. "
 
 #: templates/admin.php:195
 msgid "Log"
@@ -325,15 +317,19 @@ msgstr "ÎšÎ±Ï„Î±Î³ÏÎ±Ï†ÎÏ‚"
 msgid "Log level"
 msgstr "Î•Ï€Î¯Ï€ÎµÎ´Î¿ ÎºÎ±Ï„Î±Î³ÏÎ±Ï†Î®Ï‚"
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
 msgstr "Î ÎµÏÎ¹ÏƒÏƒÏŒÏ„ÎµÏÎ±"
 
-#: templates/admin.php:230 templates/personal.php:102
+#: templates/admin.php:228
+msgid "Less"
+msgstr "Î›Î¹Î³ÏŒÏ„ÎµÏÎ±"
+
+#: templates/admin.php:235 templates/personal.php:105
 msgid "Version"
 msgstr "ÎˆÎºÎ´Î¿ÏƒÎ·"
 
-#: templates/admin.php:233 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 "
@@ -404,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:77
 msgid "Password"
 msgstr "Î£Ï…Î½Î¸Î·Î¼Î±Ï„Î¹ÎºÏŒ"
 
@@ -428,82 +424,70 @@ msgstr "ÎÎÎ¿ ÏƒÏ…Î½Î¸Î·Î¼Î±Ï„Î¹ÎºÏŒ"
 msgid "Change password"
 msgstr "Î‘Î»Î»Î±Î³Î® ÏƒÏ…Î½Î¸Î·Î¼Î±Ï„Î¹ÎºÎ¿Ï"
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:76
 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 "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 "WebDAV"
 
-#: templates/personal.php:93
+#: templates/personal.php:96
 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:75
 msgid "Login Name"
 msgstr "ÎŒÎ½Î¿Î¼Î± Î£ÏÎ½Î´ÎµÏƒÎ·Ï‚"
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr "Î”Î·Î¼Î¹Î¿Ï…ÏÎ³Î¯Î±"
 
-#: templates/users.php:35
+#: templates/users.php:33
 msgid "Default Storage"
 msgstr "Î ÏÎ¿ÎºÎ±Î¸Î¿ÏÎ¹ÏƒÎ¼ÎÎ½Î· Î‘Ï€Î¿Î¸Î®ÎºÎµÏ…ÏƒÎ· "
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:39 templates/users.php:133
 msgid "Unlimited"
 msgstr "Î‘Ï€ÎµÏÎ¹ÏŒÏÎ¹ÏƒÏ„Î¿"
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:57 templates/users.php:148
 msgid "Other"
-msgstr "Î†Î»Î»Î±"
+msgstr "Î†Î»Î»Î¿"
 
-#: templates/users.php:84
+#: templates/users.php:82
 msgid "Storage"
 msgstr "Î‘Ï€Î¿Î¸Î®ÎºÎµÏ…ÏƒÎ·"
 
-#: templates/users.php:95
+#: templates/users.php:93
 msgid "change display name"
 msgstr "Î±Î»Î»Î±Î³Î® Î¿Î½ÏŒÎ¼Î±Ï„Î¿Ï‚ ÎµÎ¼Ï†Î¬Î½Î¹ÏƒÎ·Ï‚"
 
-#: templates/users.php:99
+#: templates/users.php:97
 msgid "set new password"
 msgstr "ÎµÏ€Î¹Î»Î¿Î³Î® Î½ÎÎ¿Ï… ÎºÏ‰Î´Î¹ÎºÎ¿Ï"
 
-#: templates/users.php:134
+#: templates/users.php:128
 msgid "Default"
 msgstr "Î ÏÎ¿ÎºÎ±Î¸Î¿ÏÎ¹ÏƒÎ¼ÎÎ½Î¿"
diff --git a/l10n/el/user_ldap.po b/l10n/el/user_ldap.po
index 208bcb75ba6f49406db90fd255b643a2ac635363..815d1c8291e150b207eb770e1a02a4b0d41babf2 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-02 00:03+0100\n"
-"PO-Revision-Date: 2013-03-01 23:04+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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: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 "ÎœÏ€Î¿ÏÎµÎ¯Ï„Îµ Î½Î± Ï€Î±ÏÎ±Î»ÎµÎ¯ÏˆÎµÏ„Îµ Ï„Î¿ Ï€ÏÏ‰Ï„ÏŒÎºÎ¿Î»Î»Î¿, ÎµÎºÏ„ÏŒÏ‚ Î±Î½ Î±Ï€Î±Î¹Ï„ÎµÎ¯Ï„Î±Î¹ SSL. Î£Îµ Î±Ï…Ï„Î® Ï„Î·Î½ Ï€ÎµÏÎ¯Ï€Ï„Ï‰ÏƒÎ· Î¾ÎµÎºÎ¹Î½Î®ÏƒÏ„Îµ Î¼Îµ ldaps://"
 
-#: templates/settings.php:26
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "Base DN"
 
-#: templates/settings.php:27
+#: templates/settings.php:41
 msgid "One Base DN per line"
-msgstr ""
+msgstr "ÎˆÎ½Î± DN Î’Î¬ÏƒÎ·Ï‚ Î±Î½Î¬ Î³ÏÎ±Î¼Î¼Î® "
 
-#: templates/settings.php:28
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "ÎœÏ€Î¿ÏÎµÎ¯Ï„Îµ Î½Î± ÎºÎ±Î¸Î¿ÏÎ¯ÏƒÎµÏ„Îµ Ï„Î¿ Base DN Î³Î¹Î± Ï‡ÏÎ®ÏƒÏ„ÎµÏ‚ ÎºÎ±Î¹ Î¿Î¼Î¬Î´ÎµÏ‚ Î±Ï€ÏŒ Ï„Î·Î½ ÎºÎ±ÏÏ„ÎÎ»Î± Î ÏÎ¿Î·Î³Î¼ÎÎ½ÎµÏ‚ ÏÏ…Î¸Î¼Î¯ÏƒÎµÎ¹Ï‚"
 
-#: templates/settings.php:30
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "User DN"
 
-#: 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 "Î¤Î¿ DN Ï„Î¿Ï… Ï‡ÏÎ®ÏƒÏ„Î· Ï€ÎµÎ»Î¬Ï„Î· Î¼Îµ Ï„Î¿ Î¿Ï€Î¿Î¯Î¿ Î¸Î± Ï€ÏÎÏ€ÎµÎ¹ Î½Î± Î³Î¯Î½ÎµÎ¹ Î· ÏƒÏÎ½Î´ÎµÏƒÎ·, Ï€.Ï‡. uid=agent,dc=example,dc=com. Î“Î¹Î± Ï‡ÏÎ®ÏƒÎ· Ï‡Ï‰ÏÎ¯Ï‚ Ï€Î¹ÏƒÏ„Î¿Ï€Î¿Î¯Î·ÏƒÎ·, Î±Ï†Î®ÏƒÏ„Îµ Ï„Î¿ DN ÎºÎ±Î¹ Ï„Î¿Î½ ÎšÏ‰Î´Î¹ÎºÏŒ ÎºÎµÎ½Î¬."
 
-#: 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 "Î“Î¹Î± Î±Î½ÏŽÎ½Ï…Î¼Î· Ï€ÏÏŒÏƒÎ²Î±ÏƒÎ·, Î±Ï†Î®ÏƒÏ„Îµ ÎºÎµÎ½Î¬ Ï„Î± Ï€ÎµÎ´Î¯Î± DN ÎºÎ±Î¹ Pasword."
 
-#: templates/settings.php:37
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "User Login Filter"
 
-#: 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 "ÎšÎ±Î¸Î¿ÏÎ¯Î¶ÎµÎ¹ Ï„Î¿ Ï†Î¯Î»Ï„ÏÎ¿ Ï€Î¿Ï… Î¸Î± Î¹ÏƒÏ‡ÏÎµÎ¹ ÎºÎ±Ï„Î¬ Ï„Î·Î½ Ï€ÏÎ¿ÏƒÏ€Î¬Î¸ÎµÎ¹Î± ÏƒÏÎ½Î´ÎµÏƒÎ·Ï‚ Ï‡ÏÎ®ÏƒÏ„Î·. %%uid Î±Î½Ï„Î¹ÎºÎ±Î¸Î¹ÏƒÏ„Î¬ Ï„Î¿ ÏŒÎ½Î¿Î¼Î± Ï‡ÏÎ®ÏƒÏ„Î· ÎºÎ±Ï„Î¬ Ï„Î· ÏƒÏÎ½Î´ÎµÏƒÎ·. "
 
-#: templates/settings.php:41
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "Ï‡ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¹Î®ÏƒÏ„Îµ Ï„Î· Î¼ÎµÏ„Î±Î²Î»Î·Ï„Î® %%uid, Ï€.Ï‡. \"uid=%%uid\""
 
-#: templates/settings.php:42
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "User List Filter"
 
-#: 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 "Ï‡Ï‰ÏÎ¯Ï‚ ÎºÎ¬Ï€Î¿Î¹Î± Î¼ÎµÏ„Î±Î²Î»Î·Ï„Î®, Ï€.Ï‡. \"objectClass=Î¬Ï„Î¿Î¼Î¿\"."
 
-#: templates/settings.php:47
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "Group Filter"
 
-#: 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 "Ï‡Ï‰ÏÎ¯Ï‚ ÎºÎ¬Ï€Î¿Î¹Î± Î¼ÎµÏ„Î±Î²Î»Î·Ï„Î®, Ï€.Ï‡. \"objectClass=ÎŸÎ¼Î¬Î´Î±Posix\"."
 
-#: templates/settings.php:55
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr "Î¡Ï…Î¸Î¼Î¯ÏƒÎµÎ¹Ï‚ Î£ÏÎ½Î´ÎµÏƒÎ·Ï‚"
 
-#: templates/settings.php:57
+#: templates/settings.php:71
 msgid "Configuration Active"
-msgstr ""
+msgstr "Î•Î½ÎµÏÎ³Î¿Ï€Î¿Î¹Î·ÏƒÎ· ÏÏ…Î¸Î¼Î¹ÏƒÎµÏ‰Î½"
 
-#: templates/settings.php:57
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
-msgstr ""
+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 ""
+msgstr "Î”Î·Î¼Î¹Î¿Ï…ÏÎ³Î¯Î± Î±Î½Ï„Î¹Î³ÏÎ¬Ï†Ï‰Î½ Î±ÏƒÏ†Î±Î»ÎµÎ¯Î±Ï‚ (Replica) Host "
 
-#: 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 ""
+msgstr "Î”ÏŽÏƒÏ„Îµ Î¼Î¹Î± Ï€ÏÎ¿Î±Î¹ÏÎµÏ„Î¹ÎºÎ® ÎµÏ†ÎµÎ´ÏÎ¹ÎºÎ® Ï…Ï€Î¿Î´Î¿Ï‡Î®. Î ÏÎÏ€ÎµÎ¹ Î½Î± ÎµÎ¯Î½Î±Î¹ ÎÎ½Î± Î±Î½Ï„Î¯Î³ÏÎ±Ï†Î¿ Ï„Î¿Ï… ÎºÏÏÎ¹Î¿Ï… LDAP / AD Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„Î·."
 
-#: templates/settings.php:60
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
-msgstr ""
+msgstr "Î”Î·Î¼Î¹Î¿Ï…ÏÎ³Î¯Î± Î±Î½Ï„Î¹Î³ÏÎ¬Ï†Ï‰Î½ Î±ÏƒÏ†Î±Î»ÎµÎ¯Î±Ï‚ (Replica) Î¥Ï€Î¿Î´Î¿Ï‡Î·"
 
-#: templates/settings.php:61
+#: templates/settings.php:75
 msgid "Disable Main Server"
-msgstr ""
+msgstr "Î‘Ï€ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¹Î·ÏƒÎ· Ï„Î¿Ï… ÎºÎµÎ½Ï„ÏÎ¹ÎºÎ¿Ï… Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„Î·"
 
-#: templates/settings.php:61
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
-msgstr ""
+msgstr "ÎŒÏ„Î±Î½ ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¹Î·Î¸ÎµÎ¯, Î¼Îµ Ï„Î¿ ownCloud Î¸Î± ÏƒÏ…Î½Î´ÎµÎ¸ÎµÎ¯Ï„Îµ Î¼Îµ Ï„Î¿ Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„Î® ÏÎµÏ€Î»Î¯ÎºÎ±."
 
-#: templates/settings.php:62
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "Î§ÏÎ®ÏƒÎ· TLS"
 
-#: templates/settings.php:62
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
-msgstr ""
+msgstr "ÎœÎ·Î½ Ï„Î¿ Ï‡ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¹Î®ÏƒÎµÏ„Îµ ÎµÏ€Î¹Ï€ÏÎ¿ÏƒÎ¸ÎÏ„Ï‰Ï‚, Î³Î¹Î± LDAPS ÏƒÏ…Î½Î´ÎÏƒÎµÎ¹Ï‚ , Î¸Î± Î±Ï€Î¿Ï„ÏÏ‡ÎµÎ¹."
 
-#: templates/settings.php:63
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "LDAP server (Windows) Î¼Îµ Î´Î¹Î¬ÎºÏÎ¹ÏƒÎ· Ï€ÎµÎ¶ÏŽÎ½-ÎšÎ•Î¦Î‘Î›Î‘Î™Î©Î"
 
-#: templates/settings.php:64
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "Î‘Ï€ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¯Î·ÏƒÎ· ÎµÏ€Î¹ÎºÏÏÏ‰ÏƒÎ·Ï‚ Ï€Î¹ÏƒÏ„Î¿Ï€Î¿Î¹Î·Ï„Î¹ÎºÎ¿Ï SSL."
 
-#: 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 "Î•Î¬Î½ Î· ÏƒÏÎ½Î´ÎµÏƒÎ· Î´Î¿Ï…Î»ÎµÏÎµÎ¹ Î¼ÏŒÎ½Î¿ Î¼Îµ Î±Ï…Ï„Î® Ï„Î·Î½ ÎµÏ€Î¹Î»Î¿Î³Î®, ÎµÎ¹ÏƒÎ¬Î³ÎµÏ„Îµ Ï„Î¿ LDAP SSL Ï€Î¹ÏƒÏ„Î¿Ï€Î¿Î¹Î·Ï„Î¹ÎºÏŒ Ï„Î¿Ï… Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„Î® ÏƒÏ„Î¿Î½ ownCloud server ÏƒÎ±Ï‚."
 
-#: 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 ""
+msgstr "Cache Time-To-Live"
 
-#: templates/settings.php:65
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr "ÏƒÎµ Î´ÎµÏ…Ï„ÎµÏÏŒÎ»ÎµÏ€Ï„Î±. ÎœÎ¹Î± Î±Î»Î»Î±Î³Î® Î±Î´ÎµÎ¹Î¬Î¶ÎµÎ¹ Ï„Î·Î½ Î¼Î½Î®Î¼Î· cache."
 
-#: 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 "Î— Î¹Î´Î¹ÏŒÏ„Î·Ï„Î± LDAP Ï€Î¿Ï… Î¸Î± Ï‡ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¹ÎµÎ¯Ï„Î±Î¹ Î³Î¹Î± Ï„Î· Î´Î·Î¼Î¹Î¿Ï…ÏÎ³Î¯Î± Ï„Î¿Ï… Î¿Î½ÏŒÎ¼Î±Ï„Î¿Ï‚ Ï‡ÏÎ®ÏƒÏ„Î· Ï„Î¿Ï… ownCloud."
 
-#: templates/settings.php:70
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "Base User Tree"
 
-#: templates/settings.php:70
+#: templates/settings.php:84
 msgid "One User Base DN per line"
-msgstr ""
+msgstr "ÎˆÎ½Î± DN Î²Î¬ÏƒÎ·Ï‚ Ï‡ÏÎ·ÏƒÏ„ÏŽÎ½ Î±Î½Î¬ Î³ÏÎ±Î¼Î¼Î®"
 
-#: templates/settings.php:71
+#: templates/settings.php:85
 msgid "User Search Attributes"
-msgstr ""
+msgstr "Î§Î±ÏÎ±ÎºÏ„Î·ÏÎ¹ÏƒÏ„Î¹ÎºÎ¬ Î±Î½Î±Î¶Î®Ï„Î·ÏƒÎ·Ï‚ Ï„Ï‰Î½ Ï‡ÏÎ·ÏƒÏ„ÏŽÎ½ "
 
-#: templates/settings.php:71 templates/settings.php:74
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
-msgstr ""
+msgstr "Î ÏÎ¿Î±Î¹ÏÎµÏ„Î¹ÎºÎ¬? ÎˆÎ½Î± Ï‡Î±ÏÎ±ÎºÏ„Î·ÏÎ¹ÏƒÏ„Î¹ÎºÏŒ Î±Î½Î¬ Î³ÏÎ±Î¼Î¼Î® "
 
-#: templates/settings.php:72
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr "Group Display Name Field"
 
-#: templates/settings.php:72
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "Î— Î¹Î´Î¹ÏŒÏ„Î·Ï„Î± LDAP Ï€Î¿Ï… Î¸Î± Ï‡ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¹ÎµÎ¯Ï„Î±Î¹ Î³Î¹Î± Ï„Î· Î´Î·Î¼Î¹Î¿Ï…ÏÎ³Î¯Î± Ï„Î¿Ï… Î¿Î½ÏŒÎ¼Î±Ï„Î¿Ï‚ Î¿Î¼Î¬Î´Î±Ï‚ Ï„Î¿Ï… ownCloud."
 
-#: templates/settings.php:73
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "Base Group Tree"
 
-#: templates/settings.php:73
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
-msgstr ""
+msgstr "ÎœÎ¹Î± Î¿Î¼Î±Î´Î¹ÎºÎ· Î’Î¬ÏƒÎ· DN Î±Î½Î¬ Î³ÏÎ±Î¼Î¼Î®"
 
-#: templates/settings.php:74
+#: templates/settings.php:88
 msgid "Group Search Attributes"
-msgstr ""
+msgstr "ÎŸÎ¼Î¬Î´Î± Î§Î±ÏÎ±ÎºÏ„Î·ÏÎ¹ÏƒÏ„Î¹ÎºÏ‰Î½ Î‘Î½Î±Î¶Î®Ï„Î·ÏƒÎ·"
 
-#: templates/settings.php:75
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr "Group-Member association"
 
-#: templates/settings.php:77
+#: templates/settings.php:91
 msgid "Special Attributes"
-msgstr ""
+msgstr "Î•Î¹Î´Î¹ÎºÎ¬ Î§Î±ÏÎ±ÎºÏ„Î·ÏÎ¹ÏƒÏ„Î¹ÎºÎ¬ "
 
-#: templates/settings.php:79
+#: templates/settings.php:93
 msgid "Quota Field"
-msgstr ""
+msgstr "Î Î¿ÏƒÎ¿ÏƒÏ„Î±ÏƒÎ· Ï€ÎµÎ´Î¹Î¿Ï…"
 
-#: templates/settings.php:80
+#: templates/settings.php:94
 msgid "Quota Default"
-msgstr ""
+msgstr "Î ÏÎ¿ÎºÎ±Î¸Î¹ÏƒÎ¼ÎµÎ½Î¿ Ï€ÎµÎ´Î¹Î¿"
 
-#: templates/settings.php:80
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr "ÏƒÎµ bytes"
 
-#: templates/settings.php:81
+#: templates/settings.php:95
 msgid "Email Field"
-msgstr ""
+msgstr "Email Ï„Ï…Ï€Î¿Ï‚"
 
-#: templates/settings.php:82
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
-msgstr ""
+msgstr "Î§ÏÎ®ÏƒÏ„Î·Ï‚ Î ÏÎ¿ÏƒÏ‰Ï€Î¹ÎºÏŒÏ‚Ï†Î¬ÎºÎµÎ»Î¿Ï‚ ÎŸÎ½Î¿Î¼Î±ÏƒÎ¯Î± ÎšÎ±Î½ÏŒÎ½Î±Ï‚ "
 
-#: templates/settings.php:82
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Î‘Ï†Î®ÏƒÏ„Îµ Ï„Î¿ ÎºÎµÎ½ÏŒ Î³Î¹Î± Ï„Î¿ ÏŒÎ½Î¿Î¼Î± Ï‡ÏÎ®ÏƒÏ„Î· (Ï€ÏÎ¿ÎµÏ€Î¹Î»Î¿Î³Î®). Î”Î¹Î±Ï†Î¿ÏÎµÏ„Î¹ÎºÎ¬, ÏƒÏ…Î¼Ï€Î»Î·ÏÏŽÏƒÏ„Îµ Î¼Î¯Î± Î¹Î´Î¹ÏŒÏ„Î·Ï„Î± LDAP/AD."
 
-#: templates/settings.php:86
-msgid "Test Configuration"
+#: templates/settings.php:101
+msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:86
+#: 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..370f455b114dd2101fe0be36ebd3f760bb42c274 100644
--- a/l10n/el/user_webdavauth.po
+++ b/l10n/el/user_webdavauth.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-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-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
 "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..48961fc2a5891783181dfa48dfac096c081e11bd
--- /dev/null
+++ b/l10n/en@pirate/core.po
@@ -0,0 +1,614 @@
+# 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-12 02:01+0200\n"
+"PO-Revision-Date: 2013-05-04 04:00+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 js/oc-dialogs.js:247
+msgid "Ok"
+msgstr ""
+
+#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:185
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:215
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:222
+msgid "No"
+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..754680e81f53a1c944a1f4d93269ab2ffc4c7506
--- /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-05-15 01:59+0200\n"
+"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"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..a45b1779141ac57b7cc134acc0e586c3c1e2dbe2
--- /dev/null
+++ b/l10n/en@pirate/files_encryption.po
@@ -0,0 +1,38 @@
+# 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-02 02:14+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"
+
+#: templates/settings-personal.php:4 templates/settings.php:5
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings-personal.php:7
+msgid "File encryption is enabled."
+msgstr ""
+
+#: templates/settings-personal.php:11
+msgid "The following file types will not be encrypted:"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Exclude the following file types from encryption:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "None"
+msgstr ""
diff --git a/l10n/en@pirate/files_external.po b/l10n/en@pirate/files_external.po
new file mode 100644
index 0000000000000000000000000000000000000000..fefa9ba8f7988c2ddfc7e2a17937fda7f744a83e
--- /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-02 02:14+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..b60b2651147884c077bcfbc712262119ddd1dd3f
--- /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-05-12 02:01+0200\n"
+"PO-Revision-Date: 2013-05-04 04:00+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..9fd846e69515c58f0455c369f80985a2fcf8bef1
--- /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-02 02:14+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..b1e0a380e9596ea60410913506005bf255d80a3d
--- /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-02 02:14+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..73994aee800093b51b4b7d61e9e9fa3b97eca0c3
--- /dev/null
+++ b/l10n/en@pirate/lib.po
@@ -0,0 +1,241 @@
+# 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-02 02:15+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:349
+msgid "Help"
+msgstr ""
+
+#: app.php:362
+msgid "Personal"
+msgstr ""
+
+#: app.php:373
+msgid "Settings"
+msgstr ""
+
+#: app.php:385
+msgid "Users"
+msgstr ""
+
+#: app.php:398
+msgid "Apps"
+msgstr ""
+
+#: app.php:406
+msgid "Admin"
+msgstr ""
+
+#: files.php:209
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: files.php:210
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: files.php:211 files.php:244
+msgid "Back to Files"
+msgstr ""
+
+#: files.php:241
+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:325 setup.php:370
+msgid "PostgreSQL username and/or password not valid"
+msgstr ""
+
+#: setup.php:133 setup.php:156 setup.php:234
+msgid "You need to enter either an existing account or the administrator."
+msgstr ""
+
+#: setup.php:155 setup.php:458 setup.php:525
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:233
+msgid "MySQL username and/or password not valid"
+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:583 setup.php:592 setup.php:600 setup.php:609
+#: setup.php:615
+#, php-format
+msgid "DB Error: \"%s\""
+msgstr ""
+
+#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
+#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
+#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#, php-format
+msgid "Offending command was: \"%s\""
+msgstr ""
+
+#: setup.php:304
+#, php-format
+msgid "MySQL user '%s'@'localhost' exists already."
+msgstr ""
+
+#: setup.php:305
+msgid "Drop this user from MySQL"
+msgstr ""
+
+#: setup.php:310
+#, php-format
+msgid "MySQL user '%s'@'%%' already exists"
+msgstr ""
+
+#: setup.php:311
+msgid "Drop this user from MySQL."
+msgstr ""
+
+#: setup.php:584 setup.php:616
+#, php-format
+msgid "Offending command was: \"%s\", name: %s, password: %s"
+msgstr ""
+
+#: setup.php:636
+#, php-format
+msgid "MS SQL username and/or password not valid: %s"
+msgstr ""
+
+#: setup.php:858
+msgid ""
+"Your web server is not yet properly setup to allow files synchronization "
+"because the WebDAV interface seems to be broken."
+msgstr ""
+
+#: setup.php:859
+#, 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..ef0b0c8304f8f737997c4621d04550f6961d1f44
--- /dev/null
+++ b/l10n/en@pirate/settings.po
@@ -0,0 +1,492 @@
+# 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-02 02:15+0200\n"
+"PO-Revision-Date: 2013-04-26 08:00+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/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:43
+msgid "deleted"
+msgstr ""
+
+#: js/users.js:43
+msgid "undo"
+msgstr ""
+
+#: js/users.js:75
+msgid "Unable to remove user"
+msgstr ""
+
+#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: templates/users.php:103
+msgid "Groups"
+msgstr ""
+
+#: js/users.js:91 templates/users.php:80 templates/users.php:115
+msgid "Group Admin"
+msgstr ""
+
+#: js/users.js:111 templates/users.php:155
+msgid "Delete"
+msgstr ""
+
+#: js/users.js:262
+msgid "add group"
+msgstr ""
+
+#: js/users.js:414
+msgid "A valid username must be provided"
+msgstr ""
+
+#: js/users.js:415 js/users.js:421 js/users.js:436
+msgid "Error creating user"
+msgstr ""
+
+#: js/users.js:420
+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:77
+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:76
+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:75
+msgid "Login Name"
+msgstr ""
+
+#: templates/users.php:30
+msgid "Create"
+msgstr ""
+
+#: templates/users.php:33
+msgid "Default Storage"
+msgstr ""
+
+#: templates/users.php:39 templates/users.php:133
+msgid "Unlimited"
+msgstr ""
+
+#: templates/users.php:57 templates/users.php:148
+msgid "Other"
+msgstr ""
+
+#: templates/users.php:82
+msgid "Storage"
+msgstr ""
+
+#: templates/users.php:93
+msgid "change display name"
+msgstr ""
+
+#: templates/users.php:97
+msgid "set new password"
+msgstr ""
+
+#: templates/users.php:128
+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..9e9a16cb2c425edbaaed74dda0210ace77a3bad2
--- /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-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-17 00:04+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..18917231eb683c2be0b86820c9f2e374b0aa572c
--- /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-02 02:14+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 e53e6244654f75dd03e5890df6f739c8729182c0..3fc75e611031b7ae13a2db98d256a267ec7c6aea 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-02-22 00:06+0100\n"
-"PO-Revision-Date: 2013-02-20 23:20+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10: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"
@@ -20,24 +17,24 @@ msgstr ""
 "Language: eo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:85
+#: ajax/share.php:97
 #, php-format
 msgid "User %s shared a file with you"
 msgstr "La uzanto %s kunhavigis dosieron kun vi"
 
-#: ajax/share.php:87
+#: ajax/share.php:99
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr "La uzanto %s kunhavigis dosierujon kun vi"
 
-#: ajax/share.php:89
+#: ajax/share.php:101
 #, php-format
 msgid ""
 "User %s shared the file \"%s\" with you. It is available for download here: "
 "%s"
 msgstr "La uzanto %s kunhavigis la dosieron â€œ%sâ€ kun vi. Äœi elÅuteblas el tie Ä‰i: %s"
 
-#: ajax/share.php:91
+#: ajax/share.php:104
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -83,79 +80,79 @@ msgstr "Neniu kategorio elektiÄis por forigo."
 msgid "Error removing %s from favorites."
 msgstr "Eraro dum forigo de %s el favoratoj."
 
-#: js/config.php:32
+#: js/config.php:34
 msgid "Sunday"
 msgstr "dimanÄ‰o"
 
-#: js/config.php:32
+#: js/config.php:35
 msgid "Monday"
 msgstr "lundo"
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Tuesday"
 msgstr "mardo"
 
-#: js/config.php:32
+#: js/config.php:37
 msgid "Wednesday"
 msgstr "merkredo"
 
-#: js/config.php:32
+#: js/config.php:38
 msgid "Thursday"
 msgstr "ÄµaÅdo"
 
-#: js/config.php:32
+#: js/config.php:39
 msgid "Friday"
 msgstr "vendredo"
 
-#: js/config.php:32
+#: js/config.php:40
 msgid "Saturday"
 msgstr "sabato"
 
-#: js/config.php:33
+#: js/config.php:45
 msgid "January"
 msgstr "Januaro"
 
-#: js/config.php:33
+#: js/config.php:46
 msgid "February"
 msgstr "Februaro"
 
-#: js/config.php:33
+#: js/config.php:47
 msgid "March"
 msgstr "Marto"
 
-#: js/config.php:33
+#: js/config.php:48
 msgid "April"
 msgstr "Aprilo"
 
-#: js/config.php:33
+#: js/config.php:49
 msgid "May"
 msgstr "Majo"
 
-#: js/config.php:33
+#: js/config.php:50
 msgid "June"
 msgstr "Junio"
 
-#: js/config.php:33
+#: js/config.php:51
 msgid "July"
 msgstr "Julio"
 
-#: js/config.php:33
+#: js/config.php:52
 msgid "August"
 msgstr "AÅgusto"
 
-#: js/config.php:33
+#: js/config.php:53
 msgid "September"
 msgstr "Septembro"
 
-#: js/config.php:33
+#: js/config.php:54
 msgid "October"
 msgstr "Oktobro"
 
-#: js/config.php:33
+#: js/config.php:55
 msgid "November"
 msgstr "Novembro"
 
-#: js/config.php:33
+#: js/config.php:56
 msgid "December"
 msgstr "Decembro"
 
@@ -163,86 +160,88 @@ msgstr "Decembro"
 msgid "Settings"
 msgstr "Agordo"
 
-#: js/js.js:767
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "sekundoj antaÅe"
 
-#: js/js.js:768
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "antaÅ 1 minuto"
 
-#: js/js.js:769
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr "antaÅ {minutes} minutoj"
 
-#: js/js.js:770
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr "antaÅ 1 horo"
 
-#: js/js.js:771
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr "antaÅ {hours} horoj"
 
-#: js/js.js:772
+#: js/js.js:723
 msgid "today"
 msgstr "hodiaÅ"
 
-#: js/js.js:773
+#: js/js.js:724
 msgid "yesterday"
 msgstr "hieraÅ"
 
-#: js/js.js:774
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr "antaÅ {days} tagoj"
 
-#: js/js.js:775
+#: js/js.js:726
 msgid "last month"
 msgstr "lastamonate"
 
-#: js/js.js:776
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr "antaÅ {months} monatoj"
 
-#: js/js.js:777
+#: js/js.js:728
 msgid "months ago"
 msgstr "monatoj antaÅe"
 
-#: js/js.js:778
+#: js/js.js:729
 msgid "last year"
 msgstr "lastajare"
 
-#: js/js.js:779
+#: js/js.js:730
 msgid "years ago"
 msgstr "jaroj antaÅe"
 
-#: js/oc-dialogs.js:126
-msgid "Choose"
-msgstr "Elekti"
+#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
+msgid "Ok"
+msgstr "Akcepti"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
 msgid "Cancel"
 msgstr "Nuligi"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "Ne"
+#: js/oc-dialogs.js:185
+msgid "Choose"
+msgstr "Elekti"
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:215
 msgid "Yes"
 msgstr "Jes"
 
-#: js/oc-dialogs.js:180
-msgid "Ok"
-msgstr "Akcepti"
+#: js/oc-dialogs.js:222
+msgid "No"
+msgstr "Ne"
 
 #: 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 "Ne indikiÄis tipo de la objekto."
 
-#: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:582
-#: js/share.js:594
+#: 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 "Eraro"
 
@@ -254,127 +253,127 @@ msgstr "Ne indikiÄis nomo de la aplikaÄµo."
 msgid "The required file {file} is not installed!"
 msgstr "La necesa dosiero {file} ne instaliÄis!"
 
-#: js/share.js:29 js/share.js:43 js/share.js:90
+#: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr ""
 
-#: js/share.js:93
+#: js/share.js:90
 msgid "Share"
 msgstr "Kunhavigi"
 
-#: js/share.js:141 js/share.js:622
+#: js/share.js:125 js/share.js:617
 msgid "Error while sharing"
 msgstr "Eraro dum kunhavigo"
 
-#: js/share.js:152
+#: js/share.js:136
 msgid "Error while unsharing"
 msgstr "Eraro dum malkunhavigo"
 
-#: js/share.js:159
+#: js/share.js:143
 msgid "Error while changing permissions"
 msgstr "Eraro dum ÅanÄo de permesoj"
 
-#: js/share.js:168
+#: js/share.js:152
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Kunhavigita kun vi kaj la grupo {group} de {owner}"
 
-#: js/share.js:170
+#: js/share.js:154
 msgid "Shared with you by {owner}"
 msgstr "Kunhavigita kun vi de {owner}"
 
-#: js/share.js:175
+#: js/share.js:159
 msgid "Share with"
 msgstr "Kunhavigi kun"
 
-#: js/share.js:180
+#: js/share.js:164
 msgid "Share with link"
 msgstr "Kunhavigi per ligilo"
 
-#: js/share.js:183
+#: js/share.js:167
 msgid "Password protect"
 msgstr "Protekti per pasvorto"
 
-#: js/share.js:185 templates/installation.php:44 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Pasvorto"
 
-#: js/share.js:189
+#: js/share.js:173
 msgid "Email link to person"
 msgstr "RetpoÅti la ligilon al ulo"
 
-#: js/share.js:190
+#: js/share.js:174
 msgid "Send"
 msgstr "Sendi"
 
-#: js/share.js:194
+#: js/share.js:178
 msgid "Set expiration date"
 msgstr "Agordi limdaton"
 
-#: js/share.js:195
+#: js/share.js:179
 msgid "Expiration date"
 msgstr "Limdato"
 
-#: js/share.js:227
+#: js/share.js:211
 msgid "Share via email:"
 msgstr "Kunhavigi per retpoÅto:"
 
-#: js/share.js:229
+#: js/share.js:213
 msgid "No people found"
 msgstr "Ne troviÄis gento"
 
-#: js/share.js:256
+#: js/share.js:251
 msgid "Resharing is not allowed"
 msgstr "Rekunhavigo ne permesatas"
 
-#: js/share.js:292
+#: js/share.js:287
 msgid "Shared in {item} with {user}"
 msgstr "Kunhavigita en {item} kun {user}"
 
-#: js/share.js:313
+#: js/share.js:308
 msgid "Unshare"
 msgstr "Malkunhavigi"
 
-#: js/share.js:325
+#: js/share.js:320
 msgid "can edit"
 msgstr "povas redakti"
 
-#: js/share.js:327
+#: js/share.js:322
 msgid "access control"
 msgstr "alirkontrolo"
 
-#: js/share.js:330
+#: js/share.js:325
 msgid "create"
 msgstr "krei"
 
-#: js/share.js:333
+#: js/share.js:328
 msgid "update"
 msgstr "Äisdatigi"
 
-#: js/share.js:336
+#: js/share.js:331
 msgid "delete"
 msgstr "forigi"
 
-#: js/share.js:339
+#: js/share.js:334
 msgid "share"
 msgstr "kunhavigi"
 
-#: js/share.js:373 js/share.js:569
+#: js/share.js:368 js/share.js:564
 msgid "Password protected"
 msgstr "Protektita per pasvorto"
 
-#: js/share.js:582
+#: js/share.js:577
 msgid "Error unsetting expiration date"
 msgstr "Eraro dum malagordado de limdato"
 
-#: js/share.js:594
+#: js/share.js:589
 msgid "Error setting expiration date"
 msgstr "Eraro dum agordado de limdato"
 
-#: js/share.js:609
+#: js/share.js:604
 msgid "Sending ..."
 msgstr "Sendante..."
 
-#: js/share.js:620
+#: js/share.js:615
 msgid "Email sent"
 msgstr "La retpoÅtaÄµo sendiÄis"
 
@@ -397,24 +396,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:39
-#: 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"
 
@@ -470,115 +472,130 @@ msgstr "Redakti kategoriojn"
 msgid "Add"
 msgstr "Aldoni"
 
-#: templates/installation.php:23 templates/installation.php:30
+#: templates/installation.php:24 templates/installation.php:31
+#: templates/installation.php:38
 msgid "Security Warning"
 msgstr "Sekureca averto"
 
-#: 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 "Ne disponeblas sekura generilo de hazardaj numeroj; bonvolu kapabligi la OpenSSL-kromaÄµon por PHP."
 
-#: templates/installation.php:25
+#: 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:31
+#: 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:32
+#: 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:36
+#: templates/installation.php:44
 msgid "Create an <strong>admin account</strong>"
 msgstr "Krei <strong>administran konton</strong>"
 
-#: templates/installation.php:52
+#: templates/installation.php:62
 msgid "Advanced"
 msgstr "Progresinta"
 
-#: templates/installation.php:54
+#: templates/installation.php:64
 msgid "Data folder"
 msgstr "Datuma dosierujo"
 
-#: templates/installation.php:61
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "Agordi la datumbazon"
 
-#: templates/installation.php:66 templates/installation.php:77
-#: templates/installation.php:87 templates/installation.php:97
+#: 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:109
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "Datumbaza uzanto"
 
-#: templates/installation.php:113
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "Datumbaza pasvorto"
 
-#: templates/installation.php:117
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "Datumbaza nomo"
 
-#: templates/installation.php:125
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "Datumbaza tabelospaco"
 
-#: templates/installation.php:131
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "Datumbaza gastigo"
 
-#: templates/installation.php:136
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "Fini la instalon"
 
-#: templates/layout.guest.php:33
+#: 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:36
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr ""
 
-#: templates/layout.user.php:48
+#: templates/layout.user.php:61
 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 868c5b92b7f1002c77bfe7c26825e5102f67175c..bc5988ea85f1b079ab9612aec0d1461a7b72fa4e 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-03-04 00:06+0100\n"
-"PO-Revision-Date: 2013-03-03 23:06+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10: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"
@@ -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"
@@ -73,59 +66,70 @@ msgstr "Malsukcesis skribo al disko"
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr "Nevalida dosierujo."
 
-#: appinfo/app.php:10
+#: appinfo/app.php:12
 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:92 templates/index.php:93
+#: 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/files.js:292 js/files.js:408
-#: js/files.js:439
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "Traktotaj"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} jam ekzistas"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "anstataÅigi"
 
-#: js/filelist.js:251
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "sugesti nomon"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "nuligi"
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "anstataÅiÄis {new_name} per {old_name}"
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "undo"
 msgstr "malfari"
 
-#: js/filelist.js:323
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr ""
 
+#: js/filelist.js:413
+msgid "1 file uploading"
+msgstr "1 dosiero estas alÅutata"
+
+#: js/filelist.js:416 js/filelist.js:470
+msgid "files uploading"
+msgstr "dosieroj estas alÅutataj"
+
 #: js/files.js:52
 msgid "'.' is an invalid file name."
 msgstr "'.' ne estas valida dosiernomo."
@@ -148,77 +152,77 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:225
+#: 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:262
+#: 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:262
-msgid "Upload Error"
-msgstr "AlÅuta eraro"
+#: js/files.js:277
+msgid "Not enough space available"
+msgstr "Ne haveblas sufiÄ‰a spaco"
 
-#: js/files.js:273
-msgid "Close"
-msgstr "Fermi"
-
-#: js/files.js:312
-msgid "1 file uploading"
-msgstr "1 dosiero estas alÅutata"
-
-#: js/files.js:315 js/files.js:370 js/files.js:385
-msgid "{count} files uploading"
-msgstr "{count} dosieroj alÅutatas"
-
-#: js/files.js:388 js/files.js:423
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "La alÅuto nuliÄis."
 
-#: js/files.js:497
+#: 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:570
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "URL ne povas esti malplena."
 
-#: js/files.js:575
+#: 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:953 templates/index.php:68
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+msgid "Error"
+msgstr "Eraro"
+
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Nomo"
 
-#: js/files.js:954 templates/index.php:79
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Grando"
 
-#: js/files.js:955 templates/index.php:81
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Modifita"
 
-#: js/files.js:974
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 dosierujo"
 
-#: js/files.js:976
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} dosierujoj"
 
-#: js/files.js:984
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 dosiero"
 
-#: js/files.js:986
+#: 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"
@@ -271,45 +275,45 @@ msgstr "Dosierujo"
 msgid "From link"
 msgstr "El ligilo"
 
-#: templates/index.php:40
+#: templates/index.php:42
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:48
 msgid "Cancel upload"
 msgstr "Nuligi alÅuton"
 
-#: templates/index.php:53
+#: templates/index.php:54
 msgid "You donâ€™t have write permissions here."
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Nenio estas Ä‰i tie. AlÅutu ion!"
 
-#: templates/index.php:74
+#: templates/index.php:75
 msgid "Download"
 msgstr "ElÅuti"
 
-#: templates/index.php:86 templates/index.php:87
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Malkunhavigi"
 
-#: templates/index.php:106
+#: templates/index.php:107
 msgid "Upload too large"
-msgstr "ElÅuto tro larÄa"
+msgstr "AlÅuto tro larÄa"
 
-#: templates/index.php:108
+#: 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:113
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Dosieroj estas skanataj, bonvolu atendi."
 
-#: templates/index.php:116
+#: 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..8b1ceb53a9bada6454033a86f8f4da7c75403c70 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/eo/files_external.po b/l10n/eo/files_external.po
index bf222a2f847a0877117b45ec10e1f92e37a2cb84..ef0f0605dd6e5dd1cee921feff94d7b9f79cb456 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-01 00:05+0100\n"
-"PO-Revision-Date: 2013-02-27 23:20+0000\n"
+"POT-Creation-Date: 2013-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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: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 "Malena memorilo"
diff --git a/l10n/eo/files_sharing.po b/l10n/eo/files_sharing.po
index e9778f8450ca1a365ab5657580360f77ebb1934f..4e6e0cbf14b1030775bc4fde420aa4ef7c0ad021 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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 783a5f733f9e15a1ddc70380aacdaaf0fecb4a74..edd0e86b304f102abddab1ac1517cf5772773058 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-03-08 00:25+0100\n"
-"PO-Revision-Date: 2013-03-07 23:25+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -17,12 +17,12 @@ msgstr ""
 "Language: eo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:40
+#: ajax/delete.php:42
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
 
-#: ajax/undelete.php:41
+#: ajax/undelete.php:42
 #, php-format
 msgid "Couldn't restore %s"
 msgstr ""
@@ -31,6 +31,10 @@ msgstr ""
 msgid "perform restore operation"
 msgstr ""
 
+#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+msgid "Error"
+msgstr "Eraro"
+
 #: js/trash.js:34
 msgid "delete file permanently"
 msgstr ""
@@ -77,4 +81,4 @@ msgstr "Forigi"
 
 #: templates/part.breadcrumb.php:9
 msgid "Deleted Files"
-msgstr ""
+msgstr "Forigitaj dosieroj"
diff --git a/l10n/eo/files_versions.po b/l10n/eo/files_versions.po
index 0c1c4992f5d87c74d5f4906ded478421af32d80f..f3fddd59090061d1a4771881f033d9332cc90b23 100644
--- a/l10n/eo/files_versions.po
+++ b/l10n/eo/files_versions.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-28 00:04+0100\n"
-"PO-Revision-Date: 2013-02-27 23:04+0000\n"
+"POT-Creation-Date: 2013-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:30+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"
@@ -21,38 +20,38 @@ msgstr ""
 #: ajax/rollbackVersion.php:15
 #, php-format
 msgid "Could not revert: %s"
-msgstr ""
+msgstr "Ne eblas malfari: %s"
 
 #: history.php:40
 msgid "success"
-msgstr ""
+msgstr "sukceso"
 
 #: history.php:42
 #, php-format
 msgid "File %s was reverted to version %s"
-msgstr ""
+msgstr "Dosiero %s estis malfarita al versio %s"
 
 #: history.php:49
 msgid "failure"
-msgstr ""
+msgstr "malsukceso"
 
 #: history.php:51
 #, php-format
 msgid "File %s could not be reverted to version %s"
-msgstr ""
+msgstr "Ne eblis malfari dosieron %s al versio %s"
 
-#: history.php:68
+#: history.php:69
 msgid "No old versions available"
-msgstr ""
+msgstr "Neniu malnova versio disponeblas"
 
-#: history.php:73
+#: history.php:74
 msgid "No path specified"
-msgstr ""
+msgstr "Neniu vojo estas specifita"
 
 #: js/versions.js:6
 msgid "Versions"
-msgstr ""
+msgstr "Versioj"
 
 #: templates/history.php:20
 msgid "Revert a file to a previous version by clicking on its revert button"
-msgstr ""
+msgstr "Malfari dosieron al antaÅa versio per klako sur sia malfarad-butono"
diff --git a/l10n/eo/lib.po b/l10n/eo/lib.po
index f996e6cedaef96cdc639b5f9245244d8d979a98b..b88a2dd5e2c1b18d4a260e1976b6ae91a352e472 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-02-27 14:35+0100\n"
-"PO-Revision-Date: 2013-02-27 13:35+0000\n"
+"POT-Creation-Date: 2013-04-28 01:57+0200\n"
+"PO-Revision-Date: 2013-04-27 23:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -42,19 +41,19 @@ msgstr "AplikaÄµoj"
 msgid "Admin"
 msgstr "Administranto"
 
-#: files.php:202
+#: files.php:209
 msgid "ZIP download is turned off."
 msgstr "ZIP-elÅuto estas malkapabligita."
 
-#: files.php:203
+#: files.php:210
 msgid "Files need to be downloaded one by one."
 msgstr "Dosieroj devas elÅutiÄi unuope."
 
-#: files.php:204 files.php:231
+#: files.php:211 files.php:244
 msgid "Back to Files"
 msgstr "Reen al la dosieroj"
 
-#: files.php:228
+#: files.php:241
 msgid "Selected files too large to generate zip file."
 msgstr "La elektitaj dosieroj tro grandas por genero de ZIP-dosiero."
 
@@ -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,79 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:128 setup.php:320 setup.php:365
+#: setup.php:132 setup.php:325 setup.php:370
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:129 setup.php:152 setup.php:229
+#: setup.php:133 setup.php:156 setup.php:234
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:151 setup.php:453 setup.php:520
+#: setup.php:155 setup.php:458 setup.php:525
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:228
+#: setup.php:233
 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: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:583 setup.php:592 setup.php:600 setup.php:609
+#: setup.php:615
 #, 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:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
+#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
+#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:299
+#: setup.php:304
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:300
+#: setup.php:305
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:305
+#: setup.php:310
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:306
+#: setup.php:311
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:579 setup.php:611
+#: setup.php:584 setup.php:616
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:631
+#: setup.php:636
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:849
+#: setup.php:858
 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:859
 #, 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 +220,7 @@ msgstr "antaÅ %d tagoj"
 
 #: template.php:121
 msgid "last month"
-msgstr "lasta monato"
+msgstr "lastamonate"
 
 #: template.php:122
 #, php-format
@@ -234,24 +229,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 84327bf8760d4e267f38dc0bd1f61870fee53ab3..5103daa9313d09638bd55d8a9f81257ce991995d 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-02-27 14:35+0100\n"
-"PO-Revision-Date: 2013-02-27 13:35+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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 ""
 
@@ -95,7 +96,7 @@ msgstr ""
 msgid "Disable"
 msgstr "Malkapabligi"
 
-#: js/apps.js:36 js/apps.js:64
+#: js/apps.js:36 js/apps.js:64 js/apps.js:83
 msgid "Enable"
 msgstr "Kapabligi"
 
@@ -103,68 +104,68 @@ msgstr "Kapabligi"
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:84
+#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+msgid "Error"
+msgstr "Eraro"
+
+#: js/apps.js:90
 msgid "Updating...."
 msgstr ""
 
-#: js/apps.js:87
+#: js/apps.js:93
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:87
-msgid "Error"
-msgstr "Eraro"
-
-#: js/apps.js:90
+#: js/apps.js:96
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr "Konservante..."
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "deleted"
 msgstr "forigita"
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "undo"
 msgstr "malfari"
 
-#: js/users.js:62
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:75 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
+#: templates/users.php:103
 msgid "Groups"
 msgstr "Grupoj"
 
-#: js/users.js:78 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr "Grupadministranto"
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "Forigi"
 
-#: js/users.js:191
+#: js/users.js:269
 msgid "add group"
 msgstr ""
 
-#: js/users.js:352
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:353 js/users.js:359 js/users.js:374
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:358
+#: js/users.js:426
 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,21 +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:230 templates/personal.php:102
+#: templates/admin.php:228
+msgid "Less"
+msgstr "Malpli"
+
+#: templates/admin.php:235 templates/personal.php:105
 msgid "Version"
 msgstr "Eldono"
 
-#: templates/admin.php:233 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 "
@@ -394,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:77
 msgid "Password"
 msgstr "Pasvorto"
 
@@ -418,82 +423,70 @@ 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:76
 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 "RetpoÅto"
 
-#: templates/personal.php:72
+#: templates/personal.php:70
 msgid "Your email address"
 msgstr "Via retpoÅta adreso"
 
-#: templates/personal.php:73
+#: templates/personal.php:71
 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:77 templates/personal.php:78
 msgid "Language"
 msgstr "Lingvo"
 
-#: templates/personal.php:86
+#: templates/personal.php:89
 msgid "Help translate"
 msgstr "Helpu traduki"
 
-#: templates/personal.php:91
+#: templates/personal.php:94
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:93
+#: templates/personal.php:96
 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:75
 msgid "Login Name"
 msgstr ""
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr "Krei"
 
-#: templates/users.php:35
+#: templates/users.php:33
 msgid "Default Storage"
 msgstr "DefaÅlta konservejo"
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:39 templates/users.php:133
 msgid "Unlimited"
 msgstr "Senlima"
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:57 templates/users.php:148
 msgid "Other"
 msgstr "Alia"
 
-#: templates/users.php:84
+#: templates/users.php:82
 msgid "Storage"
 msgstr "Konservejo"
 
-#: templates/users.php:95
+#: templates/users.php:93
 msgid "change display name"
 msgstr ""
 
-#: templates/users.php:99
+#: templates/users.php:97
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:134
+#: templates/users.php:128
 msgid "Default"
 msgstr "DefaÅlta"
diff --git a/l10n/eo/user_ldap.po b/l10n/eo/user_ldap.po
index 2c3704125de172ae2f11da543ca1a2c2d21e6419..2a5527f375c60f57254cc959c24cc1c46161ec6a 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-02 00:03+0100\n"
-"PO-Revision-Date: 2013-03-01 23:04+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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:18
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:37
 msgid "Host"
 msgstr "Gastigo"
 
-#: templates/settings.php:25
+#: 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:26
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "Bazo-DN"
 
-#: 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 "Uzanto-DN"
 
-#: 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 "Pasvorto"
 
-#: templates/settings.php:36
+#: 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:37
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "Filtrilo de uzantensaluto"
 
-#: 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 "Äœi difinas la filtrilon aplikotan, kiam oni provas ensaluti. %%uid anstataÅigas la uzantonomon en la ensaluta ago."
 
-#: templates/settings.php:41
+#: 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:42
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Filtrilo de uzantolisto"
 
-#: templates/settings.php:45
+#: 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:46
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "sen ajna referencilo, ekz.: \"objectClass=person\"."
 
-#: templates/settings.php:47
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "Filtrilo de grupo"
 
-#: templates/settings.php:50
+#: 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:51
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "sen ajna referencilo, ekz.: \"objectClass=posixGroup\"."
 
-#: 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 "Pordo"
 
-#: 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 "Uzi TLS-on"
 
-#: 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 "LDAP-servilo blinda je litergrandeco (Vindozo)"
 
-#: templates/settings.php:64
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "Malkapabligi validkontrolon de SSL-atestiloj."
 
-#: 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 "Se la konekto nur funkcias kun Ä‰i tiu malnepro, enportu la SSL-atestilo de la LDAP-servilo en via ownCloud-servilo."
 
-#: templates/settings.php:64
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "Ne rekomendata, uzu Äin nur por testoj."
 
-#: 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 "sekunde. Ajna ÅanÄo malplenigas la kaÅmemoron."
 
-#: 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 "Kampo de vidignomo de uzanto"
 
-#: templates/settings.php:69
+#: 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:70
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "Baza uzantarbo"
 
-#: 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 "Kampo de vidignomo de grupo"
 
-#: templates/settings.php:72
+#: 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:73
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "Baza gruparbo"
 
-#: 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 "Asocio de grupo kaj membro"
 
-#: 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 "duumoke"
 
-#: 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 "Lasu malplena por uzantonomo (defaÅlto). Alie, specifu LDAP/AD-atributon."
 
-#: 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 "Helpo"
diff --git a/l10n/eo/user_webdavauth.po b/l10n/eo/user_webdavauth.po
index d9f66ba5177fb4168c2b8e63e03b5e9160b34d1d..8217ee0e2b9ccb3f2adac4e0784be30425c456a9 100644
--- a/l10n/eo/user_webdavauth.po
+++ b/l10n/eo/user_webdavauth.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-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-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
 "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 4c2b388f90ad4d6942fc88c6615e6cc4247d4a2c..7e587eed777e1defe11907b7fadde8f57d8abe5d 100644
--- a/l10n/es/core.po
+++ b/l10n/es/core.po
@@ -3,27 +3,16 @@
 # 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
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-22 00:06+0100\n"
-"PO-Revision-Date: 2013-02-20 23:20+0000\n"
-"Last-Translator: juanman <juanma@kde.org.ar>\n"
+"POT-Creation-Date: 2013-05-21 02:00+0200\n"
+"PO-Revision-Date: 2013-05-20 23:10+0000\n"
+"Last-Translator: ggam <ggam@brainleakage.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"
@@ -31,33 +20,33 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:85
+#: 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:87
+#: 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:89
+#: 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:91
+#: 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 +55,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
@@ -94,79 +83,79 @@ msgstr "No hay categorÃas seleccionadas para borrar."
 msgid "Error removing %s from favorites."
 msgstr "Error eliminando %s de los favoritos."
 
-#: js/config.php:32
+#: js/config.php:34
 msgid "Sunday"
 msgstr "Domingo"
 
-#: js/config.php:32
+#: js/config.php:35
 msgid "Monday"
 msgstr "Lunes"
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Tuesday"
 msgstr "Martes"
 
-#: js/config.php:32
+#: js/config.php:37
 msgid "Wednesday"
 msgstr "MiÃ©rcoles"
 
-#: js/config.php:32
+#: js/config.php:38
 msgid "Thursday"
 msgstr "Jueves"
 
-#: js/config.php:32
+#: js/config.php:39
 msgid "Friday"
 msgstr "Viernes"
 
-#: js/config.php:32
+#: js/config.php:40
 msgid "Saturday"
 msgstr "SÃ¡bado"
 
-#: js/config.php:33
+#: js/config.php:45
 msgid "January"
 msgstr "Enero"
 
-#: js/config.php:33
+#: js/config.php:46
 msgid "February"
 msgstr "Febrero"
 
-#: js/config.php:33
+#: js/config.php:47
 msgid "March"
 msgstr "Marzo"
 
-#: js/config.php:33
+#: js/config.php:48
 msgid "April"
 msgstr "Abril"
 
-#: js/config.php:33
+#: js/config.php:49
 msgid "May"
 msgstr "Mayo"
 
-#: js/config.php:33
+#: js/config.php:50
 msgid "June"
 msgstr "Junio"
 
-#: js/config.php:33
+#: js/config.php:51
 msgid "July"
 msgstr "Julio"
 
-#: js/config.php:33
+#: js/config.php:52
 msgid "August"
 msgstr "Agosto"
 
-#: js/config.php:33
+#: js/config.php:53
 msgid "September"
 msgstr "Septiembre"
 
-#: js/config.php:33
+#: js/config.php:54
 msgid "October"
 msgstr "Octubre"
 
-#: js/config.php:33
+#: js/config.php:55
 msgid "November"
 msgstr "Noviembre"
 
-#: js/config.php:33
+#: js/config.php:56
 msgid "December"
 msgstr "Diciembre"
 
@@ -174,218 +163,220 @@ msgstr "Diciembre"
 msgid "Settings"
 msgstr "Ajustes"
 
-#: js/js.js:767
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "hace segundos"
 
-#: js/js.js:768
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "hace 1 minuto"
 
-#: js/js.js:769
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr "hace {minutes} minutos"
 
-#: js/js.js:770
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr "Hace 1 hora"
 
-#: js/js.js:771
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr "Hace {hours} horas"
 
-#: js/js.js:772
+#: js/js.js:723
 msgid "today"
 msgstr "hoy"
 
-#: js/js.js:773
+#: js/js.js:724
 msgid "yesterday"
 msgstr "ayer"
 
-#: js/js.js:774
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr "hace {days} dÃas"
 
-#: js/js.js:775
+#: js/js.js:726
 msgid "last month"
-msgstr "mes pasado"
+msgstr "el mes pasado"
 
-#: js/js.js:776
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr "Hace {months} meses"
 
-#: js/js.js:777
+#: js/js.js:728
 msgid "months ago"
 msgstr "hace meses"
 
-#: js/js.js:778
+#: js/js.js:729
 msgid "last year"
-msgstr "aÃ±o pasado"
+msgstr "el aÃ±o pasado"
 
-#: js/js.js:779
+#: js/js.js:730
 msgid "years ago"
 msgstr "hace aÃ±os"
 
-#: js/oc-dialogs.js:126
-msgid "Choose"
-msgstr "Seleccionar"
+#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
+msgid "Ok"
+msgstr "Aceptar"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "No"
+#: js/oc-dialogs.js:185
+msgid "Choose"
+msgstr "Seleccionar"
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:215
 msgid "Yes"
 msgstr "SÃ"
 
-#: js/oc-dialogs.js:180
-msgid "Ok"
-msgstr "Aceptar"
+#: js/oc-dialogs.js:222
+msgid "No"
+msgstr "No"
 
 #: 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:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:582
-#: js/share.js:594
+#: 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 "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:29 js/share.js:43 js/share.js:90
+#: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr "Compartido"
 
-#: js/share.js:93
+#: js/share.js:90
 msgid "Share"
 msgstr "Compartir"
 
-#: js/share.js:141 js/share.js:622
+#: js/share.js:125 js/share.js:617
 msgid "Error while sharing"
 msgstr "Error compartiendo"
 
-#: js/share.js:152
+#: js/share.js:136
 msgid "Error while unsharing"
 msgstr "Error descompartiendo"
 
-#: js/share.js:159
+#: js/share.js:143
 msgid "Error while changing permissions"
 msgstr "Error cambiando permisos"
 
-#: js/share.js:168
+#: js/share.js:152
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Compartido contigo y el grupo {group} por {owner}"
 
-#: js/share.js:170
+#: js/share.js:154
 msgid "Shared with you by {owner}"
 msgstr "Compartido contigo por {owner}"
 
-#: js/share.js:175
+#: js/share.js:159
 msgid "Share with"
 msgstr "Compartir con"
 
-#: js/share.js:180
+#: js/share.js:164
 msgid "Share with link"
 msgstr "Compartir con enlace"
 
-#: js/share.js:183
+#: js/share.js:167
 msgid "Password protect"
 msgstr "Protegido por contraseÃ±a"
 
-#: js/share.js:185 templates/installation.php:44 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "ContraseÃ±a"
 
-#: js/share.js:189
+#: js/share.js:173
 msgid "Email link to person"
 msgstr "Enviar un enlace por correo electrÃ³nico a una persona"
 
-#: js/share.js:190
+#: js/share.js:174
 msgid "Send"
 msgstr "Enviar"
 
-#: js/share.js:194
+#: js/share.js:178
 msgid "Set expiration date"
 msgstr "Establecer fecha de caducidad"
 
-#: js/share.js:195
+#: js/share.js:179
 msgid "Expiration date"
 msgstr "Fecha de caducidad"
 
-#: js/share.js:227
+#: js/share.js:211
 msgid "Share via email:"
-msgstr "compartido via e-mail:"
+msgstr "Compartido por correo electrÃ³nico:"
 
-#: js/share.js:229
+#: js/share.js:213
 msgid "No people found"
 msgstr "No se encontrÃ³ gente"
 
-#: js/share.js:256
+#: js/share.js:251
 msgid "Resharing is not allowed"
 msgstr "No se permite compartir de nuevo"
 
-#: js/share.js:292
+#: js/share.js:287
 msgid "Shared in {item} with {user}"
 msgstr "Compartido en {item} con {user}"
 
-#: js/share.js:313
+#: js/share.js:308
 msgid "Unshare"
-msgstr "No compartir"
+msgstr "Dejar de compartir"
 
-#: js/share.js:325
+#: js/share.js:320
 msgid "can edit"
 msgstr "puede editar"
 
-#: js/share.js:327
+#: js/share.js:322
 msgid "access control"
 msgstr "control de acceso"
 
-#: js/share.js:330
+#: js/share.js:325
 msgid "create"
 msgstr "crear"
 
-#: js/share.js:333
+#: js/share.js:328
 msgid "update"
-msgstr "modificar"
+msgstr "actualizar"
 
-#: js/share.js:336
+#: js/share.js:331
 msgid "delete"
 msgstr "eliminar"
 
-#: js/share.js:339
+#: js/share.js:334
 msgid "share"
 msgstr "compartir"
 
-#: js/share.js:373 js/share.js:569
+#: js/share.js:368 js/share.js:564
 msgid "Password protected"
 msgstr "Protegido por contraseÃ±a"
 
-#: js/share.js:582
+#: js/share.js:577
 msgid "Error unsetting expiration date"
 msgstr "Error al eliminar la fecha de caducidad"
 
-#: js/share.js:594
+#: js/share.js:589
 msgid "Error setting expiration date"
 msgstr "Error estableciendo fecha de caducidad"
 
-#: js/share.js:609
+#: js/share.js:604
 msgid "Sending ..."
 msgstr "Enviando..."
 
-#: js/share.js:620
+#: js/share.js:615
 msgid "Email sent"
 msgstr "Correo electrÃ³nico enviado"
 
@@ -394,7 +385,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."
@@ -402,36 +393,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:39
-#: 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"
@@ -459,7 +453,7 @@ msgstr "Aplicaciones"
 
 #: strings.php:8
 msgid "Admin"
-msgstr "Administrador"
+msgstr "AdministraciÃ³n"
 
 #: strings.php:9
 msgid "Help"
@@ -479,117 +473,132 @@ msgstr "Editar categorÃas"
 
 #: templates/edit_categories_dialog.php:16
 msgid "Add"
-msgstr "AÃ±adir"
+msgstr "Agregar"
 
-#: templates/installation.php:23 templates/installation.php:30
+#: templates/installation.php:24 templates/installation.php:31
+#: templates/installation.php:38
 msgid "Security Warning"
 msgstr "Advertencia de seguridad"
 
-#: templates/installation.php:24
+#: templates/installation.php:25
+msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
+msgstr "La versiÃ³n de PHP es vulnerable al ataque de Byte NULL (CVE-2006-7243)"
+
+#: 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 de manera segura."
+
+#: templates/installation.php:32
 msgid ""
 "No secure random number generator is available, please enable the PHP "
 "OpenSSL extension."
 msgstr "No estÃ¡ disponible un generador de nÃºmeros aleatorios seguro, por favor habilite la extensiÃ³n OpenSSL de PHP."
 
-#: templates/installation.php:25
+#: 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 "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:31
+#: 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:32
+#: 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 "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>."
 
-#: templates/installation.php:36
+#: 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:52
+#: templates/installation.php:62
 msgid "Advanced"
 msgstr "Avanzado"
 
-#: templates/installation.php:54
+#: templates/installation.php:64
 msgid "Data folder"
 msgstr "Directorio de almacenamiento"
 
-#: templates/installation.php:61
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "Configurar la base de datos"
 
-#: templates/installation.php:66 templates/installation.php:77
-#: templates/installation.php:87 templates/installation.php:97
+#: 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:109
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "Usuario de la base de datos"
 
-#: templates/installation.php:113
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "ContraseÃ±a de la base de datos"
 
-#: templates/installation.php:117
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "Nombre de la base de datos"
 
-#: templates/installation.php:125
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "Espacio de tablas de la base de datos"
 
-#: templates/installation.php:131
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "Host de la base de datos"
 
-#: templates/installation.php:136
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "Completar la instalaciÃ³n"
 
-#: templates/layout.guest.php:33
+#: 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:48
+#: templates/layout.user.php:36
+#, 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:61
 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 8de6b03bbbe245c52269e382cdcd35243b359097..eff94d9cc9e49e53ca1285b3fa1d3951f387ca54 100644
--- a/l10n/es/files.po
+++ b/l10n/es/files.po
@@ -3,26 +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.
-#   <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-03-07 00:16+0100\n"
-"PO-Revision-Date: 2013-03-06 15:12+0000\n"
-"Last-Translator: xsergiolpx <sergioballesterossolanas@gmail.com>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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"
@@ -40,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 ""
@@ -61,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"
@@ -73,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"
@@ -83,62 +68,73 @@ msgstr "La escritura en disco ha fallado"
 msgid "Not enough storage available"
 msgstr "No hay suficiente espacio disponible"
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr "Directorio invalido."
 
-#: appinfo/app.php:10
+#: appinfo/app.php:12
 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:92 templates/index.php:93
+#: 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/files.js:292 js/files.js:408
-#: js/files.js:439
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
-msgstr "Pendiente"
+msgstr "Pendientes"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} ya existe"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "reemplazar"
 
-#: js/filelist.js:251
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "sugerir nombre"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "cancelar"
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "reemplazado {new_name} con {old_name}"
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "undo"
 msgstr "deshacer"
 
-#: js/filelist.js:323
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr "Eliminar"
 
+#: js/filelist.js:413
+msgid "1 file uploading"
+msgstr "subiendo 1 archivo"
+
+#: 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."
@@ -152,83 +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:225
+#: 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:262
+#: 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"
-
-#: js/files.js:262
-msgid "Upload Error"
-msgstr "Error al subir el archivo"
-
-#: js/files.js:273
-msgid "Close"
-msgstr "cerrrar"
+msgstr "Imposible subir su archivo, es un directorio o tiene 0 bytes"
 
-#: js/files.js:312
-msgid "1 file uploading"
-msgstr "subiendo 1 archivo"
-
-#: js/files.js:315 js/files.js:370 js/files.js:385
-msgid "{count} files uploading"
-msgstr "Subiendo {count} archivos"
+#: js/files.js:277
+msgid "Not enough space available"
+msgstr "No hay suficiente espacio disponible"
 
-#: js/files.js:388 js/files.js:423
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "Subida cancelada."
 
-#: js/files.js:497
+#: 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:570
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "La URL no puede estar vacÃa."
 
-#: js/files.js:575
+#: 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:520 js/files.js:536 js/files.js:826 js/files.js:864
+msgid "Error"
+msgstr "Error"
 
-#: js/files.js:953 templates/index.php:68
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Nombre"
 
-#: js/files.js:954 templates/index.php:79
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "TamaÃ±o"
 
-#: js/files.js:955 templates/index.php:81
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Modificado"
 
-#: js/files.js:974
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 carpeta"
 
-#: js/files.js:976
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} carpetas"
 
-#: js/files.js:984
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 archivo"
 
-#: js/files.js:986
+#: 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"
@@ -281,48 +277,48 @@ msgstr "Carpeta"
 msgid "From link"
 msgstr "Desde el enlace"
 
-#: templates/index.php:40
+#: templates/index.php:42
 msgid "Deleted files"
 msgstr "Archivos eliminados"
 
-#: templates/index.php:46
+#: templates/index.php:48
 msgid "Cancel upload"
 msgstr "Cancelar subida"
 
-#: templates/index.php:53
+#: templates/index.php:54
 msgid "You donâ€™t have write permissions here."
 msgstr "No tienes permisos para escribir aquÃ."
 
-#: templates/index.php:60
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "AquÃ no hay nada. Â¡Sube algo!"
 
-#: templates/index.php:74
+#: templates/index.php:75
 msgid "Download"
 msgstr "Descargar"
 
-#: templates/index.php:86 templates/index.php:87
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Dejar de compartir"
 
-#: templates/index.php:106
+#: templates/index.php:107
 msgid "Upload too large"
-msgstr "El archivo es demasiado grande"
+msgstr "Subida demasido grande"
 
-#: templates/index.php:108
+#: 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:113
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Se estÃ¡n escaneando los archivos, por favor espere."
 
-#: templates/index.php:116
+#: 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..b2a20b26ea12aa44f4440101eef57f91f5ac2659 100644
--- a/l10n/es/files_encryption.po
+++ b/l10n/es/files_encryption.po
@@ -3,16 +3,12 @@
 # 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.
 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/es/files_external.po b/l10n/es/files_external.po
index ded6d20e910c08893166655cb3cd6cab5682a8d4..3160441fa9f38e0d331f22dd1769cf2192b8c90a 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-01 00:05+0100\n"
-"PO-Revision-Date: 2013-02-28 22:51+0000\n"
-"Last-Translator: Marcos <djoser.horus@gmail.com>\n"
+"POT-Creation-Date: 2013-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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: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 "<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: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 "<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..dde7058914d0bb8c09c7473470c2343fcb16563c 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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 c0b5a2c7ec0347ea12677b547587519969bda8cb..06773f7cd230d916448fe905167bc845008ed0d3 100644
--- a/l10n/es/files_trashbin.po
+++ b/l10n/es/files_trashbin.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# 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-08 00:25+0100\n"
-"PO-Revision-Date: 2013-03-07 23:25+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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"
@@ -18,12 +17,12 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:40
+#: ajax/delete.php:42
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "No se puede eliminar %s permanentemente"
 
-#: ajax/undelete.php:41
+#: ajax/undelete.php:42
 #, php-format
 msgid "Couldn't restore %s"
 msgstr "No se puede restaurar %s"
@@ -32,6 +31,10 @@ msgstr "No se puede restaurar %s"
 msgid "perform restore operation"
 msgstr "Restaurar"
 
+#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+msgid "Error"
+msgstr "Error"
+
 #: js/trash.js:34
 msgid "delete file permanently"
 msgstr "Eliminar archivo permanentemente"
@@ -66,7 +69,7 @@ msgstr "{count} archivos"
 
 #: templates/index.php:9
 msgid "Nothing in here. Your trash bin is empty!"
-msgstr "Nada aqui. La papelera esta vacia!"
+msgstr "No hay nada aquÃ. Â¡Tu papelera esta vacÃa!"
 
 #: templates/index.php:20 templates/index.php:22
 msgid "Restore"
@@ -78,4 +81,4 @@ msgstr "Eliminar"
 
 #: templates/part.breadcrumb.php:9
 msgid "Deleted Files"
-msgstr ""
+msgstr "Archivos Eliminados"
diff --git a/l10n/es/files_versions.po b/l10n/es/files_versions.po
index 214d638d330571a8fba0aa6c23a0829010fb5c00..5fc70f6e2ab7963b09f2fc94c1722b1369235676 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:30+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 ecea8f9dcec9df12893c03f9e78dc9ba325b4b41..cf73637ca6bdcc8e2238712613c33eeaaf538db1 100644
--- a/l10n/es/lib.po
+++ b/l10n/es/lib.po
@@ -3,21 +3,13 @@
 # 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.
 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:50+0000\n"
-"Last-Translator: Marcos <djoser.horus@gmail.com>\n"
+"POT-Creation-Date: 2013-05-12 02:02+0200\n"
+"PO-Revision-Date: 2013-05-04 16:20+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"
@@ -49,19 +41,19 @@ msgstr "Aplicaciones"
 msgid "Admin"
 msgstr "AdministraciÃ³n"
 
-#: files.php:202
+#: files.php:207
 msgid "ZIP download is turned off."
 msgstr "La descarga en ZIP estÃ¡ desactivada."
 
-#: files.php:203
+#: files.php:208
 msgid "Files need to be downloaded one by one."
 msgstr "Los archivos deben ser descargados uno por uno."
 
-#: files.php:204 files.php:231
+#: files.php:209 files.php:242
 msgid "Back to Files"
 msgstr "Volver a Archivos"
 
-#: files.php:228
+#: files.php:239
 msgid "Selected files too large to generate zip file."
 msgstr "Los archivos seleccionados son demasiado grandes para generar el archivo zip."
 
@@ -101,10 +93,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 +113,72 @@ 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:128 setup.php:320 setup.php:365
+#: setup.php:132 setup.php:325 setup.php:370
 msgid "PostgreSQL username and/or password not valid"
 msgstr "Usuario y/o contraseÃ±a de PostgreSQL no vÃ¡lidos"
 
-#: setup.php:129 setup.php:152 setup.php:229
+#: setup.php:133 setup.php:156 setup.php:234
 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:151 setup.php:453 setup.php:520
+#: setup.php:155 setup.php:458 setup.php:525
 msgid "Oracle username and/or password not valid"
 msgstr "Usuario y/o contraseÃ±a de Oracle no vÃ¡lidos"
 
-#: setup.php:228
+#: setup.php:233
 msgid "MySQL username and/or password not valid"
 msgstr "Usuario y/o contraseÃ±a de MySQL no vÃ¡lidos"
 
-#: 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: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:583 setup.php:592 setup.php:600 setup.php:609
+#: setup.php:615
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Error BD: \"%s\""
 
-#: 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:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
+#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
+#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "Comando infractor: \"%s\""
 
-#: setup.php:299
+#: setup.php:304
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "Usuario MySQL '%s'@'localhost' ya existe."
 
-#: setup.php:300
+#: setup.php:305
 msgid "Drop this user from MySQL"
 msgstr "Eliminar este usuario de MySQL"
 
-#: setup.php:305
+#: setup.php:310
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "Usuario MySQL '%s'@'%%' ya existe"
 
-#: setup.php:306
+#: setup.php:311
 msgid "Drop this user from MySQL."
 msgstr "Eliminar este usuario de MySQL."
 
-#: setup.php:579 setup.php:611
+#: setup.php:584 setup.php:616
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Comando infractor: \"%s\", nombre: %s, contraseÃ±a: %s"
 
-#: setup.php:631
+#: setup.php:636
 #, 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:849
+#: setup.php:858
 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:850
+#: setup.php:859
 #, 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 +220,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 +229,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 e4daad3709ac43c0f75d16f6b8d25681313231f8..4c899470e42ed7fef1e506077486dc867be17ba3 100644
--- a/l10n/es/settings.po
+++ b/l10n/es/settings.po
@@ -3,30 +3,15 @@
 # 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>, 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.
+# 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-03-01 00:05+0100\n"
-"PO-Revision-Date: 2013-02-28 22:41+0000\n"
-"Last-Translator: Marcos <djoser.horus@gmail.com>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"Last-Translator: ggam <ggam@brainleakage.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"
@@ -38,14 +23,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"
@@ -57,11 +46,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"
@@ -81,7 +70,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"
@@ -90,16 +79,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}"
@@ -109,76 +98,76 @@ msgstr "Actualizado a {appversion}"
 msgid "Disable"
 msgstr "Desactivar"
 
-#: js/apps.js:36 js/apps.js:64
+#: js/apps.js:36 js/apps.js:64 js/apps.js:83
 msgid "Enable"
 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"
+msgstr "Error"
 
-#: js/apps.js:84
+#: js/apps.js:90
 msgid "Updating...."
 msgstr "Actualizando...."
 
-#: js/apps.js:87
+#: js/apps.js:93
 msgid "Error while updating app"
-msgstr "Error mientras se actualizaba"
-
-#: js/apps.js:87
-msgid "Error"
-msgstr "Error"
+msgstr "Error mientras se actualizaba la aplicaciÃ³n"
 
-#: js/apps.js:90
+#: js/apps.js:96
 msgid "Updated"
 msgstr "Actualizado"
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr "Guardando..."
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "deleted"
 msgstr "borrado"
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "undo"
 msgstr "deshacer"
 
-#: js/users.js:62
+#: 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:75 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
+#: templates/users.php:103
 msgid "Groups"
 msgstr "Grupos"
 
-#: js/users.js:78 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
-msgstr "Grupo admin"
+msgstr "Grupo administrador"
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "Eliminar"
 
-#: js/users.js:191
+#: js/users.js:269
 msgid "add group"
-msgstr "AÃ±adir Grupo"
+msgstr "aÃ±adir Grupo"
 
-#: js/users.js:352
+#: js/users.js:420
 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:353 js/users.js:359 js/users.js:374
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr "Error al crear usuario"
 
-#: js/users.js:358
+#: js/users.js:426
 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"
 
@@ -193,11 +182,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 ""
@@ -218,11 +207,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
@@ -230,7 +219,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"
@@ -244,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 "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"
@@ -258,13 +247,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 con del sistema. Llame al archivo cron.php en la carpeta de owncloud vÃa un sistema conjob 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"
@@ -276,7 +265,7 @@ msgstr "Activar API de ComparticiÃ³n"
 
 #: templates/admin.php:135
 msgid "Allow apps to use the Share API"
-msgstr "Permitir a las aplicaciones a que usen la API de ComparticiÃ³n"
+msgstr "Permitir a las aplicaciones utilizar la API de ComparticiÃ³n"
 
 #: templates/admin.php:142
 msgid "Allow links"
@@ -296,7 +285,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"
@@ -313,31 +302,35 @@ 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 ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
-msgstr "Por favor, conecte esta instancia de ownCloud vÃa HTTPS para activar o desactivar la aplicaciÃ³n SSL"
+msgstr "Por favor, conecte esta instancia de ownCloud vÃa HTTPS para activar o desactivar la aplicaciÃ³n de SSL."
 
 #: 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:230 templates/personal.php:102
+#: templates/admin.php:228
+msgid "Less"
+msgstr "Menos"
+
+#: templates/admin.php:235 templates/personal.php:105
 msgid "Version"
-msgstr "Version"
+msgstr "VersiÃ³n"
 
-#: templates/admin.php:233 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 "
@@ -373,11 +366,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"
@@ -389,26 +382,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:77
 msgid "Password"
 msgstr "ContraseÃ±a"
 
@@ -418,7 +411,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"
@@ -426,88 +419,76 @@ 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:76
 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:68
 msgid "Email"
-msgstr "Correo electrÃ³nico"
+msgstr "E-mail"
 
-#: templates/personal.php:72
+#: templates/personal.php:70
 msgid "Your email address"
-msgstr "Tu direcciÃ³n de correo"
+msgstr "Su direcciÃ³n de correo"
 
-#: templates/personal.php:73
+#: templates/personal.php:71
 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:77 templates/personal.php:78
 msgid "Language"
 msgstr "Idioma"
 
-#: templates/personal.php:86
+#: templates/personal.php:89
 msgid "Help translate"
-msgstr "AyÃºdanos a traducir"
+msgstr "AyÃºdnos a traducir"
 
-#: templates/personal.php:91
+#: templates/personal.php:94
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:93
+#: templates/personal.php:96
 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:75
 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:33
 msgid "Default Storage"
-msgstr "Almacenamiento Predeterminado"
+msgstr "Almacenamiento predeterminado"
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:39 templates/users.php:133
 msgid "Unlimited"
 msgstr "Ilimitado"
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:57 templates/users.php:148
 msgid "Other"
 msgstr "Otro"
 
-#: templates/users.php:84
+#: templates/users.php:82
 msgid "Storage"
-msgstr "Alamacenamiento"
+msgstr "Almacenamiento"
 
-#: templates/users.php:95
+#: templates/users.php:93
 msgid "change display name"
 msgstr "Cambiar nombre a mostrar"
 
-#: templates/users.php:99
+#: templates/users.php:97
 msgid "set new password"
 msgstr "Configurar nueva contraseÃ±a"
 
-#: templates/users.php:134
+#: templates/users.php:128
 msgid "Default"
 msgstr "Predeterminado"
diff --git a/l10n/es/user_ldap.po b/l10n/es/user_ldap.po
index be0e253e524a8cb6b4468f5801adf6f6b553c19f..61e06ea4d97b1b70e0b5d2f18ed1b8eb69c5ed64 100644
--- a/l10n/es/user_ldap.po
+++ b/l10n/es/user_ldap.po
@@ -3,21 +3,15 @@
 # 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
 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 21:20+0000\n"
-"Last-Translator: Raul Fernandez Garcia <raulfg3@gmail.com>\n"
+"POT-Creation-Date: 2013-05-20 02:01+0200\n"
+"PO-Revision-Date: 2013-05-19 23:50+0000\n"
+"Last-Translator: Agustin Ferrario <agustin.ferrario@hotmail.com.ar>\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 +19,10 @@ msgstr ""
 "Language: es\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 "No se pudo borrar la configuraciÃ³n del servidor"
@@ -61,281 +59,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 ""
+
+#: 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."
 
-#: 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\""
 
-#: 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\"."
 
-#: 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\"."
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr "Configuracion de coneccion"
 
-#: 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)"
 
-#: 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."
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr "Puerto para backup (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"
 
-#: 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"
 
-#: 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 "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."
 
-#: 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 ""
+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 ""
+
+#: 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 "ownCloud utiliza nombre de usuarios 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 ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: 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..305a875650d680849ee73030cccb52c39c87a214 100644
--- a/l10n/es/user_webdavauth.po
+++ b/l10n/es/user_webdavauth.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-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-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+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 7a12fa0ee597f7ece6bdc8b03a8a4fa06c284be1..c0ae45f5a37cfca5efeb02b3caab850fe51ae310 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-02-22 00:06+0100\n"
-"PO-Revision-Date: 2013-02-20 23:20+0000\n"
-"Last-Translator: cjtess <claudio.tessone@gmail.com>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10: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,24 +17,24 @@ msgstr ""
 "Language: es_AR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:85
+#: ajax/share.php:97
 #, php-format
 msgid "User %s shared a file with you"
 msgstr "El usurario %s compartiÃ³ un archivo con vos."
 
-#: ajax/share.php:87
+#: ajax/share.php:99
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr "El usurario %s compartiÃ³ una carpeta con vos."
 
-#: ajax/share.php:89
+#: ajax/share.php:101
 #, php-format
 msgid ""
 "User %s shared the file \"%s\" with you. It is available for download here: "
 "%s"
 msgstr "El usuario %s compartiÃ³ el archivo \"%s\" con vos. EstÃ¡ disponible para su descarga aquÃ: %s"
 
-#: ajax/share.php:91
+#: ajax/share.php:104
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -76,173 +73,175 @@ 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
 msgid "Error removing %s from favorites."
 msgstr "Error al remover %s de favoritos. "
 
-#: js/config.php:32
+#: js/config.php:34
 msgid "Sunday"
 msgstr "Domingo"
 
-#: js/config.php:32
+#: js/config.php:35
 msgid "Monday"
 msgstr "Lunes"
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Tuesday"
 msgstr "Martes"
 
-#: js/config.php:32
+#: js/config.php:37
 msgid "Wednesday"
 msgstr "MiÃ©rcoles"
 
-#: js/config.php:32
+#: js/config.php:38
 msgid "Thursday"
 msgstr "Jueves"
 
-#: js/config.php:32
+#: js/config.php:39
 msgid "Friday"
 msgstr "Viernes"
 
-#: js/config.php:32
+#: js/config.php:40
 msgid "Saturday"
 msgstr "SÃ¡bado"
 
-#: js/config.php:33
+#: js/config.php:45
 msgid "January"
-msgstr "Enero"
+msgstr "enero"
 
-#: js/config.php:33
+#: js/config.php:46
 msgid "February"
-msgstr "Febrero"
+msgstr "febrero"
 
-#: js/config.php:33
+#: js/config.php:47
 msgid "March"
-msgstr "Marzo"
+msgstr "marzo"
 
-#: js/config.php:33
+#: js/config.php:48
 msgid "April"
-msgstr "Abril"
+msgstr "abril"
 
-#: js/config.php:33
+#: js/config.php:49
 msgid "May"
-msgstr "Mayo"
+msgstr "mayo"
 
-#: js/config.php:33
+#: js/config.php:50
 msgid "June"
-msgstr "Junio"
+msgstr "junio"
 
-#: js/config.php:33
+#: js/config.php:51
 msgid "July"
-msgstr "Julio"
+msgstr "julio"
 
-#: js/config.php:33
+#: js/config.php:52
 msgid "August"
-msgstr "Agosto"
+msgstr "agosto"
 
-#: js/config.php:33
+#: js/config.php:53
 msgid "September"
-msgstr "Septiembre"
+msgstr "septiembre"
 
-#: js/config.php:33
+#: js/config.php:54
 msgid "October"
-msgstr "Octubre"
+msgstr "octubre"
 
-#: js/config.php:33
+#: js/config.php:55
 msgid "November"
-msgstr "Noviembre"
+msgstr "noviembre"
 
-#: js/config.php:33
+#: js/config.php:56
 msgid "December"
-msgstr "Diciembre"
+msgstr "diciembre"
 
 #: js/js.js:286
 msgid "Settings"
-msgstr "Ajustes"
+msgstr "ConfiguraciÃ³n"
 
-#: js/js.js:767
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "segundos atrÃ¡s"
 
-#: js/js.js:768
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "hace 1 minuto"
 
-#: js/js.js:769
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr "hace {minutes} minutos"
 
-#: js/js.js:770
+#: js/js.js:721
 msgid "1 hour ago"
-msgstr "Hace 1 hora"
+msgstr "1 hora atrÃ¡s"
 
-#: js/js.js:771
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr "{hours} horas atrÃ¡s"
 
-#: js/js.js:772
+#: js/js.js:723
 msgid "today"
 msgstr "hoy"
 
-#: js/js.js:773
+#: js/js.js:724
 msgid "yesterday"
 msgstr "ayer"
 
-#: js/js.js:774
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr "hace {days} dÃas"
 
-#: js/js.js:775
+#: js/js.js:726
 msgid "last month"
 msgstr "el mes pasado"
 
-#: js/js.js:776
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr "{months} meses atrÃ¡s"
 
-#: js/js.js:777
+#: js/js.js:728
 msgid "months ago"
 msgstr "meses atrÃ¡s"
 
-#: js/js.js:778
+#: js/js.js:729
 msgid "last year"
 msgstr "el aÃ±o pasado"
 
-#: js/js.js:779
+#: js/js.js:730
 msgid "years ago"
 msgstr "aÃ±os atrÃ¡s"
 
-#: js/oc-dialogs.js:126
-msgid "Choose"
-msgstr "Elegir"
+#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
+msgid "Ok"
+msgstr "Aceptar"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "No"
+#: js/oc-dialogs.js:185
+msgid "Choose"
+msgstr "Elegir"
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:215
 msgid "Yes"
 msgstr "SÃ"
 
-#: js/oc-dialogs.js:180
-msgid "Ok"
-msgstr "Aceptar"
+#: js/oc-dialogs.js:222
+msgid "No"
+msgstr "No"
 
 #: 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 esta especificado. "
 
-#: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:582
-#: js/share.js:594
+#: 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 "Error"
 
@@ -254,127 +253,127 @@ msgstr "El nombre de la aplicaciÃ³n no esta especificado."
 msgid "The required file {file} is not installed!"
 msgstr "Â¡El archivo requerido {file} no estÃ¡ instalado!"
 
-#: js/share.js:29 js/share.js:43 js/share.js:90
+#: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr "Compartido"
 
-#: js/share.js:93
+#: js/share.js:90
 msgid "Share"
 msgstr "Compartir"
 
-#: js/share.js:141 js/share.js:622
+#: js/share.js:125 js/share.js:617
 msgid "Error while sharing"
 msgstr "Error al compartir"
 
-#: js/share.js:152
+#: js/share.js:136
 msgid "Error while unsharing"
 msgstr "Error en el procedimiento de "
 
-#: js/share.js:159
+#: js/share.js:143
 msgid "Error while changing permissions"
 msgstr "Error al cambiar permisos"
 
-#: js/share.js:168
+#: js/share.js:152
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Compartido con vos y el grupo {group} por {owner}"
 
-#: js/share.js:170
+#: js/share.js:154
 msgid "Shared with you by {owner}"
 msgstr "Compartido con vos por {owner}"
 
-#: js/share.js:175
+#: js/share.js:159
 msgid "Share with"
 msgstr "Compartir con"
 
-#: js/share.js:180
+#: js/share.js:164
 msgid "Share with link"
 msgstr "Compartir con link"
 
-#: js/share.js:183
+#: js/share.js:167
 msgid "Password protect"
 msgstr "Proteger con contraseÃ±a "
 
-#: js/share.js:185 templates/installation.php:44 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "ContraseÃ±a"
 
-#: js/share.js:189
+#: js/share.js:173
 msgid "Email link to person"
 msgstr "Enviar el link por e-mail."
 
-#: js/share.js:190
+#: js/share.js:174
 msgid "Send"
 msgstr "Enviar"
 
-#: js/share.js:194
+#: js/share.js:178
 msgid "Set expiration date"
 msgstr "Asignar fecha de vencimiento"
 
-#: js/share.js:195
+#: js/share.js:179
 msgid "Expiration date"
 msgstr "Fecha de vencimiento"
 
-#: js/share.js:227
+#: js/share.js:211
 msgid "Share via email:"
 msgstr "compartido a travÃ©s de e-mail:"
 
-#: js/share.js:229
+#: js/share.js:213
 msgid "No people found"
 msgstr "No se encontraron usuarios"
 
-#: js/share.js:256
+#: js/share.js:251
 msgid "Resharing is not allowed"
 msgstr "No se permite volver a compartir"
 
-#: js/share.js:292
+#: js/share.js:287
 msgid "Shared in {item} with {user}"
 msgstr "Compartido en {item} con {user}"
 
-#: js/share.js:313
+#: js/share.js:308
 msgid "Unshare"
-msgstr "Remover compartir"
+msgstr "Dejar de compartir"
 
-#: js/share.js:325
+#: js/share.js:320
 msgid "can edit"
 msgstr "puede editar"
 
-#: js/share.js:327
+#: js/share.js:322
 msgid "access control"
 msgstr "control de acceso"
 
-#: js/share.js:330
+#: js/share.js:325
 msgid "create"
 msgstr "crear"
 
-#: js/share.js:333
+#: js/share.js:328
 msgid "update"
 msgstr "actualizar"
 
-#: js/share.js:336
+#: js/share.js:331
 msgid "delete"
 msgstr "borrar"
 
-#: js/share.js:339
+#: js/share.js:334
 msgid "share"
 msgstr "compartir"
 
-#: js/share.js:373 js/share.js:569
+#: js/share.js:368 js/share.js:564
 msgid "Password protected"
 msgstr "Protegido por contraseÃ±a"
 
-#: js/share.js:582
+#: js/share.js:577
 msgid "Error unsetting expiration date"
 msgstr "Error al remover la fecha de caducidad"
 
-#: js/share.js:594
+#: js/share.js:589
 msgid "Error setting expiration date"
 msgstr "Error al asignar fecha de vencimiento"
 
-#: js/share.js:609
+#: js/share.js:604
 msgid "Sending ..."
 msgstr "Enviando..."
 
-#: js/share.js:620
+#: js/share.js:615
 msgid "Email sent"
 msgstr "Email enviado"
 
@@ -397,24 +396,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:39
-#: 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"
 
@@ -428,7 +430,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"
@@ -448,7 +450,7 @@ msgstr "Aplicaciones"
 
 #: strings.php:8
 msgid "Admin"
-msgstr "Administrador"
+msgstr "AdministraciÃ³n"
 
 #: strings.php:9
 msgid "Help"
@@ -470,115 +472,130 @@ msgstr "Editar categorÃas"
 msgid "Add"
 msgstr "Agregar"
 
-#: templates/installation.php:23 templates/installation.php:30
+#: templates/installation.php:24 templates/installation.php:31
+#: templates/installation.php:38
 msgid "Security Warning"
 msgstr "Advertencia de seguridad"
 
-#: templates/installation.php:24
+#: templates/installation.php:25
+msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
+msgstr "La versiÃ³n de PHP que tenÃ©s, 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 "ActualizÃ¡ tu instalaciÃ³n de PHP para usar ownCloud de manera segura."
+
+#: templates/installation.php:32
 msgid ""
 "No secure random number generator is available, please enable the PHP "
 "OpenSSL extension."
 msgstr "No hay disponible ningÃºn generador de nÃºmeros aleatorios seguro. Por favor habilitÃ¡ la extensiÃ³n OpenSSL de PHP."
 
-#: templates/installation.php:25
+#: 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 "Sin un generador de nÃºmeros aleatorios seguro un atacante podrÃa predecir los tokens de reinicio de tu contraseÃ±a y tomar control de tu cuenta."
 
-#: templates/installation.php:31
+#: templates/installation.php:39
 msgid ""
 "Your data directory and files are probably accessible from the internet "
 "because the .htaccess file does not work."
 msgstr "Tu directorio de datos y tus archivos probablemente son accesibles a travÃ©s de internet, ya que el archivo .htaccess no estÃ¡ funcionando."
 
-#: templates/installation.php:32
+#: 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 "Para informaciÃ³n sobre cÃ³mo configurar adecuadamente tu servidor, por favor mirÃ¡ la <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentaciÃ³n</a>."
 
-#: templates/installation.php:36
+#: templates/installation.php:44
 msgid "Create an <strong>admin account</strong>"
 msgstr "Crear una <strong>cuenta de administrador</strong>"
 
-#: templates/installation.php:52
+#: templates/installation.php:62
 msgid "Advanced"
 msgstr "Avanzado"
 
-#: templates/installation.php:54
+#: templates/installation.php:64
 msgid "Data folder"
 msgstr "Directorio de almacenamiento"
 
-#: templates/installation.php:61
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "Configurar la base de datos"
 
-#: templates/installation.php:66 templates/installation.php:77
-#: templates/installation.php:87 templates/installation.php:97
+#: 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:109
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "Usuario de la base de datos"
 
-#: templates/installation.php:113
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "ContraseÃ±a de la base de datos"
 
-#: templates/installation.php:117
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "Nombre de la base de datos"
 
-#: templates/installation.php:125
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "Espacio de tablas de la base de datos"
 
-#: templates/installation.php:131
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "Host de la base de datos"
 
-#: templates/installation.php:136
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "Completar la instalaciÃ³n"
 
-#: templates/layout.guest.php:33
+#: 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:36
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr ""
 
-#: templates/layout.user.php:48
+#: templates/layout.user.php:61
 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 4e357c00924a9f5e28625678a76c384104e7c2b9..f89b59caadb07726e91a724c394ce417dc2b5d0f 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-03-04 00:06+0100\n"
-"PO-Revision-Date: 2013-03-03 23:06+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-20 02:01+0200\n"
+"PO-Revision-Date: 2013-05-19 23:40+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"
@@ -74,59 +67,70 @@ msgstr "Error al escribir en el disco"
 msgid "Not enough storage available"
 msgstr "No hay suficiente capacidad de almacenamiento"
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr "Directorio invalido."
 
-#: appinfo/app.php:10
+#: appinfo/app.php:12
 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:92 templates/index.php:93
+#: 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/files.js:292 js/files.js:408
-#: js/files.js:439
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
-msgstr "Pendiente"
+msgstr "Pendientes"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} ya existe"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "reemplazar"
 
-#: js/filelist.js:251
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "sugerir nombre"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "cancelar"
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "reemplazado {new_name} con {old_name}"
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "undo"
 msgstr "deshacer"
 
-#: js/filelist.js:323
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr "Eliminar"
 
+#: js/filelist.js:413
+msgid "1 file uploading"
+msgstr "Subiendo 1 archivo"
+
+#: 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."
@@ -149,77 +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:225
+#: 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:262
+#: 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:262
-msgid "Upload Error"
-msgstr "Error al subir el archivo"
+#: js/files.js:277
+msgid "Not enough space available"
+msgstr "No hay suficiente espacio disponible"
 
-#: js/files.js:273
-msgid "Close"
-msgstr "Cerrar"
-
-#: js/files.js:312
-msgid "1 file uploading"
-msgstr "Subiendo 1 archivo"
-
-#: js/files.js:315 js/files.js:370 js/files.js:385
-msgid "{count} files uploading"
-msgstr "Subiendo {count} archivos"
-
-#: js/files.js:388 js/files.js:423
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "La subida fue cancelada"
 
-#: js/files.js:497
+#: 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:570
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "La URL no puede estar vacÃa"
 
-#: js/files.js:575
+#: 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:953 templates/index.php:68
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+msgid "Error"
+msgstr "Error"
+
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Nombre"
 
-#: js/files.js:954 templates/index.php:79
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "TamaÃ±o"
 
-#: js/files.js:955 templates/index.php:81
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Modificado"
 
-#: js/files.js:974
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 directorio"
 
-#: js/files.js:976
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} directorios"
 
-#: js/files.js:984
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 archivo"
 
-#: js/files.js:986
+#: 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"
@@ -272,45 +276,45 @@ msgstr "Carpeta"
 msgid "From link"
 msgstr "Desde enlace"
 
-#: templates/index.php:40
+#: templates/index.php:42
 msgid "Deleted files"
 msgstr "Archivos Borrados"
 
-#: templates/index.php:46
+#: templates/index.php:48
 msgid "Cancel upload"
 msgstr "Cancelar subida"
 
-#: templates/index.php:53
+#: templates/index.php:54
 msgid "You donâ€™t have write permissions here."
-msgstr ""
+msgstr "No tenÃ©s permisos de escritura acÃ¡."
 
-#: templates/index.php:60
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "No hay nada. Â¡SubÃ contenido!"
 
-#: templates/index.php:74
+#: templates/index.php:75
 msgid "Download"
 msgstr "Descargar"
 
-#: templates/index.php:86 templates/index.php:87
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Dejar de compartir"
 
-#: templates/index.php:106
+#: 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:108
+#: 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:113
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Se estÃ¡n escaneando los archivos, por favor esperÃ¡."
 
-#: templates/index.php:116
+#: 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..08c82d2bc8cc80468c514fd549526ed99214bcaa 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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"
diff --git a/l10n/es_AR/files_external.po b/l10n/es_AR/files_external.po
index b7bbefe15e6671d8dd5315ec0ff64dac48144088..f2b512a503ca61491922ac3e883f55561899c317 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-01 00:05+0100\n"
-"PO-Revision-Date: 2013-02-28 01:50+0000\n"
-"Last-Translator: juliabis <juliassantos5@gmail.com>\n"
+"POT-Creation-Date: 2013-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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: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 "<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: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 "<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..75310dddcc31bf98f0e4cc00c21b6a06b754ca34 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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 ad68177e2e7379626ab56160fffc6af17b5c2418..6677f0c6240071b8436f9a43492d07614b8f1407 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-03-08 00:25+0100\n"
-"PO-Revision-Date: 2013-03-07 23:25+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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"
@@ -18,12 +17,12 @@ msgstr ""
 "Language: es_AR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:40
+#: ajax/delete.php:42
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "No fue posible borrar %s de manera permanente"
 
-#: ajax/undelete.php:41
+#: ajax/undelete.php:42
 #, php-format
 msgid "Couldn't restore %s"
 msgstr "No se pudo restaurar %s"
@@ -32,6 +31,10 @@ msgstr "No se pudo restaurar %s"
 msgid "perform restore operation"
 msgstr "Restaurar"
 
+#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+msgid "Error"
+msgstr "Error"
+
 #: js/trash.js:34
 msgid "delete file permanently"
 msgstr "Borrar archivo de manera permanente"
@@ -78,4 +81,4 @@ msgstr "Borrar"
 
 #: templates/part.breadcrumb.php:9
 msgid "Deleted Files"
-msgstr ""
+msgstr "Archivos eliminados"
diff --git a/l10n/es_AR/files_versions.po b/l10n/es_AR/files_versions.po
index db63d14a041af12ef8ad5ad95450d340e97880bd..623368fabec30428a735ba4170a664a760a4e5fb 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:30+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 0c99dc48fd1161fdce517b029c2ed48f08c65595..d22bcbdee2f8a81edb92ab51081a533fad098ba8 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-02-28 00:04+0100\n"
-"PO-Revision-Date: 2013-02-27 14:22+0000\n"
-"Last-Translator: cjtess <claudio.tessone@gmail.com>\n"
+"POT-Creation-Date: 2013-04-28 01:57+0200\n"
+"PO-Revision-Date: 2013-04-27 23:57+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"
@@ -31,7 +27,7 @@ msgstr "Personal"
 
 #: app.php:373
 msgid "Settings"
-msgstr "Ajustes"
+msgstr "ConfiguraciÃ³n"
 
 #: app.php:385
 msgid "Users"
@@ -45,19 +41,19 @@ msgstr "Aplicaciones"
 msgid "Admin"
 msgstr "AdministraciÃ³n"
 
-#: files.php:202
+#: files.php:209
 msgid "ZIP download is turned off."
 msgstr "La descarga en ZIP estÃ¡ desactivada."
 
-#: files.php:203
+#: files.php:210
 msgid "Files need to be downloaded one by one."
 msgstr "Los archivos deben ser descargados de a uno."
 
-#: files.php:204 files.php:231
+#: files.php:211 files.php:244
 msgid "Back to Files"
 msgstr "Volver a archivos"
 
-#: files.php:228
+#: files.php:241
 msgid "Selected files too large to generate zip file."
 msgstr "Los archivos seleccionados son demasiado grandes para generar el archivo zip."
 
@@ -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,79 @@ 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:128 setup.php:320 setup.php:365
+#: setup.php:132 setup.php:325 setup.php:370
 msgid "PostgreSQL username and/or password not valid"
 msgstr "Nombre de usuario o contraseÃ±a de PostgradeSQL no vÃ¡lido."
 
-#: setup.php:129 setup.php:152 setup.php:229
+#: setup.php:133 setup.php:156 setup.php:234
 msgid "You need to enter either an existing account or the administrator."
 msgstr "Debe ingresar una cuenta existente o el administrador"
 
-#: setup.php:151 setup.php:453 setup.php:520
+#: setup.php:155 setup.php:458 setup.php:525
 msgid "Oracle username and/or password not valid"
 msgstr "El nombre de usuario y contraseÃ±a no son vÃ¡lidos"
 
-#: setup.php:228
+#: setup.php:233
 msgid "MySQL username and/or password not valid"
 msgstr "Usuario y/o contraseÃ±a MySQL no vÃ¡lido"
 
-#: 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: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:583 setup.php:592 setup.php:600 setup.php:609
+#: setup.php:615
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Error DB: \"%s\""
 
-#: 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:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
+#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
+#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "El comando no comprendido es: \"%s\""
 
-#: setup.php:299
+#: setup.php:304
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "Usuario MySQL '%s'@'localhost' ya existente"
 
-#: setup.php:300
+#: setup.php:305
 msgid "Drop this user from MySQL"
 msgstr "Borrar este usuario de MySQL"
 
-#: setup.php:305
+#: setup.php:310
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "Usuario MySQL '%s'@'%%' ya existente"
 
-#: setup.php:306
+#: setup.php:311
 msgid "Drop this user from MySQL."
 msgstr "Borrar este usuario de MySQL"
 
-#: setup.php:579 setup.php:611
+#: setup.php:584 setup.php:616
 #, 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:631
+#: setup.php:636
 #, 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:849
+#: setup.php:858
 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:850
+#: setup.php:859
 #, 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 +220,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 +229,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 3bef9b9d41e15dd12ee1299e584b46a45767c8fb..fdf454a85e1fec19470f50deeab39276b5f16e67 100644
--- a/l10n/es_AR/settings.po
+++ b/l10n/es_AR/settings.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.
-# 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-02-28 00:04+0100\n"
-"PO-Revision-Date: 2013-02-27 14:22+0000\n"
-"Last-Translator: cjtess <claudio.tessone@gmail.com>\n"
+"POT-Creation-Date: 2013-05-20 02:05+0200\n"
+"PO-Revision-Date: 2013-05-19 23:30+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"
@@ -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"
@@ -96,7 +97,7 @@ msgstr "Actualizado a {appversion}"
 msgid "Disable"
 msgstr "Desactivar"
 
-#: js/apps.js:36 js/apps.js:64
+#: js/apps.js:36 js/apps.js:64 js/apps.js:83
 msgid "Enable"
 msgstr "Activar"
 
@@ -104,68 +105,68 @@ msgstr "Activar"
 msgid "Please wait...."
 msgstr "Por favor, esperÃ¡...."
 
-#: js/apps.js:84
+#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+msgid "Error"
+msgstr "Error"
+
+#: js/apps.js:90
 msgid "Updating...."
 msgstr "Actualizando...."
 
-#: js/apps.js:87
+#: js/apps.js:93
 msgid "Error while updating app"
 msgstr "Error al actualizar"
 
-#: js/apps.js:87
-msgid "Error"
-msgstr "Error"
-
-#: js/apps.js:90
+#: js/apps.js:96
 msgid "Updated"
 msgstr "Actualizado"
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr "Guardando..."
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "deleted"
 msgstr "borrado"
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "undo"
 msgstr "deshacer"
 
-#: js/users.js:62
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr "Imposible remover usuario"
 
-#: js/users.js:75 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
+#: templates/users.php:103
 msgid "Groups"
 msgstr "Grupos"
 
-#: js/users.js:78 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr "Grupo Administrador"
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "Borrar"
 
-#: js/users.js:191
+#: js/users.js:269
 msgid "add group"
 msgstr "Agregar grupo"
 
-#: js/users.js:352
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr "Debe ingresar un nombre de usuario vÃ¡lido"
 
-#: js/users.js:353 js/users.js:359 js/users.js:374
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr "Error creando usuario"
 
-#: js/users.js:358
+#: js/users.js:426
 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,15 +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:230 templates/personal.php:102
+#: templates/admin.php:228
+msgid "Less"
+msgstr "Menos"
+
+#: templates/admin.php:235 templates/personal.php:105
 msgid "Version"
 msgstr "VersiÃ³n"
 
-#: templates/admin.php:233 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 +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:77
 msgid "Password"
 msgstr "ContraseÃ±a"
 
@@ -419,82 +424,70 @@ 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:76
 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:68
 msgid "Email"
-msgstr "Correo electrÃ³nico"
+msgstr "Correo ElectrÃ³nico"
 
-#: templates/personal.php:72
+#: templates/personal.php:70
 msgid "Your email address"
 msgstr "Tu direcciÃ³n de e-mail"
 
-#: templates/personal.php:73
+#: templates/personal.php:71
 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:77 templates/personal.php:78
 msgid "Language"
 msgstr "Idioma"
 
-#: templates/personal.php:86
+#: templates/personal.php:89
 msgid "Help translate"
 msgstr "Ayudanos a traducir"
 
-#: templates/personal.php:91
+#: templates/personal.php:94
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:93
+#: templates/personal.php:96
 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:75
 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:33
 msgid "Default Storage"
 msgstr "Almacenamiento Predeterminado"
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:39 templates/users.php:133
 msgid "Unlimited"
 msgstr "Ilimitado"
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:57 templates/users.php:148
 msgid "Other"
-msgstr "Otro"
+msgstr "Otros"
 
-#: templates/users.php:84
+#: templates/users.php:82
 msgid "Storage"
 msgstr "Almacenamiento"
 
-#: templates/users.php:95
+#: templates/users.php:93
 msgid "change display name"
 msgstr "Cambiar el nombre que se muestra"
 
-#: templates/users.php:99
+#: templates/users.php:97
 msgid "set new password"
 msgstr "Configurar nueva contraseÃ±a"
 
-#: templates/users.php:134
+#: templates/users.php:128
 msgid "Default"
 msgstr "Predeterminado"
diff --git a/l10n/es_AR/user_ldap.po b/l10n/es_AR/user_ldap.po
index 6f51b5e95094fb9e4ead7ce11da6fb281efcaf9f..9912a5ca2b42777ac7e642e188a79beb5194090a 100644
--- a/l10n/es_AR/user_ldap.po
+++ b/l10n/es_AR/user_ldap.po
@@ -3,15 +3,12 @@
 # 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-02 00:03+0100\n"
-"PO-Revision-Date: 2013-03-01 23:04+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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"
@@ -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:18
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr "AÃ±adir ConfiguraciÃ³n del Servidor"
 
-#: templates/settings.php:23
+#: templates/settings.php:37
 msgid "Host"
 msgstr "Servidor"
 
-#: templates/settings.php:25
+#: 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:26
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "DN base"
 
-#: templates/settings.php:27
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr "Una DN base por lÃnea"
 
-#: templates/settings.php:28
+#: 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:30
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "DN usuario"
 
-#: 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 "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:33
+#: templates/settings.php:47
 msgid "Password"
 msgstr "ContraseÃ±a"
 
-#: templates/settings.php:36
+#: 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:37
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "Filtro de inicio de sesiÃ³n de usuario"
 
-#: 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 "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:41
+#: 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:42
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Lista de filtros de usuario"
 
-#: templates/settings.php:45
+#: 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:46
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "Sin plantilla, p. ej.: \"objectClass=person\"."
 
-#: templates/settings.php:47
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "Filtro de grupo"
 
-#: templates/settings.php:50
+#: 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:51
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "Sin ninguna plantilla, p. ej.: \"objectClass=posixGroup\"."
 
-#: templates/settings.php:55
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr "ConfiguraciÃ³n de ConecciÃ³n"
 
-#: templates/settings.php:57
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr "ConfiguraciÃ³n activa"
 
-#: templates/settings.php:57
+#: 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:58
+#: templates/settings.php:72
 msgid "Port"
 msgstr "Puerto"
 
-#: templates/settings.php:59
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr "Host para copia de seguridad (rÃ©plica)"
 
-#: 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 "Dar un servidor de copia de seguridad opcional. Debe ser una rÃ©plica del servidor principal LDAP/AD."
 
-#: templates/settings.php:60
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr "Puerto para copia de seguridad (rÃ©plica)"
 
-#: templates/settings.php:61
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr "Deshabilitar el Servidor Principal"
 
-#: templates/settings.php:61
+#: 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:62
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "Usar TLS"
 
-#: templates/settings.php:62
+#: 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:63
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Servidor de LDAP sensible a mayÃºsculas/minÃºsculas (Windows)"
 
-#: templates/settings.php:64
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "Desactivar la validaciÃ³n por certificado SSL."
 
-#: 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 "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:64
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "No recomendado, sÃ³lo para pruebas."
 
-#: templates/settings.php:65
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
-msgstr ""
+msgstr "Tiempo de vida del cachÃ©"
 
-#: templates/settings.php:65
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr "en segundos. Cambiarlo vacÃa la cache."
 
-#: templates/settings.php:67
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr "ConfiguraciÃ³n de Directorio"
 
-#: templates/settings.php:69
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr "Campo de nombre de usuario a mostrar"
 
-#: templates/settings.php:69
+#: 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:70
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "Ãrbol base de usuario"
 
-#: templates/settings.php:70
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr "Una DN base de usuario por lÃnea"
 
-#: templates/settings.php:71
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr "Atributos de la bÃºsqueda de usuario"
 
-#: templates/settings.php:71 templates/settings.php:74
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr "Opcional; un atributo por linea"
 
-#: templates/settings.php:72
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr "Campo de nombre de grupo a mostrar"
 
-#: templates/settings.php:72
+#: 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:73
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "Ãrbol base de grupo"
 
-#: templates/settings.php:73
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr "Una DN base de grupo por lÃnea"
 
-#: templates/settings.php:74
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr "Atributos de bÃºsqueda de grupo"
 
-#: templates/settings.php:75
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr "AsociaciÃ³n Grupo-Miembro"
 
-#: templates/settings.php:77
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr "Atributos Especiales"
 
-#: templates/settings.php:79
+#: templates/settings.php:93
 msgid "Quota Field"
-msgstr ""
+msgstr "Campo de cuota"
 
-#: templates/settings.php:80
+#: templates/settings.php:94
 msgid "Quota Default"
-msgstr ""
+msgstr "Cuota por defecto"
 
-#: templates/settings.php:80
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr "en bytes"
 
-#: templates/settings.php:81
+#: templates/settings.php:95
 msgid "Email Field"
-msgstr ""
+msgstr "Campo de e-mail"
 
-#: templates/settings.php:82
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
-msgstr ""
+msgstr "Regla de nombre de los directorios de usuario"
 
-#: templates/settings.php:82
+#: 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:86
-msgid "Test Configuration"
+#: templates/settings.php:101
+msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:86
+#: 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:111
 msgid "Help"
 msgstr "Ayuda"
diff --git a/l10n/es_AR/user_webdavauth.po b/l10n/es_AR/user_webdavauth.po
index 6c88cac3fd09f92601d83b3db46ade2f069eea27..2d5007b68eab54574a821e53bdf02bebc4d4e743 100644
--- a/l10n/es_AR/user_webdavauth.po
+++ b/l10n/es_AR/user_webdavauth.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-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-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+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 c861828727684ffab1a738769abc95e5c994c59e..a03e773beb020d4d0f4e2cfe0c643f00a4c19ca6 100644
--- a/l10n/et_EE/core.po
+++ b/l10n/et_EE/core.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# 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-02-22 00:06+0100\n"
-"PO-Revision-Date: 2013-02-20 23:20+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10: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"
@@ -18,33 +19,33 @@ msgstr ""
 "Language: et_EE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:85
+#: ajax/share.php:97
 #, php-format
 msgid "User %s shared a file with you"
-msgstr ""
+msgstr "Kasutaja %s jagas Sinuga faili"
 
-#: ajax/share.php:87
+#: ajax/share.php:99
 #, php-format
 msgid "User %s shared a folder with you"
-msgstr ""
+msgstr "Kasutaja %s jagas Sinuga kausta."
 
-#: ajax/share.php:89
+#: ajax/share.php:101
 #, php-format
 msgid ""
 "User %s shared the file \"%s\" with you. It is available for download here: "
 "%s"
-msgstr ""
+msgstr "Kasutaja %s jagas Sinuga faili \"%s\". See on allalaadimiseks saadaval siin: %s"
 
-#: ajax/share.php:91
+#: ajax/share.php:104
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
 "here: %s"
-msgstr ""
+msgstr "Kasutaja %s jagas Sinuga kataloogi \"%s\". See on allalaadimiseks saadaval siin: %s"
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
-msgstr ""
+msgstr "Kategooria tÃ¼Ã¼p puudub."
 
 #: ajax/vcategories/add.php:30
 msgid "No category to add?"
@@ -53,24 +54,24 @@ msgstr "Pole kategooriat, mida lisada?"
 #: ajax/vcategories/add.php:37
 #, php-format
 msgid "This category already exists: %s"
-msgstr ""
+msgstr "See kategooria on juba olemas: %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 "Objekti tÃ¼Ã¼b puudub."
 
 #: ajax/vcategories/addToFavorites.php:30
 #: ajax/vcategories/removeFromFavorites.php:30
 #, php-format
 msgid "%s ID not provided."
-msgstr ""
+msgstr "%s ID puudub."
 
 #: ajax/vcategories/addToFavorites.php:35
 #, php-format
 msgid "Error adding %s to favorites."
-msgstr ""
+msgstr "Viga %s lisamisel lemmikutesse."
 
 #: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
 msgid "No categories selected for deletion."
@@ -79,81 +80,81 @@ msgstr "Kustutamiseks pole kategooriat valitud."
 #: ajax/vcategories/removeFromFavorites.php:35
 #, php-format
 msgid "Error removing %s from favorites."
-msgstr ""
+msgstr "Viga %s eemaldamisel lemmikutest"
 
-#: js/config.php:32
+#: js/config.php:34
 msgid "Sunday"
 msgstr "PÃ¼hapÃ¤ev"
 
-#: js/config.php:32
+#: js/config.php:35
 msgid "Monday"
 msgstr "EsmaspÃ¤ev"
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Tuesday"
 msgstr "TeisipÃ¤ev"
 
-#: js/config.php:32
+#: js/config.php:37
 msgid "Wednesday"
 msgstr "KolmapÃ¤ev"
 
-#: js/config.php:32
+#: js/config.php:38
 msgid "Thursday"
 msgstr "NeljapÃ¤ev"
 
-#: js/config.php:32
+#: js/config.php:39
 msgid "Friday"
 msgstr "Reede"
 
-#: js/config.php:32
+#: js/config.php:40
 msgid "Saturday"
 msgstr "LaupÃ¤ev"
 
-#: js/config.php:33
+#: js/config.php:45
 msgid "January"
 msgstr "Jaanuar"
 
-#: js/config.php:33
+#: js/config.php:46
 msgid "February"
 msgstr "Veebruar"
 
-#: js/config.php:33
+#: js/config.php:47
 msgid "March"
 msgstr "MÃ¤rts"
 
-#: js/config.php:33
+#: js/config.php:48
 msgid "April"
 msgstr "Aprill"
 
-#: js/config.php:33
+#: js/config.php:49
 msgid "May"
 msgstr "Mai"
 
-#: js/config.php:33
+#: js/config.php:50
 msgid "June"
 msgstr "Juuni"
 
-#: js/config.php:33
+#: js/config.php:51
 msgid "July"
 msgstr "Juuli"
 
-#: js/config.php:33
+#: js/config.php:52
 msgid "August"
 msgstr "August"
 
-#: js/config.php:33
+#: js/config.php:53
 msgid "September"
 msgstr "September"
 
-#: js/config.php:33
+#: js/config.php:54
 msgid "October"
 msgstr "Oktoober"
 
-#: js/config.php:33
+#: js/config.php:55
 msgid "November"
 msgstr "November"
 
-#: js/config.php:33
+#: js/config.php:56
 msgid "December"
 msgstr "Detsember"
 
@@ -161,231 +162,233 @@ msgstr "Detsember"
 msgid "Settings"
 msgstr "Seaded"
 
-#: js/js.js:767
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "sekundit tagasi"
 
-#: js/js.js:768
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "1 minut tagasi"
 
-#: js/js.js:769
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr "{minutes} minutit tagasi"
 
-#: js/js.js:770
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr "1 tund tagasi"
 
-#: js/js.js:771
+#: js/js.js:722
 msgid "{hours} hours ago"
-msgstr ""
+msgstr "{hours} tundi tagasi"
 
-#: js/js.js:772
+#: js/js.js:723
 msgid "today"
 msgstr "tÃ¤na"
 
-#: js/js.js:773
+#: js/js.js:724
 msgid "yesterday"
 msgstr "eile"
 
-#: js/js.js:774
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr "{days} pÃ¤eva tagasi"
 
-#: js/js.js:775
+#: js/js.js:726
 msgid "last month"
 msgstr "viimasel kuul"
 
-#: js/js.js:776
+#: js/js.js:727
 msgid "{months} months ago"
-msgstr ""
+msgstr "{months} kuud tagasi"
 
-#: js/js.js:777
+#: js/js.js:728
 msgid "months ago"
 msgstr "kuu tagasi"
 
-#: js/js.js:778
+#: js/js.js:729
 msgid "last year"
 msgstr "viimasel aastal"
 
-#: js/js.js:779
+#: js/js.js:730
 msgid "years ago"
 msgstr "aastat tagasi"
 
-#: js/oc-dialogs.js:126
-msgid "Choose"
-msgstr "Vali"
+#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
+msgid "Ok"
+msgstr "Ok"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
 msgid "Cancel"
 msgstr "Loobu"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "Ei"
+#: js/oc-dialogs.js:185
+msgid "Choose"
+msgstr "Vali"
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:215
 msgid "Yes"
 msgstr "Jah"
 
-#: js/oc-dialogs.js:180
-msgid "Ok"
-msgstr "Ok"
+#: js/oc-dialogs.js:222
+msgid "No"
+msgstr "Ei"
 
 #: 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 "Objekti tÃ¼Ã¼p pole mÃ¤Ã¤ratletud."
 
-#: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:582
-#: js/share.js:594
+#: 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 "Viga"
 
 #: js/oc-vcategories.js:179
 msgid "The app name is not specified."
-msgstr ""
+msgstr "Rakenduse nimi ole mÃ¤Ã¤ratletud"
 
 #: js/oc-vcategories.js:194
 msgid "The required file {file} is not installed!"
-msgstr ""
+msgstr "Vajalikku faili {file} pole paigaldatud!"
 
-#: js/share.js:29 js/share.js:43 js/share.js:90
+#: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
-msgstr ""
+msgstr "Jagatud"
 
-#: js/share.js:93
+#: js/share.js:90
 msgid "Share"
 msgstr "Jaga"
 
-#: js/share.js:141 js/share.js:622
+#: js/share.js:125 js/share.js:617
 msgid "Error while sharing"
 msgstr "Viga jagamisel"
 
-#: js/share.js:152
+#: js/share.js:136
 msgid "Error while unsharing"
 msgstr "Viga jagamise lÃµpetamisel"
 
-#: js/share.js:159
+#: js/share.js:143
 msgid "Error while changing permissions"
 msgstr "Viga Ãµiguste muutmisel"
 
-#: js/share.js:168
+#: js/share.js:152
 msgid "Shared with you and the group {group} by {owner}"
-msgstr ""
+msgstr "Jagatud sinu ja {group} grupiga {owner} poolt"
 
-#: js/share.js:170
+#: js/share.js:154
 msgid "Shared with you by {owner}"
 msgstr "Sinuga jagas {owner}"
 
-#: js/share.js:175
+#: js/share.js:159
 msgid "Share with"
 msgstr "Jaga"
 
-#: js/share.js:180
+#: js/share.js:164
 msgid "Share with link"
 msgstr "Jaga lingiga"
 
-#: js/share.js:183
+#: js/share.js:167
 msgid "Password protect"
 msgstr "Parooliga kaitstud"
 
-#: js/share.js:185 templates/installation.php:44 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Parool"
 
-#: js/share.js:189
+#: js/share.js:173
 msgid "Email link to person"
-msgstr ""
+msgstr "Saada link isikule e-postiga"
 
-#: js/share.js:190
+#: js/share.js:174
 msgid "Send"
-msgstr ""
+msgstr "Saada"
 
-#: js/share.js:194
+#: js/share.js:178
 msgid "Set expiration date"
 msgstr "MÃ¤Ã¤ra aegumise kuupÃ¤ev"
 
-#: js/share.js:195
+#: js/share.js:179
 msgid "Expiration date"
 msgstr "Aegumise kuupÃ¤ev"
 
-#: js/share.js:227
+#: js/share.js:211
 msgid "Share via email:"
 msgstr "Jaga e-postiga:"
 
-#: js/share.js:229
+#: js/share.js:213
 msgid "No people found"
 msgstr "Ãœhtegi inimest ei leitud"
 
-#: js/share.js:256
+#: js/share.js:251
 msgid "Resharing is not allowed"
 msgstr "Edasijagamine pole lubatud"
 
-#: js/share.js:292
+#: js/share.js:287
 msgid "Shared in {item} with {user}"
-msgstr ""
+msgstr "Jagatud {item} kasutajaga {user}"
 
-#: js/share.js:313
+#: js/share.js:308
 msgid "Unshare"
 msgstr "LÃµpeta jagamine"
 
-#: js/share.js:325
+#: js/share.js:320
 msgid "can edit"
 msgstr "saab muuta"
 
-#: js/share.js:327
+#: js/share.js:322
 msgid "access control"
 msgstr "ligipÃ¤Ã¤sukontroll"
 
-#: js/share.js:330
+#: js/share.js:325
 msgid "create"
 msgstr "loo"
 
-#: js/share.js:333
+#: js/share.js:328
 msgid "update"
 msgstr "uuenda"
 
-#: js/share.js:336
+#: js/share.js:331
 msgid "delete"
 msgstr "kustuta"
 
-#: js/share.js:339
+#: js/share.js:334
 msgid "share"
 msgstr "jaga"
 
-#: js/share.js:373 js/share.js:569
+#: js/share.js:368 js/share.js:564
 msgid "Password protected"
 msgstr "Parooliga kaitstud"
 
-#: js/share.js:582
+#: js/share.js:577
 msgid "Error unsetting expiration date"
 msgstr "Viga aegumise kuupÃ¤eva eemaldamisel"
 
-#: js/share.js:594
+#: js/share.js:589
 msgid "Error setting expiration date"
 msgstr "Viga aegumise kuupÃ¤eva mÃ¤Ã¤ramisel"
 
-#: js/share.js:609
+#: js/share.js:604
 msgid "Sending ..."
-msgstr ""
+msgstr "Saadan ..."
 
-#: js/share.js:620
+#: js/share.js:615
 msgid "Email sent"
-msgstr ""
+msgstr "Email saadetud"
 
 #: 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 "Uuendus ebaÃµnnestus. Palun teavita probleemidest  <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud kogukonda</a>."
 
 #: js/update.js:18
 msgid "The update was successful. Redirecting you to ownCloud now."
-msgstr ""
+msgstr "Uuendus oli edukas. Kohe suunatakse Sind ownCloudi."
 
 #: lostpassword/controller.php:48
 msgid "ownCloud password reset"
@@ -395,24 +398,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 aadressil.<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:39
-#: 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"
 
@@ -434,7 +440,7 @@ msgstr "Nulli parool"
 
 #: strings.php:5
 msgid "Personal"
-msgstr "isiklik"
+msgstr "Isiklik"
 
 #: strings.php:6
 msgid "Users"
@@ -442,7 +448,7 @@ msgstr "Kasutajad"
 
 #: strings.php:7
 msgid "Apps"
-msgstr "Programmid"
+msgstr "Rakendused"
 
 #: strings.php:8
 msgid "Admin"
@@ -468,117 +474,132 @@ msgstr "Muuda kategooriaid"
 msgid "Add"
 msgstr "Lisa"
 
-#: templates/installation.php:23 templates/installation.php:30
+#: templates/installation.php:24 templates/installation.php:31
+#: templates/installation.php:38
 msgid "Security Warning"
 msgstr "Turvahoiatus"
 
-#: templates/installation.php:24
+#: templates/installation.php:25
+msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
+msgstr "Sinu PHP versioon on haavatav NULL Baidi (CVE-2006-7243) rÃ¼nnakuga."
+
+#: templates/installation.php:26
+msgid "Please update your PHP installation to use ownCloud securely."
+msgstr "Palun uuenda oma paigaldatud PHP-d tagamaks ownCloudi turvalisus."
+
+#: templates/installation.php:32
 msgid ""
 "No secure random number generator is available, please enable the PHP "
 "OpenSSL extension."
-msgstr ""
+msgstr "Turvalist juhuslike numbrite generaatorit pole saadaval. Palun luba PHP-s OpenSSL laiendus."
 
-#: templates/installation.php:25
+#: 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 "Ilma turvalise juhuslike numbrite generaatorita vÃµib rÃ¼ndaja ennustada paroolivahetuse vÃµtme ning hÃµivata su konto."
 
-#: templates/installation.php:31
+#: 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 "Su andmete kataloog ja failid on tÃµenÃ¤oliselt internetist vabalt saadaval kuna .htaccess fail ei toimi."
 
-#: templates/installation.php:32
+#: 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 "Serveri korrektseks seadistuseks palun tutvu <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">dokumentatsiooniga</a>."
 
-#: templates/installation.php:36
+#: templates/installation.php:44
 msgid "Create an <strong>admin account</strong>"
 msgstr "Loo <strong>admini konto</strong>"
 
-#: templates/installation.php:52
+#: templates/installation.php:62
 msgid "Advanced"
-msgstr "Lisavalikud"
+msgstr "TÃ¤psem"
 
-#: templates/installation.php:54
+#: templates/installation.php:64
 msgid "Data folder"
 msgstr "Andmete kaust"
 
-#: templates/installation.php:61
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "Seadista andmebaasi"
 
-#: templates/installation.php:66 templates/installation.php:77
-#: templates/installation.php:87 templates/installation.php:97
+#: 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:109
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "Andmebaasi kasutaja"
 
-#: templates/installation.php:113
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "Andmebaasi parool"
 
-#: templates/installation.php:117
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "Andmebasi nimi"
 
-#: templates/installation.php:125
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "Andmebaasi tabeliruum"
 
-#: templates/installation.php:131
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "Andmebaasi host"
 
-#: templates/installation.php:136
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "LÃµpeta seadistamine"
 
-#: templates/layout.guest.php:33
+#: templates/layout.guest.php:40
 msgid "web services under your control"
-msgstr "veebiteenused sinu kontrolli all"
+msgstr "veebitenused sinu kontrolli all"
 
-#: templates/layout.user.php:48
+#: templates/layout.user.php:36
+#, 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:61
 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!"
 
-#: 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 ""
+msgstr "Alternatiivsed meldimised"
 
 #: templates/part.pagenavi.php:3
 msgid "prev"
@@ -591,4 +612,4 @@ msgstr "jÃ¤rgm"
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
-msgstr ""
+msgstr "Uuendan ownCloudi versioonile %s. LÃ¤heb pisut aega."
diff --git a/l10n/et_EE/files.po b/l10n/et_EE/files.po
index 09f2d52fdb533db843f533cffd824975d8315ab8..3084922f7727b75a188d099f4bcb94245c1fbc72 100644
--- a/l10n/et_EE/files.po
+++ b/l10n/et_EE/files.po
@@ -3,15 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <dagor.vint@hotmail.com>, 2012.
-# 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-03-04 00:06+0100\n"
-"PO-Revision-Date: 2013-03-03 23:06+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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,35 +22,31 @@ msgstr ""
 #: ajax/move.php:17
 #, php-format
 msgid "Could not move %s - File with this name already exists"
-msgstr ""
+msgstr "Ei saa liigutada faili %s - samanimeline fail on juba olemas"
 
 #: ajax/move.php:27 ajax/move.php:30
 #, php-format
 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 ""
+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"
@@ -72,58 +68,69 @@ msgstr "Kettale kirjutamine ebaÃµnnestus"
 msgid "Not enough storage available"
 msgstr "Saadaval pole piisavalt ruumi"
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr "Vigane kaust."
 
-#: appinfo/app.php:10
+#: appinfo/app.php:12
 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:92 templates/index.php:93
+#: 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/files.js:292 js/files.js:408
-#: js/files.js:439
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "Ootel"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} on juba olemas"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "asenda"
 
-#: js/filelist.js:251
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "soovita nime"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "loobu"
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "asendas nime {old_name} nimega {new_name}"
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "undo"
 msgstr "tagasi"
 
-#: js/filelist.js:323
+#: js/filelist.js:331
 msgid "perform delete operation"
-msgstr ""
+msgstr "teosta kustutamine"
+
+#: js/filelist.js:413
+msgid "1 file uploading"
+msgstr "1 fail Ã¼leslaadimisel"
+
+#: js/filelist.js:416 js/filelist.js:470
+msgid "files uploading"
+msgstr "faili Ã¼leslaadimisel"
 
 #: js/files.js:52
 msgid "'.' is an invalid file name."
@@ -141,83 +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 ""
+msgstr "Sinu andmemaht on tÃ¤is! Faile ei uuendata ega sÃ¼nkroniseerita!"
 
 #: js/files.js:82
 msgid "Your storage is almost full ({usedSpacePercent}%)"
-msgstr ""
+msgstr "Su andmemaht on peaaegu tÃ¤is ({usedSpacePercent}%)"
 
-#: js/files.js:225
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
-msgstr ""
+msgstr "Valmistatakse allalaadimist. See vÃµib vÃµtta veidi aega, kui on tegu suurte failidega. "
 
-#: js/files.js:262
+#: 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:262
-msgid "Upload Error"
-msgstr "Ãœleslaadimise viga"
+#: js/files.js:277
+msgid "Not enough space available"
+msgstr "Pole piisavalt ruumi"
 
-#: js/files.js:273
-msgid "Close"
-msgstr "Sulge"
-
-#: js/files.js:312
-msgid "1 file uploading"
-msgstr "1 faili Ã¼leslaadimisel"
-
-#: js/files.js:315 js/files.js:370 js/files.js:385
-msgid "{count} files uploading"
-msgstr "{count} faili Ã¼leslaadimist"
-
-#: js/files.js:388 js/files.js:423
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "Ãœleslaadimine tÃ¼histati."
 
-#: js/files.js:497
+#: 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:570
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "URL ei saa olla tÃ¼hi."
 
-#: js/files.js:575
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr ""
+msgstr "Vigane kataloogi nimi. 'Shared' kasutamine on reserveeritud ownCloud poolt."
+
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+msgid "Error"
+msgstr "Viga"
 
-#: js/files.js:953 templates/index.php:68
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Nimi"
 
-#: js/files.js:954 templates/index.php:79
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Suurus"
 
-#: js/files.js:955 templates/index.php:81
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Muudetud"
 
-#: js/files.js:974
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 kaust"
 
-#: js/files.js:976
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} kausta"
 
-#: js/files.js:984
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 fail"
 
-#: js/files.js:986
+#: 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"
@@ -270,48 +277,48 @@ msgstr "Kaust"
 msgid "From link"
 msgstr "Allikast"
 
-#: templates/index.php:40
+#: templates/index.php:42
 msgid "Deleted files"
-msgstr ""
+msgstr "Kustutatud failid"
 
-#: templates/index.php:46
+#: templates/index.php:48
 msgid "Cancel upload"
 msgstr "TÃ¼hista Ã¼leslaadimine"
 
-#: templates/index.php:53
+#: templates/index.php:54
 msgid "You donâ€™t have write permissions here."
-msgstr ""
+msgstr "Siin puudvad sul kirjutamisÃµigused."
 
-#: templates/index.php:60
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Siin pole midagi. Lae midagi Ã¼les!"
 
-#: templates/index.php:74
+#: templates/index.php:75
 msgid "Download"
 msgstr "Lae alla"
 
-#: templates/index.php:86 templates/index.php:87
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "LÃµpeta jagamine"
 
-#: templates/index.php:106
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "Ãœleslaadimine on liiga suur"
 
-#: templates/index.php:108
+#: 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:113
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
-msgstr "Faile skannitakse, palun oota"
+msgstr "Faile skannitakse, palun oota."
 
-#: templates/index.php:116
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "Praegune skannimine"
 
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
-msgstr ""
+msgstr "FailisÃ¼steemi puhvri uuendamine..."
diff --git a/l10n/et_EE/files_encryption.po b/l10n/et_EE/files_encryption.po
index c2fe900d3ac6bf9eb3b9d8b078be582246065a9a..9850a24ab4d904ad066c6f13eda9303bcdd5d83c 100644
--- a/l10n/et_EE/files_encryption.po
+++ b/l10n/et_EE/files_encryption.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-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"
+"POT-Creation-Date: 2013-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 11:12+0000\n"
 "Last-Translator: Rivo ZÃ¤ngov <eraser@eraser.ee>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/et_EE/files_external.po b/l10n/et_EE/files_external.po
index 867134f4d9842921e80d2aa00eb6f40eda7c6067..bcacfde3df377b998573c5badf76951377eee52c 100644
--- a/l10n/et_EE/files_external.po
+++ b/l10n/et_EE/files_external.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# 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-03-01 00:05+0100\n"
-"PO-Revision-Date: 2013-02-27 23:20+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 11:20+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"
@@ -38,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: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 ""
+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: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 ""
+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"
@@ -61,7 +68,7 @@ msgstr "Kausta nimi"
 
 #: templates/settings.php:10
 msgid "External storage"
-msgstr ""
+msgstr "VÃ¤line andmehoidla"
 
 #: templates/settings.php:11
 msgid "Configuration"
@@ -77,7 +84,7 @@ msgstr "Rakendatav"
 
 #: templates/settings.php:33
 msgid "Add storage"
-msgstr ""
+msgstr "Lisa andmehoidla"
 
 #: templates/settings.php:90
 msgid "None set"
diff --git a/l10n/et_EE/files_sharing.po b/l10n/et_EE/files_sharing.po
index c0302f73c0695ae76080e335801022aa77ce5aff..a698beda26a910b46da3791e90cc5025b9a9cbf1 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 11:07+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 33291a6ce4448ed5f78892dc6e4d0f5a46d51c65..655ddff37591b7952cda85cff66403b8078c28b7 100644
--- a/l10n/et_EE/files_trashbin.po
+++ b/l10n/et_EE/files_trashbin.po
@@ -3,14 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# 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-03-08 00:25+0100\n"
-"PO-Revision-Date: 2013-03-07 23:25+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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"
@@ -18,12 +17,12 @@ msgstr ""
 "Language: et_EE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:40
+#: ajax/delete.php:42
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "%s jÃ¤Ã¤davalt kustutamine ebaÃµnnestus"
 
-#: ajax/undelete.php:41
+#: ajax/undelete.php:42
 #, php-format
 msgid "Couldn't restore %s"
 msgstr "%s ei saa taastada"
@@ -32,6 +31,10 @@ msgstr "%s ei saa taastada"
 msgid "perform restore operation"
 msgstr "soorita taastamine"
 
+#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+msgid "Error"
+msgstr "Viga"
+
 #: js/trash.js:34
 msgid "delete file permanently"
 msgstr "kustuta fail jÃ¤Ã¤davalt"
@@ -78,4 +81,4 @@ msgstr "Kustuta"
 
 #: templates/part.breadcrumb.php:9
 msgid "Deleted Files"
-msgstr ""
+msgstr "Kustutatud failid"
diff --git a/l10n/et_EE/files_versions.po b/l10n/et_EE/files_versions.po
index 77d1e70531ef50f71da3d940ac012af40d28a791..570e7d1253e828cc9bdf2db43ea97a72e2fcd5e2 100644
--- a/l10n/et_EE/files_versions.po
+++ b/l10n/et_EE/files_versions.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# 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-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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 11:20+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"
@@ -21,7 +21,7 @@ msgstr ""
 #: ajax/rollbackVersion.php:15
 #, php-format
 msgid "Could not revert: %s"
-msgstr ""
+msgstr "Ei suuda taastada faili: %s"
 
 #: history.php:40
 msgid "success"
@@ -30,7 +30,7 @@ msgstr "korras"
 #: history.php:42
 #, php-format
 msgid "File %s was reverted to version %s"
-msgstr ""
+msgstr "Fail %s taastati versioonile %s"
 
 #: history.php:49
 msgid "failure"
@@ -39,20 +39,20 @@ msgstr "ebaÃµnnestus"
 #: history.php:51
 #, php-format
 msgid "File %s could not be reverted to version %s"
-msgstr ""
+msgstr "Faili %s ei saa taastada versioonile %s"
 
-#: history.php:68
+#: history.php:69
 msgid "No old versions available"
 msgstr "Vanu versioone pole saadaval"
 
-#: history.php:73
+#: history.php:74
 msgid "No path specified"
 msgstr "Asukohta pole mÃ¤Ã¤ratud"
 
 #: js/versions.js:6
 msgid "Versions"
-msgstr ""
+msgstr "Versioonid"
 
 #: templates/history.php:20
 msgid "Revert a file to a previous version by clicking on its revert button"
-msgstr ""
+msgstr "Taasta fail varasemale versioonile klikkides nupule \"Taasta\""
diff --git a/l10n/et_EE/lib.po b/l10n/et_EE/lib.po
index 7b1df98a802304f6eb9daee3be77ccf8c84bbbe0..7015ed74a80854d344fbf728ce6acd6d3d84c27e 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:
-# 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-02-27 14:35+0100\n"
-"PO-Revision-Date: 2013-02-27 13:35+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-16 01:58+0200\n"
+"PO-Revision-Date: 2013-05-15 08:40+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"
@@ -42,25 +42,25 @@ msgstr "Rakendused"
 msgid "Admin"
 msgstr "Admin"
 
-#: files.php:202
+#: files.php:207
 msgid "ZIP download is turned off."
 msgstr "ZIP-ina allalaadimine on vÃ¤lja lÃ¼litatud."
 
-#: files.php:203
+#: files.php:208
 msgid "Files need to be downloaded one by one."
 msgstr "Failid tuleb alla laadida Ã¼kshaaval."
 
-#: files.php:204 files.php:231
+#: files.php:209 files.php:242
 msgid "Back to Files"
 msgstr "Tagasi failide juurde"
 
-#: files.php:228
+#: files.php:239
 msgid "Selected files too large to generate zip file."
 msgstr "Valitud failid on ZIP-faili loomiseks liiga suured."
 
 #: helper.php:228
 msgid "couldn't be determined"
-msgstr ""
+msgstr "ei suudetud tuvastada"
 
 #: json.php:28
 msgid "Application is not enabled"
@@ -94,99 +94,95 @@ 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 ""
+msgstr "%s sisesta andmebaasi kasutajatunnus."
 
 #: setup.php:58
 #, php-format
 msgid "%s enter the database name."
-msgstr ""
+msgstr "%s sisesta andmebaasi nimi."
 
 #: setup.php:61
 #, php-format
 msgid "%s you may not use dots in the database name"
-msgstr ""
+msgstr "%s punktide kasutamine andmebaasi nimes pole lubatud"
 
 #: setup.php:64
 #, php-format
 msgid "%s set the database host."
-msgstr ""
+msgstr "%s mÃ¤Ã¤ra andmebaasi server."
 
-#: setup.php:128 setup.php:320 setup.php:365
+#: setup.php:132 setup.php:325 setup.php:370
 msgid "PostgreSQL username and/or password not valid"
-msgstr ""
+msgstr "PostgreSQL kasutajatunnus ja/vÃµi parool pole Ãµiged"
 
-#: setup.php:129 setup.php:152 setup.php:229
+#: setup.php:133 setup.php:156 setup.php:234
 msgid "You need to enter either an existing account or the administrator."
-msgstr ""
+msgstr "Sisesta kas juba olemasolev konto vÃµi administrator."
 
-#: setup.php:151 setup.php:453 setup.php:520
+#: setup.php:155 setup.php:458 setup.php:525
 msgid "Oracle username and/or password not valid"
-msgstr ""
+msgstr "Oracle kasutajatunnus ja/vÃµi parool pole Ãµiged"
 
-#: setup.php:228
+#: setup.php:233
 msgid "MySQL username and/or password not valid"
-msgstr ""
+msgstr "MySQL kasutajatunnus ja/vÃµi parool pole Ãµiged"
 
-#: 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: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:583 setup.php:592 setup.php:600 setup.php:609
+#: setup.php:615
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Andmebaasi viga: \"%s\""
 
-#: 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:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
+#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
+#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
 #, php-format
 msgid "Offending command was: \"%s\""
-msgstr ""
+msgstr "TÃµrkuv kÃ¤sk oli: \"%s\""
 
-#: setup.php:299
+#: setup.php:304
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
-msgstr ""
+msgstr "MySQL kasutaja '%s'@'localhost' on juba olemas."
 
-#: setup.php:300
+#: setup.php:305
 msgid "Drop this user from MySQL"
 msgstr "Kustuta see kasutaja MySQL-ist"
 
-#: setup.php:305
+#: setup.php:310
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
-msgstr ""
+msgstr "MySQL kasutaja '%s'@'%%' on juba olemas"
 
-#: setup.php:306
+#: setup.php:311
 msgid "Drop this user from MySQL."
 msgstr "Kustuta see kasutaja MySQL-ist."
 
-#: setup.php:579 setup.php:611
+#: setup.php:584 setup.php:616
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
-msgstr ""
+msgstr "TÃµrkuv kÃ¤sk oli: \"%s\", nimi: %s, parool: %s"
 
-#: setup.php:631
+#: setup.php:636
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
-msgstr ""
+msgstr "MS SQL kasutajatunnus ja/vÃµi parool pole Ãµiged: %s"
 
-#: setup.php:849
+#: setup.php:859
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
-msgstr ""
+msgstr "Veebiserveri ei ole veel korralikult seadistatud vÃµimaldamaks failide sÃ¼nkroniseerimist, kuna WebDAV liides nÃ¤ib olevat mittetoimiv."
 
-#: setup.php:850
+#: setup.php:860
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr ""
+msgstr "Palun tutvu veelkord <a href='%s'>paigalduse juhenditega</a>."
 
 #: template.php:113
 msgid "seconds ago"
@@ -225,7 +221,7 @@ msgstr "%d pÃ¤eva tagasi"
 
 #: template.php:121
 msgid "last month"
-msgstr "eelmisel kuul"
+msgstr "viimasel kuul"
 
 #: template.php:122
 #, php-format
@@ -234,26 +230,13 @@ 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\""
-msgstr ""
+msgstr "Ei leia kategooriat \"%s\""
diff --git a/l10n/et_EE/settings.po b/l10n/et_EE/settings.po
index a1c6aebc2d6765e27b39b7d9dde77918b59961e8..8ba6e31707109747b8db1e999eafa909444326d0 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.
-# Rivo ZÃ¤ngov <eraser@eraser.ee>, 2011-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-27 14:35+0100\n"
-"PO-Revision-Date: 2013-02-27 13:35+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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"
@@ -21,16 +20,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 ""
+msgstr "Ei saa muuta nÃ¤idatavat nime"
 
 #: ajax/creategroup.php:10
 msgid "Group already exists"
@@ -54,11 +57,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"
@@ -70,7 +73,7 @@ msgstr "Vigane pÃ¤ring"
 
 #: ajax/togglegroups.php:12
 msgid "Admins can't remove themself from the admin group"
-msgstr ""
+msgstr "Administraatorid ei saa ise end eemaldada admin grupist"
 
 #: ajax/togglegroups.php:30
 #, php-format
@@ -94,7 +97,7 @@ msgstr "Uuenda versioonile {appversion}"
 msgid "Disable"
 msgstr "LÃ¼lita vÃ¤lja"
 
-#: js/apps.js:36 js/apps.js:64
+#: js/apps.js:36 js/apps.js:64 js/apps.js:83
 msgid "Enable"
 msgstr "LÃ¼lita sisse"
 
@@ -102,68 +105,68 @@ msgstr "LÃ¼lita sisse"
 msgid "Please wait...."
 msgstr "Palun oota..."
 
-#: js/apps.js:84
+#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+msgid "Error"
+msgstr "Viga"
+
+#: js/apps.js:90
 msgid "Updating...."
 msgstr "Uuendamine..."
 
-#: js/apps.js:87
+#: js/apps.js:93
 msgid "Error while updating app"
 msgstr "Viga rakenduse uuendamisel"
 
-#: js/apps.js:87
-msgid "Error"
-msgstr "Viga"
-
-#: js/apps.js:90
+#: js/apps.js:96
 msgid "Updated"
 msgstr "Uuendatud"
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr "Salvestamine..."
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "deleted"
 msgstr "kustutatud"
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "undo"
 msgstr "tagasi"
 
-#: js/users.js:62
+#: js/users.js:79
 msgid "Unable to remove user"
-msgstr ""
+msgstr "Kasutaja eemaldamine ebaÃµnnestus"
 
-#: js/users.js:75 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
+#: templates/users.php:103
 msgid "Groups"
 msgstr "Grupid"
 
-#: js/users.js:78 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr "Grupi admin"
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "Kustuta"
 
-#: js/users.js:191
+#: js/users.js:269
 msgid "add group"
 msgstr "lisa grupp"
 
-#: js/users.js:352
+#: js/users.js:420
 msgid "A valid username must be provided"
-msgstr ""
+msgstr "Sisesta nÃµuetele vastav kasutajatunnus"
 
-#: js/users.js:353 js/users.js:359 js/users.js:374
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr "Viga kasutaja loomisel"
 
-#: js/users.js:358
+#: js/users.js:426
 msgid "A valid password must be provided"
-msgstr ""
+msgstr "Sisesta nÃµuetele vastav parool"
 
-#: personal.php:29 personal.php:30
+#: personal.php:35 personal.php:36
 msgid "__language_name__"
 msgstr "Eesti"
 
@@ -178,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 "Andmete kataloog ja failid on tÃµenÃ¤oliselt internetis avalikult saadaval. .htaccess fail, mida pakub ownCloud, ei toimi. Soovitame tungivalt veebiserveri seadistust selliselt, et andmete kataloog ei oleks enam vabalt saadaval vÃµi tÃµstaksid andmete kataloogi oma veebiserveri veebi-juurkataloogist mujale."
 
 #: templates/admin.php:29
 msgid "Setup Warning"
-msgstr ""
+msgstr "Paigalduse hoiatus"
 
 #: 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 "Veebiserveri ei ole veel korralikult seadistatud vÃµimaldamaks failide sÃ¼nkroniseerimist, kuna WebDAV liides nÃ¤ib olevat mittetoimiv."
 
 #: templates/admin.php:33
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr ""
+msgstr "Palun tutvu veelkord <a href='%s'>paigalduse juhenditega</a>."
 
 #: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
-msgstr ""
+msgstr "Moodul 'fileinfo' puudub"
 
 #: 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 moodul 'fileinfo' puudub. Soovitame tungivalt see lisada saavutamaks parimaid tulemusi failitÃ¼Ã¼pide tuvastamisel."
 
 #: templates/admin.php:58
 msgid "Locale not working"
-msgstr ""
+msgstr "Lokalisatsioon ei toimi"
 
 #: templates/admin.php:63
 #, php-format
@@ -215,11 +218,11 @@ msgid ""
 "This ownCloud server can't set system locale to %s. This means that there "
 "might be problems with certain characters in file names. We strongly suggest"
 " to install the required packages on your system to support %s."
-msgstr ""
+msgstr "ownCloud server ei suuda seadistada sÃ¼steemi lokalisatsiooni %s. See tÃ¤hendab, et vÃµib esineda probleeme teatud tÃ¤hemÃ¤rkidega failide nimedes. Soovitame tungivalt paigaldada sÃ¼steemi vajalikud pakid toetamaks %s."
 
 #: templates/admin.php:75
 msgid "Internet connection not working"
-msgstr ""
+msgstr "InternetiÃ¼hendus ei toimi"
 
 #: templates/admin.php:78
 msgid ""
@@ -229,27 +232,27 @@ 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 serveril puudub toimiv internetiÃ¼hendus. See tÃ¤hendab, et mÃµned funktsionaalsused, nagu nÃ¤iteks vÃ¤liste andmehoidlate Ã¼hendamine, teavitused uuendustest vÃµi kolmandate osapoolte rakenduste paigaldamine ei tÃ¶Ã¶ta. Eemalt failidele ligipÃ¤Ã¤s ning teadete saatmine emailiga ei pruugi samuti toimida. Kui soovid tÃ¤ielikku funktsionaalsust, siis soovitame serverile tagada ligipÃ¤Ã¤s internetti."
 
 #: templates/admin.php:92
 msgid "Cron"
-msgstr ""
+msgstr "Cron"
 
 #: templates/admin.php:101
 msgid "Execute one task with each page loaded"
-msgstr ""
+msgstr "KÃ¤ivita toiming lehe laadimisel"
 
 #: 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 on registreeritud webcron teenusena. Lae cron.php lehte owncloud veebikataloogist iga minut Ã¼le 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 "Kasuta sÃ¼steemi cron teenust. KÃ¤ivita cron.php fail owncloud veebikataloogist kasutades sÃ¼steemi crontab toimingut iga minut."
 
 #: templates/admin.php:128
 msgid "Sharing"
@@ -257,35 +260,35 @@ msgstr "Jagamine"
 
 #: templates/admin.php:134
 msgid "Enable Share API"
-msgstr ""
+msgstr "Luba Share API"
 
 #: templates/admin.php:135
 msgid "Allow apps to use the Share API"
-msgstr ""
+msgstr "Luba rakendustel kasutada Share API-t"
 
 #: templates/admin.php:142
 msgid "Allow links"
-msgstr ""
+msgstr "Luba lingid"
 
 #: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
-msgstr ""
+msgstr "Luba kasutajatel jagada kirjeid avalike linkidega"
 
 #: templates/admin.php:150
 msgid "Allow resharing"
-msgstr ""
+msgstr "Luba edasijagamine"
 
 #: templates/admin.php:151
 msgid "Allow users to share items shared with them again"
-msgstr ""
+msgstr "Luba kasutajatel jagada edasi kirjeid, mida on neile jagatud"
 
 #: templates/admin.php:158
 msgid "Allow users to share with anyone"
-msgstr ""
+msgstr "Luba kasutajatel kÃµigiga jagada"
 
 #: templates/admin.php:161
 msgid "Allow users to only share with users in their groups"
-msgstr ""
+msgstr "Luba kasutajatel jagada kirjeid ainult nende grupi liikmetele, millesse nad ise kuuluvad"
 
 #: templates/admin.php:168
 msgid "Security"
@@ -298,13 +301,13 @@ msgstr "Sunni peale HTTPS-i kasutamine"
 #: templates/admin.php:182
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
-msgstr ""
+msgstr "Sunnib kliente ownCloudiga Ã¼henduma krÃ¼pteeritult."
 
 #: templates/admin.php:185
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
-msgstr ""
+msgstr "Palun Ã¼hendu selle ownCloud instantsiga Ã¼le HTTPS vÃµi keela SSL kasutamine."
 
 #: templates/admin.php:195
 msgid "Log"
@@ -314,15 +317,19 @@ msgstr "Logi"
 msgid "Log level"
 msgstr "Logi tase"
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
 msgstr "Rohkem"
 
-#: templates/admin.php:230 templates/personal.php:102
+#: templates/admin.php:228
+msgid "Less"
+msgstr "VÃ¤hem"
+
+#: templates/admin.php:235 templates/personal.php:105
 msgid "Version"
 msgstr "Versioon"
 
-#: templates/admin.php:233 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 "
@@ -330,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 "Arendatud <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud kogukonna</a> poolt. <a href=\"https://github.com/owncloud\" target=\"_blank\">LÃ¤htekood</a> on avaldatud ja kaetud <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> litsentsiga."
 
 #: templates/apps.php:11
 msgid "Add your App"
@@ -378,22 +385,22 @@ msgstr "Vigade nimekiri"
 
 #: templates/help.php:17
 msgid "Commercial Support"
-msgstr "Tasuine kasutajatugi"
+msgstr "Tasuline kasutajatugi"
 
 #: templates/personal.php:8
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr ""
+msgstr "Kasutad <strong>%s</strong> saadavalolevast <strong>%s</strong>"
 
 #: templates/personal.php:15
 msgid "Get the apps to sync your files"
-msgstr ""
+msgstr "Hangi rakendusi failide sÃ¼nkroniseerimiseks"
 
 #: templates/personal.php:26
 msgid "Show First Run Wizard again"
-msgstr ""
+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:77
 msgid "Password"
 msgstr "Parool"
 
@@ -417,82 +424,70 @@ msgstr "Uus parool"
 msgid "Change password"
 msgstr "Muuda parooli"
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:76
 msgid "Display Name"
 msgstr "NÃ¤idatav nimi"
 
-#: 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 "Muuda nÃ¤idatavat nime"
-
-#: templates/personal.php:70
+#: templates/personal.php:68
 msgid "Email"
 msgstr "E-post"
 
-#: templates/personal.php:72
+#: templates/personal.php:70
 msgid "Your email address"
 msgstr "Sinu e-posti aadress"
 
-#: templates/personal.php:73
+#: templates/personal.php:71
 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:77 templates/personal.php:78
 msgid "Language"
 msgstr "Keel"
 
-#: templates/personal.php:86
+#: templates/personal.php:89
 msgid "Help translate"
 msgstr "Aita tÃµlkida"
 
-#: templates/personal.php:91
+#: templates/personal.php:94
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:93
+#: templates/personal.php:96
 msgid "Use this address to connect to your ownCloud in your file manager"
-msgstr ""
+msgstr "Kasuta seda aadressi Ã¼hendamaks oma ownCloudi failihalduriga"
 
-#: templates/users.php:21 templates/users.php:77
+#: templates/users.php:21 templates/users.php:75
 msgid "Login Name"
 msgstr "Kasutajanimi"
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr "Lisa"
 
-#: templates/users.php:35
+#: templates/users.php:33
 msgid "Default Storage"
-msgstr ""
+msgstr "Vaikimisi maht"
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:39 templates/users.php:133
 msgid "Unlimited"
 msgstr "Piiramatult"
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:57 templates/users.php:148
 msgid "Other"
 msgstr "Muu"
 
-#: templates/users.php:84
+#: templates/users.php:82
 msgid "Storage"
-msgstr ""
+msgstr "Maht"
 
-#: templates/users.php:95
+#: templates/users.php:93
 msgid "change display name"
 msgstr "muuda nÃ¤idatavat nime"
 
-#: templates/users.php:99
+#: templates/users.php:97
 msgid "set new password"
 msgstr "mÃ¤Ã¤ra uus parool"
 
-#: templates/users.php:134
+#: templates/users.php:128
 msgid "Default"
 msgstr "VaikevÃ¤Ã¤rtus"
diff --git a/l10n/et_EE/user_ldap.po b/l10n/et_EE/user_ldap.po
index d16c8b3ed56ace05fd4f22c7c595b27cf4f46b8e..93e601cf3e131615e16cb8480aad2b63000a9403 100644
--- a/l10n/et_EE/user_ldap.po
+++ b/l10n/et_EE/user_ldap.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.
+# 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-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-21 02:00+0200\n"
+"PO-Revision-Date: 2013-05-20 07:58+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,25 +19,29 @@ 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 ""
+msgstr "Serveri seadistuse kustutamine ebaÃµnnestus"
 
 #: ajax/testConfiguration.php:36
 msgid "The configuration is valid and the connection could be established!"
-msgstr ""
+msgstr "Seadistus on korrektne ning Ã¼hendus on olemas!"
 
 #: ajax/testConfiguration.php:39
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
-msgstr ""
+msgstr "Seadistus on korrektne, kuid Ã¼hendus ebaÃµnnestus. Palun kontrolli serveri seadeid ja Ã¼henduseks kasutatavaid kasutajatunnuseid."
 
 #: ajax/testConfiguration.php:43
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
-msgstr ""
+msgstr "Seadistus on vigane. Palun vaata ownCloud logist tÃ¤psemalt."
 
 #: js/settings.js:66
 msgid "Deletion failed"
@@ -44,291 +49,373 @@ msgstr "Kustutamine ebaÃµnnestus"
 
 #: js/settings.js:82
 msgid "Take over settings from recent server configuration?"
-msgstr ""
+msgstr "VÃµta sÃ¤tted viimasest serveri seadistusest?"
 
 #: js/settings.js:83
 msgid "Keep settings?"
-msgstr ""
+msgstr "SÃ¤ilitada seadistused?"
 
 #: js/settings.js:97
 msgid "Cannot add server configuration"
-msgstr ""
+msgstr "Ei suuda lisada serveri seadistust"
+
+#: 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:121
+#: js/settings.js:141
 msgid "Connection test succeeded"
-msgstr ""
+msgstr "Ãœhenduse testimine Ãµnnestus"
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
-msgstr ""
+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 ""
+msgstr "Oled kindel, et tahad kustutada praegust serveri seadistust?"
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
-msgstr ""
+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 ""
+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 ""
+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 ""
+msgstr "Serveri seadistus"
 
-#: templates/settings.php:18
+#: templates/settings.php:32
 msgid "Add Server Configuration"
-msgstr ""
+msgstr "Lisa serveri seadistus"
 
-#: templates/settings.php:23
+#: templates/settings.php:37
 msgid "Host"
 msgstr "Host"
 
-#: templates/settings.php:25
+#: 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:26
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "Baas DN"
 
-#: templates/settings.php:27
+#: templates/settings.php:41
 msgid "One Base DN per line"
-msgstr ""
+msgstr "Ãœks baas-DN rea kohta"
 
-#: templates/settings.php:28
+#: 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:30
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "Kasutaja DN"
 
-#: 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 "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:33
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Parool"
 
-#: templates/settings.php:36
+#: 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:37
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "Kasutajanime filter"
 
-#: 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 "MÃ¤Ã¤rab sisselogimisel kasutatava filtri. %%uid asendab sisselogimistegevuses kasutajanime."
 
-#: templates/settings.php:41
+#: 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:42
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Kasutajate nimekirja filter"
 
-#: templates/settings.php:45
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "MÃ¤Ã¤rab kasutajaid hankides filtri, mida rakendatakse."
 
-#: templates/settings.php:46
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "ilma Ã¼hegi kohatÃ¤itjata, nt. \"objectClass=person\"."
 
-#: templates/settings.php:47
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "Grupi filter"
 
-#: templates/settings.php:50
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "MÃ¤Ã¤rab gruppe hankides filtri, mida rakendatakse."
 
-#: templates/settings.php:51
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "ilma Ã¼hegi kohatÃ¤itjata, nt. \"objectClass=posixGroup\"."
 
-#: templates/settings.php:55
+#: templates/settings.php:69
 msgid "Connection Settings"
-msgstr ""
+msgstr "Ãœhenduse seaded"
 
-#: templates/settings.php:57
+#: templates/settings.php:71
 msgid "Configuration Active"
-msgstr ""
+msgstr "Seadistus aktiivne"
 
-#: templates/settings.php:57
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
-msgstr ""
+msgstr "Kui mÃ¤rkimata, siis seadistust ei kasutata"
 
-#: templates/settings.php:58
+#: templates/settings.php:72
 msgid "Port"
 msgstr "Port"
 
-#: templates/settings.php:59
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
-msgstr ""
+msgstr "Varuserver"
 
-#: 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 ""
+msgstr "Lisa tÃ¤iendav LDAP/AD server, mida replikeeritakse peaserveriga."
 
-#: templates/settings.php:60
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
-msgstr ""
+msgstr "Varuserveri (replika) port"
 
-#: templates/settings.php:61
+#: templates/settings.php:75
 msgid "Disable Main Server"
-msgstr ""
+msgstr "Ã„ra kasuta peaserverit"
 
-#: templates/settings.php:61
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
-msgstr ""
+msgstr "MÃ¤rgituna ownCloud Ã¼hendub ainult varuserverisse."
 
-#: templates/settings.php:62
+#: templates/settings.php:76
 msgid "Use TLS"
-msgstr "Kasutaja TLS"
+msgstr "Kasuta TLS-i"
 
-#: templates/settings.php:62
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
-msgstr ""
+msgstr "LDAPS puhul Ã¤ra kasuta. Ãœhendus ei toimi."
 
-#: templates/settings.php:63
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "MittetÃµstutundlik LDAP server (Windows)"
 
-#: templates/settings.php:64
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "LÃ¼lita SSL sertifikaadi kontrollimine vÃ¤lja."
 
-#: 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 "Kui Ã¼hendus toimib ainult selle valikuga, siis impordi LDAP serveri SSL sertifikaat oma ownCloud serverisse."
 
-#: templates/settings.php:64
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "Pole soovitatav, kasuta ainult testimiseks."
 
-#: templates/settings.php:65
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
-msgstr ""
+msgstr "Puhvri iga"
 
-#: templates/settings.php:65
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr "sekundites. Muudatus tÃ¼hjendab vahemÃ¤lu."
 
-#: templates/settings.php:67
+#: templates/settings.php:81
 msgid "Directory Settings"
-msgstr ""
+msgstr "Kataloogi seaded"
 
-#: templates/settings.php:69
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr "Kasutaja nÃ¤idatava nime vÃ¤li"
 
-#: templates/settings.php:69
+#: 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:70
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "Baaskasutaja puu"
 
-#: templates/settings.php:70
+#: templates/settings.php:84
 msgid "One User Base DN per line"
-msgstr ""
+msgstr "Ãœks kasutajate baas-DN rea kohta"
 
-#: templates/settings.php:71
+#: templates/settings.php:85
 msgid "User Search Attributes"
-msgstr ""
+msgstr "Kasutaja otsingu atribuudid"
 
-#: templates/settings.php:71 templates/settings.php:74
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
-msgstr ""
+msgstr "Valikuline; Ã¼ks atribuut rea kohta"
 
-#: templates/settings.php:72
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr "Grupi nÃ¤idatava nime vÃ¤li"
 
-#: templates/settings.php:72
+#: 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:73
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "Baasgrupi puu"
 
-#: templates/settings.php:73
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
-msgstr ""
+msgstr "Ãœks grupi baas-DN rea kohta"
 
-#: templates/settings.php:74
+#: templates/settings.php:88
 msgid "Group Search Attributes"
-msgstr ""
+msgstr "Grupi otsingu atribuudid"
 
-#: templates/settings.php:75
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr "Grupiliikme seotus"
 
-#: templates/settings.php:77
+#: templates/settings.php:91
 msgid "Special Attributes"
-msgstr ""
+msgstr "Spetsiifilised atribuudid"
 
-#: templates/settings.php:79
+#: templates/settings.php:93
 msgid "Quota Field"
-msgstr ""
+msgstr "Mahupiirangu atribuut"
 
-#: templates/settings.php:80
+#: templates/settings.php:94
 msgid "Quota Default"
-msgstr ""
+msgstr "Vaikimisi mahupiirang"
 
-#: templates/settings.php:80
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr "baitides"
 
-#: templates/settings.php:81
+#: templates/settings.php:95
 msgid "Email Field"
-msgstr ""
+msgstr "Email atribuut"
 
-#: templates/settings.php:82
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
-msgstr ""
+msgstr "Kasutaja kodukataloogi nimetamise reegel"
 
-#: templates/settings.php:82
+#: 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:86
+#: 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 ""
+msgstr "Testi seadistust"
 
-#: templates/settings.php:86
+#: 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 f4cdd7354ca8f3416891c8753a5a2653f93b95b0..b1ac57ddbf92acb421ffe253fc8f267e9e136bd3 100644
--- a/l10n/et_EE/user_webdavauth.po
+++ b/l10n/et_EE/user_webdavauth.po
@@ -3,13 +3,14 @@
 # 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>, 2012-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 17:40+0000\n"
+"POT-Creation-Date: 2013-04-28 01:57+0200\n"
+"PO-Revision-Date: 2013-04-27 19:19+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"
@@ -31,4 +32,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 saadab kasutajatunnused sellel aadressil. See vidin kontrollib vastust ning tuvastab HTTP vastuskoodid 401 ja 403 kui vigased, ning kÃµik teised vastused kui korrektsed kasutajatunnused."
diff --git a/l10n/eu/core.po b/l10n/eu/core.po
index 5b1a990636ad97642691b811d39060cf3b59f2e5..930dc72fd734478cb85d3493f22ca3411e8ac345 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-02-23 00:04+0100\n"
-"PO-Revision-Date: 2013-02-22 22:30+0000\n"
-"Last-Translator: asieriko <asieriko@gmail.com>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10: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"
@@ -164,86 +160,88 @@ msgstr "Abendua"
 msgid "Settings"
 msgstr "Ezarpenak"
 
-#: js/js.js:767
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "segundu"
 
-#: js/js.js:768
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "orain dela minutu 1"
 
-#: js/js.js:769
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr "orain dela {minutes} minutu"
 
-#: js/js.js:770
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr "orain dela ordu bat"
 
-#: js/js.js:771
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr "orain dela {hours} ordu"
 
-#: js/js.js:772
+#: js/js.js:723
 msgid "today"
 msgstr "gaur"
 
-#: js/js.js:773
+#: js/js.js:724
 msgid "yesterday"
 msgstr "atzo"
 
-#: js/js.js:774
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr "orain dela {days} egun"
 
-#: js/js.js:775
+#: js/js.js:726
 msgid "last month"
 msgstr "joan den hilabetean"
 
-#: js/js.js:776
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr "orain dela {months} hilabete"
 
-#: js/js.js:777
+#: js/js.js:728
 msgid "months ago"
 msgstr "hilabete"
 
-#: js/js.js:778
+#: js/js.js:729
 msgid "last year"
 msgstr "joan den urtean"
 
-#: js/js.js:779
+#: js/js.js:730
 msgid "years ago"
 msgstr "urte"
 
-#: js/oc-dialogs.js:126
-msgid "Choose"
-msgstr "Aukeratu"
+#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
+msgid "Ok"
+msgstr "Ados"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
 msgid "Cancel"
 msgstr "Ezeztatu"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "Ez"
+#: js/oc-dialogs.js:185
+msgid "Choose"
+msgstr "Aukeratu"
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:215
 msgid "Yes"
 msgstr "Bai"
 
-#: js/oc-dialogs.js:180
-msgid "Ok"
-msgstr "Ados"
+#: js/oc-dialogs.js:222
+msgid "No"
+msgstr "Ez"
 
 #: 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 "Objetu mota ez dago zehaztuta."
 
-#: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:582
-#: js/share.js:594
+#: 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 "Errorea"
 
@@ -255,127 +253,127 @@ msgstr "App izena ez dago zehaztuta."
 msgid "The required file {file} is not installed!"
 msgstr "Beharrezkoa den {file} fitxategia ez dago instalatuta!"
 
-#: js/share.js:29 js/share.js:43 js/share.js:90
+#: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr "Elkarbanatuta"
 
-#: js/share.js:93
+#: js/share.js:90
 msgid "Share"
 msgstr "Elkarbanatu"
 
-#: js/share.js:141 js/share.js:622
+#: js/share.js:125 js/share.js:617
 msgid "Error while sharing"
 msgstr "Errore bat egon da elkarbanatzean"
 
-#: js/share.js:152
+#: js/share.js:136
 msgid "Error while unsharing"
 msgstr "Errore bat egon da elkarbanaketa desegitean"
 
-#: js/share.js:159
+#: js/share.js:143
 msgid "Error while changing permissions"
 msgstr "Errore bat egon da baimenak aldatzean"
 
-#: js/share.js:168
+#: js/share.js:152
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "{owner}-k zu eta {group} taldearekin elkarbanatuta"
 
-#: js/share.js:170
+#: js/share.js:154
 msgid "Shared with you by {owner}"
 msgstr "{owner}-k zurekin elkarbanatuta"
 
-#: js/share.js:175
+#: js/share.js:159
 msgid "Share with"
 msgstr "Elkarbanatu honekin"
 
-#: js/share.js:180
+#: js/share.js:164
 msgid "Share with link"
 msgstr "Elkarbanatu lotura batekin"
 
-#: js/share.js:183
+#: js/share.js:167
 msgid "Password protect"
 msgstr "Babestu pasahitzarekin"
 
-#: js/share.js:185 templates/installation.php:46 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Pasahitza"
 
-#: js/share.js:189
+#: js/share.js:173
 msgid "Email link to person"
 msgstr "Postaz bidali lotura "
 
-#: js/share.js:190
+#: js/share.js:174
 msgid "Send"
 msgstr "Bidali"
 
-#: js/share.js:194
+#: js/share.js:178
 msgid "Set expiration date"
 msgstr "Ezarri muga data"
 
-#: js/share.js:195
+#: js/share.js:179
 msgid "Expiration date"
 msgstr "Muga data"
 
-#: js/share.js:227
+#: js/share.js:211
 msgid "Share via email:"
 msgstr "Elkarbanatu eposta bidez:"
 
-#: js/share.js:229
+#: js/share.js:213
 msgid "No people found"
 msgstr "Ez da inor aurkitu"
 
-#: js/share.js:256
+#: js/share.js:251
 msgid "Resharing is not allowed"
 msgstr "Berriz elkarbanatzea ez dago baimendua"
 
-#: js/share.js:292
+#: js/share.js:287
 msgid "Shared in {item} with {user}"
 msgstr "{user}ekin {item}-n elkarbanatuta"
 
-#: js/share.js:313
+#: js/share.js:308
 msgid "Unshare"
 msgstr "Ez elkarbanatu"
 
-#: js/share.js:325
+#: js/share.js:320
 msgid "can edit"
 msgstr "editatu dezake"
 
-#: js/share.js:327
+#: js/share.js:322
 msgid "access control"
 msgstr "sarrera kontrola"
 
-#: js/share.js:330
+#: js/share.js:325
 msgid "create"
 msgstr "sortu"
 
-#: js/share.js:333
+#: js/share.js:328
 msgid "update"
 msgstr "eguneratu"
 
-#: js/share.js:336
+#: js/share.js:331
 msgid "delete"
 msgstr "ezabatu"
 
-#: js/share.js:339
+#: js/share.js:334
 msgid "share"
 msgstr "elkarbanatu"
 
-#: js/share.js:373 js/share.js:569
+#: js/share.js:368 js/share.js:564
 msgid "Password protected"
 msgstr "Pasahitzarekin babestuta"
 
-#: js/share.js:582
+#: js/share.js:577
 msgid "Error unsetting expiration date"
 msgstr "Errorea izan da muga data kentzean"
 
-#: js/share.js:594
+#: js/share.js:589
 msgid "Error setting expiration date"
 msgstr "Errore bat egon da muga data ezartzean"
 
-#: js/share.js:609
+#: js/share.js:604
 msgid "Sending ..."
 msgstr "Bidaltzen ..."
 
-#: js/share.js:620
+#: js/share.js:615
 msgid "Email sent"
 msgstr "Eposta bidalia"
 
@@ -398,24 +396,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:40
-#: 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"
 
@@ -449,7 +450,7 @@ msgstr "Aplikazioak"
 
 #: strings.php:8
 msgid "Admin"
-msgstr "Kudeatzailea"
+msgstr "Admin"
 
 #: strings.php:9
 msgid "Help"
@@ -471,115 +472,130 @@ msgstr "Editatu kategoriak"
 msgid "Add"
 msgstr "Gehitu"
 
-#: templates/installation.php:23 templates/installation.php:30
+#: templates/installation.php:24 templates/installation.php:31
+#: templates/installation.php:38
 msgid "Security Warning"
 msgstr "Segurtasun abisua"
 
-#: templates/installation.php:24
+#: templates/installation.php:25
+msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
+msgstr "Zure PHP bertsioa NULL Byte erasoak (CVE-2006-7243) mendera dezake."
+
+#: templates/installation.php:26
+msgid "Please update your PHP installation to use ownCloud securely."
+msgstr "Mesedez eguneratu zure PHP instalazioa ownCloud modu seguru batean erabiltzeko."
+
+#: templates/installation.php:32
 msgid ""
 "No secure random number generator is available, please enable the PHP "
 "OpenSSL extension."
 msgstr "Ez dago hausazko zenbaki sortzaile segururik eskuragarri, mesedez gatiu PHP OpenSSL extensioa."
 
-#: templates/installation.php:25
+#: 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 "Hausazko zenbaki sortzaile segururik gabe erasotzaile batek pasahitza berrezartzeko kodeak iragarri ditzake eta zure kontuaz jabetu."
 
-#: templates/installation.php:31
+#: templates/installation.php:39
 msgid ""
 "Your data directory and files are probably accessible from the internet "
 "because the .htaccess file does not work."
 msgstr "Zure data karpeta eta fitxategiak interneten bidez eskuragarri egon daitezke .htaccess fitxategia ez delako funtzionatzen ari."
 
-#: templates/installation.php:32
+#: 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 "Zure zerbitzaria ongi konfiguratzeko informazioa eskuratzeko, begiratu  <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">dokumentazioa</a>."
 
-#: templates/installation.php:36
+#: templates/installation.php:44
 msgid "Create an <strong>admin account</strong>"
 msgstr "Sortu <strong>kudeatzaile kontu<strong> bat"
 
-#: templates/installation.php:54
+#: templates/installation.php:62
 msgid "Advanced"
 msgstr "Aurreratua"
 
-#: templates/installation.php:56
+#: templates/installation.php:64
 msgid "Data folder"
 msgstr "Datuen karpeta"
 
-#: templates/installation.php:65
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "Konfiguratu datu basea"
 
-#: templates/installation.php:70 templates/installation.php:82
-#: templates/installation.php:93 templates/installation.php:104
+#: 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:117
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "Datubasearen erabiltzailea"
 
-#: templates/installation.php:122
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "Datubasearen pasahitza"
 
-#: templates/installation.php:127
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "Datubasearen izena"
 
-#: templates/installation.php:137
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "Datu basearen taula-lekua"
 
-#: templates/installation.php:144
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "Datubasearen hostalaria"
 
-#: templates/installation.php:150
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "Bukatu konfigurazioa"
 
-#: templates/layout.guest.php:35
+#: templates/layout.guest.php:40
 msgid "web services under your control"
 msgstr "web zerbitzuak zure kontrolpean"
 
-#: templates/layout.user.php:53
+#: 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 "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 96cb7e9a37ef5aa79ccdf4913fb3f4699c05128d..df564bee56ebb3fb8d27f509e94d9483a7f161b1 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-03-04 00:06+0100\n"
-"PO-Revision-Date: 2013-03-03 23:06+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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"
@@ -74,59 +66,70 @@ msgstr "Errore bat izan da diskoan idazterakoan"
 msgid "Not enough storage available"
 msgstr "Ez dago behar aina leku erabilgarri,"
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr "Baliogabeko karpeta."
 
-#: appinfo/app.php:10
+#: appinfo/app.php:12
 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:92 templates/index.php:93
+#: 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/files.js:292 js/files.js:408
-#: js/files.js:439
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "Zain"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} dagoeneko existitzen da"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "ordeztu"
 
-#: js/filelist.js:251
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "aholkatu izena"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "ezeztatu"
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr " {new_name}-k {old_name} ordezkatu du"
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "undo"
 msgstr "desegin"
 
-#: js/filelist.js:323
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr "Ezabatu"
 
+#: js/filelist.js:413
+msgid "1 file uploading"
+msgstr "fitxategi 1 igotzen"
+
+#: js/filelist.js:416 js/filelist.js:470
+msgid "files uploading"
+msgstr "fitxategiak igotzen"
+
 #: js/files.js:52
 msgid "'.' is an invalid file name."
 msgstr "'.' ez da fitxategi izen baliogarria."
@@ -149,77 +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:225
+#: 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:262
+#: 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:262
-msgid "Upload Error"
-msgstr "Igotzean errore bat suertatu da"
+#: js/files.js:277
+msgid "Not enough space available"
+msgstr "Ez dago leku nahikorik."
 
-#: js/files.js:273
-msgid "Close"
-msgstr "Itxi"
-
-#: js/files.js:312
-msgid "1 file uploading"
-msgstr "fitxategi 1 igotzen"
-
-#: js/files.js:315 js/files.js:370 js/files.js:385
-msgid "{count} files uploading"
-msgstr "{count} fitxategi igotzen"
-
-#: js/files.js:388 js/files.js:423
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "Igoera ezeztatuta"
 
-#: js/files.js:497
+#: 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:570
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "URLa ezin da hutsik egon."
 
-#: js/files.js:575
+#: 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:953 templates/index.php:68
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+msgid "Error"
+msgstr "Errorea"
+
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Izena"
 
-#: js/files.js:954 templates/index.php:79
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Tamaina"
 
-#: js/files.js:955 templates/index.php:81
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Aldatuta"
 
-#: js/files.js:974
+#: js/files.js:898
 msgid "1 folder"
 msgstr "karpeta bat"
 
-#: js/files.js:976
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} karpeta"
 
-#: js/files.js:984
+#: js/files.js:908
 msgid "1 file"
 msgstr "fitxategi bat"
 
-#: js/files.js:986
+#: 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"
@@ -272,45 +275,45 @@ msgstr "Karpeta"
 msgid "From link"
 msgstr "Estekatik"
 
-#: templates/index.php:40
+#: templates/index.php:42
 msgid "Deleted files"
 msgstr "Ezabatutako fitxategiak"
 
-#: templates/index.php:46
+#: templates/index.php:48
 msgid "Cancel upload"
 msgstr "Ezeztatu igoera"
 
-#: templates/index.php:53
+#: templates/index.php:54
 msgid "You donâ€™t have write permissions here."
 msgstr "Ez duzu hemen idazteko baimenik."
 
-#: templates/index.php:60
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Ez dago ezer. Igo zerbait!"
 
-#: templates/index.php:74
+#: templates/index.php:75
 msgid "Download"
 msgstr "Deskargatu"
 
-#: templates/index.php:86 templates/index.php:87
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Ez elkarbanatu"
 
-#: templates/index.php:106
+#: templates/index.php:107
 msgid "Upload too large"
-msgstr "Igotakoa handiegia da"
+msgstr "Igoera handiegia da"
 
-#: templates/index.php:108
+#: 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:113
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Fitxategiak eskaneatzen ari da, itxoin mezedez."
 
-#: templates/index.php:116
+#: 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..40ebdc5fdf8b2108f15317afd2eb55454897d2db 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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"
@@ -37,4 +35,4 @@ msgstr "Baztertu hurrengo fitxategi motak enkriptatzetik:"
 
 #: templates/settings.php:12
 msgid "None"
-msgstr "Bat ere ez"
+msgstr "Ezer"
diff --git a/l10n/eu/files_external.po b/l10n/eu/files_external.po
index 6a7867c269d9e5df7f9c3b646a41ee379b1da1de..f6059f32883db199dc9dab4d865f8f231350425e 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-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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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: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 "<b>Abisua:</b> \"smbclient\" ez dago instalatuta. CIFS/SMB partekatutako karpetak montatzea ez da posible. Mesedez eskatu zure sistema kudeatzaileari instalatzea."
 
-#: 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 "<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..ca0772183cff1c999890525577dba1bc93a894b8 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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 1e340f1ca10a76c346066738cf782ad93e180548..d29b34cf73d9f7026bb672dd12787b99af40f4b7 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-03-08 00:25+0100\n"
-"PO-Revision-Date: 2013-03-07 23:25+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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"
@@ -18,12 +17,12 @@ msgstr ""
 "Language: eu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:40
+#: ajax/delete.php:42
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "Ezin izan da %s betirako ezabatu"
 
-#: ajax/undelete.php:41
+#: ajax/undelete.php:42
 #, php-format
 msgid "Couldn't restore %s"
 msgstr "Ezin izan da %s berreskuratu"
@@ -32,6 +31,10 @@ msgstr "Ezin izan da %s berreskuratu"
 msgid "perform restore operation"
 msgstr "berreskuratu"
 
+#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+msgid "Error"
+msgstr "Errorea"
+
 #: js/trash.js:34
 msgid "delete file permanently"
 msgstr "ezabatu fitxategia betirako"
@@ -78,4 +81,4 @@ msgstr "Ezabatu"
 
 #: templates/part.breadcrumb.php:9
 msgid "Deleted Files"
-msgstr ""
+msgstr "Ezabatutako Fitxategiak"
diff --git a/l10n/eu/files_versions.po b/l10n/eu/files_versions.po
index 867a9523a0917df667f87fb39afe8c08fff3d9a5..c7a497b929bea7cf988a85b7024457519d4ec007 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:30+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 6febfeec2d08cafbb75c4128fbaabb406835e255..2319ead91094f47e0be4d26a48a3ff6c9a63c2db 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-03-03 00:06+0100\n"
-"PO-Revision-Date: 2013-03-02 21:40+0000\n"
-"Last-Translator: asieriko <asieriko@gmail.com>\n"
+"POT-Creation-Date: 2013-04-28 01:57+0200\n"
+"PO-Revision-Date: 2013-04-27 23:57+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"
@@ -43,19 +41,19 @@ msgstr "Aplikazioak"
 msgid "Admin"
 msgstr "Admin"
 
-#: files.php:202
+#: files.php:209
 msgid "ZIP download is turned off."
 msgstr "ZIP deskarga ez dago gaituta."
 
-#: files.php:203
+#: files.php:210
 msgid "Files need to be downloaded one by one."
 msgstr "Fitxategiak banan-banan deskargatu behar dira."
 
-#: files.php:204 files.php:231
+#: files.php:211 files.php:244
 msgid "Back to Files"
 msgstr "Itzuli fitxategietara"
 
-#: files.php:228
+#: files.php:241
 msgid "Selected files too large to generate zip file."
 msgstr "Hautatuko fitxategiak oso handiak dira zip fitxategia sortzeko."
 
@@ -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,79 @@ msgstr "%s ezin duzu punturik erabili datu basearen izenean."
 msgid "%s set the database host."
 msgstr "%s sartu datu basearen hostalaria."
 
-#: setup.php:128 setup.php:320 setup.php:365
+#: setup.php:132 setup.php:325 setup.php:370
 msgid "PostgreSQL username and/or password not valid"
 msgstr "PostgreSQL erabiltzaile edota pasahitza ez dira egokiak."
 
-#: setup.php:129 setup.php:152 setup.php:229
+#: setup.php:133 setup.php:156 setup.php:234
 msgid "You need to enter either an existing account or the administrator."
 msgstr "Existitzen den kontu bat edo administradorearena jarri behar duzu."
 
-#: setup.php:151 setup.php:453 setup.php:520
+#: setup.php:155 setup.php:458 setup.php:525
 msgid "Oracle username and/or password not valid"
 msgstr "Oracle erabiltzaile edota pasahitza ez dira egokiak."
 
-#: setup.php:228
+#: setup.php:233
 msgid "MySQL username and/or password not valid"
 msgstr "MySQL erabiltzaile edota pasahitza ez dira egokiak."
 
-#: 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: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:583 setup.php:592 setup.php:600 setup.php:609
+#: setup.php:615
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "DB errorea: \"%s\""
 
-#: 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:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
+#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
+#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "Errorea komando honek sortu du: \"%s\""
 
-#: setup.php:299
+#: setup.php:304
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "MySQL '%s'@'localhost' erabiltzailea dagoeneko existitzen da."
 
-#: setup.php:300
+#: setup.php:305
 msgid "Drop this user from MySQL"
 msgstr "Ezabatu erabiltzaile hau MySQLtik"
 
-#: setup.php:305
+#: setup.php:310
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "MySQL '%s'@'%%' erabiltzailea dagoeneko existitzen da"
 
-#: setup.php:306
+#: setup.php:311
 msgid "Drop this user from MySQL."
 msgstr "Ezabatu erabiltzaile hau MySQLtik."
 
-#: setup.php:579 setup.php:611
+#: setup.php:584 setup.php:616
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Errorea komando honek sortu du: \"%s\", izena: %s, pasahitza: %s"
 
-#: setup.php:631
+#: setup.php:636
 #, 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:849
+#: setup.php:858
 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:850
+#: setup.php:859
 #, 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 +220,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 +229,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 0f589e657ac75c2d3012138a2f2e2ad75d00d035..6c4e25ee0aa4beab23b9a3878f930bdd5e000c2a 100644
--- a/l10n/eu/settings.po
+++ b/l10n/eu/settings.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-03-03 00:06+0100\n"
-"PO-Revision-Date: 2013-03-02 21:40+0000\n"
-"Last-Translator: asieriko <asieriko@gmail.com>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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"
@@ -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"
@@ -96,7 +96,7 @@ msgstr "Eguneratu {appversion}-ra"
 msgid "Disable"
 msgstr "Ez-gaitu"
 
-#: js/apps.js:36 js/apps.js:64
+#: js/apps.js:36 js/apps.js:64 js/apps.js:83
 msgid "Enable"
 msgstr "Gaitu"
 
@@ -104,68 +104,68 @@ msgstr "Gaitu"
 msgid "Please wait...."
 msgstr "Itxoin mesedez..."
 
-#: js/apps.js:84
+#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+msgid "Error"
+msgstr "Errorea"
+
+#: js/apps.js:90
 msgid "Updating...."
 msgstr "Eguneratzen..."
 
-#: js/apps.js:87
+#: js/apps.js:93
 msgid "Error while updating app"
 msgstr "Errorea aplikazioa eguneratzen zen bitartean"
 
-#: js/apps.js:87
-msgid "Error"
-msgstr "Errorea"
-
-#: js/apps.js:90
+#: js/apps.js:96
 msgid "Updated"
 msgstr "Eguneratuta"
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr "Gordetzen..."
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "deleted"
 msgstr "ezabatuta"
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "undo"
 msgstr "desegin"
 
-#: js/users.js:62
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr "Ezin izan da erabiltzailea aldatu"
 
-#: js/users.js:75 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
+#: templates/users.php:103
 msgid "Groups"
 msgstr "Taldeak"
 
-#: js/users.js:78 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr "Talde administradorea"
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "Ezabatu"
 
-#: js/users.js:191
+#: js/users.js:269
 msgid "add group"
 msgstr "gehitu taldea"
 
-#: js/users.js:352
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr "Baliozko erabiltzaile izena eman behar da"
 
-#: js/users.js:353 js/users.js:359 js/users.js:374
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr "Errore bat egon da erabiltzailea sortzean"
 
-#: js/users.js:358
+#: js/users.js:426
 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,15 +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:230 templates/personal.php:102
+#: templates/admin.php:228
+msgid "Less"
+msgstr "Gutxiago"
+
+#: templates/admin.php:235 templates/personal.php:105
 msgid "Version"
 msgstr "Bertsioa"
 
-#: templates/admin.php:233 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 "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:77
 msgid "Password"
 msgstr "Pasahitza"
 
@@ -419,82 +423,70 @@ msgstr "Pasahitz berria"
 msgid "Change password"
 msgstr "Aldatu pasahitza"
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:76
 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:68
 msgid "Email"
-msgstr "E-Posta"
+msgstr "E-posta"
 
-#: templates/personal.php:72
+#: templates/personal.php:70
 msgid "Your email address"
 msgstr "Zure e-posta"
 
-#: templates/personal.php:73
+#: templates/personal.php:71
 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:77 templates/personal.php:78
 msgid "Language"
 msgstr "Hizkuntza"
 
-#: templates/personal.php:86
+#: templates/personal.php:89
 msgid "Help translate"
 msgstr "Lagundu itzultzen"
 
-#: templates/personal.php:91
+#: templates/personal.php:94
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:93
+#: templates/personal.php:96
 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:75
 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:33
 msgid "Default Storage"
 msgstr "Lehenetsitako Biltegiratzea"
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:39 templates/users.php:133
 msgid "Unlimited"
 msgstr "Mugarik gabe"
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:57 templates/users.php:148
 msgid "Other"
-msgstr "Besteak"
+msgstr "Bestelakoa"
 
-#: templates/users.php:84
+#: templates/users.php:82
 msgid "Storage"
 msgstr "Biltegiratzea"
 
-#: templates/users.php:95
+#: templates/users.php:93
 msgid "change display name"
 msgstr "aldatu bistaratze izena"
 
-#: templates/users.php:99
+#: templates/users.php:97
 msgid "set new password"
 msgstr "ezarri pasahitz berria"
 
-#: templates/users.php:134
+#: templates/users.php:128
 msgid "Default"
 msgstr "Lehenetsia"
diff --git a/l10n/eu/user_ldap.po b/l10n/eu/user_ldap.po
index 9eb4cb6144017a2399a207d45ed5281183fe98bd..c0a31304c6c21e66bed5cfc7843baf9c61cfb115 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-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-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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:18
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr "Gehitu Zerbitzariaren Konfigurazioa"
 
-#: templates/settings.php:23
+#: templates/settings.php:37
 msgid "Host"
 msgstr "Hostalaria"
 
-#: templates/settings.php:25
+#: 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:26
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "Oinarrizko DN"
 
-#: templates/settings.php:27
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr "DN Oinarri bat lerroko"
 
-#: templates/settings.php:28
+#: 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:30
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "Erabiltzaile DN"
 
-#: 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 "Lotura egingo den bezero erabiltzailearen DNa, adb. uid=agent,dc=example,dc=com. Sarrera anonimoak gaitzeko utzi DN eta Pasahitza hutsik."
 
-#: templates/settings.php:33
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Pasahitza"
 
-#: templates/settings.php:36
+#: 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:37
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "Erabiltzaileen saioa hasteko iragazkia"
 
-#: 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 "Saioa hastean erabiliko den iragazkia zehazten du. %%uid-ek erabiltzaile izena ordezkatzen du saioa hasterakoan."
 
-#: templates/settings.php:41
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "erabili %%uid txantiloia, adb. \"uid=%%uid\""
 
-#: templates/settings.php:42
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Erabiltzaile zerrendaren Iragazkia"
 
-#: templates/settings.php:45
+#: 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:46
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "txantiloirik gabe, adb. \"objectClass=person\"."
 
-#: templates/settings.php:47
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "Taldeen iragazkia"
 
-#: templates/settings.php:50
+#: 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:51
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "txantiloirik gabe, adb. \"objectClass=posixGroup\"."
 
-#: templates/settings.php:55
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr "Konexio Ezarpenak"
 
-#: templates/settings.php:57
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr "Konfigurazio Aktiboa"
 
-#: templates/settings.php:57
+#: 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:58
+#: templates/settings.php:72
 msgid "Port"
 msgstr "Portua"
 
-#: templates/settings.php:59
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr "Babeskopia (Replica) Ostalaria"
 
-#: 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 "Eman babeskopia ostalari gehigarri bat. LDAP/AD zerbitzari nagusiaren replica bat izan behar da."
 
-#: templates/settings.php:60
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr "Babeskopia (Replica) Ataka"
 
-#: templates/settings.php:61
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr "Desgaitu Zerbitzari Nagusia"
 
-#: templates/settings.php:61
+#: 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:62
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "Erabili TLS"
 
-#: templates/settings.php:62
+#: 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:63
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Maiuskulak eta minuskulak ezberditzen ez dituen LDAP zerbitzaria (windows)"
 
-#: templates/settings.php:64
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "Ezgaitu SSL ziurtagirien egiaztapena."
 
-#: 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 "Konexioa aukera hau ezinbestekoa badu, inportatu LDAP zerbitzariaren SSL ziurtagiria zure ownCloud zerbitzarian."
 
-#: templates/settings.php:64
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "Ez da aholkatzen, erabili bakarrik frogak egiteko."
 
-#: templates/settings.php:65
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr "Katxearen Bizi-Iraupena"
 
-#: templates/settings.php:65
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr "segundutan. Aldaketak katxea husten du."
 
-#: templates/settings.php:67
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr "Karpetaren Ezarpenak"
 
-#: templates/settings.php:69
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr "Erabiltzaileen bistaratzeko izena duen eremua"
 
-#: templates/settings.php:69
+#: 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:70
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "Oinarrizko Erabiltzaile Zuhaitza"
 
-#: templates/settings.php:70
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr "Erabiltzaile DN Oinarri bat lerroko"
 
-#: templates/settings.php:71
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr "Erabili Bilaketa Atributuak "
 
-#: templates/settings.php:71 templates/settings.php:74
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr "Aukerakoa; atributu bat lerro bakoitzeko"
 
-#: templates/settings.php:72
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr "Taldeen bistaratzeko izena duen eremua"
 
-#: templates/settings.php:72
+#: 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:73
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "Oinarrizko Talde Zuhaitza"
 
-#: templates/settings.php:73
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr "Talde DN Oinarri bat lerroko"
 
-#: templates/settings.php:74
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr "Taldekatu Bilaketa Atributuak "
 
-#: templates/settings.php:75
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr "Talde-Kide elkarketak"
 
-#: templates/settings.php:77
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr "Atributu Bereziak"
 
-#: templates/settings.php:79
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr "Kuota Eremua"
 
-#: templates/settings.php:80
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr "Kuota Lehenetsia"
 
-#: templates/settings.php:80
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr "bytetan"
 
-#: templates/settings.php:81
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr "Eposta eremua"
 
-#: templates/settings.php:82
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr "Erabiltzailearen Karpeta Nagusia Izendatzeko Patroia"
 
-#: templates/settings.php:82
+#: 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: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 "Egiaztatu Konfigurazioa"
 
-#: templates/settings.php:86
+#: templates/settings.php:111
 msgid "Help"
 msgstr "Laguntza"
diff --git a/l10n/eu/user_webdavauth.po b/l10n/eu/user_webdavauth.po
index ada89a92f4d221189fb7dc503c3ca010f2cd25e3..7128f70cb6a1bc9da552ecfa3f3d1edabb014079 100644
--- a/l10n/eu/user_webdavauth.po
+++ b/l10n/eu/user_webdavauth.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-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-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
 "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 e800192efd3e1387d62355cb5ce2b6aed548969a..b399c5fbc0bf34ce26574521a93bb7b5d7600f92 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-02-27 00:08+0100\n"
-"PO-Revision-Date: 2013-02-26 07:50+0000\n"
-"Last-Translator: miki_mika1362 <miki_mika1362@yahoo.com>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10: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"
@@ -162,86 +160,88 @@ msgstr "Ø¯Ø³Ø§Ù…Ø¨Ø±"
 msgid "Settings"
 msgstr "ØªÙ†Ø¸ÛŒÙ…Ø§Øª"
 
-#: js/js.js:768
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "Ø«Ø§Ù†ÛŒÙ‡â€ŒÙ‡Ø§ Ù¾ÛŒØ´"
 
-#: js/js.js:769
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "1 Ø¯Ù‚ÛŒÙ‚Ù‡ Ù¾ÛŒØ´"
 
-#: js/js.js:770
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr "{Ø¯Ù‚ÛŒÙ‚Ù‡ Ù‡Ø§} Ø¯Ù‚ÛŒÙ‚Ù‡ Ù‡Ø§ÛŒ Ù¾ÛŒØ´"
 
-#: js/js.js:771
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr "1 Ø³Ø§Ø¹Øª Ù¾ÛŒØ´"
 
-#: js/js.js:772
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr "{Ø³Ø§Ø¹Øª Ù‡Ø§} Ø³Ø§Ø¹Øª Ù‡Ø§ Ù¾ÛŒØ´"
 
-#: js/js.js:773
+#: js/js.js:723
 msgid "today"
 msgstr "Ø§Ù…Ø±ÙˆØ²"
 
-#: js/js.js:774
+#: js/js.js:724
 msgid "yesterday"
 msgstr "Ø¯ÛŒØ±ÙˆØ²"
 
-#: js/js.js:775
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr "{Ø±ÙˆØ²Ù‡Ø§} Ø±ÙˆØ²Ù‡Ø§ÛŒ Ù¾ÛŒØ´"
 
-#: js/js.js:776
+#: js/js.js:726
 msgid "last month"
 msgstr "Ù…Ø§Ù‡ Ù‚Ø¨Ù„"
 
-#: js/js.js:777
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr "{Ù…Ø§Ù‡ Ù‡Ø§} Ù…Ø§Ù‡ Ù‡Ø§ Ù¾ÛŒØ´"
 
-#: js/js.js:778
+#: js/js.js:728
 msgid "months ago"
 msgstr "Ù…Ø§Ù‡â€ŒÙ‡Ø§ÛŒ Ù‚Ø¨Ù„"
 
-#: js/js.js:779
+#: js/js.js:729
 msgid "last year"
 msgstr "Ø³Ø§Ù„ Ù‚Ø¨Ù„"
 
-#: js/js.js:780
+#: js/js.js:730
 msgid "years ago"
 msgstr "Ø³Ø§Ù„â€ŒÙ‡Ø§ÛŒ Ù‚Ø¨Ù„"
 
-#: js/oc-dialogs.js:126
-msgid "Choose"
-msgstr "Ø§Ù†ØªØ®Ø§Ø¨ Ú©Ø±Ø¯Ù†"
+#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
+msgid "Ok"
+msgstr "Ù‚Ø¨ÙˆÙ„"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
 msgid "Cancel"
 msgstr "Ù…Ù†ØµØ±Ù Ø´Ø¯Ù†"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "Ù†Ù‡"
+#: js/oc-dialogs.js:185
+msgid "Choose"
+msgstr "Ø§Ù†ØªØ®Ø§Ø¨ Ú©Ø±Ø¯Ù†"
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:215
 msgid "Yes"
 msgstr "Ø¨Ù„Ù‡"
 
-#: js/oc-dialogs.js:180
-msgid "Ok"
-msgstr "Ù‚Ø¨ÙˆÙ„"
+#: js/oc-dialogs.js:222
+msgid "No"
+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:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:582
-#: js/share.js:594
+#: 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 "Ø®Ø·Ø§"
 
@@ -253,127 +253,127 @@ msgstr "Ù†Ø§Ù… Ø¨Ø±Ù†Ø§Ù…Ù‡ ØªØ¹ÛŒÛŒÙ† Ù†Ø´Ø¯Ù‡ Ø§Ø³Øª."
 msgid "The required file {file} is not installed!"
 msgstr "Ù¾Ø±ÙˆÙ†Ø¯Ù‡ { Ù¾Ø±ÙˆÙ†Ø¯Ù‡} Ø¯Ø±Ø®ÙˆØ§Ø³Øª Ø´Ø¯Ù‡ Ù†ØµØ¨ Ù†Ø´Ø¯Ù‡ Ø§Ø³Øª !"
 
-#: js/share.js:29 js/share.js:43 js/share.js:90
+#: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr "Ø§Ø´ØªØ±Ø§Ú© Ú¯Ø°Ø§Ø´ØªÙ‡ Ø´Ø¯Ù‡"
 
-#: js/share.js:93
+#: js/share.js:90
 msgid "Share"
-msgstr "Ø§Ø´ØªØ±Ø§Ú©â€ŒÚ¯Ø²Ø§Ø±ÛŒ"
+msgstr "Ø§Ø´ØªØ±Ø§Ú©â€ŒÚ¯Ø°Ø§Ø±ÛŒ"
 
-#: js/share.js:141 js/share.js:622
+#: js/share.js:125 js/share.js:617
 msgid "Error while sharing"
 msgstr "Ø®Ø·Ø§ Ø¯Ø±ØØ§Ù„ Ø¨Ù‡ Ø§Ø´ØªØ±Ø§Ú© Ú¯Ø°Ø§Ø´ØªÙ†"
 
-#: js/share.js:152
+#: js/share.js:136
 msgid "Error while unsharing"
 msgstr "Ø®Ø·Ø§ Ø¯Ø±ØØ§Ù„ Ù„ØºÙˆ Ø§Ø´ØªØ±Ø§Ú©"
 
-#: js/share.js:159
+#: js/share.js:143
 msgid "Error while changing permissions"
 msgstr "Ø®Ø·Ø§ Ø¯Ø± ØØ§Ù„ ØªØºÛŒÛŒØ± Ù…Ø¬ÙˆØ²"
 
-#: js/share.js:168
+#: js/share.js:152
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Ø¨Ù‡ Ø§Ø´ØªØ±Ø§Ú© Ú¯Ø°Ø§Ø´ØªÙ‡ Ø´Ø¯Ù‡ Ø¨Ø§ Ø´Ù…Ø§ Ùˆ Ú¯Ø±ÙˆÙ‡ {Ú¯Ø±ÙˆÙ‡} ØªÙˆØ³Ø· {Ø¯Ø§Ø±Ù†Ø¯Ù‡}"
 
-#: js/share.js:170
+#: js/share.js:154
 msgid "Shared with you by {owner}"
 msgstr "Ø¨Ù‡ Ø§Ø´ØªØ±Ø§Ú© Ú¯Ø°Ø§Ø´ØªÙ‡ Ø´Ø¯Ù‡ Ø¨Ø§ Ø´Ù…Ø§ ØªÙˆØ³Ø· { Ø¯Ø§Ø±Ù†Ø¯Ù‡}"
 
-#: js/share.js:175
+#: js/share.js:159
 msgid "Share with"
 msgstr "Ø¨Ù‡ Ø§Ø´ØªØ±Ø§Ú© Ú¯Ø°Ø§Ø´ØªÙ† Ø¨Ø§"
 
-#: js/share.js:180
+#: js/share.js:164
 msgid "Share with link"
 msgstr "Ø¨Ù‡ Ø§Ø´ØªØ±Ø§Ú© Ú¯Ø°Ø§Ø´ØªÙ† Ø¨Ø§ Ù¾ÛŒÙˆÙ†Ø¯"
 
-#: js/share.js:183
+#: js/share.js:167
 msgid "Password protect"
 msgstr "Ù†Ú¯Ù‡Ø¯Ø§Ø±ÛŒ Ú©Ø±Ø¯Ù† Ø±Ù…Ø² Ø¹Ø¨ÙˆØ±"
 
-#: js/share.js:185 templates/installation.php:47 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Ú¯Ø°Ø±ÙˆØ§Ú˜Ù‡"
 
-#: js/share.js:189
+#: js/share.js:173
 msgid "Email link to person"
 msgstr "Ù¾ÛŒÙˆÙ†Ø¯ Ø§ÛŒÙ…ÛŒÙ„ Ø¨Ø±Ø§ÛŒ Ø´Ø®Øµ."
 
-#: js/share.js:190
+#: js/share.js:174
 msgid "Send"
 msgstr "Ø§Ø±Ø³Ø§Ù„"
 
-#: js/share.js:194
+#: js/share.js:178
 msgid "Set expiration date"
 msgstr "ØªÙ†Ø¸ÛŒÙ… ØªØ§Ø±ÛŒØ® Ø§Ù†Ù‚Ø¶Ø§"
 
-#: js/share.js:195
+#: js/share.js:179
 msgid "Expiration date"
 msgstr "ØªØ§Ø±ÛŒØ® Ø§Ù†Ù‚Ø¶Ø§"
 
-#: js/share.js:227
+#: js/share.js:211
 msgid "Share via email:"
 msgstr "Ø§Ø² Ø·Ø±ÛŒÙ‚ Ø§ÛŒÙ…ÛŒÙ„ Ø¨Ù‡ Ø§Ø´ØªØ±Ø§Ú© Ø¨Ú¯Ø°Ø§Ø±ÛŒØ¯ :"
 
-#: js/share.js:229
+#: js/share.js:213
 msgid "No people found"
 msgstr "Ú©Ø³ÛŒ ÛŒØ§ÙØª Ù†Ø´Ø¯"
 
-#: js/share.js:256
+#: js/share.js:251
 msgid "Resharing is not allowed"
 msgstr "Ø§Ø´ØªØ±Ø§Ú© Ú¯Ø°Ø§Ø±ÛŒ Ù…Ø¬Ø¯Ø¯ Ù…Ø¬Ø§Ø² Ù†Ù…ÛŒ Ø¨Ø§Ø´Ø¯"
 
-#: js/share.js:292
+#: js/share.js:287
 msgid "Shared in {item} with {user}"
 msgstr "Ø¨Ù‡ Ø§Ø´ØªØ±Ø§Ú© Ú¯Ø°Ø§Ø´ØªÙ‡ Ø´Ø¯Ù‡ Ø¯Ø± {Ø¨Ø®Ø´} Ø¨Ø§ {Ú©Ø§Ø±Ø¨Ø±}"
 
-#: js/share.js:313
+#: js/share.js:308
 msgid "Unshare"
 msgstr "Ù„ØºÙˆ Ø§Ø´ØªØ±Ø§Ú©"
 
-#: js/share.js:325
+#: js/share.js:320
 msgid "can edit"
 msgstr "Ù…ÛŒ ØªÙˆØ§Ù† ÙˆÛŒØ±Ø§ÛŒØ´ Ú©Ø±Ø¯"
 
-#: js/share.js:327
+#: js/share.js:322
 msgid "access control"
 msgstr "Ú©Ù†ØªØ±Ù„ Ø¯Ø³ØªØ±Ø³ÛŒ"
 
-#: js/share.js:330
+#: js/share.js:325
 msgid "create"
 msgstr "Ø§ÛŒØ¬Ø§Ø¯"
 
-#: js/share.js:333
+#: js/share.js:328
 msgid "update"
 msgstr "Ø¨Ù‡ Ø±ÙˆØ²"
 
-#: js/share.js:336
+#: js/share.js:331
 msgid "delete"
 msgstr "Ù¾Ø§Ú© Ú©Ø±Ø¯Ù†"
 
-#: js/share.js:339
+#: js/share.js:334
 msgid "share"
 msgstr "Ø¨Ù‡ Ø§Ø´ØªØ±Ø§Ú© Ú¯Ø°Ø§Ø´ØªÙ†"
 
-#: js/share.js:373 js/share.js:569
+#: js/share.js:368 js/share.js:564
 msgid "Password protected"
 msgstr "Ù†Ú¯Ù‡Ø¯Ø§Ø±ÛŒ Ø§Ø² Ø±Ù…Ø² Ø¹Ø¨ÙˆØ±"
 
-#: js/share.js:582
+#: js/share.js:577
 msgid "Error unsetting expiration date"
 msgstr "Ø®Ø·Ø§ Ø¯Ø± ØªÙ†Ø¸ÛŒÙ… Ù†Ú©Ø±Ø¯Ù† ØªØ§Ø±ÛŒØ® Ø§Ù†Ù‚Ø¶Ø§ "
 
-#: js/share.js:594
+#: js/share.js:589
 msgid "Error setting expiration date"
 msgstr "Ø®Ø·Ø§ Ø¯Ø± ØªÙ†Ø¸ÛŒÙ… ØªØ§Ø±ÛŒØ® Ø§Ù†Ù‚Ø¶Ø§"
 
-#: js/share.js:609
+#: js/share.js:604
 msgid "Sending ..."
 msgstr "Ø¯Ø±ØØ§Ù„ Ø§Ø±Ø³Ø§Ù„ ..."
 
-#: js/share.js:620
+#: js/share.js:615
 msgid "Email sent"
 msgstr "Ø§ÛŒÙ…ÛŒÙ„ Ø§Ø±Ø³Ø§Ù„ Ø´Ø¯"
 
@@ -396,24 +396,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:41
-#: 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,11 +442,11 @@ msgstr "Ø´Ø®ØµÛŒ"
 
 #: strings.php:6
 msgid "Users"
-msgstr "Ú©Ø§Ø±Ø¨Ø± Ù‡Ø§"
+msgstr "Ú©Ø§Ø±Ø¨Ø±Ø§Ù†"
 
 #: strings.php:7
 msgid "Apps"
-msgstr "Ø¨Ø±Ù†Ø§Ù…Ù‡"
+msgstr "  Ø¨Ø±Ù†Ø§Ù…Ù‡ Ù‡Ø§"
 
 #: strings.php:8
 msgid "Admin"
@@ -451,7 +454,7 @@ msgstr "Ù…Ø¯ÛŒØ±"
 
 #: strings.php:9
 msgid "Help"
-msgstr "Ú©Ù…Ú©"
+msgstr "Ø±Ø§Ù‡â€ŒÙ†Ù…Ø§"
 
 #: templates/403.php:12
 msgid "Access forbidden"
@@ -463,124 +466,138 @@ msgstr "Ù¾ÛŒØ¯Ø§ Ù†Ø´Ø¯"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
-msgstr "ÙˆÛŒØ±Ø§ÛŒØ´ Ú¯Ø±ÙˆÙ‡ Ù‡Ø§"
+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 "Ù†Ø³Ø®Ù‡ ÛŒ PHP Ø´Ù…Ø§ Ø¯Ø± Ø¨Ø±Ø§Ø¨Ø± ØÙ…Ù„Ø§Øª NULL Byte Ø¢Ø³ÛŒØ¨ Ù¾Ø°ÛŒØ± Ø§Ø³Øª.(CVE-2006-7243)"
+
+#: templates/installation.php:26
+msgid "Please update your PHP installation to use ownCloud securely."
+msgstr "Ù„Ø·ÙØ§ Ø¨Ø±Ù†Ø§Ù…Ù‡ ÛŒ PHP Ø®ÙˆØ¯ØªØ§Ù† Ø±Ø§ Ø¨Ø±ÙˆØ² Ú©Ù†ÛŒØ¯ ØªØ§ Ø¨ØªÙˆØ§Ù†ÛŒØ¯ Ø§ÛŒÙ…Ù† ØªØ± Ø§Ø² ownCloud Ø§Ø³ØªÙØ§Ø¯Ù‡ Ú©Ù†ÛŒØ¯."
+
+#: templates/installation.php:32
 msgid ""
 "No secure random number generator is available, please enable the PHP "
 "OpenSSL extension."
 msgstr "Ù‡ÛŒÚ† Ù…ÙˆÙ„Ø¯ ØªØµØ§Ø¯ÙÛŒ Ø§Ù…Ù† Ø¯Ø± Ø¯Ø³ØªØ±Ø³ Ù†ÛŒØ³ØªØŒ Ù„Ø·ÙØ§ ÙØ±Ù…Øª PHP OpenSSL Ø±Ø§ ÙØ¹Ø§Ù„ Ù†Ù…Ø§ÛŒÛŒØ¯."
 
-#: 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 ""
+msgstr "ÙØ§ÛŒÙ„Ù‡Ø§ Ùˆ ÙÙ‡Ø±Ø³Øª Ù‡Ø§ÛŒ Ø¯Ø§Ø¯Ù‡ Ù‡Ø§ÛŒ Ø´Ù…Ø§ Ù‚Ø§Ø¨Ù„ Ø§Ø² Ø§ÛŒÙ†ØªØ±Ù†Øª Ù‚Ø§Ø¨Ù„ Ø¯Ø³ØªØ±Ø³ÛŒ Ù‡Ø³ØªÙ†Ø¯ØŒ Ú†ÙˆÙ†Ú©Ù‡ ÙØ§ÛŒÙ„ htacces. Ú©Ø§Ø± Ù†Ù…ÛŒ Ú©Ù†Ø¯."
 
-#: templates/installation.php:33
+#: 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:37
+#: templates/installation.php:44
 msgid "Create an <strong>admin account</strong>"
 msgstr "Ù„Ø·ÙØ§ ÛŒÚ© <strong> Ø´Ù†Ø§Ø³Ù‡ Ø¨Ø±Ø§ÛŒ Ù…Ø¯ÛŒØ±</strong> Ø¨Ø³Ø§Ø²ÛŒØ¯"
 
-#: templates/installation.php:55
+#: templates/installation.php:62
 msgid "Advanced"
-msgstr "ØØ±ÙÙ‡ Ø§ÛŒ"
+msgstr "Ù¾ÛŒØ´Ø±ÙØªÙ‡"
 
-#: templates/installation.php:57
+#: templates/installation.php:64
 msgid "Data folder"
 msgstr "Ù¾ÙˆØ´Ù‡ Ø§Ø·Ù„Ø§Ø¹Ø§ØªÛŒ"
 
-#: templates/installation.php:66
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "Ù¾Ø§ÛŒÚ¯Ø§Ù‡ Ø¯Ø§Ø¯Ù‡ Ø¨Ø±Ù†Ø§Ù…Ù‡ Ø±ÛŒØ²ÛŒ Ø´Ø¯Ù†Ø¯"
 
-#: templates/installation.php:71 templates/installation.php:83
-#: templates/installation.php:94 templates/installation.php:105
-#: templates/installation.php:117
+#: 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:129
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "Ø´Ù†Ø§Ø³Ù‡ Ù¾Ø§ÛŒÚ¯Ø§Ù‡ Ø¯Ø§Ø¯Ù‡"
 
-#: templates/installation.php:134
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "Ù¾Ø³ÙˆØ±Ø¯ Ù¾Ø§ÛŒÚ¯Ø§Ù‡ Ø¯Ø§Ø¯Ù‡"
 
-#: templates/installation.php:139
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "Ù†Ø§Ù… Ù¾Ø§ÛŒÚ¯Ø§Ù‡ Ø¯Ø§Ø¯Ù‡"
 
-#: templates/installation.php:149
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "Ø¬Ø¯ÙˆÙ„ Ù¾Ø§ÛŒÚ¯Ø§Ù‡ Ø¯Ø§Ø¯Ù‡"
 
-#: templates/installation.php:156
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "Ù‡Ø§Ø³Øª Ù¾Ø§ÛŒÚ¯Ø§Ù‡ Ø¯Ø§Ø¯Ù‡"
 
-#: templates/installation.php:162
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "Ø§ØªÙ…Ø§Ù… Ù†ØµØ¨"
 
-#: templates/layout.guest.php:35
+#: templates/layout.guest.php:40
 msgid "web services under your control"
-msgstr "Ø³Ø±ÙˆÛŒØ³ ÙˆØ¨ ØªØØª Ú©Ù†ØªØ±Ù„ Ø´Ù…Ø§"
+msgstr "Ø³Ø±ÙˆÛŒØ³ Ù‡Ø§ÛŒ ØªØØª ÙˆØ¨ Ø¯Ø± Ú©Ù†ØªØ±Ù„ Ø´Ù…Ø§"
+
+#: templates/layout.user.php:36
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr ""
 
-#: templates/layout.user.php:53
+#: 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 ""
+msgstr "ÙˆØ±ÙˆØ¯ Ù…ØªÙ†Ø§ÙˆØ¨"
 
 #: templates/part.pagenavi.php:3
 msgid "prev"
diff --git a/l10n/fa/files.po b/l10n/fa/files.po
index a6f1b66d2f4169cd9f96dbb0c2d9b28558848ebf..ca53e5b2c93d5e101c68eb2d6cb7373b7ee4ccff 100644
--- a/l10n/fa/files.po
+++ b/l10n/fa/files.po
@@ -3,16 +3,12 @@
 # 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-03-04 00:06+0100\n"
-"PO-Revision-Date: 2013-03-03 23:06+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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"
@@ -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"
@@ -72,60 +64,71 @@ msgstr "Ù†ÙˆØ´ØªÙ† Ø¨Ø± Ø±ÙˆÛŒ Ø¯ÛŒØ³Ú© Ø³Ø®Øª Ù†Ø§Ù…ÙˆÙÙ‚ Ø¨ÙˆØ¯"
 
 #: ajax/upload.php:51
 msgid "Not enough storage available"
-msgstr ""
+msgstr "ÙØ¶Ø§ÛŒ Ú©Ø§ÙÛŒ Ø¯Ø± Ø¯Ø³ØªØ±Ø³ Ù†ÛŒØ³Øª"
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr "ÙÙ‡Ø±Ø³Øª Ø±Ø§Ù‡Ù†Ù…Ø§ Ù†Ø§Ù…Ø¹ØªØ¨Ø± Ù…ÛŒ Ø¨Ø§Ø´Ø¯."
 
-#: appinfo/app.php:10
+#: 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 ""
+msgstr "ØØ°Ù Ù‚Ø·Ø¹ÛŒ"
 
-#: js/fileactions.js:127 templates/index.php:92 templates/index.php:93
+#: 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/files.js:292 js/files.js:408
-#: js/files.js:439
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "Ø¯Ø± Ø§Ù†ØªØ¸Ø§Ø±"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{Ù†Ø§Ù… _Ø¬Ø¯ÛŒØ¯} Ø¯Ø± ØØ§Ù„ ØØ§Ø¶Ø± ÙˆØ¬ÙˆØ¯ Ø¯Ø§Ø±Ø¯."
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "Ø¬Ø§ÛŒÚ¯Ø²ÛŒÙ†"
 
-#: js/filelist.js:251
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "Ù¾ÛŒØ´Ù†Ù‡Ø§Ø¯ Ù†Ø§Ù…"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "Ù„ØºÙˆ"
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "{Ù†Ø§Ù…_Ø¬Ø¯ÛŒØ¯} Ø¨Ø§ { Ù†Ø§Ù…_Ù‚Ø¯ÛŒÙ…ÛŒ} Ø¬Ø§ÛŒÚ¯Ø²ÛŒÙ† Ø´Ø¯."
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "undo"
 msgstr "Ø¨Ø§Ø²Ú¯Ø´Øª"
 
-#: js/filelist.js:323
+#: js/filelist.js:331
 msgid "perform delete operation"
-msgstr ""
+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."
@@ -143,86 +146,86 @@ 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:225
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Ø¯Ø§Ù†Ù„ÙˆØ¯ Ø´Ù…Ø§ Ø¯Ø± ØØ§Ù„ Ø¢Ù…Ø§Ø¯Ù‡ Ø´Ø¯Ù† Ø§Ø³Øª. Ø¯Ø± ØµÙˆØ±ØªÛŒÚ©Ù‡ Ù¾Ø±ÙˆÙ†Ø¯Ù‡ Ù‡Ø§ Ø¨Ø²Ø±Ú¯ Ø¨Ø§Ø´Ù†Ø¯ Ù…Ù…Ú©Ù† Ø§Ø³Øª Ù…Ø¯ØªÛŒ Ø·ÙˆÙ„ Ø¨Ú©Ø´Ø¯."
 
-#: js/files.js:262
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Ù†Ø§ØªÙˆØ§Ù† Ø¯Ø± Ø¨Ø§Ø±Ú¯Ø°Ø§Ø±ÛŒ ÛŒØ§ ÙØ§ÛŒÙ„ ÛŒÚ© Ù¾ÙˆØ´Ù‡ Ø§Ø³Øª ÛŒØ§ 0Ø¨Ø§ÛŒØª Ø¯Ø§Ø±Ø¯"
 
-#: js/files.js:262
-msgid "Upload Error"
-msgstr "Ø®Ø·Ø§ Ø¯Ø± Ø¨Ø§Ø± Ú¯Ø°Ø§Ø±ÛŒ"
-
-#: js/files.js:273
-msgid "Close"
-msgstr "Ø¨Ø³ØªÙ†"
+#: js/files.js:277
+msgid "Not enough space available"
+msgstr "ÙØ¶Ø§ÛŒ Ú©Ø§ÙÛŒ Ø¯Ø± Ø¯Ø³ØªØ±Ø³ Ù†ÛŒØ³Øª"
 
-#: js/files.js:312
-msgid "1 file uploading"
-msgstr "1 Ù¾Ø±ÙˆÙ†Ø¯Ù‡ Ø¢Ù¾Ù„ÙˆØ¯ Ø´Ø¯."
-
-#: js/files.js:315 js/files.js:370 js/files.js:385
-msgid "{count} files uploading"
-msgstr "{ Ø´Ù…Ø§Ø± } ÙØ§ÛŒÙ„ Ù‡Ø§ÛŒ Ø¯Ø± ØØ§Ù„ Ø¢Ù¾Ù„ÙˆØ¯"
-
-#: js/files.js:388 js/files.js:423
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "Ø¨Ø§Ø± Ú¯Ø°Ø§Ø±ÛŒ Ù„ØºÙˆ Ø´Ø¯"
 
-#: js/files.js:497
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Ø¢Ù¾Ù„ÙˆØ¯Ú©Ø±Ø¯Ù† Ù¾Ø±ÙˆÙ†Ø¯Ù‡ Ø¯Ø± ØØ§Ù„ Ù¾ÛŒØ´Ø±ÙØª Ø§Ø³Øª. Ø¯Ø± ØµÙˆØ±Øª Ø®Ø±ÙˆØ¬ Ø§Ø² ØµÙØÙ‡ Ø¢Ù¾Ù„ÙˆØ¯ Ù„ØºÙˆ Ù…ÛŒÚ¯Ø±Ø¯Ø¯. "
 
-#: js/files.js:570
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "URL  Ù†Ù…ÛŒ ØªÙˆØ§Ù†Ø¯ Ø®Ø§Ù„ÛŒ Ø¨Ø§Ø´Ø¯."
 
-#: js/files.js:575
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Ù†Ø§Ù… Ù¾ÙˆØ´Ù‡ Ù†Ø§Ù…Ø¹ØªØ¨Ø± Ø§Ø³Øª. Ø§Ø³ØªÙØ§Ø¯Ù‡ Ø§Ø² \" Ø¨Ù‡ Ø§Ø´ØªØ±Ø§Ú© Ú¯Ø°Ø§Ø´ØªÙ‡ Ø´Ø¯Ù‡ \" Ù…ØªØ¹Ù„Ù‚ Ø¨Ù‡ Ø³Ø§ÛŒØª Owncloud Ø§Ø³Øª."
 
-#: js/files.js:953 templates/index.php:68
+#: 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:954 templates/index.php:79
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Ø§Ù†Ø¯Ø§Ø²Ù‡"
 
-#: js/files.js:955 templates/index.php:81
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
-msgstr "ØªØºÛŒÛŒØ± ÛŒØ§ÙØªÙ‡"
+msgstr "ØªØ§Ø±ÛŒØ®"
 
-#: js/files.js:974
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 Ù¾ÙˆØ´Ù‡"
 
-#: js/files.js:976
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{ Ø´Ù…Ø§Ø±} Ù¾ÙˆØ´Ù‡ Ù‡Ø§"
 
-#: js/files.js:984
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 Ù¾Ø±ÙˆÙ†Ø¯Ù‡"
 
-#: js/files.js:986
+#: 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"
@@ -272,48 +275,48 @@ msgstr "Ù¾ÙˆØ´Ù‡"
 msgid "From link"
 msgstr "Ø§Ø² Ù¾ÛŒÙˆÙ†Ø¯"
 
-#: templates/index.php:40
+#: templates/index.php:42
 msgid "Deleted files"
-msgstr ""
+msgstr "ÙØ§ÛŒÙ„ Ù‡Ø§ÛŒ ØØ°Ù Ø´Ø¯Ù‡"
 
-#: templates/index.php:46
+#: templates/index.php:48
 msgid "Cancel upload"
 msgstr "Ù…ØªÙˆÙ‚Ù Ú©Ø±Ø¯Ù† Ø¨Ø§Ø± Ú¯Ø°Ø§Ø±ÛŒ"
 
-#: templates/index.php:53
+#: templates/index.php:54
 msgid "You donâ€™t have write permissions here."
-msgstr ""
+msgstr "Ø´Ù…Ø§ Ø§Ø¬Ø§Ø²Ù‡ ÛŒ Ù†ÙˆØ´ØªÙ† Ø¯Ø± Ø§ÛŒÙ†Ø¬Ø§ Ø±Ø§ Ù†Ø¯Ø§Ø±ÛŒØ¯"
 
-#: templates/index.php:60
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Ø§ÛŒÙ†Ø¬Ø§ Ù‡ÛŒÚ† Ú†ÛŒØ² Ù†ÛŒØ³Øª."
 
-#: templates/index.php:74
+#: templates/index.php:75
 msgid "Download"
-msgstr "Ø¨Ø§Ø±Ú¯ÛŒØ±ÛŒ"
+msgstr "Ø¯Ø§Ù†Ù„ÙˆØ¯"
 
-#: templates/index.php:86 templates/index.php:87
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Ù„ØºÙˆ Ø§Ø´ØªØ±Ø§Ú©"
 
-#: templates/index.php:106
+#: templates/index.php:107
 msgid "Upload too large"
-msgstr "ØØ¬Ù… Ø¨Ø§Ø±Ú¯Ø°Ø§Ø±ÛŒ Ø¨Ø³ÛŒØ§Ø± Ø²ÛŒØ§Ø¯ Ø§Ø³Øª"
+msgstr "Ø³Ø§ÛŒØ² ÙØ§ÛŒÙ„ Ø¨Ø±Ø§ÛŒ Ø¢Ù¾Ù„ÙˆØ¯ Ø²ÛŒØ§Ø¯ Ø§Ø³Øª(Ù….ØªÙ†Ø¸ÛŒÙ…Ø§Øª Ø¯Ø± php.ini)"
 
-#: templates/index.php:108
+#: 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:113
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Ù¾Ø±ÙˆÙ†Ø¯Ù‡ Ù‡Ø§ Ø¯Ø± ØØ§Ù„ Ø¨Ø§Ø²Ø±Ø³ÛŒ Ù‡Ø³ØªÙ†Ø¯ Ù„Ø·ÙØ§ ØµØ¨Ø± Ú©Ù†ÛŒØ¯"
 
-#: templates/index.php:116
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "Ø¨Ø§Ø²Ø±Ø³ÛŒ Ú©Ù†ÙˆÙ†ÛŒ"
 
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
-msgstr ""
+msgstr "Ø¨Ù‡Ø¨ÙˆØ¯ ÙØ§ÛŒÙ„ Ø³ÛŒØ³ØªÙ…ÛŒ Ø°Ø®ÛŒØ±Ù‡ Ú¯Ø§Ù‡..."
diff --git a/l10n/fa/files_encryption.po b/l10n/fa/files_encryption.po
index ca4053cf7ee19d470142ed34d468a047458c9c56..fef3cfd1926cbc8ea933680376569c6ee86c9370 100644
--- a/l10n/fa/files_encryption.po
+++ b/l10n/fa/files_encryption.po
@@ -3,15 +3,12 @@
 # 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-02-10 00:08+0100\n"
-"PO-Revision-Date: 2013-02-09 23:09+0000\n"
+"POT-Creation-Date: 2013-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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"
@@ -26,15 +23,15 @@ msgstr "Ø±Ù…Ø²Ú¯Ø°Ø§Ø±ÛŒ"
 
 #: templates/settings-personal.php:7
 msgid "File encryption is enabled."
-msgstr ""
+msgstr "Ø±Ù…Ø²Ù†Ú¯Ø§Ø±ÛŒ ÙØ§ÛŒÙ„Ù‡Ø§ ÙØ¹Ø§Ù„ Ø´Ø¯."
 
 #: templates/settings-personal.php:11
 msgid "The following file types will not be encrypted:"
-msgstr ""
+msgstr "ÙØ§ÛŒÙ„Ù‡Ø§ÛŒ Ø²ÛŒØ± Ø±Ù…Ø²Ù†Ú¯Ø§Ø±ÛŒ Ù†Ø®ÙˆØ§Ù‡Ù†Ø¯ Ø´Ø¯:"
 
 #: templates/settings.php:7
 msgid "Exclude the following file types from encryption:"
-msgstr ""
+msgstr "ÙØ§ÛŒÙ„Ù‡Ø§ÛŒ Ø²ÛŒØ± Ø§Ø² Ø±Ù…Ø²Ù†Ú¯Ø§Ø±ÛŒ Ù†Ø§Ø¯ÛŒØ¯Ù‡ Ú¯Ø±ÙØªÙ‡ Ù…ÛŒ Ø´ÙˆÙ†Ø¯:"
 
 #: templates/settings.php:12
 msgid "None"
diff --git a/l10n/fa/files_external.po b/l10n/fa/files_external.po
index f100628f3130179e025cb5fdb21aeac53b293fc5..d9f3a99ddfa6f2e5556b68ed77880704a76d40b0 100644
--- a/l10n/fa/files_external.po
+++ b/l10n/fa/files_external.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-02-28 00:04+0100\n"
-"PO-Revision-Date: 2013-02-27 23:04+0000\n"
+"POT-Creation-Date: 2013-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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"
@@ -38,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 "ØØ§ÙØ¸Ù‡ Ø®Ø§Ø±Ø¬ÛŒ"
@@ -81,7 +87,7 @@ msgstr ""
 
 #: templates/settings.php:90
 msgid "None set"
-msgstr ""
+msgstr "ØªÙ†Ø¸ÛŒÙ… Ù†Ø´Ø¯Ù‡"
 
 #: templates/settings.php:91
 msgid "All Users"
@@ -106,7 +112,7 @@ msgstr "ÙØ¹Ø§Ù„ Ø³Ø§Ø²ÛŒ ØØ§ÙØ¸Ù‡ Ø®Ø§Ø±Ø¬ÛŒ Ú©Ø§Ø±Ø¨Ø±"
 
 #: templates/settings.php:130
 msgid "Allow users to mount their own external storage"
-msgstr ""
+msgstr "Ø§Ø¬Ø§Ø²Ù‡ Ø¨Ù‡ Ú©Ø§Ø±Ø¨Ø±Ø§Ù† Ø¨Ø±Ø§ÛŒ Ù…ØªØµÙ„ Ú©Ø±Ø¯Ù† Ù…Ù†Ø§Ø¨Ø¹ Ø°Ø®ÛŒØ±Ù‡ ÛŒ Ø®Ø§Ø±Ø¬ÛŒ Ø®ÙˆØ¯Ø´Ø§Ù†"
 
 #: templates/settings.php:141
 msgid "SSL root certificates"
diff --git a/l10n/fa/files_sharing.po b/l10n/fa/files_sharing.po
index e72b1ce1dc6c506b90f966f49e58224ae7d1810a..9bc4ac8a323d44316e9e6b4d7e0c343c29eeb078 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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 8a62df4a881051a7c19e3b5e2a21860f90ba359d..adcafe886a93df474474f3e8a8078378d3858e9b 100644
--- a/l10n/fa/files_trashbin.po
+++ b/l10n/fa/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-08 00:25+0100\n"
-"PO-Revision-Date: 2013-03-07 23:25+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
@@ -17,27 +17,31 @@ msgstr ""
 "Language: fa\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/delete.php:40
+#: ajax/delete.php:42
 #, php-format
 msgid "Couldn't delete %s permanently"
-msgstr ""
+msgstr "%s Ø±Ø§ Ù†Ù…ÛŒ ØªÙˆØ§Ù† Ø¨Ø±Ø§ÛŒ Ù‡Ù…ÛŒØ´Ù‡ ØØ°Ù Ú©Ø±Ø¯"
 
-#: ajax/undelete.php:41
+#: ajax/undelete.php:42
 #, php-format
 msgid "Couldn't restore %s"
-msgstr ""
+msgstr "%s Ø±Ø§ Ù†Ù…ÛŒ ØªÙˆØ§Ù† Ø¨Ø§Ø²Ú¯Ø±Ø¯Ø§Ù†Ø¯"
 
 #: js/trash.js:7 js/trash.js:96
 msgid "perform restore operation"
-msgstr ""
+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 ""
+msgstr "ØØ°Ù ÙØ§ÛŒÙ„ Ø¨Ø±Ø§ÛŒ Ù‡Ù…ÛŒØ´Ù‡"
 
 #: js/trash.js:121
 msgid "Delete permanently"
-msgstr ""
+msgstr "ØØ°Ù Ù‚Ø·Ø¹ÛŒ"
 
 #: js/trash.js:174 templates/index.php:17
 msgid "Name"
@@ -45,7 +49,7 @@ msgstr "Ù†Ø§Ù…"
 
 #: js/trash.js:175 templates/index.php:27
 msgid "Deleted"
-msgstr ""
+msgstr "ØØ°Ù Ø´Ø¯Ù‡"
 
 #: js/trash.js:184
 msgid "1 folder"
@@ -65,7 +69,7 @@ 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"
@@ -77,4 +81,4 @@ msgstr "ØØ°Ù"
 
 #: templates/part.breadcrumb.php:9
 msgid "Deleted Files"
-msgstr ""
+msgstr "ÙØ§ÛŒÙ„Ù‡Ø§ÛŒ ØØ°Ù Ø´Ø¯Ù‡"
diff --git a/l10n/fa/files_versions.po b/l10n/fa/files_versions.po
index 325fdb2a87fb69edeff7af7b8667ed709a401a6f..15fe4b1b74237b16f21a289c546f4d69c3884704 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:30+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 d28ceaba3e755caa2364ad11481207c8b71e431e..41bd3beeae7a456a7160a4a2a71f628d9444d6bd 100644
--- a/l10n/fa/lib.po
+++ b/l10n/fa/lib.po
@@ -3,14 +3,12 @@
 # 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-27 14:35+0100\n"
-"PO-Revision-Date: 2013-02-27 13:35+0000\n"
+"POT-Creation-Date: 2013-04-28 01:57+0200\n"
+"PO-Revision-Date: 2013-04-27 23:57+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,19 +41,19 @@ msgstr "  Ø¨Ø±Ù†Ø§Ù…Ù‡ Ù‡Ø§"
 msgid "Admin"
 msgstr "Ù…Ø¯ÛŒØ±"
 
-#: files.php:202
+#: files.php:209
 msgid "ZIP download is turned off."
 msgstr "Ø¯Ø§Ù†Ù„ÙˆØ¯ Ø¨Ù‡ ØµÙˆØ±Øª ÙØ´Ø±Ø¯Ù‡ ØºÛŒØ± ÙØ¹Ø§Ù„ Ø§Ø³Øª"
 
-#: files.php:203
+#: files.php:210
 msgid "Files need to be downloaded one by one."
 msgstr "ÙØ§ÛŒÙ„ Ù‡Ø§ Ø¨Ø§ÛŒØ¯ Ø¨Ù‡ ØµÙˆØ±Øª ÛŒÚ©ÛŒ ÛŒÚ©ÛŒ Ø¯Ø§Ù†Ù„ÙˆØ¯ Ø´ÙˆÙ†Ø¯"
 
-#: files.php:204 files.php:231
+#: files.php:211 files.php:244
 msgid "Back to Files"
 msgstr "Ø¨Ø§Ø²Ú¯Ø´Øª Ø¨Ù‡ ÙØ§ÛŒÙ„ Ù‡Ø§"
 
-#: files.php:228
+#: files.php:241
 msgid "Selected files too large to generate zip file."
 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,75 +113,75 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:128 setup.php:320 setup.php:365
+#: setup.php:132 setup.php:325 setup.php:370
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:129 setup.php:152 setup.php:229
+#: setup.php:133 setup.php:156 setup.php:234
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:151 setup.php:453 setup.php:520
+#: setup.php:155 setup.php:458 setup.php:525
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:228
+#: setup.php:233
 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: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:583 setup.php:592 setup.php:600 setup.php:609
+#: setup.php:615
 #, 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:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
+#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
+#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:299
+#: setup.php:304
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:300
+#: setup.php:305
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:305
+#: setup.php:310
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:306
+#: setup.php:311
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:579 setup.php:611
+#: setup.php:584 setup.php:616
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:631
+#: setup.php:636
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:849
+#: setup.php:858
 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:850
+#: setup.php:859
 #, 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"
@@ -241,19 +235,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 269b36235008fa99f90d63c6d2ec2dc626cdb732..2b0be0416583093a5cc185ece9beaf5d0db5508c 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-03-05 00:18+0100\n"
-"PO-Revision-Date: 2013-03-04 16:30+0000\n"
-"Last-Translator: Amir Reza Asadi <amirreza.asadi@live.com>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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 "Ø§Ù…Ú©Ø§Ù† ØªØºÛŒÛŒØ± Ù†Ø§Ù… Ù†Ù…Ø§ÛŒØ´ÛŒ Ø´Ù…Ø§ ÙˆØ¬ÙˆØ¯ Ù†Ø¯Ø§Ø±Ø¯"
 
@@ -46,7 +44,7 @@ msgstr "Ø§ÙØ²ÙˆØ¯Ù† Ú¯Ø±ÙˆÙ‡ Ø§Ù…Ú©Ø§Ù† Ù¾Ø°ÛŒØ± Ù†ÛŒØ³Øª"
 
 #: ajax/enableapp.php:11
 msgid "Could not enable app. "
-msgstr ""
+msgstr "Ø¨Ø±Ù†Ø§Ù…Ù‡ Ø±Ø§ Ù†Ù…ÛŒ ØªÙˆØ§Ù† ÙØ¹Ø§Ù„ Ø³Ø§Ø®Øª."
 
 #: ajax/lostpassword.php:12
 msgid "Email saved"
@@ -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"
@@ -79,26 +77,26 @@ msgstr "Ù…Ø¯ÛŒØ±Ø§Ù† Ù†Ù…ÛŒ ØªÙˆØ§Ù†Ù†Ø¯ Ø®ÙˆØ¯ Ø±Ø§ Ø§Ø² Ú¯Ø±ÙˆÙ‡ Ù…Ø¯ÛŒØ±ÛŒØª
 #: ajax/togglegroups.php:30
 #, php-format
 msgid "Unable to add user to group %s"
-msgstr ""
+msgstr "Ø§Ù…Ú©Ø§Ù† Ø§ÙØ²ÙˆØ¯Ù† Ú©Ø§Ø±Ø¨Ø± Ø¨Ù‡ Ú¯Ø±ÙˆÙ‡ %s Ù†ÛŒØ³Øª"
 
 #: ajax/togglegroups.php:36
 #, php-format
 msgid "Unable to remove user from group %s"
-msgstr ""
+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"
 msgstr "ØºÛŒØ±ÙØ¹Ø§Ù„"
 
-#: js/apps.js:36 js/apps.js:64
+#: js/apps.js:36 js/apps.js:64 js/apps.js:83
 msgid "Enable"
 msgstr "ÙØ¹Ø§Ù„"
 
@@ -106,68 +104,68 @@ msgstr "ÙØ¹Ø§Ù„"
 msgid "Please wait...."
 msgstr "Ù„Ø·ÙØ§ ØµØ¨Ø± Ú©Ù†ÛŒØ¯ ..."
 
-#: js/apps.js:84
+#: 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:87
+#: js/apps.js:93
 msgid "Error while updating app"
-msgstr ""
-
-#: js/apps.js:87
-msgid "Error"
-msgstr "Ø®Ø·Ø§"
+msgstr "Ø®Ø·Ø§ Ø¯Ø± Ù‡Ù†Ú¯Ø§Ù… Ø¨Ù‡Ù†Ú¯Ø§Ù… Ø³Ø§Ø²ÛŒ Ø¨Ø±Ù†Ø§Ù…Ù‡"
 
-#: js/apps.js:90
+#: js/apps.js:96
 msgid "Updated"
 msgstr "Ø¨Ø±ÙˆØ² Ø±Ø³Ø§Ù†ÛŒ Ø§Ù†Ø¬Ø§Ù… Ø´Ø¯"
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
-msgstr "Ø¯Ø±ØØ§Ù„ Ø°Ø®ÛŒØ±Ù‡ ..."
+msgstr "Ø¯Ø± ØØ§Ù„ Ø°Ø®ÛŒØ±Ù‡ Ø³Ø§Ø²ÛŒ..."
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "deleted"
 msgstr "ØØ°Ù Ø´Ø¯Ù‡"
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "undo"
 msgstr "Ø¨Ø§Ø²Ú¯Ø´Øª"
 
-#: js/users.js:62
+#: js/users.js:79
 msgid "Unable to remove user"
-msgstr ""
+msgstr "ØØ°Ù Ú©Ø§Ø±Ø¨Ø± Ø§Ù…Ú©Ø§Ù† Ù¾Ø°ÛŒØ± Ù†ÛŒØ³Øª"
 
-#: js/users.js:75 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
+#: templates/users.php:103
 msgid "Groups"
 msgstr "Ú¯Ø±ÙˆÙ‡ Ù‡Ø§"
 
-#: js/users.js:78 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
-msgstr ""
+msgstr "Ú¯Ø±ÙˆÙ‡ Ù…Ø¯ÛŒØ±Ø§Ù†"
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
-msgstr "Ù¾Ø§Ú© Ú©Ø±Ø¯Ù†"
+msgstr "ØØ°Ù"
 
-#: js/users.js:191
+#: js/users.js:269
 msgid "add group"
 msgstr "Ø§ÙØ²ÙˆØ¯Ù† Ú¯Ø±ÙˆÙ‡"
 
-#: js/users.js:352
+#: js/users.js:420
 msgid "A valid username must be provided"
-msgstr ""
+msgstr "Ù†Ø§Ù… Ú©Ø§Ø±Ø¨Ø±ÛŒ ØµØÛŒØ Ø¨Ø§ÛŒØ¯ ÙˆØ§Ø±Ø¯ Ø´ÙˆØ¯"
 
-#: js/users.js:353 js/users.js:359 js/users.js:374
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr "Ø®Ø·Ø§ Ø¯Ø± Ø§ÛŒØ¬Ø§Ø¯ Ú©Ø§Ø±Ø¨Ø±"
 
-#: js/users.js:358
+#: js/users.js:426
 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,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 ""
+msgstr "Ø§ØØªÙ…Ø§Ù„Ø§Ù‹ ÙÙ‡Ø±Ø³Øª Ùˆ ÙØ§ÛŒÙ„Ù‡Ø§ÛŒ Ø´Ù…Ø§ Ø§Ø² Ø·Ø±ÛŒÙ‚ Ø§ÛŒÙ†ØªØ±Ù†Øª Ù‚Ø§Ø¨Ù„ Ø¯Ø³ØªØ±Ø³ÛŒ Ù‡Ø³ØªÙ†Ø¯. ÙØ§ÛŒÙ„ Ø¨Ø§ ÙØ±Ù…Øª .htaccess Ú©Ù‡ ownCloud Ø§Ø±Ø§Ø¯Ù‡ Ú©Ø±Ø¯Ù‡ Ø§Ø³Øª Ø¯ÛŒÚ¯Ø± Ú©Ø§Ø± Ù†Ù…ÛŒ Ú©Ù†Ø¯. Ù…Ø§ Ù‚ÙˆÛŒØ§Ù‹ ØªÙˆØµÛŒÙ‡ Ù…ÛŒ Ú©Ù†ÛŒÙ… Ú©Ù‡ Ø´Ù…Ø§ ÙˆØ¨ Ø³Ø±ÙˆØ± Ø®ÙˆØ¯ØªØ§Ù† Ø±Ø§ Ø·ÙˆØ±ÛŒ ØªÙ†Ø¸ÛŒÙ… Ú©Ù†ÛŒØ¯ Ú©Ù‡ ÙÙ‡Ø±Ø³Øª Ø§Ø·Ù„Ø§Ø¹Ø§Øª Ø´Ù…Ø§ ØºÛŒØ± Ù‚Ø§Ø¨Ù„ Ø¯Ø³ØªØ±Ø³ÛŒ Ø¨Ø§Ø´Ù†Ø¯ ÛŒØ§ ÙÙ‡Ø±Ø³Øª Ø§Ø·Ù„Ø§Ø¹Ø§Øª Ø±Ø§ Ø¨Ù‡ Ø®Ø§Ø±Ø¬ Ø§Ø² Ø±ÛŒØ´Ù‡ ÛŒ Ø§ØµÙ„ÛŒ ÙˆØ¨ Ø³Ø±ÙˆØ± Ø§Ù†ØªÙ‚Ø§Ù„ Ø¯Ù‡ÛŒØ¯."
 
 #: templates/admin.php:29
 msgid "Setup Warning"
@@ -192,22 +190,22 @@ msgstr "Ù‡Ø´Ø¯Ø§Ø± Ø±Ø§Ù‡ Ø§Ù†Ø¯Ø§Ø²ÛŒ"
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
-msgstr ""
+msgstr "Ø§ØØªÙ…Ø§Ù„Ø§Ù‹ ÙˆØ¨ Ø³Ø±ÙˆØ± Ø´Ù…Ø§ Ø·ÙˆØ±ÛŒ ØªÙ†Ø¸ÛŒÙ… Ù†Ø´Ø¯Ù‡ Ø§Ø³Øª Ú©Ù‡ Ø§Ø¬Ø§Ø²Ù‡ ÛŒ Ù‡Ù…Ú¯Ø§Ù… Ø³Ø§Ø²ÛŒ ÙØ§ÛŒÙ„Ù‡Ø§ Ø±Ø§ Ø¨Ø¯Ù‡Ø¯ Ø²ÛŒØ±Ø§ Ø¨Ù‡ Ù†Ø¸Ø± Ù…ÛŒØ±Ø³Ø¯ Ø±Ø§Ø¨Ø· WebDAV Ø§Ø² Ú©Ø§Ø± Ø§ÙØªØ§Ø¯Ù‡ Ø§Ø³Øª."
 
 #: templates/admin.php:33
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr ""
+msgstr "Ù„Ø·ÙØ§Ù‹ Ø¯ÙˆØ¨Ø§Ø±Ù‡ <a href='%s'>Ø±Ø§Ù‡Ù†Ù…Ø§ÛŒ Ù†ØµØ¨</a>Ø±Ø§ Ø¨Ø±Ø±Ø³ÛŒ Ú©Ù†ÛŒØ¯."
 
 #: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
-msgstr ""
+msgstr "Ù…Ø§Ú˜ÙˆÙ„ 'fileinfo' Ø§Ø² Ú©Ø§Ø± Ø§ÙØªØ§Ø¯Ù‡"
 
 #: templates/admin.php:47
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
-msgstr ""
+msgstr "Ù…Ø§Ú˜ÙˆÙ„ 'fileinfo' PHP Ø§Ø² Ú©Ø§Ø± Ø§ÙØªØ§Ø¯Ù‡ Ø§Ø³Øª.Ù…Ø§ Ø§Ú©ÛŒØ¯Ø§ ØªÙˆØµÛŒÙ‡ Ù…ÛŒ Ú©Ù†ÛŒÙ… Ú©Ù‡ Ø§ÛŒÙ† Ù…Ø§Ú˜ÙˆÙ„ Ø±Ø§ ÙØ¹Ø§Ù„ Ú©Ù†ÛŒØ¯ ØªØ§ Ù†ØªØ§ÛŒØ¬ Ø¨Ù‡ØªØ±ÛŒ Ø¨Ù‡ ÙˆØ³ÛŒÙ„Ù‡ ÛŒ mime-type detection Ø¯Ø±ÛŒØ§ÙØª Ú©Ù†ÛŒØ¯."
 
 #: templates/admin.php:58
 msgid "Locale not working"
@@ -219,7 +217,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"
@@ -233,7 +231,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 Ø§Ø±ØªØ¨Ø§Ø· Ø§ÛŒÙ†ØªØ±Ù†ØªÛŒ Ù†Ø¯Ø§Ø±Ø¯.Ø§ÛŒÙ† Ø¨Ø¯ÛŒÙ† Ù…Ø¹Ù†Ø§Ø³Øª Ú©Ù‡ Ø¨Ø¹Ø¶ÛŒ Ø§Ø² Ø®ØµÙˆØµÛŒØ§Øª Ù†Ø¸ÛŒØ± Ø®Ø§Ø±Ø¬ Ú©Ø±Ø¯Ù† Ù…Ù†Ø¨Ø¹ Ø°Ø®ÛŒØ±Ù‡ ÛŒ Ø®Ø§Ø±Ø¬ÛŒØŒ Ø§Ø·Ù„Ø§Ø¹Ø§Øª Ø¯Ø± Ù…ÙˆØ±Ø¯ Ø¨Ø±ÙˆØ²Ø±Ø³Ø§Ù†ÛŒ Ù‡Ø§ ÛŒØ§ Ù†ØµØ¨ Ø¨Ø±Ù†Ø§Ù…Ù‡ Ù‡Ø§ÛŒ Ù†ÙˆØ¹ 3Ø§Ù… Ú©Ø§Ø± Ù†Ù…ÛŒ Ú©Ù†Ù†Ø¯.Ø¯Ø³ØªØ±Ø³ÛŒ Ø¨Ù‡ ÙØ§ÛŒÙ„ Ù‡Ø§ Ø§Ø² Ø±Ø§Ù‡ Ø¯ÙˆØ± Ùˆ Ø§Ø±Ø³Ø§Ù„ Ø¢Ú¯Ø§Ù‡ Ø³Ø§Ø²ÛŒ Ø§ÛŒÙ…ÛŒÙ„ Ù‡Ø§ Ù…Ù…Ú©Ù† Ø§Ø³Øª Ù‡Ù…Ú†Ù†Ø§Ù† Ú©Ø§Ø± Ù†Ú©Ù†Ù†Ø¯.Ø§Ú¯Ø±Ø´Ù…Ø§ Ù‡Ù…Ù‡ ÛŒ Ø®ØµÙˆØµÛŒØ§Øª OwnCloud Ù…ÛŒ Ø®ÙˆØ§Ù‡ÛŒØ¯ Ù…Ø§ Ù¾ÛŒØ´Ù†Ù‡Ø§Ø¯ Ù…ÛŒ Ú©Ù†ÛŒÙ… ØªØ§ Ø§Ø±ØªØ¨Ø§Ø· Ø§ÛŒÙ†ØªØ±Ù†ØªÛŒ Ù…Ø±Ø¨ÙˆØ· Ø¨Ù‡ Ø§ÛŒÙ† Ø³Ø±ÙˆØ± Ø±Ø§ ÙØ¹Ø§Ù„ Ú©Ù†ÛŒØ¯."
 
 #: templates/admin.php:92
 msgid "Cron"
@@ -241,7 +239,7 @@ msgstr ""
 
 #: templates/admin.php:101
 msgid "Execute one task with each page loaded"
-msgstr ""
+msgstr "Ø§Ø¬Ø±Ø§ÛŒ ÛŒÚ© ÙˆØ¸ÛŒÙÙ‡ Ø¨Ø§ Ù‡Ø± Ø¨Ø§Ø± Ø¨Ø§Ø±Ú¯Ø°Ø§Ø±ÛŒ ØµÙØÙ‡"
 
 #: templates/admin.php:111
 msgid ""
@@ -261,15 +259,15 @@ 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"
@@ -277,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"
@@ -297,12 +295,12 @@ 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 ""
@@ -312,21 +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:230 templates/personal.php:102
+#: templates/admin.php:228
+msgid "Less"
+msgstr "Ú©Ù…â€ŒØªØ±"
+
+#: templates/admin.php:235 templates/personal.php:105
 msgid "Version"
 msgstr "Ù†Ø³Ø®Ù‡"
 
-#: templates/admin.php:233 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 "
@@ -334,7 +336,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 "ØªÙˆØ³Ø¹Ù‡ ÛŒØ§ÙØªÙ‡ Ø¨Ù‡ ÙˆØ³ÛŒÙ„Ù‡ ÛŒ  <a href=\"http://ownCloud.org/contact\" target=\"_blank\">Ø§Ù†Ø¬Ù…Ù† ownCloud</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">Ú©Ø¯ Ø§ØµÙ„ÛŒ</a> Ù…Ø¬Ø§Ø² Ø²ÛŒØ± Ú¯ÙˆØ§Ù‡ÛŒ <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
 #: templates/apps.php:11
 msgid "Add your App"
@@ -354,7 +356,7 @@ msgstr "ØµÙØÙ‡ Ø§ÛŒÙ† Ø§ÙŒÙ¾ Ø±Ø§ Ø¯Ø± apps.owncloud.com Ø¨Ø¨ÛŒÙ†ÛŒØ¯"
 
 #: templates/apps.php:36
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
-msgstr ""
+msgstr "<span class=\"licence\"></span>-Ù…Ø¬Ø§Ø² Ø§Ø² Ø·Ø±Ù <span class=\"author\"></span>"
 
 #: templates/apps.php:38
 msgid "Update"
@@ -387,17 +389,17 @@ msgstr "Ù¾Ø´ØªÛŒØ¨Ø§Ù†ÛŒ ØªØ¬Ø§Ø±ÛŒ"
 #: templates/personal.php:8
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr ""
+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 "Ø±Ø§Ù‡Ø¨Ø±ÛŒ Ú©Ù…Ú©ÛŒ Ø§Ø¬Ø±Ø§ÛŒ Ø§ÙˆÙ„ Ø±Ø§ Ø¯ÙˆØ¨Ø§Ø±Ù‡ Ù†Ù…Ø§ÛŒØ´ Ø¨Ø¯Ù‡"
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
 msgid "Password"
 msgstr "Ú¯Ø°Ø±ÙˆØ§Ú˜Ù‡"
 
@@ -421,82 +423,70 @@ msgstr "Ú¯Ø°Ø±ÙˆØ§Ú˜Ù‡ Ø¬Ø¯ÛŒØ¯"
 msgid "Change password"
 msgstr "ØªØºÛŒÛŒØ± Ú¯Ø°Ø± ÙˆØ§Ú˜Ù‡"
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:76
 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 "Ù¾Ø³Øª Ø§Ù„Ú©ØªØ±ÙˆÙ†ÛŒÚ©ÛŒ"
+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 ""
+msgstr "Ø§Ø² Ø§ÛŒÙ† Ù†Ø´Ø§Ù†ÛŒ Ø¨Ø±Ø§ÛŒ Ø§ØªØµØ§Ù„ Ø¨Ù‡ ownCloud Ø®ÙˆØ¯ØªØ§Ù† Ø¯Ø± Ø¨Ø®Ø´ Ù…Ø¯ÛŒØ±ÛŒØª ÙØ§ÛŒÙ„ Ø®ÙˆØ¯ØªØ§Ù† Ø§Ø³ØªÙØ§Ø¯Ù‡ Ú©Ù†ÛŒØ¯"
 
-#: templates/users.php:21 templates/users.php:77
+#: templates/users.php:21 templates/users.php:75
 msgid "Login Name"
 msgstr "Ù†Ø§Ù… Ú©Ø§Ø±Ø¨Ø±ÛŒ"
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr "Ø§ÛŒØ¬Ø§Ø¯ Ú©Ø±Ø¯Ù†"
 
-#: templates/users.php:35
+#: templates/users.php:33
 msgid "Default Storage"
 msgstr "Ø°Ø®ÛŒØ±Ù‡ Ø³Ø§Ø²ÛŒ Ù¾ÛŒØ´ ÙØ±Ø¶"
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:39 templates/users.php:133
 msgid "Unlimited"
 msgstr "Ù†Ø§Ù…ØØ¯ÙˆØ¯"
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:57 templates/users.php:148
 msgid "Other"
-msgstr "Ø³Ø§ÛŒØ±"
+msgstr "Ø¯ÛŒÚ¯Ø±"
 
-#: templates/users.php:84
+#: templates/users.php:82
 msgid "Storage"
 msgstr "ØØ§ÙØ¸Ù‡"
 
-#: templates/users.php:95
+#: templates/users.php:93
 msgid "change display name"
 msgstr "ØªØºÛŒÛŒØ± Ù†Ø§Ù… Ù†Ù…Ø§ÛŒØ´ÛŒ"
 
-#: templates/users.php:99
+#: templates/users.php:97
 msgid "set new password"
 msgstr "ØªÙ†Ø¸ÛŒÙ… Ú©Ù„Ù…Ù‡ Ø¹Ø¨ÙˆØ± Ø¬Ø¯ÛŒØ¯"
 
-#: templates/users.php:134
+#: templates/users.php:128
 msgid "Default"
 msgstr "Ù¾ÛŒØ´ ÙØ±Ø¶"
diff --git a/l10n/fa/user_ldap.po b/l10n/fa/user_ldap.po
index 90cac5e66415ac922447adb753be89ac1db87ef5..4a8fe98a4cfbc7b08203e5959763a48c710bdbfc 100644
--- a/l10n/fa/user_ldap.po
+++ b/l10n/fa/user_ldap.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-03-02 00:03+0100\n"
-"PO-Revision-Date: 2013-03-01 23:04+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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"
@@ -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: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 ""
+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/fa/user_webdavauth.po b/l10n/fa/user_webdavauth.po
index e4088da32dd6c3c42af2336a690dd7e4b994bd7e..5b69bafee6b7455ce577debd49e35bedc60779f2 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-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
@@ -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 a291bd3898726ff638aec3508e04c014ace18000..03746586e2ac30cbaa97451e68d612f99682f22b 100644
--- a/l10n/fi/core.po
+++ b/l10n/fi/core.po
@@ -7,211 +7,388 @@ 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"
-"Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
+"POT-Creation-Date: 2013-04-30 01:57+0200\n"
+"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: LANGUAGE <LL@li.org>\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/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 ""
+
+#: 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/js.js:670
+#: js/config.php:39
+msgid "Friday"
+msgstr ""
+
+#: js/config.php:40
+msgid "Saturday"
+msgstr ""
+
+#: js/config.php:45
 msgid "January"
 msgstr ""
 
-#: js/js.js:670
+#: js/config.php:46
 msgid "February"
 msgstr ""
 
-#: js/js.js:670
+#: js/config.php:47
 msgid "March"
 msgstr ""
 
-#: js/js.js:670
+#: js/config.php:48
 msgid "April"
 msgstr ""
 
-#: js/js.js:670
+#: js/config.php:49
 msgid "May"
 msgstr ""
 
-#: js/js.js:670
+#: js/config.php:50
 msgid "June"
 msgstr ""
 
-#: js/js.js:671
+#: js/config.php:51
 msgid "July"
 msgstr ""
 
-#: js/js.js:671
+#: js/config.php:52
 msgid "August"
 msgstr ""
 
-#: js/js.js:671
+#: js/config.php:53
 msgid "September"
 msgstr ""
 
-#: js/js.js:671
+#: js/config.php:54
 msgid "October"
 msgstr ""
 
-#: js/js.js:671
+#: js/config.php:55
 msgid "November"
 msgstr ""
 
-#: js/js.js:671
+#: js/config.php:56
 msgid "December"
 msgstr ""
 
-#: js/oc-dialogs.js:123
-msgid "Choose"
+#: js/js.js:286
+msgid "Settings"
+msgstr "asetukset"
+
+#: 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 js/oc-dialogs.js:247
+msgid "Ok"
 msgstr ""
 
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
 msgid "Cancel"
 msgstr ""
 
-#: js/oc-dialogs.js:159
-msgid "No"
+#: js/oc-dialogs.js:185
+msgid "Choose"
 msgstr ""
 
-#: js/oc-dialogs.js:160
+#: js/oc-dialogs.js:215
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:177
-msgid "Ok"
+#: js/oc-dialogs.js:222
+msgid "No"
 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 +396,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 ""
+msgstr "KÃ¤yttÃ¤jÃ¤tunnus"
 
-#: lostpassword/templates/lostpassword.php:14
+#: lostpassword/templates/lostpassword.php:21
 msgid "Request reset"
 msgstr ""
 
@@ -288,116 +468,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 +607,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/fi/files.po b/l10n/fi/files.po
index 0c0826b0f8966e193a93d9eed623c8bf5ac2586e..a43906c14d2736c0f8161dcd5f38039d2dfc8b3c 100644
--- a/l10n/fi/files.po
+++ b/l10n/fi/files.po
@@ -7,209 +7,224 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-19 02:03+0200\n"
-"PO-Revision-Date: 2012-10-19 00:04+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
-"Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
+"POT-Creation-Date: 2013-05-15 01:59+0200\n"
+"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: LANGUAGE <LL@li.org>\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/upload.php:20
+#: 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:21
-msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
+#: ajax/upload.php:27
+msgid ""
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:22
+#: 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:23
+#: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:24
+#: ajax/upload.php:31
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:25
+#: ajax/upload.php:32
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:26
+#: ajax/upload.php:33
 msgid "Failed to write to disk"
 msgstr ""
 
-#: appinfo/app.php:6
+#: 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:108 templates/index.php:62
-msgid "Unshare"
+#: js/fileactions.js:116
+msgid "Share"
+msgstr ""
+
+#: js/fileactions.js:126
+msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:110 templates/index.php:64
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr ""
 
-#: js/fileactions.js:182
+#: js/fileactions.js:194
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:194 js/filelist.js:196
+#: 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:194 js/filelist.js:196
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:194
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:194 js/filelist.js:196
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:243
-msgid "replaced {new_name}"
+#: js/filelist.js:306
+msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:243 js/filelist.js:245 js/filelist.js:277 js/filelist.js:279
+#: js/filelist.js:306
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:245
-msgid "replaced {new_name} with {old_name}"
+#: js/filelist.js:331
+msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:277
-msgid "unshared {files}"
+#: js/filelist.js:413
+msgid "1 file uploading"
 msgstr ""
 
-#: js/filelist.js:279
-msgid "deleted {files}"
+#: js/filelist.js:416 js/filelist.js:470
+msgid "files uploading"
 msgstr ""
 
-#: js/files.js:179
-msgid "generating ZIP-file, it may take some time."
+#: js/files.js:52
+msgid "'.' is an invalid file name."
 msgstr ""
 
-#: js/files.js:214
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
+#: js/files.js:56
+msgid "File name cannot be empty."
 msgstr ""
 
-#: js/files.js:214
-msgid "Upload Error"
+#: js/files.js:64
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
 msgstr ""
 
-#: js/files.js:242 js/files.js:347 js/files.js:377
-msgid "Pending"
+#: js/files.js:78
+msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:262
-msgid "1 file uploading"
+#: 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:265 js/files.js:310 js/files.js:325
-msgid "{count} files uploading"
+#: js/files.js:264
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:328 js/files.js:361
+#: js/files.js:277
+msgid "Not enough space available"
+msgstr ""
+
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:430
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:500
-msgid "Invalid name, '/' is not allowed."
+#: js/files.js:486
+msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:681
-msgid "{count} files scanned"
+#: js/files.js:491
+msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:689
-msgid "error while scanning"
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+msgid "Error"
 msgstr ""
 
-#: js/files.js:762 templates/index.php:48
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr ""
 
-#: js/files.js:763 templates/index.php:56
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr ""
 
-#: js/files.js:764 templates/index.php:58
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:791
+#: js/files.js:898
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:793
+#: js/files.js:900
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:801
+#: js/files.js:908
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:803
+#: js/files.js:910
 msgid "{count} files"
 msgstr ""
 
-#: js/files.js:846
-msgid "seconds ago"
-msgstr ""
-
-#: js/files.js:847
-msgid "1 minute ago"
-msgstr ""
-
-#: js/files.js:848
-msgid "{minutes} minutes ago"
-msgstr ""
-
-#: js/files.js:851
-msgid "today"
-msgstr ""
-
-#: js/files.js:852
-msgid "yesterday"
-msgstr ""
-
-#: js/files.js:853
-msgid "{days} days ago"
-msgstr ""
-
-#: js/files.js:854
-msgid "last month"
-msgstr ""
-
-#: js/files.js:856
-msgid "months ago"
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/files.js:857
-msgid "last year"
+#: lib/app.php:73
+msgid "Unable to rename file"
 msgstr ""
 
-#: js/files.js:858
-msgid "years ago"
+#: lib/helper.php:11 templates/index.php:18
+msgid "Upload"
 msgstr ""
 
 #: templates/admin.php:5
@@ -220,80 +235,88 @@ msgstr ""
 msgid "Maximum upload size"
 msgstr ""
 
-#: templates/admin.php:7
+#: templates/admin.php:10
 msgid "max. possible: "
 msgstr ""
 
-#: templates/admin.php:9
+#: templates/admin.php:15
 msgid "Needed for multi-file and folder downloads."
 msgstr ""
 
-#: templates/admin.php:9
+#: templates/admin.php:17
 msgid "Enable ZIP-download"
 msgstr ""
 
-#: templates/admin.php:11
+#: templates/admin.php:20
 msgid "0 is unlimited"
 msgstr ""
 
-#: templates/admin.php:12
+#: templates/admin.php:22
 msgid "Maximum input size for ZIP files"
 msgstr ""
 
-#: templates/admin.php:14
+#: templates/admin.php:26
 msgid "Save"
-msgstr ""
+msgstr "tallentaa"
 
 #: templates/index.php:7
 msgid "New"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/index.php:10
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:12
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:11
-msgid "From url"
+#: templates/index.php:14
+msgid "From link"
 msgstr ""
 
-#: templates/index.php:20
-msgid "Upload"
+#: templates/index.php:42
+msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:27
+#: templates/index.php:48
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:40
-msgid "Nothing in here. Upload something!"
+#: templates/index.php:54
+msgid "You donâ€™t have write permissions here."
 msgstr ""
 
-#: templates/index.php:50
-msgid "Share"
+#: templates/index.php:61
+msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:52
+#: templates/index.php:75
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:75
+#: templates/index.php:87 templates/index.php:88
+msgid "Unshare"
+msgstr ""
+
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:77
+#: 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:82
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:85
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr ""
+
+#: templates/upgrade.php:2
+msgid "Upgrading filesystem cache..."
+msgstr ""
diff --git a/l10n/fi/lib.po b/l10n/fi/lib.po
index 6ed65abd5e957def7b3356d4940b97f95e7f6f5a..93a7b3b4ed57501e2938e5c26269302d35f38db0 100644
--- a/l10n/fi/lib.po
+++ b/l10n/fi/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"
-"Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
+"POT-Creation-Date: 2013-04-28 01:57+0200\n"
+"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: LANGUAGE <LL@li.org>\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"
 
-#: app.php:288
+#: app.php:349
 msgid "Help"
 msgstr ""
 
-#: app.php:295
+#: app.php:362
 msgid "Personal"
 msgstr ""
 
-#: app.php:300
+#: app.php:373
 msgid "Settings"
-msgstr ""
+msgstr "asetukset"
 
-#: app.php:305
+#: app.php:385
 msgid "Users"
 msgstr ""
 
-#: app.php:312
+#: app.php:398
 msgid "Apps"
 msgstr ""
 
-#: app.php:314
+#: app.php:406
 msgid "Admin"
 msgstr ""
 
-#: files.php:280
+#: files.php:209
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:281
+#: files.php:210
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:281 files.php:306
+#: files.php:211 files.php:244
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:305
+#: files.php:241
 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,169 @@ 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:325 setup.php:370
+msgid "PostgreSQL username and/or password not valid"
+msgstr ""
+
+#: setup.php:133 setup.php:156 setup.php:234
+msgid "You need to enter either an existing account or the administrator."
+msgstr ""
+
+#: setup.php:155 setup.php:458 setup.php:525
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:233
+msgid "MySQL username and/or password not valid"
+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:583 setup.php:592 setup.php:600 setup.php:609
+#: setup.php:615
+#, php-format
+msgid "DB Error: \"%s\""
+msgstr ""
+
+#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
+#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
+#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#, php-format
+msgid "Offending command was: \"%s\""
+msgstr ""
+
+#: setup.php:304
+#, php-format
+msgid "MySQL user '%s'@'localhost' exists already."
+msgstr ""
+
+#: setup.php:305
+msgid "Drop this user from MySQL"
+msgstr ""
+
+#: setup.php:310
+#, php-format
+msgid "MySQL user '%s'@'%%' already exists"
+msgstr ""
+
+#: setup.php:311
+msgid "Drop this user from MySQL."
+msgstr ""
+
+#: setup.php:584 setup.php:616
+#, php-format
+msgid "Offending command was: \"%s\", name: %s, password: %s"
+msgstr ""
+
+#: setup.php:636
+#, php-format
+msgid "MS SQL username and/or password not valid: %s"
+msgstr ""
+
+#: setup.php:858
+msgid ""
+"Your web server is not yet properly setup to allow files synchronization "
+"because the WebDAV interface seems to be broken."
+msgstr ""
+
+#: setup.php:859
+#, 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/fi_FI/core.po b/l10n/fi_FI/core.po
index 24d915c35e79c20ba5b81a341e792a37edc26831..0110a051c43fee50a574bd0f543b53cba9de0b9a 100644
--- a/l10n/fi_FI/core.po
+++ b/l10n/fi_FI/core.po
@@ -3,20 +3,14 @@
 # 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-02-22 00:06+0100\n"
-"PO-Revision-Date: 2013-02-20 23:20+0000\n"
-"Last-Translator: Jiri GrÃ¶nroos <jiri.gronroos@iki.fi>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10: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"
@@ -24,24 +18,24 @@ msgstr ""
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:85
+#: ajax/share.php:97
 #, php-format
 msgid "User %s shared a file with you"
 msgstr "KÃ¤yttÃ¤jÃ¤ %s jakoi tiedoston kanssasi"
 
-#: ajax/share.php:87
+#: ajax/share.php:99
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr "KÃ¤yttÃ¤jÃ¤ %s jakoi kansion kanssasi"
 
-#: ajax/share.php:89
+#: ajax/share.php:101
 #, php-format
 msgid ""
 "User %s shared the file \"%s\" with you. It is available for download here: "
 "%s"
 msgstr "KÃ¤yttÃ¤jÃ¤ %s jakoi tiedoston \"%s\" kanssasi. Se on ladattavissa tÃ¤Ã¤ltÃ¤: %s"
 
-#: ajax/share.php:91
+#: ajax/share.php:104
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -50,7 +44,7 @@ msgstr "KÃ¤yttÃ¤jÃ¤ %s jakoi kansion \"%s\" kanssasi. Se on ladattavissa tÃ¤Ã¤lt
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
-msgstr ""
+msgstr "Luokan tyyppiÃ¤ ei mÃ¤Ã¤ritelty."
 
 #: ajax/vcategories/add.php:30
 msgid "No category to add?"
@@ -59,7 +53,7 @@ msgstr "Ei lisÃ¤ttÃ¤vÃ¤Ã¤ luokkaa?"
 #: ajax/vcategories/add.php:37
 #, php-format
 msgid "This category already exists: %s"
-msgstr ""
+msgstr "Luokka on jo olemassa: %s"
 
 #: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
 #: ajax/vcategories/favorites.php:24
@@ -87,166 +81,168 @@ msgstr "Luokkia ei valittu poistettavaksi."
 msgid "Error removing %s from favorites."
 msgstr "Virhe poistaessa kohdetta %s suosikeista."
 
-#: js/config.php:32
+#: js/config.php:34
 msgid "Sunday"
-msgstr "Sunnuntai"
+msgstr "sunnuntai"
 
-#: js/config.php:32
+#: js/config.php:35
 msgid "Monday"
-msgstr "Maanantai"
+msgstr "maanantai"
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Tuesday"
-msgstr "Tiistai"
+msgstr "tiistai"
 
-#: js/config.php:32
+#: js/config.php:37
 msgid "Wednesday"
-msgstr "Keskiviikko"
+msgstr "keskiviikko"
 
-#: js/config.php:32
+#: js/config.php:38
 msgid "Thursday"
-msgstr "Torstai"
+msgstr "torstai"
 
-#: js/config.php:32
+#: js/config.php:39
 msgid "Friday"
-msgstr "Perjantai"
+msgstr "perjantai"
 
-#: js/config.php:32
+#: js/config.php:40
 msgid "Saturday"
-msgstr "Lauantai"
+msgstr "lauantai"
 
-#: js/config.php:33
+#: js/config.php:45
 msgid "January"
-msgstr "Tammikuu"
+msgstr "tammikuu"
 
-#: js/config.php:33
+#: js/config.php:46
 msgid "February"
-msgstr "Helmikuu"
+msgstr "helmikuu"
 
-#: js/config.php:33
+#: js/config.php:47
 msgid "March"
-msgstr "Maaliskuu"
+msgstr "maaliskuu"
 
-#: js/config.php:33
+#: js/config.php:48
 msgid "April"
-msgstr "Huhtikuu"
+msgstr "huhtikuu"
 
-#: js/config.php:33
+#: js/config.php:49
 msgid "May"
-msgstr "Toukokuu"
+msgstr "toukokuu"
 
-#: js/config.php:33
+#: js/config.php:50
 msgid "June"
-msgstr "KesÃ¤kuu"
+msgstr "kesÃ¤kuu"
 
-#: js/config.php:33
+#: js/config.php:51
 msgid "July"
-msgstr "HeinÃ¤kuu"
+msgstr "heinÃ¤kuu"
 
-#: js/config.php:33
+#: js/config.php:52
 msgid "August"
-msgstr "Elokuu"
+msgstr "elokuu"
 
-#: js/config.php:33
+#: js/config.php:53
 msgid "September"
-msgstr "Syyskuu"
+msgstr "syyskuu"
 
-#: js/config.php:33
+#: js/config.php:54
 msgid "October"
-msgstr "Lokakuu"
+msgstr "lokakuu"
 
-#: js/config.php:33
+#: js/config.php:55
 msgid "November"
-msgstr "Marraskuu"
+msgstr "marraskuu"
 
-#: js/config.php:33
+#: js/config.php:56
 msgid "December"
-msgstr "Joulukuu"
+msgstr "joulukuu"
 
 #: js/js.js:286
 msgid "Settings"
 msgstr "Asetukset"
 
-#: js/js.js:767
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "sekuntia sitten"
 
-#: js/js.js:768
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "1 minuutti sitten"
 
-#: js/js.js:769
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr "{minutes} minuuttia sitten"
 
-#: js/js.js:770
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr "1 tunti sitten"
 
-#: js/js.js:771
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr "{hours} tuntia sitten"
 
-#: js/js.js:772
+#: js/js.js:723
 msgid "today"
 msgstr "tÃ¤nÃ¤Ã¤n"
 
-#: js/js.js:773
+#: js/js.js:724
 msgid "yesterday"
 msgstr "eilen"
 
-#: js/js.js:774
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr "{days} pÃ¤ivÃ¤Ã¤ sitten"
 
-#: js/js.js:775
+#: js/js.js:726
 msgid "last month"
 msgstr "viime kuussa"
 
-#: js/js.js:776
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr "{months} kuukautta sitten"
 
-#: js/js.js:777
+#: js/js.js:728
 msgid "months ago"
 msgstr "kuukautta sitten"
 
-#: js/js.js:778
+#: js/js.js:729
 msgid "last year"
 msgstr "viime vuonna"
 
-#: js/js.js:779
+#: js/js.js:730
 msgid "years ago"
 msgstr "vuotta sitten"
 
-#: js/oc-dialogs.js:126
-msgid "Choose"
-msgstr "Valitse"
+#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
+msgid "Ok"
+msgstr "Ok"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
 msgid "Cancel"
 msgstr "Peru"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "Ei"
+#: js/oc-dialogs.js:185
+msgid "Choose"
+msgstr "Valitse"
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:215
 msgid "Yes"
 msgstr "KyllÃ¤"
 
-#: js/oc-dialogs.js:180
-msgid "Ok"
-msgstr "Ok"
+#: js/oc-dialogs.js:222
+msgid "No"
+msgstr "Ei"
 
 #: 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:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:582
-#: js/share.js:594
+#: 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 "Virhe"
 
@@ -258,127 +254,127 @@ msgstr "Sovelluksen nimeÃ¤ ei ole mÃ¤Ã¤ritelty."
 msgid "The required file {file} is not installed!"
 msgstr "Vaadittua tiedostoa {file} ei ole asennettu!"
 
-#: js/share.js:29 js/share.js:43 js/share.js:90
+#: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
-msgstr ""
+msgstr "Jaettu"
 
-#: js/share.js:93
+#: js/share.js:90
 msgid "Share"
 msgstr "Jaa"
 
-#: js/share.js:141 js/share.js:622
+#: js/share.js:125 js/share.js:617
 msgid "Error while sharing"
 msgstr "Virhe jaettaessa"
 
-#: js/share.js:152
+#: js/share.js:136
 msgid "Error while unsharing"
 msgstr "Virhe jakoa peruttaessa"
 
-#: js/share.js:159
+#: js/share.js:143
 msgid "Error while changing permissions"
 msgstr "Virhe oikeuksia muuttaessa"
 
-#: js/share.js:168
+#: js/share.js:152
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Jaettu sinun ja ryhmÃ¤n {group} kanssa kÃ¤yttÃ¤jÃ¤n {owner} toimesta"
 
-#: js/share.js:170
+#: js/share.js:154
 msgid "Shared with you by {owner}"
 msgstr "Jaettu kanssasi kÃ¤yttÃ¤jÃ¤n {owner} toimesta"
 
-#: js/share.js:175
+#: js/share.js:159
 msgid "Share with"
 msgstr "Jaa"
 
-#: js/share.js:180
+#: js/share.js:164
 msgid "Share with link"
 msgstr "Jaa linkillÃ¤"
 
-#: js/share.js:183
+#: js/share.js:167
 msgid "Password protect"
 msgstr "Suojaa salasanalla"
 
-#: js/share.js:185 templates/installation.php:44 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Salasana"
 
-#: js/share.js:189
+#: js/share.js:173
 msgid "Email link to person"
 msgstr "LÃ¤hetÃ¤ linkki sÃ¤hkÃ¶postitse"
 
-#: js/share.js:190
+#: js/share.js:174
 msgid "Send"
 msgstr "LÃ¤hetÃ¤"
 
-#: js/share.js:194
+#: js/share.js:178
 msgid "Set expiration date"
 msgstr "Aseta pÃ¤Ã¤ttymispÃ¤ivÃ¤"
 
-#: js/share.js:195
+#: js/share.js:179
 msgid "Expiration date"
 msgstr "PÃ¤Ã¤ttymispÃ¤ivÃ¤"
 
-#: js/share.js:227
+#: js/share.js:211
 msgid "Share via email:"
 msgstr "Jaa sÃ¤hkÃ¶postilla:"
 
-#: js/share.js:229
+#: js/share.js:213
 msgid "No people found"
 msgstr "HenkilÃ¶itÃ¤ ei lÃ¶ytynyt"
 
-#: js/share.js:256
+#: js/share.js:251
 msgid "Resharing is not allowed"
 msgstr "Jakaminen uudelleen ei ole salittu"
 
-#: js/share.js:292
+#: js/share.js:287
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:313
+#: js/share.js:308
 msgid "Unshare"
 msgstr "Peru jakaminen"
 
-#: js/share.js:325
+#: js/share.js:320
 msgid "can edit"
 msgstr "voi muokata"
 
-#: js/share.js:327
+#: js/share.js:322
 msgid "access control"
 msgstr "PÃ¤Ã¤syn hallinta"
 
-#: js/share.js:330
+#: js/share.js:325
 msgid "create"
 msgstr "luo"
 
-#: js/share.js:333
+#: js/share.js:328
 msgid "update"
 msgstr "pÃ¤ivitÃ¤"
 
-#: js/share.js:336
+#: js/share.js:331
 msgid "delete"
 msgstr "poista"
 
-#: js/share.js:339
+#: js/share.js:334
 msgid "share"
 msgstr "jaa"
 
-#: js/share.js:373 js/share.js:569
+#: js/share.js:368 js/share.js:564
 msgid "Password protected"
 msgstr "Salasanasuojattu"
 
-#: js/share.js:582
+#: js/share.js:577
 msgid "Error unsetting expiration date"
 msgstr "Virhe purettaessa erÃ¤pÃ¤ivÃ¤Ã¤"
 
-#: js/share.js:594
+#: js/share.js:589
 msgid "Error setting expiration date"
 msgstr "Virhe pÃ¤Ã¤ttymispÃ¤ivÃ¤Ã¤ asettaessa"
 
-#: js/share.js:609
+#: js/share.js:604
 msgid "Sending ..."
 msgstr "LÃ¤hetetÃ¤Ã¤n..."
 
-#: js/share.js:620
+#: js/share.js:615
 msgid "Email sent"
 msgstr "SÃ¤hkÃ¶posti lÃ¤hetetty"
 
@@ -401,24 +397,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 ""
 
-#: 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:39
-#: 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"
 
@@ -440,7 +439,7 @@ msgstr "Palauta salasana"
 
 #: strings.php:5
 msgid "Personal"
-msgstr "HenkilÃ¶kohtaiset"
+msgstr "HenkilÃ¶kohtainen"
 
 #: strings.php:6
 msgid "Users"
@@ -452,7 +451,7 @@ msgstr "Sovellukset"
 
 #: strings.php:8
 msgid "Admin"
-msgstr "Hallinta"
+msgstr "YllÃ¤pitÃ¤jÃ¤"
 
 #: strings.php:9
 msgid "Help"
@@ -474,117 +473,132 @@ msgstr "Muokkaa luokkia"
 msgid "Add"
 msgstr "LisÃ¤Ã¤"
 
-#: templates/installation.php:23 templates/installation.php:30
+#: templates/installation.php:24 templates/installation.php:31
+#: templates/installation.php:38
 msgid "Security Warning"
 msgstr "Turvallisuusvaroitus"
 
-#: templates/installation.php:24
+#: templates/installation.php:25
+msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
+msgstr "PHP-asennuksesi on haavoittuvainen NULL Byte -hyÃ¶kkÃ¤ykselle (CVE-2006-7243)"
+
+#: templates/installation.php:26
+msgid "Please update your PHP installation to use ownCloud securely."
+msgstr "PÃ¤ivitÃ¤ PHP-asennuksesi kÃ¤yttÃ¤Ã¤ksesi ownCloudia turvallisesti."
+
+#: templates/installation.php:32
 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:25
+#: 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:31
+#: templates/installation.php:39
 msgid ""
 "Your data directory and files are probably accessible from the internet "
 "because the .htaccess file does not work."
 msgstr "Datakansiosi ja tiedostosi ovat mitÃ¤ luultavimmin muiden saavutettavissa internetistÃ¤, koska .htaccess-tiedosto ei toimi."
 
-#: templates/installation.php:32
+#: 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 "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>."
 
-#: templates/installation.php:36
+#: templates/installation.php:44
 msgid "Create an <strong>admin account</strong>"
 msgstr "Luo <strong>yllÃ¤pitÃ¤jÃ¤n tunnus</strong>"
 
-#: templates/installation.php:52
+#: templates/installation.php:62
 msgid "Advanced"
 msgstr "LisÃ¤asetukset"
 
-#: templates/installation.php:54
+#: templates/installation.php:64
 msgid "Data folder"
 msgstr "Datakansio"
 
-#: templates/installation.php:61
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "Muokkaa tietokantaa"
 
-#: templates/installation.php:66 templates/installation.php:77
-#: templates/installation.php:87 templates/installation.php:97
+#: 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:109
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "Tietokannan kÃ¤yttÃ¤jÃ¤"
 
-#: templates/installation.php:113
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "Tietokannan salasana"
 
-#: templates/installation.php:117
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "Tietokannan nimi"
 
-#: templates/installation.php:125
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "Tietokannan taulukkotila"
 
-#: templates/installation.php:131
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "Tietokantapalvelin"
 
-#: templates/installation.php:136
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "Viimeistele asennus"
 
-#: templates/layout.guest.php:33
+#: templates/layout.guest.php:40
 msgid "web services under your control"
 msgstr "verkkopalvelut hallinnassasi"
 
-#: templates/layout.user.php:48
+#: 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 "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 ""
+msgstr "Vaihtoehtoiset kirjautumiset"
 
 #: templates/part.pagenavi.php:3
 msgid "prev"
diff --git a/l10n/fi_FI/files.po b/l10n/fi_FI/files.po
index 3af5904ef80a1861b3cbe0d534e7be8aaa01a920..d1f62c02c71c45f0faf53c282f0089e71961be24 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-03-04 00:06+0100\n"
-"PO-Revision-Date: 2013-03-03 23:06+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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"
@@ -75,59 +66,70 @@ msgstr "Levylle kirjoitus epÃ¤onnistui"
 msgid "Not enough storage available"
 msgstr "Tallennustilaa ei ole riittÃ¤vÃ¤sti kÃ¤ytettÃ¤vissÃ¤"
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr "Virheellinen kansio."
 
-#: appinfo/app.php:10
+#: appinfo/app.php:12
 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:92 templates/index.php:93
+#: 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/files.js:292 js/files.js:408
-#: js/files.js:439
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "Odottaa"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} on jo olemassa"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "korvaa"
 
-#: js/filelist.js:251
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "ehdota nimeÃ¤"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "peru"
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "undo"
 msgstr "kumoa"
 
-#: js/filelist.js:323
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr "suorita poistotoiminto"
 
+#: 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 "'.' on virheellinen nimi tiedostolle."
@@ -150,77 +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:225
+#: 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:262
+#: 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"
-
-#: js/files.js:262
-msgid "Upload Error"
-msgstr "LÃ¤hetysvirhe."
+msgstr "Tiedoston lÃ¤hetys epÃ¤onnistui, koska sen koko on 0 tavua tai kyseessÃ¤ on kansio."
 
-#: js/files.js:273
-msgid "Close"
-msgstr "Sulje"
+#: js/files.js:277
+msgid "Not enough space available"
+msgstr "Tilaa ei ole riittÃ¤vÃ¤sti"
 
-#: js/files.js:312
-msgid "1 file uploading"
-msgstr ""
-
-#: js/files.js:315 js/files.js:370 js/files.js:385
-msgid "{count} files uploading"
-msgstr ""
-
-#: js/files.js:388 js/files.js:423
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "LÃ¤hetys peruttu."
 
-#: js/files.js:497
+#: 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:570
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "Verkko-osoite ei voi olla tyhjÃ¤"
 
-#: js/files.js:575
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:953 templates/index.php:68
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+msgid "Error"
+msgstr "Virhe"
+
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Nimi"
 
-#: js/files.js:954 templates/index.php:79
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Koko"
 
-#: js/files.js:955 templates/index.php:81
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
-msgstr "Muutettu"
+msgstr "Muokattu"
 
-#: js/files.js:974
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 kansio"
 
-#: js/files.js:976
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} kansiota"
 
-#: js/files.js:984
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 tiedosto"
 
-#: js/files.js:986
+#: 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Ã¤"
@@ -273,45 +275,45 @@ msgstr "Kansio"
 msgid "From link"
 msgstr "LinkistÃ¤"
 
-#: templates/index.php:40
+#: templates/index.php:42
 msgid "Deleted files"
 msgstr "Poistetut tiedostot"
 
-#: templates/index.php:46
+#: templates/index.php:48
 msgid "Cancel upload"
 msgstr "Peru lÃ¤hetys"
 
-#: templates/index.php:53
+#: templates/index.php:54
 msgid "You donâ€™t have write permissions here."
 msgstr "Tunnuksellasi ei ole kirjoitusoikeuksia tÃ¤nne."
 
-#: templates/index.php:60
+#: 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:74
+#: templates/index.php:75
 msgid "Download"
 msgstr "Lataa"
 
-#: templates/index.php:86 templates/index.php:87
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Peru jakaminen"
 
-#: templates/index.php:106
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "LÃ¤hetettÃ¤vÃ¤ tiedosto on liian suuri"
 
-#: templates/index.php:108
+#: 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:113
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Tiedostoja tarkistetaan, odota hetki."
 
-#: templates/index.php:116
+#: 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..8e9d79de1f6261c991d56f22c2c0a5e7d962c8e9 100644
--- a/l10n/fi_FI/files_encryption.po
+++ b/l10n/fi_FI/files_encryption.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-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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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/files_external.po b/l10n/fi_FI/files_external.po
index 8daeeb1bbff959ee3c791baee427fb21193c5f15..5063d7091103b312ea37d47e63b7fd670e344e6c 100644
--- a/l10n/fi_FI/files_external.po
+++ b/l10n/fi_FI/files_external.po
@@ -3,15 +3,12 @@
 # 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-01 00:05+0100\n"
-"PO-Revision-Date: 2013-02-27 23:20+0000\n"
+"POT-Creation-Date: 2013-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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"
@@ -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: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 "<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: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 "<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"
@@ -63,7 +67,7 @@ msgstr "Kansion nimi"
 
 #: templates/settings.php:10
 msgid "External storage"
-msgstr ""
+msgstr "Ulkoinen tallennustila"
 
 #: templates/settings.php:11
 msgid "Configuration"
@@ -79,7 +83,7 @@ msgstr "Sovellettavissa"
 
 #: templates/settings.php:33
 msgid "Add storage"
-msgstr ""
+msgstr "LisÃ¤Ã¤ tallennustila"
 
 #: templates/settings.php:90
 msgid "None set"
diff --git a/l10n/fi_FI/files_sharing.po b/l10n/fi_FI/files_sharing.po
index 8bdb2b410f99149eac246738569b0bdc08d40e56..dedda4f4352652c6572f03b23e4198f64eb78d07 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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 482678d9c7152448cdb7708e8932e8890e1251b5..b3da91aeffd657f91a85a70694ac9e05e14cbe1e 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-03-08 00:25+0100\n"
-"PO-Revision-Date: 2013-03-07 23:25+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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"
@@ -18,12 +17,12 @@ msgstr ""
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:40
+#: ajax/delete.php:42
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "Kohdetta %s ei voitu poistaa pysyvÃ¤sti"
 
-#: ajax/undelete.php:41
+#: ajax/undelete.php:42
 #, php-format
 msgid "Couldn't restore %s"
 msgstr "Kohteen %s palautus epÃ¤onnistui"
@@ -32,6 +31,10 @@ msgstr "Kohteen %s palautus epÃ¤onnistui"
 msgid "perform restore operation"
 msgstr "suorita palautustoiminto"
 
+#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+msgid "Error"
+msgstr "Virhe"
+
 #: js/trash.js:34
 msgid "delete file permanently"
 msgstr "poista tiedosto pysyvÃ¤sti"
@@ -78,4 +81,4 @@ msgstr "Poista"
 
 #: templates/part.breadcrumb.php:9
 msgid "Deleted Files"
-msgstr ""
+msgstr "Poistetut tiedostot"
diff --git a/l10n/fi_FI/files_versions.po b/l10n/fi_FI/files_versions.po
index d6e7f7b3f873ce6565b43566e01960b4e10989fe..f29c46f4570b41299d9299b017ad17c609a86087 100644
--- a/l10n/fi_FI/files_versions.po
+++ b/l10n/fi_FI/files_versions.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>, 2012-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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:30+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"
@@ -41,17 +40,17 @@ msgstr "epÃ¤onnistui"
 msgid "File %s could not be reverted to version %s"
 msgstr "Tiedoston %s palautus versioon %s epÃ¤onnistui"
 
-#: history.php:68
+#: history.php:69
 msgid "No old versions available"
-msgstr "Vanhoja ei ole saatavilla"
+msgstr "Vanhoja versioita ei ole saatavilla"
 
-#: history.php:73
+#: history.php:74
 msgid "No path specified"
 msgstr "Polkua ei ole mÃ¤Ã¤ritetty"
 
 #: js/versions.js:6
 msgid "Versions"
-msgstr ""
+msgstr "Versiot"
 
 #: templates/history.php:20
 msgid "Revert a file to a previous version by clicking on its revert button"
diff --git a/l10n/fi_FI/lib.po b/l10n/fi_FI/lib.po
index 7d15295cc376f23556bc80da5140e28f6bb25450..4a438cdbf2e71c639b7b7792b6a54c894dbfed27 100644
--- a/l10n/fi_FI/lib.po
+++ b/l10n/fi_FI/lib.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-03-02 00:03+0100\n"
-"PO-Revision-Date: 2013-03-01 07:50+0000\n"
-"Last-Translator: Jiri GrÃ¶nroos <jiri.gronroos@iki.fi>\n"
+"POT-Creation-Date: 2013-04-28 01:57+0200\n"
+"PO-Revision-Date: 2013-04-27 23:57+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"
@@ -42,19 +41,19 @@ msgstr "Sovellukset"
 msgid "Admin"
 msgstr "YllÃ¤pitÃ¤jÃ¤"
 
-#: files.php:202
+#: files.php:209
 msgid "ZIP download is turned off."
 msgstr "ZIP-lataus on poistettu kÃ¤ytÃ¶stÃ¤."
 
-#: files.php:203
+#: files.php:210
 msgid "Files need to be downloaded one by one."
 msgstr "Tiedostot on ladattava yksittÃ¤in."
 
-#: files.php:204 files.php:231
+#: files.php:211 files.php:244
 msgid "Back to Files"
 msgstr "Takaisin tiedostoihin"
 
-#: files.php:228
+#: files.php:241
 msgid "Selected files too large to generate zip file."
 msgstr "Valitut tiedostot ovat liian suurikokoisia mahtuakseen zip-tiedostoon."
 
@@ -68,7 +67,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 +93,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 +113,72 @@ msgstr "%s et voi kÃ¤yttÃ¤Ã¤ pisteitÃ¤ tietokannan nimessÃ¤"
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:128 setup.php:320 setup.php:365
+#: setup.php:132 setup.php:325 setup.php:370
 msgid "PostgreSQL username and/or password not valid"
 msgstr "PostgreSQL:n kÃ¤yttÃ¤jÃ¤tunnus ja/tai salasana on vÃ¤Ã¤rin"
 
-#: setup.php:129 setup.php:152 setup.php:229
+#: setup.php:133 setup.php:156 setup.php:234
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:151 setup.php:453 setup.php:520
+#: setup.php:155 setup.php:458 setup.php:525
 msgid "Oracle username and/or password not valid"
 msgstr "Oraclen kÃ¤yttÃ¤jÃ¤tunnus ja/tai salasana on vÃ¤Ã¤rin"
 
-#: setup.php:228
+#: setup.php:233
 msgid "MySQL username and/or password not valid"
 msgstr "MySQL:n kÃ¤yttÃ¤jÃ¤tunnus ja/tai salasana on vÃ¤Ã¤rin"
 
-#: 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: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:583 setup.php:592 setup.php:600 setup.php:609
+#: setup.php:615
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Tietokantavirhe: \"%s\""
 
-#: 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:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
+#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
+#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:299
+#: setup.php:304
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "MySQL-kÃ¤yttÃ¤jÃ¤ '%s'@'localhost' on jo olemassa."
 
-#: setup.php:300
+#: setup.php:305
 msgid "Drop this user from MySQL"
-msgstr ""
+msgstr "Pudota tÃ¤mÃ¤ kÃ¤yttÃ¤jÃ¤ MySQL:stÃ¤"
 
-#: setup.php:305
+#: setup.php:310
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "MySQL-kÃ¤yttÃ¤jÃ¤ '%s'@'%%' on jo olemassa"
 
-#: setup.php:306
+#: setup.php:311
 msgid "Drop this user from MySQL."
-msgstr ""
+msgstr "Pudota tÃ¤mÃ¤ kÃ¤yttÃ¤jÃ¤ MySQL:stÃ¤."
 
-#: setup.php:579 setup.php:611
+#: setup.php:584 setup.php:616
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:631
+#: setup.php:636
 #, 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:849
+#: setup.php:858
 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:859
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Lue tarkasti <a href='%s'>asennusohjeet</a>."
@@ -240,19 +235,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 a5c6c1ed5b24de6afddefea5a865b77fcf702c8e..52d5c8723a622c1e65227746e8d7a4e3a0344380 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-02-27 14:35+0100\n"
-"PO-Revision-Date: 2013-02-27 13:35+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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"
 "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"
 
@@ -95,7 +97,7 @@ msgstr "PÃ¤ivitÃ¤ versioon {appversion}"
 msgid "Disable"
 msgstr "Poista kÃ¤ytÃ¶stÃ¤"
 
-#: js/apps.js:36 js/apps.js:64
+#: js/apps.js:36 js/apps.js:64 js/apps.js:83
 msgid "Enable"
 msgstr "KÃ¤ytÃ¤"
 
@@ -103,68 +105,68 @@ msgstr "KÃ¤ytÃ¤"
 msgid "Please wait...."
 msgstr "Odota hetki..."
 
-#: js/apps.js:84
+#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+msgid "Error"
+msgstr "Virhe"
+
+#: js/apps.js:90
 msgid "Updating...."
 msgstr "PÃ¤ivitetÃ¤Ã¤n..."
 
-#: js/apps.js:87
+#: js/apps.js:93
 msgid "Error while updating app"
 msgstr "Virhe sovellusta pÃ¤ivittÃ¤essÃ¤"
 
-#: js/apps.js:87
-msgid "Error"
-msgstr "Virhe"
-
-#: js/apps.js:90
+#: js/apps.js:96
 msgid "Updated"
 msgstr "PÃ¤ivitetty"
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr "Tallennetaan..."
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "deleted"
 msgstr "poistettu"
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "undo"
 msgstr "kumoa"
 
-#: js/users.js:62
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr "KÃ¤yttÃ¤jÃ¤n poistaminen ei onnistunut"
 
-#: js/users.js:75 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
+#: templates/users.php:103
 msgid "Groups"
 msgstr "RyhmÃ¤t"
 
-#: js/users.js:78 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr "RyhmÃ¤n yllÃ¤pitÃ¤jÃ¤"
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "Poista"
 
-#: js/users.js:191
+#: js/users.js:269
 msgid "add group"
 msgstr "lisÃ¤Ã¤ ryhmÃ¤"
 
-#: js/users.js:352
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:353 js/users.js:359 js/users.js:374
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr "Virhe kÃ¤yttÃ¤jÃ¤Ã¤ luotaessa"
 
-#: js/users.js:358
+#: js/users.js:426
 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,15 +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:230 templates/personal.php:102
+#: templates/admin.php:228
+msgid "Less"
+msgstr "VÃ¤hemmÃ¤n"
+
+#: templates/admin.php:235 templates/personal.php:105
 msgid "Version"
 msgstr "Versio"
 
-#: templates/admin.php:233 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 "
@@ -394,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:77
 msgid "Password"
 msgstr "Salasana"
 
@@ -418,82 +424,70 @@ msgstr "Uusi salasana"
 msgid "Change password"
 msgstr "Vaihda salasana"
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:76
 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:68
 msgid "Email"
-msgstr "SÃ¤hkÃ¶posti"
+msgstr "SÃ¤hkÃ¶postiosoite"
 
-#: templates/personal.php:72
+#: templates/personal.php:70
 msgid "Your email address"
 msgstr "SÃ¤hkÃ¶postiosoitteesi"
 
-#: templates/personal.php:73
+#: templates/personal.php:71
 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:77 templates/personal.php:78
 msgid "Language"
 msgstr "Kieli"
 
-#: templates/personal.php:86
+#: templates/personal.php:89
 msgid "Help translate"
 msgstr "Auta kÃ¤Ã¤ntÃ¤misessÃ¤"
 
-#: templates/personal.php:91
+#: templates/personal.php:94
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:93
+#: templates/personal.php:96
 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:75
 msgid "Login Name"
 msgstr "Kirjautumisnimi"
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr "Luo"
 
-#: templates/users.php:35
+#: templates/users.php:33
 msgid "Default Storage"
-msgstr ""
+msgstr "Oletustallennustila"
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:39 templates/users.php:133
 msgid "Unlimited"
 msgstr "Rajoittamaton"
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:57 templates/users.php:148
 msgid "Other"
 msgstr "Muu"
 
-#: templates/users.php:84
+#: templates/users.php:82
 msgid "Storage"
-msgstr ""
+msgstr "Tallennustila"
 
-#: templates/users.php:95
+#: templates/users.php:93
 msgid "change display name"
 msgstr "vaihda nÃ¤yttÃ¶nimi"
 
-#: templates/users.php:99
+#: templates/users.php:97
 msgid "set new password"
 msgstr "aseta uusi salasana"
 
-#: templates/users.php:134
+#: templates/users.php:128
 msgid "Default"
 msgstr "Oletus"
diff --git a/l10n/fi_FI/user_ldap.po b/l10n/fi_FI/user_ldap.po
index c41a2c1ac1ede0978e4361eab275eb6728f7bab1..0bfc9766d9a5b4c244cd086fbaaf07dcf46b458f 100644
--- a/l10n/fi_FI/user_ldap.po
+++ b/l10n/fi_FI/user_ldap.po
@@ -3,15 +3,12 @@
 # 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-02 00:03+0100\n"
-"PO-Revision-Date: 2013-03-01 23:04+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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"
@@ -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:18
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:37
 msgid "Host"
 msgstr "IsÃ¤ntÃ¤"
 
-#: templates/settings.php:25
+#: 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:26
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "Oletus DN"
 
-#: 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 "Voit mÃ¤Ã¤rittÃ¤Ã¤ kÃ¤yttÃ¤jien ja ryhmien oletus DN:n (distinguished name) 'tarkemmat asetukset'-vÃ¤lilehdeltÃ¤  "
 
-#: templates/settings.php:30
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "KÃ¤yttÃ¤jÃ¤n DN"
 
-#: 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 "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:33
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Salasana"
 
-#: templates/settings.php:36
+#: 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:37
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "Login suodatus"
 
-#: 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 "MÃ¤Ã¤rittelee kÃ¤ytettÃ¤vÃ¤n suodattimen, kun sisÃ¤Ã¤nkirjautumista yritetÃ¤Ã¤n. %%uid korvaa sisÃ¤Ã¤nkirjautumisessa kÃ¤yttÃ¤jÃ¤tunnuksen."
 
-#: templates/settings.php:41
+#: 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:42
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "KÃ¤yttÃ¤jien suodatus"
 
-#: templates/settings.php:45
+#: 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:46
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "ilman paikanvaraustermiÃ¤, ts. \"objectClass=person\"."
 
-#: templates/settings.php:47
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "Ryhmien suodatus"
 
-#: templates/settings.php:50
+#: 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:51
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "ilman paikanvaraustermiÃ¤, ts. \"objectClass=posixGroup\"."
 
-#: templates/settings.php:55
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr "Yhteysasetukset"
 
-#: 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 "Portti"
 
-#: 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 "Poista pÃ¤Ã¤palvelin kÃ¤ytÃ¶stÃ¤"
 
-#: 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 "KÃ¤ytÃ¤ 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 "Kirjainkoosta piittamaton LDAP-palvelin (Windows)"
 
-#: templates/settings.php:64
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "Poista kÃ¤ytÃ¶stÃ¤ SSL-varmenteen vahvistus"
 
-#: 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 "Jos yhteys toimii vain tÃ¤llÃ¤ valinnalla, siirrÃ¤ LDAP-palvelimen SSL-varmenne ownCloud-palvelimellesi."
 
-#: templates/settings.php:64
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "Ei suositella, kÃ¤ytÃ¤ vain testausta varten."
 
-#: 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 "sekunneissa. Muutos tyhjentÃ¤Ã¤ vÃ¤limuistin."
 
-#: templates/settings.php:67
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr "Hakemistoasetukset"
 
-#: templates/settings.php:69
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr "KÃ¤yttÃ¤jÃ¤n nÃ¤ytettÃ¤vÃ¤n nimen kenttÃ¤"
 
-#: templates/settings.php:69
+#: 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:70
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "OletuskÃ¤yttÃ¤jÃ¤puu"
 
-#: 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 "RyhmÃ¤n \"nÃ¤ytettÃ¤vÃ¤ nimi\"-kenttÃ¤"
 
-#: templates/settings.php:72
+#: 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:73
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "Ryhmien juuri"
 
-#: 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 "RyhmÃ¤n ja jÃ¤senen assosiaatio (yhteys)"
 
-#: 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 "tavuissa"
 
-#: templates/settings.php:81
+#: templates/settings.php:95
 msgid "Email Field"
-msgstr ""
+msgstr "SÃ¤hkÃ¶postikenttÃ¤"
 
-#: 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 "JÃ¤tÃ¤ tyhjÃ¤ksi kÃ¤yttÃ¤jÃ¤nimi (oletusasetus). Muutoin anna LDAP/AD-atribuutti."
 
-#: 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 "Ohje"
diff --git a/l10n/fi_FI/user_webdavauth.po b/l10n/fi_FI/user_webdavauth.po
index e1fa0ca8d17ce9550bb8f057265e1ed6998fb8bb..ef62c35b8a06671b574185cb80fd88aaf2367f6f 100644
--- a/l10n/fi_FI/user_webdavauth.po
+++ b/l10n/fi_FI/user_webdavauth.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-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-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/fr/core.po b/l10n/fr/core.po
index bb1f9dc5fe7939006a4c9582997189c3674a46dc..62215da210b46042c206710c3fa77cee1c2bcae8 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.
-#   <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-02-22 00:06+0100\n"
-"PO-Revision-Date: 2013-02-20 23:20+0000\n"
-"Last-Translator: Robert Di Rosa <>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+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"
@@ -31,24 +19,24 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ajax/share.php:85
+#: ajax/share.php:97
 #, php-format
 msgid "User %s shared a file with you"
 msgstr "L'utilisateur %s a partagÃ© un fichier avec vous"
 
-#: ajax/share.php:87
+#: ajax/share.php:99
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr "L'utilsateur %s a partagÃ© un dossier avec vous"
 
-#: ajax/share.php:89
+#: ajax/share.php:101
 #, php-format
 msgid ""
 "User %s shared the file \"%s\" with you. It is available for download here: "
 "%s"
 msgstr "L'utilisateur %s a partagÃ© le fichier \"%s\" avec vous. Vous pouvez le tÃ©lÃ©charger ici : %s"
 
-#: ajax/share.php:91
+#: ajax/share.php:104
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -87,86 +75,86 @@ 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
 msgid "Error removing %s from favorites."
 msgstr "Erreur lors de la suppression de %s des favoris."
 
-#: js/config.php:32
+#: js/config.php:34
 msgid "Sunday"
 msgstr "Dimanche"
 
-#: js/config.php:32
+#: js/config.php:35
 msgid "Monday"
 msgstr "Lundi"
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Tuesday"
 msgstr "Mardi"
 
-#: js/config.php:32
+#: js/config.php:37
 msgid "Wednesday"
 msgstr "Mercredi"
 
-#: js/config.php:32
+#: js/config.php:38
 msgid "Thursday"
 msgstr "Jeudi"
 
-#: js/config.php:32
+#: js/config.php:39
 msgid "Friday"
 msgstr "Vendredi"
 
-#: js/config.php:32
+#: js/config.php:40
 msgid "Saturday"
 msgstr "Samedi"
 
-#: js/config.php:33
+#: js/config.php:45
 msgid "January"
 msgstr "janvier"
 
-#: js/config.php:33
+#: js/config.php:46
 msgid "February"
 msgstr "fÃ©vrier"
 
-#: js/config.php:33
+#: js/config.php:47
 msgid "March"
 msgstr "mars"
 
-#: js/config.php:33
+#: js/config.php:48
 msgid "April"
 msgstr "avril"
 
-#: js/config.php:33
+#: js/config.php:49
 msgid "May"
 msgstr "mai"
 
-#: js/config.php:33
+#: js/config.php:50
 msgid "June"
 msgstr "juin"
 
-#: js/config.php:33
+#: js/config.php:51
 msgid "July"
 msgstr "juillet"
 
-#: js/config.php:33
+#: js/config.php:52
 msgid "August"
 msgstr "aoÃ»t"
 
-#: js/config.php:33
+#: js/config.php:53
 msgid "September"
 msgstr "septembre"
 
-#: js/config.php:33
+#: js/config.php:54
 msgid "October"
 msgstr "octobre"
 
-#: js/config.php:33
+#: js/config.php:55
 msgid "November"
 msgstr "novembre"
 
-#: js/config.php:33
+#: js/config.php:56
 msgid "December"
 msgstr "dÃ©cembre"
 
@@ -174,86 +162,88 @@ msgstr "dÃ©cembre"
 msgid "Settings"
 msgstr "ParamÃ¨tres"
 
-#: js/js.js:767
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "il y a quelques secondes"
 
-#: js/js.js:768
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "il y a une minute"
 
-#: js/js.js:769
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr "il y a {minutes} minutes"
 
-#: js/js.js:770
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr "Il y a une heure"
 
-#: js/js.js:771
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr "Il y a {hours} heures"
 
-#: js/js.js:772
+#: js/js.js:723
 msgid "today"
 msgstr "aujourd'hui"
 
-#: js/js.js:773
+#: js/js.js:724
 msgid "yesterday"
 msgstr "hier"
 
-#: js/js.js:774
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr "il y a {days} jours"
 
-#: js/js.js:775
+#: js/js.js:726
 msgid "last month"
 msgstr "le mois dernier"
 
-#: js/js.js:776
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr "Il y a {months} mois"
 
-#: js/js.js:777
+#: js/js.js:728
 msgid "months ago"
 msgstr "il y a plusieurs mois"
 
-#: js/js.js:778
+#: js/js.js:729
 msgid "last year"
 msgstr "l'annÃ©e derniÃ¨re"
 
-#: js/js.js:779
+#: js/js.js:730
 msgid "years ago"
 msgstr "il y a plusieurs annÃ©es"
 
-#: js/oc-dialogs.js:126
-msgid "Choose"
-msgstr "Choisir"
+#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
+msgid "Ok"
+msgstr "Ok"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
 msgid "Cancel"
 msgstr "Annuler"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "Non"
+#: js/oc-dialogs.js:185
+msgid "Choose"
+msgstr "Choisir"
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:215
 msgid "Yes"
 msgstr "Oui"
 
-#: js/oc-dialogs.js:180
-msgid "Ok"
-msgstr "Ok"
+#: js/oc-dialogs.js:222
+msgid "No"
+msgstr "Non"
 
 #: 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 "Le type d'objet n'est pas spÃ©cifiÃ©."
 
-#: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:582
-#: js/share.js:594
+#: 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 "Erreur"
 
@@ -265,127 +255,127 @@ msgstr "Le nom de l'application n'est pas spÃ©cifiÃ©."
 msgid "The required file {file} is not installed!"
 msgstr "Le fichier requis {file} n'est pas installÃ© !"
 
-#: js/share.js:29 js/share.js:43 js/share.js:90
+#: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr "PartagÃ©"
 
-#: js/share.js:93
+#: js/share.js:90
 msgid "Share"
 msgstr "Partager"
 
-#: js/share.js:141 js/share.js:622
+#: js/share.js:125 js/share.js:617
 msgid "Error while sharing"
 msgstr "Erreur lors de la mise en partage"
 
-#: js/share.js:152
+#: js/share.js:136
 msgid "Error while unsharing"
 msgstr "Erreur lors de l'annulation du partage"
 
-#: js/share.js:159
+#: js/share.js:143
 msgid "Error while changing permissions"
 msgstr "Erreur lors du changement des permissions"
 
-#: js/share.js:168
+#: js/share.js:152
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "PartagÃ© par {owner} avec vous et le groupe {group}"
 
-#: js/share.js:170
+#: js/share.js:154
 msgid "Shared with you by {owner}"
 msgstr "PartagÃ© avec vous par {owner}"
 
-#: js/share.js:175
+#: js/share.js:159
 msgid "Share with"
 msgstr "Partager avec"
 
-#: js/share.js:180
+#: js/share.js:164
 msgid "Share with link"
 msgstr "Partager via lien"
 
-#: js/share.js:183
+#: js/share.js:167
 msgid "Password protect"
 msgstr "ProtÃ©ger par un mot de passe"
 
-#: js/share.js:185 templates/installation.php:44 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Mot de passe"
 
-#: js/share.js:189
+#: js/share.js:173
 msgid "Email link to person"
 msgstr "Envoyez le lien par email"
 
-#: js/share.js:190
+#: js/share.js:174
 msgid "Send"
 msgstr "Envoyer"
 
-#: js/share.js:194
+#: js/share.js:178
 msgid "Set expiration date"
 msgstr "SpÃ©cifier la date d'expiration"
 
-#: js/share.js:195
+#: js/share.js:179
 msgid "Expiration date"
 msgstr "Date d'expiration"
 
-#: js/share.js:227
+#: js/share.js:211
 msgid "Share via email:"
 msgstr "Partager via e-mail :"
 
-#: js/share.js:229
+#: js/share.js:213
 msgid "No people found"
 msgstr "Aucun utilisateur trouvÃ©"
 
-#: js/share.js:256
+#: js/share.js:251
 msgid "Resharing is not allowed"
 msgstr "Le repartage n'est pas autorisÃ©"
 
-#: js/share.js:292
+#: js/share.js:287
 msgid "Shared in {item} with {user}"
 msgstr "PartagÃ© dans {item} avec {user}"
 
-#: js/share.js:313
+#: js/share.js:308
 msgid "Unshare"
 msgstr "Ne plus partager"
 
-#: js/share.js:325
+#: js/share.js:320
 msgid "can edit"
 msgstr "Ã©dition autorisÃ©e"
 
-#: js/share.js:327
+#: js/share.js:322
 msgid "access control"
 msgstr "contrÃ´le des accÃ¨s"
 
-#: js/share.js:330
+#: js/share.js:325
 msgid "create"
 msgstr "crÃ©er"
 
-#: js/share.js:333
+#: js/share.js:328
 msgid "update"
 msgstr "mettre Ã  jour"
 
-#: js/share.js:336
+#: js/share.js:331
 msgid "delete"
 msgstr "supprimer"
 
-#: js/share.js:339
+#: js/share.js:334
 msgid "share"
 msgstr "partager"
 
-#: js/share.js:373 js/share.js:569
+#: js/share.js:368 js/share.js:564
 msgid "Password protected"
 msgstr "ProtÃ©gÃ© par un mot de passe"
 
-#: js/share.js:582
+#: js/share.js:577
 msgid "Error unsetting expiration date"
 msgstr "Une erreur est survenue pendant la suppression de la date d'expiration"
 
-#: js/share.js:594
+#: js/share.js:589
 msgid "Error setting expiration date"
 msgstr "Erreur lors de la spÃ©cification de la date d'expiration"
 
-#: js/share.js:609
+#: js/share.js:604
 msgid "Sending ..."
 msgstr "En cours d'envoi ..."
 
-#: js/share.js:620
+#: js/share.js:615
 msgid "Email sent"
 msgstr "Email envoyÃ©"
 
@@ -408,24 +398,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:39
-#: 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"
 
@@ -447,7 +440,7 @@ msgstr "RÃ©initialiser le mot de passe"
 
 #: strings.php:5
 msgid "Personal"
-msgstr "Personnels"
+msgstr "Personnel"
 
 #: strings.php:6
 msgid "Users"
@@ -475,121 +468,136 @@ 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"
 msgstr "Ajouter"
 
-#: templates/installation.php:23 templates/installation.php:30
+#: templates/installation.php:24 templates/installation.php:31
+#: templates/installation.php:38
 msgid "Security Warning"
 msgstr "Avertissement de sÃ©curitÃ©"
 
-#: templates/installation.php:24
+#: templates/installation.php:25
+msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
+msgstr "Votre version de PHP est vulnÃ©rable Ã  l'attaque par caractÃ¨re NULL (CVE-2006-7243)"
+
+#: templates/installation.php:26
+msgid "Please update your PHP installation to use ownCloud securely."
+msgstr "Veuillez mettre Ã  jour votre installation PHP pour utiliser ownCloud de faÃ§on sÃ©curisÃ©e."
+
+#: templates/installation.php:32
 msgid ""
 "No secure random number generator is available, please enable the PHP "
 "OpenSSL extension."
 msgstr "Aucun gÃ©nÃ©rateur de nombre alÃ©atoire sÃ©curisÃ© n'est disponible, veuillez activer l'extension PHP OpenSSL"
 
-#: templates/installation.php:25
+#: 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 "Sans gÃ©nÃ©rateur de nombre alÃ©atoire sÃ©curisÃ©, un attaquant peut Ãªtre en mesure de prÃ©dire les jetons de rÃ©initialisation du mot de passe, et ainsi prendre le contrÃ´le de votre compte utilisateur."
 
-#: templates/installation.php:31
+#: templates/installation.php:39
 msgid ""
 "Your data directory and files are probably accessible from the internet "
 "because the .htaccess file does not work."
 msgstr "Votre rÃ©pertoire data est certainement accessible depuis l'internet car le fichier .htaccess ne semble pas fonctionner"
 
-#: templates/installation.php:32
+#: 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 "Pour les informations de configuration de votre serveur, veuillez lire la <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>."
 
-#: templates/installation.php:36
+#: templates/installation.php:44
 msgid "Create an <strong>admin account</strong>"
 msgstr "CrÃ©er un <strong>compte administrateur</strong>"
 
-#: templates/installation.php:52
+#: templates/installation.php:62
 msgid "Advanced"
 msgstr "AvancÃ©"
 
-#: templates/installation.php:54
+#: templates/installation.php:64
 msgid "Data folder"
 msgstr "RÃ©pertoire des donnÃ©es"
 
-#: templates/installation.php:61
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "Configurer la base de donnÃ©es"
 
-#: templates/installation.php:66 templates/installation.php:77
-#: templates/installation.php:87 templates/installation.php:97
+#: 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:109
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "Utilisateur pour la base de donnÃ©es"
 
-#: templates/installation.php:113
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "Mot de passe de la base de donnÃ©es"
 
-#: templates/installation.php:117
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "Nom de la base de donnÃ©es"
 
-#: templates/installation.php:125
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "Tablespaces de la base de donnÃ©es"
 
-#: templates/installation.php:131
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "Serveur de la base de donnÃ©es"
 
-#: templates/installation.php:136
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "Terminer l'installation"
 
-#: templates/layout.guest.php:33
+#: templates/layout.guest.php:40
 msgid "web services under your control"
 msgstr "services web sous votre contrÃ´le"
 
-#: templates/layout.user.php:48
+#: templates/layout.user.php:36
+#, 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:61
 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 f7ba7a03081444ba4da46dd08232d6c6676f6151..aef01563f9d04bfc504c8c33cc1853c43c17ce1d 100644
--- a/l10n/fr/files.po
+++ b/l10n/fr/files.po
@@ -3,28 +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.
+# 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-03-04 00:06+0100\n"
-"PO-Revision-Date: 2013-03-03 23:06+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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"
@@ -42,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 ""
@@ -63,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"
@@ -85,59 +68,70 @@ msgstr "Erreur d'Ã©criture sur le disque"
 msgid "Not enough storage available"
 msgstr "Plus assez d'espace de stockage disponible"
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr "Dossier invalide."
 
-#: appinfo/app.php:10
+#: appinfo/app.php:12
 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:92 templates/index.php:93
+#: 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/files.js:292 js/files.js:408
-#: js/files.js:439
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
-msgstr "En cours"
+msgstr "En attente"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} existe dÃ©jÃ "
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "remplacer"
 
-#: js/filelist.js:251
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "SuggÃ©rer un nom"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "annuler"
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "{new_name} a Ã©tÃ© remplacÃ© par {old_name}"
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "undo"
 msgstr "annuler"
 
-#: js/filelist.js:323
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr "effectuer l'opÃ©ration de suppression"
 
+#: js/filelist.js:413
+msgid "1 file uploading"
+msgstr "1 fichier en cours d'envoi"
+
+#: js/filelist.js:416 js/filelist.js:470
+msgid "files uploading"
+msgstr "fichiers en cours d'envoi"
+
 #: js/files.js:52
 msgid "'.' is an invalid file name."
 msgstr "'.' n'est pas un nom de fichier valide."
@@ -160,77 +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:225
+#: 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:262
+#: 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."
-
-#: js/files.js:262
-msgid "Upload Error"
-msgstr "Erreur de chargement"
-
-#: js/files.js:273
-msgid "Close"
-msgstr "Fermer"
+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:312
-msgid "1 file uploading"
-msgstr "1 fichier en cours de tÃ©lÃ©chargement"
-
-#: js/files.js:315 js/files.js:370 js/files.js:385
-msgid "{count} files uploading"
-msgstr "{count} fichiers tÃ©lÃ©versÃ©s"
+#: js/files.js:277
+msgid "Not enough space available"
+msgstr "Espace disponible insuffisant"
 
-#: js/files.js:388 js/files.js:423
+#: js/files.js:317
 msgid "Upload cancelled."
-msgstr "Chargement annulÃ©."
+msgstr "Envoi annulÃ©."
 
-#: js/files.js:497
+#: 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:570
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "L'URL ne peut-Ãªtre vide"
 
-#: js/files.js:575
+#: 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:953 templates/index.php:68
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+msgid "Error"
+msgstr "Erreur"
+
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Nom"
 
-#: js/files.js:954 templates/index.php:79
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Taille"
 
-#: js/files.js:955 templates/index.php:81
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "ModifiÃ©"
 
-#: js/files.js:974
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 dossier"
 
-#: js/files.js:976
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} dossiers"
 
-#: js/files.js:984
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 fichier"
 
-#: js/files.js:986
+#: 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"
@@ -283,45 +277,45 @@ msgstr "Dossier"
 msgid "From link"
 msgstr "Depuis le lien"
 
-#: templates/index.php:40
+#: templates/index.php:42
 msgid "Deleted files"
 msgstr "Fichiers supprimÃ©s"
 
-#: templates/index.php:46
+#: templates/index.php:48
 msgid "Cancel upload"
 msgstr "Annuler l'envoi"
 
-#: templates/index.php:53
+#: templates/index.php:54
 msgid "You donâ€™t have write permissions here."
-msgstr ""
+msgstr "Vous n'avez pas le droit d'Ã©criture ici."
 
-#: templates/index.php:60
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Il n'y a rien ici ! Envoyez donc quelque chose :)"
 
-#: templates/index.php:74
+#: templates/index.php:75
 msgid "Download"
 msgstr "TÃ©lÃ©charger"
 
-#: templates/index.php:86 templates/index.php:87
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Ne plus partager"
 
-#: templates/index.php:106
+#: templates/index.php:107
 msgid "Upload too large"
-msgstr "Fichier trop volumineux"
+msgstr "TÃ©lÃ©versement trop volumineux"
 
-#: templates/index.php:108
+#: 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:113
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Les fichiers sont en cours d'analyse, veuillez patienter."
 
-#: templates/index.php:116
+#: 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..a39633b4513c2e8bc0d0aa9a4c21ad6c1590bb2a 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/fr/files_external.po b/l10n/fr/files_external.po
index fd92856f84ade2b716435129441f47a40c6efae6..1038a04378c152798e3817d90a8aa79fa5da9e8e 100644
--- a/l10n/fr/files_external.po
+++ b/l10n/fr/files_external.po
@@ -3,14 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <nicolas@shivaserv.fr>, 2012.
-# Romain DEP. <rom1dep@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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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"
@@ -39,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: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 "<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: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 "<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"
@@ -62,7 +67,7 @@ msgstr "Nom du dossier"
 
 #: templates/settings.php:10
 msgid "External storage"
-msgstr ""
+msgstr "Stockage externe"
 
 #: templates/settings.php:11
 msgid "Configuration"
@@ -78,7 +83,7 @@ msgstr "Disponible"
 
 #: templates/settings.php:33
 msgid "Add storage"
-msgstr ""
+msgstr "Ajouter un support de stockage"
 
 #: templates/settings.php:90
 msgid "None set"
diff --git a/l10n/fr/files_sharing.po b/l10n/fr/files_sharing.po
index 36628ca4e7d3f9c1bbb18c41c52d5618eb6ade47..d1da943c7c249491894e9a8de73caba0564cc3b0 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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 4b183165c73c00114ce0a1430201b186c9b7114f..1116a5b394581457065b233928c7474d4d0c6dfe 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-03-08 00:25+0100\n"
-"PO-Revision-Date: 2013-03-07 23:25+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -19,12 +17,12 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ajax/delete.php:40
+#: ajax/delete.php:42
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "Impossible d'effacer %s de faÃ§on permanente"
 
-#: ajax/undelete.php:41
+#: ajax/undelete.php:42
 #, php-format
 msgid "Couldn't restore %s"
 msgstr "Impossible de restaurer %s"
@@ -33,6 +31,10 @@ msgstr "Impossible de restaurer %s"
 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
+msgid "Error"
+msgstr "Erreur"
+
 #: js/trash.js:34
 msgid "delete file permanently"
 msgstr "effacer dÃ©finitivement le fichier"
@@ -79,4 +81,4 @@ msgstr "Supprimer"
 
 #: templates/part.breadcrumb.php:9
 msgid "Deleted Files"
-msgstr ""
+msgstr "Fichiers effacÃ©s"
diff --git a/l10n/fr/files_versions.po b/l10n/fr/files_versions.po
index 7b7b6fa9a66ed0d37da82f04891409174d87c8b7..9dd1fa7ce3f0a7b8d54371ce652c72eddc192c5c 100644
--- a/l10n/fr/files_versions.po
+++ b/l10n/fr/files_versions.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-28 00:04+0100\n"
-"PO-Revision-Date: 2013-02-27 23:04+0000\n"
+"POT-Creation-Date: 2013-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:30+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"
@@ -41,17 +40,17 @@ msgstr "Ã©chec"
 msgid "File %s could not be reverted to version %s"
 msgstr "Le fichier %s ne peut Ãªtre restaurÃ© dans sa version %s"
 
-#: history.php:68
+#: history.php:69
 msgid "No old versions available"
 msgstr "Aucune ancienne version n'est disponible"
 
-#: history.php:73
+#: history.php:74
 msgid "No path specified"
 msgstr "Aucun chemin spÃ©cifiÃ©"
 
 #: js/versions.js:6
 msgid "Versions"
-msgstr ""
+msgstr "Versions"
 
 #: templates/history.php:20
 msgid "Revert a file to a previous version by clicking on its revert button"
diff --git a/l10n/fr/lib.po b/l10n/fr/lib.po
index 2403f65f66c1b3a261886abe33c712347bd5526e..6443c8f3bd9e2d4e038dc1d5fb1901430d449c89 100644
--- a/l10n/fr/lib.po
+++ b/l10n/fr/lib.po
@@ -3,17 +3,13 @@
 # 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.
 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 17:10+0000\n"
-"Last-Translator: Christophe Lherieau <skimpax@gmail.com>\n"
+"POT-Creation-Date: 2013-04-28 01:57+0200\n"
+"PO-Revision-Date: 2013-04-27 23:57+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"
@@ -45,19 +41,19 @@ msgstr "Applications"
 msgid "Admin"
 msgstr "Administration"
 
-#: files.php:202
+#: files.php:209
 msgid "ZIP download is turned off."
 msgstr "TÃ©lÃ©chargement ZIP dÃ©sactivÃ©."
 
-#: files.php:203
+#: files.php:210
 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:204 files.php:231
+#: files.php:211 files.php:244
 msgid "Back to Files"
 msgstr "Retour aux Fichiers"
 
-#: files.php:228
+#: files.php:241
 msgid "Selected files too large to generate zip file."
 msgstr "Les fichiers sÃ©lectionnÃ©s sont trop volumineux pour Ãªtre compressÃ©s."
 
@@ -97,10 +93,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 +113,83 @@ 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:128 setup.php:320 setup.php:365
+#: setup.php:132 setup.php:325 setup.php:370
 msgid "PostgreSQL username and/or password not valid"
 msgstr "Nom d'utilisateur et/ou mot de passe de la base PostgreSQL invalide"
 
-#: setup.php:129 setup.php:152 setup.php:229
+#: setup.php:133 setup.php:156 setup.php:234
 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:151 setup.php:453 setup.php:520
+#: setup.php:155 setup.php:458 setup.php:525
 msgid "Oracle username and/or password not valid"
 msgstr "Nom d'utilisateur et/ou mot de passe de la base Oracle invalide"
 
-#: setup.php:228
+#: setup.php:233
 msgid "MySQL username and/or password not valid"
 msgstr "Nom d'utilisateur et/ou mot de passe de la base MySQL invalide"
 
-#: 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: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:583 setup.php:592 setup.php:600 setup.php:609
+#: setup.php:615
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Erreur de la base de donnÃ©es : \"%s\""
 
-#: 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:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
+#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
+#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "La requÃªte en cause est : \"%s\""
 
-#: setup.php:299
+#: setup.php:304
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "L'utilisateur MySQL '%s'@'localhost' existe dÃ©jÃ ."
 
-#: setup.php:300
+#: setup.php:305
 msgid "Drop this user from MySQL"
 msgstr "Retirer cet utilisateur de la base MySQL"
 
-#: setup.php:305
+#: setup.php:310
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "L'utilisateur MySQL '%s'@'%%' existe dÃ©jÃ "
 
-#: setup.php:306
+#: setup.php:311
 msgid "Drop this user from MySQL."
 msgstr "Retirer cet utilisateur de la base MySQL."
 
-#: setup.php:579 setup.php:611
+#: setup.php:584 setup.php:616
 #, 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:631
+#: setup.php:636
 #, 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:849
+#: setup.php:858
 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:850
+#: setup.php:859
 #, 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 +235,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 51796243567b9700f6a2046cdff86b1e28dd6e09..d6ec6b40d051e58edba9d41c97740bd23b6a312b 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-02-28 00:04+0100\n"
-"PO-Revision-Date: 2013-02-27 16:51+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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"
@@ -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"
 
@@ -111,7 +97,7 @@ msgstr "Mettre Ã  jour vers {appversion}"
 msgid "Disable"
 msgstr "DÃ©sactiver"
 
-#: js/apps.js:36 js/apps.js:64
+#: js/apps.js:36 js/apps.js:64 js/apps.js:83
 msgid "Enable"
 msgstr "Activer"
 
@@ -119,68 +105,68 @@ msgstr "Activer"
 msgid "Please wait...."
 msgstr "Veuillez patienterâ€¦"
 
-#: js/apps.js:84
+#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+msgid "Error"
+msgstr "Erreur"
+
+#: js/apps.js:90
 msgid "Updating...."
 msgstr "Mise Ã  jour..."
 
-#: js/apps.js:87
+#: js/apps.js:93
 msgid "Error while updating app"
 msgstr "Erreur lors de la mise Ã  jour de l'application"
 
-#: js/apps.js:87
-msgid "Error"
-msgstr "Erreur"
-
-#: js/apps.js:90
+#: js/apps.js:96
 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:30
+#: js/users.js:47
 msgid "deleted"
 msgstr "supprimÃ©"
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "undo"
 msgstr "annuler"
 
-#: js/users.js:62
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr "Impossible de retirer l'utilisateur"
 
-#: js/users.js:75 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
+#: templates/users.php:103
 msgid "Groups"
 msgstr "Groupes"
 
-#: js/users.js:78 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr "Groupe Admin"
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "Supprimer"
 
-#: js/users.js:191
+#: js/users.js:269
 msgid "add group"
 msgstr "ajouter un groupe"
 
-#: js/users.js:352
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr "Un nom d'utilisateur valide doit Ãªtre saisi"
 
-#: js/users.js:353 js/users.js:359 js/users.js:374
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr "Erreur lors de la crÃ©ation de l'utilisateur"
 
-#: js/users.js:358
+#: js/users.js:426
 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,15 +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:230 templates/personal.php:102
+#: templates/admin.php:228
+msgid "Less"
+msgstr "Moins"
+
+#: templates/admin.php:235 templates/personal.php:105
 msgid "Version"
 msgstr "Version"
 
-#: templates/admin.php:233 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 "
@@ -410,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:77
 msgid "Password"
 msgstr "Mot de passe"
 
@@ -434,82 +424,70 @@ 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:76
 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:68
 msgid "Email"
-msgstr "E-mail"
+msgstr "Adresse mail"
 
-#: templates/personal.php:72
+#: templates/personal.php:70
 msgid "Your email address"
 msgstr "Votre adresse e-mail"
 
-#: templates/personal.php:73
+#: templates/personal.php:71
 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:77 templates/personal.php:78
 msgid "Language"
 msgstr "Langue"
 
-#: templates/personal.php:86
+#: templates/personal.php:89
 msgid "Help translate"
 msgstr "Aidez Ã  traduire"
 
-#: templates/personal.php:91
+#: templates/personal.php:94
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:93
+#: templates/personal.php:96
 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:75
 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:33
 msgid "Default Storage"
 msgstr "Support de stockage par dÃ©faut"
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:39 templates/users.php:133
 msgid "Unlimited"
 msgstr "IllimitÃ©"
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:57 templates/users.php:148
 msgid "Other"
 msgstr "Autre"
 
-#: templates/users.php:84
+#: templates/users.php:82
 msgid "Storage"
 msgstr "Support de stockage"
 
-#: templates/users.php:95
+#: templates/users.php:93
 msgid "change display name"
 msgstr "Changer le nom affichÃ©"
 
-#: templates/users.php:99
+#: templates/users.php:97
 msgid "set new password"
 msgstr "Changer le mot de passe"
 
-#: templates/users.php:134
+#: templates/users.php:128
 msgid "Default"
 msgstr "DÃ©faut"
diff --git a/l10n/fr/user_ldap.po b/l10n/fr/user_ldap.po
index 177014bd976e14d6a17b36aa564cf904c56c8785..d277eef42e23f8301964d5e01c858de41987f3c1 100644
--- a/l10n/fr/user_ldap.po
+++ b/l10n/fr/user_ldap.po
@@ -3,20 +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>, 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-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-19 01:58+0200\n"
+"PO-Revision-Date: 2013-05-18 18:01+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"
@@ -24,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 ""
@@ -58,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:18
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr "Ajouter une configuration du serveur"
 
-#: templates/settings.php:23
+#: templates/settings.php:37
 msgid "Host"
 msgstr "HÃ´te"
 
-#: templates/settings.php:25
+#: 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:26
+#: templates/settings.php:40
 msgid "Base DN"
-msgstr "DN Racine"
+msgstr "DN racine"
 
-#: templates/settings.php:27
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr "Un DN racine par ligne"
 
-#: templates/settings.php:28
+#: 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:30
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "DN Utilisateur (AutorisÃ© Ã  consulter l'annuaire)"
 
-#: 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 "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:33
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Mot de passe"
 
-#: templates/settings.php:36
+#: 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:37
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "ModÃ¨le d'authentification utilisateurs"
 
-#: 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 "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:41
+#: 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:42
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Filtre d'utilisateurs"
 
-#: templates/settings.php:45
+#: 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:46
+#: 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:47
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "Filtre de groupes"
 
-#: templates/settings.php:50
+#: 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:51
+#: 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:55
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr "ParamÃ¨tres de connexion"
 
-#: templates/settings.php:57
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr "Configuration active"
 
-#: templates/settings.php:57
+#: 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:58
+#: templates/settings.php:72
 msgid "Port"
 msgstr "Port"
 
-#: templates/settings.php:59
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr "Serveur de backup (rÃ©plique)"
 
-#: 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 "Fournir un serveur de backup optionnel.  Il doit s'agir d'une rÃ©plique du serveur LDAP/AD principal."
 
-#: templates/settings.php:60
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr "Port du serveur de backup (rÃ©plique)"
 
-#: templates/settings.php:61
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr "DÃ©sactiver le serveur principal"
 
-#: templates/settings.php:61
+#: 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:62
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "Utiliser TLS"
 
-#: templates/settings.php:62
+#: 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:63
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Serveur LDAP insensible Ã  la casse (Windows)"
 
-#: templates/settings.php:64
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "DÃ©sactiver la validation du certificat SSL."
 
-#: 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 "Si la connexion ne fonctionne qu'avec cette option, importez le certificat SSL du serveur LDAP dans le serveur ownCloud."
 
-#: templates/settings.php:64
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "Non recommandÃ©, utilisation pour tests uniquement."
 
-#: templates/settings.php:65
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
-msgstr ""
+msgstr "DurÃ©e de vie du cache"
 
-#: templates/settings.php:65
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr "en secondes. Tout changement vide le cache."
 
-#: templates/settings.php:67
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr "ParamÃ¨tres du rÃ©pertoire"
 
-#: templates/settings.php:69
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr "Champ \"nom d'affichage\" de l'utilisateur"
 
-#: templates/settings.php:69
+#: 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:70
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "DN racine de l'arbre utilisateurs"
 
-#: templates/settings.php:70
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr "Un DN racine utilisateur par ligne"
 
-#: templates/settings.php:71
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr "Recherche des attributs utilisateur"
 
-#: templates/settings.php:71 templates/settings.php:74
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr "Optionnel, un attribut par ligne"
 
-#: templates/settings.php:72
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr "Champ \"nom d'affichage\" du groupe"
 
-#: templates/settings.php:72
+#: 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:73
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "DN racine de l'arbre groupes"
 
-#: templates/settings.php:73
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr "Un DN racine groupe par ligne"
 
-#: templates/settings.php:74
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr "Recherche des attributs du groupe"
 
-#: templates/settings.php:75
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr "Association groupe-membre"
 
-#: templates/settings.php:77
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr "Attributs spÃ©ciaux"
 
-#: templates/settings.php:79
+#: templates/settings.php:93
 msgid "Quota Field"
-msgstr ""
+msgstr "Champ du quota"
 
-#: templates/settings.php:80
+#: templates/settings.php:94
 msgid "Quota Default"
-msgstr ""
+msgstr "Quota par dÃ©faut"
 
-#: templates/settings.php:80
+#: templates/settings.php:94
 msgid "in bytes"
-msgstr "en octets"
+msgstr "en bytes"
 
-#: templates/settings.php:81
+#: templates/settings.php:95
 msgid "Email Field"
-msgstr ""
+msgstr "Champ Email"
 
-#: templates/settings.php:82
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
-msgstr ""
+msgstr "Convention de nommage du rÃ©pertoire utilisateur"
 
-#: templates/settings.php:82
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Laisser vide "
 
-#: templates/settings.php:86
+#: 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 ""
+msgstr "Tester la configuration"
 
-#: templates/settings.php:86
+#: templates/settings.php:111
 msgid "Help"
 msgstr "Aide"
diff --git a/l10n/fr/user_webdavauth.po b/l10n/fr/user_webdavauth.po
index 4d665c8ff422130f9b5afd0e1625416490630b67..8fdd18d7e53866804251f80225d2c77e2ee5343a 100644
--- a/l10n/fr/user_webdavauth.po
+++ b/l10n/fr/user_webdavauth.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-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-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+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 20bf7af29eed21fd6261ec6e4a4b199eeb0fde9f..74443dba87e9ca1a255e31f471c2c1c11d11562e 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-02-22 00:06+0100\n"
-"PO-Revision-Date: 2013-02-20 23:20+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10: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"
@@ -21,24 +18,24 @@ msgstr ""
 "Language: gl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:85
+#: ajax/share.php:97
 #, php-format
 msgid "User %s shared a file with you"
 msgstr "O usuario %s compartÃu un ficheiro con vostede"
 
-#: ajax/share.php:87
+#: ajax/share.php:99
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr "O usuario %s compartÃu un cartafol con vostede"
 
-#: ajax/share.php:89
+#: ajax/share.php:101
 #, php-format
 msgid ""
 "User %s shared the file \"%s\" with you. It is available for download here: "
 "%s"
 msgstr "O usuario %s compartiu o ficheiro Â«%sÂ» con vostede. Teno dispoÃ±Ãbel en: %s"
 
-#: ajax/share.php:91
+#: ajax/share.php:104
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -77,173 +74,175 @@ 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
 msgid "Error removing %s from favorites."
 msgstr "Produciuse un erro ao eliminar %s dos favoritos."
 
-#: js/config.php:32
+#: js/config.php:34
 msgid "Sunday"
 msgstr "Domingo"
 
-#: js/config.php:32
+#: js/config.php:35
 msgid "Monday"
 msgstr "Luns"
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Tuesday"
 msgstr "Martes"
 
-#: js/config.php:32
+#: js/config.php:37
 msgid "Wednesday"
 msgstr "MÃ©rcores"
 
-#: js/config.php:32
+#: js/config.php:38
 msgid "Thursday"
 msgstr "Xoves"
 
-#: js/config.php:32
+#: js/config.php:39
 msgid "Friday"
 msgstr "Venres"
 
-#: js/config.php:32
+#: js/config.php:40
 msgid "Saturday"
 msgstr "SÃ¡bado"
 
-#: js/config.php:33
+#: js/config.php:45
 msgid "January"
 msgstr "xaneiro"
 
-#: js/config.php:33
+#: js/config.php:46
 msgid "February"
 msgstr "febreiro"
 
-#: js/config.php:33
+#: js/config.php:47
 msgid "March"
 msgstr "marzo"
 
-#: js/config.php:33
+#: js/config.php:48
 msgid "April"
 msgstr "abril"
 
-#: js/config.php:33
+#: js/config.php:49
 msgid "May"
 msgstr "maio"
 
-#: js/config.php:33
+#: js/config.php:50
 msgid "June"
 msgstr "xuÃ±o"
 
-#: js/config.php:33
+#: js/config.php:51
 msgid "July"
 msgstr "xullo"
 
-#: js/config.php:33
+#: js/config.php:52
 msgid "August"
 msgstr "agosto"
 
-#: js/config.php:33
+#: js/config.php:53
 msgid "September"
 msgstr "setembro"
 
-#: js/config.php:33
+#: js/config.php:54
 msgid "October"
 msgstr "outubro"
 
-#: js/config.php:33
+#: js/config.php:55
 msgid "November"
 msgstr "novembro"
 
-#: js/config.php:33
+#: js/config.php:56
 msgid "December"
 msgstr "decembro"
 
 #: js/js.js:286
 msgid "Settings"
-msgstr "ConfiguraciÃ³ns"
+msgstr "Axustes"
 
-#: js/js.js:767
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "segundos atrÃ¡s"
 
-#: js/js.js:768
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "hai 1 minuto"
 
-#: js/js.js:769
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr "hai {minutes} minutos"
 
-#: js/js.js:770
+#: js/js.js:721
 msgid "1 hour ago"
-msgstr "hai 1 hora"
+msgstr "Vai 1 hora"
 
-#: js/js.js:771
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr "hai {hours} horas"
 
-#: js/js.js:772
+#: js/js.js:723
 msgid "today"
 msgstr "hoxe"
 
-#: js/js.js:773
+#: js/js.js:724
 msgid "yesterday"
 msgstr "onte"
 
-#: js/js.js:774
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr "hai {days} dÃas"
 
-#: js/js.js:775
+#: js/js.js:726
 msgid "last month"
 msgstr "Ãºltimo mes"
 
-#: js/js.js:776
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr "hai {months} meses"
 
-#: js/js.js:777
+#: js/js.js:728
 msgid "months ago"
 msgstr "meses atrÃ¡s"
 
-#: js/js.js:778
+#: js/js.js:729
 msgid "last year"
 msgstr "Ãºltimo ano"
 
-#: js/js.js:779
+#: js/js.js:730
 msgid "years ago"
 msgstr "anos atrÃ¡s"
 
-#: js/oc-dialogs.js:126
-msgid "Choose"
-msgstr "Escoller"
+#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
+msgid "Ok"
+msgstr "Aceptar"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "Non"
+#: js/oc-dialogs.js:185
+msgid "Choose"
+msgstr "Escoller"
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:215
 msgid "Yes"
 msgstr "Si"
 
-#: js/oc-dialogs.js:180
-msgid "Ok"
-msgstr "Aceptar"
+#: js/oc-dialogs.js:222
+msgid "No"
+msgstr "Non"
 
 #: 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 "Non se especificou o tipo de obxecto."
 
-#: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:582
-#: js/share.js:594
+#: 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 "Erro"
 
@@ -255,127 +254,127 @@ msgstr "Non se especificou o nome do aplicativo."
 msgid "The required file {file} is not installed!"
 msgstr "Non estÃ¡ instalado o ficheiro {file} que se precisa"
 
-#: js/share.js:29 js/share.js:43 js/share.js:90
+#: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr "Compartir"
 
-#: js/share.js:93
+#: js/share.js:90
 msgid "Share"
 msgstr "Compartir"
 
-#: js/share.js:141 js/share.js:622
+#: js/share.js:125 js/share.js:617
 msgid "Error while sharing"
 msgstr "Produciuse un erro ao compartir"
 
-#: js/share.js:152
+#: js/share.js:136
 msgid "Error while unsharing"
 msgstr "Produciuse un erro ao deixar de compartir"
 
-#: js/share.js:159
+#: js/share.js:143
 msgid "Error while changing permissions"
 msgstr "Produciuse un erro ao cambiar os permisos"
 
-#: js/share.js:168
+#: js/share.js:152
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Compartido con vostede e co grupo {group} por {owner}"
 
-#: js/share.js:170
+#: js/share.js:154
 msgid "Shared with you by {owner}"
 msgstr "Compartido con vostede por {owner}"
 
-#: js/share.js:175
+#: js/share.js:159
 msgid "Share with"
 msgstr "Compartir con"
 
-#: js/share.js:180
+#: js/share.js:164
 msgid "Share with link"
 msgstr "Compartir coa ligazÃ³n"
 
-#: js/share.js:183
+#: js/share.js:167
 msgid "Password protect"
 msgstr "Protexido con contrasinais"
 
-#: js/share.js:185 templates/installation.php:44 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Contrasinal"
 
-#: js/share.js:189
+#: js/share.js:173
 msgid "Email link to person"
 msgstr "Enviar ligazÃ³n por correo"
 
-#: js/share.js:190
+#: js/share.js:174
 msgid "Send"
 msgstr "Enviar"
 
-#: js/share.js:194
+#: js/share.js:178
 msgid "Set expiration date"
 msgstr "Definir a data de caducidade"
 
-#: js/share.js:195
+#: js/share.js:179
 msgid "Expiration date"
 msgstr "Data de caducidade"
 
-#: js/share.js:227
+#: js/share.js:211
 msgid "Share via email:"
 msgstr "Compartir por correo:"
 
-#: js/share.js:229
+#: js/share.js:213
 msgid "No people found"
 msgstr "Non se atopou xente"
 
-#: js/share.js:256
+#: js/share.js:251
 msgid "Resharing is not allowed"
 msgstr "Non se permite volver a compartir"
 
-#: js/share.js:292
+#: js/share.js:287
 msgid "Shared in {item} with {user}"
 msgstr "Compartido en {item} con {user}"
 
-#: js/share.js:313
+#: js/share.js:308
 msgid "Unshare"
 msgstr "Deixar de compartir"
 
-#: js/share.js:325
+#: js/share.js:320
 msgid "can edit"
 msgstr "pode editar"
 
-#: js/share.js:327
+#: js/share.js:322
 msgid "access control"
 msgstr "control de acceso"
 
-#: js/share.js:330
+#: js/share.js:325
 msgid "create"
 msgstr "crear"
 
-#: js/share.js:333
+#: js/share.js:328
 msgid "update"
 msgstr "actualizar"
 
-#: js/share.js:336
+#: js/share.js:331
 msgid "delete"
 msgstr "eliminar"
 
-#: js/share.js:339
+#: js/share.js:334
 msgid "share"
 msgstr "compartir"
 
-#: js/share.js:373 js/share.js:569
+#: js/share.js:368 js/share.js:564
 msgid "Password protected"
 msgstr "Protexido con contrasinal"
 
-#: js/share.js:582
+#: js/share.js:577
 msgid "Error unsetting expiration date"
 msgstr "Produciuse un erro ao retirar a data de caducidade"
 
-#: js/share.js:594
+#: js/share.js:589
 msgid "Error setting expiration date"
 msgstr "Produciuse un erro ao definir a data de caducidade"
 
-#: js/share.js:609
+#: js/share.js:604
 msgid "Sending ..."
 msgstr "Enviando..."
 
-#: js/share.js:620
+#: js/share.js:615
 msgid "Email sent"
 msgstr "Correo enviado"
 
@@ -398,24 +397,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:39
-#: 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"
 
@@ -449,7 +451,7 @@ msgstr "Aplicativos"
 
 #: strings.php:8
 msgid "Admin"
-msgstr "Admin"
+msgstr "AdministraciÃ³n"
 
 #: strings.php:9
 msgid "Help"
@@ -465,121 +467,136 @@ 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"
 msgstr "Engadir"
 
-#: templates/installation.php:23 templates/installation.php:30
+#: templates/installation.php:24 templates/installation.php:31
+#: templates/installation.php:38
 msgid "Security Warning"
 msgstr "Aviso de seguranza"
 
-#: templates/installation.php:24
+#: templates/installation.php:25
+msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
+msgstr "A sÃºa versiÃ³n de PHP Ã© vulnerÃ¡bel a un ataque de byte nulo (CVE-2006-7243)"
+
+#: templates/installation.php:26
+msgid "Please update your PHP installation to use ownCloud securely."
+msgstr "Actualice a instalaciÃ³n de PHP para empregar ownCloud de xeito seguro."
+
+#: templates/installation.php:32
 msgid ""
 "No secure random number generator is available, please enable the PHP "
 "OpenSSL extension."
 msgstr "Non hai un xerador de nÃºmeros ao chou dispoÃ±Ãbel. Active o engadido de OpenSSL para PHP."
 
-#: templates/installation.php:25
+#: 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 "Sen un xerador seguro de nÃºmeros ao chou poderÃa acontecer que predicindo as cadeas de texto de reinicio de contrasinais se afagan coa sÃºa conta."
 
-#: templates/installation.php:31
+#: templates/installation.php:39
 msgid ""
 "Your data directory and files are probably accessible from the internet "
 "because the .htaccess file does not work."
 msgstr "O seu directorio de datos e os ficheiros probabelmente sexan accesÃbeis desde a Internet xa que o ficheiro .htaccess non estÃ¡ a traballar."
 
-#: templates/installation.php:32
+#: 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 "Para obter informaciÃ³n sobre como como configurar axeitadamente o seu servidor, vexa a <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentaciÃ³n</a>."
 
-#: templates/installation.php:36
+#: templates/installation.php:44
 msgid "Create an <strong>admin account</strong>"
 msgstr "Crear unha <strong>contra de administrador</strong>"
 
-#: templates/installation.php:52
+#: templates/installation.php:62
 msgid "Advanced"
 msgstr "Avanzado"
 
-#: templates/installation.php:54
+#: templates/installation.php:64
 msgid "Data folder"
 msgstr "Cartafol de datos"
 
-#: templates/installation.php:61
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "Configurar a base de datos"
 
-#: templates/installation.php:66 templates/installation.php:77
-#: templates/installation.php:87 templates/installation.php:97
+#: 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:109
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "Usuario da base de datos"
 
-#: templates/installation.php:113
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "Contrasinal da base de datos"
 
-#: templates/installation.php:117
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "Nome da base de datos"
 
-#: templates/installation.php:125
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "TÃ¡boa de espazos da base de datos"
 
-#: templates/installation.php:131
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "Servidor da base de datos"
 
-#: templates/installation.php:136
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "Rematar a configuraciÃ³n"
 
-#: templates/layout.guest.php:33
+#: templates/layout.guest.php:40
 msgid "web services under your control"
 msgstr "servizos web baixo o seu control"
 
-#: templates/layout.user.php:48
+#: templates/layout.user.php:36
+#, 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:61
 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 49b778b128480d7df3959ec8a4e49f119716cc24..627dadfcfa2f4a2a97eb06a9a187d59b8dc32e21 100644
--- a/l10n/gl/files.po
+++ b/l10n/gl/files.po
@@ -3,18 +3,14 @@
 # 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-03-04 00:06+0100\n"
-"PO-Revision-Date: 2013-03-03 23:06+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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"
@@ -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"
@@ -75,59 +67,70 @@ msgstr "Produciuse un erro ao escribir no disco"
 msgid "Not enough storage available"
 msgstr "Non hai espazo de almacenamento abondo"
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr "O directorio Ã© incorrecto."
 
-#: appinfo/app.php:10
+#: appinfo/app.php:12
 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:92 templates/index.php:93
+#: 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/files.js:292 js/files.js:408
-#: js/files.js:439
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "Pendentes"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "Xa existe un {new_name}"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "substituÃr"
 
-#: js/filelist.js:251
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "suxerir nome"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "cancelar"
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "substituÃr {new_name} por {old_name}"
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "undo"
 msgstr "desfacer"
 
-#: js/filelist.js:323
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr "realizar a operaciÃ³n de eliminaciÃ³n"
 
+#: js/filelist.js:413
+msgid "1 file uploading"
+msgstr "EnviÃ¡ndose 1 ficheiro"
+
+#: js/filelist.js:416 js/filelist.js:470
+msgid "files uploading"
+msgstr "ficheiros enviÃ¡ndose"
+
 #: js/files.js:52
 msgid "'.' is an invalid file name."
 msgstr "Â«.Â» Ã© un nome de ficheiro incorrecto"
@@ -150,77 +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:225
+#: 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:262
+#: 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:262
-msgid "Upload Error"
-msgstr "Produciuse un erro no envÃo"
-
-#: js/files.js:273
-msgid "Close"
-msgstr "Pechar"
+#: js/files.js:277
+msgid "Not enough space available"
+msgstr "O espazo dispoÃ±Ãbel Ã© insuficiente"
 
-#: js/files.js:312
-msgid "1 file uploading"
-msgstr "EnviÃ¡ndose 1 ficheiro"
-
-#: js/files.js:315 js/files.js:370 js/files.js:385
-msgid "{count} files uploading"
-msgstr "Enviandose {count} ficheiros"
-
-#: js/files.js:388 js/files.js:423
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "EnvÃo cancelado."
 
-#: js/files.js:497
+#: 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:570
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "O URL non pode quedar baleiro."
 
-#: js/files.js:575
+#: 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:953 templates/index.php:68
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+msgid "Error"
+msgstr "Erro"
+
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Nome"
 
-#: js/files.js:954 templates/index.php:79
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "TamaÃ±o"
 
-#: js/files.js:955 templates/index.php:81
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Modificado"
 
-#: js/files.js:974
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 cartafol"
 
-#: js/files.js:976
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} cartafoles"
 
-#: js/files.js:984
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 ficheiro"
 
-#: js/files.js:986
+#: 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"
@@ -243,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"
@@ -273,45 +276,45 @@ msgstr "Cartafol"
 msgid "From link"
 msgstr "Desde a ligazÃ³n"
 
-#: templates/index.php:40
+#: templates/index.php:42
 msgid "Deleted files"
 msgstr "Ficheiros eliminados"
 
-#: templates/index.php:46
+#: templates/index.php:48
 msgid "Cancel upload"
 msgstr "Cancelar o envÃo"
 
-#: templates/index.php:53
+#: templates/index.php:54
 msgid "You donâ€™t have write permissions here."
 msgstr "Non ten permisos para escribir aquÃ."
 
-#: templates/index.php:60
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "AquÃ non hai nada. EnvÃe algo."
 
-#: templates/index.php:74
+#: templates/index.php:75
 msgid "Download"
 msgstr "Descargar"
 
-#: templates/index.php:86 templates/index.php:87
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Deixar de compartir"
 
-#: templates/index.php:106
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "EnvÃo demasiado grande"
 
-#: templates/index.php:108
+#: 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:113
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Estanse analizando os ficheiros. Agarde."
 
-#: templates/index.php:116
+#: 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..deed371c809c60c8716b9602534f2c38d9d0af01 100644
--- a/l10n/gl/files_encryption.po
+++ b/l10n/gl/files_encryption.po
@@ -3,15 +3,13 @@
 # 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.
 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"
-"Last-Translator: mbouzada <mbouzada@gmail.com>\n"
+"POT-Creation-Date: 2013-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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/gl/files_external.po b/l10n/gl/files_external.po
index eb74d6d40a1d9dddf0bbf1912129568676fb8404..d0b6177856dd7d6c28bfbc6d9780ed18ee028145 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-01 00:05+0100\n"
-"PO-Revision-Date: 2013-02-28 07:20+0000\n"
-"Last-Translator: mbouzada <mbouzada@gmail.com>\n"
+"POT-Creation-Date: 2013-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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: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 "<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: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 "<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..e9c4c07adc98ec0cb46c3c7da328b99977cc7535 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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 6f1595820d3a3c90db68942c48e8692e5fabdb51..917e0cfc516a433e9ff4e52b6d4b8cd75476b4eb 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-03-08 00:25+0100\n"
-"PO-Revision-Date: 2013-03-07 23:25+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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"
@@ -18,12 +17,12 @@ msgstr ""
 "Language: gl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:40
+#: ajax/delete.php:42
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "Non foi posÃbel eliminar %s permanente"
 
-#: ajax/undelete.php:41
+#: ajax/undelete.php:42
 #, php-format
 msgid "Couldn't restore %s"
 msgstr "Non foi posÃbel restaurar %s"
@@ -32,6 +31,10 @@ msgstr "Non foi posÃbel restaurar %s"
 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
+msgid "Error"
+msgstr "Erro"
+
 #: js/trash.js:34
 msgid "delete file permanently"
 msgstr "eliminar o ficheiro permanentemente"
@@ -78,4 +81,4 @@ msgstr "Eliminar"
 
 #: templates/part.breadcrumb.php:9
 msgid "Deleted Files"
-msgstr ""
+msgstr "Ficheiros eliminados"
diff --git a/l10n/gl/files_versions.po b/l10n/gl/files_versions.po
index 6c5d2ee8b43d7694a5bc57419d479ba57127026c..b7440fc633f37e93d5359926a0d2ec6add43b309 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:30+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 6458c4cbfd39a9283a32986bc9af1a523bb82852..f5375905736eb368186ecb94c4ca9bbf8dc5cc0c 100644
--- a/l10n/gl/lib.po
+++ b/l10n/gl/lib.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-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: mbouzada <mbouzada@gmail.com>\n"
+"POT-Creation-Date: 2013-04-28 01:57+0200\n"
+"PO-Revision-Date: 2013-04-27 23:57+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"
@@ -31,7 +27,7 @@ msgstr "Persoal"
 
 #: app.php:373
 msgid "Settings"
-msgstr "ConfiguraciÃ³ns"
+msgstr "Axustes"
 
 #: app.php:385
 msgid "Users"
@@ -45,19 +41,19 @@ msgstr "Aplicativos"
 msgid "Admin"
 msgstr "AdministraciÃ³n"
 
-#: files.php:202
+#: files.php:209
 msgid "ZIP download is turned off."
 msgstr "As descargas ZIP estÃ¡n desactivadas."
 
-#: files.php:203
+#: files.php:210
 msgid "Files need to be downloaded one by one."
 msgstr "Os ficheiros necesitan seren descargados dun en un."
 
-#: files.php:204 files.php:231
+#: files.php:211 files.php:244
 msgid "Back to Files"
 msgstr "Volver aos ficheiros"
 
-#: files.php:228
+#: files.php:241
 msgid "Selected files too large to generate zip file."
 msgstr "Os ficheiros seleccionados son demasiado grandes como para xerar un ficheiro zip."
 
@@ -71,7 +67,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 +93,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 +113,72 @@ 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:128 setup.php:320 setup.php:365
+#: setup.php:132 setup.php:325 setup.php:370
 msgid "PostgreSQL username and/or password not valid"
 msgstr "Nome de usuario e/ou contrasinal de PostgreSQL incorrecto"
 
-#: setup.php:129 setup.php:152 setup.php:229
+#: setup.php:133 setup.php:156 setup.php:234
 msgid "You need to enter either an existing account or the administrator."
 msgstr "DeberÃ¡ introducir unha conta existente ou o administrador."
 
-#: setup.php:151 setup.php:453 setup.php:520
+#: setup.php:155 setup.php:458 setup.php:525
 msgid "Oracle username and/or password not valid"
 msgstr "Nome de usuario e/ou contrasinal de Oracle incorrecto"
 
-#: setup.php:228
+#: setup.php:233
 msgid "MySQL username and/or password not valid"
 msgstr "Nome de usuario e/ou contrasinal de MySQL incorrecto"
 
-#: 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: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:583 setup.php:592 setup.php:600 setup.php:609
+#: setup.php:615
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Produciuse un erro na base de datos: Â«%sÂ»"
 
-#: 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:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
+#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
+#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "A orde ofensiva foi: Â«%sÂ»"
 
-#: setup.php:299
+#: setup.php:304
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "O usuario MySQL  '%s'@'localhost' xa existe."
 
-#: setup.php:300
+#: setup.php:305
 msgid "Drop this user from MySQL"
 msgstr "Omitir este usuario de MySQL"
 
-#: setup.php:305
+#: setup.php:310
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "O usuario MySQL Â«%sÂ»@Â«%%Â» xa existe."
 
-#: setup.php:306
+#: setup.php:311
 msgid "Drop this user from MySQL."
 msgstr "Omitir este usuario de MySQL."
 
-#: setup.php:579 setup.php:611
+#: setup.php:584 setup.php:616
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "A orde ofensiva foi: Â«%sÂ», nome: %s, contrasinal: %s"
 
-#: setup.php:631
+#: setup.php:636
 #, 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:849
+#: setup.php:858
 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:850
+#: setup.php:859
 #, 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 +235,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 f0b08fe277e338c5d533460c47632f0f719e67e4..3914db5ce19685b17261827240729e46f4a3a2bf 100644
--- a/l10n/gl/settings.po
+++ b/l10n/gl/settings.po
@@ -3,18 +3,13 @@
 # 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-03-01 00:05+0100\n"
-"PO-Revision-Date: 2013-02-28 07:20+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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"
@@ -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"
 
@@ -98,7 +97,7 @@ msgstr "Actualizar Ã¡ {appversion}"
 msgid "Disable"
 msgstr "Desactivar"
 
-#: js/apps.js:36 js/apps.js:64
+#: js/apps.js:36 js/apps.js:64 js/apps.js:83
 msgid "Enable"
 msgstr "Activar"
 
@@ -106,68 +105,68 @@ msgstr "Activar"
 msgid "Please wait...."
 msgstr "Agarde..."
 
-#: js/apps.js:84
+#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+msgid "Error"
+msgstr "Erro"
+
+#: js/apps.js:90
 msgid "Updating...."
 msgstr "Actualizando..."
 
-#: js/apps.js:87
+#: js/apps.js:93
 msgid "Error while updating app"
 msgstr "Produciuse un erro mentres actualizaba o aplicativo"
 
-#: js/apps.js:87
-msgid "Error"
-msgstr "Erro"
-
-#: js/apps.js:90
+#: js/apps.js:96
 msgid "Updated"
 msgstr "Actualizado"
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr "Gardando..."
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "deleted"
 msgstr "eliminado"
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "undo"
 msgstr "desfacer"
 
-#: js/users.js:62
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr "Non Ã© posÃbel retirar o usuario"
 
-#: js/users.js:75 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
+#: templates/users.php:103
 msgid "Groups"
 msgstr "Grupos"
 
-#: js/users.js:78 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr "Grupo Admin"
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "Eliminar"
 
-#: js/users.js:191
+#: js/users.js:269
 msgid "add group"
 msgstr "engadir un grupo"
 
-#: js/users.js:352
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr "Debe fornecer un nome de usuario"
 
-#: js/users.js:353 js/users.js:359 js/users.js:374
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr "Produciuse un erro ao crear o usuario"
 
-#: js/users.js:358
+#: js/users.js:426
 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,15 +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:230 templates/personal.php:102
+#: templates/admin.php:228
+msgid "Less"
+msgstr "Menos"
+
+#: templates/admin.php:235 templates/personal.php:105
 msgid "Version"
 msgstr "VersiÃ³n"
 
-#: templates/admin.php:233 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 "
@@ -397,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:77
 msgid "Password"
 msgstr "Contrasinal"
 
@@ -421,82 +424,70 @@ 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:76
 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:68
 msgid "Email"
 msgstr "Correo"
 
-#: templates/personal.php:72
+#: templates/personal.php:70
 msgid "Your email address"
 msgstr "O seu enderezo de correo"
 
-#: templates/personal.php:73
+#: templates/personal.php:71
 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:77 templates/personal.php:78
 msgid "Language"
 msgstr "Idioma"
 
-#: templates/personal.php:86
+#: templates/personal.php:89
 msgid "Help translate"
 msgstr "Axude na traduciÃ³n"
 
-#: templates/personal.php:91
+#: templates/personal.php:94
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:93
+#: templates/personal.php:96
 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:75
 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:33
 msgid "Default Storage"
 msgstr "Almacenamento predeterminado"
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:39 templates/users.php:133
 msgid "Unlimited"
 msgstr "Sen lÃmites"
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:57 templates/users.php:148
 msgid "Other"
 msgstr "Outro"
 
-#: templates/users.php:84
+#: templates/users.php:82
 msgid "Storage"
 msgstr "Almacenamento"
 
-#: templates/users.php:95
+#: templates/users.php:93
 msgid "change display name"
 msgstr "cambiar o nome visÃbel"
 
-#: templates/users.php:99
+#: templates/users.php:97
 msgid "set new password"
 msgstr "estabelecer un novo contrasinal"
 
-#: templates/users.php:134
+#: templates/users.php:128
 msgid "Default"
 msgstr "Predeterminado"
diff --git a/l10n/gl/user_ldap.po b/l10n/gl/user_ldap.po
index d47dc01f9f8698c461a743aec4424f0bd6df49e3..a4c52f858f39499e33773d3d1db7532469f9b51d 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-03 00:05+0100\n"
-"PO-Revision-Date: 2013-03-02 08:50+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 11:30+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:18
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr "Engadir a configuraciÃ³n do servidor"
 
-#: templates/settings.php:23
+#: templates/settings.php:37
 msgid "Host"
 msgstr "Servidor"
 
-#: templates/settings.php:25
+#: 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:26
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "DN base"
 
-#: templates/settings.php:27
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr "Un DN base por liÃ±a"
 
-#: templates/settings.php:28
+#: 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:30
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "DN do usuario"
 
-#: 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 "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:33
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Contrasinal"
 
-#: templates/settings.php:36
+#: 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:37
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "Filtro de acceso de usuarios"
 
-#: 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 "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:41
+#: 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:42
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Filtro da lista de usuarios"
 
-#: templates/settings.php:45
+#: 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:46
+#: 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:47
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "Filtro de grupo"
 
-#: templates/settings.php:50
+#: 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:51
+#: 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:55
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr "Axustes da conexiÃ³n"
 
-#: templates/settings.php:57
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr "ConfiguraciÃ³n activa"
 
-#: templates/settings.php:57
+#: 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:58
+#: templates/settings.php:72
 msgid "Port"
 msgstr "Porto"
 
-#: templates/settings.php:59
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr "Servidor da copia de seguranza (RÃ©plica)"
 
-#: 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 "Indicar un servidor de copia de seguranza opcional. Debe ser unha rÃ©plica do servidor principal LDAP/AD."
 
-#: templates/settings.php:60
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr "Porto da copia de seguranza (RÃ©plica)"
 
-#: templates/settings.php:61
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr "Desactivar o servidor principal"
 
-#: templates/settings.php:61
+#: 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:62
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "Usar TLS"
 
-#: templates/settings.php:62
+#: 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:63
+#: 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:64
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "Desactiva a validaciÃ³n do certificado SSL."
 
-#: 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 "Se a conexiÃ³n sÃ³ funciona con esta opciÃ³n importe o certificado SSL do servidor LDAP no seu servidor ownCloud."
 
-#: templates/settings.php:64
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "Non se recomenda. SÃ³ para probas."
 
-#: templates/settings.php:65
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr "Tempo de persistencia da cachÃ©"
 
-#: templates/settings.php:65
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr "en segundos. Calquera cambio baleira a cachÃ©."
 
-#: templates/settings.php:67
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr "Axustes do directorio"
 
-#: templates/settings.php:69
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr "Campo de mostra do nome de usuario"
 
-#: templates/settings.php:69
+#: 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:70
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "Base da Ã¡rbore de usuarios"
 
-#: templates/settings.php:70
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr "Un DN base de usuario por liÃ±a"
 
-#: templates/settings.php:71
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr "Atributos de busca do usuario"
 
-#: templates/settings.php:71 templates/settings.php:74
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr "Opcional; un atributo por liÃ±a"
 
-#: templates/settings.php:72
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr "Campo de mostra do nome de grupo"
 
-#: templates/settings.php:72
+#: 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:73
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "Base da Ã¡rbore de grupo"
 
-#: templates/settings.php:73
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr "Un DN base de grupo por liÃ±a"
 
-#: templates/settings.php:74
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr "Atributos de busca do grupo"
 
-#: templates/settings.php:75
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr "AsociaciÃ³n de grupos e membros"
 
-#: templates/settings.php:77
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr "Atributos especiais"
 
-#: templates/settings.php:79
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr "Campo de cota"
 
-#: templates/settings.php:80
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr "Cota predeterminada"
 
-#: templates/settings.php:80
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr "en bytes"
 
-#: templates/settings.php:81
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr "Campo do correo"
 
-#: templates/settings.php:82
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr "Regra de nomeado do cartafol do usuario"
 
-#: templates/settings.php:82
+#: 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:86
+#: 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:86
+#: templates/settings.php:111
 msgid "Help"
 msgstr "Axuda"
diff --git a/l10n/gl/user_webdavauth.po b/l10n/gl/user_webdavauth.po
index e16010dc69f596348a9ddcbe32b4f701bdd98a61..89f599a0be8b8cbad0eb4dfcaab07720a9b7524b 100644
--- a/l10n/gl/user_webdavauth.po
+++ b/l10n/gl/user_webdavauth.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-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-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+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 612d193348fdc3838fa007a2acff48613bc10430..d605f6893b8b5d216ac78542b62ad4b947a15053 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-02-25 00:05+0100\n"
-"PO-Revision-Date: 2013-02-24 12:10+0000\n"
-"Last-Translator: Gilad Naaman <gilad.doom@gmail.com>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+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,86 +161,88 @@ msgstr "×“×¦×ž×‘×¨"
 msgid "Settings"
 msgstr "×”×’×“×¨×•×ª"
 
-#: js/js.js:767
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "×©× ×™×•×ª"
 
-#: js/js.js:768
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "×œ×¤× ×™ ×“×§×” ××—×ª"
 
-#: js/js.js:769
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr "×œ×¤× ×™ {minutes} ×“×§×•×ª"
 
-#: js/js.js:770
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr "×œ×¤× ×™ ×©×¢×”"
 
-#: js/js.js:771
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr "×œ×¤× ×™ {hours} ×©×¢×•×ª"
 
-#: js/js.js:772
+#: js/js.js:723
 msgid "today"
 msgstr "×”×™×•×"
 
-#: js/js.js:773
+#: js/js.js:724
 msgid "yesterday"
 msgstr "××ª×ž×•×œ"
 
-#: js/js.js:774
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr "×œ×¤× ×™ {days} ×™×ž×™×"
 
-#: js/js.js:775
+#: js/js.js:726
 msgid "last month"
 msgstr "×—×•×“×© ×©×¢×‘×¨"
 
-#: js/js.js:776
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr "×œ×¤× ×™ {months} ×—×•×“×©×™×"
 
-#: js/js.js:777
+#: js/js.js:728
 msgid "months ago"
 msgstr "×—×•×“×©×™×"
 
-#: js/js.js:778
+#: js/js.js:729
 msgid "last year"
 msgstr "×©× ×” ×©×¢×‘×¨×”"
 
-#: js/js.js:779
+#: js/js.js:730
 msgid "years ago"
 msgstr "×©× ×™×"
 
-#: js/oc-dialogs.js:126
-msgid "Choose"
-msgstr "×‘×—×™×¨×”"
+#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
+msgid "Ok"
+msgstr "×‘×¡×“×¨"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
 msgid "Cancel"
 msgstr "×‘×™×˜×•×œ"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "×œ×"
+#: js/oc-dialogs.js:185
+msgid "Choose"
+msgstr "×‘×—×™×¨×”"
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:215
 msgid "Yes"
 msgstr "×›×Ÿ"
 
-#: js/oc-dialogs.js:180
-msgid "Ok"
-msgstr "×‘×¡×“×¨"
+#: js/oc-dialogs.js:222
+msgid "No"
+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:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:582
-#: js/share.js:594
+#: 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 "×©×’×™××”"
 
@@ -256,127 +254,127 @@ msgstr "×©× ×”×™×™×©×•× ×œ× ×¦×•×™×Ÿ."
 msgid "The required file {file} is not installed!"
 msgstr "×”×§×•×‘×¥ ×”× ×“×¨×© {file} ××™× ×• ×ž×•×ª×§×Ÿ!"
 
-#: js/share.js:29 js/share.js:43 js/share.js:90
+#: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr "×©×•×ª×£"
 
-#: js/share.js:93
+#: js/share.js:90
 msgid "Share"
 msgstr "×©×ª×£"
 
-#: js/share.js:141 js/share.js:622
+#: js/share.js:125 js/share.js:617
 msgid "Error while sharing"
 msgstr "×©×’×™××” ×‘×ž×”×œ×š ×”×©×™×ª×•×£"
 
-#: js/share.js:152
+#: js/share.js:136
 msgid "Error while unsharing"
 msgstr "×©×’×™××” ×‘×ž×”×œ×š ×‘×™×˜×•×œ ×”×©×™×ª×•×£"
 
-#: js/share.js:159
+#: js/share.js:143
 msgid "Error while changing permissions"
 msgstr "×©×’×™××” ×‘×ž×”×œ×š ×©×™× ×•×™ ×”×”×’×“×¨×•×ª"
 
-#: js/share.js:168
+#: js/share.js:152
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "×©×•×ª×£ ××ª×š ×•×¢× ×”×§×‘×•×¦×” {group} ×©×‘×‘×¢×œ×•×ª {owner}"
 
-#: js/share.js:170
+#: js/share.js:154
 msgid "Shared with you by {owner}"
 msgstr "×©×•×ª×£ ××ª×š ×¢×œ ×™×“×™ {owner}"
 
-#: js/share.js:175
+#: js/share.js:159
 msgid "Share with"
 msgstr "×©×™×ª×•×£ ×¢×"
 
-#: js/share.js:180
+#: js/share.js:164
 msgid "Share with link"
 msgstr "×©×™×ª×•×£ ×¢× ×§×™×©×•×¨"
 
-#: js/share.js:183
+#: js/share.js:167
 msgid "Password protect"
 msgstr "×”×’× ×” ×‘×¡×¡×ž×”"
 
-#: js/share.js:185 templates/installation.php:46 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
-msgstr "×¡×¡×ž×”"
+msgstr "×¡×™×¡×ž×"
 
-#: js/share.js:189
+#: js/share.js:173
 msgid "Email link to person"
 msgstr "×©×œ×™×—×ª ×§×™×©×•×¨ ×‘×“×•××´×œ ×œ×ž×©×ª×ž×©"
 
-#: js/share.js:190
+#: js/share.js:174
 msgid "Send"
 msgstr "×©×œ×™×—×”"
 
-#: js/share.js:194
+#: js/share.js:178
 msgid "Set expiration date"
 msgstr "×”×’×“×¨×ª ×ª××¨×™×š ×ª×¤×•×’×”"
 
-#: js/share.js:195
+#: js/share.js:179
 msgid "Expiration date"
 msgstr "×ª××¨×™×š ×”×ª×¤×•×’×”"
 
-#: js/share.js:227
+#: js/share.js:211
 msgid "Share via email:"
 msgstr "×©×™×ª×•×£ ×‘××ž×¦×¢×•×ª ×“×•××´×œ:"
 
-#: js/share.js:229
+#: js/share.js:213
 msgid "No people found"
 msgstr "×œ× × ×ž×¦××• ×× ×©×™×"
 
-#: js/share.js:256
+#: js/share.js:251
 msgid "Resharing is not allowed"
 msgstr "××¡×•×¨ ×œ×¢×©×•×ª ×©×™×ª×•×£ ×ž×—×“×©"
 
-#: js/share.js:292
+#: js/share.js:287
 msgid "Shared in {item} with {user}"
 msgstr "×©×•×ª×£ ×ª×—×ª {item} ×¢× {user}"
 
-#: js/share.js:313
+#: js/share.js:308
 msgid "Unshare"
 msgstr "×”×¡×¨ ×©×™×ª×•×£"
 
-#: js/share.js:325
+#: js/share.js:320
 msgid "can edit"
 msgstr "× ×™×ª×Ÿ ×œ×¢×¨×•×š"
 
-#: js/share.js:327
+#: js/share.js:322
 msgid "access control"
 msgstr "×‘×§×¨×ª ×’×™×©×”"
 
-#: js/share.js:330
+#: js/share.js:325
 msgid "create"
 msgstr "×™×¦×™×¨×”"
 
-#: js/share.js:333
+#: js/share.js:328
 msgid "update"
 msgstr "×¢×“×›×•×Ÿ"
 
-#: js/share.js:336
+#: js/share.js:331
 msgid "delete"
 msgstr "×ž×—×™×§×”"
 
-#: js/share.js:339
+#: js/share.js:334
 msgid "share"
 msgstr "×©×™×ª×•×£"
 
-#: js/share.js:373 js/share.js:569
+#: js/share.js:368 js/share.js:564
 msgid "Password protected"
 msgstr "×ž×•×’×Ÿ ×‘×¡×¡×ž×”"
 
-#: js/share.js:582
+#: js/share.js:577
 msgid "Error unsetting expiration date"
 msgstr "××™×¨×¢×” ×©×’×™××” ×‘×‘×™×˜×•×œ ×ª××¨×™×š ×”×ª×¤×•×’×”"
 
-#: js/share.js:594
+#: js/share.js:589
 msgid "Error setting expiration date"
 msgstr "××™×¨×¢×” ×©×’×™××” ×‘×¢×ª ×”×’×“×¨×ª ×ª××¨×™×š ×”×ª×¤×•×’×”"
 
-#: js/share.js:609
+#: js/share.js:604
 msgid "Sending ..."
 msgstr "×ž×ª×‘×¦×¢×ª ×©×œ×™×—×” ..."
 
-#: js/share.js:620
+#: js/share.js:615
 msgid "Email sent"
 msgstr "×”×•×“×¢×ª ×”×“×•××´×œ × ×©×œ×—×”"
 
@@ -399,24 +397,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:40
-#: 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 "×‘×§×©×ª ××™×¤×•×¡"
 
@@ -466,121 +467,136 @@ msgstr "×¢× ×Ÿ ×œ× × ×ž×¦×"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
-msgstr "×¢×¨×™×›×ª ×”×§×˜×’×•×¨×™×•×ª"
+msgstr "×¢×¨×•×š ×§×˜×’×•×¨×™×•×ª"
 
 #: templates/edit_categories_dialog.php:16
 msgid "Add"
 msgstr "×”×•×¡×¤×”"
 
-#: templates/installation.php:23 templates/installation.php:30
+#: 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 "×’×¨×¡×ª ×”Ö¾PHP ×¤×’×™×¢×” ×‘×¤× ×™ ×”×ª×§×¤×ª ×‘×™×ª NULL/×¨×™×§ (CVE-2006-7243)"
+
+#: 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 "××™×Ÿ ×ž×—×•×œ×œ ×ž×¡×¤×¨×™× ××§×¨××™×™× ×ž××•×‘×˜×—, × × ×œ×”×¤×¢×™×œ ××ª ×”×”×¨×—×‘×” OpenSSL ×‘Ö¾PHP."
 
-#: templates/installation.php:25
+#: 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:31
+#: 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 ×œ× ×¢×•×‘×“."
 
-#: templates/installation.php:32
+#: 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>."
 
-#: templates/installation.php:36
+#: templates/installation.php:44
 msgid "Create an <strong>admin account</strong>"
 msgstr "×™×¦×™×¨×ª <strong>×—×©×‘×•×Ÿ ×ž× ×”×œ</strong>"
 
-#: templates/installation.php:54
+#: templates/installation.php:62
 msgid "Advanced"
 msgstr "×ž×ª×§×“×"
 
-#: templates/installation.php:56
+#: templates/installation.php:64
 msgid "Data folder"
 msgstr "×ª×™×§×™×™×ª × ×ª×•× ×™×"
 
-#: templates/installation.php:65
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "×”×’×“×¨×ª ×ž×¡×“ ×”× ×ª×•× ×™×"
 
-#: templates/installation.php:70 templates/installation.php:82
-#: templates/installation.php:93 templates/installation.php:104
+#: 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:117
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "×©× ×ž×©×ª×ž×© ×‘×ž×¡×“ ×”× ×ª×•× ×™×"
 
-#: templates/installation.php:122
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "×¡×¡×ž×ª ×ž×¡×“ ×”× ×ª×•× ×™×"
 
-#: templates/installation.php:127
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "×©× ×ž×¡×“ ×”× ×ª×•× ×™×"
 
-#: templates/installation.php:137
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "×ž×¨×—×‘ ×”×›×ª×•×‘×•×ª ×©×œ ×ž×¡×“ ×”× ×ª×•× ×™×"
 
-#: templates/installation.php:144
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "×©×¨×ª ×‘×¡×™×¡ × ×ª×•× ×™×"
 
-#: templates/installation.php:150
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "×¡×™×•× ×”×ª×§× ×”"
 
-#: templates/layout.guest.php:35
+#: templates/layout.guest.php:40
 msgid "web services under your control"
-msgstr "×©×™×¨×•×ª×™ ×¨×©×ª ×‘×©×œ×™×˜×ª×š"
+msgstr "×©×™×¨×•×ª×™ ×¨×©×ª ×ª×—×ª ×”×©×œ×™×˜×” ×©×œ×š"
+
+#: templates/layout.user.php:36
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr ""
 
-#: templates/layout.user.php:53
+#: 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/he/files.po b/l10n/he/files.po
index 16161d70681019e42c26e61a947e7c535af43d05..a9d272af9ce4952e79a281277f6f7928e8c9203c 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-03-04 00:06+0100\n"
-"PO-Revision-Date: 2013-03-03 23:06+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10: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"
@@ -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"
@@ -74,59 +66,70 @@ msgstr "×”×›×ª×™×‘×” ×œ×›×•× ×Ÿ × ×›×©×œ×”"
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:10
+#: 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 "×ž×—×§ ×œ×¦×ž×™×ª×•×ª"
 
-#: js/fileactions.js:127 templates/index.php:92 templates/index.php:93
+#: 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/files.js:292 js/files.js:408
-#: js/files.js:439
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "×ž×ž×ª×™×Ÿ"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} ×›×‘×¨ ×§×™×™×"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "×”×—×œ×¤×”"
 
-#: js/filelist.js:251
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "×”×¦×¢×ª ×©×"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "×‘×™×˜×•×œ"
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "{new_name} ×”×•×—×œ×£ ×‘Ö¾{old_name}"
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "undo"
 msgstr "×‘×™×˜×•×œ"
 
-#: js/filelist.js:323
+#: 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 ""
@@ -149,77 +152,77 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:225
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:262
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "×œ× ×™×›×•×œ ×œ×”×¢×œ×•×ª ××ª ×”×§×•×‘×¥ ×ž×›×™×•×•×Ÿ ×©×–×• ×ª×§×™×” ××• ×©×ž×©×§×œ ×”×§×•×‘×¥ 0 ×‘×ª×™×"
 
-#: js/files.js:262
-msgid "Upload Error"
-msgstr "×©×’×™××ª ×”×¢×œ××”"
-
-#: js/files.js:273
-msgid "Close"
-msgstr "×¡×’×™×¨×”"
-
-#: js/files.js:312
-msgid "1 file uploading"
-msgstr "×§×•×‘×¥ ××—×“ × ×©×œ×—"
-
-#: js/files.js:315 js/files.js:370 js/files.js:385
-msgid "{count} files uploading"
-msgstr "{count} ×§×‘×¦×™× × ×©×œ×—×™×"
+#: js/files.js:277
+msgid "Not enough space available"
+msgstr ""
 
-#: js/files.js:388 js/files.js:423
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "×”×”×¢×œ××” ×‘×•×˜×œ×”."
 
-#: js/files.js:497
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "×ž×ª×‘×¦×¢×ª ×›×¢×ª ×”×¢×œ××ª ×§×‘×¦×™×. ×¢×–×™×‘×” ×©×œ ×”×¢×ž×•×“ ×ª×‘×˜×œ ××ª ×”×”×¢×œ××”."
 
-#: js/files.js:570
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "×§×™×©×•×¨ ××™× ×• ×™×›×•×œ ×œ×”×™×•×ª ×¨×™×§."
 
-#: js/files.js:575
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:953 templates/index.php:68
+#: 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:954 templates/index.php:79
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "×’×•×“×œ"
 
-#: js/files.js:955 templates/index.php:81
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "×–×ž×Ÿ ×©×™× ×•×™"
 
-#: js/files.js:974
+#: js/files.js:898
 msgid "1 folder"
 msgstr "×ª×™×§×™×™×” ××—×ª"
 
-#: js/files.js:976
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} ×ª×™×§×™×•×ª"
 
-#: js/files.js:984
+#: js/files.js:908
 msgid "1 file"
 msgstr "×§×•×‘×¥ ××—×“"
 
-#: js/files.js:986
+#: 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,45 +275,45 @@ msgstr "×ª×™×§×™×™×”"
 msgid "From link"
 msgstr "×ž×§×™×©×•×¨"
 
-#: templates/index.php:40
+#: templates/index.php:42
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:48
 msgid "Cancel upload"
 msgstr "×‘×™×˜×•×œ ×”×”×¢×œ××”"
 
-#: templates/index.php:53
+#: templates/index.php:54
 msgid "You donâ€™t have write permissions here."
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "××™×Ÿ ×›××Ÿ ×©×•× ×“×‘×¨. ××•×œ×™ ×‘×¨×¦×•× ×š ×œ×”×¢×œ×•×ª ×ž×©×”×•?"
 
-#: templates/index.php:74
+#: templates/index.php:75
 msgid "Download"
 msgstr "×”×•×¨×“×”"
 
-#: templates/index.php:86 templates/index.php:87
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "×”×¡×¨ ×©×™×ª×•×£"
 
-#: templates/index.php:106
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "×”×¢×œ××” ×’×“×•×œ×” ×ž×™×“×™"
 
-#: templates/index.php:108
+#: 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:113
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "×”×§×‘×¦×™× × ×¡×¨×§×™×, × × ×œ×”×ž×ª×™×Ÿ."
 
-#: templates/index.php:116
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "×”×¡×¨×™×§×” ×”× ×•×›×—×™×ª"
 
diff --git a/l10n/he/files_encryption.po b/l10n/he/files_encryption.po
index 2c26e96cd12132ba40a314695fb7e2851af74528..2d25899318b7bdd923f118913d33a33506618999 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/he/files_external.po b/l10n/he/files_external.po
index ae9da0cff3937cc6b7ffe2651f50de000e473d88..c0c781c9cda848ff767434571b6350aa4a85ad4d 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-01 00:05+0100\n"
-"PO-Revision-Date: 2013-02-27 23:20+0000\n"
+"POT-Creation-Date: 2013-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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: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/he/files_sharing.po b/l10n/he/files_sharing.po
index 2ccef5f2b52c0028b2f5464c4a007fb28f8eea5a..a457a7f6147f2560002a49251b61b209e6f0201d 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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 b60aec2b9c29f890c4346a31ddb220cd96060994..7c32f2b83ba56988cff17fdeb864d3e270cdb0ab 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-03-08 00:25+0100\n"
-"PO-Revision-Date: 2013-03-07 23:25+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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,12 +17,12 @@ msgstr ""
 "Language: he\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:40
+#: ajax/delete.php:42
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "×‘×œ×ª×™ ××¤×©×¨×™ ×œ×ž×—×•×§ ××ª %s ×œ×¦×ž×™×ª×•×ª"
 
-#: ajax/undelete.php:41
+#: ajax/undelete.php:42
 #, php-format
 msgid "Couldn't restore %s"
 msgstr "×‘×œ×ª×™ ××¤×©×¨×™ ×œ×©×—×–×¨ ××ª %s"
@@ -32,6 +31,10 @@ msgstr "×‘×œ×ª×™ ××¤×©×¨×™ ×œ×©×—×–×¨ ××ª %s"
 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 "×ž×—×§ ×§×•×‘×¥ ×œ×¦×ž×™×ª×•×ª"
diff --git a/l10n/he/files_versions.po b/l10n/he/files_versions.po
index 171a23cbc9ee79526a1ec40d9aafc08e0ec099f8..e39843a6d4a3f8b3a2f45976654d3b111535b17f 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:30+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 743ad9d6d4bc684e31d53d25f88c009d7a1e1d35..d6112754714499d593c62caacb8d5f4f6fb9a0a6 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-02-27 14:35+0100\n"
-"PO-Revision-Date: 2013-02-27 13:35+0000\n"
+"POT-Creation-Date: 2013-04-28 01:57+0200\n"
+"PO-Revision-Date: 2013-04-27 23:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -43,19 +41,19 @@ msgstr "×™×™×©×•×ž×™×"
 msgid "Admin"
 msgstr "×ž× ×”×œ"
 
-#: files.php:202
+#: files.php:209
 msgid "ZIP download is turned off."
 msgstr "×”×•×¨×“×ª ZIP ×›×‘×•×™×”"
 
-#: files.php:203
+#: files.php:210
 msgid "Files need to be downloaded one by one."
 msgstr "×™×© ×œ×”×•×¨×™×“ ××ª ×”×§×‘×¦×™× ××—×“ ××—×¨×™ ×”×©× ×™."
 
-#: files.php:204 files.php:231
+#: files.php:211 files.php:244
 msgid "Back to Files"
 msgstr "×—×–×¨×” ×œ×§×‘×¦×™×"
 
-#: files.php:228
+#: files.php:241
 msgid "Selected files too large to generate zip file."
 msgstr "×”×§×‘×¦×™× ×”× ×‘×—×¨×™× ×’×“×•×œ×™× ×ž×™×“×™ ×œ×™×¦×™×¨×ª ×§×•×‘×¥ zip."
 
@@ -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,72 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:128 setup.php:320 setup.php:365
+#: setup.php:132 setup.php:325 setup.php:370
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:129 setup.php:152 setup.php:229
+#: setup.php:133 setup.php:156 setup.php:234
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:151 setup.php:453 setup.php:520
+#: setup.php:155 setup.php:458 setup.php:525
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:228
+#: setup.php:233
 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: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:583 setup.php:592 setup.php:600 setup.php:609
+#: setup.php:615
 #, 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:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
+#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
+#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:299
+#: setup.php:304
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:300
+#: setup.php:305
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:305
+#: setup.php:310
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:306
+#: setup.php:311
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:579 setup.php:611
+#: setup.php:584 setup.php:616
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:631
+#: setup.php:636
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:849
+#: setup.php:858
 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:859
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
@@ -241,19 +235,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 97fff33879b667c0ef71bfbd13e8348de033e30f..fa36b2f31e4e9f6460cd0ce2d1503ae7c7f3c9fb 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-02-27 14:35+0100\n"
-"PO-Revision-Date: 2013-02-27 13:35+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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 ""
 
@@ -96,76 +96,76 @@ msgstr ""
 msgid "Disable"
 msgstr "×‘×˜×œ"
 
-#: js/apps.js:36 js/apps.js:64
+#: js/apps.js:36 js/apps.js:64 js/apps.js:83
 msgid "Enable"
-msgstr "×”×¤×¢×œ"
+msgstr "×”×¤×¢×œ×”"
 
 #: js/apps.js:55
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:84
+#: 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:87
+#: js/apps.js:93
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:87
-msgid "Error"
-msgstr "×©×’×™××”"
-
-#: js/apps.js:90
+#: js/apps.js:96
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
-msgstr "×©×•×ž×¨.."
+msgstr "×©×ž×™×¨×”â€¦"
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "deleted"
 msgstr ""
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "undo"
 msgstr "×‘×™×˜×•×œ"
 
-#: js/users.js:62
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:75 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
+#: templates/users.php:103
 msgid "Groups"
 msgstr "×§×‘×•×¦×•×ª"
 
-#: js/users.js:78 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr "×ž× ×”×œ ×”×§×‘×•×¦×”"
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "×ž×—×™×§×”"
 
-#: js/users.js:191
+#: js/users.js:269
 msgid "add group"
 msgstr ""
 
-#: js/users.js:352
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:353 js/users.js:359 js/users.js:374
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:358
+#: js/users.js:426
 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,21 +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:230 templates/personal.php:102
+#: templates/admin.php:228
+msgid "Less"
+msgstr "×¤×—×•×ª"
+
+#: templates/admin.php:235 templates/personal.php:105
 msgid "Version"
 msgstr "×’×¨×¡×"
 
-#: templates/admin.php:233 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,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:77
 msgid "Password"
-msgstr "×¡×¡×ž×”"
+msgstr "×¡×™×¡×ž×"
 
 #: templates/personal.php:38
 msgid "Your password was changed"
@@ -419,82 +423,70 @@ msgstr "×¡×¡×ž×” ×—×“×©×”"
 msgid "Change password"
 msgstr "×©×™× ×•×™ ×¡×¡×ž×”"
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:76
 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 "×“×•××´×œ"
+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 "×”×©×ª×ž×© ×‘×›×ª×•×‘×ª ×–××ª ×¢×œ ×ž× ×ª ×œ×”×ª×—×‘×¨ ××œ ownCloud ×“×¨×š ×¡×™×™×¨ ×§×‘×¦×™×."
 
-#: templates/users.php:21 templates/users.php:77
+#: templates/users.php:21 templates/users.php:75
 msgid "Login Name"
 msgstr ""
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr "×™×¦×™×¨×”"
 
-#: templates/users.php:35
+#: templates/users.php:33
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:39 templates/users.php:133
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:57 templates/users.php:148
 msgid "Other"
 msgstr "××—×¨"
 
-#: templates/users.php:84
+#: templates/users.php:82
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:95
+#: templates/users.php:93
 msgid "change display name"
 msgstr ""
 
-#: templates/users.php:99
+#: templates/users.php:97
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:134
+#: templates/users.php:128
 msgid "Default"
 msgstr ""
diff --git a/l10n/he/user_ldap.po b/l10n/he/user_ldap.po
index e4f8afeb9296c1b61131488b05b3f717c1e7bd13..86da0727977ce4490ba1f2af9632742397a05741 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-02 00:03+0100\n"
-"PO-Revision-Date: 2013-03-01 23:04+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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:18
+#: templates/settings.php:32
 msgid "Add Server Configuration"
-msgstr ""
+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 "DN ×ž×©×ª×ž×©"
 
-#: 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 "×œ×’×™×©×” ×× ×•× ×™×ž×™×ª, ×”×©××¨ ××ª ×”DM ×•×”×¡×™×¡×ž× ×¨×™×§×™×."
 
-#: 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/he/user_webdavauth.po b/l10n/he/user_webdavauth.po
index 65a279ed44f5a506b730b55bc449bc9d3bc19cbf..a1956eff5da94a6bba096d041153ca8e974e04d3 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-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -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 1cdf7d56f60a62ad0d2285312ddb1e4ab7e6372d..09e45c10d5e7bd477171af1cafa11e5233f2d294 100644
--- a/l10n/hi/core.po
+++ b/l10n/hi/core.po
@@ -3,15 +3,13 @@
 # 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-02-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 09:52+0000\n"
-"Last-Translator: Sanjay Rabidas <rabidassanjay@gmail.com>\n"
+"POT-Creation-Date: 2013-04-30 01:57+0200\n"
+"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,24 +17,24 @@ msgstr ""
 "Language: hi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:85
+#: ajax/share.php:97
 #, php-format
 msgid "User %s shared a file with you"
 msgstr ""
 
-#: ajax/share.php:87
+#: ajax/share.php:99
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr ""
 
-#: ajax/share.php:89
+#: 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:91
+#: ajax/share.php:104
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -82,79 +80,79 @@ msgstr ""
 msgid "Error removing %s from favorites."
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:34
 msgid "Sunday"
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:35
 msgid "Monday"
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Tuesday"
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:37
 msgid "Wednesday"
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:38
 msgid "Thursday"
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:39
 msgid "Friday"
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:40
 msgid "Saturday"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:45
 msgid "January"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:46
 msgid "February"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:47
 msgid "March"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:48
 msgid "April"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:49
 msgid "May"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:50
 msgid "June"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:51
 msgid "July"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:52
 msgid "August"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:53
 msgid "September"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:54
 msgid "October"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:55
 msgid "November"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:56
 msgid "December"
 msgstr ""
 
@@ -162,76 +160,76 @@ msgstr ""
 msgid "Settings"
 msgstr "à¤¸à¥‡à¤Ÿà¤¿à¤‚à¤—à¥à¤¸"
 
-#: js/js.js:767
+#: js/js.js:718
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:768
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:769
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:770
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:771
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:772
+#: js/js.js:723
 msgid "today"
 msgstr ""
 
-#: js/js.js:773
+#: js/js.js:724
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:774
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:775
+#: js/js.js:726
 msgid "last month"
 msgstr ""
 
-#: js/js.js:776
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:777
+#: js/js.js:728
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:778
+#: js/js.js:729
 msgid "last year"
 msgstr ""
 
-#: js/js.js:779
+#: js/js.js:730
 msgid "years ago"
 msgstr ""
 
-#: js/oc-dialogs.js:126
-msgid "Choose"
+#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
+msgid "Ok"
 msgstr ""
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
 msgid "Cancel"
 msgstr ""
 
-#: js/oc-dialogs.js:162
-msgid "No"
+#: js/oc-dialogs.js:185
+msgid "Choose"
 msgstr ""
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:215
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:180
-msgid "Ok"
+#: js/oc-dialogs.js:222
+msgid "No"
 msgstr ""
 
 #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
@@ -239,9 +237,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:152 js/share.js:159 js/share.js:582
-#: js/share.js:594
+#: 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 ""
 
@@ -253,127 +253,127 @@ msgstr ""
 msgid "The required file {file} is not installed!"
 msgstr ""
 
-#: js/share.js:29 js/share.js:43 js/share.js:90
+#: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr ""
 
-#: js/share.js:93
+#: js/share.js:90
 msgid "Share"
 msgstr ""
 
-#: js/share.js:141 js/share.js:622
+#: js/share.js:125 js/share.js:617
 msgid "Error while sharing"
 msgstr ""
 
-#: js/share.js:152
+#: js/share.js:136
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:159
+#: js/share.js:143
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:168
+#: js/share.js:152
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:170
+#: js/share.js:154
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:175
+#: js/share.js:159
 msgid "Share with"
 msgstr ""
 
-#: js/share.js:180
+#: js/share.js:164
 msgid "Share with link"
 msgstr ""
 
-#: js/share.js:183
+#: js/share.js:167
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:185 templates/installation.php:44 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "à¤ªà¤¾à¤¸à¤µà¤°à¥à¤¡"
 
-#: js/share.js:189
+#: js/share.js:173
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:190
+#: js/share.js:174
 msgid "Send"
 msgstr ""
 
-#: js/share.js:194
+#: js/share.js:178
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:195
+#: js/share.js:179
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:227
+#: js/share.js:211
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:229
+#: js/share.js:213
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:256
+#: js/share.js:251
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:292
+#: js/share.js:287
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:313
+#: js/share.js:308
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:325
+#: js/share.js:320
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:327
+#: js/share.js:322
 msgid "access control"
 msgstr ""
 
-#: js/share.js:330
+#: js/share.js:325
 msgid "create"
 msgstr ""
 
-#: js/share.js:333
+#: js/share.js:328
 msgid "update"
 msgstr ""
 
-#: js/share.js:336
+#: js/share.js:331
 msgid "delete"
 msgstr ""
 
-#: js/share.js:339
+#: js/share.js:334
 msgid "share"
 msgstr ""
 
-#: js/share.js:373 js/share.js:569
+#: js/share.js:368 js/share.js:564
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:582
+#: js/share.js:577
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:594
+#: js/share.js:589
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:609
+#: js/share.js:604
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:620
+#: js/share.js:615
 msgid "Email sent"
 msgstr ""
 
@@ -388,7 +388,7 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:47
+#: lostpassword/controller.php:48
 msgid "ownCloud password reset"
 msgstr ""
 
@@ -396,24 +396,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:39
-#: 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 ""
 
@@ -469,115 +472,130 @@ msgstr ""
 msgid "Add"
 msgstr ""
 
-#: templates/installation.php:23 templates/installation.php:30
+#: 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:25
+#: 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:31
+#: 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:32
+#: 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:36
+#: templates/installation.php:44
 msgid "Create an <strong>admin account</strong>"
 msgstr "à¤µà¥à¤¯à¤µà¤¸à¥à¤¥à¤¾à¤ªà¤• à¤–à¤¾à¤¤à¤¾ à¤¬à¤¨à¤¾à¤à¤"
 
-#: templates/installation.php:52
+#: templates/installation.php:62
 msgid "Advanced"
 msgstr "à¤‰à¤¨à¥à¤¨à¤¤"
 
-#: templates/installation.php:54
+#: templates/installation.php:64
 msgid "Data folder"
 msgstr "à¤¡à¤¾à¤Ÿà¤¾ à¤«à¥‹à¤²à¥à¤¡à¤°"
 
-#: templates/installation.php:61
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "à¤¡à¥‡à¤Ÿà¤¾à¤¬à¥‡à¤¸ à¤•à¥‰à¤¨à¥à¤«à¤¼à¤¿à¤—à¤° à¤•à¤°à¥‡à¤‚ "
 
-#: templates/installation.php:66 templates/installation.php:77
-#: templates/installation.php:87 templates/installation.php:97
+#: 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:109
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "à¤¡à¥‡à¤Ÿà¤¾à¤¬à¥‡à¤¸ à¤‰à¤ªà¤¯à¥‹à¤—à¤•à¤°à¥à¤¤à¤¾"
 
-#: templates/installation.php:113
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "à¤¡à¥‡à¤Ÿà¤¾à¤¬à¥‡à¤¸ à¤ªà¤¾à¤¸à¤µà¤°à¥à¤¡"
 
-#: templates/installation.php:117
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "à¤¡à¥‡à¤Ÿà¤¾à¤¬à¥‡à¤¸ à¤•à¤¾ à¤¨à¤¾à¤®"
 
-#: templates/installation.php:125
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:131
+#: templates/installation.php:166
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:136
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "à¤¸à¥‡à¤Ÿà¤…à¤ª à¤¸à¤®à¤¾à¤ªà¥à¤¤ à¤•à¤°à¥‡"
 
-#: templates/layout.guest.php:33
+#: templates/layout.guest.php:40
 msgid "web services under your control"
 msgstr ""
 
-#: templates/layout.user.php:48
+#: 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/hi/files.po b/l10n/hi/files.po
index 40ec6e1b41664c2cc19d63fcb9064ca17622bd55..9474cdb73f6e233d2ed3f6a6f6f8212616a9da84 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-03-04 00:06+0100\n"
-"PO-Revision-Date: 2013-03-03 23:06+0000\n"
+"POT-Creation-Date: 2013-05-15 01:59+0200\n"
+"PO-Revision-Date: 2013-05-15 00:00+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
 "MIME-Version: 1.0\n"
@@ -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 ""
@@ -70,59 +66,70 @@ msgstr ""
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:10
+#: 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 ""
 
-#: js/fileactions.js:127 templates/index.php:92 templates/index.php:93
+#: 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/files.js:292 js/files.js:408
-#: js/files.js:439
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:251
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:323
+#: 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 ""
@@ -145,77 +152,77 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:225
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:262
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:262
-msgid "Upload Error"
-msgstr ""
-
-#: js/files.js:273
-msgid "Close"
+#: js/files.js:277
+msgid "Not enough space available"
 msgstr ""
 
-#: js/files.js:312
-msgid "1 file uploading"
-msgstr ""
-
-#: js/files.js:315 js/files.js:370 js/files.js:385
-msgid "{count} files uploading"
-msgstr ""
-
-#: js/files.js:388 js/files.js:423
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:497
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:570
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:575
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:953 templates/index.php:68
+#: 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:954 templates/index.php:79
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr ""
 
-#: js/files.js:955 templates/index.php:81
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:974
+#: js/files.js:898
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:976
+#: js/files.js:900
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:984
+#: js/files.js:908
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:986
+#: 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 ""
@@ -268,45 +275,45 @@ msgstr ""
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:42
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:48
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:53
+#: templates/index.php:54
 msgid "You donâ€™t have write permissions here."
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:74
+#: templates/index.php:75
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:86 templates/index.php:87
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr ""
 
-#: templates/index.php:106
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:108
+#: 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:113
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:116
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr ""
 
diff --git a/l10n/hi/files_encryption.po b/l10n/hi/files_encryption.po
index 94768da1fcc82e1d63b9dfbd2d662c3d1efe9bc3..1c0263d2b386d4d3460cc8dbe31a2aba68092027 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-04-26 10:00+0200\n"
+"PO-Revision-Date: 2013-04-26 08:01+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_external.po b/l10n/hi/files_external.po
index b4d9abc7e762eb9a1d0fc085da820612283ffd6c..befaf1f2c96f0e0e7d8595015db9b0cf22658b46 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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..d56df17b305b104158d7791e39701204e3f076e9 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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 e0e86d2f8e1db36253a0521913063778663141dc..ad93e8681d2df7ba12b2e9a30aa3284dcb54aa6f 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-03-08 00:25+0100\n"
-"PO-Revision-Date: 2013-03-07 23:25+0000\n"
+"POT-Creation-Date: 2013-04-26 10:00+0200\n"
+"PO-Revision-Date: 2013-04-26 08:01+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,12 +17,12 @@ msgstr ""
 "Language: hi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:40
+#: ajax/delete.php:42
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
 
-#: ajax/undelete.php:41
+#: ajax/undelete.php:42
 #, php-format
 msgid "Couldn't restore %s"
 msgstr ""
@@ -31,6 +31,10 @@ msgstr ""
 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 ""
diff --git a/l10n/hi/files_versions.po b/l10n/hi/files_versions.po
index c58f10c16c61adcf67ab9cf5f5efa5e5af9c6094..66568383a703e33d68b89a0f700229c04ca96ba5 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-04-26 10:00+0200\n"
+"PO-Revision-Date: 2013-04-26 08: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"
@@ -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 a2be65c48546fb2f56182826947a4cbf5f237273..bee0b2803db21c49b0e753fa3fed5318df6b71d6 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-02-27 14:35+0100\n"
-"PO-Revision-Date: 2013-02-27 13:35+0000\n"
+"POT-Creation-Date: 2013-04-28 01:57+0200\n"
+"PO-Revision-Date: 2013-04-27 23:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
 "MIME-Version: 1.0\n"
@@ -41,19 +41,19 @@ msgstr "Apps"
 msgid "Admin"
 msgstr ""
 
-#: files.php:202
+#: files.php:209
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:203
+#: files.php:210
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:204 files.php:231
+#: files.php:211 files.php:244
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:228
+#: files.php:241
 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,72 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:128 setup.php:320 setup.php:365
+#: setup.php:132 setup.php:325 setup.php:370
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:129 setup.php:152 setup.php:229
+#: setup.php:133 setup.php:156 setup.php:234
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:151 setup.php:453 setup.php:520
+#: setup.php:155 setup.php:458 setup.php:525
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:228
+#: setup.php:233
 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: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:583 setup.php:592 setup.php:600 setup.php:609
+#: setup.php:615
 #, 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:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
+#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
+#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:299
+#: setup.php:304
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:300
+#: setup.php:305
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:305
+#: setup.php:310
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:306
+#: setup.php:311
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:579 setup.php:611
+#: setup.php:584 setup.php:616
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:631
+#: setup.php:636
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:849
+#: setup.php:858
 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:859
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
@@ -239,19 +235,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 6598846cc3316d904fd6c36ffcae4375e3c04483..b8210ac04b7f087ad1ca082ed50a65babae75a4e 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-02-27 14:35+0100\n"
-"PO-Revision-Date: 2013-02-27 13:35+0000\n"
+"POT-Creation-Date: 2013-04-27 02:17+0200\n"
+"PO-Revision-Date: 2013-04-26 08: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"
@@ -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 ""
 
@@ -92,7 +96,7 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: js/apps.js:36 js/apps.js:64
+#: js/apps.js:36 js/apps.js:64 js/apps.js:83
 msgid "Enable"
 msgstr ""
 
@@ -100,68 +104,68 @@ msgstr ""
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:84
-msgid "Updating...."
+#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+msgid "Error"
 msgstr ""
 
-#: js/apps.js:87
-msgid "Error while updating app"
+#: js/apps.js:90
+msgid "Updating...."
 msgstr ""
 
-#: js/apps.js:87
-msgid "Error"
+#: js/apps.js:93
+msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:90
+#: js/apps.js:96
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr ""
 
-#: js/users.js:30
+#: js/users.js:43
 msgid "deleted"
 msgstr ""
 
-#: js/users.js:30
+#: js/users.js:43
 msgid "undo"
 msgstr ""
 
-#: js/users.js:62
+#: js/users.js:75
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:75 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: templates/users.php:103
 msgid "Groups"
 msgstr ""
 
-#: js/users.js:78 templates/users.php:82 templates/users.php:119
+#: js/users.js:91 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:111 templates/users.php:155
 msgid "Delete"
 msgstr ""
 
-#: js/users.js:191
+#: js/users.js:262
 msgid "add group"
 msgstr ""
 
-#: js/users.js:352
+#: js/users.js:414
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:353 js/users.js:359 js/users.js:374
+#: js/users.js:415 js/users.js:421 js/users.js:436
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:358
+#: js/users.js:420
 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,15 +316,19 @@ msgstr ""
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:230 templates/personal.php:102
+#: templates/admin.php:228
+msgid "Less"
+msgstr ""
+
+#: templates/admin.php:235 templates/personal.php:105
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:233 templates/personal.php:105
+#: templates/admin.php:238 templates/personal.php:108
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -391,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:77
 msgid "Password"
 msgstr "à¤ªà¤¾à¤¸à¤µà¤°à¥à¤¡"
 
@@ -415,82 +423,70 @@ msgstr "à¤¨à¤¯à¤¾ à¤ªà¤¾à¤¸à¤µà¤°à¥à¤¡"
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:76
 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:75
 msgid "Login Name"
 msgstr ""
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr ""
 
-#: templates/users.php:35
+#: templates/users.php:33
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:39 templates/users.php:133
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:57 templates/users.php:148
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:84
+#: templates/users.php:82
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:95
+#: templates/users.php:93
 msgid "change display name"
 msgstr ""
 
-#: templates/users.php:99
+#: templates/users.php:97
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:134
+#: templates/users.php:128
 msgid "Default"
 msgstr ""
diff --git a/l10n/hi/user_ldap.po b/l10n/hi/user_ldap.po
index b2f6a9761a59b3882ce94e2a43039315ea9825a9..9b539eea4a957cf6d66b388a6d71df057e011313 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-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-17 00:04+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
 "MIME-Version: 1.0\n"
@@ -17,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..c6cb2a241350ad54a39c2b65814dc4d38e20f0c4 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-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
 "MIME-Version: 1.0\n"
@@ -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 2c13cde4da86b29ac96174e12e8b13ad8933fad4..73cc62216f8cca2c01db2f3099864fe395afd35f 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-02-22 00:06+0100\n"
-"PO-Revision-Date: 2013-02-20 23:20+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10: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"
@@ -21,24 +17,24 @@ 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/share.php:85
+#: ajax/share.php:97
 #, php-format
 msgid "User %s shared a file with you"
 msgstr ""
 
-#: ajax/share.php:87
+#: ajax/share.php:99
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr ""
 
-#: ajax/share.php:89
+#: 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:91
+#: ajax/share.php:104
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -77,86 +73,86 @@ 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
 msgid "Error removing %s from favorites."
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:34
 msgid "Sunday"
 msgstr "nedelja"
 
-#: js/config.php:32
+#: js/config.php:35
 msgid "Monday"
 msgstr "ponedeljak"
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Tuesday"
 msgstr "utorak"
 
-#: js/config.php:32
+#: js/config.php:37
 msgid "Wednesday"
 msgstr "srijeda"
 
-#: js/config.php:32
+#: js/config.php:38
 msgid "Thursday"
 msgstr "Äetvrtak"
 
-#: js/config.php:32
+#: js/config.php:39
 msgid "Friday"
 msgstr "petak"
 
-#: js/config.php:32
+#: js/config.php:40
 msgid "Saturday"
 msgstr "subota"
 
-#: js/config.php:33
+#: js/config.php:45
 msgid "January"
 msgstr "SijeÄanj"
 
-#: js/config.php:33
+#: js/config.php:46
 msgid "February"
 msgstr "VeljaÄa"
 
-#: js/config.php:33
+#: js/config.php:47
 msgid "March"
 msgstr "OÅ¾ujak"
 
-#: js/config.php:33
+#: js/config.php:48
 msgid "April"
 msgstr "Travanj"
 
-#: js/config.php:33
+#: js/config.php:49
 msgid "May"
 msgstr "Svibanj"
 
-#: js/config.php:33
+#: js/config.php:50
 msgid "June"
 msgstr "Lipanj"
 
-#: js/config.php:33
+#: js/config.php:51
 msgid "July"
 msgstr "Srpanj"
 
-#: js/config.php:33
+#: js/config.php:52
 msgid "August"
 msgstr "Kolovoz"
 
-#: js/config.php:33
+#: js/config.php:53
 msgid "September"
 msgstr "Rujan"
 
-#: js/config.php:33
+#: js/config.php:54
 msgid "October"
 msgstr "Listopad"
 
-#: js/config.php:33
+#: js/config.php:55
 msgid "November"
 msgstr "Studeni"
 
-#: js/config.php:33
+#: js/config.php:56
 msgid "December"
 msgstr "Prosinac"
 
@@ -164,88 +160,90 @@ msgstr "Prosinac"
 msgid "Settings"
 msgstr "Postavke"
 
-#: js/js.js:767
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "sekundi prije"
 
-#: js/js.js:768
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:769
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:770
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:771
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:772
+#: js/js.js:723
 msgid "today"
 msgstr "danas"
 
-#: js/js.js:773
+#: js/js.js:724
 msgid "yesterday"
 msgstr "juÄer"
 
-#: js/js.js:774
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:775
+#: js/js.js:726
 msgid "last month"
 msgstr "proÅ¡li mjesec"
 
-#: js/js.js:776
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:777
+#: js/js.js:728
 msgid "months ago"
 msgstr "mjeseci"
 
-#: js/js.js:778
+#: js/js.js:729
 msgid "last year"
 msgstr "proÅ¡lu godinu"
 
-#: js/js.js:779
+#: js/js.js:730
 msgid "years ago"
 msgstr "godina"
 
-#: js/oc-dialogs.js:126
-msgid "Choose"
-msgstr "Izaberi"
+#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
+msgid "Ok"
+msgstr "U redu"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
 msgid "Cancel"
 msgstr "Odustani"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "Ne"
+#: js/oc-dialogs.js:185
+msgid "Choose"
+msgstr "Izaberi"
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:215
 msgid "Yes"
 msgstr "Da"
 
-#: js/oc-dialogs.js:180
-msgid "Ok"
-msgstr "U redu"
+#: js/oc-dialogs.js:222
+msgid "No"
+msgstr "Ne"
 
 #: 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:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:582
-#: js/share.js:594
+#: 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 "PogreÅ¡ka"
+msgstr "GreÅ¡ka"
 
 #: js/oc-vcategories.js:179
 msgid "The app name is not specified."
@@ -255,127 +253,127 @@ msgstr ""
 msgid "The required file {file} is not installed!"
 msgstr ""
 
-#: js/share.js:29 js/share.js:43 js/share.js:90
+#: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr ""
 
-#: js/share.js:93
+#: js/share.js:90
 msgid "Share"
 msgstr "Podijeli"
 
-#: js/share.js:141 js/share.js:622
+#: js/share.js:125 js/share.js:617
 msgid "Error while sharing"
 msgstr "GreÅ¡ka prilikom djeljenja"
 
-#: js/share.js:152
+#: js/share.js:136
 msgid "Error while unsharing"
 msgstr "GreÅ¡ka prilikom iskljuÄivanja djeljenja"
 
-#: js/share.js:159
+#: js/share.js:143
 msgid "Error while changing permissions"
 msgstr "GreÅ¡ka prilikom promjena prava"
 
-#: js/share.js:168
+#: js/share.js:152
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:170
+#: js/share.js:154
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:175
+#: js/share.js:159
 msgid "Share with"
 msgstr "Djeli sa"
 
-#: js/share.js:180
+#: js/share.js:164
 msgid "Share with link"
 msgstr "Djeli preko link-a"
 
-#: js/share.js:183
+#: js/share.js:167
 msgid "Password protect"
 msgstr "ZaÅ¡titi lozinkom"
 
-#: js/share.js:185 templates/installation.php:44 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Lozinka"
 
-#: js/share.js:189
+#: js/share.js:173
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:190
+#: js/share.js:174
 msgid "Send"
 msgstr ""
 
-#: js/share.js:194
+#: js/share.js:178
 msgid "Set expiration date"
 msgstr "Postavi datum isteka"
 
-#: js/share.js:195
+#: js/share.js:179
 msgid "Expiration date"
 msgstr "Datum isteka"
 
-#: js/share.js:227
+#: js/share.js:211
 msgid "Share via email:"
 msgstr "Dijeli preko email-a:"
 
-#: js/share.js:229
+#: js/share.js:213
 msgid "No people found"
 msgstr "Osobe nisu pronaÄ‘ene"
 
-#: js/share.js:256
+#: js/share.js:251
 msgid "Resharing is not allowed"
 msgstr "Ponovo dijeljenje nije dopuÅ¡teno"
 
-#: js/share.js:292
+#: js/share.js:287
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:313
+#: js/share.js:308
 msgid "Unshare"
 msgstr "Makni djeljenje"
 
-#: js/share.js:325
+#: js/share.js:320
 msgid "can edit"
 msgstr "moÅ¾e mjenjat"
 
-#: js/share.js:327
+#: js/share.js:322
 msgid "access control"
 msgstr "kontrola pristupa"
 
-#: js/share.js:330
+#: js/share.js:325
 msgid "create"
 msgstr "kreiraj"
 
-#: js/share.js:333
+#: js/share.js:328
 msgid "update"
 msgstr "aÅ¾uriraj"
 
-#: js/share.js:336
+#: js/share.js:331
 msgid "delete"
 msgstr "izbriÅ¡i"
 
-#: js/share.js:339
+#: js/share.js:334
 msgid "share"
 msgstr "djeli"
 
-#: js/share.js:373 js/share.js:569
+#: js/share.js:368 js/share.js:564
 msgid "Password protected"
 msgstr "ZaÅ¡tita lozinkom"
 
-#: js/share.js:582
+#: js/share.js:577
 msgid "Error unsetting expiration date"
 msgstr "GreÅ¡ka prilikom brisanja datuma isteka"
 
-#: js/share.js:594
+#: js/share.js:589
 msgid "Error setting expiration date"
 msgstr "GreÅ¡ka prilikom postavljanja datuma isteka"
 
-#: js/share.js:609
+#: js/share.js:604
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:620
+#: js/share.js:615
 msgid "Email sent"
 msgstr ""
 
@@ -398,24 +396,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:39
-#: 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"
 
@@ -471,115 +472,130 @@ msgstr "Uredi kategorije"
 msgid "Add"
 msgstr "Dodaj"
 
-#: templates/installation.php:23 templates/installation.php:30
+#: 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:25
+#: 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:31
+#: 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:32
+#: 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:36
+#: templates/installation.php:44
 msgid "Create an <strong>admin account</strong>"
 msgstr "Stvori <strong>administratorski raÄun</strong>"
 
-#: templates/installation.php:52
+#: templates/installation.php:62
 msgid "Advanced"
-msgstr "Dodatno"
+msgstr "Napredno"
 
-#: templates/installation.php:54
+#: templates/installation.php:64
 msgid "Data folder"
 msgstr "Mapa baze podataka"
 
-#: templates/installation.php:61
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "Konfiguriraj bazu podataka"
 
-#: templates/installation.php:66 templates/installation.php:77
-#: templates/installation.php:87 templates/installation.php:97
+#: 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:109
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "Korisnik baze podataka"
 
-#: templates/installation.php:113
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "Lozinka baze podataka"
 
-#: templates/installation.php:117
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "Ime baze podataka"
 
-#: templates/installation.php:125
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "Database tablespace"
 
-#: templates/installation.php:131
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "PosluÅ¾itelj baze podataka"
 
-#: templates/installation.php:136
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "ZavrÅ¡i postavljanje"
 
-#: templates/layout.guest.php:33
+#: templates/layout.guest.php:40
 msgid "web services under your control"
 msgstr "web usluge pod vaÅ¡om kontrolom"
 
-#: templates/layout.user.php:48
+#: 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 "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 c59404f0df3b64e3e3728537b6d74daad6807a0a..8e5d0343835b7d6068ba49ade3e6158e155ad30b 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-03-04 00:06+0100\n"
-"PO-Revision-Date: 2013-03-03 23:06+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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"
@@ -73,59 +66,70 @@ msgstr "Neuspjelo pisanje na disk"
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:10
+#: appinfo/app.php:12
 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:92 templates/index.php:93
+#: 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/files.js:292 js/files.js:408
-#: js/files.js:439
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "U tijeku"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "zamjeni"
 
-#: js/filelist.js:251
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "predloÅ¾i ime"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "odustani"
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "undo"
 msgstr "vrati"
 
-#: js/filelist.js:323
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr ""
 
+#: js/filelist.js:413
+msgid "1 file uploading"
+msgstr "1 datoteka se uÄitava"
+
+#: js/filelist.js:416 js/filelist.js:470
+msgid "files uploading"
+msgstr "datoteke se uÄitavaju"
+
 #: js/files.js:52
 msgid "'.' is an invalid file name."
 msgstr ""
@@ -148,80 +152,80 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:225
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:262
+#: 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:262
-msgid "Upload Error"
-msgstr "PogreÅ¡ka pri slanju"
-
-#: js/files.js:273
-msgid "Close"
-msgstr "Zatvori"
-
-#: js/files.js:312
-msgid "1 file uploading"
-msgstr "1 datoteka se uÄitava"
-
-#: js/files.js:315 js/files.js:370 js/files.js:385
-msgid "{count} files uploading"
+#: js/files.js:277
+msgid "Not enough space available"
 msgstr ""
 
-#: js/files.js:388 js/files.js:423
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "Slanje poniÅ¡teno."
 
-#: js/files.js:497
+#: 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:570
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:575
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:953 templates/index.php:68
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+msgid "Error"
+msgstr "GreÅ¡ka"
+
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
-msgstr "Naziv"
+msgstr "Ime"
 
-#: js/files.js:954 templates/index.php:79
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "VeliÄina"
 
-#: js/files.js:955 templates/index.php:81
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Zadnja promjena"
 
-#: js/files.js:974
+#: js/files.js:898
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:976
+#: js/files.js:900
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:984
+#: js/files.js:908
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:986
+#: 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"
@@ -271,45 +275,45 @@ msgstr "mapa"
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:42
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:48
 msgid "Cancel upload"
 msgstr "Prekini upload"
 
-#: templates/index.php:53
+#: templates/index.php:54
 msgid "You donâ€™t have write permissions here."
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Nema niÄega u ovoj mapi. PoÅ¡alji neÅ¡to!"
 
-#: templates/index.php:74
+#: templates/index.php:75
 msgid "Download"
-msgstr "Preuzmi"
+msgstr "Preuzimanje"
 
-#: templates/index.php:86 templates/index.php:87
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
-msgstr "Prekini djeljenje"
+msgstr "Makni djeljenje"
 
-#: templates/index.php:106
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "Prijenos je preobiman"
 
-#: templates/index.php:108
+#: 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:113
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Datoteke se skeniraju, molimo priÄekajte."
 
-#: templates/index.php:116
+#: 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..ba59607422cf2775acd65f5bbfe7a9281e44efa6 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-04-26 10:00+0200\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/hr/files_external.po b/l10n/hr/files_external.po
index ff1ac7f575f1c012224152486feb04cab39e4bc2..2e386aed7b1910929083206eded922a6722b90f0 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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..7e51b0c2de4368514374617358aa9e17a3cb8f6a 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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 4be5c7a6f5a3387b85f86df790467ae43fefa2fc..a0d1710ecdf950eed2ff928a85525523e33d9367 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-03-08 00:25+0100\n"
-"PO-Revision-Date: 2013-03-07 23:25+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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,12 +17,12 @@ 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/delete.php:40
+#: ajax/delete.php:42
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
 
-#: ajax/undelete.php:41
+#: ajax/undelete.php:42
 #, php-format
 msgid "Couldn't restore %s"
 msgstr ""
@@ -31,6 +31,10 @@ msgstr ""
 msgid "perform restore operation"
 msgstr ""
 
+#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+msgid "Error"
+msgstr "GreÅ¡ka"
+
 #: js/trash.js:34
 msgid "delete file permanently"
 msgstr ""
diff --git a/l10n/hr/files_versions.po b/l10n/hr/files_versions.po
index 95d4715bd686ac82c9c1c1076e7dfcedc1988c42..6004430d182aed8b38124e07449fa66d8edd1210 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-04-26 10:00+0200\n"
+"PO-Revision-Date: 2013-04-26 08:02+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 247fd49ed9e857c249420b6a3ea86b5233178e8c..4004b99b0ee0f9fa28e1ef6e99cd2e057ac6b6e1 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-02-27 14:35+0100\n"
-"PO-Revision-Date: 2013-02-27 13:35+0000\n"
+"POT-Creation-Date: 2013-04-28 01:57+0200\n"
+"PO-Revision-Date: 2013-04-27 23:57+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"
@@ -35,25 +35,25 @@ msgstr "Korisnici"
 
 #: app.php:398
 msgid "Apps"
-msgstr ""
+msgstr "Aplikacije"
 
 #: app.php:406
 msgid "Admin"
-msgstr ""
+msgstr "Administrator"
 
-#: files.php:202
+#: files.php:209
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:203
+#: files.php:210
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:204 files.php:231
+#: files.php:211 files.php:244
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:228
+#: files.php:241
 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,72 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:128 setup.php:320 setup.php:365
+#: setup.php:132 setup.php:325 setup.php:370
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:129 setup.php:152 setup.php:229
+#: setup.php:133 setup.php:156 setup.php:234
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:151 setup.php:453 setup.php:520
+#: setup.php:155 setup.php:458 setup.php:525
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:228
+#: setup.php:233
 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: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:583 setup.php:592 setup.php:600 setup.php:609
+#: setup.php:615
 #, 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:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
+#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
+#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:299
+#: setup.php:304
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:300
+#: setup.php:305
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:305
+#: setup.php:310
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:306
+#: setup.php:311
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:579 setup.php:611
+#: setup.php:584 setup.php:616
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:631
+#: setup.php:636
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:849
+#: setup.php:858
 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:859
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
@@ -239,19 +235,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 c0d9d336801bf30f040ebc03a187cb5e550a1798..958c0ac531c60f5c5dee92374765e4b76967c4d8 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-02-27 14:35+0100\n"
-"PO-Revision-Date: 2013-02-27 13:35+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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 ""
 
@@ -95,7 +96,7 @@ msgstr ""
 msgid "Disable"
 msgstr "IskljuÄi"
 
-#: js/apps.js:36 js/apps.js:64
+#: js/apps.js:36 js/apps.js:64 js/apps.js:83
 msgid "Enable"
 msgstr "UkljuÄi"
 
@@ -103,68 +104,68 @@ msgstr "UkljuÄi"
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:84
+#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+msgid "Error"
+msgstr "GreÅ¡ka"
+
+#: js/apps.js:90
 msgid "Updating...."
 msgstr ""
 
-#: js/apps.js:87
+#: js/apps.js:93
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:87
-msgid "Error"
-msgstr "GreÅ¡ka"
-
-#: js/apps.js:90
+#: js/apps.js:96
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr "Spremanje..."
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "deleted"
 msgstr "izbrisano"
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "undo"
 msgstr "vrati"
 
-#: js/users.js:62
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:75 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
+#: templates/users.php:103
 msgid "Groups"
 msgstr "Grupe"
 
-#: js/users.js:78 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr "Grupa Admin"
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "ObriÅ¡i"
 
-#: js/users.js:191
+#: js/users.js:269
 msgid "add group"
 msgstr ""
 
-#: js/users.js:352
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:353 js/users.js:359 js/users.js:374
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:358
+#: js/users.js:426
 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,21 +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 "viÅ¡e"
+
+#: templates/admin.php:228
+msgid "Less"
 msgstr ""
 
-#: templates/admin.php:230 templates/personal.php:102
+#: templates/admin.php:235 templates/personal.php:105
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:233 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 "
@@ -394,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:77
 msgid "Password"
 msgstr "Lozinka"
 
@@ -418,82 +423,70 @@ msgstr "Nova lozinka"
 msgid "Change password"
 msgstr "Izmjena lozinke"
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:76
 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 "e-mail adresa"
 
-#: templates/personal.php:72
+#: templates/personal.php:70
 msgid "Your email address"
 msgstr "VaÅ¡a e-mail adresa"
 
-#: templates/personal.php:73
+#: templates/personal.php:71
 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:77 templates/personal.php:78
 msgid "Language"
 msgstr "Jezik"
 
-#: templates/personal.php:86
+#: templates/personal.php:89
 msgid "Help translate"
 msgstr "PomoÄ‡ prevesti"
 
-#: 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:75
 msgid "Login Name"
 msgstr ""
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr "Izradi"
 
-#: templates/users.php:35
+#: templates/users.php:33
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:39 templates/users.php:133
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:57 templates/users.php:148
 msgid "Other"
 msgstr "ostali"
 
-#: templates/users.php:84
+#: templates/users.php:82
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:95
+#: templates/users.php:93
 msgid "change display name"
 msgstr ""
 
-#: templates/users.php:99
+#: templates/users.php:97
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:134
+#: templates/users.php:128
 msgid "Default"
 msgstr ""
diff --git a/l10n/hr/user_ldap.po b/l10n/hr/user_ldap.po
index fbc304add5da3d691768fb480edaf432acb7ac2c..166e8e4738bdc1dc5edf422818a26e8fe2ab9cd7 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-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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..c9f410b1ad0aba78e7ae282ed440a954a052c9d8 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-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -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 c82ad716faffad271a6abfa0a888f5a22c06b0b2..3d1f00c6a412b074d4a313fd266b342d4a2b722a 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-02-27 14:35+0100\n"
-"PO-Revision-Date: 2013-02-27 09:21+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10: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"
@@ -165,86 +161,88 @@ msgstr "december"
 msgid "Settings"
 msgstr "BeÃ¡llÃtÃ¡sok"
 
-#: js/js.js:768
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "pÃ¡r mÃ¡sodperce"
 
-#: js/js.js:769
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "1 perce"
 
-#: js/js.js:770
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr "{minutes} perce"
 
-#: js/js.js:771
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr "1 Ã³rÃ¡ja"
 
-#: js/js.js:772
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr "{hours} Ã³rÃ¡ja"
 
-#: js/js.js:773
+#: js/js.js:723
 msgid "today"
 msgstr "ma"
 
-#: js/js.js:774
+#: js/js.js:724
 msgid "yesterday"
 msgstr "tegnap"
 
-#: js/js.js:775
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr "{days} napja"
 
-#: js/js.js:776
+#: js/js.js:726
 msgid "last month"
 msgstr "mÃºlt hÃ³napban"
 
-#: js/js.js:777
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr "{months} hÃ³napja"
 
-#: js/js.js:778
+#: js/js.js:728
 msgid "months ago"
 msgstr "tÃ¶bb hÃ³napja"
 
-#: js/js.js:779
+#: js/js.js:729
 msgid "last year"
 msgstr "tavaly"
 
-#: js/js.js:780
+#: js/js.js:730
 msgid "years ago"
 msgstr "tÃ¶bb Ã©ve"
 
-#: js/oc-dialogs.js:126
-msgid "Choose"
-msgstr "VÃ¡lasszon"
+#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
+msgid "Ok"
+msgstr "Ok"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
 msgid "Cancel"
-msgstr "MÃ©gse"
+msgstr "MÃ©gsem"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "Nem"
+#: js/oc-dialogs.js:185
+msgid "Choose"
+msgstr "VÃ¡lasszon"
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:215
 msgid "Yes"
 msgstr "Igen"
 
-#: js/oc-dialogs.js:180
-msgid "Ok"
-msgstr "Ok"
+#: js/oc-dialogs.js:222
+msgid "No"
+msgstr "Nem"
 
 #: 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 "Az objektum tÃpusa nincs megadva."
 
-#: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:582
-#: js/share.js:594
+#: 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 "Hiba"
 
@@ -256,127 +254,127 @@ msgstr "Az alkalmazÃ¡s neve nincs megadva."
 msgid "The required file {file} is not installed!"
 msgstr "A szÃ¼ksÃ©ges fÃ¡jl: {file} nincs telepÃtve!"
 
-#: js/share.js:29 js/share.js:43 js/share.js:90
+#: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr "Megosztott"
 
-#: js/share.js:93
+#: js/share.js:90
 msgid "Share"
 msgstr "MegosztÃ¡s"
 
-#: js/share.js:141 js/share.js:622
+#: js/share.js:125 js/share.js:617
 msgid "Error while sharing"
 msgstr "Nem sikerÃ¼lt lÃ©trehozni a megosztÃ¡st"
 
-#: js/share.js:152
+#: js/share.js:136
 msgid "Error while unsharing"
 msgstr "Nem sikerÃ¼lt visszavonni a megosztÃ¡st"
 
-#: js/share.js:159
+#: js/share.js:143
 msgid "Error while changing permissions"
 msgstr "Nem sikerÃ¼lt mÃ³dosÃtani a jogosultsÃ¡gokat"
 
-#: js/share.js:168
+#: js/share.js:152
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Megosztotta Ã–nnel Ã©s a(z) {group} csoporttal: {owner}"
 
-#: js/share.js:170
+#: js/share.js:154
 msgid "Shared with you by {owner}"
 msgstr "Megosztotta Ã–nnel: {owner}"
 
-#: js/share.js:175
+#: js/share.js:159
 msgid "Share with"
 msgstr "Kivel osztom meg"
 
-#: js/share.js:180
+#: js/share.js:164
 msgid "Share with link"
 msgstr "Link megadÃ¡sÃ¡val osztom meg"
 
-#: js/share.js:183
+#: js/share.js:167
 msgid "Password protect"
 msgstr "JelszÃ³val is vÃ©dem"
 
-#: js/share.js:185 templates/installation.php:47 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "JelszÃ³"
 
-#: js/share.js:189
+#: js/share.js:173
 msgid "Email link to person"
 msgstr "Email cÃmre kÃ¼ldjÃ¼k el"
 
-#: js/share.js:190
+#: js/share.js:174
 msgid "Send"
 msgstr "KÃ¼ldjÃ¼k el"
 
-#: js/share.js:194
+#: js/share.js:178
 msgid "Set expiration date"
 msgstr "Legyen lejÃ¡rati idÅ‘"
 
-#: js/share.js:195
+#: js/share.js:179
 msgid "Expiration date"
 msgstr "A lejÃ¡rati idÅ‘"
 
-#: js/share.js:227
+#: js/share.js:211
 msgid "Share via email:"
 msgstr "MegosztÃ¡s emaillel:"
 
-#: js/share.js:229
+#: js/share.js:213
 msgid "No people found"
 msgstr "Nincs talÃ¡lat"
 
-#: js/share.js:256
+#: js/share.js:251
 msgid "Resharing is not allowed"
 msgstr "Ezt az Ã¡llomÃ¡nyt csak a tulajdonosa oszthatja meg mÃ¡sokkal"
 
-#: js/share.js:292
+#: js/share.js:287
 msgid "Shared in {item} with {user}"
 msgstr "Megosztva {item}-ben {user}-rel"
 
-#: js/share.js:313
+#: js/share.js:308
 msgid "Unshare"
 msgstr "A megosztÃ¡s visszavonÃ¡sa"
 
-#: js/share.js:325
+#: js/share.js:320
 msgid "can edit"
 msgstr "mÃ³dosÃthat"
 
-#: js/share.js:327
+#: js/share.js:322
 msgid "access control"
 msgstr "jogosultsÃ¡g"
 
-#: js/share.js:330
+#: js/share.js:325
 msgid "create"
 msgstr "lÃ©trehoz"
 
-#: js/share.js:333
+#: js/share.js:328
 msgid "update"
 msgstr "szerkeszt"
 
-#: js/share.js:336
+#: js/share.js:331
 msgid "delete"
 msgstr "tÃ¶rÃ¶l"
 
-#: js/share.js:339
+#: js/share.js:334
 msgid "share"
 msgstr "megoszt"
 
-#: js/share.js:373 js/share.js:569
+#: js/share.js:368 js/share.js:564
 msgid "Password protected"
 msgstr "JelszÃ³val van vÃ©dve"
 
-#: js/share.js:582
+#: js/share.js:577
 msgid "Error unsetting expiration date"
 msgstr "Nem sikerÃ¼lt a lejÃ¡rati idÅ‘t tÃ¶rÃ¶lni"
 
-#: js/share.js:594
+#: js/share.js:589
 msgid "Error setting expiration date"
 msgstr "Nem sikerÃ¼lt a lejÃ¡rati idÅ‘t beÃ¡llÃtani"
 
-#: js/share.js:609
+#: js/share.js:604
 msgid "Sending ..."
 msgstr "KÃ¼ldÃ©s ..."
 
-#: js/share.js:620
+#: js/share.js:615
 msgid "Email sent"
 msgstr "Az emailt elkÃ¼ldtÃ¼k"
 
@@ -399,24 +397,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:41
-#: 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"
 
@@ -430,7 +431,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"
@@ -450,7 +451,7 @@ msgstr "AlkalmazÃ¡sok"
 
 #: strings.php:8
 msgid "Admin"
-msgstr "AdminisztrÃ¡ciÃ³"
+msgstr "AdminsztrÃ¡ciÃ³"
 
 #: strings.php:9
 msgid "Help"
@@ -473,115 +474,129 @@ msgid "Add"
 msgstr "HozzÃ¡adÃ¡s"
 
 #: templates/installation.php:24 templates/installation.php:31
+#: templates/installation.php:38
 msgid "Security Warning"
 msgstr "BiztonsÃ¡gi figyelmeztetÃ©s"
 
 #: templates/installation.php:25
+msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
+msgstr "Az Ã–n PHP verziÃ³ja sebezhetÅ‘ a NULL bÃ¡jtos tÃ¡madÃ¡ssal szemben (CVE-2006-7243)"
+
+#: templates/installation.php:26
+msgid "Please update your PHP installation to use ownCloud securely."
+msgstr "KÃ©rjÃ¼k frissÃtse a telepÃtett PHP csomagjait, hogy biztonsÃ¡gos legyen az ownCloud szolgÃ¡ltatÃ¡sa."
+
+#: templates/installation.php:32
 msgid ""
 "No secure random number generator is available, please enable the PHP "
 "OpenSSL extension."
 msgstr "Nem Ã©rhetÅ‘ el megfelelÅ‘ vÃ©letlenszÃ¡m-generÃ¡tor, telepÃteni kellene a PHP OpenSSL kiegÃ©szÃtÃ©sÃ©t."
 
-#: 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 "MegfelelÅ‘ vÃ©letlenszÃ¡m-generÃ¡tor hiÃ¡nyÃ¡ban egy tÃ¡madÃ³ szÃ¡ndÃ©kÃº idegen kÃ©pes lehet megjÃ³solni a jelszÃ³visszaÃ¡llÃtÃ³ tokent, Ã©s Ã–n helyett belÃ©pni."
 
-#: 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 "Az adatkÃ¶nyvtÃ¡r Ã©s a benne levÅ‘ Ã¡llomÃ¡nyok valÃ³szÃnÅ±leg kÃ¶zvetlenÃ¼l is elÃ©rhetÅ‘k az internetrÅ‘l, mert a .htaccess Ã¡llomÃ¡ny nem Ã©rvÃ©nyesÃ¼l."
 
-#: templates/installation.php:33
+#: 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 kiszolgÃ¡lÃ³ megfelelÅ‘ beÃ¡llÃtÃ¡sÃ¡hoz kÃ©rjÃ¼k olvassa el a <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">dokumentÃ¡ciÃ³t</a>."
 
-#: templates/installation.php:37
+#: templates/installation.php:44
 msgid "Create an <strong>admin account</strong>"
 msgstr "<strong>Rendszergazdai belÃ©pÃ©s</strong> lÃ©trehozÃ¡sa"
 
-#: templates/installation.php:55
+#: templates/installation.php:62
 msgid "Advanced"
 msgstr "HaladÃ³"
 
-#: templates/installation.php:57
+#: templates/installation.php:64
 msgid "Data folder"
 msgstr "AdatkÃ¶nyvtÃ¡r"
 
-#: templates/installation.php:66
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "AdatbÃ¡zis konfigurÃ¡lÃ¡sa"
 
-#: templates/installation.php:71 templates/installation.php:83
-#: templates/installation.php:94 templates/installation.php:105
-#: templates/installation.php:117
+#: 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:129
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "AdatbÃ¡zis felhasznÃ¡lÃ³nÃ©v"
 
-#: templates/installation.php:134
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "AdatbÃ¡zis jelszÃ³"
 
-#: templates/installation.php:139
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "Az adatbÃ¡zis neve"
 
-#: templates/installation.php:149
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "Az adatbÃ¡zis tÃ¡blÃ¡zattÃ©r (tablespace)"
 
-#: templates/installation.php:156
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "AdatbÃ¡zis szerver"
 
-#: templates/installation.php:162
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "A beÃ¡llÃtÃ¡sok befejezÃ©se"
 
-#: templates/layout.guest.php:35
+#: templates/layout.guest.php:40
 msgid "web services under your control"
 msgstr "webszolgÃ¡ltatÃ¡sok sajÃ¡t kÃ©zben"
 
-#: templates/layout.user.php:53
+#: templates/layout.user.php:36
+#, 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:61
 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 c28ba061869455133f08c8ea1095d96c4e68887c..bbdedfe71e9c0a7708a8dabc38066975ac1e39b1 100644
--- a/l10n/hu_HU/files.po
+++ b/l10n/hu_HU/files.po
@@ -3,19 +3,12 @@
 # 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.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-04 00:06+0100\n"
-"PO-Revision-Date: 2013-03-03 23:06+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10: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"
@@ -34,10 +27,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 +52,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"
@@ -77,59 +66,70 @@ msgstr "Nem sikerÃ¼lt a lemezre tÃ¶rtÃ©nÅ‘ ÃrÃ¡s"
 msgid "Not enough storage available"
 msgstr "Nincs elÃ©g szabad hely."
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr "Ã‰rvÃ©nytelen mappa."
 
-#: appinfo/app.php:10
+#: appinfo/app.php:12
 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:92 templates/index.php:93
+#: 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/files.js:292 js/files.js:408
-#: js/files.js:439
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "Folyamatban"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} mÃ¡r lÃ©tezik"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "Ãrjuk fÃ¶lÃ¼l"
 
-#: js/filelist.js:251
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "legyen mÃ¡s neve"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "mÃ©gse"
 
-#: js/filelist.js:298
+#: 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:298
+#: js/filelist.js:306
 msgid "undo"
 msgstr "visszavonÃ¡s"
 
-#: js/filelist.js:323
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr "a tÃ¶rlÃ©s vÃ©grehajtÃ¡sa"
 
+#: js/filelist.js:413
+msgid "1 file uploading"
+msgstr "1 fÃ¡jl tÃ¶ltÅ‘dik fÃ¶l"
+
+#: js/filelist.js:416 js/filelist.js:470
+msgid "files uploading"
+msgstr "fÃ¡jl tÃ¶ltÅ‘dik fÃ¶l"
+
 #: js/files.js:52
 msgid "'.' is an invalid file name."
 msgstr "'.' fÃ¡jlnÃ©v Ã©rvÃ©nytelen."
@@ -152,77 +152,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:225
+#: 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:262
+#: 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:262
-msgid "Upload Error"
-msgstr "FeltÃ¶ltÃ©si hiba"
+#: js/files.js:277
+msgid "Not enough space available"
+msgstr "Nincs elÃ©g szabad hely"
 
-#: js/files.js:273
-msgid "Close"
-msgstr "BezÃ¡rÃ¡s"
-
-#: js/files.js:312
-msgid "1 file uploading"
-msgstr "1 fÃ¡jl tÃ¶ltÅ‘dik fÃ¶l"
-
-#: js/files.js:315 js/files.js:370 js/files.js:385
-msgid "{count} files uploading"
-msgstr "{count} fÃ¡jl tÃ¶ltÅ‘dik fÃ¶l"
-
-#: js/files.js:388 js/files.js:423
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "A feltÃ¶ltÃ©st megszakÃtottuk."
 
-#: js/files.js:497
+#: 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:570
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "Az URL nem lehet semmi."
 
-#: js/files.js:575
+#: 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:953 templates/index.php:68
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+msgid "Error"
+msgstr "Hiba"
+
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "NÃ©v"
 
-#: js/files.js:954 templates/index.php:79
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "MÃ©ret"
 
-#: js/files.js:955 templates/index.php:81
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "MÃ³dosÃtva"
 
-#: js/files.js:974
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 mappa"
 
-#: js/files.js:976
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} mappa"
 
-#: js/files.js:984
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 fÃ¡jl"
 
-#: js/files.js:986
+#: 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 ""
+
+#: 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"
@@ -275,45 +275,45 @@ msgstr "Mappa"
 msgid "From link"
 msgstr "FeltÃ¶ltÃ©s linkrÅ‘l"
 
-#: templates/index.php:40
+#: templates/index.php:42
 msgid "Deleted files"
 msgstr "TÃ¶rÃ¶lt fÃ¡jlok"
 
-#: templates/index.php:46
+#: templates/index.php:48
 msgid "Cancel upload"
 msgstr "A feltÃ¶ltÃ©s megszakÃtÃ¡sa"
 
-#: templates/index.php:53
+#: templates/index.php:54
 msgid "You donâ€™t have write permissions here."
 msgstr "Itt nincs ÃrÃ¡sjoga."
 
-#: templates/index.php:60
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Itt nincs semmi. TÃ¶ltsÃ¶n fel valamit!"
 
-#: templates/index.php:74
+#: templates/index.php:75
 msgid "Download"
 msgstr "LetÃ¶ltÃ©s"
 
-#: templates/index.php:86 templates/index.php:87
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
-msgstr "MegosztÃ¡s visszavonÃ¡sa"
+msgstr "A megosztÃ¡s visszavonÃ¡sa"
 
-#: templates/index.php:106
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "A feltÃ¶ltÃ©s tÃºl nagy"
 
-#: templates/index.php:108
+#: 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:113
+#: 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:116
+#: 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..319463b63866d41f18812885987c02bf2426a846 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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"
diff --git a/l10n/hu_HU/files_external.po b/l10n/hu_HU/files_external.po
index e5618fc11721cf84a70f1035c4df659cd5f5570c..f040dbabdc8af6689f89b49b89e968966f0d27aa 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-01 00:05+0100\n"
-"PO-Revision-Date: 2013-02-28 13:20+0000\n"
+"POT-Creation-Date: 2013-05-02 02:14+0200\n"
+"PO-Revision-Date: 2013-05-01 16:20+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: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 "<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: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 "<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..c2a6ad60a756ad99471624878d16c7eafb0938ef 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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 3496d44486bd6a1aceaee45ce6152ced1e60a85e..2b1cf55a603a73f97c3251c1293bde0120bb10c1 100644
--- a/l10n/hu_HU/files_trashbin.po
+++ b/l10n/hu_HU/files_trashbin.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-08 00:25+0100\n"
-"PO-Revision-Date: 2013-03-07 23:25+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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"
@@ -18,12 +17,12 @@ msgstr ""
 "Language: hu_HU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:40
+#: ajax/delete.php:42
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "Nem sikerÃ¼lt %s vÃ©gleges tÃ¶rlÃ©se"
 
-#: ajax/undelete.php:41
+#: ajax/undelete.php:42
 #, php-format
 msgid "Couldn't restore %s"
 msgstr "Nem sikerÃ¼lt %s visszaÃ¡llÃtÃ¡sa"
@@ -32,6 +31,10 @@ msgstr "Nem sikerÃ¼lt %s visszaÃ¡llÃtÃ¡sa"
 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
+msgid "Error"
+msgstr "Hiba"
+
 #: js/trash.js:34
 msgid "delete file permanently"
 msgstr "az Ã¡llomÃ¡ny vÃ©gleges tÃ¶rlÃ©se"
@@ -78,4 +81,4 @@ msgstr "TÃ¶rlÃ©s"
 
 #: templates/part.breadcrumb.php:9
 msgid "Deleted Files"
-msgstr ""
+msgstr "TÃ¶rÃ¶lt fÃ¡jlok"
diff --git a/l10n/hu_HU/files_versions.po b/l10n/hu_HU/files_versions.po
index f166ccc2e3591f9e45106545d2381474ba713c90..c10a67b3b874cfeec54e8ddc08843196b7a8984d 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:30+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 94453c1b3514fb3fb5840dda978a0f7966aea97c..9b4f3529f8e9b555a1ef68057e29ffd7c794e11e 100644
--- a/l10n/hu_HU/lib.po
+++ b/l10n/hu_HU/lib.po
@@ -3,16 +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.
 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 13:10+0000\n"
-"Last-Translator: Laszlo Tornoci <torlasz@gmail.com>\n"
+"POT-Creation-Date: 2013-04-28 01:57+0200\n"
+"PO-Revision-Date: 2013-04-27 23:57+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"
@@ -44,19 +41,19 @@ msgstr "AlkalmazÃ¡sok"
 msgid "Admin"
 msgstr "AdminsztrÃ¡ciÃ³"
 
-#: files.php:202
+#: files.php:209
 msgid "ZIP download is turned off."
 msgstr "A ZIP-letÃ¶ltÃ©s nincs engedÃ©lyezve."
 
-#: files.php:203
+#: files.php:210
 msgid "Files need to be downloaded one by one."
 msgstr "A fÃ¡jlokat egyenkÃ©nt kell letÃ¶lteni."
 
-#: files.php:204 files.php:231
+#: files.php:211 files.php:244
 msgid "Back to Files"
 msgstr "Vissza a FÃ¡jlokhoz"
 
-#: files.php:228
+#: files.php:241
 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."
 
@@ -70,7 +67,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 +93,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 +113,79 @@ 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:128 setup.php:320 setup.php:365
+#: setup.php:132 setup.php:325 setup.php:370
 msgid "PostgreSQL username and/or password not valid"
 msgstr "A PostgreSQL felhasznÃ¡lÃ³i nÃ©v Ã©s/vagy jelszÃ³ Ã©rvÃ©nytelen"
 
-#: setup.php:129 setup.php:152 setup.php:229
+#: setup.php:133 setup.php:156 setup.php:234
 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:151 setup.php:453 setup.php:520
+#: setup.php:155 setup.php:458 setup.php:525
 msgid "Oracle username and/or password not valid"
 msgstr "Az Oracle felhasznÃ¡lÃ³i nÃ©v Ã©s/vagy jelszÃ³ Ã©rvÃ©nytelen"
 
-#: setup.php:228
+#: setup.php:233
 msgid "MySQL username and/or password not valid"
 msgstr "A MySQL felhasznÃ¡lÃ³i nÃ©v Ã©s/vagy jelszÃ³ Ã©rvÃ©nytelen"
 
-#: 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: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:583 setup.php:592 setup.php:600 setup.php:609
+#: setup.php:615
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "AdatbÃ¡zis hiba: \"%s\""
 
-#: 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:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
+#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
+#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "A hibÃ¡t ez a parancs okozta: \"%s\""
 
-#: setup.php:299
+#: setup.php:304
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "A '%s'@'localhost' MySQL felhasznÃ¡lÃ³ mÃ¡r lÃ©tezik."
 
-#: setup.php:300
+#: setup.php:305
 msgid "Drop this user from MySQL"
 msgstr "TÃ¶rÃ¶lje ezt a felhasznÃ¡lÃ³t a MySQL-bÅ‘l"
 
-#: setup.php:305
+#: setup.php:310
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "A '%s'@'%%' MySQL felhasznÃ¡lÃ³ mÃ¡r lÃ©tezik"
 
-#: setup.php:306
+#: setup.php:311
 msgid "Drop this user from MySQL."
 msgstr "TÃ¶rÃ¶lje ezt a felhasznÃ¡lÃ³t a MySQL-bÅ‘l."
 
-#: setup.php:579 setup.php:611
+#: setup.php:584 setup.php:616
 #, 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:631
+#: setup.php:636
 #, 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:849
+#: setup.php:858
 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:850
+#: setup.php:859
 #, 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 +233,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 d274313816968c8097155db82b429a05032e9e95..4bc6f8ef6fcfffafd61e2b9992480efdb31a6bed 100644
--- a/l10n/hu_HU/settings.po
+++ b/l10n/hu_HU/settings.po
@@ -3,16 +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.
-# 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-03-01 00:05+0100\n"
-"PO-Revision-Date: 2013-02-28 13:10+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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"
@@ -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"
 
@@ -96,76 +97,76 @@ msgstr "FrissÃtÃ©s erre a verziÃ³ra: {appversion}"
 msgid "Disable"
 msgstr "LetiltÃ¡s"
 
-#: js/apps.js:36 js/apps.js:64
+#: 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...."
 msgstr "KÃ©rem vÃ¡rjon..."
 
-#: js/apps.js:84
+#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+msgid "Error"
+msgstr "Hiba"
+
+#: js/apps.js:90
 msgid "Updating...."
 msgstr "FrissÃtÃ©s folyamatban..."
 
-#: js/apps.js:87
+#: js/apps.js:93
 msgid "Error while updating app"
 msgstr "Hiba tÃ¶rtÃ©nt a programfrissÃtÃ©s kÃ¶zben"
 
-#: js/apps.js:87
-msgid "Error"
-msgstr "Hiba"
-
-#: js/apps.js:90
+#: js/apps.js:96
 msgid "Updated"
 msgstr "FrissÃtve"
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr "MentÃ©s..."
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "deleted"
 msgstr "tÃ¶rÃ¶lve"
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "undo"
 msgstr "visszavonÃ¡s"
 
-#: js/users.js:62
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr "A felhasznÃ¡lÃ³t nem sikerÃ¼lt eltÃ¡volÃtÃ¡ni"
 
-#: js/users.js:75 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
+#: templates/users.php:103
 msgid "Groups"
 msgstr "Csoportok"
 
-#: js/users.js:78 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr "CsoportadminisztrÃ¡tor"
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "TÃ¶rlÃ©s"
 
-#: js/users.js:191
+#: js/users.js:269
 msgid "add group"
 msgstr "csoport hozzÃ¡adÃ¡sa"
 
-#: js/users.js:352
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr "Ã‰rvÃ©nyes felhasznÃ¡lÃ³nevet kell megadnia"
 
-#: js/users.js:353 js/users.js:359 js/users.js:374
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr "A felhasznÃ¡lÃ³ nem hozhatÃ³ lÃ©tre"
 
-#: js/users.js:358
+#: js/users.js:426
 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,15 +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:230 templates/personal.php:102
+#: templates/admin.php:228
+msgid "Less"
+msgstr "Kevesebb"
+
+#: templates/admin.php:235 templates/personal.php:105
 msgid "Version"
 msgstr "VerziÃ³"
 
-#: templates/admin.php:233 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 +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:77
 msgid "Password"
 msgstr "JelszÃ³"
 
@@ -419,82 +424,70 @@ 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:76
 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:68
 msgid "Email"
 msgstr "Email"
 
-#: templates/personal.php:72
+#: templates/personal.php:70
 msgid "Your email address"
 msgstr "Az Ã–n email cÃme"
 
-#: templates/personal.php:73
+#: templates/personal.php:71
 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:77 templates/personal.php:78
 msgid "Language"
 msgstr "Nyelv"
 
-#: templates/personal.php:86
+#: templates/personal.php:89
 msgid "Help translate"
 msgstr "SegÃtsen a fordÃtÃ¡sban!"
 
-#: templates/personal.php:91
+#: templates/personal.php:94
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:93
+#: templates/personal.php:96
 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:75
 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:33
 msgid "Default Storage"
 msgstr "AlapÃ©rtelmezett tÃ¡rhely"
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:39 templates/users.php:133
 msgid "Unlimited"
 msgstr "KorlÃ¡tlan"
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:57 templates/users.php:148
 msgid "Other"
 msgstr "MÃ¡s"
 
-#: templates/users.php:84
+#: templates/users.php:82
 msgid "Storage"
 msgstr "TÃ¡rhely"
 
-#: templates/users.php:95
+#: templates/users.php:93
 msgid "change display name"
 msgstr "a megjelenÃtett nÃ©v mÃ³dosÃtÃ¡sa"
 
-#: templates/users.php:99
+#: templates/users.php:97
 msgid "set new password"
 msgstr "Ãºj jelszÃ³ beÃ¡llÃtÃ¡sa"
 
-#: templates/users.php:134
+#: templates/users.php:128
 msgid "Default"
 msgstr "AlapÃ©rtelmezett"
diff --git a/l10n/hu_HU/user_ldap.po b/l10n/hu_HU/user_ldap.po
index 3ad1f562736a341f27c99bb62e5eeeff136a83a8..537f774ff53838d4014b90ea59a1d0492d321683 100644
--- a/l10n/hu_HU/user_ldap.po
+++ b/l10n/hu_HU/user_ldap.po
@@ -3,15 +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.
 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 09:01+0000\n"
-"Last-Translator: Laszlo Tornoci <torlasz@gmail.com>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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"
@@ -19,6 +17,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 ""
+
 #: 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 +57,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 ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: 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:18
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr "Ãšj kiszolgÃ¡lÃ³ beÃ¡llÃtÃ¡sÃ¡nak hozzÃ¡adÃ¡sa"
 
-#: templates/settings.php:23
+#: templates/settings.php:37
 msgid "Host"
 msgstr "KiszolgÃ¡lÃ³"
 
-#: templates/settings.php:25
+#: 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:26
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "DN-gyÃ¶kÃ©r"
 
-#: templates/settings.php:27
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr "SoronkÃ©nt egy DN-gyÃ¶kÃ©r"
 
-#: templates/settings.php:28
+#: 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:30
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "A kapcsolÃ³dÃ³ felhasznÃ¡lÃ³ DN-je"
 
-#: 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 "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:33
+#: templates/settings.php:47
 msgid "Password"
 msgstr "JelszÃ³"
 
-#: templates/settings.php:36
+#: 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:37
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "SzÅ±rÅ‘ a bejelentkezÃ©shez"
 
-#: 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 "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:41
+#: 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:42
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "A felhasznÃ¡lÃ³k szÅ±rÅ‘je"
 
-#: templates/settings.php:45
+#: 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:46
+#: 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:47
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "A csoportok szÅ±rÅ‘je"
 
-#: templates/settings.php:50
+#: 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:51
+#: 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:55
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr "Kapcsolati beÃ¡llÃtÃ¡sok"
 
-#: templates/settings.php:57
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr "A beÃ¡llÃtÃ¡s aktÃv"
 
-#: templates/settings.php:57
+#: 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:58
+#: templates/settings.php:72
 msgid "Port"
 msgstr "Port"
 
-#: templates/settings.php:59
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr "MÃ¡sodkiszolgÃ¡lÃ³ (replika)"
 
-#: 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 "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:60
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr "A mÃ¡sodkiszolgÃ¡lÃ³ (replika) portszÃ¡ma"
 
-#: templates/settings.php:61
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr "A fÅ‘ szerver kihagyÃ¡sa"
 
-#: templates/settings.php:61
+#: 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:62
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "HasznÃ¡ljunk TLS-t"
 
-#: templates/settings.php:62
+#: 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:63
+#: 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:64
+#: 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: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 "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:64
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "Nem javasolt, csak tesztelÃ©sre Ã©rdemes hasznÃ¡lni."
 
-#: templates/settings.php:65
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr "A gyorsÃtÃ³tÃ¡r tÃ¡rolÃ¡si idÅ‘tartama"
 
-#: templates/settings.php:65
+#: 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:67
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr "CÃmtÃ¡r beÃ¡llÃtÃ¡sok"
 
-#: templates/settings.php:69
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr "A felhasznÃ¡lÃ³nÃ©v mezÅ‘je"
 
-#: templates/settings.php:69
+#: 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:70
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "A felhasznÃ¡lÃ³i fa gyÃ¶kere"
 
-#: templates/settings.php:70
+#: 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:71
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr "A felhasznÃ¡lÃ³k lekÃ©rdezett attribÃºtumai"
 
-#: templates/settings.php:71 templates/settings.php:74
+#: 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:72
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr "A csoport nevÃ©nek mezÅ‘je"
 
-#: templates/settings.php:72
+#: 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:73
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "A csoportfa gyÃ¶kere"
 
-#: templates/settings.php:73
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr "SoronkÃ©nt egy csoportfa gyÃ¶kerÃ©t adhatjuk meg"
 
-#: templates/settings.php:74
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr "A csoportok lekÃ©rdezett attribÃºtumai"
 
-#: templates/settings.php:75
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr "A csoporttagsÃ¡g attribÃºtuma"
 
-#: templates/settings.php:77
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr "KÃ¼lÃ¶nleges attribÃºtumok"
 
-#: templates/settings.php:79
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr "KvÃ³ta mezÅ‘"
 
-#: templates/settings.php:80
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr "AlapÃ©rtelmezett kvÃ³ta"
 
-#: templates/settings.php:80
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr "bÃ¡jtban"
 
-#: templates/settings.php:81
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr "Email mezÅ‘"
 
-#: templates/settings.php:82
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr "A home kÃ¶nyvtÃ¡r elÃ©rÃ©si Ãºtvonala"
 
-#: templates/settings.php:82
+#: 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: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 "A beÃ¡llÃtÃ¡sok tesztelÃ©se"
 
-#: templates/settings.php:86
+#: 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..535e53af3312800d8a67ebb2273aea125f1ee87d 100644
--- a/l10n/hu_HU/user_webdavauth.po
+++ b/l10n/hu_HU/user_webdavauth.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-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-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -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..f393e4f5a2b20c14f881724efef01e5258cf7ad5 100644
--- a/l10n/hy/core.po
+++ b/l10n/hy/core.po
@@ -7,211 +7,388 @@ 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"
-"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
+"POT-Creation-Date: 2013-04-30 01:57+0200\n"
+"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: LANGUAGE <LL@li.org>\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"
 
-#: 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/oc-dialogs.js:123
-msgid "Choose"
+#: 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/oc-dialogs.js:143 js/oc-dialogs.js:163
+#: 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 js/oc-dialogs.js:247
+msgid "Ok"
+msgstr ""
+
+#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
 msgid "Cancel"
 msgstr ""
 
-#: js/oc-dialogs.js:159
-msgid "No"
+#: js/oc-dialogs.js:185
+msgid "Choose"
 msgstr ""
 
-#: js/oc-dialogs.js:160
+#: js/oc-dialogs.js:215
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:177
-msgid "Ok"
+#: js/oc-dialogs.js:222
+msgid "No"
 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 +396,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 +468,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 +607,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 3e3e9ee87c6d0744ec48ad0d49cb88ff2b4a8731..52f66f4a8d31bf85dedc8918ad824c915e4ae74a 100644
--- a/l10n/hy/files.po
+++ b/l10n/hy/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-04 00:06+0100\n"
-"PO-Revision-Date: 2013-03-03 23:06+0000\n"
+"POT-Creation-Date: 2013-05-15 01:59+0200\n"
+"PO-Revision-Date: 2013-05-15 00:00+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: LANGUAGE <LL@li.org>\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 ""
@@ -70,59 +66,70 @@ msgstr ""
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:10
+#: 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 ""
 
-#: js/fileactions.js:127 templates/index.php:92 templates/index.php:93
+#: 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/files.js:292 js/files.js:408
-#: js/files.js:439
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:251
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:323
+#: 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 ""
@@ -145,77 +152,77 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:225
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:262
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:262
-msgid "Upload Error"
+#: js/files.js:277
+msgid "Not enough space available"
 msgstr ""
 
-#: js/files.js:273
-msgid "Close"
-msgstr "Õ“Õ¡Õ¯Õ¥Õ¬"
-
-#: js/files.js:312
-msgid "1 file uploading"
-msgstr ""
-
-#: js/files.js:315 js/files.js:370 js/files.js:385
-msgid "{count} files uploading"
-msgstr ""
-
-#: js/files.js:388 js/files.js:423
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:497
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:570
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:575
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:953 templates/index.php:68
+#: 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:954 templates/index.php:79
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr ""
 
-#: js/files.js:955 templates/index.php:81
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:974
+#: js/files.js:898
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:976
+#: js/files.js:900
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:984
+#: js/files.js:908
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:986
+#: 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 ""
@@ -268,45 +275,45 @@ msgstr ""
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:42
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:48
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:53
+#: templates/index.php:54
 msgid "You donâ€™t have write permissions here."
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:74
+#: templates/index.php:75
 msgid "Download"
 msgstr "Ô²Õ¥Õ¼Õ¶Õ¥Õ¬"
 
-#: templates/index.php:86 templates/index.php:87
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr ""
 
-#: templates/index.php:106
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:108
+#: 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:113
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:116
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr ""
 
diff --git a/l10n/hy/files_external.po b/l10n/hy/files_external.po
index 6563d686916bf5dc7f221e5cfc54fb5ad9844200..a6e391b464839829a31ed9b1ea8d087b1a0a76a2 100644
--- a/l10n/hy/files_external.po
+++ b/l10n/hy/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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\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/hy/files_sharing.po b/l10n/hy/files_sharing.po
index 8d83b7805c5267406e9a25b4c94b207ec27eb05f..22d56339abe874d73dd1efa01b4e5c257196f3aa 100644
--- a/l10n/hy/files_sharing.po
+++ b/l10n/hy/files_sharing.po
@@ -7,10 +7,10 @@ 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"
-"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
+"POT-Creation-Date: 2013-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\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 b04c3cb98c48dd76cfe7fe62eec1417ec51fc8cd..57d556aab188f72ad0319c2e7651bc3505eb6c23 100644
--- a/l10n/hy/files_trashbin.po
+++ b/l10n/hy/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-03-08 00:25+0100\n"
-"PO-Revision-Date: 2013-03-07 23:25+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,12 +17,12 @@ msgstr ""
 "Language: hy\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:40
+#: ajax/delete.php:42
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
 
-#: ajax/undelete.php:41
+#: ajax/undelete.php:42
 #, php-format
 msgid "Couldn't restore %s"
 msgstr ""
@@ -31,6 +31,10 @@ msgstr ""
 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 ""
diff --git a/l10n/hy/settings.po b/l10n/hy/settings.po
index da0084348d80ca4684079ba6f27019115fdb3e5f..0ce7e26c45783c99a1831762a66c7d01634f29c6 100644
--- a/l10n/hy/settings.po
+++ b/l10n/hy/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-02-27 14:35+0100\n"
-"PO-Revision-Date: 2013-02-27 13:35+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-04-27 02:17+0200\n"
+"PO-Revision-Date: 2013-04-26 08:00+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\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 ""
 
@@ -92,7 +96,7 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: js/apps.js:36 js/apps.js:64
+#: js/apps.js:36 js/apps.js:64 js/apps.js:83
 msgid "Enable"
 msgstr ""
 
@@ -100,68 +104,68 @@ msgstr ""
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:84
-msgid "Updating...."
+#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+msgid "Error"
 msgstr ""
 
-#: js/apps.js:87
-msgid "Error while updating app"
+#: js/apps.js:90
+msgid "Updating...."
 msgstr ""
 
-#: js/apps.js:87
-msgid "Error"
+#: js/apps.js:93
+msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:90
+#: js/apps.js:96
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr ""
 
-#: js/users.js:30
+#: js/users.js:43
 msgid "deleted"
 msgstr ""
 
-#: js/users.js:30
+#: js/users.js:43
 msgid "undo"
 msgstr ""
 
-#: js/users.js:62
+#: js/users.js:75
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:75 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: templates/users.php:103
 msgid "Groups"
 msgstr ""
 
-#: js/users.js:78 templates/users.php:82 templates/users.php:119
+#: js/users.js:91 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:111 templates/users.php:155
 msgid "Delete"
 msgstr "Õ‹Õ¶Õ»Õ¥Õ¬"
 
-#: js/users.js:191
+#: js/users.js:262
 msgid "add group"
 msgstr ""
 
-#: js/users.js:352
+#: js/users.js:414
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:353 js/users.js:359 js/users.js:374
+#: js/users.js:415 js/users.js:421 js/users.js:436
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:358
+#: js/users.js:420
 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,15 +316,19 @@ msgstr ""
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:230 templates/personal.php:102
+#: templates/admin.php:228
+msgid "Less"
+msgstr ""
+
+#: templates/admin.php:235 templates/personal.php:105
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:233 templates/personal.php:105
+#: templates/admin.php:238 templates/personal.php:108
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -391,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:77
 msgid "Password"
 msgstr ""
 
@@ -415,82 +423,70 @@ msgstr ""
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:76
 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:75
 msgid "Login Name"
 msgstr ""
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr ""
 
-#: templates/users.php:35
+#: templates/users.php:33
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:39 templates/users.php:133
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:57 templates/users.php:148
 msgid "Other"
 msgstr "Ô±ÕµÕ¬"
 
-#: templates/users.php:84
+#: templates/users.php:82
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:95
+#: templates/users.php:93
 msgid "change display name"
 msgstr ""
 
-#: templates/users.php:99
+#: templates/users.php:97
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:134
+#: templates/users.php:128
 msgid "Default"
 msgstr ""
diff --git a/l10n/ia/core.po b/l10n/ia/core.po
index d545c83f5ee71e2836b605bd102db909e6661069..8e5b97b1c5a215591accbcea992c03c844318ad0 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-02-22 00:06+0100\n"
-"PO-Revision-Date: 2013-02-20 23:20+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10: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"
@@ -18,24 +17,24 @@ msgstr ""
 "Language: ia\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:85
+#: ajax/share.php:97
 #, php-format
 msgid "User %s shared a file with you"
 msgstr ""
 
-#: ajax/share.php:87
+#: ajax/share.php:99
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr ""
 
-#: ajax/share.php:89
+#: 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:91
+#: ajax/share.php:104
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -81,79 +80,79 @@ msgstr ""
 msgid "Error removing %s from favorites."
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:34
 msgid "Sunday"
 msgstr "Dominica"
 
-#: js/config.php:32
+#: js/config.php:35
 msgid "Monday"
 msgstr "Lunedi"
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Tuesday"
 msgstr "Martedi"
 
-#: js/config.php:32
+#: js/config.php:37
 msgid "Wednesday"
 msgstr "Mercuridi"
 
-#: js/config.php:32
+#: js/config.php:38
 msgid "Thursday"
 msgstr "Jovedi"
 
-#: js/config.php:32
+#: js/config.php:39
 msgid "Friday"
 msgstr "Venerdi"
 
-#: js/config.php:32
+#: js/config.php:40
 msgid "Saturday"
 msgstr "Sabbato"
 
-#: js/config.php:33
+#: js/config.php:45
 msgid "January"
 msgstr "januario"
 
-#: js/config.php:33
+#: js/config.php:46
 msgid "February"
 msgstr "Februario"
 
-#: js/config.php:33
+#: js/config.php:47
 msgid "March"
 msgstr "Martio"
 
-#: js/config.php:33
+#: js/config.php:48
 msgid "April"
 msgstr "April"
 
-#: js/config.php:33
+#: js/config.php:49
 msgid "May"
 msgstr "Mai"
 
-#: js/config.php:33
+#: js/config.php:50
 msgid "June"
 msgstr "Junio"
 
-#: js/config.php:33
+#: js/config.php:51
 msgid "July"
 msgstr "Julio"
 
-#: js/config.php:33
+#: js/config.php:52
 msgid "August"
 msgstr "Augusto"
 
-#: js/config.php:33
+#: js/config.php:53
 msgid "September"
 msgstr "Septembre"
 
-#: js/config.php:33
+#: js/config.php:54
 msgid "October"
 msgstr "Octobre"
 
-#: js/config.php:33
+#: js/config.php:55
 msgid "November"
 msgstr "Novembre"
 
-#: js/config.php:33
+#: js/config.php:56
 msgid "December"
 msgstr "Decembre"
 
@@ -161,76 +160,76 @@ msgstr "Decembre"
 msgid "Settings"
 msgstr "Configurationes"
 
-#: js/js.js:767
+#: js/js.js:718
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:768
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:769
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:770
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:771
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:772
+#: js/js.js:723
 msgid "today"
 msgstr ""
 
-#: js/js.js:773
+#: js/js.js:724
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:774
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:775
+#: js/js.js:726
 msgid "last month"
 msgstr ""
 
-#: js/js.js:776
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:777
+#: js/js.js:728
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:778
+#: js/js.js:729
 msgid "last year"
 msgstr ""
 
-#: js/js.js:779
+#: js/js.js:730
 msgid "years ago"
 msgstr ""
 
-#: js/oc-dialogs.js:126
-msgid "Choose"
+#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
+msgid "Ok"
 msgstr ""
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
 msgid "Cancel"
 msgstr "Cancellar"
 
-#: js/oc-dialogs.js:162
-msgid "No"
+#: js/oc-dialogs.js:185
+msgid "Choose"
 msgstr ""
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:215
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:180
-msgid "Ok"
+#: js/oc-dialogs.js:222
+msgid "No"
 msgstr ""
 
 #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
@@ -238,11 +237,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:152 js/share.js:159 js/share.js:582
-#: js/share.js:594
+#: 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."
@@ -252,127 +253,127 @@ msgstr ""
 msgid "The required file {file} is not installed!"
 msgstr ""
 
-#: js/share.js:29 js/share.js:43 js/share.js:90
+#: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr ""
 
-#: js/share.js:93
+#: js/share.js:90
 msgid "Share"
 msgstr "Compartir"
 
-#: js/share.js:141 js/share.js:622
+#: js/share.js:125 js/share.js:617
 msgid "Error while sharing"
 msgstr ""
 
-#: js/share.js:152
+#: js/share.js:136
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:159
+#: js/share.js:143
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:168
+#: js/share.js:152
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:170
+#: js/share.js:154
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:175
+#: js/share.js:159
 msgid "Share with"
 msgstr ""
 
-#: js/share.js:180
+#: js/share.js:164
 msgid "Share with link"
 msgstr ""
 
-#: js/share.js:183
+#: js/share.js:167
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:185 templates/installation.php:44 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Contrasigno"
 
-#: js/share.js:189
+#: js/share.js:173
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:190
+#: js/share.js:174
 msgid "Send"
-msgstr ""
+msgstr "Invia"
 
-#: js/share.js:194
+#: js/share.js:178
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:195
+#: js/share.js:179
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:227
+#: js/share.js:211
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:229
+#: js/share.js:213
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:256
+#: js/share.js:251
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:292
+#: js/share.js:287
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:313
+#: js/share.js:308
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:325
+#: js/share.js:320
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:327
+#: js/share.js:322
 msgid "access control"
 msgstr ""
 
-#: js/share.js:330
+#: js/share.js:325
 msgid "create"
 msgstr ""
 
-#: js/share.js:333
+#: js/share.js:328
 msgid "update"
 msgstr ""
 
-#: js/share.js:336
+#: js/share.js:331
 msgid "delete"
 msgstr ""
 
-#: js/share.js:339
+#: js/share.js:334
 msgid "share"
 msgstr ""
 
-#: js/share.js:373 js/share.js:569
+#: js/share.js:368 js/share.js:564
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:582
+#: js/share.js:577
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:594
+#: js/share.js:589
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:609
+#: js/share.js:604
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:620
+#: js/share.js:615
 msgid "Email sent"
 msgstr ""
 
@@ -395,24 +396,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:39
-#: 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"
 
@@ -468,115 +472,130 @@ msgstr "Modificar categorias"
 msgid "Add"
 msgstr "Adder"
 
-#: templates/installation.php:23 templates/installation.php:30
+#: 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:25
+#: 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:31
+#: 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:32
+#: 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:36
+#: templates/installation.php:44
 msgid "Create an <strong>admin account</strong>"
 msgstr "Crear un <strong>conto de administration</strong>"
 
-#: templates/installation.php:52
+#: templates/installation.php:62
 msgid "Advanced"
 msgstr "Avantiate"
 
-#: templates/installation.php:54
+#: templates/installation.php:64
 msgid "Data folder"
 msgstr "Dossier de datos"
 
-#: templates/installation.php:61
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "Configurar le base de datos"
 
-#: templates/installation.php:66 templates/installation.php:77
-#: templates/installation.php:87 templates/installation.php:97
+#: 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:109
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "Usator de base de datos"
 
-#: templates/installation.php:113
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "Contrasigno de base de datos"
 
-#: templates/installation.php:117
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "Nomine de base de datos"
 
-#: templates/installation.php:125
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:131
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "Hospite de base de datos"
 
-#: templates/installation.php:136
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr ""
 
-#: templates/layout.guest.php:33
+#: templates/layout.guest.php:40
 msgid "web services under your control"
 msgstr "servicios web sub tu controlo"
 
-#: templates/layout.user.php:48
+#: 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 "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 0494da5e957c21d72159cf0fd859c62194ad372c..861f74f8217329422a87870552a13e0d1eca593e 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-03-04 00:06+0100\n"
-"PO-Revision-Date: 2013-03-03 23:06+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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"
@@ -72,59 +66,70 @@ msgstr ""
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:10
+#: appinfo/app.php:12
 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:92 templates/index.php:93
+#: 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/files.js:292 js/files.js:408
-#: js/files.js:439
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:251
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:323
+#: 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 ""
@@ -147,77 +152,77 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:225
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:262
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:262
-msgid "Upload Error"
+#: js/files.js:277
+msgid "Not enough space available"
 msgstr ""
 
-#: js/files.js:273
-msgid "Close"
-msgstr "Clauder"
-
-#: js/files.js:312
-msgid "1 file uploading"
-msgstr ""
-
-#: js/files.js:315 js/files.js:370 js/files.js:385
-msgid "{count} files uploading"
-msgstr ""
-
-#: js/files.js:388 js/files.js:423
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:497
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:570
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:575
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:953 templates/index.php:68
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+msgid "Error"
+msgstr "Error"
+
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Nomine"
 
-#: js/files.js:954 templates/index.php:79
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Dimension"
 
-#: js/files.js:955 templates/index.php:81
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Modificate"
 
-#: js/files.js:974
+#: js/files.js:898
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:976
+#: js/files.js:900
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:984
+#: js/files.js:908
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:986
+#: 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"
@@ -270,45 +275,45 @@ msgstr "Dossier"
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:42
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:48
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:53
+#: templates/index.php:54
 msgid "You donâ€™t have write permissions here."
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Nihil hic. Incarga alcun cosa!"
 
-#: templates/index.php:74
+#: templates/index.php:75
 msgid "Download"
 msgstr "Discargar"
 
-#: templates/index.php:86 templates/index.php:87
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr ""
 
-#: templates/index.php:106
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "Incargamento troppo longe"
 
-#: templates/index.php:108
+#: 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:113
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:116
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr ""
 
diff --git a/l10n/ia/files_encryption.po b/l10n/ia/files_encryption.po
index 11e4cc8eb8c110820bbd50fae6ad4953bda41c17..542eba1d2eb6cd495207eeab58e5a4cca402402f 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-04-26 10:00+0200\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ia/files_external.po b/l10n/ia/files_external.po
index e79169bb213912f7531c2dc92ba30332fa479c4c..bebf028aa871aa5d033af17236cc1397f05f746c 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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..0234ab82aa4e6ea3e155391322a113c919741255 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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 8f143679d149fdde995b4b087eef6c4add5de10b..262c7e82f7bcb142df491ffa7753f02784e5ca37 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-03-08 00:25+0100\n"
-"PO-Revision-Date: 2013-03-07 23:25+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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,12 +17,12 @@ msgstr ""
 "Language: ia\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:40
+#: ajax/delete.php:42
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
 
-#: ajax/undelete.php:41
+#: ajax/undelete.php:42
 #, php-format
 msgid "Couldn't restore %s"
 msgstr ""
@@ -31,6 +31,10 @@ msgstr ""
 msgid "perform restore operation"
 msgstr ""
 
+#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+msgid "Error"
+msgstr "Error"
+
 #: js/trash.js:34
 msgid "delete file permanently"
 msgstr ""
diff --git a/l10n/ia/files_versions.po b/l10n/ia/files_versions.po
index 400157adb8f57fcc68a26bbac5377d214bc9fbd8..7c02d48b46e0b4351600116eff772046ccb41bc8 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-04-26 10:00+0200\n"
+"PO-Revision-Date: 2013-04-26 08:02+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -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 2bb101b7e714032c72387c42386a600c413f126c..304647c370fefabd8caeaf46371772854b206b40 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-02-27 14:35+0100\n"
-"PO-Revision-Date: 2013-02-27 13:35+0000\n"
+"POT-Creation-Date: 2013-04-28 01:57+0200\n"
+"PO-Revision-Date: 2013-04-27 23:57+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"
@@ -35,25 +35,25 @@ msgstr "Usatores"
 
 #: app.php:398
 msgid "Apps"
-msgstr ""
+msgstr "Applicationes"
 
 #: app.php:406
 msgid "Admin"
-msgstr ""
+msgstr "Administration"
 
-#: files.php:202
+#: files.php:209
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:203
+#: files.php:210
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:204 files.php:231
+#: files.php:211 files.php:244
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:228
+#: files.php:241
 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,72 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:128 setup.php:320 setup.php:365
+#: setup.php:132 setup.php:325 setup.php:370
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:129 setup.php:152 setup.php:229
+#: setup.php:133 setup.php:156 setup.php:234
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:151 setup.php:453 setup.php:520
+#: setup.php:155 setup.php:458 setup.php:525
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:228
+#: setup.php:233
 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: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:583 setup.php:592 setup.php:600 setup.php:609
+#: setup.php:615
 #, 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:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
+#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
+#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:299
+#: setup.php:304
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:300
+#: setup.php:305
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:305
+#: setup.php:310
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:306
+#: setup.php:311
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:579 setup.php:611
+#: setup.php:584 setup.php:616
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:631
+#: setup.php:636
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:849
+#: setup.php:858
 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:859
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
@@ -239,19 +235,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 3be4a6973418f4ba3ffbff5d8f0e7c6b3999a38d..9297795c3bed2df40411e1780214509d948ec2f9 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-02-27 14:35+0100\n"
-"PO-Revision-Date: 2013-02-27 13:35+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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 ""
 
@@ -94,7 +96,7 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: js/apps.js:36 js/apps.js:64
+#: js/apps.js:36 js/apps.js:64 js/apps.js:83
 msgid "Enable"
 msgstr ""
 
@@ -102,68 +104,68 @@ msgstr ""
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:84
+#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+msgid "Error"
+msgstr "Error"
+
+#: js/apps.js:90
 msgid "Updating...."
 msgstr ""
 
-#: js/apps.js:87
+#: js/apps.js:93
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:87
-msgid "Error"
-msgstr ""
-
-#: js/apps.js:90
+#: js/apps.js:96
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr ""
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "deleted"
 msgstr ""
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "undo"
 msgstr ""
 
-#: js/users.js:62
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:75 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
+#: templates/users.php:103
 msgid "Groups"
 msgstr "Gruppos"
 
-#: js/users.js:78 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "Deler"
 
-#: js/users.js:191
+#: js/users.js:269
 msgid "add group"
 msgstr ""
 
-#: js/users.js:352
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:353 js/users.js:359 js/users.js:374
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:358
+#: js/users.js:426
 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,21 +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 "Plus"
+
+#: templates/admin.php:228
+msgid "Less"
 msgstr ""
 
-#: templates/admin.php:230 templates/personal.php:102
+#: templates/admin.php:235 templates/personal.php:105
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:233 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 "
@@ -387,13 +393,13 @@ msgstr ""
 
 #: templates/personal.php:15
 msgid "Get the apps to sync your files"
-msgstr ""
+msgstr "Obtene le apps (applicationes) pro synchronizar tu files"
 
 #: 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:77
 msgid "Password"
 msgstr "Contrasigno"
 
@@ -417,82 +423,70 @@ msgstr "Nove contrasigno"
 msgid "Change password"
 msgstr "Cambiar contrasigno"
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:76
 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 "E-posta"
 
-#: templates/personal.php:72
+#: templates/personal.php:70
 msgid "Your email address"
 msgstr "Tu adresse de e-posta"
 
-#: 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 "Linguage"
 
-#: templates/personal.php:86
+#: templates/personal.php:89
 msgid "Help translate"
 msgstr "Adjuta a traducer"
 
-#: 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:75
 msgid "Login Name"
 msgstr ""
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr "Crear"
 
-#: templates/users.php:35
+#: templates/users.php:33
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:39 templates/users.php:133
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:57 templates/users.php:148
 msgid "Other"
 msgstr "Altere"
 
-#: templates/users.php:84
+#: templates/users.php:82
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:95
+#: templates/users.php:93
 msgid "change display name"
 msgstr ""
 
-#: templates/users.php:99
+#: templates/users.php:97
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:134
+#: templates/users.php:128
 msgid "Default"
 msgstr ""
diff --git a/l10n/ia/user_ldap.po b/l10n/ia/user_ldap.po
index 602cde8f9a6ae544b591aa8b8d911182c86ca937..2cccdd93f88d9c08f60df45bfaf5f6b7e5aca0c1 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-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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..5b5b3f334726881330a963bd51e4eb96910b33c7 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-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -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 181a4aff126287f349ab23334cdc2727aca12a3d..e17e73ed172c5855147e786ba4f1c9737eb76925 100644
--- a/l10n/id/core.po
+++ b/l10n/id/core.po
@@ -3,18 +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.
 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 14:10+0000\n"
-"Last-Translator: evanlimanto <evanlimanto@gmail.com>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10: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"
@@ -25,26 +20,26 @@ msgstr ""
 #: ajax/share.php:97
 #, php-format
 msgid "User %s shared a file with you"
-msgstr ""
+msgstr "%s berbagi berkas dengan Anda"
 
 #: ajax/share.php:99
 #, php-format
 msgid "User %s shared a folder with you"
-msgstr ""
+msgstr "%s berbagi folder dengan Anda"
 
 #: ajax/share.php:101
 #, php-format
 msgid ""
 "User %s shared the file \"%s\" with you. It is available for download here: "
 "%s"
-msgstr ""
+msgstr "%s berbagi berkas \"%s\" dengan Anda. Silakan unduh di sini: %s"
 
 #: ajax/share.php:104
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
 "here: %s"
-msgstr ""
+msgstr "%s berbagi folder \"%s\" dengan Anda. Silakan unduh di sini: %s"
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -63,55 +58,55 @@ msgstr "Kategori ini sudah ada: %s"
 #: ajax/vcategories/favorites.php:24
 #: ajax/vcategories/removeFromFavorites.php:26
 msgid "Object type not provided."
-msgstr "Tipe obyek tidak diberikan."
+msgstr "Tipe objek tidak diberikan."
 
 #: ajax/vcategories/addToFavorites.php:30
 #: ajax/vcategories/removeFromFavorites.php:30
 #, php-format
 msgid "%s ID not provided."
-msgstr "%s ID tidak diberikan."
+msgstr "ID %s tidak diberikan."
 
 #: ajax/vcategories/addToFavorites.php:35
 #, php-format
 msgid "Error adding %s to favorites."
-msgstr "Kesalahan menambah %s ke favorit"
+msgstr "Galat ketika menambah %s ke favorit"
 
 #: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
 msgid "No categories selected for deletion."
-msgstr "Tidak ada kategori terpilih untuk penghapusan."
+msgstr "Tidak ada kategori terpilih untuk dihapus."
 
 #: ajax/vcategories/removeFromFavorites.php:35
 #, php-format
 msgid "Error removing %s from favorites."
-msgstr "Kesalahan menghapus %s dari favorit"
+msgstr "Galat ketika menghapus %s dari favorit"
 
 #: js/config.php:34
 msgid "Sunday"
-msgstr "minggu"
+msgstr "Minggu"
 
 #: js/config.php:35
 msgid "Monday"
-msgstr "senin"
+msgstr "Senin"
 
 #: js/config.php:36
 msgid "Tuesday"
-msgstr "selasa"
+msgstr "Selasa"
 
 #: js/config.php:37
 msgid "Wednesday"
-msgstr "rabu"
+msgstr "Rabu"
 
 #: js/config.php:38
 msgid "Thursday"
-msgstr "kamis"
+msgstr "Kamis"
 
 #: js/config.php:39
 msgid "Friday"
-msgstr "jumat"
+msgstr "Jumat"
 
 #: js/config.php:40
 msgid "Saturday"
-msgstr "sabtu"
+msgstr "Sabtu"
 
 #: js/config.php:45
 msgid "January"
@@ -155,7 +150,7 @@ msgstr "Oktober"
 
 #: js/config.php:55
 msgid "November"
-msgstr "Nopember"
+msgstr "November"
 
 #: js/config.php:56
 msgid "December"
@@ -165,218 +160,220 @@ msgstr "Desember"
 msgid "Settings"
 msgstr "Setelan"
 
-#: js/js.js:777
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "beberapa detik yang lalu"
 
-#: js/js.js:778
+#: js/js.js:719
 msgid "1 minute ago"
-msgstr "1 menit lalu"
+msgstr "1 menit yang lalu"
 
-#: js/js.js:779
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr "{minutes} menit yang lalu"
 
-#: js/js.js:780
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr "1 jam yang lalu"
 
-#: js/js.js:781
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr "{hours} jam yang lalu"
 
-#: js/js.js:782
+#: js/js.js:723
 msgid "today"
 msgstr "hari ini"
 
-#: js/js.js:783
+#: js/js.js:724
 msgid "yesterday"
 msgstr "kemarin"
 
-#: js/js.js:784
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr "{days} hari yang lalu"
 
-#: js/js.js:785
+#: js/js.js:726
 msgid "last month"
 msgstr "bulan kemarin"
 
-#: js/js.js:786
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr "{months} bulan yang lalu"
 
-#: js/js.js:787
+#: js/js.js:728
 msgid "months ago"
 msgstr "beberapa bulan lalu"
 
-#: js/js.js:788
+#: js/js.js:729
 msgid "last year"
 msgstr "tahun kemarin"
 
-#: js/js.js:789
+#: js/js.js:730
 msgid "years ago"
 msgstr "beberapa tahun lalu"
 
-#: js/oc-dialogs.js:126
-msgid "Choose"
-msgstr "pilih"
+#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
+msgid "Ok"
+msgstr "Oke"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
 msgid "Cancel"
-msgstr "Batalkan"
+msgstr "Batal"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "Tidak"
+#: js/oc-dialogs.js:185
+msgid "Choose"
+msgstr "Pilih"
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:215
 msgid "Yes"
 msgstr "Ya"
 
-#: js/oc-dialogs.js:180
-msgid "Ok"
-msgstr "Oke"
+#: js/oc-dialogs.js:222
+msgid "No"
+msgstr "Tidak"
 
 #: 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 "Tipe objek tidak ditentukan."
 
-#: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:582
-#: js/share.js:594
+#: 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 "gagal"
+msgstr "Galat"
 
 #: js/oc-vcategories.js:179
 msgid "The app name is not specified."
-msgstr ""
+msgstr "Nama aplikasi tidak ditentukan."
 
 #: js/oc-vcategories.js:194
 msgid "The required file {file} is not installed!"
-msgstr ""
+msgstr "Berkas {file} yang dibutuhkan tidak terpasang!"
 
-#: js/share.js:29 js/share.js:43 js/share.js:90
+#: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
-msgstr "Terbagi"
+msgstr "Dibagikan"
 
-#: js/share.js:93
+#: js/share.js:90
 msgid "Share"
-msgstr "Bagi"
+msgstr "Bagikan"
 
-#: js/share.js:141 js/share.js:622
+#: js/share.js:125 js/share.js:617
 msgid "Error while sharing"
-msgstr "gagal ketika membagikan"
+msgstr "Galat ketika membagikan"
 
-#: js/share.js:152
+#: js/share.js:136
 msgid "Error while unsharing"
-msgstr "gagal ketika membatalkan pembagian"
+msgstr "Galat ketika membatalkan pembagian"
 
-#: js/share.js:159
+#: js/share.js:143
 msgid "Error while changing permissions"
-msgstr "gagal ketika merubah perijinan"
+msgstr "Galat ketika mengubah izin"
 
-#: js/share.js:168
+#: js/share.js:152
 msgid "Shared with you and the group {group} by {owner}"
-msgstr "dibagikan dengan anda dan grup {group} oleh {owner}"
+msgstr "Dibagikan dengan Anda dan grup {group} oleh {owner}"
 
-#: js/share.js:170
+#: js/share.js:154
 msgid "Shared with you by {owner}"
-msgstr "dibagikan dengan anda oleh {owner}"
+msgstr "Dibagikan dengan Anda oleh {owner}"
 
-#: js/share.js:175
+#: js/share.js:159
 msgid "Share with"
-msgstr "bagikan dengan"
+msgstr "Bagikan dengan"
 
-#: js/share.js:180
+#: js/share.js:164
 msgid "Share with link"
-msgstr "bagikan dengan tautan"
+msgstr "Bagikan lewat tautan"
 
-#: js/share.js:183
+#: js/share.js:167
 msgid "Password protect"
-msgstr "lindungi dengan kata kunci"
+msgstr "Lindungi dengan sandi"
 
-#: js/share.js:185 templates/installation.php:47 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
-msgstr "Password"
+msgstr "Sandi"
 
-#: js/share.js:189
+#: js/share.js:173
 msgid "Email link to person"
-msgstr "Email link ini ke orang"
+msgstr "Emailkan tautan ini ke orang"
 
-#: js/share.js:190
+#: js/share.js:174
 msgid "Send"
 msgstr "Kirim"
 
-#: js/share.js:194
+#: js/share.js:178
 msgid "Set expiration date"
-msgstr "set tanggal kadaluarsa"
+msgstr "Setel tanggal kedaluwarsa"
 
-#: js/share.js:195
+#: js/share.js:179
 msgid "Expiration date"
-msgstr "tanggal kadaluarsa"
+msgstr "Tanggal kedaluwarsa"
 
-#: js/share.js:227
+#: js/share.js:211
 msgid "Share via email:"
-msgstr "berbagi memlalui surel:"
+msgstr "Bagian lewat email:"
 
-#: js/share.js:229
+#: js/share.js:213
 msgid "No people found"
-msgstr "tidak ada orang ditemukan"
+msgstr "Tidak ada orang ditemukan"
 
-#: js/share.js:256
+#: js/share.js:251
 msgid "Resharing is not allowed"
-msgstr "berbagi ulang tidak diperbolehkan"
+msgstr "Berbagi ulang tidak diizinkan"
 
-#: js/share.js:292
+#: js/share.js:287
 msgid "Shared in {item} with {user}"
-msgstr "dibagikan dalam {item} dengan {user}"
+msgstr "Dibagikan dalam {item} dengan {user}"
 
-#: js/share.js:313
+#: js/share.js:308
 msgid "Unshare"
-msgstr "batalkan berbagi"
+msgstr "Batalkan berbagi"
 
-#: js/share.js:325
+#: js/share.js:320
 msgid "can edit"
-msgstr "dapat merubah"
+msgstr "dapat mengedit"
 
-#: js/share.js:327
+#: js/share.js:322
 msgid "access control"
 msgstr "kontrol akses"
 
-#: js/share.js:330
+#: js/share.js:325
 msgid "create"
-msgstr "buat baru"
+msgstr "buat"
 
-#: js/share.js:333
+#: js/share.js:328
 msgid "update"
-msgstr "baharui"
+msgstr "perbarui"
 
-#: js/share.js:336
+#: js/share.js:331
 msgid "delete"
 msgstr "hapus"
 
-#: js/share.js:339
+#: js/share.js:334
 msgid "share"
 msgstr "bagikan"
 
-#: js/share.js:373 js/share.js:569
+#: js/share.js:368 js/share.js:564
 msgid "Password protected"
-msgstr "dilindungi kata kunci"
+msgstr "Dilindungi sandi"
 
-#: js/share.js:582
+#: js/share.js:577
 msgid "Error unsetting expiration date"
-msgstr "gagal melepas tanggal kadaluarsa"
+msgstr "Galat ketika menghapus tanggal kedaluwarsa"
 
-#: js/share.js:594
+#: js/share.js:589
 msgid "Error setting expiration date"
-msgstr "gagal memasang tanggal kadaluarsa"
+msgstr "Galat ketika menyetel tanggal kedaluwarsa"
 
-#: js/share.js:609
+#: js/share.js:604
 msgid "Sending ..."
-msgstr "Sedang mengirim ..."
+msgstr "Mengirim ..."
 
-#: js/share.js:620
+#: js/share.js:615
 msgid "Email sent"
 msgstr "Email terkirim"
 
@@ -385,56 +382,59 @@ 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 "Pembaruan gagal. Silakan laporkan masalah ini ke <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">komunitas ownCloud</a>."
 
 #: js/update.js:18
 msgid "The update was successful. Redirecting you to ownCloud now."
-msgstr "Update sukses. Membawa anda ke ownCloud sekarang."
+msgstr "Pembaruan sukses. Anda akan diarahkan ulang ke ownCloud."
 
 #: lostpassword/controller.php:48
 msgid "ownCloud password reset"
-msgstr "reset password ownCloud"
+msgstr "Setel ulang sandi ownCloud"
 
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
-msgstr "Gunakan tautan berikut untuk mereset password anda: {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 mendapatkan link untuk mereset password anda 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."
+#: 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:41
-#: templates/login.php:28
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: templates/login.php:19
 msgid "Username"
-msgstr "Username"
+msgstr "Nama pengguna"
 
-#: lostpassword/templates/lostpassword.php:14
+#: lostpassword/templates/lostpassword.php:21
 msgid "Request reset"
-msgstr "Meminta reset"
+msgstr "Ajukan penyetelan ulang"
 
 #: lostpassword/templates/resetpassword.php:4
 msgid "Your password was reset"
-msgstr "Password anda telah direset"
+msgstr "Sandi Anda telah disetel ulang"
 
 #: lostpassword/templates/resetpassword.php:5
 msgid "To login page"
-msgstr "Ke halaman login"
+msgstr "Ke halaman masuk"
 
 #: lostpassword/templates/resetpassword.php:8
 msgid "New password"
-msgstr "Password baru"
+msgstr "Sandi baru"
 
 #: lostpassword/templates/resetpassword.php:11
 msgid "Reset password"
-msgstr "Reset password"
+msgstr "Setel ulang sandi"
 
 #: strings.php:5
 msgid "Personal"
@@ -458,7 +458,7 @@ msgstr "Bantuan"
 
 #: templates/403.php:12
 msgid "Access forbidden"
-msgstr "Akses Ditiadakan"
+msgstr "Akses ditolak"
 
 #: templates/404.php:12
 msgid "Cloud not found"
@@ -470,124 +470,138 @@ 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
 msgid "Security Warning"
-msgstr "peringatan keamanan"
+msgstr "Peringatan Keamanan"
 
 #: templates/installation.php:25
+msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
+msgstr "Versi PHP Anda rentan terhadap serangan NULL Byte (CVE-2006-7243)"
+
+#: templates/installation.php:26
+msgid "Please update your PHP installation to use ownCloud securely."
+msgstr "Silakan perbarui instalasi PHP untuk dapat menggunakan ownCloud secara aman."
+
+#: templates/installation.php:32
 msgid ""
 "No secure random number generator is available, please enable the PHP "
 "OpenSSL extension."
-msgstr ""
+msgstr "Generator acak yang aman tidak tersedia, silakan aktifkan ekstensi OpenSSL pada PHP."
 
-#: 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 "tanpa generator angka acak, penyerang mungkin dapat menebak token reset kata kunci dan mengambil alih akun anda."
+msgstr "Tanpa generator acak, penyerang mungkin dapat menebak token penyetelan sandi dan mengambil alih akun Anda."
 
-#: 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 ""
+msgstr "Kemungkinan direktori data dan berkas Anda dapat diakses dari internet karena berkas .htaccess tidak berfungsi."
 
-#: templates/installation.php:33
+#: 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 "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>."
 
-#: templates/installation.php:37
+#: templates/installation.php:44
 msgid "Create an <strong>admin account</strong>"
 msgstr "Buat sebuah <strong>akun admin</strong>"
 
-#: templates/installation.php:55
+#: templates/installation.php:62
 msgid "Advanced"
-msgstr "Tingkat Lanjut"
+msgstr "Lanjutan"
 
-#: templates/installation.php:57
+#: templates/installation.php:64
 msgid "Data folder"
 msgstr "Folder data"
 
-#: templates/installation.php:66
+#: templates/installation.php:74
 msgid "Configure the database"
-msgstr "Konfigurasi database"
+msgstr "Konfigurasikan basis data"
 
-#: templates/installation.php:71 templates/installation.php:83
-#: templates/installation.php:94 templates/installation.php:105
-#: templates/installation.php:117
+#: 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:129
+#: templates/installation.php:137
 msgid "Database user"
-msgstr "Pengguna database"
+msgstr "Pengguna basis data"
 
-#: templates/installation.php:134
+#: templates/installation.php:144
 msgid "Database password"
-msgstr "Password database"
+msgstr "Sandi basis data"
 
-#: templates/installation.php:139
+#: templates/installation.php:149
 msgid "Database name"
-msgstr "Nama database"
+msgstr "Nama basis data"
 
-#: templates/installation.php:149
+#: templates/installation.php:159
 msgid "Database tablespace"
-msgstr "tablespace basis data"
+msgstr "Tablespace basis data"
 
-#: templates/installation.php:156
+#: templates/installation.php:166
 msgid "Database host"
-msgstr "Host database"
+msgstr "Host basis data"
 
-#: templates/installation.php:162
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "Selesaikan instalasi"
 
 #: templates/layout.guest.php:40
 msgid "web services under your control"
-msgstr "web service dibawah kontrol anda"
+msgstr "layanan web dalam kontrol Anda"
+
+#: templates/layout.user.php:36
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr ""
 
-#: templates/layout.user.php:58
+#: templates/layout.user.php:61
 msgid "Log out"
 msgstr "Keluar"
 
-#: templates/login.php:10
+#: templates/login.php:9
 msgid "Automatic logon rejected!"
-msgstr "login otomatis ditolak!"
+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 "apabila anda tidak merubah kata kunci belakangan ini, akun anda dapat di gunakan orang lain!"
+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 kata kunci untuk mengamankan akun anda"
+msgstr "Mohon ubah sandi Anda untuk mengamankan kembali akun Anda."
 
-#: templates/login.php:19
+#: templates/login.php:34
 msgid "Lost your password?"
-msgstr "Lupa password anda?"
+msgstr "Lupa sandi?"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "remember"
-msgstr "selalu login"
+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 "Login dengan cara lain"
+msgstr "Cara Alternatif untuk Masuk"
 
 #: templates/part.pagenavi.php:3
 msgid "prev"
-msgstr "sebelum"
+msgstr "sebelumnya"
 
 #: templates/part.pagenavi.php:20
 msgid "next"
@@ -596,4 +610,4 @@ msgstr "selanjutnya"
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
-msgstr ""
+msgstr "Memperbarui ownCloud ke versi %s, prosesnya akan berlangsung beberapa saat."
diff --git a/l10n/id/files.po b/l10n/id/files.po
index 174bfa27e28a584e5dd41328b00c63b514290ef1..9d29950e69bd986ea27c976935179a9868afaef5 100644
--- a/l10n/id/files.po
+++ b/l10n/id/files.po
@@ -3,15 +3,12 @@
 # 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.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-04 00:06+0100\n"
-"PO-Revision-Date: 2013-03-03 23:06+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -23,20 +20,16 @@ msgstr ""
 #: ajax/move.php:17
 #, php-format
 msgid "Could not move %s - File with this name already exists"
-msgstr ""
+msgstr "Tidak dapat memindahkan %s - Berkas dengan nama ini sudah ada"
 
 #: 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 "Tidak dapat memindahkan %s"
 
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
-msgstr ""
+msgstr "Tidak ada berkas yang diunggah. Galat tidak dikenal."
 
 #: ajax/upload.php:26
 msgid "There is no error, the file uploaded with success"
@@ -45,13 +38,13 @@ msgstr "Tidak ada galat, berkas sukses diunggah"
 #: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
-msgstr ""
+msgstr "Berkas yang diunggah melampaui direktif upload_max_filesize pada php.ini"
 
 #: ajax/upload.php:29
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
-msgstr "File yang diunggah melampaui directive MAX_FILE_SIZE yang disebutan dalam form HTML."
+msgstr "Berkas yang diunggah melampaui direktif MAX_FILE_SIZE yang ditentukan dalam formulir HTML."
 
 #: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
@@ -63,7 +56,7 @@ msgstr "Tidak ada berkas yang diunggah"
 
 #: ajax/upload.php:32
 msgid "Missing a temporary folder"
-msgstr "Kehilangan folder temporer"
+msgstr "Folder sementara tidak ada"
 
 #: ajax/upload.php:33
 msgid "Failed to write to disk"
@@ -71,154 +64,165 @@ msgstr "Gagal menulis ke disk"
 
 #: ajax/upload.php:51
 msgid "Not enough storage available"
-msgstr ""
+msgstr "Ruang penyimpanan tidak mencukupi"
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
-msgstr ""
+msgstr "Direktori tidak valid."
 
-#: appinfo/app.php:10
+#: appinfo/app.php:12
 msgid "Files"
 msgstr "Berkas"
 
-#: js/fileactions.js:125
+#: js/fileactions.js:116
+msgid "Share"
+msgstr "Bagikan"
+
+#: js/fileactions.js:126
 msgid "Delete permanently"
-msgstr ""
+msgstr "Hapus secara permanen"
 
-#: js/fileactions.js:127 templates/index.php:92 templates/index.php:93
+#: 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 ""
+msgstr "Ubah nama"
 
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
-#: js/files.js:439
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "Menunggu"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
-msgstr ""
+msgstr "{new_name} sudah ada"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
-msgstr "mengganti"
+msgstr "ganti"
 
-#: js/filelist.js:251
+#: js/filelist.js:259
 msgid "suggest name"
-msgstr ""
+msgstr "sarankan nama"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "batalkan"
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
-msgstr ""
+msgstr "mengganti {new_name} dengan {old_name}"
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "undo"
-msgstr "batal dikerjakan"
+msgstr "urungkan"
 
-#: js/filelist.js:323
+#: js/filelist.js:331
 msgid "perform delete operation"
-msgstr ""
+msgstr "Lakukan operasi penghapusan"
+
+#: js/filelist.js:413
+msgid "1 file uploading"
+msgstr "1 berkas diunggah"
+
+#: js/filelist.js:416 js/filelist.js:470
+msgid "files uploading"
+msgstr "berkas diunggah"
 
 #: js/files.js:52
 msgid "'.' is an invalid file name."
-msgstr ""
+msgstr "'.' bukan nama berkas yang valid."
 
 #: js/files.js:56
 msgid "File name cannot be empty."
-msgstr ""
+msgstr "Nama berkas tidak boleh kosong."
 
 #: js/files.js:64
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
-msgstr ""
+msgstr "Nama tidak valid, karakter '\\', '/', '<', '>', ':', '\"', '|', '?' dan '*' tidak diizinkan."
 
 #: js/files.js:78
 msgid "Your storage is full, files can not be updated or synced anymore!"
-msgstr ""
+msgstr "Ruang penyimpanan Anda penuh, berkas tidak dapat diperbarui atau disinkronkan lagi!"
 
 #: js/files.js:82
 msgid "Your storage is almost full ({usedSpacePercent}%)"
-msgstr ""
+msgstr "Ruang penyimpanan hampir penuh ({usedSpacePercent}%)"
 
-#: js/files.js:225
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
-msgstr ""
+msgstr "Unduhan Anda sedang disiapkan. Prosesnya dapat berlangsung agak lama jika ukuran berkasnya besar."
 
-#: js/files.js:262
+#: 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 mempunyai ukuran 0 byte"
-
-#: js/files.js:262
-msgid "Upload Error"
-msgstr "Terjadi Galat Pengunggahan"
+msgstr "Gagal mengunggah berkas Anda karena berupa direktori atau mempunyai ukuran 0 byte"
 
-#: js/files.js:273
-msgid "Close"
-msgstr "tutup"
+#: js/files.js:277
+msgid "Not enough space available"
+msgstr "Ruang penyimpanan tidak mencukupi"
 
-#: js/files.js:312
-msgid "1 file uploading"
-msgstr ""
-
-#: js/files.js:315 js/files.js:370 js/files.js:385
-msgid "{count} files uploading"
-msgstr ""
-
-#: js/files.js:388 js/files.js:423
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "Pengunggahan dibatalkan."
 
-#: js/files.js:497
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
-msgstr ""
+msgstr "Berkas sedang diunggah. Meninggalkan halaman ini akan membatalkan proses."
 
-#: js/files.js:570
+#: js/files.js:486
 msgid "URL cannot be empty."
-msgstr "tautan tidak boleh kosong"
+msgstr "URL tidak boleh kosong"
 
-#: js/files.js:575
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr ""
+msgstr "Nama folder salah. Nama 'Shared' telah digunakan oleh Owncloud."
+
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+msgid "Error"
+msgstr "Galat"
 
-#: js/files.js:953 templates/index.php:68
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Nama"
 
-#: js/files.js:954 templates/index.php:79
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Ukuran"
 
-#: js/files.js:955 templates/index.php:81
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Dimodifikasi"
 
-#: js/files.js:974
+#: js/files.js:898
 msgid "1 folder"
-msgstr "1 map"
+msgstr "1 folder"
 
-#: js/files.js:976
+#: js/files.js:900
 msgid "{count} folders"
-msgstr "{count} map"
+msgstr "{count} folder"
 
-#: js/files.js:984
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 berkas"
 
-#: js/files.js:986
+#: 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"
@@ -229,15 +233,15 @@ msgstr "Penanganan berkas"
 
 #: templates/admin.php:7
 msgid "Maximum upload size"
-msgstr "Ukuran unggah maksimum"
+msgstr "Ukuran pengunggahan maksimum"
 
 #: templates/admin.php:10
 msgid "max. possible: "
-msgstr "Kemungkinan maks:"
+msgstr "Kemungkinan maks.:"
 
 #: templates/admin.php:15
 msgid "Needed for multi-file and folder downloads."
-msgstr "Dibutuhkan untuk multi-berkas dan unduhan folder"
+msgstr "Dibutuhkan untuk pengunduhan multi-berkas dan multi-folder"
 
 #: templates/admin.php:17
 msgid "Enable ZIP-download"
@@ -245,15 +249,15 @@ msgstr "Aktifkan unduhan ZIP"
 
 #: templates/admin.php:20
 msgid "0 is unlimited"
-msgstr "0 adalah tidak terbatas"
+msgstr "0 berarti tidak terbatas"
 
 #: templates/admin.php:22
 msgid "Maximum input size for ZIP files"
-msgstr "Ukuran masukan maksimal untuk berkas ZIP"
+msgstr "Ukuran masukan maksimum untuk berkas ZIP"
 
 #: templates/admin.php:26
 msgid "Save"
-msgstr "simpan"
+msgstr "Simpan"
 
 #: templates/index.php:7
 msgid "New"
@@ -269,50 +273,50 @@ msgstr "Folder"
 
 #: templates/index.php:14
 msgid "From link"
-msgstr ""
+msgstr "Dari tautan"
 
-#: templates/index.php:40
+#: templates/index.php:42
 msgid "Deleted files"
-msgstr ""
+msgstr "Berkas yang dihapus"
 
-#: templates/index.php:46
+#: templates/index.php:48
 msgid "Cancel upload"
-msgstr "Batal mengunggah"
+msgstr "Batal pengunggahan"
 
-#: templates/index.php:53
+#: templates/index.php:54
 msgid "You donâ€™t have write permissions here."
-msgstr ""
+msgstr "Anda tidak memiliki izin menulis di sini."
 
-#: templates/index.php:60
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Tidak ada apa-apa di sini. Unggah sesuatu!"
 
-#: templates/index.php:74
+#: templates/index.php:75
 msgid "Download"
 msgstr "Unduh"
 
-#: templates/index.php:86 templates/index.php:87
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
-msgstr "batalkan berbagi"
+msgstr "Batalkan berbagi"
 
-#: templates/index.php:106
+#: templates/index.php:107
 msgid "Upload too large"
-msgstr "Unggahan terlalu besar"
+msgstr "Yang diunggah terlalu besar"
 
-#: templates/index.php:108
+#: 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 anda coba unggah melebihi ukuran maksimum untuk pengunggahan berkas di server ini."
+msgstr "Berkas yang dicoba untuk diunggah melebihi ukuran maksimum pengunggahan berkas di server ini."
 
-#: templates/index.php:113
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
-msgstr "Berkas sedang dipindai, silahkan tunggu."
+msgstr "Berkas sedang dipindai, silakan tunggu."
 
-#: templates/index.php:116
+#: templates/index.php:117
 msgid "Current scanning"
-msgstr "Sedang memindai"
+msgstr "Yang sedang dipindai"
 
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
-msgstr ""
+msgstr "Meningkatkan tembolok sistem berkas..."
diff --git a/l10n/id/files_encryption.po b/l10n/id/files_encryption.po
index 7a7d4d5211df5e0a202e980284398103444cbf08..0bcbac256783fde5fe50042fa7d2a8c9e3697b32 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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_external.po b/l10n/id/files_external.po
index 0e4f7fdfbf5e8c6dfbcb5e6da7c43bc402fffcb9..af35c34bf0fe2b32cf9e32de7bd0864f5afb987a 100644
--- a/l10n/id/files_external.po
+++ b/l10n/id/files_external.po
@@ -3,14 +3,12 @@
 # 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-28 00:04+0100\n"
-"PO-Revision-Date: 2013-02-27 23:04+0000\n"
+"POT-Creation-Date: 2013-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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"
@@ -25,7 +23,7 @@ msgstr "Akses diberikan"
 
 #: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
 msgid "Error configuring Dropbox storage"
-msgstr "Kesalahan dalam mengkonfigurasi penyimpanan Dropbox"
+msgstr "Kesalahan dalam mengonfigurasi penyimpanan Dropbox"
 
 #: js/dropbox.js:65 js/google.js:66
 msgid "Grant access"
@@ -39,30 +37,37 @@ 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: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 "<b>Peringatan:</b> \"smbclient\" tidak terpasang. Mount direktori CIFS/SMB tidak dapat dilakukan. Silakan minta administrator sistem untuk memasangnya."
 
-#: 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 "<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"
 
 #: templates/settings.php:9 templates/settings.php:28
 msgid "Folder name"
-msgstr ""
+msgstr "Nama folder"
 
 #: templates/settings.php:10
 msgid "External storage"
-msgstr ""
+msgstr "Penyimpanan eksternal"
 
 #: templates/settings.php:11
 msgid "Configuration"
@@ -70,7 +75,7 @@ msgstr "Konfigurasi"
 
 #: templates/settings.php:12
 msgid "Options"
-msgstr "Pilihan"
+msgstr "Opsi"
 
 #: templates/settings.php:13
 msgid "Applicable"
@@ -78,7 +83,7 @@ msgstr "Berlaku"
 
 #: templates/settings.php:33
 msgid "Add storage"
-msgstr ""
+msgstr "Tambahkan penyimpanan"
 
 #: templates/settings.php:90
 msgid "None set"
@@ -107,7 +112,7 @@ msgstr "Aktifkan Penyimpanan Eksternal Pengguna"
 
 #: templates/settings.php:130
 msgid "Allow users to mount their own external storage"
-msgstr "Ijinkan pengguna untuk me-mount penyimpanan eksternal mereka"
+msgstr "Izinkan pengguna untuk mengaitkan penyimpanan eksternal mereka"
 
 #: templates/settings.php:141
 msgid "SSL root certificates"
diff --git a/l10n/id/files_sharing.po b/l10n/id/files_sharing.po
index 95854936367c856715936d98e41c0b86c1d183ca..7e044193ad619f5b7db3ee65acc97d52ed233b16 100644
--- a/l10n/id/files_sharing.po
+++ b/l10n/id/files_sharing.po
@@ -3,14 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <mr.pige_ina@yahoo.co.id>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-21 02:03+0200\n"
-"PO-Revision-Date: 2012-10-20 23:29+0000\n"
-"Last-Translator: elmakong <mr.pige_ina@yahoo.co.id>\n"
+"POT-Creation-Date: 2013-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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,30 +19,30 @@ msgstr ""
 
 #: templates/authenticate.php:4
 msgid "Password"
-msgstr "kata kunci"
+msgstr "Sandi"
 
 #: templates/authenticate.php:6
 msgid "Submit"
-msgstr "kirim"
+msgstr "Kirim"
 
-#: templates/public.php:9
+#: templates/public.php:10
 #, php-format
 msgid "%s shared the folder %s with you"
-msgstr "%s membagikan folder %s dengan anda"
+msgstr "%s membagikan folder %s dengan Anda"
 
-#: templates/public.php:11
+#: templates/public.php:13
 #, php-format
 msgid "%s shared the file %s with you"
-msgstr "%s membagikan file %s dengan anda"
+msgstr "%s membagikan file %s dengan Anda"
 
-#: templates/public.php:14 templates/public.php:30
+#: templates/public.php:19 templates/public.php:43
 msgid "Download"
-msgstr "unduh"
+msgstr "Unduh"
 
-#: templates/public.php:29
+#: templates/public.php:40
 msgid "No preview available for"
-msgstr "tidak ada pratinjau tersedia untuk"
+msgstr "Tidak ada pratinjau tersedia untuk"
 
-#: templates/public.php:35
+#: templates/public.php:50
 msgid "web services under your control"
-msgstr "servis web dibawah kendali anda"
+msgstr "layanan web dalam kontrol Anda"
diff --git a/l10n/id/files_trashbin.po b/l10n/id/files_trashbin.po
index 01538027a14ee6ee01e82f9fafca66d596783447..eb5ff111db8d691a97fcf46a2b8e13df4cbef96e 100644
--- a/l10n/id/files_trashbin.po
+++ b/l10n/id/files_trashbin.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# 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-03-08 00:25+0100\n"
-"PO-Revision-Date: 2013-03-07 23:25+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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"
@@ -18,12 +17,12 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/delete.php:40
+#: ajax/delete.php:42
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "Tidak dapat menghapus permanen %s"
 
-#: ajax/undelete.php:41
+#: ajax/undelete.php:42
 #, php-format
 msgid "Couldn't restore %s"
 msgstr "Tidak dapat memulihkan %s"
@@ -32,13 +31,17 @@ msgstr "Tidak dapat memulihkan %s"
 msgid "perform restore operation"
 msgstr "jalankan operasi pemulihan"
 
+#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+msgid "Error"
+msgstr "Galat"
+
 #: js/trash.js:34
 msgid "delete file permanently"
 msgstr "hapus berkas secara permanen"
 
 #: js/trash.js:121
 msgid "Delete permanently"
-msgstr ""
+msgstr "Hapus secara permanen"
 
 #: js/trash.js:174 templates/index.php:17
 msgid "Name"
@@ -50,11 +53,11 @@ msgstr "Dihapus"
 
 #: js/trash.js:184
 msgid "1 folder"
-msgstr "1 map"
+msgstr "1 folder"
 
 #: js/trash.js:186
 msgid "{count} folders"
-msgstr "{count} map"
+msgstr "{count} folder"
 
 #: js/trash.js:194
 msgid "1 file"
@@ -78,4 +81,4 @@ msgstr "Hapus"
 
 #: templates/part.breadcrumb.php:9
 msgid "Deleted Files"
-msgstr ""
+msgstr "Berkas yang Dihapus"
diff --git a/l10n/id/files_versions.po b/l10n/id/files_versions.po
index 395a75c2fba1ba818a28f8179a462968d02f6389..24b9a2f18c9f62a25249df413835a1e6e4fc0431 100644
--- a/l10n/id/files_versions.po
+++ b/l10n/id/files_versions.po
@@ -3,14 +3,12 @@
 # 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-28 00:04+0100\n"
-"PO-Revision-Date: 2013-02-27 23:04+0000\n"
+"POT-Creation-Date: 2013-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:30+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -42,18 +40,18 @@ msgstr "gagal"
 msgid "File %s could not be reverted to version %s"
 msgstr "Berkas %s gagal dikembalikan ke versi %s"
 
-#: history.php:68
+#: history.php:69
 msgid "No old versions available"
 msgstr "Versi lama tidak tersedia"
 
-#: history.php:73
+#: history.php:74
 msgid "No path specified"
 msgstr "Lokasi tidak ditentukan"
 
 #: js/versions.js:6
 msgid "Versions"
-msgstr ""
+msgstr "Versi"
 
 #: templates/history.php:20
 msgid "Revert a file to a previous version by clicking on its revert button"
-msgstr "Kembalikan berkas ke versi sebelumnya dengan mengklik tombol kembalikan"
+msgstr "Kembalikan berkas ke versi sebelumnya dengan mengeklik tombol kembalikan"
diff --git a/l10n/id/lib.po b/l10n/id/lib.po
index 6ef9f41ad6999629dfdd883caff6bfc37d7bf046..88c6934ad62968a37e146a3f4a0f16f61de27a79 100644
--- a/l10n/id/lib.po
+++ b/l10n/id/lib.po
@@ -3,14 +3,12 @@
 # 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.
 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 14:00+0000\n"
+"POT-Creation-Date: 2013-04-28 01:57+0200\n"
+"PO-Revision-Date: 2013-04-27 23:57+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"
@@ -21,59 +19,59 @@ msgstr ""
 
 #: app.php:349
 msgid "Help"
-msgstr "bantu"
+msgstr "Bantuan"
 
 #: app.php:362
 msgid "Personal"
-msgstr "perseorangan"
+msgstr "Pribadi"
 
 #: app.php:373
 msgid "Settings"
-msgstr "pengaturan"
+msgstr "Setelan"
 
 #: app.php:385
 msgid "Users"
-msgstr "pengguna"
+msgstr "Pengguna"
 
 #: app.php:398
 msgid "Apps"
-msgstr "aplikasi"
+msgstr "Aplikasi"
 
 #: app.php:406
 msgid "Admin"
-msgstr "admin"
+msgstr "Admin"
 
-#: files.php:202
+#: files.php:209
 msgid "ZIP download is turned off."
-msgstr "download ZIP sedang dimatikan"
+msgstr "Pengunduhan ZIP dimatikan."
 
-#: files.php:203
+#: files.php:210
 msgid "Files need to be downloaded one by one."
-msgstr "file harus di unduh satu persatu"
+msgstr "Berkas harus diunduh satu persatu."
 
-#: files.php:204 files.php:231
+#: files.php:211 files.php:244
 msgid "Back to Files"
-msgstr "kembali ke daftar file"
+msgstr "Kembali ke Daftar Berkas"
 
-#: files.php:228
+#: files.php:241
 msgid "Selected files too large to generate zip file."
-msgstr "file yang dipilih terlalu besar untuk membuat file zip"
+msgstr "Berkas yang dipilih terlalu besar untuk dibuat berkas zip-nya."
 
 #: helper.php:228
 msgid "couldn't be determined"
-msgstr ""
+msgstr "tidak dapat ditentukan"
 
 #: json.php:28
 msgid "Application is not enabled"
-msgstr "aplikasi tidak diaktifkan"
+msgstr "Aplikasi tidak diaktifkan"
 
 #: json.php:39 json.php:62 json.php:73
 msgid "Authentication error"
-msgstr "autentikasi bermasalah"
+msgstr "Galat saat autentikasi"
 
 #: json.php:51
 msgid "Token expired. Please reload page."
-msgstr "token kadaluarsa.mohon perbaharui laman."
+msgstr "Token kedaluwarsa. Silakan muat ulang halaman."
 
 #: search/provider/file.php:17 search/provider/file.php:35
 msgid "Files"
@@ -81,7 +79,7 @@ msgstr "Berkas"
 
 #: search/provider/file.php:26 search/provider/file.php:33
 msgid "Text"
-msgstr "teks"
+msgstr "Teks"
 
 #: search/provider/file.php:29
 msgid "Images"
@@ -89,105 +87,101 @@ msgstr "Gambar"
 
 #: setup.php:34
 msgid "Set an admin username."
-msgstr ""
+msgstr "Setel nama pengguna admin."
 
 #: setup.php:37
 msgid "Set an admin password."
-msgstr ""
-
-#: setup.php:40
-msgid "Specify a data folder."
-msgstr ""
+msgstr "Setel sandi admin."
 
 #: setup.php:55
 #, php-format
 msgid "%s enter the database username."
-msgstr ""
+msgstr "%s masukkan nama pengguna basis data."
 
 #: setup.php:58
 #, php-format
 msgid "%s enter the database name."
-msgstr ""
+msgstr "%s masukkan nama basis data."
 
 #: setup.php:61
 #, php-format
 msgid "%s you may not use dots in the database name"
-msgstr ""
+msgstr "%sAnda tidak boleh menggunakan karakter titik pada nama basis data"
 
 #: setup.php:64
 #, php-format
 msgid "%s set the database host."
-msgstr ""
+msgstr "%s setel host basis data."
 
-#: setup.php:128 setup.php:320 setup.php:365
+#: setup.php:132 setup.php:325 setup.php:370
 msgid "PostgreSQL username and/or password not valid"
-msgstr ""
+msgstr "Nama pengguna dan/atau sandi PostgreSQL tidak valid"
 
-#: setup.php:129 setup.php:152 setup.php:229
+#: setup.php:133 setup.php:156 setup.php:234
 msgid "You need to enter either an existing account or the administrator."
-msgstr ""
+msgstr "Anda harus memasukkan akun yang sudah ada atau administrator."
 
-#: setup.php:151 setup.php:453 setup.php:520
+#: setup.php:155 setup.php:458 setup.php:525
 msgid "Oracle username and/or password not valid"
-msgstr ""
+msgstr "Nama pengguna dan/atau sandi Oracle tidak valid"
 
-#: setup.php:228
+#: setup.php:233
 msgid "MySQL username and/or password not valid"
-msgstr ""
+msgstr "Nama pengguna dan/atau sandi MySQL tidak valid"
 
-#: 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: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:583 setup.php:592 setup.php:600 setup.php:609
+#: setup.php:615
 #, php-format
 msgid "DB Error: \"%s\""
-msgstr ""
+msgstr "Galat Basis Data: \"%s\""
 
-#: 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:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
+#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
+#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
 #, php-format
 msgid "Offending command was: \"%s\""
-msgstr ""
+msgstr "Perintah yang bermasalah: \"%s\""
 
-#: setup.php:299
+#: setup.php:304
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
-msgstr ""
+msgstr "Pengguna MySQL '%s'@'localhost' sudah ada."
 
-#: setup.php:300
+#: setup.php:305
 msgid "Drop this user from MySQL"
-msgstr ""
+msgstr "Hapus pengguna ini dari MySQL"
 
-#: setup.php:305
+#: setup.php:310
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
-msgstr ""
+msgstr "Pengguna MySQL '%s'@'%%' sudah ada."
 
-#: setup.php:306
+#: setup.php:311
 msgid "Drop this user from MySQL."
-msgstr ""
+msgstr "Hapus pengguna ini dari MySQL."
 
-#: setup.php:579 setup.php:611
+#: setup.php:584 setup.php:616
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
-msgstr ""
+msgstr "Perintah yang bermasalah: \"%s\", nama pengguna: %s, sandi: %s"
 
-#: setup.php:631
+#: setup.php:636
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
-msgstr ""
+msgstr "Nama pengguna dan/atau sandi MySQL tidak valid: %s"
 
-#: setup.php:849
+#: setup.php:858
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
-msgstr ""
+msgstr "Web server Anda belum dikonfigurasikan dengan baik untuk mengizinkan sinkronisasi berkas karena tampaknya antarmuka WebDAV rusak."
 
-#: setup.php:850
+#: setup.php:859
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr ""
+msgstr "Silakan periksa ulang <a href='%s'>panduan instalasi</a>."
 
 #: template.php:113
 msgid "seconds ago"
@@ -195,12 +189,12 @@ msgstr "beberapa detik yang lalu"
 
 #: template.php:114
 msgid "1 minute ago"
-msgstr "1 menit lalu"
+msgstr "1 menit yang lalu"
 
 #: template.php:115
 #, php-format
 msgid "%d minutes ago"
-msgstr "%d menit lalu"
+msgstr "%d menit yang lalu"
 
 #: template.php:116
 msgid "1 hour ago"
@@ -222,7 +216,7 @@ msgstr "kemarin"
 #: template.php:120
 #, php-format
 msgid "%d days ago"
-msgstr "%d hari lalu"
+msgstr "%d hari yang lalu"
 
 #: template.php:121
 msgid "last month"
@@ -241,19 +235,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 "pengecekan pembaharuan sedang non-aktifkan"
-
 #: 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 620961e598f03c85c0a841fe767ca483e82d1d08..e490ada997c02b9fd2fe6b7a11414b5cd2b06a5e 100644
--- a/l10n/id/settings.po
+++ b/l10n/id/settings.po
@@ -3,16 +3,12 @@
 # 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.
 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:35+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -23,48 +19,52 @@ msgstr ""
 
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
-msgstr ""
+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 "autentikasi bermasalah"
+msgstr "Galat saat autentikasi"
 
-#: 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 "Tidak dapat mengubah nama tampilan"
+
 #: ajax/creategroup.php:10
 msgid "Group already exists"
-msgstr ""
+msgstr "Grup sudah ada"
 
 #: ajax/creategroup.php:19
 msgid "Unable to add group"
-msgstr ""
+msgstr "Tidak dapat menambah grup"
 
 #: ajax/enableapp.php:11
 msgid "Could not enable app. "
-msgstr ""
+msgstr "Tidak dapat mengaktifkan aplikasi."
 
 #: ajax/lostpassword.php:12
 msgid "Email saved"
-msgstr "Email tersimpan"
+msgstr "Email disimpan"
 
 #: ajax/lostpassword.php:14
 msgid "Invalid email"
-msgstr "Email tidak sah"
+msgstr "Email tidak valid"
 
 #: ajax/removegroup.php:13
 msgid "Unable to delete group"
-msgstr ""
+msgstr "Tidak dapat menghapus grup"
 
 #: ajax/removeuser.php:24
 msgid "Unable to delete user"
-msgstr ""
+msgstr "Tidak dapat menghapus pengguna"
 
 #: ajax/setlanguage.php:15
 msgid "Language changed"
-msgstr "Bahasa telah diganti"
+msgstr "Bahasa telah diubah"
 
 #: ajax/setlanguage.php:17 ajax/setlanguage.php:20
 msgid "Invalid request"
@@ -72,106 +72,106 @@ msgstr "Permintaan tidak valid"
 
 #: ajax/togglegroups.php:12
 msgid "Admins can't remove themself from the admin group"
-msgstr ""
+msgstr "Admin tidak dapat menghapus dirinya sendiri dari grup admin"
 
 #: ajax/togglegroups.php:30
 #, php-format
 msgid "Unable to add user to group %s"
-msgstr ""
+msgstr "Tidak dapat menambahkan pengguna ke grup %s"
 
 #: ajax/togglegroups.php:36
 #, php-format
 msgid "Unable to remove user from group %s"
-msgstr ""
+msgstr "Tidak dapat menghapus pengguna dari grup %s"
 
 #: ajax/updateapp.php:14
 msgid "Couldn't update app."
-msgstr ""
+msgstr "Tidak dapat memperbarui aplikasi."
 
 #: js/apps.js:30
 msgid "Update to {appversion}"
-msgstr ""
+msgstr "Perbarui ke {appversion}"
 
 #: js/apps.js:36 js/apps.js:76
 msgid "Disable"
-msgstr "NonAktifkan"
+msgstr "Nonaktifkan"
 
-#: js/apps.js:36 js/apps.js:64
+#: 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...."
-msgstr ""
+msgstr "Mohon tunggu...."
 
-#: js/apps.js:84
+#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+msgid "Error"
+msgstr "Galat"
+
+#: js/apps.js:90
 msgid "Updating...."
-msgstr ""
+msgstr "Memperbarui...."
 
-#: js/apps.js:87
+#: js/apps.js:93
 msgid "Error while updating app"
-msgstr ""
+msgstr "Gagal ketika memperbarui aplikasi"
 
-#: js/apps.js:87
-msgid "Error"
-msgstr "kesalahan"
-
-#: js/apps.js:90
+#: js/apps.js:96
 msgid "Updated"
-msgstr ""
+msgstr "Diperbarui"
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr "Menyimpan..."
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "deleted"
 msgstr "dihapus"
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "undo"
-msgstr "batal dikerjakan"
+msgstr "urungkan"
 
-#: js/users.js:62
+#: js/users.js:79
 msgid "Unable to remove user"
-msgstr ""
+msgstr "Tidak dapat menghapus pengguna"
 
-#: js/users.js:75 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
+#: templates/users.php:103
 msgid "Groups"
-msgstr "Group"
+msgstr "Grup"
 
-#: js/users.js:78 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr "Admin Grup"
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "Hapus"
 
-#: js/users.js:191
+#: js/users.js:269
 msgid "add group"
-msgstr ""
+msgstr "tambah grup"
 
-#: js/users.js:352
+#: js/users.js:420
 msgid "A valid username must be provided"
-msgstr ""
+msgstr "Tuliskan nama pengguna yang valid"
 
-#: js/users.js:353 js/users.js:359 js/users.js:374
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
-msgstr ""
+msgstr "Gagal membuat pengguna"
 
-#: js/users.js:358
+#: js/users.js:426
 msgid "A valid password must be provided"
-msgstr ""
+msgstr "Tuliskan sandi yang valid"
 
-#: personal.php:29 personal.php:30
+#: personal.php:35 personal.php:36
 msgid "__language_name__"
 msgstr "__language_name__"
 
 #: templates/admin.php:15
 msgid "Security Warning"
-msgstr "peringatan keamanan"
+msgstr "Peringatan Keamanan"
 
 #: templates/admin.php:18
 msgid ""
@@ -180,36 +180,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 "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."
 
 #: templates/admin.php:29
 msgid "Setup Warning"
-msgstr ""
+msgstr "Peringatan Persiapan"
 
 #: 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 "Web server Anda belum dikonfigurasikan dengan baik untuk mengizinkan sinkronisasi berkas karena tampaknya antarmuka WebDAV rusak."
 
 #: templates/admin.php:33
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr ""
+msgstr "Silakan periksa ulang <a href='%s'>panduan instalasi</a>."
 
 #: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
-msgstr ""
+msgstr "Module 'fileinfo' tidak ada"
 
 #: 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 "Module 'fileinfo' pada PHP tidak ada. Kami sangat menyarankan untuk mengaktifkan modul ini untuk mendapatkan hasil terbaik pada proses pendeteksian mime-type."
 
 #: templates/admin.php:58
 msgid "Locale not working"
-msgstr ""
+msgstr "Kode pelokalan tidak berfungsi"
 
 #: templates/admin.php:63
 #, php-format
@@ -217,11 +217,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 "Server ownCloud ini tidak dapat menyetel kode pelokalan sistem ke nilai %s. Ini berarti mungkin akan terjadi masalah pada karakter tertentu pada nama berkas. Kami sarankan untuk menginstal paket yang dibutuhkan pada sistem Anda untuk mendukung %s."
 
 #: templates/admin.php:75
 msgid "Internet connection not working"
-msgstr ""
+msgstr "Koneksi internet tidak berfungsi"
 
 #: templates/admin.php:78
 msgid ""
@@ -231,100 +231,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 "Server ownCloud ini tidak memiliki koneksi internet yang berfungsi. Artinya, beberapa fitur misalnya mengaitkan penyimpanan eksternal, notifikasi tentang pembaruan, atau instalasi aplikasi dari pihak ketiga tidak akan dapat berfungsi. Pengaksesan berkas secara online dan pengiriman email notifikasi mungkin juga tidak dapat berfungsi. Kami sarankan untuk mengaktifkan koneksi internet server ini agar mendapatkan semua fitur ownCloud."
 
 #: templates/admin.php:92
 msgid "Cron"
-msgstr ""
+msgstr "Cron"
 
 #: templates/admin.php:101
 msgid "Execute one task with each page loaded"
-msgstr ""
+msgstr "Jalankan tugas setiap kali halaman dimuat"
 
 #: 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 telah terdaftar sebagai layanan webcron. Panggil halaman cron.php pada akar direktori ownCloud tiap menit lewat 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 "Gunakan layanan cron sistem. Panggil berkas cron.php pada folder ownCloud lewat cronjob sistem tiap menit."
 
 #: templates/admin.php:128
 msgid "Sharing"
-msgstr ""
+msgstr "Berbagi"
 
 #: templates/admin.php:134
 msgid "Enable Share API"
-msgstr ""
+msgstr "Aktifkan API Pembagian"
 
 #: templates/admin.php:135
 msgid "Allow apps to use the Share API"
-msgstr ""
+msgstr "Izinkan aplikasi untuk menggunakan API Pembagian"
 
 #: templates/admin.php:142
 msgid "Allow links"
-msgstr ""
+msgstr "Izinkan tautan"
 
 #: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
-msgstr ""
+msgstr "Izinkan pengguna untuk berbagi item kepada publik lewat tautan"
 
 #: templates/admin.php:150
 msgid "Allow resharing"
-msgstr ""
+msgstr "Izinkan pembagian ulang"
 
 #: templates/admin.php:151
 msgid "Allow users to share items shared with them again"
-msgstr ""
+msgstr "Izinkan pengguna untuk berbagi kembali item yang dibagikan kepada mereka."
 
 #: templates/admin.php:158
 msgid "Allow users to share with anyone"
-msgstr ""
+msgstr "Izinkan pengguna untuk berbagi kepada siapa saja"
 
 #: templates/admin.php:161
 msgid "Allow users to only share with users in their groups"
-msgstr ""
+msgstr "Hanya izinkan pengguna untuk berbagi dengan pengguna pada grup mereka sendiri"
 
 #: templates/admin.php:168
 msgid "Security"
-msgstr ""
+msgstr "Keamanan"
 
 #: templates/admin.php:181
 msgid "Enforce HTTPS"
-msgstr ""
+msgstr "Selalu Gunakan HTTPS"
 
 #: templates/admin.php:182
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
-msgstr ""
+msgstr "Paksa klien untuk tersambung ke ownCloud lewat koneksi yang dienkripsi."
 
 #: templates/admin.php:185
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
-msgstr ""
+msgstr "Silakan sambungkan ke instalasi ownCloud lewat HTTPS untuk mengaktifkan atau menonaktifkan fitur SSL."
 
 #: templates/admin.php:195
 msgid "Log"
-msgstr ""
+msgstr "Catat"
 
 #: templates/admin.php:196
 msgid "Log level"
-msgstr ""
+msgstr "Level pencatatan"
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
-msgstr "lagi"
+msgstr "Lainnya"
+
+#: templates/admin.php:228
+msgid "Less"
+msgstr "Ciutkan"
 
-#: templates/admin.php:230 templates/personal.php:102
+#: templates/admin.php:235 templates/personal.php:105
 msgid "Version"
-msgstr ""
+msgstr "Versi"
 
-#: templates/admin.php:233 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 "
@@ -332,19 +336,19 @@ 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 "Dikembangkan oleh <a href=\"http://ownCloud.org/contact\" target=\"_blank\">komunitas ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">kode sumber</a> dilisensikan di bawah <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
 #: templates/apps.php:11
 msgid "Add your App"
-msgstr "Tambahkan App anda"
+msgstr "Tambahkan Aplikasi Anda"
 
 #: templates/apps.php:12
 msgid "More Apps"
-msgstr ""
+msgstr "Aplikasi Lainnya"
 
 #: templates/apps.php:28
 msgid "Select an App"
-msgstr "Pilih satu aplikasi"
+msgstr "Pilih Aplikasi"
 
 #: templates/apps.php:34
 msgid "See application page at apps.owncloud.com"
@@ -352,149 +356,137 @@ msgstr "Lihat halaman aplikasi di apps.owncloud.com"
 
 #: templates/apps.php:36
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
-msgstr ""
+msgstr "<span class=\"licence\"></span>-dilisensikan oleh <span class=\"author\"></span>"
 
 #: templates/apps.php:38
 msgid "Update"
-msgstr "Pembaruan"
+msgstr "Perbarui"
 
 #: templates/help.php:4
 msgid "User Documentation"
-msgstr ""
+msgstr "Dokumentasi Pengguna"
 
 #: templates/help.php:6
 msgid "Administrator Documentation"
-msgstr ""
+msgstr "Dokumentasi Administrator"
 
 #: templates/help.php:9
 msgid "Online Documentation"
-msgstr ""
+msgstr "Dokumentasi Online"
 
 #: templates/help.php:11
 msgid "Forum"
-msgstr ""
+msgstr "Forum"
 
 #: templates/help.php:14
 msgid "Bugtracker"
-msgstr ""
+msgstr "Bugtracker"
 
 #: templates/help.php:17
 msgid "Commercial Support"
-msgstr ""
+msgstr "Dukungan Komersial"
 
 #: templates/personal.php:8
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr ""
+msgstr "Anda telah menggunakan <strong>%s</strong> dari total <strong>%s</strong>"
 
 #: templates/personal.php:15
 msgid "Get the apps to sync your files"
-msgstr "Dapatkan aplikasi untuk sinkronisasi berkas anda"
+msgstr "Dapatkan aplikasi untuk sinkronisasi berkas Anda"
 
 #: templates/personal.php:26
 msgid "Show First Run Wizard again"
-msgstr ""
+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:77
 msgid "Password"
-msgstr "Password"
+msgstr "Sandi"
 
 #: templates/personal.php:38
 msgid "Your password was changed"
-msgstr ""
+msgstr "Sandi Anda telah diubah"
 
 #: templates/personal.php:39
 msgid "Unable to change your password"
-msgstr "Tidak dapat merubah password anda"
+msgstr "Gagal mengubah sandi Anda"
 
 #: templates/personal.php:40
 msgid "Current password"
-msgstr "Password saat ini"
+msgstr "Sandi saat ini"
 
 #: templates/personal.php:42
 msgid "New password"
-msgstr "kata kunci baru"
+msgstr "Sandi baru"
 
 #: templates/personal.php:44
 msgid "Change password"
-msgstr "Rubah password"
+msgstr "Ubah sandi"
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:76
 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 "Nama Tampilan"
 
-#: templates/personal.php:70
+#: templates/personal.php:68
 msgid "Email"
 msgstr "Email"
 
-#: templates/personal.php:72
+#: templates/personal.php:70
 msgid "Your email address"
-msgstr "Alamat email anda"
+msgstr "Alamat email Anda"
 
-#: templates/personal.php:73
+#: templates/personal.php:71
 msgid "Fill in an email address to enable password recovery"
-msgstr "Masukkan alamat email untuk mengaktifkan pemulihan password"
+msgstr "Masukkan alamat email untuk mengaktifkan pemulihan sandi"
 
-#: templates/personal.php:79 templates/personal.php:80
+#: templates/personal.php:77 templates/personal.php:78
 msgid "Language"
 msgstr "Bahasa"
 
-#: templates/personal.php:86
+#: templates/personal.php:89
 msgid "Help translate"
 msgstr "Bantu menerjemahkan"
 
-#: templates/personal.php:91
+#: templates/personal.php:94
 msgid "WebDAV"
-msgstr ""
+msgstr "WebDAV"
 
-#: templates/personal.php:93
+#: templates/personal.php:96
 msgid "Use this address to connect to your ownCloud in your file manager"
-msgstr ""
+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:75
 msgid "Login Name"
-msgstr ""
+msgstr "Nama Masuk"
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr "Buat"
 
-#: templates/users.php:35
+#: templates/users.php:33
 msgid "Default Storage"
-msgstr ""
+msgstr "Penyimpanan Baku"
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:39 templates/users.php:133
 msgid "Unlimited"
-msgstr ""
+msgstr "Tak terbatas"
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:57 templates/users.php:148
 msgid "Other"
-msgstr "Lain-lain"
+msgstr "Lainnya"
 
-#: templates/users.php:84
+#: templates/users.php:82
 msgid "Storage"
-msgstr ""
+msgstr "Penyimpanan"
 
-#: templates/users.php:95
+#: templates/users.php:93
 msgid "change display name"
-msgstr ""
+msgstr "ubah nama tampilan"
 
-#: templates/users.php:99
+#: templates/users.php:97
 msgid "set new password"
-msgstr ""
+msgstr "setel sandi baru"
 
-#: templates/users.php:134
+#: templates/users.php:128
 msgid "Default"
-msgstr ""
+msgstr "Baku"
diff --git a/l10n/id/user_ldap.po b/l10n/id/user_ldap.po
index b90a1e9ab08ac3432516c56fc6ffaf8656fd1a4e..339de48adee9cedc79b268516c16cee8bdf7a71a 100644
--- a/l10n/id/user_ldap.po
+++ b/l10n/id/user_ldap.po
@@ -3,14 +3,12 @@
 # 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-03-02 00:03+0100\n"
-"PO-Revision-Date: 2013-03-01 23:04+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -19,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"
@@ -41,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?"
@@ -55,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:18
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr "Tambah Konfigurasi Server"
 
-#: templates/settings.php:23
+#: templates/settings.php:37
 msgid "Host"
-msgstr "host"
+msgstr "Host"
 
-#: templates/settings.php:25
+#: 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:26
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "Base DN"
 
-#: templates/settings.php:27
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr "Satu Base DN per baris"
 
-#: templates/settings.php:28
+#: 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:30
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "User DN"
 
-#: 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 "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:33
+#: templates/settings.php:47
 msgid "Password"
-msgstr "kata kunci"
+msgstr "Sandi"
 
-#: templates/settings.php:36
+#: 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:37
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "gunakan saringan login"
 
-#: 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 "Definisikan filter untuk diterapkan, saat login dilakukan. %%uid menggantikan username saat login."
 
-#: templates/settings.php:41
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "gunakan pengganti %%uid, mis. \"uid=%%uid\""
 
-#: templates/settings.php:42
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Daftar Filter Pengguna"
 
-#: templates/settings.php:45
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Definisikan filter untuk diterapkan saat menerima pengguna."
 
-#: templates/settings.php:46
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "tanpa pengganti apapun, mis. \"objectClass=seseorang\"."
 
-#: templates/settings.php:47
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "saringan grup"
 
-#: templates/settings.php:50
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Definisikan filter untuk diterapkan saat menerima grup."
 
-#: templates/settings.php:51
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "tanpa pengganti apapaun, mis. \"objectClass=posixGroup\"."
 
-#: templates/settings.php:55
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr "Pengaturan Koneksi"
 
-#: templates/settings.php:57
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr "Konfigurasi Aktif"
 
-#: templates/settings.php:57
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr "Jika tidak dicentang, konfigurasi ini dilewati."
 
-#: templates/settings.php:58
+#: templates/settings.php:72
 msgid "Port"
 msgstr "port"
 
-#: templates/settings.php:59
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr "Host Cadangan (Replika)"
 
-#: 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 "Berikan pilihan host cadangan. Harus merupakan replika dari server LDAP/AD utama."
 
-#: templates/settings.php:60
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr "Port Cadangan (Replika)"
 
-#: templates/settings.php:61
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr "Nonaktifkan Server Utama"
 
-#: templates/settings.php:61
+#: 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:62
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "gunakan TLS"
 
-#: templates/settings.php:62
+#: 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:63
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Server LDAP dengan kapitalisasi tidak sensitif (Windows)"
 
-#: templates/settings.php:64
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "matikan validasi sertivikat SSL"
 
-#: 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 "Jika koneksi hanya bekerja dengan opsi ini, impor sertifikat SSL server LDAP dari server ownCloud anda."
 
-#: templates/settings.php:64
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "tidak disarankan, gunakan hanya untuk pengujian."
 
-#: templates/settings.php:65
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
-msgstr ""
+msgstr "Gunakan Tembolok untuk Time-To-Live"
 
-#: templates/settings.php:65
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr "dalam detik. perubahan mengosongkan cache"
 
-#: templates/settings.php:67
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr "Pengaturan Direktori"
 
-#: templates/settings.php:69
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr "Bidang Tampilan Nama Pengguna"
 
-#: templates/settings.php:69
+#: 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:70
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "Pohon Pengguna Dasar"
 
-#: templates/settings.php:70
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr "Satu Pengguna Base DN per baris"
 
-#: templates/settings.php:71
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr "Atribut Pencarian Pengguna"
 
-#: templates/settings.php:71 templates/settings.php:74
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr "Pilihan; satu atribut per baris"
 
-#: templates/settings.php:72
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr "Bidang Tampilan Nama Grup"
 
-#: templates/settings.php:72
+#: 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:73
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "Pohon Grup Dasar"
 
-#: templates/settings.php:73
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr "Satu Grup Base DN per baris"
 
-#: templates/settings.php:74
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr "Atribut Pencarian Grup"
 
-#: templates/settings.php:75
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr "asosiasi Anggota-Grup"
 
-#: templates/settings.php:77
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr "Atribut Khusus"
 
-#: templates/settings.php:79
+#: templates/settings.php:93
 msgid "Quota Field"
-msgstr ""
+msgstr "Bidang Kuota"
 
-#: templates/settings.php:80
+#: templates/settings.php:94
 msgid "Quota Default"
-msgstr ""
+msgstr "Kuota Baku"
 
-#: templates/settings.php:80
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr "dalam bytes"
 
-#: templates/settings.php:81
+#: templates/settings.php:95
 msgid "Email Field"
-msgstr ""
+msgstr "Bidang Email"
 
-#: templates/settings.php:82
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
-msgstr ""
+msgstr "Aturan Penamaan Folder Home Pengguna"
 
-#: templates/settings.php:82
+#: 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:86
-msgid "Test Configuration"
+#: templates/settings.php:101
+msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:86
+#: 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:111
 msgid "Help"
-msgstr "bantuan"
+msgstr "Bantuan"
diff --git a/l10n/id/user_webdavauth.po b/l10n/id/user_webdavauth.po
index 9ae62e5a2cf80d8b8eddc9bf1ef4ee7be4179fe6..89a9bc5bcd3ffcc9fdef3411fd2901768f2c6661 100644
--- a/l10n/id/user_webdavauth.po
+++ b/l10n/id/user_webdavauth.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-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-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/is/core.po b/l10n/is/core.po
index ff58acb1af5065eba0291394dfa631f56bb5bd07..53ede14ddb07def530409bfa9523d71f611c35bd 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-02-22 00:06+0100\n"
-"PO-Revision-Date: 2013-02-20 23:20+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10: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"
@@ -19,24 +17,24 @@ msgstr ""
 "Language: is\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:85
+#: ajax/share.php:97
 #, php-format
 msgid "User %s shared a file with you"
 msgstr "Notandinn %s deildi skrÃ¡ meÃ° Ã¾Ã©r"
 
-#: ajax/share.php:87
+#: ajax/share.php:99
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr "Notandinn %s deildi mÃ¶ppu meÃ° Ã¾Ã©r"
 
-#: ajax/share.php:89
+#: ajax/share.php:101
 #, php-format
 msgid ""
 "User %s shared the file \"%s\" with you. It is available for download here: "
 "%s"
 msgstr "Notandinn %s deildi skrÃ¡nni \"%s\" meÃ° Ã¾Ã©r. HÃ¦gt er aÃ° hlaÃ°a henni niÃ°ur hÃ©r: %s"
 
-#: ajax/share.php:91
+#: ajax/share.php:104
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -82,79 +80,79 @@ msgstr "Enginn flokkur valinn til eyÃ°ingar."
 msgid "Error removing %s from favorites."
 msgstr "Villa viÃ° aÃ° fjarlÃ¦gja %s Ãºr eftirlÃ¦ti."
 
-#: js/config.php:32
+#: js/config.php:34
 msgid "Sunday"
 msgstr "Sunnudagur"
 
-#: js/config.php:32
+#: js/config.php:35
 msgid "Monday"
 msgstr "MÃ¡nudagur"
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Tuesday"
 msgstr "ÃžriÃ°judagur"
 
-#: js/config.php:32
+#: js/config.php:37
 msgid "Wednesday"
 msgstr "MiÃ°vikudagur"
 
-#: js/config.php:32
+#: js/config.php:38
 msgid "Thursday"
 msgstr "Fimmtudagur"
 
-#: js/config.php:32
+#: js/config.php:39
 msgid "Friday"
 msgstr "FÃ¶studagur"
 
-#: js/config.php:32
+#: js/config.php:40
 msgid "Saturday"
 msgstr "Laugardagur"
 
-#: js/config.php:33
+#: js/config.php:45
 msgid "January"
 msgstr "JanÃºar"
 
-#: js/config.php:33
+#: js/config.php:46
 msgid "February"
 msgstr "FebrÃºar"
 
-#: js/config.php:33
+#: js/config.php:47
 msgid "March"
 msgstr "Mars"
 
-#: js/config.php:33
+#: js/config.php:48
 msgid "April"
 msgstr "AprÃl"
 
-#: js/config.php:33
+#: js/config.php:49
 msgid "May"
 msgstr "MaÃ"
 
-#: js/config.php:33
+#: js/config.php:50
 msgid "June"
 msgstr "JÃºnÃ"
 
-#: js/config.php:33
+#: js/config.php:51
 msgid "July"
 msgstr "JÃºlÃ"
 
-#: js/config.php:33
+#: js/config.php:52
 msgid "August"
 msgstr "ÃgÃºst"
 
-#: js/config.php:33
+#: js/config.php:53
 msgid "September"
 msgstr "September"
 
-#: js/config.php:33
+#: js/config.php:54
 msgid "October"
 msgstr "OktÃ³ber"
 
-#: js/config.php:33
+#: js/config.php:55
 msgid "November"
 msgstr "NÃ³vember"
 
-#: js/config.php:33
+#: js/config.php:56
 msgid "December"
 msgstr "Desember"
 
@@ -162,86 +160,88 @@ msgstr "Desember"
 msgid "Settings"
 msgstr "Stillingar"
 
-#: js/js.js:767
+#: js/js.js:718
 msgid "seconds ago"
-msgstr "sek sÃÃ°an"
+msgstr "sek."
 
-#: js/js.js:768
+#: js/js.js:719
 msgid "1 minute ago"
-msgstr "1 min sÃÃ°an"
+msgstr "Fyrir 1 mÃnÃºtu"
 
-#: js/js.js:769
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr "{minutes} min sÃÃ°an"
 
-#: js/js.js:770
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr "Fyrir 1 klst."
 
-#: js/js.js:771
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr "fyrir {hours} klst."
 
-#: js/js.js:772
+#: js/js.js:723
 msgid "today"
 msgstr "Ã dag"
 
-#: js/js.js:773
+#: js/js.js:724
 msgid "yesterday"
 msgstr "Ã gÃ¦r"
 
-#: js/js.js:774
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr "{days} dagar sÃÃ°an"
 
-#: js/js.js:775
+#: js/js.js:726
 msgid "last month"
 msgstr "sÃÃ°asta mÃ¡nuÃ°i"
 
-#: js/js.js:776
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr "fyrir {months} mÃ¡nuÃ°um"
 
-#: js/js.js:777
+#: js/js.js:728
 msgid "months ago"
 msgstr "mÃ¡nuÃ°ir sÃÃ°an"
 
-#: js/js.js:778
+#: js/js.js:729
 msgid "last year"
 msgstr "sÃÃ°asta Ã¡ri"
 
-#: js/js.js:779
+#: js/js.js:730
 msgid "years ago"
-msgstr "Ã¡rum sÃÃ°an"
+msgstr "einhverjum Ã¡rum"
 
-#: js/oc-dialogs.js:126
-msgid "Choose"
-msgstr "Veldu"
+#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
+msgid "Ok"
+msgstr "Ã lagi"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
 msgid "Cancel"
 msgstr "HÃ¦tta viÃ°"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "Nei"
+#: js/oc-dialogs.js:185
+msgid "Choose"
+msgstr "Veldu"
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:215
 msgid "Yes"
 msgstr "JÃ¡"
 
-#: js/oc-dialogs.js:180
-msgid "Ok"
-msgstr "Ã lagi"
+#: js/oc-dialogs.js:222
+msgid "No"
+msgstr "Nei"
 
 #: 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 "Tegund ekki tilgreind"
 
-#: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:582
-#: js/share.js:594
+#: 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 "Villa"
 
@@ -253,127 +253,127 @@ msgstr "Nafn forrits ekki tilgreint"
 msgid "The required file {file} is not installed!"
 msgstr "UmbeÃ°ina skrÃ¡in {file} ekki tiltÃ¦k!"
 
-#: js/share.js:29 js/share.js:43 js/share.js:90
+#: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr ""
 
-#: js/share.js:93
+#: js/share.js:90
 msgid "Share"
 msgstr "Deila"
 
-#: js/share.js:141 js/share.js:622
+#: js/share.js:125 js/share.js:617
 msgid "Error while sharing"
 msgstr "Villa viÃ° deilingu"
 
-#: js/share.js:152
+#: js/share.js:136
 msgid "Error while unsharing"
 msgstr "Villa viÃ° aÃ° hÃ¦tta deilingu"
 
-#: js/share.js:159
+#: js/share.js:143
 msgid "Error while changing permissions"
 msgstr "Villa viÃ° aÃ° breyta aÃ°gangsheimildum"
 
-#: js/share.js:168
+#: js/share.js:152
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Deilt meÃ° Ã¾Ã©r og hÃ³pnum {group} af {owner}"
 
-#: js/share.js:170
+#: js/share.js:154
 msgid "Shared with you by {owner}"
 msgstr "Deilt meÃ° Ã¾Ã©r af {owner}"
 
-#: js/share.js:175
+#: js/share.js:159
 msgid "Share with"
 msgstr "Deila meÃ°"
 
-#: js/share.js:180
+#: js/share.js:164
 msgid "Share with link"
 msgstr "Deila meÃ° veftengli"
 
-#: js/share.js:183
+#: js/share.js:167
 msgid "Password protect"
 msgstr "Verja meÃ° lykilorÃ°i"
 
-#: js/share.js:185 templates/installation.php:44 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "LykilorÃ°"
 
-#: js/share.js:189
+#: js/share.js:173
 msgid "Email link to person"
 msgstr "Senda vefhlekk Ã tÃ¶lvupÃ³stu til notenda"
 
-#: js/share.js:190
+#: js/share.js:174
 msgid "Send"
 msgstr "Senda"
 
-#: js/share.js:194
+#: js/share.js:178
 msgid "Set expiration date"
 msgstr "Setja gildistÃma"
 
-#: js/share.js:195
+#: js/share.js:179
 msgid "Expiration date"
 msgstr "Gildir til"
 
-#: js/share.js:227
+#: js/share.js:211
 msgid "Share via email:"
 msgstr "Deila meÃ° tÃ¶lvupÃ³sti:"
 
-#: js/share.js:229
+#: js/share.js:213
 msgid "No people found"
 msgstr "Engir notendur fundust"
 
-#: js/share.js:256
+#: js/share.js:251
 msgid "Resharing is not allowed"
 msgstr "Endurdeiling er ekki leyfÃ°"
 
-#: js/share.js:292
+#: js/share.js:287
 msgid "Shared in {item} with {user}"
 msgstr "Deilt meÃ° {item} Ã¡samt {user}"
 
-#: js/share.js:313
+#: js/share.js:308
 msgid "Unshare"
 msgstr "HÃ¦tta deilingu"
 
-#: js/share.js:325
+#: js/share.js:320
 msgid "can edit"
 msgstr "getur breytt"
 
-#: js/share.js:327
+#: js/share.js:322
 msgid "access control"
 msgstr "aÃ°gangsstÃ½ring"
 
-#: js/share.js:330
+#: js/share.js:325
 msgid "create"
 msgstr "mynda"
 
-#: js/share.js:333
+#: js/share.js:328
 msgid "update"
 msgstr "uppfÃ¦ra"
 
-#: js/share.js:336
+#: js/share.js:331
 msgid "delete"
 msgstr "eyÃ°a"
 
-#: js/share.js:339
+#: js/share.js:334
 msgid "share"
 msgstr "deila"
 
-#: js/share.js:373 js/share.js:569
+#: js/share.js:368 js/share.js:564
 msgid "Password protected"
 msgstr "Verja meÃ° lykilorÃ°i"
 
-#: js/share.js:582
+#: js/share.js:577
 msgid "Error unsetting expiration date"
 msgstr "Villa viÃ° aÃ° aftengja gildistÃma"
 
-#: js/share.js:594
+#: js/share.js:589
 msgid "Error setting expiration date"
 msgstr "Villa viÃ° aÃ° setja gildistÃma"
 
-#: js/share.js:609
+#: js/share.js:604
 msgid "Sending ..."
 msgstr "Sendi ..."
 
-#: js/share.js:620
+#: js/share.js:615
 msgid "Email sent"
 msgstr "TÃ¶lvupÃ³stur sendur"
 
@@ -396,24 +396,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:39
-#: 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Ã°"
 
@@ -435,7 +438,7 @@ msgstr "Endursetja lykilorÃ°"
 
 #: strings.php:5
 msgid "Personal"
-msgstr "PersÃ³nustillingar"
+msgstr "Um mig"
 
 #: strings.php:6
 msgid "Users"
@@ -447,7 +450,7 @@ msgstr "Forrit"
 
 #: strings.php:8
 msgid "Admin"
-msgstr "VefstjÃ³rn"
+msgstr "StjÃ³rnun"
 
 #: strings.php:9
 msgid "Help"
@@ -467,117 +470,132 @@ msgstr "Breyta flokkum"
 
 #: templates/edit_categories_dialog.php:16
 msgid "Add"
-msgstr "BÃ¦ta"
+msgstr "BÃ¦ta viÃ°"
 
-#: templates/installation.php:23 templates/installation.php:30
+#: templates/installation.php:24 templates/installation.php:31
+#: templates/installation.php:38
 msgid "Security Warning"
 msgstr "Ã–ryggis aÃ°vÃ¶run"
 
-#: 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 "Enginn traustur slembitÃ¶lugjafi Ã boÃ°i, vinsamlegast virkjaÃ°u PHP OpenSSL viÃ°bÃ³tina."
 
-#: templates/installation.php:25
+#: 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 "Ãn Ã¶ruggs slembitÃ¶lugjafa er mÃ¶gulegt aÃ° sjÃ¡ fyrir Ã¶ryggis auÃ°kenni til aÃ° endursetja lykilorÃ° og komast inn Ã¡ aÃ°ganginn Ã¾inn."
 
-#: templates/installation.php:31
+#: 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:32
+#: 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:36
+#: templates/installation.php:44
 msgid "Create an <strong>admin account</strong>"
 msgstr "ÃštbÃºa <strong>vefstjÃ³ra aÃ°gang</strong>"
 
-#: templates/installation.php:52
+#: templates/installation.php:62
 msgid "Advanced"
 msgstr "Ãtarlegt"
 
-#: templates/installation.php:54
+#: templates/installation.php:64
 msgid "Data folder"
 msgstr "Gagnamappa"
 
-#: templates/installation.php:61
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "Stilla gagnagrunn"
 
-#: templates/installation.php:66 templates/installation.php:77
-#: templates/installation.php:87 templates/installation.php:97
+#: 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:109
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "Gagnagrunns notandi"
 
-#: templates/installation.php:113
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "Gagnagrunns lykilorÃ°"
 
-#: templates/installation.php:117
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "Nafn gagnagrunns"
 
-#: templates/installation.php:125
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "TÃ¶flusvÃ¦Ã°i gagnagrunns"
 
-#: templates/installation.php:131
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "NetÃ¾jÃ³nn gagnagrunns"
 
-#: templates/installation.php:136
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "Virkja uppsetningu"
 
-#: templates/layout.guest.php:33
+#: templates/layout.guest.php:40
 msgid "web services under your control"
 msgstr "vefÃ¾jÃ³nusta undir Ã¾inni stjÃ³rn"
 
-#: templates/layout.user.php:48
+#: 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 "Ãš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 147ec127f5ca750c8c6c9e3227cd470b776c980e..c568952bc04f4abb0784b94c05c07b74085c7464 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-03-04 00:06+0100\n"
-"PO-Revision-Date: 2013-03-03 23:06+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10: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"
@@ -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."
@@ -71,59 +66,70 @@ msgstr "TÃ³kst ekki aÃ° skrifa Ã¡ disk"
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr "Ã“gild mappa."
 
-#: appinfo/app.php:10
+#: appinfo/app.php:12
 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:92 templates/index.php:93
+#: 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/files.js:292 js/files.js:408
-#: js/files.js:439
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "BÃÃ°ur"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} er Ã¾egar til"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "yfirskrifa"
 
-#: js/filelist.js:251
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "stinga upp Ã¡ nafni"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "hÃ¦tta viÃ°"
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "yfirskrifaÃ°i {new_name} meÃ° {old_name}"
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "undo"
 msgstr "afturkalla"
 
-#: js/filelist.js:323
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr ""
 
+#: js/filelist.js:413
+msgid "1 file uploading"
+msgstr "1 skrÃ¡ innsend"
+
+#: js/filelist.js:416 js/filelist.js:470
+msgid "files uploading"
+msgstr ""
+
 #: js/files.js:52
 msgid "'.' is an invalid file name."
 msgstr "'.' er ekki leyfilegt nafn."
@@ -146,77 +152,77 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:225
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:262
+#: 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:262
-msgid "Upload Error"
-msgstr "Villa viÃ° innsendingu"
-
-#: js/files.js:273
-msgid "Close"
-msgstr "Loka"
+#: js/files.js:277
+msgid "Not enough space available"
+msgstr "Ekki nÃ¦gt plÃ¡ss tiltÃ¦kt"
 
-#: js/files.js:312
-msgid "1 file uploading"
-msgstr "1 skrÃ¡ innsend"
-
-#: js/files.js:315 js/files.js:370 js/files.js:385
-msgid "{count} files uploading"
-msgstr "{count} skrÃ¡r innsendar"
-
-#: js/files.js:388 js/files.js:423
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "HÃ¦tt viÃ° innsendingu."
 
-#: js/files.js:497
+#: 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:570
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "VefslÃ³Ã° mÃ¡ ekki vera tÃ³m."
 
-#: js/files.js:575
+#: 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:953 templates/index.php:68
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+msgid "Error"
+msgstr "Villa"
+
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Nafn"
 
-#: js/files.js:954 templates/index.php:79
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "StÃ¦rÃ°"
 
-#: js/files.js:955 templates/index.php:81
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Breytt"
 
-#: js/files.js:974
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 mappa"
 
-#: js/files.js:976
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} mÃ¶ppur"
 
-#: js/files.js:984
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 skrÃ¡"
 
-#: js/files.js:986
+#: 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"
@@ -269,45 +275,45 @@ msgstr "Mappa"
 msgid "From link"
 msgstr "Af tengli"
 
-#: templates/index.php:40
+#: templates/index.php:42
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:48
 msgid "Cancel upload"
 msgstr "HÃ¦tta viÃ° innsendingu"
 
-#: templates/index.php:53
+#: templates/index.php:54
 msgid "You donâ€™t have write permissions here."
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Ekkert hÃ©r. Settu eitthvaÃ° inn!"
 
-#: templates/index.php:74
+#: templates/index.php:75
 msgid "Download"
 msgstr "NiÃ°urhal"
 
-#: templates/index.php:86 templates/index.php:87
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "HÃ¦tta deilingu"
 
-#: templates/index.php:106
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "Innsend skrÃ¡ er of stÃ³r"
 
-#: templates/index.php:108
+#: 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:113
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "VeriÃ° er aÃ° skima skrÃ¡r, vinsamlegast hinkraÃ°u."
 
-#: templates/index.php:116
+#: 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..5c70420bc371a85e41c9931a5fa277d6cfba806f 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/is/files_external.po b/l10n/is/files_external.po
index 8f3de2de45ad3ee27309be517c09db2d480d5754..e92632bcfa08959ef74bc8771a839af7c2973bf2 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-01 00:05+0100\n"
-"PO-Revision-Date: 2013-02-27 23:20+0000\n"
+"POT-Creation-Date: 2013-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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: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 "<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: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 "<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..bd919a4af317158dffc6ecdb3c1a600be810547f 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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 be62d3c52aaebff21f83746e94a1665ac769b8af..ceeac18a0944f32368b70de71e769e26cc73f309 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-03-08 00:25+0100\n"
-"PO-Revision-Date: 2013-03-07 23:25+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
 "MIME-Version: 1.0\n"
@@ -17,12 +17,12 @@ msgstr ""
 "Language: is\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:40
+#: ajax/delete.php:42
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
 
-#: ajax/undelete.php:41
+#: ajax/undelete.php:42
 #, php-format
 msgid "Couldn't restore %s"
 msgstr ""
@@ -31,6 +31,10 @@ msgstr ""
 msgid "perform restore operation"
 msgstr ""
 
+#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+msgid "Error"
+msgstr "Villa"
+
 #: js/trash.js:34
 msgid "delete file permanently"
 msgstr ""
diff --git a/l10n/is/files_versions.po b/l10n/is/files_versions.po
index 4159653790a1689f5952bbeb2d01c8f8b6096a3f..0f8c3dd0c344684dddbe16ef039707139bcf4389 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:30+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 83f91466f73e131c6d05be8f684f156b13c94d66..3aa394501c133948790b7c984a26ad9e112f05e2 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-02-27 14:35+0100\n"
-"PO-Revision-Date: 2013-02-27 13:36+0000\n"
+"POT-Creation-Date: 2013-04-28 01:57+0200\n"
+"PO-Revision-Date: 2013-04-27 23:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
 "MIME-Version: 1.0\n"
@@ -42,19 +41,19 @@ msgstr "Forrit"
 msgid "Admin"
 msgstr "StjÃ³rnun"
 
-#: files.php:202
+#: files.php:209
 msgid "ZIP download is turned off."
 msgstr "SlÃ¶kkt Ã¡ ZIP niÃ°urhali."
 
-#: files.php:203
+#: files.php:210
 msgid "Files need to be downloaded one by one."
 msgstr "SkrÃ¡rnar verÃ°ur aÃ° sÃ¦kja eina og eina"
 
-#: files.php:204 files.php:231
+#: files.php:211 files.php:244
 msgid "Back to Files"
 msgstr "Aftur Ã skrÃ¡r"
 
-#: files.php:228
+#: files.php:241
 msgid "Selected files too large to generate zip file."
 msgstr "Valdar skrÃ¡r eru of stÃ³rar til aÃ° bÃºa til ZIP skrÃ¡."
 
@@ -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,72 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:128 setup.php:320 setup.php:365
+#: setup.php:132 setup.php:325 setup.php:370
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:129 setup.php:152 setup.php:229
+#: setup.php:133 setup.php:156 setup.php:234
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:151 setup.php:453 setup.php:520
+#: setup.php:155 setup.php:458 setup.php:525
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:228
+#: setup.php:233
 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: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:583 setup.php:592 setup.php:600 setup.php:609
+#: setup.php:615
 #, 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:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
+#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
+#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:299
+#: setup.php:304
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:300
+#: setup.php:305
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:305
+#: setup.php:310
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:306
+#: setup.php:311
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:579 setup.php:611
+#: setup.php:584 setup.php:616
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:631
+#: setup.php:636
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:849
+#: setup.php:858
 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:859
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
@@ -240,19 +235,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 d4ff8d5ce670ba0128174844f6fd3d2e7189229e..0906807b3c4f87a65d6ce719c3716c83ba5b28ca 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-02-27 14:35+0100\n"
-"PO-Revision-Date: 2013-02-27 13:35+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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 ""
 
@@ -93,7 +96,7 @@ msgstr ""
 msgid "Disable"
 msgstr "Gera Ã³virkt"
 
-#: js/apps.js:36 js/apps.js:64
+#: js/apps.js:36 js/apps.js:64 js/apps.js:83
 msgid "Enable"
 msgstr "Virkja"
 
@@ -101,68 +104,68 @@ msgstr "Virkja"
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:84
+#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+msgid "Error"
+msgstr "Villa"
+
+#: js/apps.js:90
 msgid "Updating...."
 msgstr ""
 
-#: js/apps.js:87
+#: js/apps.js:93
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:87
-msgid "Error"
-msgstr "Villa"
-
-#: js/apps.js:90
+#: js/apps.js:96
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr "Er aÃ° vista ..."
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "deleted"
 msgstr ""
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "undo"
 msgstr "afturkalla"
 
-#: js/users.js:62
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:75 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
+#: templates/users.php:103
 msgid "Groups"
 msgstr "HÃ³par"
 
-#: js/users.js:78 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr "HÃ³pstjÃ³ri"
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "EyÃ°a"
 
-#: js/users.js:191
+#: js/users.js:269
 msgid "add group"
 msgstr ""
 
-#: js/users.js:352
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:353 js/users.js:359 js/users.js:374
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:358
+#: js/users.js:426
 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,15 +316,19 @@ msgstr ""
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
 msgstr "Meira"
 
-#: templates/admin.php:230 templates/personal.php:102
+#: templates/admin.php:228
+msgid "Less"
+msgstr "Minna"
+
+#: templates/admin.php:235 templates/personal.php:105
 msgid "Version"
 msgstr "ÃštgÃ¡fa"
 
-#: templates/admin.php:233 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 "
@@ -392,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:77
 msgid "Password"
 msgstr "LykilorÃ°"
 
@@ -416,82 +423,70 @@ 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:76
 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 "Netfang"
 
-#: templates/personal.php:72
+#: templates/personal.php:70
 msgid "Your email address"
 msgstr "NetfangiÃ° Ã¾itt"
 
-#: templates/personal.php:73
+#: templates/personal.php:71
 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:77 templates/personal.php:78
 msgid "Language"
 msgstr "TungumÃ¡l"
 
-#: templates/personal.php:86
+#: templates/personal.php:89
 msgid "Help translate"
 msgstr "HjÃ¡lpa viÃ° Ã¾Ã½Ã°ingu"
 
-#: templates/personal.php:91
+#: templates/personal.php:94
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:93
+#: templates/personal.php:96
 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:75
 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:33
 msgid "Default Storage"
 msgstr "SjÃ¡lfgefin gagnageymsla"
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:39 templates/users.php:133
 msgid "Unlimited"
 msgstr "Ã“takmarkaÃ°"
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:57 templates/users.php:148
 msgid "Other"
 msgstr "AnnaÃ°"
 
-#: templates/users.php:84
+#: templates/users.php:82
 msgid "Storage"
 msgstr "gagnaplÃ¡ss"
 
-#: templates/users.php:95
+#: templates/users.php:93
 msgid "change display name"
 msgstr ""
 
-#: templates/users.php:99
+#: templates/users.php:97
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:134
+#: templates/users.php:128
 msgid "Default"
 msgstr "SjÃ¡lfgefiÃ°"
diff --git a/l10n/is/user_ldap.po b/l10n/is/user_ldap.po
index 7b8cfc519cd1bcb875204d5d5c5c43e67485f809..ee1bb681f85330b941fae9817cc7d6329e5d0129 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-02 00:03+0100\n"
-"PO-Revision-Date: 2013-03-01 23:04+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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:18
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:37
 msgid "Host"
 msgstr "NetÃ¾jÃ³nn"
 
-#: 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 "LykilorÃ°"
 
-#: 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 "HjÃ¡lp"
diff --git a/l10n/is/user_webdavauth.po b/l10n/is/user_webdavauth.po
index 8bf055721845f4840753adee06f1cab83c2cae5d..66194d2dae2979baf2a34eef6fab1e8ac0c283c7 100644
--- a/l10n/is/user_webdavauth.po
+++ b/l10n/is/user_webdavauth.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
 "MIME-Version: 1.0\n"
@@ -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 e1bca79ae849a921d27e28adb3406f19c19a275e..df7f35c828ff801d7ae531822ccc5c0252fec767 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-02-22 00:06+0100\n"
-"PO-Revision-Date: 2013-02-20 23:20+0000\n"
+"POT-Creation-Date: 2013-05-20 02:01+0200\n"
+"PO-Revision-Date: 2013-05-19 09:22+0000\n"
 "Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
@@ -23,24 +18,24 @@ msgstr ""
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:85
+#: ajax/share.php:97
 #, php-format
 msgid "User %s shared a file with you"
 msgstr "L'utente %s ha condiviso un file con te"
 
-#: ajax/share.php:87
+#: ajax/share.php:99
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr "L'utente %s ha condiviso una cartella con te"
 
-#: ajax/share.php:89
+#: ajax/share.php:101
 #, php-format
 msgid ""
 "User %s shared the file \"%s\" with you. It is available for download here: "
 "%s"
 msgstr "L'utente %s ha condiviso il file \"%s\" con te. Ãˆ disponibile per lo scaricamento qui: %s"
 
-#: ajax/share.php:91
+#: ajax/share.php:104
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -86,79 +81,79 @@ msgstr "Nessuna categoria selezionata per l'eliminazione."
 msgid "Error removing %s from favorites."
 msgstr "Errore durante la rimozione di %s dai preferiti."
 
-#: js/config.php:32
+#: js/config.php:34
 msgid "Sunday"
 msgstr "Domenica"
 
-#: js/config.php:32
+#: js/config.php:35
 msgid "Monday"
 msgstr "LunedÃ¬"
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Tuesday"
 msgstr "MartedÃ¬"
 
-#: js/config.php:32
+#: js/config.php:37
 msgid "Wednesday"
 msgstr "MercoledÃ¬"
 
-#: js/config.php:32
+#: js/config.php:38
 msgid "Thursday"
 msgstr "GiovedÃ¬"
 
-#: js/config.php:32
+#: js/config.php:39
 msgid "Friday"
 msgstr "VenerdÃ¬"
 
-#: js/config.php:32
+#: js/config.php:40
 msgid "Saturday"
 msgstr "Sabato"
 
-#: js/config.php:33
+#: js/config.php:45
 msgid "January"
 msgstr "Gennaio"
 
-#: js/config.php:33
+#: js/config.php:46
 msgid "February"
 msgstr "Febbraio"
 
-#: js/config.php:33
+#: js/config.php:47
 msgid "March"
 msgstr "Marzo"
 
-#: js/config.php:33
+#: js/config.php:48
 msgid "April"
 msgstr "Aprile"
 
-#: js/config.php:33
+#: js/config.php:49
 msgid "May"
 msgstr "Maggio"
 
-#: js/config.php:33
+#: js/config.php:50
 msgid "June"
 msgstr "Giugno"
 
-#: js/config.php:33
+#: js/config.php:51
 msgid "July"
 msgstr "Luglio"
 
-#: js/config.php:33
+#: js/config.php:52
 msgid "August"
 msgstr "Agosto"
 
-#: js/config.php:33
+#: js/config.php:53
 msgid "September"
 msgstr "Settembre"
 
-#: js/config.php:33
+#: js/config.php:54
 msgid "October"
 msgstr "Ottobre"
 
-#: js/config.php:33
+#: js/config.php:55
 msgid "November"
 msgstr "Novembre"
 
-#: js/config.php:33
+#: js/config.php:56
 msgid "December"
 msgstr "Dicembre"
 
@@ -166,86 +161,88 @@ msgstr "Dicembre"
 msgid "Settings"
 msgstr "Impostazioni"
 
-#: js/js.js:767
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "secondi fa"
 
-#: js/js.js:768
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "Un minuto fa"
 
-#: js/js.js:769
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr "{minutes} minuti fa"
 
-#: js/js.js:770
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr "1 ora fa"
 
-#: js/js.js:771
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr "{hours} ore fa"
 
-#: js/js.js:772
+#: js/js.js:723
 msgid "today"
 msgstr "oggi"
 
-#: js/js.js:773
+#: js/js.js:724
 msgid "yesterday"
 msgstr "ieri"
 
-#: js/js.js:774
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr "{days} giorni fa"
 
-#: js/js.js:775
+#: js/js.js:726
 msgid "last month"
 msgstr "mese scorso"
 
-#: js/js.js:776
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr "{months} mesi fa"
 
-#: js/js.js:777
+#: js/js.js:728
 msgid "months ago"
 msgstr "mesi fa"
 
-#: js/js.js:778
+#: js/js.js:729
 msgid "last year"
 msgstr "anno scorso"
 
-#: js/js.js:779
+#: js/js.js:730
 msgid "years ago"
 msgstr "anni fa"
 
-#: js/oc-dialogs.js:126
-msgid "Choose"
-msgstr "Scegli"
+#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
+msgid "Ok"
+msgstr "Ok"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
 msgid "Cancel"
 msgstr "Annulla"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "No"
+#: js/oc-dialogs.js:185
+msgid "Choose"
+msgstr "Scegli"
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:215
 msgid "Yes"
 msgstr "SÃ¬"
 
-#: js/oc-dialogs.js:180
-msgid "Ok"
-msgstr "Ok"
+#: js/oc-dialogs.js:222
+msgid "No"
+msgstr "No"
 
 #: 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 "Il tipo di oggetto non Ã¨ specificato."
 
-#: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:582
-#: js/share.js:594
+#: 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 "Errore"
 
@@ -257,127 +254,127 @@ msgstr "Il nome dell'applicazione non Ã¨ specificato."
 msgid "The required file {file} is not installed!"
 msgstr "Il file richiesto {file} non Ã¨ installato!"
 
-#: js/share.js:29 js/share.js:43 js/share.js:90
+#: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr "Condivisi"
 
-#: js/share.js:93
+#: js/share.js:90
 msgid "Share"
 msgstr "Condividi"
 
-#: js/share.js:141 js/share.js:622
+#: js/share.js:125 js/share.js:617
 msgid "Error while sharing"
 msgstr "Errore durante la condivisione"
 
-#: js/share.js:152
+#: js/share.js:136
 msgid "Error while unsharing"
 msgstr "Errore durante la rimozione della condivisione"
 
-#: js/share.js:159
+#: js/share.js:143
 msgid "Error while changing permissions"
 msgstr "Errore durante la modifica dei permessi"
 
-#: js/share.js:168
+#: js/share.js:152
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Condiviso con te e con il gruppo {group} da {owner}"
 
-#: js/share.js:170
+#: js/share.js:154
 msgid "Shared with you by {owner}"
 msgstr "Condiviso con te da {owner}"
 
-#: js/share.js:175
+#: js/share.js:159
 msgid "Share with"
 msgstr "Condividi con"
 
-#: js/share.js:180
+#: js/share.js:164
 msgid "Share with link"
 msgstr "Condividi con collegamento"
 
-#: js/share.js:183
+#: js/share.js:167
 msgid "Password protect"
 msgstr "Proteggi con password"
 
-#: js/share.js:185 templates/installation.php:44 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Password"
 
-#: js/share.js:189
+#: js/share.js:173
 msgid "Email link to person"
 msgstr "Invia collegamento via email"
 
-#: js/share.js:190
+#: js/share.js:174
 msgid "Send"
 msgstr "Invia"
 
-#: js/share.js:194
+#: js/share.js:178
 msgid "Set expiration date"
 msgstr "Imposta data di scadenza"
 
-#: js/share.js:195
+#: js/share.js:179
 msgid "Expiration date"
 msgstr "Data di scadenza"
 
-#: js/share.js:227
+#: js/share.js:211
 msgid "Share via email:"
 msgstr "Condividi tramite email:"
 
-#: js/share.js:229
+#: js/share.js:213
 msgid "No people found"
 msgstr "Non sono state trovate altre persone"
 
-#: js/share.js:256
+#: js/share.js:251
 msgid "Resharing is not allowed"
 msgstr "La ri-condivisione non Ã¨ consentita"
 
-#: js/share.js:292
+#: js/share.js:287
 msgid "Shared in {item} with {user}"
 msgstr "Condiviso in {item} con {user}"
 
-#: js/share.js:313
+#: js/share.js:308
 msgid "Unshare"
 msgstr "Rimuovi condivisione"
 
-#: js/share.js:325
+#: js/share.js:320
 msgid "can edit"
 msgstr "puÃ² modificare"
 
-#: js/share.js:327
+#: js/share.js:322
 msgid "access control"
 msgstr "controllo d'accesso"
 
-#: js/share.js:330
+#: js/share.js:325
 msgid "create"
 msgstr "creare"
 
-#: js/share.js:333
+#: js/share.js:328
 msgid "update"
 msgstr "aggiornare"
 
-#: js/share.js:336
+#: js/share.js:331
 msgid "delete"
-msgstr "eliminare"
+msgstr "elimina"
 
-#: js/share.js:339
+#: js/share.js:334
 msgid "share"
-msgstr "condividere"
+msgstr "condividi"
 
-#: js/share.js:373 js/share.js:569
+#: js/share.js:368 js/share.js:564
 msgid "Password protected"
 msgstr "Protetta da password"
 
-#: js/share.js:582
+#: js/share.js:577
 msgid "Error unsetting expiration date"
 msgstr "Errore durante la rimozione della data di scadenza"
 
-#: js/share.js:594
+#: js/share.js:589
 msgid "Error setting expiration date"
 msgstr "Errore durante l'impostazione della data di scadenza"
 
-#: js/share.js:609
+#: js/share.js:604
 msgid "Sending ..."
 msgstr "Invio in corso..."
 
-#: js/share.js:620
+#: js/share.js:615
 msgid "Email sent"
 msgstr "Messaggio inviato"
 
@@ -400,24 +397,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:39
-#: 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"
 
@@ -467,121 +467,136 @@ 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"
 msgstr "Aggiungi"
 
-#: templates/installation.php:23 templates/installation.php:30
+#: templates/installation.php:24 templates/installation.php:31
+#: templates/installation.php:38
 msgid "Security Warning"
 msgstr "Avviso di sicurezza"
 
-#: templates/installation.php:24
+#: templates/installation.php:25
+msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
+msgstr "La tua versione di PHP Ã¨ vulnerabile all'attacco NULL Byte (CVE-2006-7243)"
+
+#: templates/installation.php:26
+msgid "Please update your PHP installation to use ownCloud securely."
+msgstr "Aggiorna la tua installazione di PHP per utilizzare ownCloud in modo sicuro."
+
+#: templates/installation.php:32
 msgid ""
 "No secure random number generator is available, please enable the PHP "
 "OpenSSL extension."
 msgstr "Non Ã¨ disponibile alcun generatore di numeri casuali sicuro. Abilita l'estensione OpenSSL di PHP"
 
-#: templates/installation.php:25
+#: 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 "Senza un generatore di numeri casuali sicuro, un malintenzionato potrebbe riuscire a individuare i token di ripristino delle password e impossessarsi del tuo account."
 
-#: templates/installation.php:31
+#: templates/installation.php:39
 msgid ""
 "Your data directory and files are probably accessible from the internet "
 "because the .htaccess file does not work."
 msgstr "La cartella dei dati e i file sono probabilmente accessibili da Internet poichÃ© il file .htaccess non funziona."
 
-#: templates/installation.php:32
+#: 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 "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>."
 
-#: templates/installation.php:36
+#: templates/installation.php:44
 msgid "Create an <strong>admin account</strong>"
 msgstr "Crea un <strong>account amministratore</strong>"
 
-#: templates/installation.php:52
+#: templates/installation.php:62
 msgid "Advanced"
-msgstr "Avanzate"
+msgstr "Avanzat"
 
-#: templates/installation.php:54
+#: templates/installation.php:64
 msgid "Data folder"
 msgstr "Cartella dati"
 
-#: templates/installation.php:61
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "Configura il database"
 
-#: templates/installation.php:66 templates/installation.php:77
-#: templates/installation.php:87 templates/installation.php:97
+#: 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:109
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "Utente del database"
 
-#: templates/installation.php:113
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "Password del database"
 
-#: templates/installation.php:117
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "Nome del database"
 
-#: templates/installation.php:125
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "Spazio delle tabelle del database"
 
-#: templates/installation.php:131
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "Host del database"
 
-#: templates/installation.php:136
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "Termina la configurazione"
 
-#: templates/layout.guest.php:33
+#: templates/layout.guest.php:40
 msgid "web services under your control"
 msgstr "servizi web nelle tue mani"
 
-#: templates/layout.user.php:48
+#: templates/layout.user.php:36
+#, 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:61
 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 ede7635d207addc25a06937d5977cc4a1a2a450b..4245330eb175eb70f0ae52171024d026309a4a8a 100644
--- a/l10n/it/files.po
+++ b/l10n/it/files.po
@@ -3,17 +3,14 @@
 # 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-03-04 00:06+0100\n"
-"PO-Revision-Date: 2013-03-03 23:06+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-20 02:01+0200\n"
+"PO-Revision-Date: 2013-05-19 09:23+0000\n"
+"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\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"
@@ -74,59 +67,70 @@ msgstr "Scrittura su disco non riuscita"
 msgid "Not enough storage available"
 msgstr "Spazio di archiviazione insufficiente"
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr "Cartella non valida."
 
-#: appinfo/app.php:10
+#: appinfo/app.php:12
 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:92 templates/index.php:93
+#: 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/files.js:292 js/files.js:408
-#: js/files.js:439
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "In corso"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} esiste giÃ "
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "sostituisci"
 
-#: js/filelist.js:251
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "suggerisci nome"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "annulla"
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "sostituito {new_name} con {old_name}"
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "undo"
 msgstr "annulla"
 
-#: js/filelist.js:323
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr "esegui l'operazione di eliminazione"
 
+#: js/filelist.js:413
+msgid "1 file uploading"
+msgstr "1 file in fase di caricamento"
+
+#: js/filelist.js:416 js/filelist.js:470
+msgid "files uploading"
+msgstr "caricamento file"
+
 #: js/files.js:52
 msgid "'.' is an invalid file name."
 msgstr "'.' non Ã¨ un nome file valido."
@@ -149,77 +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:225
+#: 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:262
+#: 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"
-
-#: js/files.js:262
-msgid "Upload Error"
-msgstr "Errore di invio"
+msgstr "Impossibile caricare il file poichÃ© Ã¨ una cartella o ha una dimensione di 0 byte"
 
-#: js/files.js:273
-msgid "Close"
-msgstr "Chiudi"
+#: js/files.js:277
+msgid "Not enough space available"
+msgstr "Spazio disponibile insufficiente"
 
-#: js/files.js:312
-msgid "1 file uploading"
-msgstr "1 file in fase di caricamento"
-
-#: js/files.js:315 js/files.js:370 js/files.js:385
-msgid "{count} files uploading"
-msgstr "{count} file in fase di caricamentoe"
-
-#: js/files.js:388 js/files.js:423
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "Invio annullato"
 
-#: js/files.js:497
+#: 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:570
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "L'URL non puÃ² essere vuoto."
 
-#: js/files.js:575
+#: 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:953 templates/index.php:68
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+msgid "Error"
+msgstr "Errore"
+
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Nome"
 
-#: js/files.js:954 templates/index.php:79
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Dimensione"
 
-#: js/files.js:955 templates/index.php:81
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Modificato"
 
-#: js/files.js:974
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 cartella"
 
-#: js/files.js:976
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} cartelle"
 
-#: js/files.js:984
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 file"
 
-#: js/files.js:986
+#: 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"
@@ -272,45 +276,45 @@ msgstr "Cartella"
 msgid "From link"
 msgstr "Da collegamento"
 
-#: templates/index.php:40
+#: templates/index.php:42
 msgid "Deleted files"
 msgstr "File eliminati"
 
-#: templates/index.php:46
+#: templates/index.php:48
 msgid "Cancel upload"
 msgstr "Annulla invio"
 
-#: templates/index.php:53
+#: templates/index.php:54
 msgid "You donâ€™t have write permissions here."
 msgstr "Qui non hai i permessi di scrittura."
 
-#: templates/index.php:60
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Non c'Ã¨ niente qui. Carica qualcosa!"
 
-#: templates/index.php:74
+#: templates/index.php:75
 msgid "Download"
 msgstr "Scarica"
 
-#: templates/index.php:86 templates/index.php:87
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Rimuovi condivisione"
 
-#: templates/index.php:106
+#: templates/index.php:107
 msgid "Upload too large"
-msgstr "Il file caricato Ã¨ troppo grande"
+msgstr "Caricamento troppo grande"
 
-#: templates/index.php:108
+#: 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:113
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Scansione dei file in corso, attendi"
 
-#: templates/index.php:116
+#: 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..7fa5301fd908abfeade81041a58233c6890e7bce 100644
--- a/l10n/it/files_encryption.po
+++ b/l10n/it/files_encryption.po
@@ -3,14 +3,13 @@
 # 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-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-20 02:01+0200\n"
+"PO-Revision-Date: 2013-05-19 09:23+0000\n"
+"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -36,4 +35,4 @@ msgstr "Escludi i seguenti tipi di file dalla cifratura:"
 
 #: templates/settings.php:12
 msgid "None"
-msgstr "Nessuna"
+msgstr "Nessuno"
diff --git a/l10n/it/files_external.po b/l10n/it/files_external.po
index 496c15e1d7a314ee6f15a3135612f7e7454bd679..14033bcc2c3a1e0859c71290b8581efd84265eb0 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-01 00:05+0100\n"
-"PO-Revision-Date: 2013-02-27 23:30+0000\n"
+"POT-Creation-Date: 2013-05-20 02:01+0200\n"
+"PO-Revision-Date: 2013-05-19 09:23+0000\n"
 "Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
@@ -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: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 "<b>Avviso:</b> \"smbclient\" non Ã¨ installato. Impossibile montare condivisioni CIFS/SMB. Chiedi all'amministratore di sistema di installarlo."
 
-#: 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 "<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..3e03f7b349ecc025fa1c3be1e936d51f9ea1c4a1 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-05-20 02:01+0200\n"
+"PO-Revision-Date: 2013-05-19 09:24+0000\n"
 "Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
@@ -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 b2baa9ac7adf283bb92c4f18594374b8c0e0794b..3091e2a39fc576f9a95044fb043af2aa1849f92c 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-03-08 00:25+0100\n"
-"PO-Revision-Date: 2013-03-07 23:25+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-20 02:01+0200\n"
+"PO-Revision-Date: 2013-05-19 09:24+0000\n"
+"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,12 +17,12 @@ msgstr ""
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:40
+#: ajax/delete.php:42
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "Impossibile eliminare %s definitivamente"
 
-#: ajax/undelete.php:41
+#: ajax/undelete.php:42
 #, php-format
 msgid "Couldn't restore %s"
 msgstr "Impossibile ripristinare %s"
@@ -32,6 +31,10 @@ msgstr "Impossibile ripristinare %s"
 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
+msgid "Error"
+msgstr "Errore"
+
 #: js/trash.js:34
 msgid "delete file permanently"
 msgstr "elimina il file definitivamente"
@@ -78,4 +81,4 @@ msgstr "Elimina"
 
 #: templates/part.breadcrumb.php:9
 msgid "Deleted Files"
-msgstr ""
+msgstr "File eliminati"
diff --git a/l10n/it/files_versions.po b/l10n/it/files_versions.po
index 57ca778df641b10a395267484c54c91dc8b0b865..51be74320b20a4e169c375dd94ff98aeeb0032a9 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-20 02:01+0200\n"
+"PO-Revision-Date: 2013-05-19 09:24+0000\n"
 "Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
@@ -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 696ca92b12132883c3e5842e0d6c0ebc6c1b4aa2..cebca82b595b7422841283d2b31ecdd02e268e56 100644
--- a/l10n/it/lib.po
+++ b/l10n/it/lib.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-02-28 00:04+0100\n"
-"PO-Revision-Date: 2013-02-27 13:51+0000\n"
+"POT-Creation-Date: 2013-05-20 02:03+0200\n"
+"PO-Revision-Date: 2013-05-19 09:23+0000\n"
 "Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
@@ -42,19 +41,19 @@ msgstr "Applicazioni"
 msgid "Admin"
 msgstr "Admin"
 
-#: files.php:202
+#: files.php:207
 msgid "ZIP download is turned off."
 msgstr "Lo scaricamento in formato ZIP Ã¨ stato disabilitato."
 
-#: files.php:203
+#: files.php:208
 msgid "Files need to be downloaded one by one."
 msgstr "I file devono essere scaricati uno alla volta."
 
-#: files.php:204 files.php:231
+#: files.php:209 files.php:242
 msgid "Back to Files"
 msgstr "Torna ai file"
 
-#: files.php:228
+#: files.php:239
 msgid "Selected files too large to generate zip file."
 msgstr "I  file selezionati sono troppo grandi per generare un file zip."
 
@@ -94,10 +93,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 +113,72 @@ 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:128 setup.php:320 setup.php:365
+#: setup.php:132 setup.php:325 setup.php:370
 msgid "PostgreSQL username and/or password not valid"
 msgstr "Nome utente e/o password di PostgreSQL non validi"
 
-#: setup.php:129 setup.php:152 setup.php:229
+#: setup.php:133 setup.php:156 setup.php:234
 msgid "You need to enter either an existing account or the administrator."
 msgstr "Ãˆ necessario inserire un account esistente o l'amministratore."
 
-#: setup.php:151 setup.php:453 setup.php:520
+#: setup.php:155 setup.php:458 setup.php:525
 msgid "Oracle username and/or password not valid"
 msgstr "Nome utente e/o password di Oracle non validi"
 
-#: setup.php:228
+#: setup.php:233
 msgid "MySQL username and/or password not valid"
 msgstr "Nome utente e/o password di MySQL non validi"
 
-#: 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: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:583 setup.php:592 setup.php:600 setup.php:609
+#: setup.php:615
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Errore DB: \"%s\""
 
-#: 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:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
+#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
+#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "Il comando non consentito era: \"%s\""
 
-#: setup.php:299
+#: setup.php:304
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "L'utente MySQL '%s'@'localhost' esiste giÃ ."
 
-#: setup.php:300
+#: setup.php:305
 msgid "Drop this user from MySQL"
 msgstr "Elimina questo utente da MySQL"
 
-#: setup.php:305
+#: setup.php:310
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "L'utente MySQL '%s'@'%%' esiste giÃ "
 
-#: setup.php:306
+#: setup.php:311
 msgid "Drop this user from MySQL."
 msgstr "Elimina questo utente da MySQL."
 
-#: setup.php:579 setup.php:611
+#: setup.php:584 setup.php:616
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Il comando non consentito era: \"%s\", nome: %s, password: %s"
 
-#: setup.php:631
+#: setup.php:636
 #, 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:849
+#: setup.php:859
 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:850
+#: setup.php:860
 #, 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 +189,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 +220,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 +229,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 07407feff948f1588d45945aaa58977390d23526..ca626d4fa3ddcd4e03140dbef54c34c1e6f26abb 100644
--- a/l10n/it/settings.po
+++ b/l10n/it/settings.po
@@ -3,19 +3,13 @@
 # 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-02-28 00:04+0100\n"
-"PO-Revision-Date: 2013-02-27 13:51+0000\n"
+"POT-Creation-Date: 2013-05-20 02:05+0200\n"
+"PO-Revision-Date: 2013-05-19 09:23+0000\n"
 "Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
@@ -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"
 
@@ -99,7 +97,7 @@ msgstr "Aggiorna a {appversion}"
 msgid "Disable"
 msgstr "Disabilita"
 
-#: js/apps.js:36 js/apps.js:64
+#: js/apps.js:36 js/apps.js:64 js/apps.js:83
 msgid "Enable"
 msgstr "Abilita"
 
@@ -107,68 +105,68 @@ msgstr "Abilita"
 msgid "Please wait...."
 msgstr "Attendere..."
 
-#: js/apps.js:84
+#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+msgid "Error"
+msgstr "Errore"
+
+#: js/apps.js:90
 msgid "Updating...."
 msgstr "Aggiornamento in corso..."
 
-#: js/apps.js:87
+#: js/apps.js:93
 msgid "Error while updating app"
 msgstr "Errore durante l'aggiornamento"
 
-#: js/apps.js:87
-msgid "Error"
-msgstr "Errore"
-
-#: js/apps.js:90
+#: js/apps.js:96
 msgid "Updated"
 msgstr "Aggiornato"
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr "Salvataggio in corso..."
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "deleted"
 msgstr "eliminati"
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "undo"
 msgstr "annulla"
 
-#: js/users.js:62
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr "Impossibile rimuovere l'utente"
 
-#: js/users.js:75 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
+#: templates/users.php:103
 msgid "Groups"
 msgstr "Gruppi"
 
-#: js/users.js:78 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr "Gruppi amministrati"
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "Elimina"
 
-#: js/users.js:191
+#: js/users.js:269
 msgid "add group"
 msgstr "aggiungi gruppo"
 
-#: js/users.js:352
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr "Deve essere fornito un nome utente valido"
 
-#: js/users.js:353 js/users.js:359 js/users.js:374
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr "Errore durante la creazione dell'utente"
 
-#: js/users.js:358
+#: js/users.js:426
 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,15 +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:230 templates/personal.php:102
+#: templates/admin.php:228
+msgid "Less"
+msgstr "Meno"
+
+#: templates/admin.php:235 templates/personal.php:105
 msgid "Version"
 msgstr "Versione"
 
-#: templates/admin.php:233 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 "
@@ -398,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:77
 msgid "Password"
 msgstr "Password"
 
@@ -422,82 +424,70 @@ msgstr "Nuova password"
 msgid "Change password"
 msgstr "Modifica password"
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:76
 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:68
 msgid "Email"
-msgstr "Email"
+msgstr "Posta elettronica"
 
-#: templates/personal.php:72
+#: templates/personal.php:70
 msgid "Your email address"
 msgstr "Il tuo indirizzo email"
 
-#: templates/personal.php:73
+#: templates/personal.php:71
 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:77 templates/personal.php:78
 msgid "Language"
 msgstr "Lingua"
 
-#: templates/personal.php:86
+#: templates/personal.php:89
 msgid "Help translate"
 msgstr "Migliora la traduzione"
 
-#: templates/personal.php:91
+#: templates/personal.php:94
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:93
+#: templates/personal.php:96
 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:75
 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:33
 msgid "Default Storage"
 msgstr "Archiviazione predefinita"
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:39 templates/users.php:133
 msgid "Unlimited"
 msgstr "Illimitata"
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:57 templates/users.php:148
 msgid "Other"
 msgstr "Altro"
 
-#: templates/users.php:84
+#: templates/users.php:82
 msgid "Storage"
 msgstr "Archiviazione"
 
-#: templates/users.php:95
+#: templates/users.php:93
 msgid "change display name"
 msgstr "cambia il nome visualizzato"
 
-#: templates/users.php:99
+#: templates/users.php:97
 msgid "set new password"
 msgstr "imposta una nuova password"
 
-#: templates/users.php:134
+#: templates/users.php:128
 msgid "Default"
 msgstr "Predefinito"
diff --git a/l10n/it/user_ldap.po b/l10n/it/user_ldap.po
index a03705a5cf6997f638d10e3140aca40bed8dca34..294dede9336a06964742b78b0dffe9361f4da143 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-05 00:18+0100\n"
-"PO-Revision-Date: 2013-03-04 14:30+0000\n"
+"POT-Creation-Date: 2013-05-20 02:01+0200\n"
+"PO-Revision-Date: 2013-05-19 09:24+0000\n"
 "Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
@@ -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:18
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr "Aggiungi configurazione del server"
 
-#: templates/settings.php:23
+#: templates/settings.php:37
 msgid "Host"
 msgstr "Host"
 
-#: templates/settings.php:25
+#: 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:26
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "DN base"
 
-#: templates/settings.php:27
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr "Un DN base per riga"
 
-#: templates/settings.php:28
+#: 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:30
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "DN utente"
 
-#: 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 "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:33
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Password"
 
-#: templates/settings.php:36
+#: 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:37
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "Filtro per l'accesso utente"
 
-#: 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 "Specifica quale filtro utilizzare quando si tenta l'accesso. %%uid sostituisce il nome utente all'atto dell'accesso."
 
-#: templates/settings.php:41
+#: 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:42
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Filtro per l'elenco utenti"
 
-#: templates/settings.php:45
+#: 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:46
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "senza nessun segnaposto, per esempio \"objectClass=person\"."
 
-#: templates/settings.php:47
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "Filtro per il gruppo"
 
-#: templates/settings.php:50
+#: 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:51
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "senza nessun segnaposto, per esempio \"objectClass=posixGroup\"."
 
-#: templates/settings.php:55
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr "Impostazioni di connessione"
 
-#: templates/settings.php:57
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr "Configurazione attiva"
 
-#: templates/settings.php:57
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr "Se deselezionata, questa configurazione sarÃ  saltata."
 
-#: templates/settings.php:58
+#: templates/settings.php:72
 msgid "Port"
 msgstr "Porta"
 
-#: templates/settings.php:59
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr "Host di backup (Replica)"
 
-#: 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 "Fornisci un host di backup opzionale. Deve essere una replica del server AD/LDAP principale."
 
-#: templates/settings.php:60
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr "Porta di backup (Replica)"
 
-#: templates/settings.php:61
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr "Disabilita server principale"
 
-#: templates/settings.php:61
+#: 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:62
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "Usa TLS"
 
-#: templates/settings.php:62
+#: 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:63
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Case insensitve LDAP server (Windows)"
 
-#: templates/settings.php:64
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "Disattiva il controllo del certificato SSL."
 
-#: 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 "Se la connessione funziona esclusivamente con questa opzione, importa il certificato SSL del server LDAP nel tuo server ownCloud."
 
-#: templates/settings.php:64
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "Non consigliato, utilizzare solo per test."
 
-#: templates/settings.php:65
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr "Tempo di vita della cache"
 
-#: templates/settings.php:65
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr "in secondi. Il cambio svuota la cache."
 
-#: templates/settings.php:67
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr "Impostazioni delle cartelle"
 
-#: templates/settings.php:69
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr "Campo per la visualizzazione del nome utente"
 
-#: templates/settings.php:69
+#: 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:70
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "Struttura base dell'utente"
 
-#: templates/settings.php:70
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr "Un DN base utente per riga"
 
-#: templates/settings.php:71
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr "Attributi di ricerca utente"
 
-#: templates/settings.php:71 templates/settings.php:74
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr "Opzionale; un attributo per riga"
 
-#: templates/settings.php:72
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr "Campo per la visualizzazione del nome del gruppo"
 
-#: templates/settings.php:72
+#: 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:73
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "Struttura base del gruppo"
 
-#: templates/settings.php:73
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr "Un DN base gruppo per riga"
 
-#: templates/settings.php:74
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr "Attributi di ricerca gruppo"
 
-#: templates/settings.php:75
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr "Associazione gruppo-utente "
 
-#: templates/settings.php:77
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr "Attributi speciali"
 
-#: templates/settings.php:79
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr "Campo Quota"
 
-#: templates/settings.php:80
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr "Quota predefinita"
 
-#: templates/settings.php:80
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr "in byte"
 
-#: templates/settings.php:81
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr "Campo Email"
 
-#: templates/settings.php:82
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr "Regola di assegnazione del nome della cartella utente"
 
-#: templates/settings.php:82
+#: 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:86
+#: 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:86
+#: templates/settings.php:111
 msgid "Help"
 msgstr "Aiuto"
diff --git a/l10n/it/user_webdavauth.po b/l10n/it/user_webdavauth.po
index ba6bfbe7d44cfc720d07e631f2a32edb3ea46f05..705336024c24cd4c1eda9b212bced30b830185c1 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-20 02:01+0200\n"
+"PO-Revision-Date: 2013-05-19 09:22+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 c9a3092c49a6c57fcf11d27061cb168ac467a928..f36a992b1146539c090b075b1523b7e4a7f45b30 100644
--- a/l10n/ja_JP/core.po
+++ b/l10n/ja_JP/core.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>, 2012-2013.
-#   <tetuyano+transi@gmail.com>, 2012.
+# 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-02-22 00:06+0100\n"
-"PO-Revision-Date: 2013-02-20 23:20+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10: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"
@@ -20,24 +18,24 @@ msgstr ""
 "Language: ja_JP\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/share.php:85
+#: ajax/share.php:97
 #, php-format
 msgid "User %s shared a file with you"
 msgstr "ãƒ¦ãƒ¼ã‚¶ %s ã¯ã‚ãªãŸã¨ãƒ•ã‚¡ã‚¤ãƒ«ã‚’å…±æœ‰ã—ã¦ã„ã¾ã™"
 
-#: ajax/share.php:87
+#: ajax/share.php:99
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr "ãƒ¦ãƒ¼ã‚¶ %s ã¯ã‚ãªãŸã¨ãƒ•ã‚©ãƒ«ãƒ€ã‚’å…±æœ‰ã—ã¦ã„ã¾ã™"
 
-#: ajax/share.php:89
+#: ajax/share.php:101
 #, php-format
 msgid ""
 "User %s shared the file \"%s\" with you. It is available for download here: "
 "%s"
 msgstr "ãƒ¦ãƒ¼ã‚¶ %s ã¯ã‚ãªãŸã¨ãƒ•ã‚¡ã‚¤ãƒ« \"%s\" ã‚’å…±æœ‰ã—ã¦ã„ã¾ã™ã€‚ã“ã¡ã‚‰ã‹ã‚‰ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ã§ãã¾ã™: %s"
 
-#: ajax/share.php:91
+#: ajax/share.php:104
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -83,79 +81,79 @@ msgstr "å‰Šé™¤ã™ã‚‹ã‚«ãƒ†ã‚´ãƒªãŒé¸æŠžã•ã‚Œã¦ã„ã¾ã›ã‚“ã€‚"
 msgid "Error removing %s from favorites."
 msgstr "ãŠæ°—ã«å…¥ã‚Šã‹ã‚‰ %s ã®å‰Šé™¤ã‚¨ãƒ©ãƒ¼"
 
-#: js/config.php:32
+#: js/config.php:34
 msgid "Sunday"
 msgstr "æ—¥"
 
-#: js/config.php:32
+#: js/config.php:35
 msgid "Monday"
 msgstr "æœˆ"
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Tuesday"
 msgstr "ç«"
 
-#: js/config.php:32
+#: js/config.php:37
 msgid "Wednesday"
 msgstr "æ°´"
 
-#: js/config.php:32
+#: js/config.php:38
 msgid "Thursday"
 msgstr "æœ¨"
 
-#: js/config.php:32
+#: js/config.php:39
 msgid "Friday"
 msgstr "é‡‘"
 
-#: js/config.php:32
+#: js/config.php:40
 msgid "Saturday"
 msgstr "åœŸ"
 
-#: js/config.php:33
+#: js/config.php:45
 msgid "January"
 msgstr "1æœˆ"
 
-#: js/config.php:33
+#: js/config.php:46
 msgid "February"
 msgstr "2æœˆ"
 
-#: js/config.php:33
+#: js/config.php:47
 msgid "March"
 msgstr "3æœˆ"
 
-#: js/config.php:33
+#: js/config.php:48
 msgid "April"
 msgstr "4æœˆ"
 
-#: js/config.php:33
+#: js/config.php:49
 msgid "May"
 msgstr "5æœˆ"
 
-#: js/config.php:33
+#: js/config.php:50
 msgid "June"
 msgstr "6æœˆ"
 
-#: js/config.php:33
+#: js/config.php:51
 msgid "July"
 msgstr "7æœˆ"
 
-#: js/config.php:33
+#: js/config.php:52
 msgid "August"
 msgstr "8æœˆ"
 
-#: js/config.php:33
+#: js/config.php:53
 msgid "September"
 msgstr "9æœˆ"
 
-#: js/config.php:33
+#: js/config.php:54
 msgid "October"
 msgstr "10æœˆ"
 
-#: js/config.php:33
+#: js/config.php:55
 msgid "November"
 msgstr "11æœˆ"
 
-#: js/config.php:33
+#: js/config.php:56
 msgid "December"
 msgstr "12æœˆ"
 
@@ -163,86 +161,88 @@ msgstr "12æœˆ"
 msgid "Settings"
 msgstr "è¨å®š"
 
-#: js/js.js:767
+#: js/js.js:718
 msgid "seconds ago"
-msgstr "ç§’å‰"
+msgstr "æ•°ç§’å‰"
 
-#: js/js.js:768
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "1 åˆ†å‰"
 
-#: js/js.js:769
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr "{minutes} åˆ†å‰"
 
-#: js/js.js:770
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr "1 æ™‚é–“å‰"
 
-#: js/js.js:771
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr "{hours} æ™‚é–“å‰"
 
-#: js/js.js:772
+#: js/js.js:723
 msgid "today"
 msgstr "ä»Šæ—¥"
 
-#: js/js.js:773
+#: js/js.js:724
 msgid "yesterday"
 msgstr "æ˜¨æ—¥"
 
-#: js/js.js:774
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr "{days} æ—¥å‰"
 
-#: js/js.js:775
+#: js/js.js:726
 msgid "last month"
 msgstr "ä¸€æœˆå‰"
 
-#: js/js.js:776
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr "{months} æœˆå‰"
 
-#: js/js.js:777
+#: js/js.js:728
 msgid "months ago"
 msgstr "æœˆå‰"
 
-#: js/js.js:778
+#: js/js.js:729
 msgid "last year"
 msgstr "ä¸€å¹´å‰"
 
-#: js/js.js:779
+#: js/js.js:730
 msgid "years ago"
 msgstr "å¹´å‰"
 
-#: js/oc-dialogs.js:126
-msgid "Choose"
-msgstr "é¸æŠž"
+#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
+msgid "Ok"
+msgstr "OK"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
 msgid "Cancel"
 msgstr "ã‚ãƒ£ãƒ³ã‚»ãƒ«"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "ã„ã„ãˆ"
+#: js/oc-dialogs.js:185
+msgid "Choose"
+msgstr "é¸æŠž"
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:215
 msgid "Yes"
 msgstr "ã¯ã„"
 
-#: js/oc-dialogs.js:180
-msgid "Ok"
-msgstr "OK"
+#: js/oc-dialogs.js:222
+msgid "No"
+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:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:582
-#: js/share.js:594
+#: 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 "ã‚¨ãƒ©ãƒ¼"
 
@@ -254,127 +254,127 @@ msgstr "ã‚¢ãƒ—ãƒªåãŒã—ã¦ã„ã•ã‚Œã¦ã„ã¾ã›ã‚“ã€‚"
 msgid "The required file {file} is not installed!"
 msgstr "å¿…è¦ãªãƒ•ã‚¡ã‚¤ãƒ« {file} ãŒã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ã¾ã›ã‚“ï¼"
 
-#: js/share.js:29 js/share.js:43 js/share.js:90
+#: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr "å…±æœ‰ä¸"
 
-#: js/share.js:93
+#: js/share.js:90
 msgid "Share"
 msgstr "å…±æœ‰"
 
-#: js/share.js:141 js/share.js:622
+#: js/share.js:125 js/share.js:617
 msgid "Error while sharing"
 msgstr "å…±æœ‰ã§ã‚¨ãƒ©ãƒ¼ç™ºç”Ÿ"
 
-#: js/share.js:152
+#: js/share.js:136
 msgid "Error while unsharing"
 msgstr "å…±æœ‰è§£é™¤ã§ã‚¨ãƒ©ãƒ¼ç™ºç”Ÿ"
 
-#: js/share.js:159
+#: js/share.js:143
 msgid "Error while changing permissions"
 msgstr "æ¨©é™å¤‰æ›´ã§ã‚¨ãƒ©ãƒ¼ç™ºç”Ÿ"
 
-#: js/share.js:168
+#: js/share.js:152
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "ã‚ãªãŸã¨ {owner} ã®ã‚°ãƒ«ãƒ¼ãƒ— {group} ã§å…±æœ‰ä¸"
 
-#: js/share.js:170
+#: js/share.js:154
 msgid "Shared with you by {owner}"
 msgstr "{owner} ã¨å…±æœ‰ä¸"
 
-#: js/share.js:175
+#: js/share.js:159
 msgid "Share with"
 msgstr "å…±æœ‰è€…"
 
-#: js/share.js:180
+#: js/share.js:164
 msgid "Share with link"
 msgstr "URLãƒªãƒ³ã‚¯ã§å…±æœ‰"
 
-#: js/share.js:183
+#: js/share.js:167
 msgid "Password protect"
 msgstr "ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰ä¿è·"
 
-#: js/share.js:185 templates/installation.php:44 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰"
 
-#: js/share.js:189
+#: js/share.js:173
 msgid "Email link to person"
 msgstr "ãƒ¡ãƒ¼ãƒ«ãƒªãƒ³ã‚¯"
 
-#: js/share.js:190
+#: js/share.js:174
 msgid "Send"
 msgstr "é€ä¿¡"
 
-#: js/share.js:194
+#: js/share.js:178
 msgid "Set expiration date"
 msgstr "æœ‰åŠ¹æœŸé™ã‚’è¨å®š"
 
-#: js/share.js:195
+#: js/share.js:179
 msgid "Expiration date"
 msgstr "æœ‰åŠ¹æœŸé™"
 
-#: js/share.js:227
+#: js/share.js:211
 msgid "Share via email:"
 msgstr "ãƒ¡ãƒ¼ãƒ«çµŒç”±ã§å…±æœ‰:"
 
-#: js/share.js:229
+#: js/share.js:213
 msgid "No people found"
 msgstr "ãƒ¦ãƒ¼ã‚¶ãƒ¼ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“"
 
-#: js/share.js:256
+#: js/share.js:251
 msgid "Resharing is not allowed"
 msgstr "å†å…±æœ‰ã¯è¨±å¯ã•ã‚Œã¦ã„ã¾ã›ã‚“"
 
-#: js/share.js:292
+#: js/share.js:287
 msgid "Shared in {item} with {user}"
 msgstr "{item} å†…ã§ {user} ã¨å…±æœ‰ä¸"
 
-#: js/share.js:313
+#: js/share.js:308
 msgid "Unshare"
 msgstr "å…±æœ‰è§£é™¤"
 
-#: js/share.js:325
+#: js/share.js:320
 msgid "can edit"
 msgstr "ç·¨é›†å¯èƒ½"
 
-#: js/share.js:327
+#: js/share.js:322
 msgid "access control"
 msgstr "ã‚¢ã‚¯ã‚»ã‚¹æ¨©é™"
 
-#: js/share.js:330
+#: js/share.js:325
 msgid "create"
 msgstr "ä½œæˆ"
 
-#: js/share.js:333
+#: js/share.js:328
 msgid "update"
 msgstr "æ›´æ–°"
 
-#: js/share.js:336
+#: js/share.js:331
 msgid "delete"
 msgstr "å‰Šé™¤"
 
-#: js/share.js:339
+#: js/share.js:334
 msgid "share"
 msgstr "å…±æœ‰"
 
-#: js/share.js:373 js/share.js:569
+#: js/share.js:368 js/share.js:564
 msgid "Password protected"
 msgstr "ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰ä¿è·"
 
-#: js/share.js:582
+#: js/share.js:577
 msgid "Error unsetting expiration date"
 msgstr "æœ‰åŠ¹æœŸé™ã®æœªè¨å®šã‚¨ãƒ©ãƒ¼"
 
-#: js/share.js:594
+#: js/share.js:589
 msgid "Error setting expiration date"
 msgstr "æœ‰åŠ¹æœŸé™ã®è¨å®šã§ã‚¨ãƒ©ãƒ¼ç™ºç”Ÿ"
 
-#: js/share.js:609
+#: js/share.js:604
 msgid "Sending ..."
 msgstr "é€ä¿¡ä¸..."
 
-#: js/share.js:620
+#: js/share.js:615
 msgid "Email sent"
 msgstr "ãƒ¡ãƒ¼ãƒ«ã‚’é€ä¿¡ã—ã¾ã—ãŸ"
 
@@ -397,24 +397,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:39
-#: 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 "ãƒªã‚»ãƒƒãƒˆã‚’è¦æ±‚ã—ã¾ã™ã€‚"
 
@@ -436,7 +439,7 @@ msgstr "ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰ã‚’ãƒªã‚»ãƒƒãƒˆ"
 
 #: strings.php:5
 msgid "Personal"
-msgstr "å€‹äººè¨å®š"
+msgstr "å€‹äºº"
 
 #: strings.php:6
 msgid "Users"
@@ -448,7 +451,7 @@ msgstr "ã‚¢ãƒ—ãƒª"
 
 #: strings.php:8
 msgid "Admin"
-msgstr "ç®¡ç†è€…"
+msgstr "ç®¡ç†"
 
 #: strings.php:9
 msgid "Help"
@@ -470,115 +473,130 @@ msgstr "ã‚«ãƒ†ã‚´ãƒªã‚’ç·¨é›†"
 msgid "Add"
 msgstr "è¿½åŠ "
 
-#: templates/installation.php:23 templates/installation.php:30
+#: 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 "ã‚ãªãŸã®PHPã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã«ã¯ã€Null Byteæ”»æ’ƒ(CVE-2006-7243)ã¨ã„ã†è„†å¼±æ€§ãŒå«ã¾ã‚Œã¦ã„ã¾ã™ã€‚"
+
+#: templates/installation.php:26
+msgid "Please update your PHP installation to use ownCloud securely."
+msgstr "ownCloud ã‚’å®‰å…¨ã«åˆ©ç”¨ã™ã‚‹ã«ã€PHPã®æ›´æ–°ã‚’è¡Œãªã£ã¦ãã ã•ã„ã€‚"
+
+#: templates/installation.php:32
 msgid ""
 "No secure random number generator is available, please enable the PHP "
 "OpenSSL extension."
 msgstr "ã‚»ã‚ãƒ¥ã‚¢ãªä¹±æ•°ç”Ÿæˆå™¨ãŒåˆ©ç”¨å¯èƒ½ã§ã¯ã‚ã‚Šã¾ã›ã‚“ã€‚PHPã®OpenSSLæ‹¡å¼µã‚’æœ‰åŠ¹ã«ã—ã¦ä¸‹ã•ã„ã€‚"
 
-#: templates/installation.php:25
+#: 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:31
+#: 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 ãƒ•ã‚¡ã‚¤ãƒ«ãŒå‹•ä½œã—ã¦ã„ãªã„ãŸã‚ã€ãŠãã‚‰ãã‚ãªãŸã®ãƒ‡ãƒ¼ã‚¿ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‚‚ã—ãã¯ãƒ•ã‚¡ã‚¤ãƒ«ã¯ã‚¤ãƒ³ã‚¿ãƒ¼ãƒãƒƒãƒˆã‹ã‚‰ã‚¢ã‚¯ã‚»ã‚¹å¯èƒ½ã§ã™ã€‚"
 
-#: templates/installation.php:32
+#: 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>ã‚’å‚ç…§ã—ã¦ä¸‹ã•ã„ã€‚"
 
-#: templates/installation.php:36
+#: templates/installation.php:44
 msgid "Create an <strong>admin account</strong>"
 msgstr "<strong>ç®¡ç†è€…ã‚¢ã‚«ã‚¦ãƒ³ãƒˆ</strong>ã‚’ä½œæˆã—ã¦ãã ã•ã„"
 
-#: templates/installation.php:52
+#: templates/installation.php:62
 msgid "Advanced"
 msgstr "è©³ç´°è¨å®š"
 
-#: templates/installation.php:54
+#: templates/installation.php:64
 msgid "Data folder"
 msgstr "ãƒ‡ãƒ¼ã‚¿ãƒ•ã‚©ãƒ«ãƒ€"
 
-#: templates/installation.php:61
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ã‚’è¨å®šã—ã¦ãã ã•ã„"
 
-#: templates/installation.php:66 templates/installation.php:77
-#: templates/installation.php:87 templates/installation.php:97
+#: 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:109
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ã®ãƒ¦ãƒ¼ã‚¶å"
 
-#: templates/installation.php:113
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ã®ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰"
 
-#: templates/installation.php:117
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹å"
 
-#: templates/installation.php:125
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ã®è¡¨é ˜åŸŸ"
 
-#: templates/installation.php:131
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ã®ãƒ›ã‚¹ãƒˆå"
 
-#: templates/installation.php:136
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "ã‚»ãƒƒãƒˆã‚¢ãƒƒãƒ—ã‚’å®Œäº†ã—ã¾ã™"
 
-#: templates/layout.guest.php:33
+#: templates/layout.guest.php:40
 msgid "web services under your control"
-msgstr "ç®¡ç†ä¸‹ã«ã‚ã‚‹ã‚¦ã‚§ãƒ–ã‚µãƒ¼ãƒ“ã‚¹"
+msgstr "ç®¡ç†ä¸‹ã®ã‚¦ã‚§ãƒ–ã‚µãƒ¼ãƒ“ã‚¹"
 
-#: templates/layout.user.php:48
+#: templates/layout.user.php:36
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr "%s ãŒåˆ©ç”¨å¯èƒ½ã§ã™ã€‚æ›´æ–°æ–¹æ³•ã«é–¢ã—ã¦ã•ã‚‰ã«æƒ…å ±ã‚’å–å¾—ã—ã¦ä¸‹ã•ã„ã€‚"
+
+#: 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/ja_JP/files.po b/l10n/ja_JP/files.po
index dd044d05836fbab4f24e161bd8ea011d97dd433e..32f0f5daf357287b36b6b75a3dedc35d91080747 100644
--- a/l10n/ja_JP/files.po
+++ b/l10n/ja_JP/files.po
@@ -3,18 +3,14 @@
 # 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-03-04 00:06+0100\n"
-"PO-Revision-Date: 2013-03-03 23:06+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 12: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"
@@ -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"
@@ -75,59 +67,70 @@ msgstr "ãƒ‡ã‚£ã‚¹ã‚¯ã¸ã®æ›¸ãè¾¼ã¿ã«å¤±æ•—ã—ã¾ã—ãŸ"
 msgid "Not enough storage available"
 msgstr "ã‚¹ãƒˆãƒ¬ãƒ¼ã‚¸ã«ååˆ†ãªç©ºãå®¹é‡ãŒã‚ã‚Šã¾ã›ã‚“"
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr "ç„¡åŠ¹ãªãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã§ã™ã€‚"
 
-#: appinfo/app.php:10
+#: 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 "å®Œå…¨ã«å‰Šé™¤ã™ã‚‹"
 
-#: js/fileactions.js:127 templates/index.php:92 templates/index.php:93
+#: 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/files.js:292 js/files.js:408
-#: js/files.js:439
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
-msgstr "ä¿ç•™"
+msgstr "ä¸æ–"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} ã¯ã™ã§ã«å˜åœ¨ã—ã¦ã„ã¾ã™"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "ç½®ãæ›ãˆ"
 
-#: js/filelist.js:251
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "æŽ¨å¥¨åç§°"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "ã‚ãƒ£ãƒ³ã‚»ãƒ«"
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "{old_name} ã‚’ {new_name} ã«ç½®æ›"
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "undo"
 msgstr "å…ƒã«æˆ»ã™"
 
-#: js/filelist.js:323
+#: 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 "'.' ã¯ç„¡åŠ¹ãªãƒ•ã‚¡ã‚¤ãƒ«åã§ã™ã€‚"
@@ -150,77 +153,77 @@ msgstr "ã‚ãªãŸã®ã‚¹ãƒˆãƒ¬ãƒ¼ã‚¸ã¯ä¸€æ¯ã§ã™ã€‚ãƒ•ã‚¡ã‚¤ãƒ«ã®æ›´æ–°ã¨åŒ
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "ã‚ãªãŸã®ã‚¹ãƒˆãƒ¬ãƒ¼ã‚¸ã¯ã»ã¼ä¸€æ¯ã§ã™ï¼ˆ{usedSpacePercent}%ï¼‰"
 
-#: js/files.js:225
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ã®æº–å‚™ä¸ã§ã™ã€‚ãƒ•ã‚¡ã‚¤ãƒ«ã‚µã‚¤ã‚ºãŒå¤§ãã„å ´åˆã¯å°‘ã—æ™‚é–“ãŒã‹ã‹ã‚‹ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“ã€‚"
 
-#: js/files.js:262
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‚‚ã—ãã¯0ãƒã‚¤ãƒˆã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ã§ãã¾ã›ã‚“"
 
-#: js/files.js:262
-msgid "Upload Error"
-msgstr "ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ã‚¨ãƒ©ãƒ¼"
-
-#: js/files.js:273
-msgid "Close"
-msgstr "é–‰ã˜ã‚‹"
+#: js/files.js:277
+msgid "Not enough space available"
+msgstr "åˆ©ç”¨å¯èƒ½ãªã‚¹ãƒšãƒ¼ã‚¹ãŒååˆ†ã«ã‚ã‚Šã¾ã›ã‚“"
 
-#: js/files.js:312
-msgid "1 file uploading"
-msgstr "ãƒ•ã‚¡ã‚¤ãƒ«ã‚’1ã¤ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ä¸"
-
-#: js/files.js:315 js/files.js:370 js/files.js:385
-msgid "{count} files uploading"
-msgstr "{count} ãƒ•ã‚¡ã‚¤ãƒ«ã‚’ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ä¸"
-
-#: js/files.js:388 js/files.js:423
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ã¯ã‚ãƒ£ãƒ³ã‚»ãƒ«ã•ã‚Œã¾ã—ãŸã€‚"
 
-#: js/files.js:497
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "ãƒ•ã‚¡ã‚¤ãƒ«è»¢é€ã‚’å®Ÿè¡Œä¸ã§ã™ã€‚ä»Šã“ã®ãƒšãƒ¼ã‚¸ã‹ã‚‰ç§»å‹•ã™ã‚‹ã¨ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ãŒä¸æ¢ã•ã‚Œã¾ã™ã€‚"
 
-#: js/files.js:570
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "URLã¯ç©ºã«ã§ãã¾ã›ã‚“ã€‚"
 
-#: js/files.js:575
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "ç„¡åŠ¹ãªãƒ•ã‚©ãƒ«ãƒ€åã§ã™ã€‚'Shared' ã®åˆ©ç”¨ã¯ ownCloud ãŒäºˆç´„æ¸ˆã¿ã§ã™ã€‚"
 
-#: js/files.js:953 templates/index.php:68
+#: 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:954 templates/index.php:79
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "ã‚µã‚¤ã‚º"
 
-#: js/files.js:955 templates/index.php:81
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
-msgstr "æ›´æ–°æ—¥æ™‚"
+msgstr "å¤‰æ›´"
 
-#: js/files.js:974
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 ãƒ•ã‚©ãƒ«ãƒ€"
 
-#: js/files.js:976
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} ãƒ•ã‚©ãƒ«ãƒ€"
 
-#: js/files.js:984
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 ãƒ•ã‚¡ã‚¤ãƒ«"
 
-#: js/files.js:986
+#: 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 "ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰"
@@ -259,7 +262,7 @@ msgstr "ä¿å˜"
 
 #: templates/index.php:7
 msgid "New"
-msgstr "æ–°è¦"
+msgstr "æ–°è¦ä½œæˆ"
 
 #: templates/index.php:10
 msgid "Text file"
@@ -273,45 +276,45 @@ msgstr "ãƒ•ã‚©ãƒ«ãƒ€"
 msgid "From link"
 msgstr "ãƒªãƒ³ã‚¯"
 
-#: templates/index.php:40
+#: templates/index.php:42
 msgid "Deleted files"
 msgstr "å‰Šé™¤ãƒ•ã‚¡ã‚¤ãƒ«"
 
-#: templates/index.php:46
+#: templates/index.php:48
 msgid "Cancel upload"
 msgstr "ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ã‚’ã‚ãƒ£ãƒ³ã‚»ãƒ«"
 
-#: templates/index.php:53
+#: templates/index.php:54
 msgid "You donâ€™t have write permissions here."
 msgstr "ã‚ãªãŸã«ã¯æ›¸ãè¾¼ã¿æ¨©é™ãŒã‚ã‚Šã¾ã›ã‚“ã€‚"
 
-#: templates/index.php:60
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "ã“ã“ã«ã¯ä½•ã‚‚ã‚ã‚Šã¾ã›ã‚“ã€‚ä½•ã‹ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ã—ã¦ãã ã•ã„ã€‚"
 
-#: templates/index.php:74
+#: templates/index.php:75
 msgid "Download"
 msgstr "ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰"
 
-#: templates/index.php:86 templates/index.php:87
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
-msgstr "å…±æœ‰ã—ãªã„"
+msgstr "å…±æœ‰è§£é™¤"
 
-#: templates/index.php:106
+#: templates/index.php:107
 msgid "Upload too large"
-msgstr "ãƒ•ã‚¡ã‚¤ãƒ«ã‚µã‚¤ã‚ºãŒå¤§ãã™ãŽã¾ã™"
+msgstr "ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ã«ã¯å¤§ãã™ãŽã¾ã™ã€‚"
 
-#: templates/index.php:108
+#: 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:113
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "ãƒ•ã‚¡ã‚¤ãƒ«ã‚’ã‚¹ã‚ãƒ£ãƒ³ã—ã¦ã„ã¾ã™ã€ã—ã°ã‚‰ããŠå¾…ã¡ãã ã•ã„ã€‚"
 
-#: templates/index.php:116
+#: 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..90764dc0dae0e42aba1880bd87d5afd86ff17aab 100644
--- a/l10n/ja_JP/files_encryption.po
+++ b/l10n/ja_JP/files_encryption.po
@@ -3,14 +3,12 @@
 # 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.
 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ja_JP/files_external.po b/l10n/ja_JP/files_external.po
index 1c37d81d9dbfbb4548fe4db02a887d348a4688b3..ebea1cd8427439f25e941f3030ab3f763f78a7e0 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-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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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: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 "<b>è¦å‘Š:</b> \"smbclient\" ã¯ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ã¾ã›ã‚“ã€‚CIFS/SMB å…±æœ‰ã®ãƒžã‚¦ãƒ³ãƒˆã¯ã§ãã¾ã›ã‚“ã€‚ã‚·ã‚¹ãƒ†ãƒ ç®¡ç†è€…ã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã‚’ãŠé¡˜ã„ã—ã¦ä¸‹ã•ã„ã€‚"
 
-#: 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 "<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..c6e1114ec1f3967d050d368f1bb9ceb8bd5f2662 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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 842098d5227ccf9798a797bcf1830454cc638479..bdec5a34504ec672f6705544940394dc9e138236 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-03-08 00:25+0100\n"
-"PO-Revision-Date: 2013-03-07 23:25+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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"
@@ -18,12 +17,12 @@ msgstr ""
 "Language: ja_JP\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/delete.php:40
+#: ajax/delete.php:42
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "%s ã‚’å®Œå…¨ã«å‰Šé™¤å‡ºæ¥ã¾ã›ã‚“ã§ã—ãŸ"
 
-#: ajax/undelete.php:41
+#: ajax/undelete.php:42
 #, php-format
 msgid "Couldn't restore %s"
 msgstr "%s ã‚’å¾©å…ƒå‡ºæ¥ã¾ã›ã‚“ã§ã—ãŸ"
@@ -32,6 +31,10 @@ msgstr "%s ã‚’å¾©å…ƒå‡ºæ¥ã¾ã›ã‚“ã§ã—ãŸ"
 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 "ãƒ•ã‚¡ã‚¤ãƒ«ã‚’å®Œå…¨ã«å‰Šé™¤ã™ã‚‹"
@@ -78,4 +81,4 @@ msgstr "å‰Šé™¤"
 
 #: templates/part.breadcrumb.php:9
 msgid "Deleted Files"
-msgstr ""
+msgstr "å‰Šé™¤ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«"
diff --git a/l10n/ja_JP/files_versions.po b/l10n/ja_JP/files_versions.po
index 7b11e7cf484e5f555a0103c0f83900c506b2cb37..62a28eb62b825253a812ec23b9be60339a13bd2b 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:30+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 e5d0546cea3630baf2a8e6bcc3feb1d430618aaa..a65b9bba7667bbba773374673ddc91832a46ddd8 100644
--- a/l10n/ja_JP/lib.po
+++ b/l10n/ja_JP/lib.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>, 2013.
-# 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-04-28 01:57+0200\n"
+"PO-Revision-Date: 2013-04-27 23:57+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"
@@ -26,7 +23,7 @@ msgstr "ãƒ˜ãƒ«ãƒ—"
 
 #: app.php:362
 msgid "Personal"
-msgstr "å€‹äººè¨å®š"
+msgstr "å€‹äºº"
 
 #: app.php:373
 msgid "Settings"
@@ -42,21 +39,21 @@ msgstr "ã‚¢ãƒ—ãƒª"
 
 #: app.php:406
 msgid "Admin"
-msgstr "ç®¡ç†è€…"
+msgstr "ç®¡ç†"
 
-#: files.php:202
+#: files.php:209
 msgid "ZIP download is turned off."
 msgstr "ZIPãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ã¯ç„¡åŠ¹ã§ã™ã€‚"
 
-#: files.php:203
+#: files.php:210
 msgid "Files need to be downloaded one by one."
 msgstr "ãƒ•ã‚¡ã‚¤ãƒ«ã¯1ã¤ãšã¤ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚"
 
-#: files.php:204 files.php:231
+#: files.php:211 files.php:244
 msgid "Back to Files"
 msgstr "ãƒ•ã‚¡ã‚¤ãƒ«ã«æˆ»ã‚‹"
 
-#: files.php:228
+#: files.php:241
 msgid "Selected files too large to generate zip file."
 msgstr "é¸æŠžã—ãŸãƒ•ã‚¡ã‚¤ãƒ«ã¯ZIPãƒ•ã‚¡ã‚¤ãƒ«ã®ç”Ÿæˆã«ã¯å¤§ãã™ãŽã¾ã™ã€‚"
 
@@ -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,83 @@ msgstr "%s ã§ã¯ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹åã«ãƒ‰ãƒƒãƒˆã‚’åˆ©ç”¨ã§ããªã„ã‹ã‚‚ã—
 msgid "%s set the database host."
 msgstr "%s ã«ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ãƒ›ã‚¹ãƒˆã‚’è¨å®šã—ã¾ã™ã€‚"
 
-#: setup.php:128 setup.php:320 setup.php:365
+#: setup.php:132 setup.php:325 setup.php:370
 msgid "PostgreSQL username and/or password not valid"
 msgstr "PostgreSQLã®ãƒ¦ãƒ¼ã‚¶åã‚‚ã—ãã¯ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰ã¯æœ‰åŠ¹ã§ã¯ã‚ã‚Šã¾ã›ã‚“"
 
-#: setup.php:129 setup.php:152 setup.php:229
+#: setup.php:133 setup.php:156 setup.php:234
 msgid "You need to enter either an existing account or the administrator."
 msgstr "æ—¢å˜ã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã‚‚ã—ãã¯ç®¡ç†è€…ã®ã©ã¡ã‚‰ã‹ã‚’å…¥åŠ›ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚"
 
-#: setup.php:151 setup.php:453 setup.php:520
+#: setup.php:155 setup.php:458 setup.php:525
 msgid "Oracle username and/or password not valid"
 msgstr "Oracleã®ãƒ¦ãƒ¼ã‚¶åã‚‚ã—ãã¯ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰ã¯æœ‰åŠ¹ã§ã¯ã‚ã‚Šã¾ã›ã‚“"
 
-#: setup.php:228
+#: setup.php:233
 msgid "MySQL username and/or password not valid"
 msgstr "MySQLã®ãƒ¦ãƒ¼ã‚¶åã‚‚ã—ãã¯ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰ã¯æœ‰åŠ¹ã§ã¯ã‚ã‚Šã¾ã›ã‚“"
 
-#: 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: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:583 setup.php:592 setup.php:600 setup.php:609
+#: setup.php:615
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "DBã‚¨ãƒ©ãƒ¼: \"%s\""
 
-#: 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:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
+#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
+#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "é•åã‚³ãƒžãƒ³ãƒ‰: \"%s\""
 
-#: setup.php:299
+#: setup.php:304
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "MySQLã®ãƒ¦ãƒ¼ã‚¶ '%s'@'localhost' ã¯ã™ã§ã«å˜åœ¨ã—ã¾ã™ã€‚"
 
-#: setup.php:300
+#: setup.php:305
 msgid "Drop this user from MySQL"
 msgstr "MySQLã‹ã‚‰ã“ã®ãƒ¦ãƒ¼ã‚¶ã‚’å‰Šé™¤"
 
-#: setup.php:305
+#: setup.php:310
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "MySQLã®ãƒ¦ãƒ¼ã‚¶ '%s'@'%%' ã¯ã™ã§ã«å˜åœ¨ã—ã¾ã™ã€‚"
 
-#: setup.php:306
+#: setup.php:311
 msgid "Drop this user from MySQL."
 msgstr "MySQLã‹ã‚‰ã“ã®ãƒ¦ãƒ¼ã‚¶ã‚’å‰Šé™¤ã™ã‚‹ã€‚"
 
-#: setup.php:579 setup.php:611
+#: setup.php:584 setup.php:616
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "é•åã‚³ãƒžãƒ³ãƒ‰: \"%s\"ã€åå‰: %sã€ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰: %s"
 
-#: setup.php:631
+#: setup.php:636
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr "MS SQL ã‚µãƒ¼ãƒãƒ¼ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼å/ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰ãŒæ£ã—ãã‚ã‚Šã¾ã›ã‚“: %s"
 
-#: setup.php:849
+#: setup.php:858
 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:850
+#: setup.php:859
 #, 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 +220,7 @@ msgstr "%d æ—¥å‰"
 
 #: template.php:121
 msgid "last month"
-msgstr "å…ˆæœˆ"
+msgstr "ä¸€æœˆå‰"
 
 #: template.php:122
 #, php-format
@@ -236,25 +229,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 8a310c531732495a10badc82d1ee4b62744e662c..5c7b4905c9e38faa839e3ebf522e2893069be4e6 100644
--- a/l10n/ja_JP/settings.po
+++ b/l10n/ja_JP/settings.po
@@ -3,18 +3,14 @@
 # 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-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-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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"
@@ -26,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 "èªè¨¼ã‚¨ãƒ©ãƒ¼"
 
-#: 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 +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"
@@ -97,76 +97,76 @@ msgstr "{appversion} ã«æ›´æ–°"
 msgid "Disable"
 msgstr "ç„¡åŠ¹"
 
-#: js/apps.js:36 js/apps.js:64
+#: js/apps.js:36 js/apps.js:64 js/apps.js:83
 msgid "Enable"
-msgstr "æœ‰åŠ¹"
+msgstr "æœ‰åŠ¹åŒ–"
 
 #: js/apps.js:55
 msgid "Please wait...."
 msgstr "ã—ã°ã‚‰ããŠå¾…ã¡ãã ã•ã„ã€‚"
 
-#: js/apps.js:84
+#: 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:87
+#: js/apps.js:93
 msgid "Error while updating app"
 msgstr "ã‚¢ãƒ—ãƒªã®æ›´æ–°ä¸ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿ"
 
-#: js/apps.js:87
-msgid "Error"
-msgstr "ã‚¨ãƒ©ãƒ¼"
-
-#: js/apps.js:90
+#: js/apps.js:96
 msgid "Updated"
 msgstr "æ›´æ–°æ¸ˆã¿"
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr "ä¿å˜ä¸..."
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "deleted"
 msgstr "å‰Šé™¤"
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "undo"
 msgstr "å…ƒã«æˆ»ã™"
 
-#: js/users.js:62
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr "ãƒ¦ãƒ¼ã‚¶ã‚’å‰Šé™¤å‡ºæ¥ã¾ã›ã‚“"
 
-#: js/users.js:75 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
+#: templates/users.php:103
 msgid "Groups"
 msgstr "ã‚°ãƒ«ãƒ¼ãƒ—"
 
-#: js/users.js:78 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr "ã‚°ãƒ«ãƒ¼ãƒ—ç®¡ç†è€…"
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "å‰Šé™¤"
 
-#: js/users.js:191
+#: js/users.js:269
 msgid "add group"
 msgstr "ã‚°ãƒ«ãƒ¼ãƒ—ã‚’è¿½åŠ "
 
-#: js/users.js:352
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr "æœ‰åŠ¹ãªãƒ¦ãƒ¼ã‚¶åã‚’æŒ‡å®šã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™"
 
-#: js/users.js:353 js/users.js:359 js/users.js:374
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr "ãƒ¦ãƒ¼ã‚¶ä½œæˆã‚¨ãƒ©ãƒ¼"
 
-#: js/users.js:358
+#: js/users.js:426
 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,15 +317,19 @@ msgstr "ãƒã‚°"
 msgid "Log level"
 msgstr "ãƒã‚°ãƒ¬ãƒ™ãƒ«"
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
-msgstr "è©³ç´°"
+msgstr "ã‚‚ã£ã¨è¦‹ã‚‹"
+
+#: templates/admin.php:228
+msgid "Less"
+msgstr "é–‰ã˜ã‚‹"
 
-#: templates/admin.php:230 templates/personal.php:102
+#: templates/admin.php:235 templates/personal.php:105
 msgid "Version"
 msgstr "ãƒãƒ¼ã‚¸ãƒ§ãƒ³"
 
-#: templates/admin.php:233 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 "
@@ -333,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 "<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"
@@ -390,13 +394,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:77
 msgid "Password"
 msgstr "ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰"
 
@@ -410,92 +414,80 @@ 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:76
 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 "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 "WebDAV"
 
-#: templates/personal.php:93
+#: templates/personal.php:96
 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:75
 msgid "Login Name"
 msgstr "ãƒã‚°ã‚¤ãƒ³å"
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr "ä½œæˆ"
 
-#: templates/users.php:35
+#: templates/users.php:33
 msgid "Default Storage"
 msgstr "ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã‚¹ãƒˆãƒ¬ãƒ¼ã‚¸"
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:39 templates/users.php:133
 msgid "Unlimited"
 msgstr "ç„¡åˆ¶é™"
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:57 templates/users.php:148
 msgid "Other"
 msgstr "ãã®ä»–"
 
-#: templates/users.php:84
+#: templates/users.php:82
 msgid "Storage"
 msgstr "ã‚¹ãƒˆãƒ¬ãƒ¼ã‚¸"
 
-#: templates/users.php:95
+#: templates/users.php:93
 msgid "change display name"
 msgstr "è¡¨ç¤ºåã‚’å¤‰æ›´"
 
-#: templates/users.php:99
+#: templates/users.php:97
 msgid "set new password"
 msgstr "æ–°ã—ã„ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰ã‚’è¨å®š"
 
-#: templates/users.php:134
+#: templates/users.php:128
 msgid "Default"
 msgstr "ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆ"
diff --git a/l10n/ja_JP/user_ldap.po b/l10n/ja_JP/user_ldap.po
index a2a1882730a9a11a26fe0203a799bd45877bebcd..4c7f9ca2dcd4a16929692fd4af90032e7207bbd6 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-03 00:05+0100\n"
-"PO-Revision-Date: 2013-03-02 08:10+0000\n"
+"POT-Creation-Date: 2013-05-21 02:00+0200\n"
+"PO-Revision-Date: 2013-05-20 07:58+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: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 "SSLé€šä¿¡ã—ãªã„å ´åˆã«ã¯ã€ãƒ—ãƒãƒˆã‚³ãƒ«åã‚’çœç•¥ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ãã†ã§ãªã„å ´åˆã«ã¯ã€ldaps:// ã‹ã‚‰å§‹ã‚ã¦ãã ã•ã„ã€‚"
 
-#: templates/settings.php:26
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "ãƒ™ãƒ¼ã‚¹DN"
 
-#: templates/settings.php:27
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr "1è¡Œã«1ã¤ã®ãƒ™ãƒ¼ã‚¹DN"
 
-#: templates/settings.php:28
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "æ‹¡å¼µã‚¿ãƒ–ã§ãƒ¦ãƒ¼ã‚¶ã¨ã‚°ãƒ«ãƒ¼ãƒ—ã®ãƒ™ãƒ¼ã‚¹DNã‚’æŒ‡å®šã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚"
 
-#: templates/settings.php:30
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "ãƒ¦ãƒ¼ã‚¶DN"
 
-#: 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 "ã‚¯ãƒ©ã‚¤ã‚¢ãƒ³ãƒˆãƒ¦ãƒ¼ã‚¶ãƒ¼ã®DNã¯ã€ç‰¹å®šã®ã‚‚ã®ã«çµã³ã¤ã‘ã‚‹ã“ã¨ã¯ã—ã¾ã›ã‚“ã€‚ ä¾‹ãˆã° uid=agent,dc=example,dc=com. ã ã¨åŒ¿åã‚¢ã‚¯ã‚»ã‚¹ã®å ´åˆã€DNã¨ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰ã¯ç©ºã®ã¾ã¾ã§ã™ã€‚"
 
-#: 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 "åŒ¿åã‚¢ã‚¯ã‚»ã‚¹ã®å ´åˆã¯ã€DNã¨ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰ã‚’ç©ºã«ã—ã¦ãã ã•ã„ã€‚"
 
-#: 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 "ãƒã‚°ã‚¤ãƒ³ã™ã‚‹ã¨ãã«é©ç”¨ã™ã‚‹ãƒ•ã‚£ãƒ«ã‚¿ãƒ¼ã‚’å®šç¾©ã™ã‚‹ã€‚%%uid ãŒãƒã‚°ã‚¤ãƒ³æ™‚ã«ãƒ¦ãƒ¼ã‚¶ãƒ¼åã«ç½®ãæ›ãˆã‚‰ã‚Œã¾ã™ã€‚"
 
-#: templates/settings.php:41
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "%%uid ãƒ—ãƒ¬ãƒ¼ã‚¹ãƒ›ãƒ«ãƒ€ãƒ¼ã‚’åˆ©ç”¨ã—ã¦ãã ã•ã„ã€‚ä¾‹ \"uid=%%uid\""
 
-#: 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 "ãƒ—ãƒ¬ãƒ¼ã‚¹ãƒ›ãƒ«ãƒ€ãƒ¼ã‚’åˆ©ç”¨ã—ãªã„ã§ãã ã•ã„ã€‚ä¾‹ \"objectClass=person\""
 
-#: 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 "ãƒ—ãƒ¬ãƒ¼ã‚¹ãƒ›ãƒ«ãƒ€ãƒ¼ã‚’åˆ©ç”¨ã—ãªã„ã§ãã ã•ã„ã€‚ä¾‹ \"objectClass=posixGroup\""
 
-#: 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 "ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—ãƒ›ã‚¹ãƒˆã‚’ã‚ªãƒ—ã‚·ãƒ§ãƒ³ã§æŒ‡å®šã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ãƒ¡ã‚¤ãƒ³ã®LDAP/ADã‚µãƒ¼ãƒã®ãƒ¬ãƒ—ãƒªã‚«ã§ã‚ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚"
 
-#: 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 "æœ‰åŠ¹ã«ã™ã‚‹ã¨ã€ownCloudã¯ãƒ¬ãƒ—ãƒªã‚«ã‚µãƒ¼ãƒã«ã®ã¿æŽ¥ç¶šã—ã¾ã™ã€‚"
 
-#: templates/settings.php:62
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "TLSã‚’åˆ©ç”¨"
 
-#: templates/settings.php:62
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr "LDAPSæŽ¥ç¶šã®ãŸã‚ã«è¿½åŠ ã§ãã‚Œã‚’åˆ©ç”¨ã—ãªã„ã§ä¸‹ã•ã„ã€‚å¤±æ•—ã—ã¾ã™ã€‚"
 
-#: templates/settings.php:63
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "å¤§æ–‡å—ï¼å°æ–‡å—ã‚’åŒºåˆ¥ã—ãªã„LDAPã‚µãƒ¼ãƒï¼ˆWindowsï¼‰"
 
-#: templates/settings.php:64
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "SSLè¨¼æ˜Žæ›¸ã®ç¢ºèªã‚’ç„¡åŠ¹ã«ã™ã‚‹ã€‚"
 
-#: 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 "æŽ¥ç¶šãŒã“ã®ã‚ªãƒ—ã‚·ãƒ§ãƒ³ã§ã®ã¿å‹•ä½œã™ã‚‹å ´åˆã¯ã€LDAPã‚µãƒ¼ãƒã®SSLè¨¼æ˜Žæ›¸ã‚’ownCloudã‚µãƒ¼ãƒã«ã‚¤ãƒ³ãƒãƒ¼ãƒˆã—ã¦ãã ã•ã„ã€‚"
 
-#: 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 "ã‚ãƒ£ãƒƒã‚·ãƒ¥ã®TTL"
 
-#: 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 "ãƒ¦ãƒ¼ã‚¶ã®ownCloudåã®ç”Ÿæˆã«åˆ©ç”¨ã™ã‚‹LDAPå±žæ€§ã€‚"
 
-#: 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 "1è¡Œã«1ã¤ã®ãƒ¦ãƒ¼ã‚¶ãƒ™ãƒ¼ã‚¹DN"
 
-#: 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 "ã‚ªãƒ—ã‚·ãƒ§ãƒ³ï¼š1è¡Œã«1å±žæ€§"
 
-#: 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 "ã‚°ãƒ«ãƒ¼ãƒ—ã®ownCloudåã®ç”Ÿæˆã«åˆ©ç”¨ã™ã‚‹LDAPå±žæ€§ã€‚"
 
-#: 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 "1è¡Œã«1ã¤ã®ã‚°ãƒ«ãƒ¼ãƒ—ãƒ™ãƒ¼ã‚¹DN"
 
-#: 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 "ãƒ¦ãƒ¼ã‚¶åã‚’ç©ºã®ã¾ã¾ã«ã—ã¦ãã ã•ã„ï¼ˆãƒ‡ãƒ•ã‚©ãƒ«ãƒˆï¼‰ã€‚ãã†ã§ãªã„å ´åˆã¯ã€LDAPã‚‚ã—ãã¯ADã®å±žæ€§ã‚’æŒ‡å®šã—ã¦ãã ã•ã„ã€‚"
 
-#: 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 "ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã§ã¯ã€å†…éƒ¨ãƒ¦ãƒ¼ã‚¶åã¯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:86
+#: 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..2341b9f95c72b93cdd0cd03f102c7358e294c0b2 100644
--- a/l10n/ja_JP/user_webdavauth.po
+++ b/l10n/ja_JP/user_webdavauth.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-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-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+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 9bb57f7e7c8caeea69d09f065011f19ff8badd93..3840fc7208c7c981ee5d66fe812e300ffd1b91b4 100644
--- a/l10n/ka/core.po
+++ b/l10n/ka/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-02-27 14:35+0100\n"
-"PO-Revision-Date: 2011-07-25 16:05+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-04-30 01:57+0200\n"
+"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -160,76 +160,76 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:768
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "áƒ¬áƒáƒ›áƒ˜áƒ¡ áƒ¬áƒ˜áƒœ"
 
-#: js/js.js:769
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "1 áƒ¬áƒ£áƒ—áƒ˜áƒ¡ áƒ¬áƒ˜áƒœ"
 
-#: js/js.js:770
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:771
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr "1 áƒ¡áƒáƒáƒ—áƒ˜áƒ¡ áƒ¬áƒ˜áƒœ"
 
-#: js/js.js:772
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:773
+#: js/js.js:723
 msgid "today"
 msgstr "áƒ“áƒ¦áƒ”áƒ¡"
 
-#: js/js.js:774
+#: js/js.js:724
 msgid "yesterday"
 msgstr "áƒ’áƒ£áƒ¨áƒ˜áƒœ"
 
-#: js/js.js:775
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:776
+#: js/js.js:726
 msgid "last month"
 msgstr ""
 
-#: js/js.js:777
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:778
+#: js/js.js:728
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:779
+#: js/js.js:729
 msgid "last year"
 msgstr ""
 
-#: js/js.js:780
+#: js/js.js:730
 msgid "years ago"
 msgstr ""
 
-#: js/oc-dialogs.js:126
-msgid "Choose"
+#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
+msgid "Ok"
 msgstr ""
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
 msgid "Cancel"
 msgstr ""
 
-#: js/oc-dialogs.js:162
-msgid "No"
+#: js/oc-dialogs.js:185
+msgid "Choose"
 msgstr ""
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:215
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:180
-msgid "Ok"
+#: js/oc-dialogs.js:222
+msgid "No"
 msgstr ""
 
 #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
@@ -237,9 +237,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:152 js/share.js:159 js/share.js:582
-#: js/share.js:594
+#: 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 ""
 
@@ -251,127 +253,127 @@ msgstr ""
 msgid "The required file {file} is not installed!"
 msgstr ""
 
-#: js/share.js:29 js/share.js:43 js/share.js:90
+#: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr ""
 
-#: js/share.js:93
+#: js/share.js:90
 msgid "Share"
 msgstr ""
 
-#: js/share.js:141 js/share.js:622
+#: js/share.js:125 js/share.js:617
 msgid "Error while sharing"
 msgstr ""
 
-#: js/share.js:152
+#: js/share.js:136
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:159
+#: js/share.js:143
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:168
+#: js/share.js:152
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:170
+#: js/share.js:154
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:175
+#: js/share.js:159
 msgid "Share with"
 msgstr ""
 
-#: js/share.js:180
+#: js/share.js:164
 msgid "Share with link"
 msgstr ""
 
-#: js/share.js:183
+#: js/share.js:167
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:185 templates/installation.php:47 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "áƒžáƒáƒ áƒáƒšáƒ˜"
 
-#: js/share.js:189
+#: js/share.js:173
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:190
+#: js/share.js:174
 msgid "Send"
 msgstr ""
 
-#: js/share.js:194
+#: js/share.js:178
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:195
+#: js/share.js:179
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:227
+#: js/share.js:211
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:229
+#: js/share.js:213
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:256
+#: js/share.js:251
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:292
+#: js/share.js:287
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:313
+#: js/share.js:308
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:325
+#: js/share.js:320
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:327
+#: js/share.js:322
 msgid "access control"
 msgstr ""
 
-#: js/share.js:330
+#: js/share.js:325
 msgid "create"
 msgstr ""
 
-#: js/share.js:333
+#: js/share.js:328
 msgid "update"
 msgstr ""
 
-#: js/share.js:336
+#: js/share.js:331
 msgid "delete"
 msgstr ""
 
-#: js/share.js:339
+#: js/share.js:334
 msgid "share"
 msgstr ""
 
-#: js/share.js:373 js/share.js:569
+#: js/share.js:368 js/share.js:564
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:582
+#: js/share.js:577
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:594
+#: js/share.js:589
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:609
+#: js/share.js:604
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:620
+#: js/share.js:615
 msgid "Email sent"
 msgstr ""
 
@@ -394,24 +396,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:41
-#: 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,115 +473,129 @@ 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: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:33
+#: 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:37
+#: templates/installation.php:44
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
-#: templates/installation.php:55
+#: templates/installation.php:62
 msgid "Advanced"
 msgstr ""
 
-#: templates/installation.php:57
+#: templates/installation.php:64
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:66
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:71 templates/installation.php:83
-#: templates/installation.php:94 templates/installation.php:105
-#: templates/installation.php:117
+#: 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:129
+#: templates/installation.php:137
 msgid "Database user"
 msgstr ""
 
-#: templates/installation.php:134
+#: templates/installation.php:144
 msgid "Database password"
 msgstr ""
 
-#: templates/installation.php:139
+#: templates/installation.php:149
 msgid "Database name"
 msgstr ""
 
-#: templates/installation.php:149
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:156
+#: templates/installation.php:166
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:162
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr ""
 
-#: templates/layout.guest.php:35
+#: templates/layout.guest.php:40
 msgid "web services under your control"
 msgstr ""
 
-#: templates/layout.user.php:53
+#: 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 a70ab61b464bcee560d47c2401d05dc113b7ba32..b139973c0ca0c32333e265ddfcb3bee4d0a71ba7 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-03-04 00:06+0100\n"
-"PO-Revision-Date: 2013-03-03 23:06+0000\n"
+"POT-Creation-Date: 2013-05-15 01:59+0200\n"
+"PO-Revision-Date: 2013-05-15 00:00+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
 "MIME-Version: 1.0\n"
@@ -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 ""
@@ -70,59 +66,70 @@ msgstr ""
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:10
+#: 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 ""
 
-#: js/fileactions.js:127 templates/index.php:92 templates/index.php:93
+#: 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/files.js:292 js/files.js:408
-#: js/files.js:439
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:251
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:323
+#: 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 ""
@@ -145,77 +152,77 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:225
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:262
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:262
-msgid "Upload Error"
-msgstr ""
-
-#: js/files.js:273
-msgid "Close"
+#: js/files.js:277
+msgid "Not enough space available"
 msgstr ""
 
-#: js/files.js:312
-msgid "1 file uploading"
-msgstr ""
-
-#: js/files.js:315 js/files.js:370 js/files.js:385
-msgid "{count} files uploading"
-msgstr ""
-
-#: js/files.js:388 js/files.js:423
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:497
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:570
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:575
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:953 templates/index.php:68
+#: 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:954 templates/index.php:79
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr ""
 
-#: js/files.js:955 templates/index.php:81
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:974
+#: js/files.js:898
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:976
+#: js/files.js:900
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:984
+#: js/files.js:908
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:986
+#: 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 ""
@@ -268,45 +275,45 @@ msgstr ""
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:42
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:48
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:53
+#: templates/index.php:54
 msgid "You donâ€™t have write permissions here."
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:74
+#: templates/index.php:75
 msgid "Download"
 msgstr "áƒ’áƒáƒ“áƒ›áƒáƒ¬áƒ”áƒ áƒ"
 
-#: templates/index.php:86 templates/index.php:87
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr ""
 
-#: templates/index.php:106
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:108
+#: 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:113
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:116
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr ""
 
diff --git a/l10n/ka/files_encryption.po b/l10n/ka/files_encryption.po
index 5321e594c35c54b88517db4e7908682ec4767ed3..06cfd02260e3e57ca51b43cbe075bc5fbff606a1 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-04-26 10:00+0200\n"
+"PO-Revision-Date: 2013-04-26 08:01+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/files_external.po b/l10n/ka/files_external.po
index ff99ab06484501bbba82776a33813f4e599eefda..a9eecf3b31f35f07cd374aecfe0b6e9e5b67dd49 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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..9590d263fb3c043107c2aaa62badf5cd852dcb52 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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 84d63cc28b6ba51deee9cc467d8a72eee3a0c6ee..934d68261ea14ed776a20af937659157f1149912 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-03-08 00:25+0100\n"
-"PO-Revision-Date: 2013-03-07 23:25+0000\n"
+"POT-Creation-Date: 2013-04-26 10:00+0200\n"
+"PO-Revision-Date: 2013-04-26 08:01+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,12 +17,12 @@ msgstr ""
 "Language: ka\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/delete.php:40
+#: ajax/delete.php:42
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
 
-#: ajax/undelete.php:41
+#: ajax/undelete.php:42
 #, php-format
 msgid "Couldn't restore %s"
 msgstr ""
@@ -31,6 +31,10 @@ msgstr ""
 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 ""
diff --git a/l10n/ka/files_versions.po b/l10n/ka/files_versions.po
index 4f6c948624dd79acf0811c8477c63e9a95bb9c54..fe02221e103dda9e37fdbe1bc24e190864ae7396 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-04-26 10:00+0200\n"
+"PO-Revision-Date: 2013-04-26 08: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"
@@ -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 70d1ab92117df8e52e7de0a60e295f3e6e326257..26890fc56dc0c0b5ae404fc2725cdedbc4e6f67a 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-02-27 14:35+0100\n"
-"PO-Revision-Date: 2013-02-27 13:36+0000\n"
+"POT-Creation-Date: 2013-04-28 01:57+0200\n"
+"PO-Revision-Date: 2013-04-27 23:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
 "MIME-Version: 1.0\n"
@@ -42,19 +41,19 @@ msgstr ""
 msgid "Admin"
 msgstr "áƒáƒ“áƒ›áƒ˜áƒœáƒ˜áƒ¡áƒ¢áƒ áƒáƒ¢áƒáƒ áƒ˜"
 
-#: files.php:202
+#: files.php:209
 msgid "ZIP download is turned off."
 msgstr "ZIP áƒ’áƒáƒ“áƒ›áƒáƒ¬áƒ”áƒ áƒ áƒ’áƒáƒ›áƒáƒ áƒ—áƒ£áƒšáƒ˜áƒ"
 
-#: files.php:203
+#: files.php:210
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:204 files.php:231
+#: files.php:211 files.php:244
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:228
+#: files.php:241
 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,72 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:128 setup.php:320 setup.php:365
+#: setup.php:132 setup.php:325 setup.php:370
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:129 setup.php:152 setup.php:229
+#: setup.php:133 setup.php:156 setup.php:234
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:151 setup.php:453 setup.php:520
+#: setup.php:155 setup.php:458 setup.php:525
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:228
+#: setup.php:233
 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: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:583 setup.php:592 setup.php:600 setup.php:609
+#: setup.php:615
 #, 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:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
+#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
+#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:299
+#: setup.php:304
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:300
+#: setup.php:305
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:305
+#: setup.php:310
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:306
+#: setup.php:311
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:579 setup.php:611
+#: setup.php:584 setup.php:616
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:631
+#: setup.php:636
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:849
+#: setup.php:858
 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:859
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
@@ -240,19 +235,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 494239e38919ae623f74bf956b8047af33e88c34..d7da24759a28b80b8d736b48098951dc0938d458 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-02-27 14:35+0100\n"
-"PO-Revision-Date: 2013-02-27 13:35+0000\n"
+"POT-Creation-Date: 2013-04-27 02:17+0200\n"
+"PO-Revision-Date: 2013-04-26 08: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"
@@ -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 ""
 
@@ -92,7 +96,7 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: js/apps.js:36 js/apps.js:64
+#: js/apps.js:36 js/apps.js:64 js/apps.js:83
 msgid "Enable"
 msgstr ""
 
@@ -100,68 +104,68 @@ msgstr ""
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:84
-msgid "Updating...."
+#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+msgid "Error"
 msgstr ""
 
-#: js/apps.js:87
-msgid "Error while updating app"
+#: js/apps.js:90
+msgid "Updating...."
 msgstr ""
 
-#: js/apps.js:87
-msgid "Error"
+#: js/apps.js:93
+msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:90
+#: js/apps.js:96
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr ""
 
-#: js/users.js:30
+#: js/users.js:43
 msgid "deleted"
 msgstr ""
 
-#: js/users.js:30
+#: js/users.js:43
 msgid "undo"
 msgstr ""
 
-#: js/users.js:62
+#: js/users.js:75
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:75 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: templates/users.php:103
 msgid "Groups"
 msgstr ""
 
-#: js/users.js:78 templates/users.php:82 templates/users.php:119
+#: js/users.js:91 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:111 templates/users.php:155
 msgid "Delete"
 msgstr ""
 
-#: js/users.js:191
+#: js/users.js:262
 msgid "add group"
 msgstr ""
 
-#: js/users.js:352
+#: js/users.js:414
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:353 js/users.js:359 js/users.js:374
+#: js/users.js:415 js/users.js:421 js/users.js:436
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:358
+#: js/users.js:420
 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,15 +316,19 @@ msgstr ""
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:230 templates/personal.php:102
+#: templates/admin.php:228
+msgid "Less"
+msgstr ""
+
+#: templates/admin.php:235 templates/personal.php:105
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:233 templates/personal.php:105
+#: templates/admin.php:238 templates/personal.php:108
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -391,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:77
 msgid "Password"
 msgstr "áƒžáƒáƒ áƒáƒšáƒ˜"
 
@@ -415,82 +423,70 @@ msgstr ""
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:76
 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:75
 msgid "Login Name"
 msgstr ""
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr ""
 
-#: templates/users.php:35
+#: templates/users.php:33
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:39 templates/users.php:133
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:57 templates/users.php:148
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:84
+#: templates/users.php:82
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:95
+#: templates/users.php:93
 msgid "change display name"
 msgstr ""
 
-#: templates/users.php:99
+#: templates/users.php:97
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:134
+#: templates/users.php:128
 msgid "Default"
 msgstr ""
diff --git a/l10n/ka/user_ldap.po b/l10n/ka/user_ldap.po
index a49552a01fb6627be3a6f50d8f966c09fb51fd2c..597ca2251745727f6a6182fca3544c05e5995348 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-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-17 00:04+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..5433bc595c77dd9e8d0b0a0af0bfdea8c752640d 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-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/ka_GE/core.po b/l10n/ka_GE/core.po
index bf41a76a467267688267d136fe2487d0775b3e29..e0df88abc2fc8beeb864bd31aef88616ebd53a06 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-02-27 14:35+0100\n"
-"PO-Revision-Date: 2013-02-27 06:10+0000\n"
-"Last-Translator: drlinux64 <romeo@energo-pro.ge>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10: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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,30 +20,30 @@ msgstr ""
 #: ajax/share.php:97
 #, php-format
 msgid "User %s shared a file with you"
-msgstr ""
+msgstr "áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒ”áƒšáƒ›áƒ  %s áƒ’áƒáƒ’áƒ˜áƒ–áƒ˜áƒáƒ áƒáƒ— áƒ¤áƒáƒ˜áƒšáƒ˜"
 
 #: ajax/share.php:99
 #, php-format
 msgid "User %s shared a folder with you"
-msgstr ""
+msgstr "áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒ”áƒšáƒ›áƒ  %s áƒ’áƒáƒ’áƒ˜áƒ–áƒ˜áƒáƒ áƒáƒ— áƒ¤áƒáƒšáƒ“áƒ”áƒ áƒ˜"
 
 #: ajax/share.php:101
 #, php-format
 msgid ""
 "User %s shared the file \"%s\" with you. It is available for download here: "
 "%s"
-msgstr ""
+msgstr "áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒ”áƒšáƒ›áƒ %s áƒ’áƒáƒ’áƒ˜áƒ–áƒ˜áƒáƒ áƒáƒ— áƒ¤áƒáƒ˜áƒšáƒ˜ \"%s\". áƒ˜áƒ¡ áƒ®áƒ”áƒšáƒ›áƒ˜áƒ¡áƒáƒ¬áƒ•áƒ“áƒáƒ›áƒ˜áƒ áƒ’áƒáƒ“áƒ›áƒáƒ¡áƒáƒ¬áƒ”áƒ áƒáƒ“ áƒáƒ¥: %s"
 
 #: ajax/share.php:104
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
 "here: %s"
-msgstr ""
+msgstr "áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒ”áƒšáƒ›áƒ %s áƒ’áƒáƒ’áƒ˜áƒ–áƒ˜áƒáƒ áƒáƒ— áƒ¤áƒáƒšáƒ“áƒ”áƒ áƒ˜ \"%s\". áƒ˜áƒ¡ áƒ®áƒ”áƒšáƒ›áƒ˜áƒ¡áƒáƒ¬áƒ•áƒ“áƒáƒ›áƒ˜áƒ áƒ’áƒáƒ“áƒ›áƒáƒ¡áƒáƒ¬áƒ”áƒ áƒáƒ“ áƒáƒ¥: %s"
 
 #: 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?"
@@ -54,24 +52,24 @@ 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
 #: 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 ""
+msgstr "%s ID áƒáƒ  áƒáƒ áƒ˜áƒ¡ áƒ’áƒáƒœáƒ®áƒ˜áƒšáƒ£áƒšáƒ˜"
 
 #: ajax/vcategories/addToFavorites.php:35
 #, php-format
 msgid "Error adding %s to favorites."
-msgstr ""
+msgstr "áƒ¨áƒ”áƒªáƒ“áƒáƒ›áƒ %sâ€“áƒ˜áƒ¡ áƒ¤áƒ”áƒ•áƒáƒ áƒ˜áƒ¢áƒ”áƒ‘áƒ¨áƒ˜ áƒ“áƒáƒ›áƒáƒ¢áƒ”áƒ‘áƒ˜áƒ¡ áƒ“áƒ áƒáƒ¡."
 
 #: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
 msgid "No categories selected for deletion."
@@ -80,7 +78,7 @@ msgstr "áƒ¡áƒáƒ áƒ”áƒ“áƒáƒ¥áƒ¢áƒ˜áƒ áƒ”áƒ‘áƒ”áƒšáƒ˜ áƒ™áƒáƒ¢áƒ”áƒ’áƒáƒ áƒ˜
 #: ajax/vcategories/removeFromFavorites.php:35
 #, php-format
 msgid "Error removing %s from favorites."
-msgstr ""
+msgstr "áƒ¨áƒ”áƒªáƒ“áƒáƒ›áƒ  %sâ€“áƒ˜áƒ¡ áƒ¤áƒ”áƒ•áƒáƒ áƒ˜áƒ¢áƒ”áƒ‘áƒ˜áƒ“áƒáƒœ áƒ¬áƒáƒ¨áƒšáƒ˜áƒ¡ áƒ“áƒ áƒáƒ¡."
 
 #: js/config.php:34
 msgid "Sunday"
@@ -162,231 +160,233 @@ msgstr "áƒ“áƒ”áƒ™áƒ”áƒ›áƒ‘áƒ”áƒ áƒ˜"
 msgid "Settings"
 msgstr "áƒžáƒáƒ áƒáƒ›áƒ”áƒ¢áƒ áƒ”áƒ‘áƒ˜"
 
-#: js/js.js:768
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "áƒ¬áƒáƒ›áƒ˜áƒ¡ áƒ¬áƒ˜áƒœ"
 
-#: js/js.js:769
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "1 áƒ¬áƒ£áƒ—áƒ˜áƒ¡ áƒ¬áƒ˜áƒœ"
 
-#: js/js.js:770
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr "{minutes} áƒ¬áƒ£áƒ—áƒ˜áƒ¡ áƒ¬áƒ˜áƒœ"
 
-#: js/js.js:771
+#: js/js.js:721
 msgid "1 hour ago"
-msgstr ""
+msgstr "1 áƒ¡áƒáƒáƒ—áƒ˜áƒ¡ áƒ¬áƒ˜áƒœ"
 
-#: js/js.js:772
+#: js/js.js:722
 msgid "{hours} hours ago"
-msgstr ""
+msgstr "{hours} áƒ¡áƒáƒáƒ—áƒ˜áƒ¡ áƒ¬áƒ˜áƒœ"
 
-#: js/js.js:773
+#: js/js.js:723
 msgid "today"
 msgstr "áƒ“áƒ¦áƒ”áƒ¡"
 
-#: js/js.js:774
+#: js/js.js:724
 msgid "yesterday"
 msgstr "áƒ’áƒ£áƒ¨áƒ˜áƒœ"
 
-#: js/js.js:775
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr "{days} áƒ“áƒ¦áƒ˜áƒ¡ áƒ¬áƒ˜áƒœ"
 
-#: js/js.js:776
+#: js/js.js:726
 msgid "last month"
 msgstr "áƒ’áƒáƒ¡áƒ£áƒš áƒ—áƒ•áƒ”áƒ¨áƒ˜"
 
-#: js/js.js:777
+#: js/js.js:727
 msgid "{months} months ago"
-msgstr ""
+msgstr "{months} áƒ—áƒ•áƒ˜áƒ¡ áƒ¬áƒ˜áƒœ"
 
-#: js/js.js:778
+#: js/js.js:728
 msgid "months ago"
 msgstr "áƒ—áƒ•áƒ˜áƒ¡ áƒ¬áƒ˜áƒœ"
 
-#: js/js.js:779
+#: js/js.js:729
 msgid "last year"
 msgstr "áƒ‘áƒáƒšáƒ áƒ¬áƒ”áƒšáƒ¡"
 
-#: js/js.js:780
+#: js/js.js:730
 msgid "years ago"
 msgstr "áƒ¬áƒšáƒ˜áƒ¡ áƒ¬áƒ˜áƒœ"
 
-#: js/oc-dialogs.js:126
-msgid "Choose"
-msgstr "áƒáƒ áƒ©áƒ”áƒ•áƒ"
+#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
+msgid "Ok"
+msgstr "áƒ“áƒ˜áƒáƒ®"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
 msgid "Cancel"
 msgstr "áƒ£áƒáƒ áƒ§áƒáƒ¤áƒ"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "áƒáƒ áƒ"
+#: js/oc-dialogs.js:185
+msgid "Choose"
+msgstr "áƒáƒ áƒ©áƒ”áƒ•áƒ"
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:215
 msgid "Yes"
 msgstr "áƒ™áƒ˜"
 
-#: js/oc-dialogs.js:180
-msgid "Ok"
-msgstr "áƒ“áƒ˜áƒáƒ®"
+#: js/oc-dialogs.js:222
+msgid "No"
+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:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:582
-#: js/share.js:594
+#: 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 ""
+msgstr "áƒáƒžáƒšáƒ˜áƒ™áƒáƒªáƒ˜áƒ˜áƒ¡ áƒ¡áƒáƒ®áƒ”áƒšáƒ˜ áƒáƒ  áƒáƒ áƒ˜áƒ¡ áƒ›áƒ˜áƒ—áƒ˜áƒ—áƒ”áƒ‘áƒ£áƒšáƒ˜."
 
 #: js/oc-vcategories.js:194
 msgid "The required file {file} is not installed!"
-msgstr ""
+msgstr "áƒ›áƒáƒ—áƒ®áƒáƒ•áƒœáƒ˜áƒšáƒ˜ áƒ¤áƒáƒ˜áƒšáƒ˜  {file} áƒáƒ  áƒáƒ áƒ˜áƒ¡ áƒ“áƒáƒ˜áƒœáƒ¡áƒ¢áƒáƒšáƒ˜áƒ áƒ”áƒ‘áƒ£áƒšáƒ˜."
 
-#: js/share.js:29 js/share.js:43 js/share.js:90
+#: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
-msgstr ""
+msgstr "áƒ’áƒáƒ–áƒ˜áƒáƒ áƒ”áƒ‘áƒ£áƒšáƒ˜"
 
-#: js/share.js:93
+#: js/share.js:90
 msgid "Share"
 msgstr "áƒ’áƒáƒ–áƒ˜áƒáƒ áƒ”áƒ‘áƒ"
 
-#: js/share.js:141 js/share.js:622
+#: js/share.js:125 js/share.js:617
 msgid "Error while sharing"
 msgstr "áƒ¨áƒ”áƒªáƒ“áƒáƒ›áƒ áƒ’áƒáƒ–áƒ˜áƒáƒ áƒ”áƒ‘áƒ˜áƒ¡ áƒ“áƒ áƒáƒ¡"
 
-#: js/share.js:152
+#: js/share.js:136
 msgid "Error while unsharing"
 msgstr "áƒ¨áƒ”áƒªáƒ“áƒáƒ›áƒ áƒ’áƒáƒ–áƒ˜áƒáƒ áƒ”áƒ‘áƒ˜áƒ¡ áƒ’áƒáƒ£áƒ¥áƒ›áƒ”áƒ‘áƒ˜áƒ¡ áƒ“áƒ áƒáƒ¡"
 
-#: js/share.js:159
+#: js/share.js:143
 msgid "Error while changing permissions"
 msgstr "áƒ¨áƒ”áƒªáƒ“áƒáƒ›áƒ áƒ“áƒáƒ¨áƒ•áƒ”áƒ‘áƒ˜áƒ¡ áƒªáƒ•áƒšáƒ˜áƒšáƒ”áƒ‘áƒ˜áƒ¡ áƒ“áƒ áƒáƒ¡"
 
-#: js/share.js:168
+#: js/share.js:152
 msgid "Shared with you and the group {group} by {owner}"
-msgstr ""
+msgstr "áƒ’áƒáƒ–áƒ˜áƒáƒ áƒ“áƒ áƒ—áƒ¥áƒ•áƒ”áƒœáƒ—áƒ•áƒ˜áƒ¡ áƒ“áƒ áƒ¯áƒ’áƒ£áƒ¤áƒ˜áƒ¡áƒ—áƒ•áƒ˜áƒ¡ {group}, {owner}â€“áƒ˜áƒ¡ áƒ›áƒ˜áƒ”áƒ "
 
-#: js/share.js:170
+#: js/share.js:154
 msgid "Shared with you by {owner}"
-msgstr ""
+msgstr "áƒ’áƒáƒ–áƒ˜áƒáƒ áƒ“áƒ áƒ—áƒ¥áƒ•áƒ”áƒœáƒ—áƒ•áƒ˜áƒ¡ {owner}â€“áƒ˜áƒ¡ áƒ›áƒ˜áƒ”áƒ "
 
-#: js/share.js:175
+#: js/share.js:159
 msgid "Share with"
-msgstr "áƒ’áƒáƒ£áƒ–áƒ˜áƒáƒ áƒ”"
+msgstr "áƒ’áƒáƒáƒ–áƒ˜áƒáƒ áƒ” áƒ¨áƒ”áƒ›áƒ“áƒ”áƒ’áƒ˜áƒ—:"
 
-#: js/share.js:180
+#: js/share.js:164
 msgid "Share with link"
 msgstr "áƒ’áƒáƒ£áƒ–áƒ˜áƒáƒ áƒ” áƒšáƒ˜áƒœáƒ™áƒ˜áƒ—"
 
-#: js/share.js:183
+#: js/share.js:167
 msgid "Password protect"
 msgstr "áƒžáƒáƒ áƒáƒšáƒ˜áƒ— áƒ“áƒáƒªáƒ•áƒ"
 
-#: js/share.js:185 templates/installation.php:47 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "áƒžáƒáƒ áƒáƒšáƒ˜"
 
-#: js/share.js:189
+#: js/share.js:173
 msgid "Email link to person"
-msgstr ""
+msgstr "áƒšáƒ˜áƒœáƒ™áƒ˜áƒ¡ áƒžáƒ˜áƒ áƒáƒ•áƒœáƒ”áƒ‘áƒ˜áƒ¡ áƒ˜áƒ›áƒ”áƒ˜áƒšáƒ–áƒ” áƒ’áƒáƒ’áƒ–áƒáƒ•áƒœáƒ"
 
-#: js/share.js:190
+#: js/share.js:174
 msgid "Send"
-msgstr ""
+msgstr "áƒ’áƒáƒ’áƒ–áƒáƒ•áƒœáƒ"
 
-#: js/share.js:194
+#: js/share.js:178
 msgid "Set expiration date"
 msgstr "áƒ›áƒ˜áƒ£áƒ—áƒ˜áƒ—áƒ” áƒ•áƒáƒ“áƒ˜áƒ¡ áƒ’áƒáƒ¡áƒ•áƒšáƒ˜áƒ¡ áƒ“áƒ áƒ"
 
-#: js/share.js:195
+#: js/share.js:179
 msgid "Expiration date"
 msgstr "áƒ•áƒáƒ“áƒ˜áƒ¡ áƒ’áƒáƒ¡áƒ•áƒšáƒ˜áƒ¡ áƒ“áƒ áƒ"
 
-#: js/share.js:227
+#: js/share.js:211
 msgid "Share via email:"
 msgstr "áƒ’áƒáƒáƒ–áƒ˜áƒáƒ áƒ” áƒ›áƒ”áƒ˜áƒšáƒ–áƒ”"
 
-#: js/share.js:229
+#: js/share.js:213
 msgid "No people found"
 msgstr "áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒ”áƒšáƒ˜ áƒáƒ  áƒáƒ áƒ˜áƒ¡ áƒœáƒáƒžáƒáƒ•áƒœáƒ˜"
 
-#: js/share.js:256
+#: js/share.js:251
 msgid "Resharing is not allowed"
 msgstr "áƒ›áƒ”áƒáƒ áƒ”áƒ¯áƒ”áƒ  áƒ’áƒáƒ–áƒ˜áƒáƒ áƒ”áƒ‘áƒ áƒáƒ  áƒáƒ áƒ˜áƒ¡ áƒ“áƒáƒ¨áƒ•áƒ”áƒ‘áƒ£áƒšáƒ˜"
 
-#: js/share.js:292
+#: js/share.js:287
 msgid "Shared in {item} with {user}"
-msgstr ""
+msgstr "áƒ’áƒáƒ–áƒ˜áƒáƒ áƒ“áƒ {item}â€“áƒ¨áƒ˜  {user}â€“áƒ˜áƒ¡ áƒ›áƒ˜áƒ”áƒ "
 
-#: js/share.js:313
+#: js/share.js:308
 msgid "Unshare"
-msgstr "áƒ’áƒáƒ–áƒ˜áƒáƒ áƒ”áƒ‘áƒ˜áƒ¡ áƒ›áƒáƒ®áƒ¡áƒœáƒ"
+msgstr "áƒ’áƒáƒ£áƒ–áƒ˜áƒáƒ áƒ”áƒ‘áƒáƒ“áƒ˜"
 
-#: js/share.js:325
+#: js/share.js:320
 msgid "can edit"
 msgstr "áƒ¨áƒ”áƒ’áƒ˜áƒ«áƒšáƒ˜áƒ áƒ¨áƒ”áƒªáƒ•áƒšáƒ"
 
-#: js/share.js:327
+#: js/share.js:322
 msgid "access control"
 msgstr "áƒ“áƒáƒ¨áƒ•áƒ”áƒ‘áƒ˜áƒ¡ áƒ™áƒáƒœáƒ¢áƒ áƒáƒšáƒ˜"
 
-#: js/share.js:330
+#: js/share.js:325
 msgid "create"
 msgstr "áƒ¨áƒ”áƒ¥áƒ›áƒœáƒ"
 
-#: js/share.js:333
+#: js/share.js:328
 msgid "update"
 msgstr "áƒ’áƒáƒœáƒáƒ®áƒšáƒ”áƒ‘áƒ"
 
-#: js/share.js:336
+#: js/share.js:331
 msgid "delete"
 msgstr "áƒ¬áƒáƒ¨áƒšáƒ"
 
-#: js/share.js:339
+#: js/share.js:334
 msgid "share"
 msgstr "áƒ’áƒáƒ–áƒ˜áƒáƒ áƒ”áƒ‘áƒ"
 
-#: js/share.js:373 js/share.js:569
+#: js/share.js:368 js/share.js:564
 msgid "Password protected"
 msgstr "áƒžáƒáƒ áƒáƒšáƒ˜áƒ— áƒ“áƒáƒªáƒ£áƒšáƒ˜"
 
-#: js/share.js:582
+#: js/share.js:577
 msgid "Error unsetting expiration date"
 msgstr "áƒ¨áƒ”áƒªáƒ“áƒáƒ›áƒ áƒ•áƒáƒ“áƒ˜áƒ¡ áƒ’áƒáƒ¡áƒ•áƒšáƒ˜áƒ¡ áƒ›áƒáƒ®áƒ¡áƒœáƒ˜áƒ¡ áƒ“áƒ áƒáƒ¡"
 
-#: js/share.js:594
+#: js/share.js:589
 msgid "Error setting expiration date"
 msgstr "áƒ¨áƒ”áƒªáƒ“áƒáƒ›áƒ áƒ•áƒáƒ“áƒ˜áƒ¡ áƒ’áƒáƒ¡áƒ•áƒšáƒ˜áƒ¡ áƒ›áƒ˜áƒ—áƒ˜áƒ—áƒ”áƒ‘áƒ˜áƒ¡ áƒ“áƒ áƒáƒ¡"
 
-#: js/share.js:609
+#: js/share.js:604
 msgid "Sending ..."
-msgstr ""
+msgstr "áƒ’áƒáƒ’áƒ–áƒáƒ•áƒœáƒ ...."
 
-#: js/share.js:620
+#: 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 ""
+msgstr "áƒ’áƒáƒœáƒáƒ®áƒšáƒ”áƒ‘áƒ áƒ•áƒ”áƒ  áƒ’áƒáƒœáƒ®áƒáƒ áƒªáƒ˜áƒ”áƒšáƒ“áƒ. áƒ’áƒ—áƒ®áƒáƒ•áƒ— áƒ¨áƒ”áƒ’áƒ•áƒáƒ¢áƒ§áƒáƒ‘áƒ˜áƒœáƒáƒ— áƒáƒ› áƒžáƒ áƒáƒ‘áƒšáƒ”áƒ›áƒ˜áƒ¡ áƒ¨áƒ”áƒ¡áƒáƒ®áƒ”áƒ‘ áƒáƒ¥: <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 ""
+msgstr "áƒ’áƒáƒœáƒáƒ®áƒšáƒ”áƒ‘áƒ áƒ•áƒ”áƒ  áƒ’áƒáƒœáƒ®áƒáƒ áƒªáƒ˜áƒ”áƒšáƒ“áƒ. áƒ’áƒáƒ“áƒáƒ›áƒ˜áƒ¡áƒáƒ›áƒáƒ áƒ—áƒ”áƒ‘áƒ áƒ—áƒ¥áƒ•áƒ”áƒœáƒ¡ ownCloudâ€“áƒ–áƒ”."
 
 #: lostpassword/controller.php:48
 msgid "ownCloud password reset"
@@ -396,24 +396,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: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:41
-#: 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 "áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒ”áƒšáƒ˜"
+msgstr "áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒšáƒ˜áƒ¡ áƒ¡áƒáƒ®áƒ”áƒšáƒ˜"
 
-#: lostpassword/templates/lostpassword.php:14
+#: lostpassword/templates/lostpassword.php:21
 msgid "Request reset"
 msgstr "áƒžáƒáƒ áƒáƒšáƒ˜áƒ¡ áƒ¨áƒ”áƒªáƒ•áƒšáƒ˜áƒ¡ áƒ›áƒáƒ—áƒ®áƒáƒ•áƒœáƒ"
 
@@ -439,7 +442,7 @@ msgstr "áƒžáƒ˜áƒ áƒáƒ“áƒ˜"
 
 #: strings.php:6
 msgid "Users"
-msgstr "áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒšáƒ”áƒ‘áƒ˜"
+msgstr "áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒ”áƒšáƒ˜"
 
 #: strings.php:7
 msgid "Apps"
@@ -447,7 +450,7 @@ msgstr "áƒáƒžáƒšáƒ˜áƒ™áƒáƒªáƒ˜áƒ”áƒ‘áƒ˜"
 
 #: strings.php:8
 msgid "Admin"
-msgstr "áƒáƒ“áƒ›áƒ˜áƒœáƒ˜"
+msgstr "áƒáƒ“áƒ›áƒ˜áƒœáƒ˜áƒ¡áƒ¢áƒ áƒáƒ¢áƒáƒ áƒ˜"
 
 #: strings.php:9
 msgid "Help"
@@ -470,117 +473,131 @@ 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 "áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ PHP áƒ•áƒ”áƒ áƒ¡áƒ˜áƒ áƒ¨áƒ”áƒ˜áƒªáƒáƒ•áƒ¡ áƒ¡áƒáƒ¤áƒ áƒ—áƒ®áƒ”áƒ¡  NULL Byte áƒ¨áƒ”áƒ¢áƒ”áƒ•áƒ”áƒ‘áƒ˜áƒ¡áƒ—áƒ•áƒ˜áƒ¡ (CVE-2006-7243)"
+
+#: templates/installation.php:26
+msgid "Please update your PHP installation to use ownCloud securely."
+msgstr "áƒ˜áƒ›áƒ˜áƒ¡áƒáƒ—áƒ•áƒ˜áƒ¡ áƒ áƒáƒ› áƒ’áƒáƒ›áƒáƒ˜áƒ§áƒ”áƒœáƒáƒ— ownCloud áƒ£áƒ¡áƒáƒ¤áƒ áƒ—áƒ®áƒáƒ“, áƒ’áƒ—áƒ®áƒáƒ•áƒ— áƒ’áƒáƒœáƒáƒáƒ®áƒšáƒáƒ— áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜  PHP áƒ•áƒ”áƒ áƒ¡áƒ˜áƒ."
+
+#: templates/installation.php:32
 msgid ""
 "No secure random number generator is available, please enable the PHP "
 "OpenSSL extension."
 msgstr "áƒ¨áƒ”áƒ›áƒ—áƒ®áƒ•áƒ”áƒ•áƒ˜áƒ—áƒ˜ áƒ¡áƒ˜áƒ›áƒ‘áƒáƒšáƒáƒ”áƒ‘áƒ˜áƒ¡ áƒ’áƒ”áƒœáƒ”áƒ áƒáƒ¢áƒáƒ áƒ˜ áƒáƒ  áƒáƒ áƒ¡áƒ”áƒ‘áƒáƒ‘áƒ¡, áƒ’áƒ—áƒ®áƒáƒ•áƒ— áƒ©áƒáƒ áƒ—áƒáƒ— PHP OpenSSL áƒ’áƒáƒ¤áƒáƒ áƒ—áƒáƒ”áƒ‘áƒ."
 
-#: 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 ""
+msgstr "áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ data áƒ“áƒ˜áƒ áƒ”áƒ¥áƒ¢áƒáƒ áƒ˜áƒ áƒ“áƒ áƒ¤áƒáƒ˜áƒšáƒ”áƒ‘áƒ˜ áƒ“áƒáƒ¨áƒ•áƒ”áƒ‘áƒáƒ“áƒ˜áƒ áƒ˜áƒœáƒ¢áƒ”áƒ áƒœáƒ”áƒ¢áƒ¨áƒ˜ áƒ áƒáƒ“áƒ’áƒáƒœ  .htaccess áƒ¤áƒáƒ˜áƒšáƒ˜ áƒáƒ  áƒ›áƒ£áƒ¨áƒáƒáƒ‘áƒ¡."
 
-#: templates/installation.php:33
+#: 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:37
+#: templates/installation.php:44
 msgid "Create an <strong>admin account</strong>"
 msgstr "áƒ¨áƒ”áƒ¥áƒ›áƒ”áƒœáƒ˜ <strong>áƒáƒ“áƒ›áƒ˜áƒœ áƒ”áƒ¥áƒáƒ£áƒœáƒ¢áƒ˜</strong>"
 
-#: templates/installation.php:55
+#: templates/installation.php:62
 msgid "Advanced"
-msgstr "Advanced"
+msgstr "áƒ“áƒáƒ›áƒáƒ¢áƒ”áƒ‘áƒ˜áƒ—áƒ˜ áƒ¤áƒ£áƒœáƒ¥áƒªáƒ˜áƒ”áƒ‘áƒ˜"
 
-#: templates/installation.php:57
+#: templates/installation.php:64
 msgid "Data folder"
 msgstr "áƒ›áƒáƒœáƒáƒªáƒ”áƒ›áƒ—áƒ áƒ¡áƒáƒ¥áƒáƒ¦áƒáƒšáƒ“áƒ”"
 
-#: templates/installation.php:66
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "áƒ›áƒáƒœáƒáƒªáƒ”áƒ›áƒ—áƒ áƒ‘áƒáƒ–áƒ˜áƒ¡ áƒ™áƒáƒœáƒ¤áƒ˜áƒ’áƒ£áƒ áƒ˜áƒ áƒ”áƒ‘áƒ"
 
-#: templates/installation.php:71 templates/installation.php:83
-#: templates/installation.php:94 templates/installation.php:105
-#: templates/installation.php:117
+#: 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:129
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "áƒ›áƒáƒœáƒáƒªáƒ”áƒ›áƒ—áƒ áƒ‘áƒáƒ–áƒ˜áƒ¡ áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒ”áƒšáƒ˜"
 
-#: templates/installation.php:134
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "áƒ›áƒáƒœáƒáƒªáƒ”áƒ›áƒ—áƒ áƒ‘áƒáƒ–áƒ˜áƒ¡ áƒžáƒáƒ áƒáƒšáƒ˜"
 
-#: templates/installation.php:139
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "áƒ›áƒáƒœáƒáƒªáƒ”áƒ›áƒ—áƒ áƒ‘áƒáƒ–áƒ˜áƒ¡ áƒ¡áƒáƒ®áƒ”áƒšáƒ˜"
 
-#: templates/installation.php:149
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "áƒ‘áƒáƒ–áƒ˜áƒ¡ áƒªáƒ®áƒ áƒ˜áƒšáƒ˜áƒ¡ áƒ–áƒáƒ›áƒ"
 
-#: templates/installation.php:156
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "áƒ›áƒáƒœáƒáƒªáƒ”áƒ›áƒ—áƒ áƒ‘áƒáƒ–áƒ˜áƒ¡ áƒ°áƒáƒ¡áƒ¢áƒ˜"
 
-#: templates/installation.php:162
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "áƒ™áƒáƒœáƒ¤áƒ˜áƒ’áƒ£áƒ áƒáƒªáƒ˜áƒ˜áƒ¡ áƒ“áƒáƒ¡áƒ áƒ£áƒšáƒ”áƒ‘áƒ"
 
-#: templates/layout.guest.php:35
+#: templates/layout.guest.php:40
 msgid "web services under your control"
-msgstr "áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ áƒ™áƒáƒœáƒ¢áƒ áƒáƒšáƒ˜áƒ¡ áƒ¥áƒ•áƒ”áƒ¨ áƒ›áƒ§áƒáƒ¤áƒ˜ áƒ•áƒ”áƒ‘ áƒ¡áƒ”áƒ áƒ•áƒ˜áƒ¡áƒ”áƒ‘áƒ˜"
+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:53
+#: 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 ""
+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 ""
+msgstr "áƒáƒšáƒ¢áƒ”áƒ áƒœáƒáƒ¢áƒ˜áƒ£áƒšáƒ˜ Loginâ€“áƒ˜"
 
 #: templates/part.pagenavi.php:3
 msgid "prev"
@@ -593,4 +610,4 @@ msgstr "áƒ¨áƒ”áƒ›áƒ“áƒ”áƒ’áƒ˜"
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
-msgstr ""
+msgstr "ownCloudâ€“áƒ˜áƒ¡ áƒ’áƒáƒœáƒáƒ®áƒšáƒ”áƒ‘áƒ %sâ€“áƒ•áƒ”áƒ áƒ¡áƒ˜áƒáƒ›áƒ“áƒ”. áƒ”áƒ¡ áƒ›áƒáƒ˜áƒ—áƒ®áƒáƒ•áƒ¡ áƒ’áƒáƒ áƒ™áƒ•áƒ”áƒ£áƒš áƒ“áƒ áƒáƒ¡."
diff --git a/l10n/ka_GE/files.po b/l10n/ka_GE/files.po
index dd8bcd2633cf7ef9a1ec8a2b5d78bfac380589b8..11183252ce8a8e407d3b1d6779ab90e193a5a5c6 100644
--- a/l10n/ka_GE/files.po
+++ b/l10n/ka_GE/files.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <romeo@energo-pro.ge>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-04 00:06+0100\n"
-"PO-Revision-Date: 2013-03-03 23:06+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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"
@@ -21,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"
@@ -43,7 +38,7 @@ msgstr "áƒáƒáƒªáƒ“áƒáƒ›áƒ áƒáƒ  áƒ“áƒáƒ¤áƒ˜áƒ¥áƒ¡áƒ˜áƒ áƒ“áƒ, áƒ¤áƒáƒ˜
 #: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
-msgstr ""
+msgstr "áƒáƒ¢áƒ•áƒ˜áƒ áƒ—áƒ£áƒšáƒ˜ áƒ¤áƒáƒ˜áƒšáƒ˜ áƒáƒáƒáƒ áƒ‘áƒ”áƒ‘áƒ¡ upload_max_filesize áƒ“áƒ˜áƒ áƒ”áƒ¥áƒ¢áƒ˜áƒ•áƒáƒ¡ php.ini áƒ¤áƒáƒ˜áƒšáƒ¨áƒ˜"
 
 #: ajax/upload.php:29
 msgid ""
@@ -69,154 +64,165 @@ msgstr "áƒ¨áƒ”áƒªáƒ“áƒáƒ›áƒ áƒ“áƒ˜áƒ¡áƒ™áƒ–áƒ” áƒ©áƒáƒ¬áƒ”áƒ áƒ˜áƒ¡áƒáƒ¡"
 
 #: ajax/upload.php:51
 msgid "Not enough storage available"
-msgstr ""
+msgstr "áƒ¡áƒáƒªáƒáƒ•áƒ¨áƒ˜ áƒ¡áƒáƒ™áƒ›áƒáƒ áƒ˜áƒ¡áƒ˜ áƒáƒ“áƒ’áƒ˜áƒšáƒ˜ áƒáƒ  áƒáƒ áƒ˜áƒ¡"
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
-msgstr ""
+msgstr "áƒ“áƒáƒ£áƒ¨áƒ•áƒ”áƒ‘áƒ”áƒšáƒ˜ áƒ“áƒ˜áƒ áƒ”áƒ¥áƒ¢áƒáƒ áƒ˜áƒ."
 
-#: appinfo/app.php:10
+#: 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:92 templates/index.php:93
+#: 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/files.js:292 js/files.js:408
-#: js/files.js:439
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "áƒ›áƒáƒªáƒ“áƒ˜áƒ¡ áƒ áƒ”áƒŸáƒ˜áƒ›áƒ¨áƒ˜"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} áƒ£áƒ™áƒ•áƒ” áƒáƒ áƒ¡áƒ”áƒ‘áƒáƒ‘áƒ¡"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "áƒ¨áƒ”áƒªáƒ•áƒšáƒ"
 
-#: js/filelist.js:251
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "áƒ¡áƒáƒ®áƒ”áƒšáƒ˜áƒ¡ áƒ¨áƒ”áƒ›áƒáƒ—áƒáƒ•áƒáƒ–áƒ”áƒ‘áƒ"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "áƒ£áƒáƒ áƒ§áƒáƒ¤áƒ"
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "{new_name} áƒ¨áƒ”áƒªáƒ•áƒšáƒ˜áƒšáƒ˜áƒ {old_name}â€“áƒ˜áƒ—"
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "undo"
 msgstr "áƒ“áƒáƒ‘áƒ áƒ£áƒœáƒ”áƒ‘áƒ"
 
-#: js/filelist.js:323
+#: js/filelist.js:331
 msgid "perform delete operation"
-msgstr ""
+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 ""
+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 ""
+msgstr "áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ áƒ¡áƒáƒªáƒáƒ•áƒ˜ áƒ—áƒ˜áƒ—áƒ¥áƒ›áƒ˜áƒ¡ áƒ’áƒáƒ“áƒáƒ˜áƒ•áƒ¡áƒ ({usedSpacePercent}%)"
 
-#: js/files.js:225
+#: 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:262
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ áƒ¤áƒáƒ˜áƒšáƒ˜áƒ¡ áƒáƒ¢áƒ•áƒ˜áƒ áƒ—áƒ•áƒ áƒ•áƒ”áƒ  áƒ›áƒáƒ®áƒ”áƒ áƒ®áƒ“áƒ. áƒ˜áƒ¡ áƒáƒ áƒ˜áƒ¡ áƒ¡áƒáƒ¥áƒáƒ¦áƒáƒšáƒ“áƒ” áƒ“áƒ áƒ¨áƒ”áƒ˜áƒªáƒáƒ•áƒ¡ 0 áƒ‘áƒáƒ˜áƒ¢áƒ¡"
 
-#: js/files.js:262
-msgid "Upload Error"
-msgstr "áƒ¨áƒ”áƒªáƒ“áƒáƒ›áƒ áƒáƒ¢áƒ•áƒ˜áƒ áƒ—áƒ•áƒ˜áƒ¡áƒáƒ¡"
-
-#: js/files.js:273
-msgid "Close"
-msgstr "áƒ“áƒáƒ®áƒ£áƒ áƒ•áƒ"
-
-#: js/files.js:312
-msgid "1 file uploading"
-msgstr "1 áƒ¤áƒáƒ˜áƒšáƒ˜áƒ¡ áƒáƒ¢áƒ•áƒ˜áƒ áƒ—áƒ•áƒ"
-
-#: js/files.js:315 js/files.js:370 js/files.js:385
-msgid "{count} files uploading"
-msgstr "{count} áƒ¤áƒáƒ˜áƒšáƒ˜ áƒ˜áƒ¢áƒ•áƒ˜áƒ áƒ—áƒ”áƒ‘áƒ"
+#: js/files.js:277
+msgid "Not enough space available"
+msgstr "áƒ¡áƒáƒ™áƒ›áƒáƒ áƒ˜áƒ¡áƒ˜ áƒáƒ“áƒ’áƒ˜áƒšáƒ˜ áƒáƒ  áƒáƒ áƒ˜áƒ¡"
 
-#: js/files.js:388 js/files.js:423
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "áƒáƒ¢áƒ•áƒ˜áƒ áƒ—áƒ•áƒ áƒ¨áƒ”áƒ©áƒ”áƒ áƒ”áƒ‘áƒ£áƒš áƒ˜áƒ¥áƒœáƒ."
 
-#: js/files.js:497
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "áƒ›áƒ˜áƒ›áƒ“áƒ˜áƒœáƒáƒ áƒ”áƒáƒ‘áƒ¡ áƒ¤áƒáƒ˜áƒšáƒ˜áƒ¡ áƒáƒ¢áƒ•áƒ˜áƒ áƒ—áƒ•áƒ. áƒ¡áƒ®áƒ•áƒ áƒ’áƒ•áƒ”áƒ áƒ“áƒ–áƒ” áƒ’áƒáƒ“áƒáƒ¡áƒ•áƒšáƒ áƒ’áƒáƒ›áƒáƒ˜áƒ¬áƒ•áƒ”áƒ•áƒ¡ áƒáƒ¢áƒ•áƒ˜áƒ áƒ—áƒ•áƒ˜áƒ¡ áƒ¨áƒ”áƒ©áƒ”áƒ áƒ”áƒ‘áƒáƒ¡"
 
-#: js/files.js:570
+#: js/files.js:486
 msgid "URL cannot be empty."
-msgstr ""
+msgstr "URL áƒáƒ  áƒ¨áƒ”áƒ˜áƒ«áƒšáƒ”áƒ‘áƒ áƒ˜áƒ§áƒáƒ¡ áƒªáƒáƒ áƒ˜áƒ”áƒšáƒ˜."
 
-#: js/files.js:575
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr ""
+msgstr "áƒ“áƒáƒ£áƒ¨áƒ•áƒ”áƒ‘áƒ”áƒšáƒ˜ áƒ¤áƒáƒšáƒ“áƒ”áƒ áƒ˜áƒ¡ áƒ¡áƒáƒ®áƒ”áƒšáƒ˜.  'Shared'â€“áƒ˜áƒ¡ áƒ’áƒáƒ›áƒáƒ§áƒ”áƒœáƒ”áƒ‘áƒ áƒ áƒ”áƒ–áƒ”áƒ áƒ•áƒ˜áƒ áƒ”áƒ‘áƒ£áƒšáƒ˜áƒ Owncloudâ€“áƒ˜áƒ¡ áƒ›áƒ˜áƒ”áƒ "
 
-#: js/files.js:953 templates/index.php:68
+#: 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:954 templates/index.php:79
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "áƒ–áƒáƒ›áƒ"
 
-#: js/files.js:955 templates/index.php:81
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "áƒ¨áƒ”áƒªáƒ•áƒšáƒ˜áƒšáƒ˜áƒ"
 
-#: js/files.js:974
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 áƒ¡áƒáƒ¥áƒáƒ¦áƒáƒšáƒ“áƒ”"
 
-#: js/files.js:976
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} áƒ¡áƒáƒ¥áƒáƒ¦áƒáƒšáƒ“áƒ”"
 
-#: js/files.js:984
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 áƒ¤áƒáƒ˜áƒšáƒ˜"
 
-#: js/files.js:986
+#: 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 "áƒáƒ¢áƒ•áƒ˜áƒ áƒ—áƒ•áƒ"
@@ -267,50 +273,50 @@ msgstr "áƒ¡áƒáƒ¥áƒáƒ¦áƒáƒšáƒ“áƒ”"
 
 #: templates/index.php:14
 msgid "From link"
-msgstr ""
+msgstr "áƒ›áƒ˜áƒ¡áƒáƒ›áƒáƒ áƒ—áƒ˜áƒ“áƒáƒœ"
 
-#: templates/index.php:40
+#: templates/index.php:42
 msgid "Deleted files"
-msgstr ""
+msgstr "áƒ¬áƒáƒ¨áƒšáƒ˜áƒšáƒ˜ áƒ¤áƒáƒ˜áƒšáƒ”áƒ‘áƒ˜"
 
-#: templates/index.php:46
+#: templates/index.php:48
 msgid "Cancel upload"
 msgstr "áƒáƒ¢áƒ•áƒ˜áƒ áƒ—áƒ•áƒ˜áƒ¡ áƒ’áƒáƒ£áƒ¥áƒ›áƒ”áƒ‘áƒ"
 
-#: templates/index.php:53
+#: templates/index.php:54
 msgid "You donâ€™t have write permissions here."
-msgstr ""
+msgstr "áƒ—áƒ¥áƒ•áƒ”áƒœ áƒáƒ  áƒ’áƒáƒ¥áƒ•áƒ— áƒ©áƒáƒ¬áƒ”áƒ áƒ˜áƒ¡ áƒ£áƒ¤áƒšáƒ”áƒ‘áƒ áƒáƒ¥."
 
-#: templates/index.php:60
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "áƒáƒ¥ áƒáƒ áƒáƒ¤áƒ”áƒ áƒ˜ áƒáƒ  áƒáƒ áƒ˜áƒ¡. áƒáƒ¢áƒ•áƒ˜áƒ áƒ—áƒ” áƒ áƒáƒ›áƒ”!"
 
-#: templates/index.php:74
+#: templates/index.php:75
 msgid "Download"
 msgstr "áƒ©áƒáƒ›áƒáƒ¢áƒ•áƒ˜áƒ áƒ—áƒ•áƒ"
 
-#: templates/index.php:86 templates/index.php:87
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
-msgstr "áƒ’áƒáƒ–áƒ˜áƒáƒ áƒ”áƒ‘áƒ˜áƒ¡ áƒ›áƒáƒ®áƒ¡áƒœáƒ"
+msgstr "áƒ’áƒáƒ£áƒ–áƒ˜áƒáƒ áƒ”áƒ‘áƒáƒ“áƒ˜"
 
-#: templates/index.php:106
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "áƒáƒ¡áƒáƒ¢áƒ•áƒ˜áƒ áƒ—áƒ˜ áƒ¤áƒáƒ˜áƒšáƒ˜ áƒ«áƒáƒšáƒ˜áƒáƒœ áƒ“áƒ˜áƒ“áƒ˜áƒ"
 
-#: templates/index.php:108
+#: 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:113
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "áƒ›áƒ˜áƒ›áƒ“áƒ˜áƒœáƒáƒ áƒ”áƒáƒ‘áƒ¡ áƒ¤áƒáƒ˜áƒšáƒ”áƒ‘áƒ˜áƒ¡ áƒ¡áƒ™áƒáƒœáƒ˜áƒ áƒ”áƒ‘áƒ, áƒ’áƒ—áƒ®áƒáƒ•áƒ— áƒ“áƒáƒ”áƒšáƒáƒ“áƒáƒ—."
 
-#: templates/index.php:116
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "áƒ›áƒ˜áƒ›áƒ“áƒ˜áƒœáƒáƒ áƒ” áƒ¡áƒ™áƒáƒœáƒ˜áƒ áƒ”áƒ‘áƒ"
 
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
-msgstr ""
+msgstr "áƒ¤áƒáƒ˜áƒšáƒ£áƒ áƒ˜ áƒ¡áƒ˜áƒ¡áƒ¢áƒ”áƒ›áƒ˜áƒ¡ áƒ¥áƒ”áƒ¨áƒ˜áƒ¡ áƒ’áƒáƒœáƒáƒ®áƒšáƒ”áƒ‘áƒ...."
diff --git a/l10n/ka_GE/files_encryption.po b/l10n/ka_GE/files_encryption.po
index 81a4932c1409182a70474f9d0a71f83e388b21e5..6678dd7cc533592fa7578e3a78139462a8c5940b 100644
--- a/l10n/ka_GE/files_encryption.po
+++ b/l10n/ka_GE/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-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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 09:04+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,20 +19,20 @@ msgstr ""
 
 #: templates/settings-personal.php:4 templates/settings.php:5
 msgid "Encryption"
-msgstr ""
+msgstr "áƒ”áƒœáƒ™áƒ áƒ˜áƒžáƒªáƒ˜áƒ"
 
 #: templates/settings-personal.php:7
 msgid "File encryption is enabled."
-msgstr ""
+msgstr "áƒ¤áƒáƒ˜áƒšáƒ˜áƒ¡ áƒ”áƒœáƒ™áƒ áƒ˜áƒžáƒªáƒ˜áƒ áƒ©áƒáƒ áƒ—áƒ£áƒšáƒ˜áƒ."
 
 #: templates/settings-personal.php:11
 msgid "The following file types will not be encrypted:"
-msgstr ""
+msgstr "áƒ¨áƒ”áƒ›áƒ“áƒ”áƒ’áƒ˜ áƒ¤áƒáƒ˜áƒšáƒ£áƒ áƒ˜ áƒ¢áƒ˜áƒžáƒ”áƒ‘áƒ˜áƒ¡ áƒ”áƒœáƒ™áƒ áƒ˜áƒžáƒªáƒ˜áƒ áƒáƒ  áƒ›áƒáƒ®áƒ“áƒ”áƒ‘áƒ:"
 
 #: templates/settings.php:7
 msgid "Exclude the following file types from encryption:"
-msgstr ""
+msgstr "áƒáƒ›áƒáƒ˜áƒ¦áƒ” áƒ¨áƒ”áƒ›áƒ“áƒ”áƒ’áƒ˜ áƒ¤áƒáƒ˜áƒšáƒ˜áƒ¡ áƒ¢áƒ˜áƒžáƒ”áƒ‘áƒ˜ áƒ”áƒœáƒ™áƒ áƒ˜áƒžáƒªáƒ˜áƒ˜áƒ“áƒáƒœ:"
 
 #: templates/settings.php:12
 msgid "None"
-msgstr ""
+msgstr "áƒáƒ áƒ"
diff --git a/l10n/ka_GE/files_external.po b/l10n/ka_GE/files_external.po
index b38a37b7e55cbc9dd6953871f4b4ebcca059a9f2..203e29f7c011480f77e0369eb6bc39cdeeb81005 100644
--- a/l10n/ka_GE/files_external.po
+++ b/l10n/ka_GE/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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 09:03+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,72 +19,79 @@ 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 áƒáƒžáƒšáƒ˜áƒ™áƒáƒªáƒ˜áƒ˜áƒ¡ áƒ’áƒáƒ¡áƒáƒ¦áƒ”áƒ‘áƒ˜ áƒ“áƒ áƒ™áƒáƒ“áƒ˜."
 
 #: js/google.js:36 js/google.js:93
 msgid "Error configuring Google Drive storage"
-msgstr ""
+msgstr "áƒ¨áƒ”áƒªáƒ“áƒáƒ›áƒ Google Drive áƒ¡áƒáƒªáƒáƒ•áƒ˜áƒ¡ áƒ™áƒáƒœáƒ¤áƒ˜áƒ’áƒ£áƒ áƒ˜áƒ áƒ”áƒ‘áƒ˜áƒ¡ áƒ“áƒ áƒáƒ¡"
 
-#: 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 ""
+msgstr "<b>áƒ’áƒáƒ¤áƒ áƒ—áƒ®áƒ˜áƒšáƒ”áƒ‘áƒ:</b> \"smbclient\" áƒáƒ  áƒáƒ áƒ˜áƒ¡ áƒ˜áƒœáƒ¡áƒ¢áƒáƒšáƒ˜áƒ áƒ”áƒ‘áƒ£áƒšáƒ˜. CIFS/SMB áƒ–áƒ˜áƒáƒ áƒ”áƒ‘áƒ˜áƒ¡ áƒ›áƒáƒœáƒ¢áƒ˜áƒ áƒ”áƒ‘áƒ áƒ¨áƒ”áƒ£áƒ«áƒšáƒ”áƒ‘áƒ”áƒšáƒ˜áƒ. áƒ’áƒ—áƒ®áƒáƒ•áƒ— áƒ—áƒ®áƒáƒ•áƒáƒ— áƒ—áƒ¥áƒ•áƒ”áƒœáƒ¡ áƒ¡áƒ˜áƒ¡áƒ¢áƒ”áƒ›áƒ£áƒ  áƒáƒ“áƒ›áƒ˜áƒœáƒ˜áƒ¡áƒ¢áƒ áƒáƒ¢áƒáƒ áƒ”áƒ‘áƒ¡ áƒ“áƒáƒáƒ˜áƒœáƒ¡áƒ¢áƒáƒšáƒ˜áƒ áƒáƒ¡ áƒ˜áƒ¡."
 
-#: 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 ""
+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 ""
+msgstr "áƒ”áƒ¥áƒ¡áƒ¢áƒ”áƒ áƒœáƒáƒš áƒ¡áƒáƒªáƒáƒ•áƒ˜"
 
 #: templates/settings.php:9 templates/settings.php:28
 msgid "Folder name"
-msgstr ""
+msgstr "áƒ¤áƒáƒšáƒ“áƒ”áƒ áƒ˜áƒ¡ áƒ¡áƒáƒ®áƒ”áƒšáƒ˜"
 
 #: templates/settings.php:10
 msgid "External storage"
-msgstr ""
+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"
-msgstr ""
+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"
@@ -101,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 ""
+msgstr "SSL root áƒ¡áƒ”áƒ áƒ—áƒ˜áƒ¤áƒ˜áƒ™áƒáƒ¢áƒ”áƒ‘áƒ˜"
 
 #: templates/settings.php:159
 msgid "Import Root Certificate"
-msgstr ""
+msgstr "Root áƒ¡áƒ”áƒ áƒ—áƒ˜áƒ¤áƒ˜áƒ™áƒáƒ¢áƒ˜áƒ¡ áƒ˜áƒ›áƒžáƒáƒ áƒ¢áƒ˜áƒ áƒ”áƒ‘áƒ"
diff --git a/l10n/ka_GE/files_sharing.po b/l10n/ka_GE/files_sharing.po
index 8b33377df96078b2716c263771ec1712a6649a2d..2cd7702bc648ae718fd5e3c5ea6e7fdb5dfe082d 100644
--- a/l10n/ka_GE/files_sharing.po
+++ b/l10n/ka_GE/files_sharing.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <romeo@energo-pro.ge>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-27 00:01+0200\n"
-"PO-Revision-Date: 2012-10-26 12:58+0000\n"
+"POT-Creation-Date: 2013-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 09:03+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"
@@ -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 ""
+msgstr "%sâ€“áƒ›áƒ áƒ’áƒáƒ’áƒ˜áƒ–áƒ˜áƒáƒ áƒáƒ— áƒ¤áƒáƒšáƒ“áƒ”áƒ áƒ˜ %s"
 
-#: templates/public.php:11
+#: templates/public.php:13
 #, php-format
 msgid "%s shared the file %s with you"
-msgstr ""
+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 ""
+msgstr "áƒ¬áƒ˜áƒœáƒáƒ¡áƒ¬áƒáƒ áƒ˜ áƒ“áƒáƒ—áƒ•áƒáƒšáƒ˜áƒ”áƒ áƒ”áƒ‘áƒ áƒ¨áƒ”áƒ£áƒ«áƒšáƒ”áƒ‘áƒ”áƒšáƒ˜áƒ"
 
-#: templates/public.php:35
+#: templates/public.php:50
 msgid "web services under your control"
 msgstr "web services under your control"
diff --git a/l10n/ka_GE/files_trashbin.po b/l10n/ka_GE/files_trashbin.po
index df2af0a4a7da3240272f89f29a7321b7a6537fb3..41bba41dbdc34e6fdfdc76ad36bb404d7098541e 100644
--- a/l10n/ka_GE/files_trashbin.po
+++ b/l10n/ka_GE/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-03-08 00:25+0100\n"
-"PO-Revision-Date: 2013-03-07 23:25+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,27 +17,31 @@ msgstr ""
 "Language: ka_GE\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/delete.php:40
+#: ajax/delete.php:42
 #, php-format
 msgid "Couldn't delete %s permanently"
-msgstr ""
+msgstr "áƒ¤áƒáƒ˜áƒšáƒ˜ %sâ€“áƒ˜áƒ¡ áƒ¡áƒ áƒ£áƒšáƒáƒ“ áƒ¬áƒáƒ¨áƒšáƒ áƒ•áƒ”áƒ  áƒ›áƒáƒ®áƒ”áƒ áƒ®áƒ“áƒ"
 
-#: ajax/undelete.php:41
+#: ajax/undelete.php:42
 #, php-format
 msgid "Couldn't restore %s"
-msgstr ""
+msgstr "%sâ€“áƒ˜áƒ¡ áƒáƒ¦áƒ“áƒ’áƒ”áƒœáƒ áƒ•áƒ”áƒ  áƒ›áƒáƒ®áƒ”áƒ áƒ®áƒ“áƒ"
 
 #: js/trash.js:7 js/trash.js:96
 msgid "perform restore operation"
-msgstr ""
+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 ""
+msgstr "áƒ¤áƒáƒ˜áƒšáƒ˜áƒ¡ áƒ¡áƒ áƒ£áƒšáƒáƒ“ áƒ¬áƒáƒ¨áƒšáƒ"
 
 #: js/trash.js:121
 msgid "Delete permanently"
-msgstr ""
+msgstr "áƒ¡áƒ áƒ£áƒšáƒáƒ“ áƒ¬áƒáƒ¨áƒšáƒ"
 
 #: js/trash.js:174 templates/index.php:17
 msgid "Name"
@@ -45,7 +49,7 @@ msgstr "áƒ¡áƒáƒ®áƒ”áƒšáƒ˜"
 
 #: js/trash.js:175 templates/index.php:27
 msgid "Deleted"
-msgstr ""
+msgstr "áƒ¬áƒáƒ¨áƒšáƒ˜áƒšáƒ˜"
 
 #: js/trash.js:184
 msgid "1 folder"
@@ -65,11 +69,11 @@ msgstr "{count} áƒ¤áƒáƒ˜áƒšáƒ˜"
 
 #: templates/index.php:9
 msgid "Nothing in here. Your trash bin is empty!"
-msgstr ""
+msgstr "áƒáƒ¥ áƒáƒ áƒáƒ¤áƒ”áƒ áƒ˜ áƒáƒ  áƒáƒ áƒ˜áƒ¡. áƒ¡áƒáƒœáƒáƒ’áƒ•áƒ” áƒ§áƒ£áƒ—áƒ˜ áƒªáƒáƒ áƒ˜áƒ”áƒšáƒ˜áƒ!"
 
 #: templates/index.php:20 templates/index.php:22
 msgid "Restore"
-msgstr ""
+msgstr "áƒáƒ¦áƒ“áƒ’áƒ”áƒœáƒ"
 
 #: templates/index.php:30 templates/index.php:31
 msgid "Delete"
@@ -77,4 +81,4 @@ msgstr "áƒ¬áƒáƒ¨áƒšáƒ"
 
 #: templates/part.breadcrumb.php:9
 msgid "Deleted Files"
-msgstr ""
+msgstr "áƒ¬áƒáƒ¨áƒšáƒ˜áƒšáƒ˜ áƒ¤áƒáƒ˜áƒšáƒ”áƒ‘áƒ˜"
diff --git a/l10n/ka_GE/files_versions.po b/l10n/ka_GE/files_versions.po
index b37855b93c5c460cec193a83923c98cae572cf35..87f15b8179cc8efb51cc7fe5090122d884f0d48f 100644
--- a/l10n/ka_GE/files_versions.po
+++ b/l10n/ka_GE/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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 09:02+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,38 +20,38 @@ msgstr ""
 #: ajax/rollbackVersion.php:15
 #, php-format
 msgid "Could not revert: %s"
-msgstr ""
+msgstr "áƒ•áƒ”áƒ  áƒ›áƒáƒ®áƒ”áƒ áƒ®áƒ“áƒ áƒ£áƒ™áƒáƒœ áƒ“áƒáƒ‘áƒ áƒ£áƒœáƒ”áƒ‘áƒ: %s"
 
 #: history.php:40
 msgid "success"
-msgstr ""
+msgstr "áƒ“áƒáƒ¡áƒ áƒ£áƒšáƒ“áƒ"
 
 #: history.php:42
 #, php-format
 msgid "File %s was reverted to version %s"
-msgstr ""
+msgstr "áƒ¤áƒáƒ˜áƒšáƒ˜ %s áƒ“áƒáƒ‘áƒ áƒ£áƒœáƒ“áƒ áƒ•áƒ”áƒ áƒ¡áƒ˜áƒáƒ–áƒ” %s"
 
 #: history.php:49
 msgid "failure"
-msgstr ""
+msgstr "áƒ¨áƒ”áƒªáƒ“áƒáƒ›áƒ"
 
 #: history.php:51
 #, php-format
 msgid "File %s could not be reverted to version %s"
-msgstr ""
+msgstr "áƒ•áƒ”áƒ  áƒ›áƒáƒ®áƒ”áƒ áƒ®áƒ“áƒ %s áƒ¤áƒáƒ˜áƒšáƒ˜áƒ¡ %s áƒ•áƒ”áƒ áƒ¡áƒ˜áƒáƒ–áƒ” áƒ“áƒáƒ‘áƒ áƒ£áƒœáƒ”áƒ‘áƒ"
 
-#: history.php:68
+#: history.php:69
 msgid "No old versions available"
-msgstr ""
+msgstr "áƒ«áƒ•áƒ”áƒšáƒ˜ áƒ•áƒ”áƒ áƒ¡áƒ˜áƒ áƒáƒ  áƒáƒ áƒ¡áƒ”áƒ‘áƒáƒ‘áƒ¡"
 
-#: history.php:73
+#: history.php:74
 msgid "No path specified"
-msgstr ""
+msgstr "áƒ’áƒ–áƒ áƒáƒ  áƒáƒ áƒ˜áƒ¡ áƒ›áƒ˜áƒ—áƒ˜áƒ—áƒ”áƒ‘áƒ£áƒšáƒ˜"
 
 #: js/versions.js:6
 msgid "Versions"
-msgstr ""
+msgstr "áƒ•áƒ”áƒ áƒ¡áƒ˜áƒ”áƒ‘áƒ˜"
 
 #: templates/history.php:20
 msgid "Revert a file to a previous version by clicking on its revert button"
-msgstr ""
+msgstr "áƒ“áƒáƒáƒ‘áƒ áƒ£áƒœáƒ”áƒ— áƒ¤áƒáƒ˜áƒšáƒ˜ áƒ¬áƒ˜áƒœáƒ áƒžáƒáƒ–áƒ˜áƒªáƒ˜áƒáƒ–áƒ” revert áƒ¦áƒ˜áƒšáƒáƒ™áƒ–áƒ” áƒ“áƒáƒáƒ”áƒ áƒ˜áƒ—"
diff --git a/l10n/ka_GE/lib.po b/l10n/ka_GE/lib.po
index a31bc08bf89c7ed76576e4ccf24ea04f919bddaa..af7df55b76601805ab98ed1ed021b52826190fbc 100644
--- a/l10n/ka_GE/lib.po
+++ b/l10n/ka_GE/lib.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <romeo@energo-pro.ge>, 2012.
 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-04-28 01:57+0200\n"
+"PO-Revision-Date: 2013-04-27 23:57+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"
@@ -42,29 +41,29 @@ msgstr "áƒáƒžáƒšáƒ˜áƒ™áƒáƒªáƒ˜áƒ”áƒ‘áƒ˜"
 msgid "Admin"
 msgstr "áƒáƒ“áƒ›áƒ˜áƒœáƒ˜áƒ¡áƒ¢áƒ áƒáƒ¢áƒáƒ áƒ˜"
 
-#: files.php:202
+#: files.php:209
 msgid "ZIP download is turned off."
-msgstr ""
+msgstr "ZIP downloadâ€“áƒ˜ áƒ’áƒáƒ—áƒ˜áƒ¨áƒ£áƒšáƒ˜áƒ"
 
-#: files.php:203
+#: files.php:210
 msgid "Files need to be downloaded one by one."
-msgstr ""
+msgstr "áƒ¤áƒáƒ˜áƒšáƒ”áƒ‘áƒ˜ áƒ£áƒœáƒ“áƒ áƒ’áƒáƒ“áƒ›áƒáƒ˜áƒ¢áƒ•áƒ˜áƒ áƒ—áƒáƒ¡ áƒ¡áƒáƒ—áƒ˜áƒ—áƒáƒáƒ“."
 
-#: files.php:204 files.php:231
+#: files.php:211 files.php:244
 msgid "Back to Files"
-msgstr ""
+msgstr "áƒ£áƒ™áƒáƒœ áƒ¤áƒáƒ˜áƒšáƒ”áƒ‘áƒ¨áƒ˜"
 
-#: files.php:228
+#: files.php:241
 msgid "Selected files too large to generate zip file."
-msgstr ""
+msgstr "áƒáƒ áƒ©áƒ”áƒ£áƒšáƒ˜ áƒ¤áƒáƒ˜áƒšáƒ”áƒ‘áƒ˜ áƒ«áƒáƒšáƒ˜áƒáƒœ áƒ“áƒ˜áƒ“áƒ˜áƒ zip áƒ¤áƒáƒ˜áƒšáƒ˜áƒ¡ áƒ’áƒ”áƒœáƒ”áƒ áƒáƒªáƒ˜áƒ˜áƒ¡áƒ—áƒ•áƒ˜áƒ¡."
 
 #: helper.php:228
 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"
@@ -72,7 +71,7 @@ msgstr "áƒáƒ•áƒ—áƒ”áƒœáƒ¢áƒ˜áƒ¤áƒ˜áƒ™áƒáƒªáƒ˜áƒ˜áƒ¡ áƒ¨áƒ”áƒªáƒ“áƒáƒ›áƒ"
 
 #: json.php:51
 msgid "Token expired. Please reload page."
-msgstr ""
+msgstr "Tokenâ€“áƒ¡ áƒ•áƒáƒ“áƒ áƒ’áƒáƒ£áƒ•áƒ˜áƒ“áƒ. áƒ’áƒ—áƒ®áƒáƒ•áƒ— áƒ’áƒáƒœáƒáƒáƒ®áƒšáƒáƒ— áƒ’áƒ•áƒ”áƒ áƒ“áƒ˜."
 
 #: search/provider/file.php:17 search/provider/file.php:35
 msgid "Files"
@@ -84,109 +83,105 @@ msgstr "áƒ¢áƒ”áƒ¥áƒ¡áƒ¢áƒ˜"
 
 #: search/provider/file.php:29
 msgid "Images"
-msgstr ""
+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:128 setup.php:320 setup.php:365
+#: setup.php:132 setup.php:325 setup.php:370
 msgid "PostgreSQL username and/or password not valid"
-msgstr ""
+msgstr "PostgreSQL áƒ˜áƒ£áƒ–áƒ”áƒ áƒœáƒ”áƒ˜áƒ›áƒ˜ áƒ“áƒ/áƒáƒœ áƒžáƒáƒ áƒáƒšáƒ˜ áƒáƒ  áƒáƒ áƒ˜áƒ¡ áƒ¡áƒ¬áƒáƒ áƒ˜"
 
-#: setup.php:129 setup.php:152 setup.php:229
+#: setup.php:133 setup.php:156 setup.php:234
 msgid "You need to enter either an existing account or the administrator."
-msgstr ""
+msgstr "áƒ—áƒ¥áƒ•áƒ”áƒœ áƒ£áƒœáƒ“áƒ áƒ¨áƒ”áƒ˜áƒ§áƒ•áƒáƒœáƒáƒ— áƒáƒ áƒ¡áƒ”áƒ‘áƒ£áƒšáƒ˜ áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒ”áƒšáƒ˜áƒ¡ áƒ¡áƒáƒ®áƒ”áƒšáƒ˜ áƒáƒœ áƒáƒ“áƒ›áƒ˜áƒœáƒ˜áƒ¡áƒ¢áƒ áƒáƒ¢áƒáƒ áƒ˜."
 
-#: setup.php:151 setup.php:453 setup.php:520
+#: setup.php:155 setup.php:458 setup.php:525
 msgid "Oracle username and/or password not valid"
-msgstr ""
+msgstr "Oracle áƒ˜áƒ£áƒ–áƒ”áƒ áƒœáƒ”áƒ˜áƒ›áƒ˜ áƒ“áƒ/áƒáƒœ áƒžáƒáƒ áƒáƒšáƒ˜ áƒáƒ  áƒáƒ áƒ˜áƒ¡ áƒ¡áƒ¬áƒáƒ áƒ˜"
 
-#: setup.php:228
+#: setup.php:233
 msgid "MySQL username and/or password not valid"
-msgstr ""
+msgstr "MySQL áƒ˜áƒ£áƒ–áƒ”áƒ áƒœáƒ”áƒ˜áƒ›áƒ˜ áƒ“áƒ/áƒáƒœ áƒžáƒáƒ áƒáƒšáƒ˜ áƒáƒ  áƒáƒ áƒ˜áƒ¡ áƒ¡áƒ¬áƒáƒ áƒ˜"
 
-#: 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: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:583 setup.php:592 setup.php:600 setup.php:609
+#: setup.php:615
 #, php-format
 msgid "DB Error: \"%s\""
-msgstr ""
+msgstr "DB áƒ¨áƒ”áƒªáƒ“áƒáƒ›áƒ: \"%s\""
 
-#: 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:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
+#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
+#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
 #, php-format
 msgid "Offending command was: \"%s\""
-msgstr ""
+msgstr "Offending áƒ‘áƒ áƒ«áƒáƒœáƒ”áƒ‘áƒ áƒ˜áƒ§áƒ: \"%s\""
 
-#: setup.php:299
+#: setup.php:304
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
-msgstr ""
+msgstr "MySQL áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒ”áƒšáƒ˜ '%s'@'localhost' áƒ£áƒ™áƒ•áƒ” áƒáƒ áƒ¡áƒ”áƒ‘áƒáƒ‘áƒ¡."
 
-#: setup.php:300
+#: setup.php:305
 msgid "Drop this user from MySQL"
-msgstr ""
+msgstr "áƒ¬áƒáƒ¨áƒáƒšáƒ” áƒ”áƒ¡ áƒ›áƒáƒ›áƒ®áƒáƒ›áƒ áƒ”áƒ‘áƒ”áƒšáƒ˜ MySQLâ€“áƒ˜áƒ“áƒáƒœ"
 
-#: setup.php:305
+#: setup.php:310
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
-msgstr ""
+msgstr "MySQL áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒ”áƒšáƒ˜ '%s'@'%%' áƒ£áƒ™áƒ•áƒ” áƒáƒ áƒ¡áƒ”áƒ‘áƒáƒ‘áƒ¡"
 
-#: setup.php:306
+#: setup.php:311
 msgid "Drop this user from MySQL."
-msgstr ""
+msgstr "áƒ¬áƒáƒ¨áƒáƒšáƒ” áƒ”áƒ¡ áƒ›áƒáƒ›áƒ®áƒáƒ›áƒ áƒ”áƒ‘áƒ”áƒšáƒ˜ MySQLâ€“áƒ˜áƒ“áƒáƒœ"
 
-#: setup.php:579 setup.php:611
+#: setup.php:584 setup.php:616
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
-msgstr ""
+msgstr "Offending áƒ‘áƒ áƒ«áƒáƒœáƒ”áƒ‘áƒ áƒ˜áƒ§áƒ: \"%s\", áƒ¡áƒáƒ®áƒ”áƒšáƒ˜: %s, áƒžáƒáƒ áƒáƒšáƒ˜: %s"
 
-#: setup.php:631
+#: setup.php:636
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
-msgstr ""
+msgstr "MS SQL áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒ”áƒšáƒ˜ áƒ“áƒ/áƒáƒœ áƒžáƒáƒ áƒáƒšáƒ˜ áƒáƒ  áƒáƒ áƒ˜áƒ¡ áƒ›áƒáƒ áƒ—áƒ”áƒ‘áƒ£áƒšáƒ˜: %s"
 
-#: setup.php:849
+#: setup.php:858
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
-msgstr ""
+msgstr "áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ web áƒ¡áƒ”áƒ áƒ•áƒ”áƒ áƒ˜ áƒáƒ  áƒáƒ áƒ˜áƒ¡ áƒ™áƒáƒœáƒ¤áƒ˜áƒ’áƒ£áƒ áƒ˜áƒ áƒ”áƒ‘áƒ£áƒšáƒ˜ áƒ¤áƒáƒ˜áƒš áƒ¡áƒ˜áƒœáƒ¥áƒ áƒáƒœáƒ˜áƒ–áƒáƒªáƒ˜áƒ˜áƒ¡áƒ—áƒ•áƒ˜áƒ¡, áƒ áƒáƒ“áƒ’áƒáƒœ WebDAV áƒ˜áƒœáƒ¢áƒ”áƒ áƒ¤áƒ”áƒ˜áƒ¡áƒ˜ áƒ¨áƒ”áƒ˜áƒ«áƒšáƒ”áƒ‘áƒ áƒ˜áƒ§áƒáƒ¡ áƒ’áƒáƒ¢áƒ”áƒ®áƒ˜áƒšáƒ˜."
 
-#: setup.php:850
+#: setup.php:859
 #, 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"
@@ -199,16 +194,16 @@ msgstr "1 áƒ¬áƒ£áƒ—áƒ˜áƒ¡ áƒ¬áƒ˜áƒœ"
 #: template.php:115
 #, php-format
 msgid "%d minutes ago"
-msgstr ""
+msgstr "%d áƒ¬áƒ£áƒ—áƒ˜áƒ¡ áƒ¬áƒ˜áƒœ"
 
 #: template.php:116
 msgid "1 hour ago"
-msgstr ""
+msgstr "1 áƒ¡áƒáƒáƒ—áƒ˜áƒ¡ áƒ¬áƒ˜áƒœ"
 
 #: template.php:117
 #, php-format
 msgid "%d hours ago"
-msgstr ""
+msgstr "%d áƒ¡áƒáƒáƒ—áƒ˜áƒ¡ áƒ¬áƒ˜áƒœ"
 
 #: template.php:118
 msgid "today"
@@ -221,7 +216,7 @@ msgstr "áƒ’áƒ£áƒ¨áƒ˜áƒœ"
 #: template.php:120
 #, php-format
 msgid "%d days ago"
-msgstr ""
+msgstr "%d  áƒ“áƒ¦áƒ˜áƒ¡ áƒ¬áƒ˜áƒœ"
 
 #: template.php:121
 msgid "last month"
@@ -230,7 +225,7 @@ msgstr "áƒ’áƒáƒ¡áƒ£áƒš áƒ—áƒ•áƒ”áƒ¨áƒ˜"
 #: template.php:122
 #, php-format
 msgid "%d months ago"
-msgstr ""
+msgstr "%d áƒ—áƒ•áƒ˜áƒ¡ áƒ¬áƒ˜áƒœ"
 
 #: template.php:123
 msgid "last year"
@@ -240,20 +235,7 @@ 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\""
-msgstr ""
+msgstr "\"%s\" áƒ™áƒáƒ¢áƒ”áƒ’áƒáƒ áƒ˜áƒ˜áƒ¡ áƒ›áƒáƒ«áƒ”áƒ‘áƒœáƒ áƒ•áƒ”áƒ  áƒ›áƒáƒ®áƒ”áƒ áƒ®áƒ“áƒ"
diff --git a/l10n/ka_GE/settings.po b/l10n/ka_GE/settings.po
index a2498bd7718cd1ae1e4fb0d61491920ad901ebe9..b7c222205a149cd2c2591cf2ed788791b06bfa9f 100644
--- a/l10n/ka_GE/settings.po
+++ b/l10n/ka_GE/settings.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <romeo@energo-pro.ge>, 2012.
+# 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-02-27 14:35+0100\n"
-"PO-Revision-Date: 2013-02-27 13:35+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,14 +22,18 @@ 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 ""
+msgstr "áƒ“áƒ˜áƒ¡áƒ¤áƒšáƒ”áƒ˜áƒ¡ áƒ¡áƒáƒ®áƒ”áƒšáƒ˜áƒ¡ áƒ¨áƒ”áƒªáƒ•áƒšáƒ áƒ•áƒ”áƒ  áƒ›áƒáƒ®áƒ”áƒ áƒ®áƒ“áƒ"
 
 #: ajax/creategroup.php:10
 msgid "Group already exists"
@@ -69,7 +73,7 @@ msgstr "áƒáƒ áƒáƒ¡áƒ¬áƒáƒ áƒ˜ áƒ›áƒáƒ—áƒ®áƒáƒ•áƒœáƒ"
 
 #: ajax/togglegroups.php:12
 msgid "Admins can't remove themself from the admin group"
-msgstr ""
+msgstr "áƒáƒ“áƒ›áƒ˜áƒœáƒ˜áƒ¡áƒ¢áƒ áƒáƒ¢áƒáƒ áƒ”áƒ‘áƒ¡ áƒáƒ  áƒ¨áƒ”áƒ£áƒ«áƒšáƒ˜áƒáƒ— áƒ¡áƒáƒ™áƒ£áƒ—áƒáƒ áƒ˜ áƒ—áƒáƒ•áƒ˜áƒ¡ áƒ¬áƒáƒ¨áƒšáƒ áƒáƒ“áƒ›áƒ˜áƒœ áƒ¯áƒ’áƒ£áƒ¤áƒ˜áƒ“áƒáƒœ"
 
 #: ajax/togglegroups.php:30
 #, php-format
@@ -83,86 +87,86 @@ msgstr "áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒšáƒ˜áƒ¡ áƒ¬áƒáƒ¨áƒšáƒ áƒ•áƒ”áƒ  áƒ›áƒáƒ®
 
 #: 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"
 msgstr "áƒ’áƒáƒ›áƒáƒ áƒ—áƒ•áƒ"
 
-#: js/apps.js:36 js/apps.js:64
+#: js/apps.js:36 js/apps.js:64 js/apps.js:83
 msgid "Enable"
 msgstr "áƒ©áƒáƒ áƒ—áƒ•áƒ"
 
 #: js/apps.js:55
 msgid "Please wait...."
-msgstr ""
+msgstr "áƒ“áƒáƒ˜áƒªáƒáƒ“áƒ”áƒ—...."
 
-#: js/apps.js:84
-msgid "Updating...."
-msgstr ""
-
-#: js/apps.js:87
-msgid "Error while updating app"
-msgstr ""
-
-#: js/apps.js:87
+#: 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 ""
+msgstr "áƒ’áƒáƒœáƒáƒ®áƒšáƒ”áƒ‘áƒ£áƒšáƒ˜áƒ"
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr "áƒ¨áƒ”áƒœáƒáƒ®áƒ•áƒ..."
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "deleted"
-msgstr ""
+msgstr "áƒ¬áƒáƒ¨áƒšáƒ˜áƒšáƒ˜"
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "undo"
 msgstr "áƒ“áƒáƒ‘áƒ áƒ£áƒœáƒ”áƒ‘áƒ"
 
-#: js/users.js:62
+#: js/users.js:79
 msgid "Unable to remove user"
-msgstr ""
+msgstr "áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒšáƒ˜áƒ¡ áƒ¬áƒáƒ¨áƒšáƒ áƒ•áƒ”áƒ  áƒ›áƒáƒ®áƒ”áƒ áƒ®áƒ“áƒ"
 
-#: js/users.js:75 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
+#: templates/users.php:103
 msgid "Groups"
-msgstr "áƒ¯áƒ’áƒ£áƒ¤áƒ˜"
+msgstr "áƒ¯áƒ’áƒ£áƒ¤áƒ”áƒ‘áƒ˜"
 
-#: js/users.js:78 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr "áƒ¯áƒ’áƒ£áƒ¤áƒ˜áƒ¡ áƒáƒ“áƒ›áƒ˜áƒœáƒ˜áƒ¡áƒ¢áƒ áƒáƒ¢áƒáƒ áƒ˜"
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "áƒ¬áƒáƒ¨áƒšáƒ"
 
-#: js/users.js:191
+#: js/users.js:269
 msgid "add group"
-msgstr ""
+msgstr "áƒ¯áƒ’áƒ£áƒ¤áƒ˜áƒ¡ áƒ“áƒáƒ›áƒáƒ¢áƒ”áƒ‘áƒ"
 
-#: js/users.js:352
+#: js/users.js:420
 msgid "A valid username must be provided"
-msgstr ""
+msgstr "áƒ£áƒœáƒ“áƒ áƒ›áƒ˜áƒ£áƒ—áƒ˜áƒ—áƒáƒ— áƒáƒ áƒ¡áƒ”áƒ‘áƒ£áƒšáƒ˜ áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒšáƒ˜áƒ¡ áƒ¡áƒáƒ®áƒ”áƒšáƒ˜"
 
-#: js/users.js:353 js/users.js:359 js/users.js:374
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
-msgstr ""
+msgstr "áƒ¨áƒ”áƒªáƒ“áƒáƒ›áƒ áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒšáƒ˜áƒ¡ áƒ¨áƒ”áƒ¥áƒ›áƒœáƒ˜áƒ¡áƒáƒ¡"
 
-#: js/users.js:358
+#: js/users.js:426
 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__"
 
@@ -177,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 "áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ data áƒ“áƒ˜áƒ áƒ”áƒ¥áƒ¢áƒáƒ áƒ˜áƒ áƒ“áƒ áƒ¤áƒáƒ˜áƒšáƒ”áƒ‘áƒ˜ áƒáƒ áƒ˜áƒ¡ áƒ“áƒáƒ¨áƒ•áƒ”áƒ‘áƒáƒ“áƒ˜ áƒ˜áƒœáƒ¢áƒ”áƒ áƒœáƒ”áƒ¢áƒ˜áƒ“áƒáƒœ. .htaccess áƒ¤áƒáƒ˜áƒšáƒ˜ áƒ áƒáƒ›áƒ”áƒšáƒ¡áƒáƒª ownCloud áƒ’áƒ•áƒ—áƒáƒ•áƒáƒ–áƒáƒ‘áƒ¡ áƒáƒ  áƒ›áƒ£áƒ¨áƒáƒáƒ‘áƒ¡. áƒ©áƒ•áƒ”áƒœ áƒ’áƒ˜áƒ áƒ©áƒ”áƒ•áƒ— áƒ áƒáƒ› áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ áƒ•áƒ”áƒ‘áƒ¡áƒ”áƒ áƒ•áƒ”áƒ áƒ˜ áƒ“áƒáƒáƒ™áƒáƒœáƒ¤áƒ˜áƒ’áƒ£áƒ áƒ˜áƒ áƒáƒ— áƒ˜áƒ¡áƒ” áƒ áƒáƒ› data áƒ“áƒ˜áƒ áƒ”áƒ¥áƒ¢áƒáƒ áƒ˜áƒ áƒáƒ  áƒ˜áƒ§áƒáƒ¡ áƒ“áƒáƒ¨áƒ•áƒ”áƒ‘áƒáƒ“áƒ˜, áƒáƒœ áƒ’áƒáƒ˜áƒ¢áƒáƒœáƒáƒ— data áƒ“áƒ˜áƒ áƒ”áƒ¥áƒ¢áƒáƒ áƒ˜áƒ áƒ•áƒ”áƒ‘áƒ¡áƒ”áƒ áƒ•áƒ”áƒ áƒ˜áƒ¡ document root áƒ“áƒ˜áƒ áƒ”áƒ¥áƒ¢áƒáƒ áƒ˜áƒ˜áƒ¡ áƒ’áƒáƒ áƒ”áƒ—."
 
 #: 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 "áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ web áƒ¡áƒ”áƒ áƒ•áƒ”áƒ áƒ˜ áƒáƒ  áƒáƒ áƒ˜áƒ¡ áƒ™áƒáƒœáƒ¤áƒ˜áƒ’áƒ£áƒ áƒ˜áƒ áƒ”áƒ‘áƒ£áƒšáƒ˜ áƒ¤áƒáƒ˜áƒš áƒ¡áƒ˜áƒœáƒ¥áƒ áƒáƒœáƒ˜áƒ–áƒáƒªáƒ˜áƒ˜áƒ¡áƒ—áƒ•áƒ˜áƒ¡, áƒ áƒáƒ“áƒ’áƒáƒœ 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-typeâ€“áƒ¡ áƒáƒ¦áƒ›áƒáƒ©áƒ”áƒœáƒ˜áƒ¡áƒáƒ¡."
 
 #: templates/admin.php:58
 msgid "Locale not working"
-msgstr ""
+msgstr "áƒšáƒáƒ™áƒáƒšáƒ˜áƒ–áƒáƒªáƒ˜áƒ áƒáƒ  áƒ›áƒ£áƒ¨áƒáƒáƒ‘áƒ¡"
 
 #: templates/admin.php:63
 #, php-format
@@ -214,11 +218,11 @@ msgid ""
 "This ownCloud server can't set system locale to %s. This means that there "
 "might be problems with certain characters in file names. We strongly suggest"
 " to install the required packages on your system to support %s."
-msgstr ""
+msgstr "áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ ownCloud áƒ¡áƒ”áƒ áƒ•áƒ”áƒ áƒ˜ áƒ•áƒ”áƒ  áƒáƒ§áƒ”áƒœáƒ”áƒ‘áƒ¡ %s áƒ¡áƒ˜áƒ¡áƒ¢áƒ”áƒ›áƒ£áƒ  áƒ”áƒœáƒáƒ¡. áƒ”áƒ¡ áƒ’áƒ£áƒšáƒ˜áƒ¡áƒ®áƒ›áƒáƒ‘áƒ¡ áƒ˜áƒ›áƒáƒ¡ áƒ áƒáƒ› áƒ¨áƒ”áƒ˜áƒ«áƒšáƒ”áƒ‘áƒ áƒ¨áƒ”áƒ˜áƒ¥áƒ›áƒœáƒáƒ¡ áƒžáƒ áƒáƒ‘áƒšáƒ”áƒ›áƒ áƒ’áƒáƒ áƒ™áƒ•áƒ”áƒ£áƒš áƒ¡áƒ˜áƒ›áƒ‘áƒáƒšáƒáƒ”áƒ‘áƒ–áƒ” áƒ¤áƒáƒ˜áƒšáƒ˜áƒ¡ áƒ¡áƒáƒ®áƒ”áƒšáƒ”áƒ‘áƒ¨áƒ˜. áƒ©áƒ•áƒ”áƒœ áƒ’áƒ˜áƒ©áƒ”áƒ•áƒ— áƒ áƒáƒ› áƒ“áƒáƒáƒ˜áƒœáƒ¡áƒ¢áƒáƒšáƒ˜áƒ áƒáƒ— áƒ¡áƒáƒáƒ˜áƒ áƒ áƒžáƒáƒ™áƒ”áƒ¢áƒ”áƒ‘áƒ˜ áƒ—áƒ¥áƒ•áƒ”áƒœáƒ¡ áƒ¡áƒ˜áƒ¡áƒ¢áƒ”áƒ›áƒáƒ–áƒ” áƒ˜áƒ›áƒ˜áƒ¡áƒáƒ—áƒ•áƒ˜áƒ¡ áƒ áƒáƒ› áƒ˜áƒ§áƒáƒ¡ %s â€“áƒ˜áƒ¡ áƒ›áƒ®áƒáƒ áƒ“áƒáƒáƒ”áƒ áƒ."
 
 #: templates/admin.php:75
 msgid "Internet connection not working"
-msgstr ""
+msgstr "áƒ˜áƒœáƒ¢áƒ”áƒ áƒœáƒ”áƒ¢ áƒ™áƒáƒ•áƒ¨áƒ˜áƒ áƒ˜ áƒáƒ  áƒ›áƒ£áƒ¨áƒáƒáƒ‘áƒ¡"
 
 #: templates/admin.php:78
 msgid ""
@@ -228,100 +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 "ownCloud áƒ¡áƒ”áƒ áƒ•áƒ”áƒ áƒ¡ áƒáƒ  áƒ’áƒáƒáƒ©áƒœáƒ˜áƒ áƒ˜áƒœáƒ¢áƒ”áƒ áƒœáƒ”áƒ¢áƒ—áƒáƒœ áƒ™áƒáƒ•áƒ¨áƒ˜áƒ áƒ˜. áƒ”áƒ¡ áƒœáƒ˜áƒ¨áƒœáƒáƒ•áƒ¡ áƒ˜áƒ›áƒáƒ¡ áƒ áƒáƒ› áƒ’áƒáƒ áƒ™áƒ•áƒ”áƒ£áƒšáƒ˜ áƒ¤áƒ£áƒœáƒ¥áƒªáƒ˜áƒ”áƒ‘áƒ˜ áƒ áƒáƒ’áƒáƒ áƒ˜áƒªáƒáƒ áƒ”áƒ¥áƒ¡áƒ¢áƒ”áƒ áƒœáƒáƒš áƒ¡áƒáƒªáƒáƒ•áƒ”áƒ‘áƒ˜áƒ¡ áƒ›áƒáƒœáƒ¢áƒ˜áƒ áƒ”áƒ‘áƒ, áƒ¨áƒ”áƒ¢áƒ§áƒáƒ‘áƒ˜áƒœáƒ”áƒ‘áƒ”áƒ‘áƒ˜ áƒ’áƒáƒœáƒáƒ®áƒšáƒ”áƒ‘áƒ˜áƒ¡ áƒ¨áƒ”áƒ¡áƒáƒ®áƒ”áƒ‘ áƒáƒœ áƒ¡áƒ®áƒ•áƒáƒ“áƒáƒ¡áƒ®áƒ•áƒ 3rd áƒáƒžáƒšáƒ˜áƒ™áƒáƒªáƒ˜áƒ”áƒ‘áƒ˜áƒ¡ áƒ˜áƒœáƒ¡áƒ¢áƒáƒšáƒáƒªáƒ˜áƒ áƒáƒ  áƒ˜áƒ›áƒ£áƒ¨áƒáƒ•áƒ”áƒ‘áƒ¡. áƒ¤áƒáƒ˜áƒšáƒ”áƒ‘áƒ—áƒáƒœ áƒ¬áƒ•áƒ“áƒáƒ›áƒ áƒ’áƒáƒ áƒ” áƒ¡áƒáƒ›áƒ§áƒáƒ áƒáƒ“áƒáƒœ áƒ“áƒ áƒ¨áƒ”áƒ¢áƒ§áƒáƒ‘áƒ˜áƒœáƒ”áƒ‘áƒ˜áƒ¡ áƒ˜áƒ›áƒ”áƒ˜áƒšáƒ”áƒ‘áƒ˜áƒª áƒáƒ’áƒ áƒ”áƒ—áƒ•áƒ” áƒáƒ  áƒ˜áƒ›áƒ£áƒ¨áƒáƒ•áƒ”áƒ‘áƒ¡. áƒ©áƒ•áƒ”áƒœ áƒ’áƒ˜áƒ áƒ©áƒ”áƒ•áƒ— áƒ áƒáƒ› áƒ©áƒáƒ áƒ—áƒáƒ— áƒ˜áƒœáƒ¢áƒ”áƒ áƒœáƒ”áƒ¢ áƒ™áƒáƒ•áƒ¨áƒ˜áƒ áƒ˜ áƒáƒ› áƒ¡áƒ”áƒ áƒ•áƒ”áƒ áƒ˜áƒ¡áƒ—áƒ•áƒ˜áƒ¡ áƒ˜áƒ›áƒ˜áƒ¡áƒáƒ—áƒ•áƒ˜áƒ¡ áƒ áƒáƒ› áƒ’áƒ¥áƒáƒœáƒ“áƒ”áƒ— ownCloudâ€“áƒ˜áƒ¡ áƒ§áƒ•áƒ”áƒšáƒ áƒ¤áƒ£áƒœáƒ¥áƒªáƒ˜áƒ áƒ’áƒáƒáƒ¥áƒ¢áƒ˜áƒ£áƒ áƒ”áƒ‘áƒ£áƒšáƒ˜."
 
 #: 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 áƒ’áƒ•áƒ”áƒ áƒ“áƒ˜ áƒ áƒáƒ›áƒ”áƒšáƒ˜áƒª áƒ›áƒáƒ—áƒáƒ•áƒ¡áƒ”áƒ‘áƒ£áƒšáƒ˜áƒ owncloud root áƒ“áƒ˜áƒ áƒ”áƒ¥áƒ¢áƒáƒ áƒ˜áƒáƒ¨áƒ˜, áƒ¬áƒ£áƒ—áƒ¨áƒ˜ áƒ”áƒ áƒ—áƒ®áƒ”áƒš  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 "Share APIâ€“áƒ˜áƒ¡ áƒ©áƒáƒ áƒ—áƒ•áƒ"
 
 #: templates/admin.php:135
 msgid "Allow apps to use the Share API"
-msgstr ""
+msgstr "áƒ“áƒáƒ£áƒ¨áƒ•áƒ˜ áƒáƒžáƒšáƒ˜áƒ™áƒáƒªáƒ˜áƒ”áƒ‘áƒ˜áƒ¡ áƒ£áƒ¤áƒšáƒ”áƒ‘áƒ  Share API â€“áƒ–áƒ”"
 
 #: templates/admin.php:142
 msgid "Allow links"
-msgstr ""
+msgstr "áƒšáƒ˜áƒœáƒ™áƒ”áƒ‘áƒ˜áƒ¡ áƒ“áƒáƒ¨áƒ•áƒ”áƒ‘áƒ"
 
 #: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
-msgstr ""
+msgstr "áƒ›áƒ˜áƒ”áƒªáƒ˜ áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒšáƒ”áƒ‘áƒ¡ áƒ£áƒ¤áƒšáƒ”áƒ‘áƒ áƒ áƒáƒ› áƒ’áƒáƒáƒ–áƒ˜áƒáƒ áƒáƒ¡ áƒ”áƒšáƒ”áƒ›áƒ”áƒœáƒ¢áƒ”áƒ‘áƒ˜ áƒ¡áƒáƒ¯áƒáƒ áƒáƒ“ áƒšáƒ˜áƒœáƒ™áƒ”áƒ‘áƒ˜áƒ—"
 
 #: templates/admin.php:150
 msgid "Allow resharing"
-msgstr ""
+msgstr "áƒ’áƒáƒ“áƒáƒ–áƒ˜áƒáƒ áƒ”áƒ‘áƒ˜áƒ¡ áƒ“áƒáƒ¨áƒ•áƒ”áƒ‘áƒ"
 
 #: templates/admin.php:151
 msgid "Allow users to share items shared with them again"
-msgstr ""
+msgstr "áƒ›áƒ˜áƒ”áƒªáƒ˜áƒ— áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒšáƒ”áƒ‘áƒ¡ áƒ£áƒ¤áƒšáƒ”áƒ‘áƒ áƒ áƒáƒ› áƒ’áƒáƒáƒ–áƒ˜áƒáƒ áƒáƒ¡ áƒ›áƒ˜áƒ¡áƒ—áƒ•áƒ˜áƒ¡ áƒ’áƒáƒ–áƒ˜áƒáƒ áƒ”áƒ‘áƒ£áƒšáƒ˜"
 
 #: templates/admin.php:158
 msgid "Allow users to share with anyone"
-msgstr ""
+msgstr "áƒ›áƒ˜áƒ”áƒªáƒ˜áƒ— áƒ£áƒ¤áƒšáƒ”áƒ‘áƒ áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒšáƒ”áƒ‘áƒ¡ áƒ’áƒáƒáƒ–áƒ˜áƒáƒ áƒáƒ¡ áƒ§áƒ•áƒ”áƒšáƒáƒ¡áƒ—áƒ•áƒ˜áƒ¡"
 
 #: templates/admin.php:161
 msgid "Allow users to only share with users in their groups"
-msgstr ""
+msgstr "áƒ›áƒ˜áƒ”áƒªáƒ˜áƒ— áƒ£áƒ¤áƒšáƒ”áƒ‘áƒ áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒšáƒ”áƒ‘áƒ¡ áƒ áƒáƒ› áƒ’áƒáƒáƒ–áƒ˜áƒáƒ áƒáƒ¡ áƒ›áƒ®áƒáƒšáƒáƒ“ áƒ—áƒáƒ•áƒ˜áƒáƒœáƒ—áƒ˜ áƒ¯áƒ’áƒ£áƒ¤áƒ˜áƒ¡áƒ—áƒ•áƒ˜áƒ¡"
 
 #: templates/admin.php:168
 msgid "Security"
-msgstr ""
+msgstr "áƒ£áƒ¡áƒáƒ¤áƒ áƒ—áƒ®áƒáƒ”áƒ‘áƒ"
 
 #: templates/admin.php:181
 msgid "Enforce HTTPS"
-msgstr ""
+msgstr "HTTPSâ€“áƒ˜áƒ¡ áƒ©áƒáƒ áƒ—áƒ•áƒ"
 
 #: templates/admin.php:182
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
-msgstr ""
+msgstr "áƒ•áƒáƒ˜áƒ«áƒ£áƒšáƒáƒ— áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒšáƒ”áƒ‘áƒ˜ áƒ áƒáƒ› áƒ“áƒáƒ£áƒ™áƒáƒ•áƒ¨áƒ˜áƒ áƒ“áƒœáƒ”áƒœ ownCloud áƒ“áƒáƒªáƒ£áƒšáƒ˜ áƒ™áƒáƒ•áƒ¨áƒ˜áƒ áƒ˜áƒ— (https)."
 
 #: templates/admin.php:185
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
-msgstr ""
+msgstr "áƒ’áƒ—áƒ®áƒáƒ•áƒ— áƒ“áƒáƒ£áƒ™áƒáƒ•áƒ¨áƒ˜áƒ áƒ“áƒ”áƒ— ownCloudâ€“áƒ¡  HTTPSâ€“áƒ˜áƒ— áƒ áƒáƒ› áƒ¨áƒ”áƒ«áƒšáƒáƒ— SSLâ€“áƒ˜áƒ¡ áƒ©áƒáƒ áƒ—áƒ•áƒ áƒ’áƒáƒ›áƒáƒ áƒ—áƒ•áƒ."
 
 #: 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:228
+msgid "Less"
+msgstr "áƒ£áƒ¤áƒ áƒ áƒœáƒáƒ™áƒšáƒ”áƒ‘áƒ˜"
 
-#: templates/admin.php:230 templates/personal.php:102
+#: templates/admin.php:235 templates/personal.php:105
 msgid "Version"
-msgstr ""
+msgstr "áƒ•áƒ”áƒ áƒ¡áƒ˜áƒ"
 
-#: templates/admin.php:233 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 "
@@ -329,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 "áƒ¬áƒáƒ áƒ›áƒáƒ”áƒ‘áƒ£áƒšáƒ˜áƒ <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>â€“áƒ˜áƒ¡ áƒ›áƒ˜áƒ”áƒ . <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a>  áƒ•áƒ áƒªáƒ”áƒšáƒ“áƒ”áƒ‘áƒ <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> áƒšáƒ˜áƒªáƒ”áƒœáƒ–áƒ˜áƒ˜áƒ¡ áƒ¤áƒáƒ áƒ’áƒšáƒ”áƒ‘áƒ¨áƒ˜."
 
 #: templates/apps.php:11
 msgid "Add your App"
@@ -357,42 +365,42 @@ 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
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr ""
+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:77
 msgid "Password"
 msgstr "áƒžáƒáƒ áƒáƒšáƒ˜"
 
@@ -416,82 +424,70 @@ msgstr "áƒáƒ®áƒáƒšáƒ˜ áƒžáƒáƒ áƒáƒšáƒ˜"
 msgid "Change password"
 msgstr "áƒžáƒáƒ áƒáƒšáƒ˜áƒ¡ áƒ¨áƒ”áƒªáƒ•áƒšáƒ"
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:76
 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: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 ""
+msgstr "WebDAV"
 
-#: templates/personal.php:93
+#: templates/personal.php:96
 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:75
 msgid "Login Name"
-msgstr ""
+msgstr "áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒšáƒ˜áƒ¡ áƒ¡áƒáƒ®áƒ”áƒšáƒ˜"
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr "áƒ¨áƒ”áƒ¥áƒ›áƒœáƒ"
 
-#: templates/users.php:35
+#: templates/users.php:33
 msgid "Default Storage"
-msgstr ""
+msgstr "áƒ¡áƒáƒ¬áƒ§áƒ˜áƒ¡áƒ˜ áƒ¡áƒáƒªáƒáƒ•áƒ˜"
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:39 templates/users.php:133
 msgid "Unlimited"
-msgstr ""
+msgstr "áƒ£áƒšáƒ˜áƒ›áƒ˜áƒ¢áƒ"
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:57 templates/users.php:148
 msgid "Other"
 msgstr "áƒ¡áƒ®áƒ•áƒ"
 
-#: templates/users.php:84
+#: templates/users.php:82
 msgid "Storage"
-msgstr ""
+msgstr "áƒ¡áƒáƒªáƒáƒ•áƒ˜"
 
-#: templates/users.php:95
+#: templates/users.php:93
 msgid "change display name"
-msgstr ""
+msgstr "áƒ¨áƒ”áƒªáƒ•áƒáƒšáƒ” áƒ“áƒ˜áƒ¡áƒ¤áƒšáƒ”áƒ˜áƒ¡ áƒ¡áƒáƒ®áƒ”áƒšáƒ˜"
 
-#: templates/users.php:99
+#: templates/users.php:97
 msgid "set new password"
-msgstr ""
+msgstr "áƒ“áƒáƒáƒ§áƒ”áƒœáƒ”áƒ— áƒáƒ®áƒáƒšáƒ˜ áƒžáƒáƒ áƒáƒšáƒ˜"
 
-#: templates/users.php:134
+#: templates/users.php:128
 msgid "Default"
-msgstr ""
+msgstr "áƒ¡áƒáƒ¬áƒ§áƒ˜áƒ¡áƒ˜ áƒžáƒáƒ áƒáƒ›áƒ”áƒ¢áƒ áƒ”áƒ‘áƒ˜"
diff --git a/l10n/ka_GE/user_ldap.po b/l10n/ka_GE/user_ldap.po
index 33202c71fcff955f2e6bbb6caab88c73ab31ec11..b59faa4d492597c8b40af623fd584f0f3d1517bd 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-03-02 00:03+0100\n"
-"PO-Revision-Date: 2013-03-01 23:04+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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:18
+#: templates/settings.php:32
 msgid "Add Server Configuration"
-msgstr ""
+msgstr "áƒ¡áƒ”áƒ áƒ•áƒ”áƒ áƒ˜áƒ¡ áƒžáƒáƒ áƒáƒ›áƒ”áƒ¢áƒ áƒ”áƒ‘áƒ˜áƒ¡ áƒ“áƒáƒ›áƒáƒ¢áƒ”áƒ‘áƒ"
 
-#: templates/settings.php:23
+#: templates/settings.php:37
 msgid "Host"
-msgstr ""
+msgstr "áƒ°áƒáƒ¡áƒ¢áƒ˜"
 
-#: templates/settings.php:25
+#: 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:26
+#: templates/settings.php:40
 msgid "Base DN"
-msgstr ""
+msgstr "áƒ¡áƒáƒ¬áƒ§áƒ˜áƒ¡áƒ˜ DN"
 
-#: templates/settings.php:27
+#: templates/settings.php:41
 msgid "One Base DN per line"
-msgstr ""
+msgstr "áƒ”áƒ áƒ—áƒ˜ áƒ¡áƒáƒ¬áƒ§áƒ˜áƒ¡áƒ˜ DN áƒ”áƒ áƒ— áƒ®áƒáƒ–áƒ–áƒ”"
 
-#: templates/settings.php:28
+#: 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:30
+#: templates/settings.php:44
 msgid "User DN"
-msgstr ""
+msgstr "áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒšáƒ˜áƒ¡ DN"
 
-#: 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 ""
+msgstr "áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒšáƒ˜áƒ¡ DN áƒ áƒáƒ›áƒ”áƒšáƒ—áƒáƒœáƒáƒª áƒ£áƒœáƒ“áƒ áƒ›áƒáƒ®áƒ“áƒ”áƒ¡ áƒ“áƒáƒ™áƒáƒ•áƒ¨áƒ˜áƒ áƒ”áƒ‘áƒ áƒ›áƒáƒ®áƒ“áƒ”áƒ‘áƒ áƒ¨áƒ”áƒ›áƒ“áƒ”áƒ’áƒœáƒáƒ˜áƒ áƒáƒ“ áƒ›áƒáƒ’: uid=agent,dc=example,dc=com. áƒ®áƒáƒšáƒ áƒáƒœáƒáƒœáƒ˜áƒ›áƒ£áƒ áƒ˜ áƒ“áƒáƒ¨áƒ•áƒ”áƒ‘áƒ˜áƒ¡áƒ—áƒ•áƒ˜áƒ¡, áƒ“áƒáƒ¢áƒáƒ•áƒ”áƒ— DNâ€“áƒ˜áƒ¡ áƒ“áƒ áƒžáƒáƒ áƒáƒšáƒ˜áƒ¡ áƒ•áƒ”áƒšáƒ”áƒ‘áƒ˜ áƒªáƒáƒ áƒ˜áƒ”áƒšáƒ˜."
 
-#: 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 ""
+msgstr "áƒáƒœáƒáƒœáƒ˜áƒ›áƒ£áƒ áƒ˜ áƒ“áƒáƒ¨áƒ•áƒ”áƒ‘áƒ˜áƒ¡áƒ—áƒ•áƒ˜áƒ¡, áƒ“áƒáƒ¢áƒáƒ•áƒ”áƒ— DNâ€“áƒ˜áƒ¡ áƒ“áƒ áƒžáƒáƒ áƒáƒšáƒ˜áƒ¡ áƒ•áƒ”áƒšáƒ”áƒ‘áƒ˜ áƒªáƒáƒ áƒ˜áƒ”áƒšáƒ˜."
 
-#: templates/settings.php:37
+#: templates/settings.php:51
 msgid "User Login Filter"
-msgstr ""
+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 ""
+msgstr "áƒ áƒáƒªáƒ áƒ¨áƒ”áƒ›áƒáƒ¡áƒ•áƒšáƒ áƒ’áƒáƒœáƒ®áƒáƒ áƒªáƒ˜áƒ”áƒšáƒ“áƒ”áƒ‘áƒ áƒáƒ¡áƒ”áƒ˜áƒ«áƒšáƒ”áƒ‘áƒ áƒ›áƒáƒ•áƒáƒ®áƒ“áƒ˜áƒœáƒáƒ— áƒ’áƒáƒ¤áƒ˜áƒšáƒ¢áƒ•áƒ áƒ. %%uid áƒ¨áƒ”áƒ˜áƒªáƒ•áƒšáƒ”áƒ‘áƒ áƒ˜áƒ£áƒ–áƒ”áƒ áƒœáƒ”áƒ˜áƒ›áƒ˜áƒ— áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒšáƒ˜áƒ¡ áƒ•áƒ”áƒšáƒ¨áƒ˜."
 
-#: templates/settings.php:41
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
+msgstr "áƒ’áƒáƒ›áƒáƒ˜áƒ§áƒ”áƒœáƒ”áƒ— %%uid áƒ“áƒáƒ›áƒáƒ¡áƒ áƒ£áƒšáƒ”áƒ‘áƒ”áƒšáƒ˜ áƒ›áƒáƒ’: \"uid=%%uid\""
 
-#: templates/settings.php:42
+#: templates/settings.php:56
 msgid "User List Filter"
-msgstr ""
+msgstr "áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒšáƒ”áƒ‘áƒ˜áƒ˜áƒ¡ áƒ¡áƒ˜áƒ˜áƒ¡ áƒ¤áƒ˜áƒšáƒ¢áƒ áƒ˜"
 
-#: templates/settings.php:45
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
+msgstr "áƒ’áƒáƒ¤áƒ˜áƒšáƒ¢áƒ•áƒ áƒ áƒ’áƒáƒœáƒ®áƒáƒ áƒªáƒ˜áƒ”áƒšáƒ“áƒ”áƒ‘áƒ, áƒ áƒáƒªáƒ áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒšáƒ”áƒ‘áƒ˜áƒ¡ áƒ¡áƒ˜áƒ áƒ©áƒáƒ›áƒáƒ˜áƒ¢áƒ•áƒ˜áƒ áƒ—áƒ”áƒ‘áƒ."
 
-#: templates/settings.php:46
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr ""
+msgstr "áƒ§áƒáƒ•áƒ”áƒšáƒ’áƒ•áƒáƒ áƒ˜ áƒ“áƒáƒ›áƒáƒ¡áƒ áƒ£áƒšáƒ”áƒ‘áƒ”áƒšáƒ˜áƒ¡ áƒ’áƒáƒ áƒ”áƒ¨áƒ”, áƒ›áƒáƒ’: \"objectClass=person\"."
 
-#: templates/settings.php:47
+#: templates/settings.php:61
 msgid "Group Filter"
-msgstr ""
+msgstr "áƒ¯áƒ’áƒ£áƒ¤áƒ˜áƒ¡ áƒ¤áƒ˜áƒšáƒ¢áƒ áƒ˜"
 
-#: templates/settings.php:50
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
+msgstr "áƒ’áƒáƒ¤áƒ˜áƒšáƒ¢áƒ•áƒ áƒ áƒ’áƒáƒœáƒ®áƒáƒ áƒªáƒ˜áƒ”áƒšáƒ“áƒ”áƒ‘áƒ, áƒ áƒáƒªáƒ áƒ¯áƒ’áƒ£áƒ¤áƒ˜áƒ¡ áƒ¡áƒ˜áƒ áƒ©áƒáƒ›áƒáƒ˜áƒ¢áƒ•áƒ˜áƒ áƒ—áƒ”áƒ‘áƒ."
 
-#: templates/settings.php:51
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr ""
+msgstr "áƒ§áƒáƒ•áƒ”áƒšáƒ’áƒ•áƒáƒ áƒ˜ áƒ“áƒáƒ›áƒáƒ¡áƒ áƒ£áƒšáƒ”áƒ‘áƒ”áƒšáƒ˜áƒ¡ áƒ’áƒáƒ áƒ”áƒ¨áƒ”, áƒ›áƒáƒ’: \"objectClass=posixGroup\"."
 
-#: templates/settings.php:55
+#: templates/settings.php:69
 msgid "Connection Settings"
-msgstr ""
+msgstr "áƒ™áƒáƒ•áƒ¨áƒ˜áƒ áƒ˜áƒ¡ áƒžáƒáƒ áƒáƒ›áƒ”áƒ¢áƒ áƒ”áƒ‘áƒ˜"
 
-#: templates/settings.php:57
+#: templates/settings.php:71
 msgid "Configuration Active"
-msgstr ""
+msgstr "áƒ™áƒáƒœáƒ¤áƒ˜áƒ’áƒ£áƒ áƒáƒªáƒ˜áƒ áƒáƒ¥áƒ¢áƒ˜áƒ£áƒ áƒ˜áƒ"
 
-#: templates/settings.php:57
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
-msgstr ""
+msgstr "áƒ áƒáƒªáƒ áƒ’áƒáƒ“áƒáƒœáƒ˜áƒ¨áƒœáƒ£áƒšáƒ˜áƒ, áƒ”áƒ¡ áƒ™áƒáƒœáƒ¤áƒ˜áƒ’áƒ£áƒ áƒáƒªáƒ˜áƒ áƒ’áƒáƒ›áƒáƒ¢áƒáƒ•áƒ”áƒ‘áƒ£áƒšáƒ˜ áƒ˜áƒ¥áƒœáƒ”áƒ‘áƒ."
 
-#: templates/settings.php:58
+#: templates/settings.php:72
 msgid "Port"
-msgstr ""
+msgstr "áƒžáƒáƒ áƒ¢áƒ˜"
 
-#: templates/settings.php:59
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
-msgstr ""
+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 ""
+msgstr "áƒ›áƒ˜áƒ£áƒ—áƒ˜áƒ—áƒ”áƒ— áƒ áƒáƒ˜áƒ›áƒ” áƒ‘áƒ”áƒ¥áƒáƒ¤ áƒ°áƒáƒ¡áƒ¢áƒ˜. áƒ˜áƒ¡ áƒ£áƒœáƒ“áƒ áƒ˜áƒ§áƒáƒ¡ áƒ«áƒ˜áƒ áƒ˜áƒ—áƒáƒ“áƒ˜ LDAP/AD áƒ¡áƒ”áƒ áƒ•áƒ”áƒ áƒ˜áƒ¡ áƒ áƒ”áƒžáƒšáƒ˜áƒ™áƒ."
 
-#: templates/settings.php:60
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
-msgstr ""
+msgstr "áƒ‘áƒ”áƒ¥áƒáƒ¤ (áƒ áƒ”áƒžáƒšáƒ˜áƒ™áƒ) áƒžáƒáƒ áƒ¢áƒ˜"
 
-#: templates/settings.php:61
+#: templates/settings.php:75
 msgid "Disable Main Server"
-msgstr ""
+msgstr "áƒ’áƒáƒ›áƒáƒ áƒ—áƒ”áƒ— áƒ«áƒ˜áƒ áƒ˜áƒ—áƒáƒ“áƒ˜ áƒ¡áƒ”áƒ áƒ•áƒ”áƒ áƒ˜"
 
-#: templates/settings.php:61
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
-msgstr ""
+msgstr "áƒ áƒáƒªáƒ áƒ›áƒáƒœáƒ˜áƒ¨áƒœáƒ£áƒšáƒ˜áƒ, ownCloud áƒ“áƒáƒ£áƒ™áƒáƒ•áƒ¨áƒ˜áƒ áƒ“áƒ”áƒ‘áƒ áƒ›áƒ®áƒáƒšáƒáƒ“ áƒ áƒ”áƒžáƒšáƒ˜áƒ™áƒ áƒ¡áƒ”áƒ áƒ•áƒ”áƒ áƒ¡."
 
-#: templates/settings.php:62
+#: templates/settings.php:76
 msgid "Use TLS"
-msgstr ""
+msgstr "áƒ’áƒáƒ›áƒáƒ˜áƒ§áƒ”áƒœáƒ”áƒ— TLS"
 
-#: templates/settings.php:62
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
-msgstr ""
+msgstr "áƒáƒ  áƒ’áƒáƒ›áƒáƒ˜áƒ§áƒ”áƒœáƒáƒ— áƒ“áƒáƒ›áƒáƒ¢áƒ”áƒ‘áƒ˜áƒ— LDAPS áƒ™áƒáƒ•áƒ¨áƒ˜áƒ áƒ˜. áƒ˜áƒ¡ áƒ¬áƒáƒ áƒ£áƒ›áƒáƒ¢áƒ”áƒ‘áƒšáƒáƒ“ áƒ“áƒáƒ¡áƒ áƒ£áƒšáƒ“áƒ”áƒ‘áƒ."
 
-#: templates/settings.php:63
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
-msgstr ""
+msgstr "LDAP server (Windows)"
 
-#: templates/settings.php:64
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
-msgstr ""
+msgstr "áƒ’áƒáƒ›áƒáƒ áƒ—áƒ”áƒ— SSL áƒ¡áƒ”áƒ áƒ—áƒ˜áƒ¤áƒ˜áƒ™áƒáƒ¢áƒ˜áƒ¡ áƒ•áƒáƒšáƒ˜áƒ“áƒáƒªáƒ˜áƒ."
 
-#: 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 ""
+msgstr "áƒ˜áƒ› áƒ¨áƒ”áƒ›áƒ—áƒ®áƒ•áƒ”áƒ•áƒáƒ¨áƒ˜ áƒ—áƒ£ áƒ›áƒ£áƒ¨áƒáƒáƒ‘áƒ¡ áƒ›áƒ®áƒáƒšáƒáƒ“ áƒ”áƒ¡ áƒáƒ¤áƒªáƒ˜áƒ, áƒ“áƒáƒáƒ˜áƒ›áƒžáƒáƒ áƒ¢áƒ”áƒ— LDAP áƒ¡áƒ”áƒ áƒ•áƒ”áƒ áƒ˜áƒ¡ SSL áƒ¡áƒ”áƒ áƒ—áƒ˜áƒ¤áƒ˜áƒ™áƒáƒ¢áƒ˜ áƒ—áƒ¥áƒ•áƒ”áƒœáƒ¡ ownCloud áƒ¡áƒ”áƒ áƒ•áƒ”áƒ áƒ–áƒ”."
 
-#: templates/settings.php:64
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
-msgstr ""
+msgstr "áƒáƒ  áƒáƒ áƒ˜áƒ¡ áƒ áƒ”áƒ™áƒáƒ›áƒ”áƒœáƒ“áƒ˜áƒ áƒ”áƒ‘áƒ£áƒšáƒ˜, áƒ’áƒáƒ›áƒáƒ˜áƒ§áƒ”áƒœáƒ”áƒ— áƒ›áƒ®áƒáƒšáƒáƒ“ áƒ¡áƒáƒ¢áƒ”áƒ¡áƒ¢áƒáƒ“."
 
-#: templates/settings.php:65
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
-msgstr ""
+msgstr "áƒ¥áƒ”áƒ¨áƒ˜áƒ¡ áƒ¡áƒ˜áƒªáƒáƒªáƒ®áƒšáƒ˜áƒ¡ áƒ®áƒáƒœáƒ’áƒ áƒ«áƒšáƒ˜áƒ•áƒáƒ‘áƒ"
 
-#: templates/settings.php:65
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
-msgstr ""
+msgstr "áƒ¬áƒáƒ›áƒ”áƒ‘áƒ¨áƒ˜. áƒªáƒ•áƒšáƒ˜áƒšáƒ”áƒ‘áƒ áƒáƒ¡áƒ£áƒ¤áƒ—áƒáƒ•áƒ”áƒ‘áƒ¡ áƒ¥áƒ”áƒ¨áƒ¡."
 
-#: templates/settings.php:67
+#: templates/settings.php:81
 msgid "Directory Settings"
-msgstr ""
+msgstr "áƒ“áƒ˜áƒ áƒ”áƒ¥áƒ¢áƒáƒ áƒ˜áƒ˜áƒ¡ áƒžáƒáƒ áƒáƒ›áƒ”áƒ¢áƒ áƒ”áƒ‘áƒ˜"
 
-#: templates/settings.php:69
+#: templates/settings.php:83
 msgid "User Display Name Field"
-msgstr ""
+msgstr "áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒšáƒ˜áƒ¡ áƒ“áƒ˜áƒ¡áƒ¤áƒšáƒ”áƒ˜áƒ¡ áƒ¡áƒáƒ®áƒ”áƒšáƒ˜áƒ¡ áƒ¤áƒ˜áƒšáƒ“áƒ˜"
 
-#: templates/settings.php:69
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
-msgstr ""
+msgstr "LDAP áƒáƒ¢áƒ áƒ˜áƒ‘áƒ£áƒ¢áƒ˜ áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒšáƒ˜áƒ¡  ownCloud áƒ¡áƒáƒ®áƒ”áƒšáƒ˜áƒ¡ áƒ’áƒ”áƒœáƒ”áƒ áƒáƒªáƒ˜áƒ˜áƒ¡áƒ—áƒ•áƒ˜áƒ¡."
 
-#: templates/settings.php:70
+#: templates/settings.php:84
 msgid "Base User Tree"
-msgstr ""
+msgstr "áƒ«áƒ˜áƒ áƒ˜áƒ—áƒáƒ“ áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒ”áƒšáƒ—áƒ áƒ¡áƒ˜áƒ"
 
-#: templates/settings.php:70
+#: templates/settings.php:84
 msgid "One User Base DN per line"
-msgstr ""
+msgstr "áƒ”áƒ áƒ—áƒ˜ áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒšáƒ˜áƒ¡ áƒ¡áƒáƒ¬áƒ§áƒ˜áƒ¡áƒ˜ DN áƒ”áƒ áƒ— áƒ®áƒáƒ–áƒ–áƒ”"
 
-#: templates/settings.php:71
+#: templates/settings.php:85
 msgid "User Search Attributes"
-msgstr ""
+msgstr "áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒšáƒ˜áƒ¡ áƒ«áƒ”áƒ‘áƒœáƒ˜áƒ¡ áƒáƒ¢áƒ áƒ˜áƒ‘áƒ£áƒ¢áƒ˜"
 
-#: templates/settings.php:71 templates/settings.php:74
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
-msgstr ""
+msgstr "áƒáƒ¤áƒªáƒ˜áƒáƒœáƒáƒšáƒ£áƒ áƒ˜; áƒ—áƒ˜áƒ—áƒ áƒáƒ¢áƒ áƒ˜áƒ‘áƒ£áƒ¢áƒ˜ áƒ—áƒ˜áƒ—áƒ áƒ®áƒáƒ–áƒ–áƒ”"
 
-#: templates/settings.php:72
+#: templates/settings.php:86
 msgid "Group Display Name Field"
-msgstr ""
+msgstr "áƒ¯áƒ’áƒ£áƒ¤áƒ˜áƒ¡ áƒ“áƒ˜áƒ¡áƒ¤áƒšáƒ”áƒ˜áƒ¡ áƒ¡áƒáƒ®áƒ”áƒšáƒ˜áƒ¡ áƒ¤áƒ˜áƒšáƒ“áƒ˜"
 
-#: templates/settings.php:72
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
-msgstr ""
+msgstr "LDAP áƒáƒ¢áƒ áƒ˜áƒ‘áƒ£áƒ¢áƒ˜ áƒ¯áƒ’áƒ£áƒ¤áƒ˜áƒ¡  ownCloud áƒ¡áƒáƒ®áƒ”áƒšáƒ˜áƒ¡ áƒ’áƒ”áƒœáƒ”áƒ áƒáƒªáƒ˜áƒ˜áƒ¡áƒ—áƒ•áƒ˜áƒ¡."
 
-#: templates/settings.php:73
+#: templates/settings.php:87
 msgid "Base Group Tree"
-msgstr ""
+msgstr "áƒ«áƒ˜áƒ áƒ˜áƒ—áƒáƒ“ áƒ¯áƒ’áƒ£áƒ¤áƒ—áƒ áƒ¡áƒ˜áƒ"
 
-#: templates/settings.php:73
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
-msgstr ""
+msgstr "áƒ”áƒ áƒ—áƒ˜ áƒ¯áƒ’áƒ£áƒ¤áƒ˜áƒ¡ áƒ¡áƒáƒ¬áƒ§áƒ˜áƒ¡áƒ˜ DN áƒ”áƒ áƒ— áƒ®áƒáƒ–áƒ–áƒ”"
 
-#: templates/settings.php:74
+#: templates/settings.php:88
 msgid "Group Search Attributes"
-msgstr ""
+msgstr "áƒ¯áƒ’áƒ£áƒ¤áƒ£áƒ áƒ˜ áƒ«áƒ”áƒ‘áƒœáƒ˜áƒ¡ áƒáƒ¢áƒ áƒ˜áƒ‘áƒ£áƒ¢áƒ˜"
 
-#: templates/settings.php:75
+#: templates/settings.php:89
 msgid "Group-Member association"
-msgstr ""
+msgstr "áƒ¯áƒ’áƒ£áƒ¤áƒ˜áƒ¡ áƒ¬áƒ”áƒ•áƒ áƒáƒ‘áƒ˜áƒ¡ áƒáƒ¡áƒáƒªáƒ˜áƒáƒªáƒ˜áƒ"
 
-#: templates/settings.php:77
+#: templates/settings.php:91
 msgid "Special Attributes"
-msgstr ""
+msgstr "áƒ¡áƒžáƒ”áƒªáƒ˜áƒáƒšáƒ£áƒ áƒ˜ áƒáƒ¢áƒ áƒ˜áƒ‘áƒ£áƒ¢áƒ”áƒ‘áƒ˜"
 
-#: templates/settings.php:79
+#: templates/settings.php:93
 msgid "Quota Field"
-msgstr ""
+msgstr "áƒ¥áƒ•áƒáƒ¢áƒáƒ¡ áƒ•áƒ”áƒšáƒ˜"
 
-#: templates/settings.php:80
+#: templates/settings.php:94
 msgid "Quota Default"
-msgstr ""
+msgstr "áƒ¡áƒáƒ¬áƒ§áƒ˜áƒ¡áƒ˜ áƒ¥áƒ•áƒáƒ¢áƒ"
 
-#: templates/settings.php:80
+#: templates/settings.php:94
 msgid "in bytes"
-msgstr ""
+msgstr "áƒ‘áƒáƒ˜áƒ¢áƒ”áƒ‘áƒ¨áƒ˜"
 
-#: templates/settings.php:81
+#: templates/settings.php:95
 msgid "Email Field"
-msgstr ""
+msgstr "áƒ˜áƒ›áƒ”áƒ˜áƒšáƒ˜áƒ¡ áƒ•áƒ”áƒšáƒ˜"
 
-#: templates/settings.php:82
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
-msgstr ""
+msgstr "áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒšáƒ˜áƒ¡ Home áƒ“áƒ˜áƒ áƒ”áƒ¥áƒ¢áƒáƒ áƒ˜áƒ˜áƒ¡ áƒ¡áƒáƒ®áƒ”áƒšáƒ”áƒ‘áƒ˜áƒ¡ áƒ“áƒáƒ áƒ¥áƒ›áƒ”áƒ•áƒ˜áƒ¡ áƒ¬áƒ”áƒ¡áƒ˜"
 
-#: templates/settings.php:82
+#: 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:86
-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:86
+#: 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/ka_GE/user_webdavauth.po b/l10n/ka_GE/user_webdavauth.po
index b7a0b5576301a2e68b6d6a48cc03d82ce581e1bb..a6662b7e1129c06b3129107f14f5ed88db882a84 100644
--- a/l10n/ka_GE/user_webdavauth.po
+++ b/l10n/ka_GE/user_webdavauth.po
@@ -3,12 +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-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
 "MIME-Version: 1.0\n"
@@ -19,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â€“áƒ–áƒ”. áƒ”áƒ¡ áƒžáƒšáƒáƒ’áƒ˜áƒœáƒ˜ áƒ¨áƒ”áƒáƒ›áƒáƒ¬áƒ›áƒ”áƒ‘áƒ¡ áƒžáƒáƒ¡áƒ£áƒ®áƒ¡ áƒ“áƒ áƒ›áƒáƒáƒ®áƒ“áƒ”áƒœáƒ¡ áƒ›áƒ˜áƒ¡ áƒ˜áƒœáƒ¢áƒ”áƒ áƒžáƒ áƒ”áƒ¢áƒáƒªáƒ˜áƒáƒ¡ HTTP áƒ¡áƒ¢áƒáƒ¢áƒ£áƒ¡áƒ™áƒáƒ“áƒ”áƒ‘áƒ¨áƒ˜ 401 áƒ“áƒ 403 áƒ“áƒáƒ£áƒ¨áƒ•áƒ”áƒ‘áƒ”áƒšáƒ˜ áƒ›áƒáƒœáƒáƒªáƒ”áƒ›áƒ”áƒ‘áƒ˜áƒ¡áƒ—áƒ•áƒ˜áƒ¡, áƒ®áƒáƒšáƒ áƒ¡áƒ®áƒ•áƒ áƒ“áƒáƒœáƒáƒ áƒ©áƒ”áƒœáƒ¡ áƒ“áƒáƒ¨áƒ•áƒ”áƒ‘áƒáƒ“áƒ˜ áƒ›áƒáƒœáƒáƒªáƒ”áƒ›áƒ”áƒ‘áƒ˜áƒ¡áƒ—áƒ•áƒ˜áƒ¡."
diff --git a/l10n/kn/core.po b/l10n/kn/core.po
new file mode 100644
index 0000000000000000000000000000000000000000..b412b63b1ff51e2f40fed86b1b2934f640492b0a
--- /dev/null
+++ b/l10n/kn/core.po
@@ -0,0 +1,613 @@
+# 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-04-30 01:57+0200\n"
+"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: kn\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 ""
+
+#: 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 js/oc-dialogs.js:247
+msgid "Ok"
+msgstr ""
+
+#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:185
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:215
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:222
+msgid "No"
+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: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/kn/files.po b/l10n/kn/files.po
new file mode 100644
index 0000000000000000000000000000000000000000..6dc22644115d7c8c3324e868a3794d7e50e9085c
--- /dev/null
+++ b/l10n/kn/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-05-15 01:59+0200\n"
+"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: kn\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 ""
+
+#: 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 ""
+
+#: 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/kn/files_encryption.po b/l10n/kn/files_encryption.po
new file mode 100644
index 0000000000000000000000000000000000000000..602b35e3e8f825dac2ad397994b91f1ec9f7f84d
--- /dev/null
+++ b/l10n/kn/files_encryption.po
@@ -0,0 +1,38 @@
+# 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-04-26 10:00+0200\n"
+"PO-Revision-Date: 2013-04-26 08:01+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"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: kn\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: templates/settings-personal.php:4 templates/settings.php:5
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings-personal.php:7
+msgid "File encryption is enabled."
+msgstr ""
+
+#: templates/settings-personal.php:11
+msgid "The following file types will not be encrypted:"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Exclude the following file types from encryption:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "None"
+msgstr ""
diff --git a/l10n/kn/files_external.po b/l10n/kn/files_external.po
new file mode 100644
index 0000000000000000000000000000000000000000..d73e3f29a793b2470bda4db37395d54d2c895cd7
--- /dev/null
+++ b/l10n/kn/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-04-26 10:00+0200\n"
+"PO-Revision-Date: 2013-04-26 08:01+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"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: kn\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/kn/files_sharing.po b/l10n/kn/files_sharing.po
new file mode 100644
index 0000000000000000000000000000000000000000..17f0921f70163ac6cf3cdba1d98d28ba71d1de20
--- /dev/null
+++ b/l10n/kn/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-04-26 10:00+0200\n"
+"PO-Revision-Date: 2013-04-26 08:01+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"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: kn\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/kn/files_trashbin.po b/l10n/kn/files_trashbin.po
new file mode 100644
index 0000000000000000000000000000000000000000..1886595ceabc472e4f950e2a664f5edb81f06afd
--- /dev/null
+++ b/l10n/kn/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-04-26 10:00+0200\n"
+"PO-Revision-Date: 2013-04-26 08:01+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"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: kn\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: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/kn/files_versions.po b/l10n/kn/files_versions.po
new file mode 100644
index 0000000000000000000000000000000000000000..33d7a4a3b2540199b96113b8ab9919af53550dac
--- /dev/null
+++ b/l10n/kn/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-04-26 10:00+0200\n"
+"PO-Revision-Date: 2013-04-26 08: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"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: kn\n"
+"Plural-Forms: nplurals=1; plural=0;\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/kn/lib.po b/l10n/kn/lib.po
new file mode 100644
index 0000000000000000000000000000000000000000..8bc47e9ad2cbb816e6ebff5092d156ecf68c9de7
--- /dev/null
+++ b/l10n/kn/lib.po
@@ -0,0 +1,241 @@
+# 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-04-28 01:57+0200\n"
+"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: kn\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: app.php:349
+msgid "Help"
+msgstr ""
+
+#: app.php:362
+msgid "Personal"
+msgstr ""
+
+#: app.php:373
+msgid "Settings"
+msgstr ""
+
+#: app.php:385
+msgid "Users"
+msgstr ""
+
+#: app.php:398
+msgid "Apps"
+msgstr ""
+
+#: app.php:406
+msgid "Admin"
+msgstr ""
+
+#: files.php:209
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: files.php:210
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: files.php:211 files.php:244
+msgid "Back to Files"
+msgstr ""
+
+#: files.php:241
+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:325 setup.php:370
+msgid "PostgreSQL username and/or password not valid"
+msgstr ""
+
+#: setup.php:133 setup.php:156 setup.php:234
+msgid "You need to enter either an existing account or the administrator."
+msgstr ""
+
+#: setup.php:155 setup.php:458 setup.php:525
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:233
+msgid "MySQL username and/or password not valid"
+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:583 setup.php:592 setup.php:600 setup.php:609
+#: setup.php:615
+#, php-format
+msgid "DB Error: \"%s\""
+msgstr ""
+
+#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
+#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
+#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#, php-format
+msgid "Offending command was: \"%s\""
+msgstr ""
+
+#: setup.php:304
+#, php-format
+msgid "MySQL user '%s'@'localhost' exists already."
+msgstr ""
+
+#: setup.php:305
+msgid "Drop this user from MySQL"
+msgstr ""
+
+#: setup.php:310
+#, php-format
+msgid "MySQL user '%s'@'%%' already exists"
+msgstr ""
+
+#: setup.php:311
+msgid "Drop this user from MySQL."
+msgstr ""
+
+#: setup.php:584 setup.php:616
+#, php-format
+msgid "Offending command was: \"%s\", name: %s, password: %s"
+msgstr ""
+
+#: setup.php:636
+#, php-format
+msgid "MS SQL username and/or password not valid: %s"
+msgstr ""
+
+#: setup.php:858
+msgid ""
+"Your web server is not yet properly setup to allow files synchronization "
+"because the WebDAV interface seems to be broken."
+msgstr ""
+
+#: setup.php:859
+#, 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/kn/settings.po b/l10n/kn/settings.po
new file mode 100644
index 0000000000000000000000000000000000000000..034be72d0ddaae1dd3ce589af5e4ac7c113f93d3
--- /dev/null
+++ b/l10n/kn/settings.po
@@ -0,0 +1,492 @@
+# 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-04-26 10:00+0200\n"
+"PO-Revision-Date: 2013-04-26 08:00+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: kn\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 ""
+
+#: 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:115
+msgid "Saving..."
+msgstr ""
+
+#: js/users.js:43
+msgid "deleted"
+msgstr ""
+
+#: js/users.js:43
+msgid "undo"
+msgstr ""
+
+#: js/users.js:75
+msgid "Unable to remove user"
+msgstr ""
+
+#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: templates/users.php:103
+msgid "Groups"
+msgstr ""
+
+#: js/users.js:91 templates/users.php:80 templates/users.php:115
+msgid "Group Admin"
+msgstr ""
+
+#: js/users.js:111 templates/users.php:155
+msgid "Delete"
+msgstr ""
+
+#: js/users.js:262
+msgid "add group"
+msgstr ""
+
+#: js/users.js:414
+msgid "A valid username must be provided"
+msgstr ""
+
+#: js/users.js:415 js/users.js:421 js/users.js:436
+msgid "Error creating user"
+msgstr ""
+
+#: js/users.js:420
+msgid "A valid password must be provided"
+msgstr ""
+
+#: personal.php:29 personal.php:30
+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:100
+msgid "Version"
+msgstr ""
+
+#: templates/admin.php:238 templates/personal.php:103
+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:77
+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:76
+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:84
+msgid "Help translate"
+msgstr ""
+
+#: templates/personal.php:89
+msgid "WebDAV"
+msgstr ""
+
+#: templates/personal.php:91
+msgid "Use this address to connect to your ownCloud in your file manager"
+msgstr ""
+
+#: templates/users.php:21 templates/users.php:75
+msgid "Login Name"
+msgstr ""
+
+#: templates/users.php:30
+msgid "Create"
+msgstr ""
+
+#: templates/users.php:33
+msgid "Default Storage"
+msgstr ""
+
+#: templates/users.php:39 templates/users.php:133
+msgid "Unlimited"
+msgstr ""
+
+#: templates/users.php:57 templates/users.php:148
+msgid "Other"
+msgstr ""
+
+#: templates/users.php:82
+msgid "Storage"
+msgstr ""
+
+#: templates/users.php:93
+msgid "change display name"
+msgstr ""
+
+#: templates/users.php:97
+msgid "set new password"
+msgstr ""
+
+#: templates/users.php:128
+msgid "Default"
+msgstr ""
diff --git a/l10n/kn/user_ldap.po b/l10n/kn/user_ldap.po
new file mode 100644
index 0000000000000000000000000000000000000000..f6390750e15784298fc0a898e640d692f1aaa1c3
--- /dev/null
+++ b/l10n/kn/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-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-17 00:04+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"
+"Content-Transfer-Encoding: 8bit\n"
+"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 ""
+
+#: ajax/testConfiguration.php:36
+msgid "The configuration is valid and the connection could be established!"
+msgstr ""
+
+#: ajax/testConfiguration.php:39
+msgid ""
+"The configuration is valid, but the Bind failed. Please check the server "
+"settings and credentials."
+msgstr ""
+
+#: ajax/testConfiguration.php:43
+msgid ""
+"The configuration is invalid. Please look in the ownCloud log for further "
+"details."
+msgstr ""
+
+#: js/settings.js:66
+msgid "Deletion failed"
+msgstr ""
+
+#: js/settings.js:82
+msgid "Take over settings from recent server configuration?"
+msgstr ""
+
+#: js/settings.js:83
+msgid "Keep settings?"
+msgstr ""
+
+#: js/settings.js:97
+msgid "Cannot add server configuration"
+msgstr ""
+
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
+msgid "Connection test succeeded"
+msgstr ""
+
+#: js/settings.js:146
+msgid "Connection test failed"
+msgstr ""
+
+#: js/settings.js:156
+msgid "Do you really want to delete the current Server Configuration?"
+msgstr ""
+
+#: js/settings.js:157
+msgid "Confirm Deletion"
+msgstr ""
+
+#: templates/settings.php:9
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:12
+msgid ""
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:16
+msgid "Server configuration"
+msgstr ""
+
+#: templates/settings.php:32
+msgid "Add Server Configuration"
+msgstr ""
+
+#: templates/settings.php:37
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:40
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:41
+msgid "One Base DN per line"
+msgstr ""
+
+#: templates/settings.php:42
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:44
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:46
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:47
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:50
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:51
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:54
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:55
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:56
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:59
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:60
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:61
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:65
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Connection Settings"
+msgstr ""
+
+#: templates/settings.php:71
+msgid "Configuration Active"
+msgstr ""
+
+#: templates/settings.php:71
+msgid "When unchecked, this configuration will be skipped."
+msgstr ""
+
+#: templates/settings.php:72
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:73
+msgid "Backup (Replica) Host"
+msgstr ""
+
+#: templates/settings.php:73
+msgid ""
+"Give an optional backup host. It must be a replica of the main LDAP/AD "
+"server."
+msgstr ""
+
+#: templates/settings.php:74
+msgid "Backup (Replica) Port"
+msgstr ""
+
+#: templates/settings.php:75
+msgid "Disable Main Server"
+msgstr ""
+
+#: templates/settings.php:75
+msgid "When switched on, ownCloud will only connect to the replica server."
+msgstr ""
+
+#: templates/settings.php:76
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:76
+msgid "Do not use it additionally for LDAPS connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:77
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:78
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:78
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:78
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:79
+msgid "Cache Time-To-Live"
+msgstr ""
+
+#: templates/settings.php:79
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:81
+msgid "Directory Settings"
+msgstr ""
+
+#: templates/settings.php:83
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:83
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:84
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:84
+msgid "One User Base DN per line"
+msgstr ""
+
+#: templates/settings.php:85
+msgid "User Search Attributes"
+msgstr ""
+
+#: templates/settings.php:85 templates/settings.php:88
+msgid "Optional; one attribute per line"
+msgstr ""
+
+#: templates/settings.php:86
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:86
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:87
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "One Group Base DN per line"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "Group Search Attributes"
+msgstr ""
+
+#: templates/settings.php:89
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "Special Attributes"
+msgstr ""
+
+#: templates/settings.php:93
+msgid "Quota Field"
+msgstr ""
+
+#: templates/settings.php:94
+msgid "Quota Default"
+msgstr ""
+
+#: templates/settings.php:94
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:95
+msgid "Email Field"
+msgstr ""
+
+#: templates/settings.php:96
+msgid "User Home Folder Naming Rule"
+msgstr ""
+
+#: templates/settings.php:96
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
+msgid "Test Configuration"
+msgstr ""
+
+#: templates/settings.php:111
+msgid "Help"
+msgstr ""
diff --git a/l10n/kn/user_webdavauth.po b/l10n/kn/user_webdavauth.po
new file mode 100644
index 0000000000000000000000000000000000000000..1dde34b41e36efde9e6acbdf2432495e764e226f
--- /dev/null
+++ b/l10n/kn/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-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+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"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: kn\n"
+"Plural-Forms: nplurals=1; plural=0;\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/ko/core.po b/l10n/ko/core.po
index 4d5ca8bf43b0d1c5a0ef4f35de56896ba9161f93..cdaa87d744d59c0d83da87c157f50bfc672c1799 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-02-22 00:06+0100\n"
-"PO-Revision-Date: 2013-02-20 23:20+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10: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"
@@ -22,24 +18,24 @@ msgstr ""
 "Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/share.php:85
+#: ajax/share.php:97
 #, php-format
 msgid "User %s shared a file with you"
 msgstr "%s ë‹˜ì´ íŒŒì¼ì„ ê³µìœ í•˜ì˜€ìŠµë‹ˆë‹¤"
 
-#: ajax/share.php:87
+#: ajax/share.php:99
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr "%s ë‹˜ì´ í´ë”ë¥¼ ê³µìœ í•˜ì˜€ìŠµë‹ˆë‹¤"
 
-#: ajax/share.php:89
+#: ajax/share.php:101
 #, php-format
 msgid ""
 "User %s shared the file \"%s\" with you. It is available for download here: "
 "%s"
 msgstr "%s ë‹˜ì´ íŒŒì¼ \"%s\"ì„(ë¥¼) ê³µìœ í•˜ì˜€ìŠµë‹ˆë‹¤. ì—¬ê¸°ì—ì„œ ë‹¤ìš´ë¡œë“œí•  ìˆ˜ ìžˆìŠµë‹ˆë‹¤: %s"
 
-#: ajax/share.php:91
+#: ajax/share.php:104
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -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,86 +74,86 @@ 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
 msgid "Error removing %s from favorites."
 msgstr "ì±…ê°ˆí”¼ì—ì„œ %sì„(ë¥¼) ì‚ì œí•  ìˆ˜ ì—†ì—ˆìŠµë‹ˆë‹¤."
 
-#: js/config.php:32
+#: js/config.php:34
 msgid "Sunday"
 msgstr "ì¼ìš”ì¼"
 
-#: js/config.php:32
+#: js/config.php:35
 msgid "Monday"
 msgstr "ì›”ìš”ì¼"
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Tuesday"
 msgstr "í™”ìš”ì¼"
 
-#: js/config.php:32
+#: js/config.php:37
 msgid "Wednesday"
 msgstr "ìˆ˜ìš”ì¼"
 
-#: js/config.php:32
+#: js/config.php:38
 msgid "Thursday"
 msgstr "ëª©ìš”ì¼"
 
-#: js/config.php:32
+#: js/config.php:39
 msgid "Friday"
 msgstr "ê¸ˆìš”ì¼"
 
-#: js/config.php:32
+#: js/config.php:40
 msgid "Saturday"
 msgstr "í† ìš”ì¼"
 
-#: js/config.php:33
+#: js/config.php:45
 msgid "January"
 msgstr "1ì›”"
 
-#: js/config.php:33
+#: js/config.php:46
 msgid "February"
 msgstr "2ì›”"
 
-#: js/config.php:33
+#: js/config.php:47
 msgid "March"
 msgstr "3ì›”"
 
-#: js/config.php:33
+#: js/config.php:48
 msgid "April"
 msgstr "4ì›”"
 
-#: js/config.php:33
+#: js/config.php:49
 msgid "May"
 msgstr "5ì›”"
 
-#: js/config.php:33
+#: js/config.php:50
 msgid "June"
 msgstr "6ì›”"
 
-#: js/config.php:33
+#: js/config.php:51
 msgid "July"
 msgstr "7ì›”"
 
-#: js/config.php:33
+#: js/config.php:52
 msgid "August"
 msgstr "8ì›”"
 
-#: js/config.php:33
+#: js/config.php:53
 msgid "September"
 msgstr "9ì›”"
 
-#: js/config.php:33
+#: js/config.php:54
 msgid "October"
 msgstr "10ì›”"
 
-#: js/config.php:33
+#: js/config.php:55
 msgid "November"
 msgstr "11ì›”"
 
-#: js/config.php:33
+#: js/config.php:56
 msgid "December"
 msgstr "12ì›”"
 
@@ -165,86 +161,88 @@ msgstr "12ì›”"
 msgid "Settings"
 msgstr "ì„¤ì •"
 
-#: js/js.js:767
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "ì´ˆ ì „"
 
-#: js/js.js:768
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "1ë¶„ ì „"
 
-#: js/js.js:769
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr "{minutes}ë¶„ ì „"
 
-#: js/js.js:770
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr "1ì‹œê°„ ì „"
 
-#: js/js.js:771
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr "{hours}ì‹œê°„ ì „"
 
-#: js/js.js:772
+#: js/js.js:723
 msgid "today"
 msgstr "ì˜¤ëŠ˜"
 
-#: js/js.js:773
+#: js/js.js:724
 msgid "yesterday"
 msgstr "ì–´ì œ"
 
-#: js/js.js:774
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr "{days}ì¼ ì „"
 
-#: js/js.js:775
+#: js/js.js:726
 msgid "last month"
 msgstr "ì§€ë‚œ ë‹¬"
 
-#: js/js.js:776
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr "{months}ê°œì›” ì „"
 
-#: js/js.js:777
+#: js/js.js:728
 msgid "months ago"
 msgstr "ê°œì›” ì „"
 
-#: js/js.js:778
+#: js/js.js:729
 msgid "last year"
 msgstr "ìž‘ë…„"
 
-#: js/js.js:779
+#: js/js.js:730
 msgid "years ago"
 msgstr "ë…„ ì „"
 
-#: js/oc-dialogs.js:126
-msgid "Choose"
-msgstr "ì„ íƒ"
+#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
+msgid "Ok"
+msgstr "ìŠ¹ë½"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
 msgid "Cancel"
 msgstr "ì·¨ì†Œ"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "ì•„ë‹ˆìš”"
+#: js/oc-dialogs.js:185
+msgid "Choose"
+msgstr "ì„ íƒ"
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:215
 msgid "Yes"
 msgstr "ì˜ˆ"
 
-#: js/oc-dialogs.js:180
-msgid "Ok"
-msgstr "ìŠ¹ë½"
+#: js/oc-dialogs.js:222
+msgid "No"
+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:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:582
-#: js/share.js:594
+#: 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 "ì˜¤ë¥˜"
 
@@ -256,127 +254,127 @@ msgstr "ì•± ì´ë¦„ì´ ì§€ì •ë˜ì§€ ì•Šì•˜ìŠµë‹ˆë‹¤."
 msgid "The required file {file} is not installed!"
 msgstr "í•„ìš”í•œ íŒŒì¼ {file}ì´(ê°€) ì„¤ì¹˜ë˜ì§€ ì•Šì•˜ìŠµë‹ˆë‹¤!"
 
-#: js/share.js:29 js/share.js:43 js/share.js:90
+#: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr "ê³µìœ ë¨"
 
-#: js/share.js:93
+#: js/share.js:90
 msgid "Share"
 msgstr "ê³µìœ "
 
-#: js/share.js:141 js/share.js:622
+#: js/share.js:125 js/share.js:617
 msgid "Error while sharing"
 msgstr "ê³µìœ í•˜ëŠ” ì¤‘ ì˜¤ë¥˜ ë°œìƒ"
 
-#: js/share.js:152
+#: js/share.js:136
 msgid "Error while unsharing"
 msgstr "ê³µìœ  í•´ì œí•˜ëŠ” ì¤‘ ì˜¤ë¥˜ ë°œìƒ"
 
-#: js/share.js:159
+#: js/share.js:143
 msgid "Error while changing permissions"
 msgstr "ê¶Œí•œ ë³€ê²½í•˜ëŠ” ì¤‘ ì˜¤ë¥˜ ë°œìƒ"
 
-#: js/share.js:168
+#: js/share.js:152
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "{owner} ë‹˜ì´ ì—¬ëŸ¬ë¶„ ë° ê·¸ë£¹ {group}ì™€(ê³¼) ê³µìœ  ì¤‘"
 
-#: js/share.js:170
+#: js/share.js:154
 msgid "Shared with you by {owner}"
 msgstr "{owner} ë‹˜ì´ ê³µìœ  ì¤‘"
 
-#: js/share.js:175
+#: js/share.js:159
 msgid "Share with"
 msgstr "ë‹¤ìŒìœ¼ë¡œ ê³µìœ "
 
-#: js/share.js:180
+#: js/share.js:164
 msgid "Share with link"
 msgstr "URL ë§í¬ë¡œ ê³µìœ "
 
-#: js/share.js:183
+#: js/share.js:167
 msgid "Password protect"
 msgstr "ì•”í˜¸ ë³´í˜¸"
 
-#: js/share.js:185 templates/installation.php:44 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "ì•”í˜¸"
 
-#: js/share.js:189
+#: js/share.js:173
 msgid "Email link to person"
 msgstr "ì´ë©”ì¼ ì£¼ì†Œ"
 
-#: js/share.js:190
+#: js/share.js:174
 msgid "Send"
 msgstr "ì „ì†¡"
 
-#: js/share.js:194
+#: js/share.js:178
 msgid "Set expiration date"
 msgstr "ë§Œë£Œ ë‚ ì§œ ì„¤ì •"
 
-#: js/share.js:195
+#: js/share.js:179
 msgid "Expiration date"
 msgstr "ë§Œë£Œ ë‚ ì§œ"
 
-#: js/share.js:227
+#: js/share.js:211
 msgid "Share via email:"
 msgstr "ì´ë©”ì¼ë¡œ ê³µìœ :"
 
-#: js/share.js:229
+#: js/share.js:213
 msgid "No people found"
 msgstr "ë°œê²¬ëœ ì‚¬ëžŒ ì—†ìŒ"
 
-#: js/share.js:256
+#: js/share.js:251
 msgid "Resharing is not allowed"
 msgstr "ë‹¤ì‹œ ê³µìœ í•  ìˆ˜ ì—†ìŠµë‹ˆë‹¤"
 
-#: js/share.js:292
+#: js/share.js:287
 msgid "Shared in {item} with {user}"
 msgstr "{user} ë‹˜ê³¼ {item}ì—ì„œ ê³µìœ  ì¤‘"
 
-#: js/share.js:313
+#: js/share.js:308
 msgid "Unshare"
 msgstr "ê³µìœ  í•´ì œ"
 
-#: js/share.js:325
+#: js/share.js:320
 msgid "can edit"
 msgstr "íŽ¸ì§‘ ê°€ëŠ¥"
 
-#: js/share.js:327
+#: js/share.js:322
 msgid "access control"
 msgstr "ì ‘ê·¼ ì œì–´"
 
-#: js/share.js:330
+#: js/share.js:325
 msgid "create"
-msgstr "ë§Œë“¤ê¸°"
+msgstr "ìƒì„±"
 
-#: js/share.js:333
+#: js/share.js:328
 msgid "update"
 msgstr "ì—…ë°ì´íŠ¸"
 
-#: js/share.js:336
+#: js/share.js:331
 msgid "delete"
 msgstr "ì‚ì œ"
 
-#: js/share.js:339
+#: js/share.js:334
 msgid "share"
 msgstr "ê³µìœ "
 
-#: js/share.js:373 js/share.js:569
+#: js/share.js:368 js/share.js:564
 msgid "Password protected"
 msgstr "ì•”í˜¸ë¡œ ë³´í˜¸ë¨"
 
-#: js/share.js:582
+#: js/share.js:577
 msgid "Error unsetting expiration date"
 msgstr "ë§Œë£Œ ë‚ ì§œ í•´ì œ ì˜¤ë¥˜"
 
-#: js/share.js:594
+#: js/share.js:589
 msgid "Error setting expiration date"
 msgstr "ë§Œë£Œ ë‚ ì§œ ì„¤ì • ì˜¤ë¥˜"
 
-#: js/share.js:609
+#: js/share.js:604
 msgid "Sending ..."
 msgstr "ì „ì†¡ ì¤‘..."
 
-#: js/share.js:620
+#: js/share.js:615
 msgid "Email sent"
 msgstr "ì´ë©”ì¼ ë°œì†¡ë¨"
 
@@ -399,24 +397,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:39
-#: 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 "ìš”ì² ì´ˆê¸°í™”"
 
@@ -466,123 +467,138 @@ msgstr "í´ë¼ìš°ë“œë¥¼ ì°¾ì„ ìˆ˜ ì—†ìŠµë‹ˆë‹¤"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
-msgstr "ë¶„ë¥˜ íŽ¸ì§‘"
+msgstr "ë¶„ë¥˜ ìˆ˜ì •"
 
 #: templates/edit_categories_dialog.php:16
 msgid "Add"
 msgstr "ì¶”ê°€"
 
-#: templates/installation.php:23 templates/installation.php:30
+#: 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 "ì‚¬ìš© ì¤‘ì¸ PHP ë²„ì „ì´ NULL ë°”ì´íŠ¸ ê³µê²©ì— ì·¨ì•½í•©ë‹ˆë‹¤ (CVE-2006-7243)"
+
+#: templates/installation.php:26
+msgid "Please update your PHP installation to use ownCloud securely."
+msgstr "ownCloudì˜ ë³´ì•ˆì„ ìœ„í•˜ì—¬ PHP ë²„ì „ì„ ì—…ë°ì´íŠ¸í•˜ì‹ì‹œì˜¤."
+
+#: templates/installation.php:32
 msgid ""
 "No secure random number generator is available, please enable the PHP "
 "OpenSSL extension."
 msgstr "ì•ˆì „í•œ ë‚œìˆ˜ ìƒì„±ê¸°ë¥¼ ì‚¬ìš©í•  ìˆ˜ ì—†ìŠµë‹ˆë‹¤. PHPì˜ OpenSSL í™•ìž¥ì„ í™œì„±í™”í•´ ì£¼ì‹ì‹œì˜¤."
 
-#: templates/installation.php:25
+#: 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:31
+#: 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 ".htaccess íŒŒì¼ì´ ì²˜ë¦¬ë˜ì§€ ì•Šì•„ì„œ ë°ì´í„° ë””ë ‰í„°ë¦¬ì™€ íŒŒì¼ì„ ì¸í„°ë„·ì—ì„œ ì ‘ê·¼í•  ìˆ˜ ì—†ì„ ìˆ˜ë„ ìžˆìŠµë‹ˆë‹¤."
 
-#: templates/installation.php:32
+#: 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:36
+#: templates/installation.php:44
 msgid "Create an <strong>admin account</strong>"
 msgstr "<strong>ê´€ë¦¬ìž ê³„ì •</strong> ë§Œë“¤ê¸°"
 
-#: templates/installation.php:52
+#: templates/installation.php:62
 msgid "Advanced"
 msgstr "ê³ ê¸‰"
 
-#: templates/installation.php:54
+#: templates/installation.php:64
 msgid "Data folder"
 msgstr "ë°ì´í„° í´ë”"
 
-#: templates/installation.php:61
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "ë°ì´í„°ë² ì´ìŠ¤ ì„¤ì •"
 
-#: templates/installation.php:66 templates/installation.php:77
-#: templates/installation.php:87 templates/installation.php:97
+#: 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:109
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "ë°ì´í„°ë² ì´ìŠ¤ ì‚¬ìš©ìž"
 
-#: templates/installation.php:113
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "ë°ì´í„°ë² ì´ìŠ¤ ì•”í˜¸"
 
-#: templates/installation.php:117
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "ë°ì´í„°ë² ì´ìŠ¤ ì´ë¦„"
 
-#: templates/installation.php:125
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "ë°ì´í„°ë² ì´ìŠ¤ í…Œì´ë¸” ê³µê°„"
 
-#: templates/installation.php:131
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "ë°ì´í„°ë² ì´ìŠ¤ í˜¸ìŠ¤íŠ¸"
 
-#: templates/installation.php:136
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "ì„¤ì¹˜ ì™„ë£Œ"
 
-#: templates/layout.guest.php:33
+#: templates/layout.guest.php:40
 msgid "web services under your control"
 msgstr "ë‚´ê°€ ê´€ë¦¬í•˜ëŠ” ì›¹ ì„œë¹„ìŠ¤"
 
-#: templates/layout.user.php:48
+#: 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 ""
+msgstr "ëŒ€ì²´ "
 
 #: templates/part.pagenavi.php:3
 msgid "prev"
diff --git a/l10n/ko/files.po b/l10n/ko/files.po
index c122421e3bfb4749755bfeee8b676eb69ffae864..7db090797c8dbb66120e62c6282e703137c56f63 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-03-04 00:06+0100\n"
-"PO-Revision-Date: 2013-03-03 23:06+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10: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"
@@ -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,60 +66,71 @@ msgstr "ë””ìŠ¤í¬ì— ì“°ì§€ ëª»í–ˆìŠµë‹ˆë‹¤"
 
 #: ajax/upload.php:51
 msgid "Not enough storage available"
-msgstr ""
+msgstr "ì €ìž¥ì†Œê°€ ìš©ëŸ‰ì´ ì¶©ë¶„í•˜ì§€ ì•ŠìŠµë‹ˆë‹¤."
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr "ì˜¬ë°”ë¥´ì§€ ì•Šì€ ë””ë ‰í„°ë¦¬ìž…ë‹ˆë‹¤."
 
-#: appinfo/app.php:10
+#: 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:92 templates/index.php:93
+#: 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/files.js:292 js/files.js:408
-#: js/files.js:439
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
-msgstr "ë³´ë¥˜ ì¤‘"
+msgstr "ëŒ€ê¸° ì¤‘"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name}ì´(ê°€) ì´ë¯¸ ì¡´ìž¬í•¨"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "ë°”ê¾¸ê¸°"
 
-#: js/filelist.js:251
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "ì´ë¦„ ì œì•ˆ"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "ì·¨ì†Œ"
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "{old_name}ì´(ê°€) {new_name}(ìœ¼)ë¡œ ëŒ€ì²´ë¨"
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "undo"
-msgstr "ì‹¤í–‰ ì·¨ì†Œ"
+msgstr "ë˜ëŒë¦¬ê¸°"
 
-#: js/filelist.js:323
+#: js/filelist.js:331
 msgid "perform delete operation"
-msgstr ""
+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."
@@ -151,77 +154,77 @@ msgstr "ì €ìž¥ ê³µê°„ì´ ê°€ë“ ì°¼ìŠµë‹ˆë‹¤. íŒŒì¼ì„ ì—…ë°ì´íŠ¸í•˜ê±°ë‚˜ 
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "ì €ìž¥ ê³µê°„ì´ ê±°ì˜ ê°€ë“ ì°¼ìŠµë‹ˆë‹¤ ({usedSpacePercent}%)"
 
-#: js/files.js:225
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "ë‹¤ìš´ë¡œë“œê°€ ì¤€ë¹„ ì¤‘ìž…ë‹ˆë‹¤. íŒŒì¼ í¬ê¸°ê°€ í¬ë‹¤ë©´ ì‹œê°„ì´ ì˜¤ëž˜ ê±¸ë¦´ ìˆ˜ë„ ìžˆìŠµë‹ˆë‹¤."
 
-#: js/files.js:262
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "ì´ íŒŒì¼ì€ ë””ë ‰í„°ë¦¬ì´ê±°ë‚˜ ë¹„ì–´ ìžˆê¸° ë•Œë¬¸ì— ì—…ë¡œë“œí•  ìˆ˜ ì—†ìŠµë‹ˆë‹¤"
-
-#: js/files.js:262
-msgid "Upload Error"
-msgstr "ì—…ë¡œë“œ ì˜¤ë¥˜"
+msgstr "ë””ë ‰í„°ë¦¬ ë° ë¹ˆ íŒŒì¼ì€ ì—…ë¡œë“œí•  ìˆ˜ ì—†ìŠµë‹ˆë‹¤"
 
-#: js/files.js:273
-msgid "Close"
-msgstr "ë‹«ê¸°"
+#: js/files.js:277
+msgid "Not enough space available"
+msgstr "ì—¬ìœ  ê³µê°„ì´ ë¶€ì¡±í•©ë‹ˆë‹¤"
 
-#: js/files.js:312
-msgid "1 file uploading"
-msgstr "íŒŒì¼ 1ê°œ ì—…ë¡œë“œ ì¤‘"
-
-#: js/files.js:315 js/files.js:370 js/files.js:385
-msgid "{count} files uploading"
-msgstr "íŒŒì¼ {count}ê°œ ì—…ë¡œë“œ ì¤‘"
-
-#: js/files.js:388 js/files.js:423
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "ì—…ë¡œë“œê°€ ì·¨ì†Œë˜ì—ˆìŠµë‹ˆë‹¤."
 
-#: js/files.js:497
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "íŒŒì¼ ì—…ë¡œë“œê°€ ì§„í–‰ ì¤‘ìž…ë‹ˆë‹¤. ì´ íŽ˜ì´ì§€ë¥¼ ë²—ì–´ë‚˜ë©´ ì—…ë¡œë“œê°€ ì·¨ì†Œë©ë‹ˆë‹¤."
 
-#: js/files.js:570
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "URLì„ ìž…ë ¥í•´ì•¼ í•©ë‹ˆë‹¤."
 
-#: js/files.js:575
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "í´ë” ì´ë¦„ì´ ìœ íš¨í•˜ì§€ ì•ŠìŠµë‹ˆë‹¤. "
 
-#: js/files.js:953 templates/index.php:68
+#: 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:954 templates/index.php:79
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "í¬ê¸°"
 
-#: js/files.js:955 templates/index.php:81
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "ìˆ˜ì •ë¨"
 
-#: js/files.js:974
+#: js/files.js:898
 msgid "1 folder"
 msgstr "í´ë” 1ê°œ"
 
-#: js/files.js:976
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "í´ë” {count}ê°œ"
 
-#: js/files.js:984
+#: js/files.js:908
 msgid "1 file"
 msgstr "íŒŒì¼ 1ê°œ"
 
-#: js/files.js:986
+#: 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 "ì—…ë¡œë“œ"
@@ -274,45 +277,45 @@ msgstr "í´ë”"
 msgid "From link"
 msgstr "ë§í¬ì—ì„œ"
 
-#: templates/index.php:40
+#: templates/index.php:42
 msgid "Deleted files"
-msgstr ""
+msgstr "íŒŒì¼ ì‚ì œë¨"
 
-#: templates/index.php:46
+#: templates/index.php:48
 msgid "Cancel upload"
 msgstr "ì—…ë¡œë“œ ì·¨ì†Œ"
 
-#: templates/index.php:53
+#: templates/index.php:54
 msgid "You donâ€™t have write permissions here."
-msgstr ""
+msgstr "ë‹¹ì‹ ì€ ì—¬ê¸°ì— ì“°ê¸°ë¥¼ í•  ìˆ˜ ìžˆëŠ” ê¶Œí•œì´ ì—†ìŠµë‹ˆë‹¤."
 
-#: templates/index.php:60
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "ë‚´ìš©ì´ ì—†ìŠµë‹ˆë‹¤. ì—…ë¡œë“œí•  ìˆ˜ ìžˆìŠµë‹ˆë‹¤!"
 
-#: templates/index.php:74
+#: templates/index.php:75
 msgid "Download"
 msgstr "ë‹¤ìš´ë¡œë“œ"
 
-#: templates/index.php:86 templates/index.php:87
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "ê³µìœ  í•´ì œ"
 
-#: templates/index.php:106
+#: templates/index.php:107
 msgid "Upload too large"
-msgstr "ì—…ë¡œë“œ ìš©ëŸ‰ ì´ˆê³¼"
+msgstr "ì—…ë¡œë“œí•œ íŒŒì¼ì´ ë„ˆë¬´ í¼"
 
-#: templates/index.php:108
+#: 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:113
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "íŒŒì¼ì„ ê²€ìƒ‰í•˜ê³  ìžˆìŠµë‹ˆë‹¤. ê¸°ë‹¤ë ¤ ì£¼ì‹ì‹œì˜¤."
 
-#: templates/index.php:116
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "í˜„ìž¬ ê²€ìƒ‰"
 
diff --git a/l10n/ko/files_encryption.po b/l10n/ko/files_encryption.po
index 79f1c6ae60785936c91116c9a7ae1b0ca8f3ccd1..432f5ed62559fe760ce20825adbe48f1b84a95de 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ko/files_external.po b/l10n/ko/files_external.po
index 9e719652bb644bb7a96956218967c1ae3bf25060..05f9ba418c261fde83a080dfb138ea20a2f4eeba 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-01 00:05+0100\n"
-"PO-Revision-Date: 2013-02-27 23:20+0000\n"
+"POT-Creation-Date: 2013-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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: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 "<b>ê²½ê³ :</b> \"smbclient\"ê°€ ì„¤ì¹˜ë˜ì§€ ì•Šì•˜ìŠµë‹ˆë‹¤. CIFS/SMB ê³µìœ  ìžì›ì— ì—°ê²°í•  ìˆ˜ ì—†ìŠµë‹ˆë‹¤. ì‹œìŠ¤í…œ ê´€ë¦¬ìžì—ê²Œ ì„¤ì¹˜ë¥¼ ìš”ì²í•˜ì‹ì‹œì˜¤."
 
-#: 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 "<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..245187c1159f1d92cc4f717cfaee002e5514903b 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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 1464b23c7c3ee40c4fa530baed434f0312deedef..fbea475af8c5b9138bae6546654e5a558c78fbee 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-03-08 00:25+0100\n"
-"PO-Revision-Date: 2013-03-07 23:25+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
@@ -17,12 +17,12 @@ msgstr ""
 "Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/delete.php:40
+#: ajax/delete.php:42
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
 
-#: ajax/undelete.php:41
+#: ajax/undelete.php:42
 #, php-format
 msgid "Couldn't restore %s"
 msgstr ""
@@ -31,13 +31,17 @@ msgstr ""
 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 ""
+msgstr "ì˜ì›ížˆ ì‚ì œ"
 
 #: js/trash.js:174 templates/index.php:17
 msgid "Name"
diff --git a/l10n/ko/files_versions.po b/l10n/ko/files_versions.po
index cfd2654c9c4afa9d2f796a8d8322ff47626afda7..b3241be267d5d614e72e4e666ba668991e5903f7 100644
--- a/l10n/ko/files_versions.po
+++ b/l10n/ko/files_versions.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.
 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:30+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"
@@ -22,38 +20,38 @@ msgstr ""
 #: ajax/rollbackVersion.php:15
 #, php-format
 msgid "Could not revert: %s"
-msgstr ""
+msgstr "ë˜ëŒë¦´ ìˆ˜ ì—†ìŠµë‹ˆë‹¤: %s"
 
 #: history.php:40
 msgid "success"
-msgstr ""
+msgstr "ì™„ë£Œ"
 
 #: history.php:42
 #, php-format
 msgid "File %s was reverted to version %s"
-msgstr ""
+msgstr "íŒŒì¼ %së¥¼ ë²„ì „ %së¡œ ë³€ê²½í•˜ì˜€ìŠµë‹ˆë‹¤."
 
 #: history.php:49
 msgid "failure"
-msgstr ""
+msgstr "ì‹¤íŒ¨"
 
 #: history.php:51
 #, php-format
 msgid "File %s could not be reverted to version %s"
-msgstr ""
+msgstr "íŒŒì¼ %së¥¼ ë²„ì „ %së¡œ ë˜ëŒë¦¬ì§€ ëª»í–ˆìŠµë‹ˆë‹¤."
 
-#: history.php:68
+#: history.php:69
 msgid "No old versions available"
-msgstr ""
+msgstr "ì˜¤ëž˜ëœ ë²„ì „ì„ ì‚¬ìš©í•  ìˆ˜ ì—†ìŠµë‹ˆë‹¤"
 
-#: history.php:73
+#: history.php:74
 msgid "No path specified"
-msgstr ""
+msgstr "ê²½ë¡œë¥¼ ì•Œìˆ˜ ì—†ìŠµë‹ˆë‹¤."
 
 #: js/versions.js:6
 msgid "Versions"
-msgstr ""
+msgstr "ë²„ì ¼"
 
 #: templates/history.php:20
 msgid "Revert a file to a previous version by clicking on its revert button"
-msgstr ""
+msgstr "ë³€ê²½ ë²„íŠ¼ì„ í´ë¦í•˜ì—¬ ì´ì „ ë²„ì „ì˜ íŒŒì¼ë¡œ ë³€ê²½í•  ìˆ˜ ìžˆìŠµë‹ˆë‹¤."
diff --git a/l10n/ko/lib.po b/l10n/ko/lib.po
index b5155c8f1d9bad5d81202757c39e66f07e843f5d..06d9e41f52e21d300a9bd1850d396225e8c24c18 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-02-27 14:35+0100\n"
-"PO-Revision-Date: 2013-02-27 13:35+0000\n"
+"POT-Creation-Date: 2013-04-28 01:57+0200\n"
+"PO-Revision-Date: 2013-04-27 23:57+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"
@@ -44,19 +41,19 @@ msgstr "ì•±"
 msgid "Admin"
 msgstr "ê´€ë¦¬ìž"
 
-#: files.php:202
+#: files.php:209
 msgid "ZIP download is turned off."
 msgstr "ZIP ë‹¤ìš´ë¡œë“œê°€ ë¹„í™œì„±í™”ë˜ì—ˆìŠµë‹ˆë‹¤."
 
-#: files.php:203
+#: files.php:210
 msgid "Files need to be downloaded one by one."
 msgstr "íŒŒì¼ì„ ê°œë³„ì ìœ¼ë¡œ ë‹¤ìš´ë¡œë“œí•´ì•¼ í•©ë‹ˆë‹¤."
 
-#: files.php:204 files.php:231
+#: files.php:211 files.php:244
 msgid "Back to Files"
 msgstr "íŒŒì¼ë¡œ ëŒì•„ê°€ê¸°"
 
-#: files.php:228
+#: files.php:241
 msgid "Selected files too large to generate zip file."
 msgstr "ì„ íƒí•œ íŒŒì¼ë“¤ì€ ZIP íŒŒì¼ì„ ìƒì„±í•˜ê¸°ì— ë„ˆë¬´ í½ë‹ˆë‹¤."
 
@@ -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,72 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:128 setup.php:320 setup.php:365
+#: setup.php:132 setup.php:325 setup.php:370
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:129 setup.php:152 setup.php:229
+#: setup.php:133 setup.php:156 setup.php:234
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:151 setup.php:453 setup.php:520
+#: setup.php:155 setup.php:458 setup.php:525
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:228
+#: setup.php:233
 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: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:583 setup.php:592 setup.php:600 setup.php:609
+#: setup.php:615
 #, 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:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
+#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
+#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:299
+#: setup.php:304
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:300
+#: setup.php:305
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:305
+#: setup.php:310
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:306
+#: setup.php:311
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:579 setup.php:611
+#: setup.php:584 setup.php:616
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:631
+#: setup.php:636
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:849
+#: setup.php:858
 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:859
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
@@ -242,19 +235,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 331f157580654483dab1c86e79619bf35580d1c5..a914eb05241999665b124c0079139b5b6a969068 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-02-27 14:35+0100\n"
-"PO-Revision-Date: 2013-02-27 13:35+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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 ""
 
@@ -97,76 +96,76 @@ msgstr ""
 msgid "Disable"
 msgstr "ë¹„í™œì„±í™”"
 
-#: js/apps.js:36 js/apps.js:64
+#: js/apps.js:36 js/apps.js:64 js/apps.js:83
 msgid "Enable"
-msgstr "í™œì„±í™”"
+msgstr "ì‚¬ìš©í•¨"
 
 #: js/apps.js:55
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:84
+#: 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:87
+#: js/apps.js:93
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:87
-msgid "Error"
-msgstr "ì˜¤ë¥˜"
-
-#: js/apps.js:90
+#: js/apps.js:96
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr "ì €ìž¥ ì¤‘..."
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "deleted"
 msgstr "ì‚ì œ"
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "undo"
-msgstr "ì‹¤í–‰ ì·¨ì†Œ"
+msgstr "ë˜ëŒë¦¬ê¸°"
 
-#: js/users.js:62
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:75 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
+#: templates/users.php:103
 msgid "Groups"
 msgstr "ê·¸ë£¹"
 
-#: js/users.js:78 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr "ê·¸ë£¹ ê´€ë¦¬ìž"
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "ì‚ì œ"
 
-#: js/users.js:191
+#: js/users.js:269
 msgid "add group"
 msgstr ""
 
-#: js/users.js:352
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:353 js/users.js:359 js/users.js:374
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:358
+#: js/users.js:426
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:29 personal.php:30
+#: personal.php:35 personal.php:36
 msgid "__language_name__"
 msgstr "í•œêµì–´"
 
@@ -185,7 +184,7 @@ msgstr "ë°ì´í„° ë””ë ‰í„°ë¦¬ì™€ íŒŒì¼ì„ ì¸í„°ë„·ì—ì„œ ì ‘ê·¼í•  ìˆ˜ ìžˆëŠ”
 
 #: templates/admin.php:29
 msgid "Setup Warning"
-msgstr ""
+msgstr "ì„¤ì • ê²½ê³ "
 
 #: templates/admin.php:32
 msgid ""
@@ -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,21 +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:230 templates/personal.php:102
+#: templates/admin.php:228
+msgid "Less"
+msgstr "ëœ ì¤‘ìš”í•¨"
+
+#: templates/admin.php:235 templates/personal.php:105
 msgid "Version"
 msgstr "ë²„ì „"
 
-#: templates/admin.php:233 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 "
@@ -390,13 +393,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 "ì²« ì‹¤í–‰ ë§ˆë²•ì‚¬ ë‹¤ì‹œ ë³´ì´ê¸°"
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
 msgid "Password"
 msgstr "ì•”í˜¸"
 
@@ -420,82 +423,70 @@ msgstr "ìƒˆ ì•”í˜¸"
 msgid "Change password"
 msgstr "ì•”í˜¸ ë³€ê²½"
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:76
 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 "WebDAV"
 
-#: templates/personal.php:93
+#: templates/personal.php:96
 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:75
 msgid "Login Name"
 msgstr "ë¡œê·¸ì¸ ì´ë¦„"
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr "ë§Œë“¤ê¸°"
 
-#: templates/users.php:35
+#: templates/users.php:33
 msgid "Default Storage"
 msgstr "ê¸°ë³¸ ì €ìž¥ì†Œ"
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:39 templates/users.php:133
 msgid "Unlimited"
 msgstr "ë¬´ì œí•œ"
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:57 templates/users.php:148
 msgid "Other"
 msgstr "ê¸°íƒ€"
 
-#: templates/users.php:84
+#: templates/users.php:82
 msgid "Storage"
 msgstr "ì €ìž¥ì†Œ"
 
-#: templates/users.php:95
+#: templates/users.php:93
 msgid "change display name"
 msgstr "í‘œì‹œ ì´ë¦„ ë³€ê²½"
 
-#: templates/users.php:99
+#: templates/users.php:97
 msgid "set new password"
 msgstr "ìƒˆ ì•”í˜¸ ì„¤ì •"
 
-#: templates/users.php:134
+#: templates/users.php:128
 msgid "Default"
 msgstr "ê¸°ë³¸ê°’"
diff --git a/l10n/ko/user_ldap.po b/l10n/ko/user_ldap.po
index 6e20895df1fb0f019971251eeab2e9a63f5b3e6c..9f36e614e1e868da258466271ceb46614bd0b772 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-02 00:03+0100\n"
-"PO-Revision-Date: 2013-03-01 23:04+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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: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 "SSLì„ ì‚¬ìš©í•˜ëŠ” ê²½ìš°ê°€ ì•„ë‹ˆë¼ë©´ í”„ë¡œí† ì½œì„ ìž…ë ¥í•˜ì§€ ì•Šì•„ë„ ë©ë‹ˆë‹¤. SSLì„ ì‚¬ìš©í•˜ë ¤ë©´ ldaps://ë¥¼ ìž…ë ¥í•˜ì‹ì‹œì˜¤."
 
-#: templates/settings.php:26
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "ê¸°ë³¸ DN"
 
-#: templates/settings.php:27
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr "ê¸°ë³¸ DNì„ í•œ ì¤„ì— í•˜ë‚˜ì”© ìž…ë ¥í•˜ì‹ì‹œì˜¤"
 
-#: templates/settings.php:28
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "ê³ ê¸‰ íƒì—ì„œ ì‚¬ìš©ìž ë° ê·¸ë£¹ì— ëŒ€í•œ ê¸°ë³¸ DNì„ ì§€ì •í•  ìˆ˜ ìžˆìŠµë‹ˆë‹¤."
 
-#: templates/settings.php:30
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "ì‚¬ìš©ìž DN"
 
-#: 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 "ë°”ì¸ë”© ìž‘ì—…ì„ ìˆ˜í–‰í•  í´ë¼ì´ì–¸íŠ¸ ì‚¬ìš©ìž DNìž…ë‹ˆë‹¤. ì˜ˆë¥¼ ë“¤ì–´ì„œ uid=agent,dc=example,dc=comìž…ë‹ˆë‹¤. ìµëª… ì ‘ê·¼ì„ í—ˆìš©í•˜ë ¤ë©´ DNê³¼ ì•”í˜¸ë¥¼ ë¹„ì›Œ ë‘ì‹ì‹œì˜¤."
 
-#: 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 "ìµëª… ì ‘ê·¼ì„ í—ˆìš©í•˜ë ¤ë©´ DNê³¼ ì•”í˜¸ë¥¼ ë¹„ì›Œ ë‘ì‹ì‹œì˜¤."
 
-#: 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 "ë¡œê·¸ì¸ì„ ì‹œë„í•  ë•Œ ì ìš©í•  í•„í„°ìž…ë‹ˆë‹¤. %%uidëŠ” ë¡œê·¸ì¸ ìž‘ì—…ì—ì„œì˜ ì‚¬ìš©ìž ì´ë¦„ìœ¼ë¡œ ëŒ€ì²´ë©ë‹ˆë‹¤."
 
-#: templates/settings.php:41
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "%%uid ìžë¦¬ ë¹„ì›€ìžë¥¼ ì‚¬ìš©í•˜ì‹ì‹œì˜¤. ì˜ˆì œ: \"uid=%%uid\"\""
 
-#: 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 "ìžë¦¬ ë¹„ì›€ìžë¥¼ ì‚¬ìš©í•  ìˆ˜ ì—†ìŠµë‹ˆë‹¤. ì˜ˆì œ: \"objectClass=person\""
 
-#: 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 "ìžë¦¬ ë¹„ì›€ìžë¥¼ ì‚¬ìš©í•  ìˆ˜ ì—†ìŠµë‹ˆë‹¤. ì˜ˆì œ: \"objectClass=posixGroup\""
 
-#: 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 "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 "ì„œë²„ì—ì„œ ëŒ€ì†Œë¬¸ìžë¥¼ êµ¬ë¶„í•˜ì§€ ì•ŠìŒ (Windows)"
 
-#: templates/settings.php:64
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "SSL ì¸ì¦ì„œ ìœ íš¨ì„± ê²€ì‚¬ë¥¼ í•´ì œí•©ë‹ˆë‹¤."
 
-#: 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 "ì´ ì˜µì…˜ì„ ì‚¬ìš©í•´ì•¼ ì—°ê²°í•  ìˆ˜ ìžˆëŠ” ê²½ìš°ì—ëŠ” LDAP ì„œë²„ì˜ SSL ì¸ì¦ì„œë¥¼ ownCloudë¡œ ê°€ì ¸ì˜¬ ìˆ˜ ìžˆìŠµë‹ˆë‹¤."
 
-#: 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 "LDAP ì†ì„±ì€ ì‚¬ìš©ìžì˜ ownCloud ì´ë¦„ì„ ìƒì„±í•˜ê¸° ìœ„í•´ ì‚¬ìš©í•©ë‹ˆë‹¤."
 
-#: 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 "ì‚¬ìš©ìž DNì„ í•œ ì¤„ì— í•˜ë‚˜ì”© ìž…ë ¥í•˜ì‹ì‹œì˜¤"
 
-#: 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 "LDAP ì†ì„±ì€ ê·¸ë£¹ì˜ ownCloud ì´ë¦„ì„ ìƒì„±í•˜ê¸° ìœ„í•´ ì‚¬ìš©í•©ë‹ˆë‹¤."
 
-#: 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 "ê·¸ë£¹ ê¸°ë³¸ DNì„ í•œ ì¤„ì— í•˜ë‚˜ì”© ìž…ë ¥í•˜ì‹ì‹œì˜¤"
 
-#: 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 "ì‚¬ìš©ìž ì´ë¦„ì„ ì‚¬ìš©í•˜ë ¤ë©´ ë¹„ì›Œ ë‘ì‹ì‹œì˜¤(ê¸°ë³¸ê°’). ê¸°íƒ€ ê²½ìš° LDAP/AD ì†ì„±ì„ ì§€ì •í•˜ì‹ì‹œì˜¤."
 
-#: 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/ko/user_webdavauth.po b/l10n/ko/user_webdavauth.po
index f10bd76454e5e8f5443a82f84cc71d8dfebdc422..02c3920ceba670d4f3291f20ec12f22122edd9c9 100644
--- a/l10n/ko/user_webdavauth.po
+++ b/l10n/ko/user_webdavauth.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-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-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -28,7 +28,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 f665ac3e0afff487b8a349562d93f172066c6419..9a9a4568887d93dd239f7f934b5faca3f185c060 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-02-09 00:12+0100\n"
-"PO-Revision-Date: 2013-02-08 23:12+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10: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"
@@ -18,24 +17,24 @@ msgstr ""
 "Language: ku_IQ\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:85
+#: ajax/share.php:97
 #, php-format
 msgid "User %s shared a file with you"
 msgstr ""
 
-#: ajax/share.php:87
+#: ajax/share.php:99
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr ""
 
-#: ajax/share.php:89
+#: 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:91
+#: ajax/share.php:104
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -81,156 +80,156 @@ msgstr ""
 msgid "Error removing %s from favorites."
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:34
 msgid "Sunday"
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:35
 msgid "Monday"
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Tuesday"
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:37
 msgid "Wednesday"
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:38
 msgid "Thursday"
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:39
 msgid "Friday"
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:40
 msgid "Saturday"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:45
 msgid "January"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:46
 msgid "February"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:47
 msgid "March"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:48
 msgid "April"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:49
 msgid "May"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:50
 msgid "June"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:51
 msgid "July"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:52
 msgid "August"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:53
 msgid "September"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:54
 msgid "October"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:55
 msgid "November"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:56
 msgid "December"
 msgstr ""
 
-#: js/js.js:284
+#: js/js.js:286
 msgid "Settings"
 msgstr "Ø¯Ù‡â€ŒØ³ØªÙƒØ§Ø±ÛŒ"
 
-#: js/js.js:764
+#: js/js.js:718
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:765
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:766
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:767
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:768
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:769
+#: js/js.js:723
 msgid "today"
 msgstr ""
 
-#: js/js.js:770
+#: js/js.js:724
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:771
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:772
+#: js/js.js:726
 msgid "last month"
 msgstr ""
 
-#: js/js.js:773
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:774
+#: js/js.js:728
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:775
+#: js/js.js:729
 msgid "last year"
 msgstr ""
 
-#: js/js.js:776
+#: js/js.js:730
 msgid "years ago"
 msgstr ""
 
-#: js/oc-dialogs.js:126
-msgid "Choose"
+#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
+msgid "Ok"
 msgstr ""
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
 msgid "Cancel"
 msgstr ""
 
-#: js/oc-dialogs.js:162
-msgid "No"
+#: js/oc-dialogs.js:185
+msgid "Choose"
 msgstr ""
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:215
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:180
-msgid "Ok"
+#: js/oc-dialogs.js:222
+msgid "No"
 msgstr ""
 
 #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
@@ -238,9 +237,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:152 js/share.js:159 js/share.js:571
-#: js/share.js:583
+#: 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 "Ù‡Ù‡â€ŒÚµÙ‡"
 
@@ -252,127 +253,127 @@ msgstr ""
 msgid "The required file {file} is not installed!"
 msgstr ""
 
-#: js/share.js:29 js/share.js:43 js/share.js:90 js/share.js:93
-msgid "Share"
+#: js/share.js:30 js/share.js:45 js/share.js:87
+msgid "Shared"
 msgstr ""
 
-#: js/share.js:29 js/share.js:43 js/share.js:90 js/share.js:93
-msgid "Shared"
+#: js/share.js:90
+msgid "Share"
 msgstr ""
 
-#: js/share.js:141 js/share.js:611
+#: js/share.js:125 js/share.js:617
 msgid "Error while sharing"
 msgstr ""
 
-#: js/share.js:152
+#: js/share.js:136
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:159
+#: js/share.js:143
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:168
+#: js/share.js:152
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:170
+#: js/share.js:154
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:175
+#: js/share.js:159
 msgid "Share with"
 msgstr ""
 
-#: js/share.js:180
+#: js/share.js:164
 msgid "Share with link"
 msgstr ""
 
-#: js/share.js:183
+#: js/share.js:167
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:185 templates/installation.php:44 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "ÙˆØ´Û•ÛŒ ØªÛŽÙ¾Û•Ø±Ø¨Ùˆ"
 
-#: js/share.js:189
+#: js/share.js:173
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:190
+#: js/share.js:174
 msgid "Send"
 msgstr ""
 
-#: js/share.js:194
+#: js/share.js:178
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:195
+#: js/share.js:179
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:227
+#: js/share.js:211
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:229
+#: js/share.js:213
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:256
+#: js/share.js:251
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:292
+#: js/share.js:287
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:313
+#: js/share.js:308
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:325
+#: js/share.js:320
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:327
+#: js/share.js:322
 msgid "access control"
 msgstr ""
 
-#: js/share.js:330
+#: js/share.js:325
 msgid "create"
 msgstr ""
 
-#: js/share.js:333
+#: js/share.js:328
 msgid "update"
 msgstr ""
 
-#: js/share.js:336
+#: js/share.js:331
 msgid "delete"
 msgstr ""
 
-#: js/share.js:339
+#: js/share.js:334
 msgid "share"
 msgstr ""
 
-#: js/share.js:373 js/share.js:558
+#: js/share.js:368 js/share.js:564
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:571
+#: js/share.js:577
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:583
+#: js/share.js:589
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:598
+#: js/share.js:604
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:609
+#: js/share.js:615
 msgid "Email sent"
 msgstr ""
 
@@ -387,7 +388,7 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:47
+#: lostpassword/controller.php:48
 msgid "ownCloud password reset"
 msgstr ""
 
@@ -395,24 +396,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:39
-#: 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,115 +472,130 @@ msgstr ""
 msgid "Add"
 msgstr "Ø²ÛŒØ§Ø¯Ú©Ø±Ø¯Ù†"
 
-#: templates/installation.php:23 templates/installation.php:30
+#: 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:25
+#: 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:31
+#: 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:32
+#: 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:36
+#: templates/installation.php:44
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
-#: templates/installation.php:52
+#: templates/installation.php:62
 msgid "Advanced"
 msgstr "Ù‡Ù‡â€ŒÚµØ¨Ú˜Ø§Ø±Ø¯Ù†ÛŒ Ù¾ÛŒØ´ÙƒÙ‡â€ŒÙˆØªÙˆÙˆ"
 
-#: templates/installation.php:54
+#: templates/installation.php:64
 msgid "Data folder"
 msgstr "Ø²Ø§Ù†ÛŒØ§Ø±ÛŒ ÙÛ†ÚµØ¯Ù‡â€ŒØ±"
 
-#: templates/installation.php:61
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:66 templates/installation.php:77
-#: templates/installation.php:87 templates/installation.php:97
+#: 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:109
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "Ø¨Ù‡â€ŒÙƒØ§Ø±Ù‡ÛŽÙ†Ù‡â€ŒØ±ÛŒ Ø¯Ø§ØªØ§Ø¨Ù‡â€ŒÛŒØ³"
 
-#: templates/installation.php:113
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "ÙˆØ´Ù‡â€ŒÛŒ Ù†Ù‡ÛŽÙ†ÛŒ Ø¯Ø§ØªØ§ Ø¨Ù‡â€ŒÛŒØ³"
 
-#: templates/installation.php:117
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "Ù†Ø§ÙˆÛŒ Ø¯Ø§ØªØ§Ø¨Ù‡â€ŒÛŒØ³"
 
-#: templates/installation.php:125
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:131
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "Ù‡Û†Ø³ØªÛŒ Ø¯Ø§ØªØ§Ø¨Ù‡â€ŒÛŒØ³"
 
-#: templates/installation.php:136
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "ÙƒÛ†ØªØ§ÛŒÛŒ Ù‡Ø§Øª Ø¯Ù‡â€ŒØ³ØªÙƒØ§Ø±ÛŒÙ‡â€ŒÙƒØ§Ù†"
 
-#: templates/layout.guest.php:33
+#: templates/layout.guest.php:40
 msgid "web services under your control"
 msgstr "Ú•Ø§Ú˜Ù‡â€ŒÛŒ ÙˆÛŽØ¨ Ù„Ù‡â€ŒÚ˜ÛŽØ± Ú†Ø§ÙˆØ¯ÛŽØ±ÛŒØª Ø¯Ø§ÛŒÙ‡"
 
-#: templates/layout.user.php:48
+#: 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/ku_IQ/files.po b/l10n/ku_IQ/files.po
index 29bb55872a116ead0da359b6a373849433df67bd..8a8df832c2da8810c658abfff76c2e86e6e0c9d1 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-03-04 00:06+0100\n"
-"PO-Revision-Date: 2013-03-03 23:06+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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 ""
@@ -70,59 +66,70 @@ msgstr ""
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:10
+#: 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 ""
 
-#: js/fileactions.js:127 templates/index.php:92 templates/index.php:93
+#: 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/files.js:292 js/files.js:408
-#: js/files.js:439
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:251
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:323
+#: 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 ""
@@ -145,77 +152,77 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:225
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:262
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:262
-msgid "Upload Error"
-msgstr ""
-
-#: js/files.js:273
-msgid "Close"
-msgstr "Ø¯Ø§Ø®Ø³ØªÙ†"
-
-#: js/files.js:312
-msgid "1 file uploading"
-msgstr ""
-
-#: js/files.js:315 js/files.js:370 js/files.js:385
-msgid "{count} files uploading"
+#: js/files.js:277
+msgid "Not enough space available"
 msgstr ""
 
-#: js/files.js:388 js/files.js:423
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:497
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:570
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "Ù†Ø§ÙˆÙ†ÛŒØ´Ø§Ù†ÛŒ Ø¨Ù‡â€ŒØ³ØªÙ‡â€ŒØ± Ù†Ø§Ø¨ÛŽØª Ø¨Ù‡â€ŒØªØ§Úµ Ø¨ÛŽØª."
 
-#: js/files.js:575
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:953 templates/index.php:68
+#: 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:954 templates/index.php:79
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr ""
 
-#: js/files.js:955 templates/index.php:81
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:974
+#: js/files.js:898
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:976
+#: js/files.js:900
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:984
+#: js/files.js:908
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:986
+#: 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 "Ø¨Ø§Ø±Ú©Ø±Ø¯Ù†"
@@ -268,45 +275,45 @@ msgstr "Ø¨ÙˆØ®Ú†Ù‡"
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:42
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:48
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:53
+#: templates/index.php:54
 msgid "You donâ€™t have write permissions here."
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:74
+#: templates/index.php:75
 msgid "Download"
 msgstr "Ø¯Ø§Ú¯Ø±ØªÙ†"
 
-#: templates/index.php:86 templates/index.php:87
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr ""
 
-#: templates/index.php:106
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:108
+#: 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:113
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:116
+#: 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..c961a1e23dbfdd204d5e9ba989638b71dc384259 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ku_IQ/files_external.po b/l10n/ku_IQ/files_external.po
index 0a53bb876de97b23e3cb6ccc600e689288530705..ff019f8366a13c0beda61cf231478907bfbe3635 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-01 00:05+0100\n"
-"PO-Revision-Date: 2013-02-27 23:20+0000\n"
+"POT-Creation-Date: 2013-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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: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/ku_IQ/files_sharing.po b/l10n/ku_IQ/files_sharing.po
index daa1ed36ce9bf4fdccd0b32de6b420eba4ecc2d9..291c1ca15a05985d4c817bd1359982a65e8501ec 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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 5fe9d389ebf1c9918fbbdb9f0839c09d6d8d1fed..f1b2bac0ba733c3402ba9508208ec69f0c1c0ff9 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-03-08 00:25+0100\n"
-"PO-Revision-Date: 2013-03-07 23:25+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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,12 +17,12 @@ msgstr ""
 "Language: ku_IQ\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:40
+#: ajax/delete.php:42
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
 
-#: ajax/undelete.php:41
+#: ajax/undelete.php:42
 #, php-format
 msgid "Couldn't restore %s"
 msgstr ""
@@ -31,6 +31,10 @@ msgstr ""
 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 ""
diff --git a/l10n/ku_IQ/files_versions.po b/l10n/ku_IQ/files_versions.po
index d5bfd4c337f4098fda7a9a7f7f5fd42bc71e17e7..0b3811c2a529b563afc0ae8ce08a7b8654084673 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:30+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 42b6f4b92ef673cc576257c291826a9c143955ab..2bf8387dbb9eb03bae06702ba01562e1a1cd1aac 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-02-27 14:35+0100\n"
-"PO-Revision-Date: 2013-02-27 13:35+0000\n"
+"POT-Creation-Date: 2013-04-28 01:57+0200\n"
+"PO-Revision-Date: 2013-04-27 23:57+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"
@@ -35,25 +35,25 @@ msgstr "Ø¨Ù‡â€ŒÙƒØ§Ø±Ù‡ÛŽÙ†Ù‡â€ŒØ±"
 
 #: app.php:398
 msgid "Apps"
-msgstr ""
+msgstr "Ø¨Ù‡â€ŒØ±Ù†Ø§Ù…Ù‡â€ŒÙƒØ§Ù†"
 
 #: app.php:406
 msgid "Admin"
-msgstr ""
+msgstr "Ø¨Ù‡â€ŒÚ•ÛŽÙˆÙ‡â€ŒØ¨Ù‡â€ŒØ±ÛŒ Ø³Ù‡â€ŒØ±Ù‡â€ŒÙƒÛŒ"
 
-#: files.php:202
+#: files.php:209
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:203
+#: files.php:210
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:204 files.php:231
+#: files.php:211 files.php:244
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:228
+#: files.php:241
 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,72 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:128 setup.php:320 setup.php:365
+#: setup.php:132 setup.php:325 setup.php:370
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:129 setup.php:152 setup.php:229
+#: setup.php:133 setup.php:156 setup.php:234
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:151 setup.php:453 setup.php:520
+#: setup.php:155 setup.php:458 setup.php:525
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:228
+#: setup.php:233
 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: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:583 setup.php:592 setup.php:600 setup.php:609
+#: setup.php:615
 #, 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:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
+#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
+#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:299
+#: setup.php:304
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:300
+#: setup.php:305
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:305
+#: setup.php:310
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:306
+#: setup.php:311
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:579 setup.php:611
+#: setup.php:584 setup.php:616
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:631
+#: setup.php:636
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:849
+#: setup.php:858
 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:859
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
@@ -239,19 +235,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 60417dfa73486be1da2ef227fd29aa47ac371022..57cd5d6abcf86054d3e5776eda0187bb0545adce 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-02-27 14:35+0100\n"
-"PO-Revision-Date: 2013-02-27 13:35+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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 ""
 
@@ -92,7 +96,7 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: js/apps.js:36 js/apps.js:64
+#: js/apps.js:36 js/apps.js:64 js/apps.js:83
 msgid "Enable"
 msgstr "Ú†Ø§Ù„Ø§Ú©Ú©Ø±Ø¯Ù†"
 
@@ -100,68 +104,68 @@ msgstr "Ú†Ø§Ù„Ø§Ú©Ú©Ø±Ø¯Ù†"
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:84
+#: 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:87
+#: js/apps.js:93
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:87
-msgid "Error"
-msgstr "Ù‡Ù‡â€ŒÚµÙ‡"
-
-#: js/apps.js:90
+#: js/apps.js:96
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr "Ù¾Ø§Ø´Ú©Ù‡â€ŒÙˆØªØ¯Ù‡â€ŒÚ©Ø§Øª..."
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "deleted"
 msgstr ""
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "undo"
 msgstr ""
 
-#: js/users.js:62
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:75 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
+#: templates/users.php:103
 msgid "Groups"
 msgstr ""
 
-#: js/users.js:78 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr ""
 
-#: js/users.js:191
+#: js/users.js:269
 msgid "add group"
 msgstr ""
 
-#: js/users.js:352
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:353 js/users.js:359 js/users.js:374
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:358
+#: js/users.js:426
 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,15 +316,19 @@ msgstr ""
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:230 templates/personal.php:102
+#: templates/admin.php:228
+msgid "Less"
+msgstr ""
+
+#: templates/admin.php:235 templates/personal.php:105
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:233 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 "
@@ -391,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:77
 msgid "Password"
 msgstr "ÙˆØ´Û•ÛŒ ØªÛŽÙ¾Û•Ø±Ø¨Ùˆ"
 
@@ -415,82 +423,70 @@ msgstr "ÙˆØ´Û•ÛŒ Ù†Ù‡ÛŽÙ†ÛŒ Ù†ÙˆÛŽ"
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:76
 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:75
 msgid "Login Name"
 msgstr ""
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr ""
 
-#: templates/users.php:35
+#: templates/users.php:33
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:39 templates/users.php:133
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:57 templates/users.php:148
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:84
+#: templates/users.php:82
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:95
+#: templates/users.php:93
 msgid "change display name"
 msgstr ""
 
-#: templates/users.php:99
+#: templates/users.php:97
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:134
+#: templates/users.php:128
 msgid "Default"
 msgstr ""
diff --git a/l10n/ku_IQ/user_ldap.po b/l10n/ku_IQ/user_ldap.po
index 0e3bf045fa26e14704dbcd29e8e616f93bef46c0..1a425c728db980cddb1a14ad5d6adfc482d37807 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-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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..e623bd161b4be11e69c0ee8057b9ec37c22d7382 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-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
@@ -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 e15a264f1a77410f9f5bb9ef96e42bccc04c86df..91e5887e0bc6ef01b98e6b200e7183a3f4c577ce 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-02-22 00:06+0100\n"
-"PO-Revision-Date: 2013-02-20 23:20+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10: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"
@@ -19,24 +17,24 @@ msgstr ""
 "Language: lb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:85
+#: ajax/share.php:97
 #, php-format
 msgid "User %s shared a file with you"
 msgstr ""
 
-#: ajax/share.php:87
+#: ajax/share.php:99
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr ""
 
-#: ajax/share.php:89
+#: 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:91
+#: ajax/share.php:104
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -82,79 +80,79 @@ msgstr "Keng Kategorien ausgewielt fir ze lÃ¤schen."
 msgid "Error removing %s from favorites."
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:34
 msgid "Sunday"
 msgstr "Sonndes"
 
-#: js/config.php:32
+#: js/config.php:35
 msgid "Monday"
 msgstr "MÃ©indes"
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Tuesday"
 msgstr "DÃ«nschdes"
 
-#: js/config.php:32
+#: js/config.php:37
 msgid "Wednesday"
 msgstr "MÃ«ttwoch"
 
-#: js/config.php:32
+#: js/config.php:38
 msgid "Thursday"
 msgstr "Donneschdes"
 
-#: js/config.php:32
+#: js/config.php:39
 msgid "Friday"
 msgstr "Freides"
 
-#: js/config.php:32
+#: js/config.php:40
 msgid "Saturday"
 msgstr "Samschdes"
 
-#: js/config.php:33
+#: js/config.php:45
 msgid "January"
 msgstr "Januar"
 
-#: js/config.php:33
+#: js/config.php:46
 msgid "February"
 msgstr "Februar"
 
-#: js/config.php:33
+#: js/config.php:47
 msgid "March"
 msgstr "MÃ¤erz"
 
-#: js/config.php:33
+#: js/config.php:48
 msgid "April"
 msgstr "AbrÃ«ll"
 
-#: js/config.php:33
+#: js/config.php:49
 msgid "May"
 msgstr "Mee"
 
-#: js/config.php:33
+#: js/config.php:50
 msgid "June"
 msgstr "Juni"
 
-#: js/config.php:33
+#: js/config.php:51
 msgid "July"
 msgstr "Juli"
 
-#: js/config.php:33
+#: js/config.php:52
 msgid "August"
 msgstr "August"
 
-#: js/config.php:33
+#: js/config.php:53
 msgid "September"
 msgstr "September"
 
-#: js/config.php:33
+#: js/config.php:54
 msgid "October"
 msgstr "Oktober"
 
-#: js/config.php:33
+#: js/config.php:55
 msgid "November"
 msgstr "November"
 
-#: js/config.php:33
+#: js/config.php:56
 msgid "December"
 msgstr "Dezember"
 
@@ -162,86 +160,88 @@ msgstr "Dezember"
 msgid "Settings"
 msgstr "Astellungen"
 
-#: js/js.js:767
+#: js/js.js:718
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:768
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:769
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:770
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr "vrun 1 Stonn"
 
-#: js/js.js:771
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr "vru {hours} Stonnen"
 
-#: js/js.js:772
+#: js/js.js:723
 msgid "today"
 msgstr ""
 
-#: js/js.js:773
+#: js/js.js:724
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:774
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:775
+#: js/js.js:726
 msgid "last month"
 msgstr "LÃ¤schte Mount"
 
-#: js/js.js:776
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr "vru {months} MÃ©int"
 
-#: js/js.js:777
+#: js/js.js:728
 msgid "months ago"
 msgstr "MÃ©int hier"
 
-#: js/js.js:778
+#: js/js.js:729
 msgid "last year"
 msgstr "LÃ¤scht Joer"
 
-#: js/js.js:779
+#: js/js.js:730
 msgid "years ago"
 msgstr "Joren hier"
 
-#: js/oc-dialogs.js:126
-msgid "Choose"
-msgstr "Auswielen"
+#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
+msgid "Ok"
+msgstr "OK"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
 msgid "Cancel"
 msgstr "Ofbriechen"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "Nee"
+#: js/oc-dialogs.js:185
+msgid "Choose"
+msgstr "Auswielen"
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:215
 msgid "Yes"
 msgstr "Jo"
 
-#: js/oc-dialogs.js:180
-msgid "Ok"
-msgstr "OK"
+#: js/oc-dialogs.js:222
+msgid "No"
+msgstr "Nee"
 
 #: 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:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:582
-#: js/share.js:594
+#: 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 "Fehler"
 
@@ -253,127 +253,127 @@ msgstr ""
 msgid "The required file {file} is not installed!"
 msgstr ""
 
-#: js/share.js:29 js/share.js:43 js/share.js:90
+#: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr ""
 
-#: js/share.js:93
+#: js/share.js:90
 msgid "Share"
 msgstr "Deelen"
 
-#: js/share.js:141 js/share.js:622
+#: js/share.js:125 js/share.js:617
 msgid "Error while sharing"
 msgstr ""
 
-#: js/share.js:152
+#: js/share.js:136
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:159
+#: js/share.js:143
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:168
+#: js/share.js:152
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:170
+#: js/share.js:154
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:175
+#: js/share.js:159
 msgid "Share with"
 msgstr ""
 
-#: js/share.js:180
+#: js/share.js:164
 msgid "Share with link"
 msgstr ""
 
-#: js/share.js:183
+#: js/share.js:167
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:185 templates/installation.php:44 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Passwuert"
 
-#: js/share.js:189
+#: js/share.js:173
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:190
+#: js/share.js:174
 msgid "Send"
 msgstr ""
 
-#: js/share.js:194
+#: js/share.js:178
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:195
+#: js/share.js:179
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:227
+#: js/share.js:211
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:229
+#: js/share.js:213
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:256
+#: js/share.js:251
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:292
+#: js/share.js:287
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:313
+#: js/share.js:308
 msgid "Unshare"
 msgstr "Net mÃ©i deelen"
 
-#: js/share.js:325
+#: js/share.js:320
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:327
+#: js/share.js:322
 msgid "access control"
 msgstr ""
 
-#: js/share.js:330
+#: js/share.js:325
 msgid "create"
 msgstr "erstellen"
 
-#: js/share.js:333
+#: js/share.js:328
 msgid "update"
 msgstr ""
 
-#: js/share.js:336
+#: js/share.js:331
 msgid "delete"
 msgstr "lÃ¤schen"
 
-#: js/share.js:339
+#: js/share.js:334
 msgid "share"
 msgstr "deelen"
 
-#: js/share.js:373 js/share.js:569
+#: js/share.js:368 js/share.js:564
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:582
+#: js/share.js:577
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:594
+#: js/share.js:589
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:609
+#: js/share.js:604
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:620
+#: js/share.js:615
 msgid "Email sent"
 msgstr ""
 
@@ -396,24 +396,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:39
-#: 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"
 
@@ -467,117 +470,132 @@ msgstr "Kategorien editÃ©ieren"
 
 #: templates/edit_categories_dialog.php:16
 msgid "Add"
-msgstr "BÃ¤isetzen"
+msgstr "DobÃ¤isetzen"
 
-#: templates/installation.php:23 templates/installation.php:30
+#: templates/installation.php:24 templates/installation.php:31
+#: templates/installation.php:38
 msgid "Security Warning"
 msgstr "SÃ©cherheets Warnung"
 
-#: 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:25
+#: 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:31
+#: 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:32
+#: 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:36
+#: templates/installation.php:44
 msgid "Create an <strong>admin account</strong>"
 msgstr "En <strong>Admin Account</strong> uleeÃ«n"
 
-#: templates/installation.php:52
+#: templates/installation.php:62
 msgid "Advanced"
 msgstr "AvancÃ©iert"
 
-#: templates/installation.php:54
+#: templates/installation.php:64
 msgid "Data folder"
 msgstr "Daten Dossier"
 
-#: templates/installation.php:61
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "Datebank konfigurÃ©ieren"
 
-#: templates/installation.php:66 templates/installation.php:77
-#: templates/installation.php:87 templates/installation.php:97
+#: 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:109
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "Datebank Benotzer"
 
-#: templates/installation.php:113
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "Datebank Passwuert"
 
-#: templates/installation.php:117
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "Datebank Numm"
 
-#: templates/installation.php:125
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "Datebank Tabelle-GrÃ©isst"
 
-#: templates/installation.php:131
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "Datebank Server"
 
-#: templates/installation.php:136
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "Installatioun ofschlÃ©issen"
 
-#: templates/layout.guest.php:33
+#: templates/layout.guest.php:40
 msgid "web services under your control"
 msgstr "Web Servicer Ã«nnert denger Kontroll"
 
-#: templates/layout.user.php:48
+#: 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 "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 2b34722f3e2dc382b1768d33ca466710c602d6e3..f6df3c81116159922e57ecbc74589a55609cbc64 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-03-04 00:06+0100\n"
-"PO-Revision-Date: 2013-03-03 23:06+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10: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"
@@ -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"
@@ -71,59 +66,70 @@ msgstr "Konnt net op den Disk schreiwen"
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:10
+#: appinfo/app.php:12
 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:92 templates/index.php:93
+#: 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/files.js:292 js/files.js:408
-#: js/files.js:439
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "ersetzen"
 
-#: js/filelist.js:251
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "ofbriechen"
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "undo"
 msgstr "rÃ©ckgÃ¤ngeg man"
 
-#: js/filelist.js:323
+#: 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 ""
@@ -146,77 +152,77 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:225
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:262
+#: 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:262
-msgid "Upload Error"
-msgstr "Fehler beim eroplueden"
-
-#: js/files.js:273
-msgid "Close"
-msgstr "Zoumaachen"
-
-#: js/files.js:312
-msgid "1 file uploading"
+#: js/files.js:277
+msgid "Not enough space available"
 msgstr ""
 
-#: js/files.js:315 js/files.js:370 js/files.js:385
-msgid "{count} files uploading"
-msgstr ""
-
-#: js/files.js:388 js/files.js:423
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "Upload ofgebrach."
 
-#: js/files.js:497
+#: 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:570
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:575
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:953 templates/index.php:68
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+msgid "Error"
+msgstr "Fehler"
+
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Numm"
 
-#: js/files.js:954 templates/index.php:79
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "GrÃ©isst"
 
-#: js/files.js:955 templates/index.php:81
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "GeÃ¤nnert"
 
-#: js/files.js:974
+#: js/files.js:898
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:976
+#: js/files.js:900
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:984
+#: js/files.js:908
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:986
+#: 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"
@@ -269,45 +275,45 @@ msgstr "Dossier"
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:42
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:48
 msgid "Cancel upload"
 msgstr "Upload ofbriechen"
 
-#: templates/index.php:53
+#: templates/index.php:54
 msgid "You donâ€™t have write permissions here."
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Hei ass nÃ¤ischt. Lued eppes rop!"
 
-#: templates/index.php:74
+#: templates/index.php:75
 msgid "Download"
-msgstr "Eroflueden"
+msgstr "Download"
 
-#: templates/index.php:86 templates/index.php:87
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Net mÃ©i deelen"
 
-#: templates/index.php:106
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "Upload ze grouss"
 
-#: templates/index.php:108
+#: 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:113
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Fichieren gi gescannt, war weg."
 
-#: templates/index.php:116
+#: 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..09f6598370f47a981bf416abf62e49715c952774 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-04-26 10:00+0200\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/lb/files_external.po b/l10n/lb/files_external.po
index 21d28336fc94fba603156c13cbae9d647709a799..2461cbdaeb55d4b76ab7763cf56e029601c93a93 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-01 00:05+0100\n"
-"PO-Revision-Date: 2013-02-27 23:20+0000\n"
+"POT-Creation-Date: 2013-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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: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 ""
@@ -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..8905aedf4333181bb39a521dec23e07ad0d2705c 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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 715eba7064d7d12ff942160c10d7eeb6eb8efcdd..69c55f0f895a8190c5648ec214445cf1c5616ed9 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-03-08 00:25+0100\n"
-"PO-Revision-Date: 2013-03-07 23:25+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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,12 +17,12 @@ msgstr ""
 "Language: lb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:40
+#: ajax/delete.php:42
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
 
-#: ajax/undelete.php:41
+#: ajax/undelete.php:42
 #, php-format
 msgid "Couldn't restore %s"
 msgstr ""
@@ -31,6 +31,10 @@ msgstr ""
 msgid "perform restore operation"
 msgstr ""
 
+#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+msgid "Error"
+msgstr "Fehler"
+
 #: js/trash.js:34
 msgid "delete file permanently"
 msgstr ""
diff --git a/l10n/lb/files_versions.po b/l10n/lb/files_versions.po
index c820aa4669e61102e6d8eae49273f0e2c8ac3e39..7745e418c12083d62ebc15249734b103ff61a77e 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-04-26 10:00+0200\n"
+"PO-Revision-Date: 2013-04-26 08:02+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 fff83c08b66e675d30de8df6df545bdd0f128a41..6060004b5233d9b98ba5fab84a26af95fdb25eb8 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-02-27 14:35+0100\n"
-"PO-Revision-Date: 2013-02-27 13:35+0000\n"
+"POT-Creation-Date: 2013-04-28 01:57+0200\n"
+"PO-Revision-Date: 2013-04-27 23:57+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"
@@ -31,29 +31,29 @@ msgstr "Astellungen"
 
 #: app.php:385
 msgid "Users"
-msgstr ""
+msgstr "Benotzer"
 
 #: app.php:398
 msgid "Apps"
-msgstr ""
+msgstr "Applicatiounen"
 
 #: app.php:406
 msgid "Admin"
-msgstr ""
+msgstr "Admin"
 
-#: files.php:202
+#: files.php:209
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:203
+#: files.php:210
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:204 files.php:231
+#: files.php:211 files.php:244
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:228
+#: files.php:241
 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,72 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:128 setup.php:320 setup.php:365
+#: setup.php:132 setup.php:325 setup.php:370
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:129 setup.php:152 setup.php:229
+#: setup.php:133 setup.php:156 setup.php:234
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:151 setup.php:453 setup.php:520
+#: setup.php:155 setup.php:458 setup.php:525
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:228
+#: setup.php:233
 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: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:583 setup.php:592 setup.php:600 setup.php:609
+#: setup.php:615
 #, 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:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
+#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
+#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:299
+#: setup.php:304
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:300
+#: setup.php:305
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:305
+#: setup.php:310
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:306
+#: setup.php:311
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:579 setup.php:611
+#: setup.php:584 setup.php:616
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:631
+#: setup.php:636
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:849
+#: setup.php:858
 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:859
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
@@ -239,19 +235,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 31ccb692123b2b312b966523c8d17501f2fa4d3d..6575b570b9be7153f933de0ccb3cc2760ac63d64 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-02-27 14:35+0100\n"
-"PO-Revision-Date: 2013-02-27 13:35+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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 ""
 
@@ -93,7 +96,7 @@ msgstr ""
 msgid "Disable"
 msgstr "Ofschalten"
 
-#: js/apps.js:36 js/apps.js:64
+#: js/apps.js:36 js/apps.js:64 js/apps.js:83
 msgid "Enable"
 msgstr "Aschalten"
 
@@ -101,68 +104,68 @@ msgstr "Aschalten"
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:84
+#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+msgid "Error"
+msgstr "Fehler"
+
+#: js/apps.js:90
 msgid "Updating...."
 msgstr ""
 
-#: js/apps.js:87
+#: js/apps.js:93
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:87
-msgid "Error"
-msgstr "Fehler"
-
-#: js/apps.js:90
+#: js/apps.js:96
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr "Speicheren..."
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "deleted"
 msgstr "gelÃ¤scht"
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "undo"
 msgstr "rÃ©ckgÃ¤ngeg man"
 
-#: js/users.js:62
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:75 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
+#: templates/users.php:103
 msgid "Groups"
 msgstr "Gruppen"
 
-#: js/users.js:78 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr "Gruppen Admin"
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "LÃ¤schen"
 
-#: js/users.js:191
+#: js/users.js:269
 msgid "add group"
 msgstr ""
 
-#: js/users.js:352
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:353 js/users.js:359 js/users.js:374
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:358
+#: js/users.js:426
 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,21 +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 "MÃ©i"
+
+#: templates/admin.php:228
+msgid "Less"
 msgstr ""
 
-#: templates/admin.php:230 templates/personal.php:102
+#: templates/admin.php:235 templates/personal.php:105
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:233 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 "
@@ -392,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:77
 msgid "Password"
 msgstr "Passwuert"
 
@@ -416,82 +423,70 @@ msgstr "Neit Passwuert"
 msgid "Change password"
 msgstr "Passwuert Ã¤nneren"
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:76
 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 "Email"
 
-#: templates/personal.php:72
+#: templates/personal.php:70
 msgid "Your email address"
 msgstr "Deng Email Adress"
 
-#: templates/personal.php:73
+#: templates/personal.php:71
 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:77 templates/personal.php:78
 msgid "Language"
 msgstr "Sprooch"
 
-#: templates/personal.php:86
+#: templates/personal.php:89
 msgid "Help translate"
 msgstr "HÃ«llef iwwersetzen"
 
-#: 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:75
 msgid "Login Name"
 msgstr ""
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr "Erstellen"
 
-#: templates/users.php:35
+#: templates/users.php:33
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:39 templates/users.php:133
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:57 templates/users.php:148
 msgid "Other"
 msgstr "Aner"
 
-#: templates/users.php:84
+#: templates/users.php:82
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:95
+#: templates/users.php:93
 msgid "change display name"
 msgstr ""
 
-#: templates/users.php:99
+#: templates/users.php:97
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:134
+#: templates/users.php:128
 msgid "Default"
 msgstr ""
diff --git a/l10n/lb/user_ldap.po b/l10n/lb/user_ldap.po
index 8e3b5b7e3124018ab5a2512710687c1401e596b4..38893be1d6bedefd986220366b99ee4744aedfad 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-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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..093341b3d26cea395949efcb12cbca5e1ee56993 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-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -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 50c0876c7f7d57bafcc8aa79a832489fded654b4..472e6577080aeda49d70566635b1b159f4d5eb73 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-02-22 00:06+0100\n"
-"PO-Revision-Date: 2013-02-20 23:20+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+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"
@@ -19,24 +18,24 @@ 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/share.php:85
+#: 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:87
+#: 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:89
+#: 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:91
+#: ajax/share.php:104
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -82,79 +81,79 @@ msgstr "Trynimui nepasirinkta jokia kategorija."
 msgid "Error removing %s from favorites."
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:34
 msgid "Sunday"
 msgstr "Sekmadienis"
 
-#: js/config.php:32
+#: js/config.php:35
 msgid "Monday"
 msgstr "Pirmadienis"
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Tuesday"
 msgstr "Antradienis"
 
-#: js/config.php:32
+#: js/config.php:37
 msgid "Wednesday"
 msgstr "TreÄiadienis"
 
-#: js/config.php:32
+#: js/config.php:38
 msgid "Thursday"
 msgstr "Ketvirtadienis"
 
-#: js/config.php:32
+#: js/config.php:39
 msgid "Friday"
 msgstr "Penktadienis"
 
-#: js/config.php:32
+#: js/config.php:40
 msgid "Saturday"
 msgstr "Å eÅ¡tadienis"
 
-#: js/config.php:33
+#: js/config.php:45
 msgid "January"
 msgstr "Sausis"
 
-#: js/config.php:33
+#: js/config.php:46
 msgid "February"
 msgstr "Vasaris"
 
-#: js/config.php:33
+#: js/config.php:47
 msgid "March"
 msgstr "Kovas"
 
-#: js/config.php:33
+#: js/config.php:48
 msgid "April"
 msgstr "Balandis"
 
-#: js/config.php:33
+#: js/config.php:49
 msgid "May"
 msgstr "GeguÅ¾Ä—"
 
-#: js/config.php:33
+#: js/config.php:50
 msgid "June"
 msgstr "BirÅ¾elis"
 
-#: js/config.php:33
+#: js/config.php:51
 msgid "July"
 msgstr "Liepa"
 
-#: js/config.php:33
+#: js/config.php:52
 msgid "August"
 msgstr "RugpjÅ«tis"
 
-#: js/config.php:33
+#: js/config.php:53
 msgid "September"
 msgstr "RugsÄ—jis"
 
-#: js/config.php:33
+#: js/config.php:54
 msgid "October"
 msgstr "Spalis"
 
-#: js/config.php:33
+#: js/config.php:55
 msgid "November"
 msgstr "Lapkritis"
 
-#: js/config.php:33
+#: js/config.php:56
 msgid "December"
 msgstr "Gruodis"
 
@@ -162,86 +161,88 @@ msgstr "Gruodis"
 msgid "Settings"
 msgstr "Nustatymai"
 
-#: js/js.js:767
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "prieÅ¡ sekundÄ™"
 
-#: js/js.js:768
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "PrieÅ¡ 1 minutÄ™"
 
-#: js/js.js:769
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr "PrieÅ¡ {count} minutes"
 
-#: js/js.js:770
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:771
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:772
+#: js/js.js:723
 msgid "today"
 msgstr "Å¡iandien"
 
-#: js/js.js:773
+#: js/js.js:724
 msgid "yesterday"
 msgstr "vakar"
 
-#: js/js.js:774
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr "PrieÅ¡ {days}  dienas"
 
-#: js/js.js:775
+#: js/js.js:726
 msgid "last month"
 msgstr "praeitÄ… mÄ—nesÄ¯"
 
-#: js/js.js:776
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:777
+#: js/js.js:728
 msgid "months ago"
 msgstr "prieÅ¡ mÄ—nesÄ¯"
 
-#: js/js.js:778
+#: js/js.js:729
 msgid "last year"
 msgstr "praeitais metais"
 
-#: js/js.js:779
+#: js/js.js:730
 msgid "years ago"
 msgstr "prieÅ¡ metus"
 
-#: js/oc-dialogs.js:126
-msgid "Choose"
-msgstr "Pasirinkite"
+#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
+msgid "Ok"
+msgstr "Gerai"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
 msgid "Cancel"
 msgstr "AtÅ¡aukti"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "Ne"
+#: js/oc-dialogs.js:185
+msgid "Choose"
+msgstr "Pasirinkite"
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:215
 msgid "Yes"
 msgstr "Taip"
 
-#: js/oc-dialogs.js:180
-msgid "Ok"
-msgstr "Gerai"
+#: js/oc-dialogs.js:222
+msgid "No"
+msgstr "Ne"
 
 #: 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:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:582
-#: js/share.js:594
+#: 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 "Klaida"
 
@@ -253,127 +254,127 @@ msgstr ""
 msgid "The required file {file} is not installed!"
 msgstr ""
 
-#: js/share.js:29 js/share.js:43 js/share.js:90
+#: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr ""
 
-#: js/share.js:93
+#: js/share.js:90
 msgid "Share"
 msgstr "Dalintis"
 
-#: js/share.js:141 js/share.js:622
+#: js/share.js:125 js/share.js:617
 msgid "Error while sharing"
 msgstr "Klaida, dalijimosi metu"
 
-#: js/share.js:152
+#: js/share.js:136
 msgid "Error while unsharing"
 msgstr "Klaida, kai atÅ¡aukiamas dalijimasis"
 
-#: js/share.js:159
+#: js/share.js:143
 msgid "Error while changing permissions"
 msgstr "Klaida, keiÄiant privilegijas"
 
-#: js/share.js:168
+#: js/share.js:152
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Pasidalino su Jumis ir {group} grupe {owner}"
 
-#: js/share.js:170
+#: js/share.js:154
 msgid "Shared with you by {owner}"
 msgstr "Pasidalino su Jumis {owner}"
 
-#: js/share.js:175
+#: js/share.js:159
 msgid "Share with"
 msgstr "Dalintis su"
 
-#: js/share.js:180
+#: js/share.js:164
 msgid "Share with link"
 msgstr "Dalintis nuoroda"
 
-#: js/share.js:183
+#: js/share.js:167
 msgid "Password protect"
 msgstr "Apsaugotas slaptaÅ¾odÅ¾iu"
 
-#: js/share.js:185 templates/installation.php:44 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "SlaptaÅ¾odis"
 
-#: js/share.js:189
+#: js/share.js:173
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:190
+#: js/share.js:174
 msgid "Send"
 msgstr ""
 
-#: js/share.js:194
+#: js/share.js:178
 msgid "Set expiration date"
 msgstr "Nustatykite galiojimo laikÄ…"
 
-#: js/share.js:195
+#: js/share.js:179
 msgid "Expiration date"
 msgstr "Galiojimo laikas"
 
-#: js/share.js:227
+#: js/share.js:211
 msgid "Share via email:"
 msgstr "Dalintis per el. paÅ¡tÄ…:"
 
-#: js/share.js:229
+#: js/share.js:213
 msgid "No people found"
 msgstr "Å½moniÅ³ nerasta"
 
-#: js/share.js:256
+#: js/share.js:251
 msgid "Resharing is not allowed"
 msgstr "Dalijinasis iÅ¡naujo negalimas"
 
-#: js/share.js:292
+#: js/share.js:287
 msgid "Shared in {item} with {user}"
 msgstr "Pasidalino {item} su {user}"
 
-#: js/share.js:313
+#: js/share.js:308
 msgid "Unshare"
-msgstr "Nesidalinti"
+msgstr "Nebesidalinti"
 
-#: js/share.js:325
+#: js/share.js:320
 msgid "can edit"
 msgstr "gali redaguoti"
 
-#: js/share.js:327
+#: js/share.js:322
 msgid "access control"
 msgstr "priÄ—jimo kontrolÄ—"
 
-#: js/share.js:330
+#: js/share.js:325
 msgid "create"
 msgstr "sukurti"
 
-#: js/share.js:333
+#: js/share.js:328
 msgid "update"
 msgstr "atnaujinti"
 
-#: js/share.js:336
+#: js/share.js:331
 msgid "delete"
 msgstr "iÅ¡trinti"
 
-#: js/share.js:339
+#: js/share.js:334
 msgid "share"
 msgstr "dalintis"
 
-#: js/share.js:373 js/share.js:569
+#: js/share.js:368 js/share.js:564
 msgid "Password protected"
 msgstr "Apsaugota slaptaÅ¾odÅ¾iu"
 
-#: js/share.js:582
+#: js/share.js:577
 msgid "Error unsetting expiration date"
 msgstr "Klaida nuimant galiojimo laikÄ…"
 
-#: js/share.js:594
+#: js/share.js:589
 msgid "Error setting expiration date"
 msgstr "Klaida nustatant galiojimo laikÄ…"
 
-#: js/share.js:609
+#: js/share.js:604
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:620
+#: js/share.js:615
 msgid "Email sent"
 msgstr ""
 
@@ -396,24 +397,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:39
-#: 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"
 
@@ -469,115 +473,130 @@ msgstr "Redaguoti kategorijas"
 msgid "Add"
 msgstr "PridÄ—ti"
 
-#: templates/installation.php:23 templates/installation.php:30
+#: templates/installation.php:24 templates/installation.php:31
+#: templates/installation.php:38
 msgid "Security Warning"
 msgstr "Saugumo praneÅ¡imas"
 
-#: 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 "Saugaus atsitiktiniÅ³ skaiÄiÅ³ generatoriaus nÄ—ra, praÅ¡ome Ä¯jungti PHP OpenSSL modulÄ¯."
 
-#: templates/installation.php:25
+#: 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 "Be saugaus atsitiktiniÅ³ skaiÄiÅ³ generatoriaus, piktavaliai gali atspÄ—ti JÅ«sÅ³ slaptaÅ¾odÄ¯ ir pasisavinti paskyrÄ…."
 
-#: templates/installation.php:31
+#: 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:32
+#: 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:36
+#: templates/installation.php:44
 msgid "Create an <strong>admin account</strong>"
 msgstr "Sukurti <strong>administratoriaus paskyrÄ…</strong>"
 
-#: templates/installation.php:52
+#: templates/installation.php:62
 msgid "Advanced"
 msgstr "IÅ¡plÄ—stiniai"
 
-#: templates/installation.php:54
+#: templates/installation.php:64
 msgid "Data folder"
 msgstr "DuomenÅ³ katalogas"
 
-#: templates/installation.php:61
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "Nustatyti duomenÅ³ bazÄ™"
 
-#: templates/installation.php:66 templates/installation.php:77
-#: templates/installation.php:87 templates/installation.php:97
+#: 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:109
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "DuomenÅ³ bazÄ—s vartotojas"
 
-#: templates/installation.php:113
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "DuomenÅ³ bazÄ—s slaptaÅ¾odis"
 
-#: templates/installation.php:117
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "DuomenÅ³ bazÄ—s pavadinimas"
 
-#: templates/installation.php:125
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "DuomenÅ³ bazÄ—s loginis saugojimas"
 
-#: templates/installation.php:131
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "DuomenÅ³ bazÄ—s serveris"
 
-#: templates/installation.php:136
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "Baigti diegimÄ…"
 
-#: templates/layout.guest.php:33
+#: templates/layout.guest.php:40
 msgid "web services under your control"
 msgstr "jÅ«sÅ³ valdomos web paslaugos"
 
-#: templates/layout.user.php:48
+#: 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 "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 7336f6ef67437b9ca8be2760e5aa3f726143d251..c4731e2bd87b4f7d25de5813c61dd3fee37b0bec 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-03-04 00:06+0100\n"
-"PO-Revision-Date: 2013-03-03 23:06+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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"
@@ -73,59 +66,70 @@ msgstr "Nepavyko Ä¯raÅ¡yti Ä¯ diskÄ…"
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:10
+#: appinfo/app.php:12
 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:92 templates/index.php:93
+#: 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/files.js:292 js/files.js:408
-#: js/files.js:439
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "Laukiantis"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} jau egzistuoja"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "pakeisti"
 
-#: js/filelist.js:251
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "pasiÅ«lyti pavadinimÄ…"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "atÅ¡aukti"
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "pakeiskite {new_name} Ä¯ {old_name}"
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "undo"
 msgstr "anuliuoti"
 
-#: js/filelist.js:323
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr ""
 
+#: js/filelist.js:413
+msgid "1 file uploading"
+msgstr "Ä¯keliamas 1 failas"
+
+#: js/filelist.js:416 js/filelist.js:470
+msgid "files uploading"
+msgstr ""
+
 #: js/files.js:52
 msgid "'.' is an invalid file name."
 msgstr ""
@@ -148,77 +152,77 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:225
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:262
+#: 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:262
-msgid "Upload Error"
-msgstr "Ä®kÄ—limo klaida"
-
-#: js/files.js:273
-msgid "Close"
-msgstr "UÅ¾verti"
-
-#: js/files.js:312
-msgid "1 file uploading"
-msgstr "Ä¯keliamas 1 failas"
-
-#: js/files.js:315 js/files.js:370 js/files.js:385
-msgid "{count} files uploading"
-msgstr "{count}  Ä¯keliami failai"
+#: js/files.js:277
+msgid "Not enough space available"
+msgstr ""
 
-#: js/files.js:388 js/files.js:423
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "Ä®kÄ—limas atÅ¡auktas."
 
-#: js/files.js:497
+#: 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:570
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:575
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:953 templates/index.php:68
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+msgid "Error"
+msgstr "Klaida"
+
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Pavadinimas"
 
-#: js/files.js:954 templates/index.php:79
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Dydis"
 
-#: js/files.js:955 templates/index.php:81
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Pakeista"
 
-#: js/files.js:974
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 aplankalas"
 
-#: js/files.js:976
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} aplankalai"
 
-#: js/files.js:984
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 failas"
 
-#: js/files.js:986
+#: 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"
@@ -271,45 +275,45 @@ msgstr "Katalogas"
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:42
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:48
 msgid "Cancel upload"
 msgstr "AtÅ¡aukti siuntimÄ…"
 
-#: templates/index.php:53
+#: templates/index.php:54
 msgid "You donâ€™t have write permissions here."
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "ÄŒia tuÅ¡Äia. Ä®kelkite kÄ… nors!"
 
-#: templates/index.php:74
+#: templates/index.php:75
 msgid "Download"
 msgstr "AtsisiÅ³sti"
 
-#: templates/index.php:86 templates/index.php:87
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Nebesidalinti"
 
-#: templates/index.php:106
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "Ä®kÄ—limui failas per didelis"
 
-#: templates/index.php:108
+#: 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:113
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Skenuojami failai, praÅ¡ome palaukti."
 
-#: templates/index.php:116
+#: 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..0ee05335796aa051d0376e692aa724835941d1a9 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/lt_LT/files_external.po b/l10n/lt_LT/files_external.po
index c31537d0139f85cdf54b72541d28ae71796a6928..4e0ad2de0152c162723860b9347a4cde67f6df74 100644
--- a/l10n/lt_LT/files_external.po
+++ b/l10n/lt_LT/files_external.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-03-01 00:05+0100\n"
-"PO-Revision-Date: 2013-02-27 23:20+0000\n"
+"POT-Creation-Date: 2013-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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"
@@ -39,17 +37,24 @@ 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: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 ""
+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: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 "<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 ""
 
 #: templates/settings.php:3
@@ -62,7 +67,7 @@ msgstr "Katalogo pavadinimas"
 
 #: templates/settings.php:10
 msgid "External storage"
-msgstr ""
+msgstr "IÅ¡orinÄ— saugykla"
 
 #: templates/settings.php:11
 msgid "Configuration"
@@ -78,7 +83,7 @@ msgstr "Pritaikyti"
 
 #: templates/settings.php:33
 msgid "Add storage"
-msgstr ""
+msgstr "PridÄ—ti saugyklÄ…"
 
 #: templates/settings.php:90
 msgid "None set"
diff --git a/l10n/lt_LT/files_sharing.po b/l10n/lt_LT/files_sharing.po
index e6c1c3865f082d59ba3698bf5aeed4ae74422cfd..3b808b373533988bd423c435ba520c217c63d90c 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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 de4d898a2c69cc64bc48c8d5bc26828e6e71c77c..38d8809bf8d7e45c9dbd3d8fe08290f01928a754 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-03-08 00:25+0100\n"
-"PO-Revision-Date: 2013-03-07 23:25+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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"
@@ -17,12 +17,12 @@ 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/delete.php:40
+#: ajax/delete.php:42
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
 
-#: ajax/undelete.php:41
+#: ajax/undelete.php:42
 #, php-format
 msgid "Couldn't restore %s"
 msgstr ""
@@ -31,6 +31,10 @@ msgstr ""
 msgid "perform restore operation"
 msgstr ""
 
+#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+msgid "Error"
+msgstr "Klaida"
+
 #: js/trash.js:34
 msgid "delete file permanently"
 msgstr ""
diff --git a/l10n/lt_LT/files_versions.po b/l10n/lt_LT/files_versions.po
index 8ad43f0ec2441730f0a8e5aafdbe461784f4386e..57d518462cda26c2c3ba8798a51ea886e13d0b57 100644
--- a/l10n/lt_LT/files_versions.po
+++ b/l10n/lt_LT/files_versions.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-02-28 00:04+0100\n"
-"PO-Revision-Date: 2013-02-27 23:04+0000\n"
+"POT-Creation-Date: 2013-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:30+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"
@@ -22,38 +20,38 @@ msgstr ""
 #: ajax/rollbackVersion.php:15
 #, php-format
 msgid "Could not revert: %s"
-msgstr ""
+msgstr "Nepavyko atstatyti: %s"
 
 #: history.php:40
 msgid "success"
-msgstr ""
+msgstr "pavyko"
 
 #: history.php:42
 #, php-format
 msgid "File %s was reverted to version %s"
-msgstr ""
+msgstr "Dokumentas %s buvo atstatytas Ä¯ versijÄ… %s"
 
 #: history.php:49
 msgid "failure"
-msgstr ""
+msgstr "klaida"
 
 #: history.php:51
 #, php-format
 msgid "File %s could not be reverted to version %s"
-msgstr ""
+msgstr "Dokumento %s nepavyko atstatyti Ä¯ versijÄ… %s"
 
-#: history.php:68
+#: history.php:69
 msgid "No old versions available"
-msgstr ""
+msgstr "NÄ—ra senÅ³ versijÅ³"
 
-#: history.php:73
+#: history.php:74
 msgid "No path specified"
-msgstr ""
+msgstr "Nenurodytas kelias"
 
 #: js/versions.js:6
 msgid "Versions"
-msgstr ""
+msgstr "Versijos"
 
 #: templates/history.php:20
 msgid "Revert a file to a previous version by clicking on its revert button"
-msgstr ""
+msgstr "Atstatykite dokumentÄ… Ä¯ prieÅ¡ tai buvusiÄ… versijÄ… spausdami ant jo atstatymo mygtuko"
diff --git a/l10n/lt_LT/lib.po b/l10n/lt_LT/lib.po
index ef437a287d4bd0fabf501c2c31a0e9fe9ea1f610..91b409910d1a6f19c23d4dfe9acbd11b6fe99f65 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-02-27 14:35+0100\n"
-"PO-Revision-Date: 2013-02-27 13:35+0000\n"
+"POT-Creation-Date: 2013-04-28 01:57+0200\n"
+"PO-Revision-Date: 2013-04-27 23:57+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"
@@ -43,19 +41,19 @@ msgstr "Programos"
 msgid "Admin"
 msgstr "Administravimas"
 
-#: files.php:202
+#: files.php:209
 msgid "ZIP download is turned off."
 msgstr "ZIP atsisiuntimo galimybÄ— yra iÅ¡jungta."
 
-#: files.php:203
+#: files.php:210
 msgid "Files need to be downloaded one by one."
 msgstr "Failai turi bÅ«ti parsiunÄiami vienas po kito."
 
-#: files.php:204 files.php:231
+#: files.php:211 files.php:244
 msgid "Back to Files"
 msgstr "Atgal Ä¯ Failus"
 
-#: files.php:228
+#: files.php:241
 msgid "Selected files too large to generate zip file."
 msgstr "Pasirinkti failai per dideli archyvavimui Ä¯ ZIP."
 
@@ -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,83 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:128 setup.php:320 setup.php:365
+#: setup.php:132 setup.php:325 setup.php:370
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:129 setup.php:152 setup.php:229
+#: setup.php:133 setup.php:156 setup.php:234
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:151 setup.php:453 setup.php:520
+#: setup.php:155 setup.php:458 setup.php:525
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:228
+#: setup.php:233
 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: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:583 setup.php:592 setup.php:600 setup.php:609
+#: setup.php:615
 #, 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:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
+#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
+#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:299
+#: setup.php:304
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:300
+#: setup.php:305
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:305
+#: setup.php:310
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:306
+#: setup.php:311
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:579 setup.php:611
+#: setup.php:584 setup.php:616
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:631
+#: setup.php:636
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:849
+#: setup.php:858
 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:859
 #, 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 +220,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 +229,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 f6bfa41c0813f72f557e99a499c5bb36c96bd8cc..e8508048b44688071775fb5b231fe1ac4d41acc5 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-02-27 14:35+0100\n"
-"PO-Revision-Date: 2013-02-27 13:35+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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 ""
 
@@ -94,7 +96,7 @@ msgstr ""
 msgid "Disable"
 msgstr "IÅ¡jungti"
 
-#: js/apps.js:36 js/apps.js:64
+#: js/apps.js:36 js/apps.js:64 js/apps.js:83
 msgid "Enable"
 msgstr "Ä®jungti"
 
@@ -102,68 +104,68 @@ msgstr "Ä®jungti"
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:84
+#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+msgid "Error"
+msgstr "Klaida"
+
+#: js/apps.js:90
 msgid "Updating...."
 msgstr ""
 
-#: js/apps.js:87
+#: js/apps.js:93
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:87
-msgid "Error"
-msgstr "Klaida"
-
-#: js/apps.js:90
+#: js/apps.js:96
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
-msgstr "Saugoma.."
+msgstr "Saugoma..."
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "deleted"
 msgstr ""
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "undo"
 msgstr "anuliuoti"
 
-#: js/users.js:62
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:75 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
+#: templates/users.php:103
 msgid "Groups"
 msgstr "GrupÄ—s"
 
-#: js/users.js:78 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "IÅ¡trinti"
 
-#: js/users.js:191
+#: js/users.js:269
 msgid "add group"
 msgstr ""
 
-#: js/users.js:352
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:353 js/users.js:359 js/users.js:374
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:358
+#: js/users.js:426
 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,21 +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:230 templates/personal.php:102
+#: templates/admin.php:228
+msgid "Less"
+msgstr "MaÅ¾iau"
+
+#: templates/admin.php:235 templates/personal.php:105
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:233 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 "
@@ -393,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:77
 msgid "Password"
 msgstr "SlaptaÅ¾odis"
 
@@ -417,82 +423,70 @@ 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:76
 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 "El. paÅ¡tas"
+msgstr "El. PaÅ¡tas"
 
-#: templates/personal.php:72
+#: templates/personal.php:70
 msgid "Your email address"
 msgstr "JÅ«sÅ³ el. paÅ¡to adresas"
 
-#: templates/personal.php:73
+#: templates/personal.php:71
 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:77 templates/personal.php:78
 msgid "Language"
 msgstr "Kalba"
 
-#: templates/personal.php:86
+#: templates/personal.php:89
 msgid "Help translate"
 msgstr "PadÄ—kite iÅ¡versti"
 
-#: 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:75
 msgid "Login Name"
 msgstr ""
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr "Sukurti"
 
-#: templates/users.php:35
+#: templates/users.php:33
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:39 templates/users.php:133
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:57 templates/users.php:148
 msgid "Other"
 msgstr "Kita"
 
-#: templates/users.php:84
+#: templates/users.php:82
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:95
+#: templates/users.php:93
 msgid "change display name"
 msgstr ""
 
-#: templates/users.php:99
+#: templates/users.php:97
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:134
+#: templates/users.php:128
 msgid "Default"
 msgstr ""
diff --git a/l10n/lt_LT/user_ldap.po b/l10n/lt_LT/user_ldap.po
index 28684ff33e67f4a648a304edad45d4bac24105a9..83ba46a5fdab8996ed4cacbd3465ba09a11353d2 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-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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 f8bc059ae29c091d54d46eaaec558dae15c7d3b6..9f842d853966c998e6f14eb181b19a00ccebb521 100644
--- a/l10n/lt_LT/user_webdavauth.po
+++ b/l10n/lt_LT/user_webdavauth.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# 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-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -19,15 +20,15 @@ msgstr ""
 
 #: templates/settings.php:3
 msgid "WebDAV Authentication"
-msgstr ""
+msgstr "WebDAV autorizavimas"
 
 #: templates/settings.php:4
 msgid "URL: http://"
-msgstr ""
+msgstr "Adresas: 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 iÅ¡siÅ³s naudotojo duomenis Ä¯ Å¡Ä¯ WWW adresÄ…. Å is Ä¯skiepis patikrins gautÄ… atsakymÄ… ir interpretuos HTTP bÅ«senos kodÄ… 401 ir 403 kaip negaliojanÄius duomenis, ir visus kitus gautus atsakymus kaip galiojanÄius duomenis. "
diff --git a/l10n/lv/core.po b/l10n/lv/core.po
index 55f705bdd4778b2add527f083b1f7b3651d76724..f06cd6259bacda982adb82a5e67d85191c0de9cc 100644
--- a/l10n/lv/core.po
+++ b/l10n/lv/core.po
@@ -3,15 +3,13 @@
 # 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-02-22 00:06+0100\n"
-"PO-Revision-Date: 2013-02-20 23:20+0000\n"
-"Last-Translator: RÅ«dolfs Mazurs <rudolfs.mazurs@gmail.com>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10: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"
@@ -19,24 +17,24 @@ msgstr ""
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
-#: ajax/share.php:85
+#: ajax/share.php:97
 #, php-format
 msgid "User %s shared a file with you"
 msgstr "LietotÄjs %s ar jums dalÄ«jÄs ar datni."
 
-#: ajax/share.php:87
+#: ajax/share.php:99
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr "LietotÄjs %s ar jums dalÄ«jÄs ar mapi."
 
-#: ajax/share.php:89
+#: ajax/share.php:101
 #, php-format
 msgid ""
 "User %s shared the file \"%s\" with you. It is available for download here: "
 "%s"
 msgstr "LietotÄjs %s ar jums dalÄ«jÄs ar datni â€œ%sâ€. To var lejupielÄdÄ“t Å¡eit â€” %s"
 
-#: ajax/share.php:91
+#: ajax/share.php:104
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -75,86 +73,86 @@ 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
 msgid "Error removing %s from favorites."
 msgstr "KÄ¼Å«da, izÅ†emot %s no izlases."
 
-#: js/config.php:32
+#: js/config.php:34
 msgid "Sunday"
 msgstr "SvÄ“tdiena"
 
-#: js/config.php:32
+#: js/config.php:35
 msgid "Monday"
 msgstr "Pirmdiena"
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Tuesday"
 msgstr "Otrdiena"
 
-#: js/config.php:32
+#: js/config.php:37
 msgid "Wednesday"
 msgstr "TreÅ¡diena"
 
-#: js/config.php:32
+#: js/config.php:38
 msgid "Thursday"
 msgstr "Ceturtdiena"
 
-#: js/config.php:32
+#: js/config.php:39
 msgid "Friday"
 msgstr "Piektdiena"
 
-#: js/config.php:32
+#: js/config.php:40
 msgid "Saturday"
 msgstr "Sestdiena"
 
-#: js/config.php:33
+#: js/config.php:45
 msgid "January"
 msgstr "JanvÄris"
 
-#: js/config.php:33
+#: js/config.php:46
 msgid "February"
 msgstr "FebruÄris"
 
-#: js/config.php:33
+#: js/config.php:47
 msgid "March"
 msgstr "Marts"
 
-#: js/config.php:33
+#: js/config.php:48
 msgid "April"
 msgstr "AprÄ«lis"
 
-#: js/config.php:33
+#: js/config.php:49
 msgid "May"
 msgstr "Maijs"
 
-#: js/config.php:33
+#: js/config.php:50
 msgid "June"
 msgstr "JÅ«nijs"
 
-#: js/config.php:33
+#: js/config.php:51
 msgid "July"
 msgstr "JÅ«lijs"
 
-#: js/config.php:33
+#: js/config.php:52
 msgid "August"
 msgstr "Augusts"
 
-#: js/config.php:33
+#: js/config.php:53
 msgid "September"
 msgstr "Septembris"
 
-#: js/config.php:33
+#: js/config.php:54
 msgid "October"
 msgstr "Oktobris"
 
-#: js/config.php:33
+#: js/config.php:55
 msgid "November"
 msgstr "Novembris"
 
-#: js/config.php:33
+#: js/config.php:56
 msgid "December"
 msgstr "Decembris"
 
@@ -162,86 +160,88 @@ msgstr "Decembris"
 msgid "Settings"
 msgstr "IestatÄ«jumi"
 
-#: js/js.js:767
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "sekundes atpakaÄ¼"
 
-#: js/js.js:768
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "pirms 1 minÅ«tes"
 
-#: js/js.js:769
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr "pirms {minutes} minÅ«tÄ“m"
 
-#: js/js.js:770
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr "pirms 1 stundas"
 
-#: js/js.js:771
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr "pirms {hours} stundÄm"
 
-#: js/js.js:772
+#: js/js.js:723
 msgid "today"
 msgstr "Å¡odien"
 
-#: js/js.js:773
+#: js/js.js:724
 msgid "yesterday"
 msgstr "vakar"
 
-#: js/js.js:774
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr "pirms {days} dienÄm"
 
-#: js/js.js:775
+#: js/js.js:726
 msgid "last month"
 msgstr "pagÄjuÅ¡ajÄ mÄ“nesÄ«"
 
-#: js/js.js:776
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr "pirms {months} mÄ“neÅ¡iem"
 
-#: js/js.js:777
+#: js/js.js:728
 msgid "months ago"
 msgstr "mÄ“neÅ¡us atpakaÄ¼"
 
-#: js/js.js:778
+#: js/js.js:729
 msgid "last year"
 msgstr "gÄjuÅ¡ajÄ gadÄ"
 
-#: js/js.js:779
+#: js/js.js:730
 msgid "years ago"
 msgstr "gadus atpakaÄ¼"
 
-#: js/oc-dialogs.js:126
-msgid "Choose"
-msgstr "IzvÄ“lieties"
+#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
+msgid "Ok"
+msgstr "Labi"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
 msgid "Cancel"
 msgstr "Atcelt"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "NÄ“"
+#: js/oc-dialogs.js:185
+msgid "Choose"
+msgstr "IzvÄ“lieties"
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:215
 msgid "Yes"
 msgstr "JÄ"
 
-#: js/oc-dialogs.js:180
-msgid "Ok"
-msgstr "Labi"
+#: js/oc-dialogs.js:222
+msgid "No"
+msgstr "NÄ“"
 
 #: 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 "Nav norÄdÄ«ts objekta tips."
 
-#: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:582
-#: js/share.js:594
+#: 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 "KÄ¼Å«da"
 
@@ -253,127 +253,127 @@ msgstr "Nav norÄdÄ«ts lietotnes nosaukums."
 msgid "The required file {file} is not installed!"
 msgstr "PieprasÄ«tÄ datne {file} nav instalÄ“ta!"
 
-#: js/share.js:29 js/share.js:43 js/share.js:90
+#: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr "KopÄ«gs"
 
-#: js/share.js:93
+#: js/share.js:90
 msgid "Share"
 msgstr "DalÄ«ties"
 
-#: js/share.js:141 js/share.js:622
+#: js/share.js:125 js/share.js:617
 msgid "Error while sharing"
 msgstr "KÄ¼Å«da, daloties"
 
-#: js/share.js:152
+#: js/share.js:136
 msgid "Error while unsharing"
 msgstr "KÄ¼Å«da, beidzot dalÄ«ties"
 
-#: js/share.js:159
+#: js/share.js:143
 msgid "Error while changing permissions"
 msgstr "KÄ¼Å«da, mainot atÄ¼aujas"
 
-#: js/share.js:168
+#: js/share.js:152
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "{owner} dalÄ«jÄs ar jums un grupu {group}"
 
-#: js/share.js:170
+#: js/share.js:154
 msgid "Shared with you by {owner}"
 msgstr "{owner} dalÄ«jÄs ar jums"
 
-#: js/share.js:175
+#: js/share.js:159
 msgid "Share with"
 msgstr "DalÄ«ties ar"
 
-#: js/share.js:180
+#: js/share.js:164
 msgid "Share with link"
 msgstr "DalÄ«ties ar saiti"
 
-#: js/share.js:183
+#: js/share.js:167
 msgid "Password protect"
 msgstr "AizsargÄt ar paroli"
 
-#: js/share.js:185 templates/installation.php:44 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Parole"
 
-#: js/share.js:189
+#: js/share.js:173
 msgid "Email link to person"
 msgstr "SÅ«tÄ«t saiti personai pa e-pastu"
 
-#: js/share.js:190
+#: js/share.js:174
 msgid "Send"
 msgstr "SÅ«tÄ«t"
 
-#: js/share.js:194
+#: js/share.js:178
 msgid "Set expiration date"
 msgstr "Iestaties termiÅ†a datumu"
 
-#: js/share.js:195
+#: js/share.js:179
 msgid "Expiration date"
 msgstr "TermiÅ†a datums"
 
-#: js/share.js:227
+#: js/share.js:211
 msgid "Share via email:"
 msgstr "DalÄ«ties, izmantojot e-pastu:"
 
-#: js/share.js:229
+#: js/share.js:213
 msgid "No people found"
 msgstr "Nav atrastu cilvÄ“ku"
 
-#: js/share.js:256
+#: js/share.js:251
 msgid "Resharing is not allowed"
 msgstr "AtkÄrtota dalÄ«Å¡anÄs nav atÄ¼auta"
 
-#: js/share.js:292
+#: js/share.js:287
 msgid "Shared in {item} with {user}"
 msgstr "DalÄ«jÄs ar {item} ar {user}"
 
-#: js/share.js:313
+#: js/share.js:308
 msgid "Unshare"
-msgstr "Beigt dalÄ«ties"
+msgstr "PÄrtraukt dalÄ«Å¡anos"
 
-#: js/share.js:325
+#: js/share.js:320
 msgid "can edit"
 msgstr "var rediÄ£Ä“t"
 
-#: js/share.js:327
+#: js/share.js:322
 msgid "access control"
 msgstr "piekÄ¼uves vadÄ«ba"
 
-#: js/share.js:330
+#: js/share.js:325
 msgid "create"
 msgstr "izveidot"
 
-#: js/share.js:333
+#: js/share.js:328
 msgid "update"
 msgstr "atjauninÄt"
 
-#: js/share.js:336
+#: js/share.js:331
 msgid "delete"
 msgstr "dzÄ“st"
 
-#: js/share.js:339
+#: js/share.js:334
 msgid "share"
 msgstr "dalÄ«ties"
 
-#: js/share.js:373 js/share.js:569
+#: js/share.js:368 js/share.js:564
 msgid "Password protected"
 msgstr "AizsargÄts ar paroli"
 
-#: js/share.js:582
+#: js/share.js:577
 msgid "Error unsetting expiration date"
 msgstr "KÄ¼Å«da, noÅ†emot termiÅ†a datumu"
 
-#: js/share.js:594
+#: js/share.js:589
 msgid "Error setting expiration date"
 msgstr "KÄ¼Å«da, iestatot termiÅ†a datumu"
 
-#: js/share.js:609
+#: js/share.js:604
 msgid "Sending ..."
 msgstr "SÅ«ta..."
 
-#: js/share.js:620
+#: js/share.js:615
 msgid "Email sent"
 msgstr "VÄ“stule nosÅ«tÄ«ta"
 
@@ -396,24 +396,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:39
-#: 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"
 
@@ -447,7 +450,7 @@ msgstr "Lietotnes"
 
 #: strings.php:8
 msgid "Admin"
-msgstr "Administrators"
+msgstr "Administratori"
 
 #: strings.php:9
 msgid "Help"
@@ -469,115 +472,130 @@ msgstr "RediÄ£Ä“t kategoriju"
 msgid "Add"
 msgstr "Pievienot"
 
-#: templates/installation.php:23 templates/installation.php:30
+#: templates/installation.php:24 templates/installation.php:31
+#: templates/installation.php:38
 msgid "Security Warning"
 msgstr "BrÄ«dinÄjums par droÅ¡Ä«bu"
 
-#: 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 "Nav pieejams droÅ¡s nejauÅ¡u skaitÄ¼u Ä£enerators. LÅ«dzu, aktivÄ“jiet PHP OpenSSL paplaÅ¡inÄjumu."
 
-#: templates/installation.php:25
+#: 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 "Bez droÅ¡a nejauÅ¡u skaitÄ¼u Ä£eneratora uzbrucÄ“js var paredzÄ“t paroÄ¼u atjaunoÅ¡anas marÄ·ierus un pÄrÅ†em jÅ«su kontu."
 
-#: templates/installation.php:31
+#: templates/installation.php:39
 msgid ""
 "Your data directory and files are probably accessible from the internet "
 "because the .htaccess file does not work."
 msgstr "VisticamÄk, jÅ«su datu direktorija un datnes ir pieejamas no interneta, jo .htaccess datne nedarbojas."
 
-#: templates/installation.php:32
+#: 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 "Lai uzzinÄtu, kÄ pareizi jÄkonfigurÄ“ Å¡is serveris, skatiet <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">dokumentÄciju</a>."
 
-#: templates/installation.php:36
+#: templates/installation.php:44
 msgid "Create an <strong>admin account</strong>"
 msgstr "Izveidot <strong>administratora kontu</strong>"
 
-#: templates/installation.php:52
+#: templates/installation.php:62
 msgid "Advanced"
 msgstr "PaplaÅ¡inÄti"
 
-#: templates/installation.php:54
+#: templates/installation.php:64
 msgid "Data folder"
 msgstr "Datu mape"
 
-#: templates/installation.php:61
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "KonfigurÄ“t datubÄzi"
 
-#: templates/installation.php:66 templates/installation.php:77
-#: templates/installation.php:87 templates/installation.php:97
+#: 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:109
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "DatubÄzes lietotÄjs"
 
-#: templates/installation.php:113
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "DatubÄzes parole"
 
-#: templates/installation.php:117
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "DatubÄzes nosaukums"
 
-#: templates/installation.php:125
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "DatubÄzes tabulas telpa"
 
-#: templates/installation.php:131
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "DatubÄzes serveris"
 
-#: templates/installation.php:136
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "Pabeigt iestatÄ«Å¡anu"
 
-#: templates/layout.guest.php:33
+#: templates/layout.guest.php:40
 msgid "web services under your control"
-msgstr "jÅ«su vadÄ«bÄ esoÅ¡ie tÄ«mekÄ¼a servisi"
+msgstr "tÄ«mekÄ¼a servisi tavÄ varÄ"
+
+#: templates/layout.user.php:36
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr ""
 
-#: templates/layout.user.php:48
+#: templates/layout.user.php:61
 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 afbd5a9846334cc8132ce23f7e9a6543661e940b..40ca8300d6bfba967cc2798cbecb31576c2c46e5 100644
--- a/l10n/lv/files.po
+++ b/l10n/lv/files.po
@@ -3,16 +3,13 @@
 # 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-03-06 00:07+0100\n"
-"PO-Revision-Date: 2013-03-05 16:30+0000\n"
-"Last-Translator: RÅ«dolfs Mazurs <rudolfs.mazurs@gmail.com>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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"
@@ -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 ""
@@ -73,59 +66,70 @@ msgstr "NeizdevÄs saglabÄt diskÄ"
 msgid "Not enough storage available"
 msgstr "Nav pietiekami daudz vietas"
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr "NederÄ«ga direktorija."
 
-#: appinfo/app.php:10
+#: appinfo/app.php:12
 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:92 templates/index.php:93
+#: 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/files.js:292 js/files.js:408
-#: js/files.js:439
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "Gaida savu kÄrtu"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} jau eksistÄ“"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "aizvietot"
 
-#: js/filelist.js:251
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "ieteiktais nosaukums"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "atcelt"
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "aizvietoja {new_name} ar {old_name}"
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "undo"
 msgstr "atsaukt"
 
-#: js/filelist.js:323
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr "veikt dzÄ“Å¡anas darbÄ«bu"
 
+#: js/filelist.js:413
+msgid "1 file uploading"
+msgstr "AugÅ¡upielÄdÄ“ 1 datni"
+
+#: js/filelist.js:416 js/filelist.js:470
+msgid "files uploading"
+msgstr ""
+
 #: js/files.js:52
 msgid "'.' is an invalid file name."
 msgstr "'.' ir nederÄ«gs datnes nosaukums."
@@ -148,77 +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:225
+#: 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:262
+#: 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"
-
-#: js/files.js:262
-msgid "Upload Error"
-msgstr "KÄ¼Å«da augÅ¡upielÄdÄ“jot"
+msgstr "Nevar augÅ¡upielÄdÄ“t jÅ«su datni, jo tÄ ir direktorija vai arÄ« tÄ ir 0 baitu liela"
 
-#: js/files.js:273
-msgid "Close"
-msgstr "AizvÄ“rt"
+#: js/files.js:277
+msgid "Not enough space available"
+msgstr "Nepietiek brÄ«vas vietas"
 
-#: js/files.js:312
-msgid "1 file uploading"
-msgstr "AugÅ¡upielÄdÄ“ 1 datni"
-
-#: js/files.js:315 js/files.js:370 js/files.js:385
-msgid "{count} files uploading"
-msgstr "augÅ¡upielÄdÄ“ {count} datnes"
-
-#: js/files.js:388 js/files.js:423
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "AugÅ¡upielÄde ir atcelta."
 
-#: js/files.js:497
+#: 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:570
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "URL nevar bÅ«t tukÅ¡s."
 
-#: js/files.js:575
+#: 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:953 templates/index.php:68
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+msgid "Error"
+msgstr "KÄ¼Å«da"
+
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Nosaukums"
 
-#: js/files.js:954 templates/index.php:79
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "IzmÄ“rs"
 
-#: js/files.js:955 templates/index.php:81
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "MainÄ«ts"
 
-#: js/files.js:974
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 mape"
 
-#: js/files.js:976
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} mapes"
 
-#: js/files.js:984
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 datne"
 
-#: js/files.js:986
+#: 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"
@@ -271,45 +275,45 @@ msgstr "Mape"
 msgid "From link"
 msgstr "No saites"
 
-#: templates/index.php:40
+#: templates/index.php:42
 msgid "Deleted files"
 msgstr "DzÄ“stÄs datnes"
 
-#: templates/index.php:46
+#: templates/index.php:48
 msgid "Cancel upload"
 msgstr "Atcelt augÅ¡upielÄdi"
 
-#: templates/index.php:53
+#: templates/index.php:54
 msgid "You donâ€™t have write permissions here."
 msgstr "Jums nav tiesÄ«bu Å¡eit rakstÄ«t."
 
-#: templates/index.php:60
+#: 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:74
+#: templates/index.php:75
 msgid "Download"
 msgstr "LejupielÄdÄ“t"
 
-#: templates/index.php:86 templates/index.php:87
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "PÄrtraukt dalÄ«Å¡anos"
 
-#: templates/index.php:106
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "Datne ir par lielu, lai to augÅ¡upielÄdÄ“tu"
 
-#: templates/index.php:108
+#: 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:113
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Datnes Å¡obrÄ«d tiek caurskatÄ«tas, lÅ«dzu, uzgaidiet."
 
-#: templates/index.php:116
+#: 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..cc342439494bd6524e4334d14c10864b6471ba15 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/lv/files_external.po b/l10n/lv/files_external.po
index d701675703ae6ed13fe76dc6dcaf3192be172fde..8f0bcb6261aef8aa2f52fd0de233a9632a0d4f9d 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-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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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: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 "<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: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 "<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 3e20fdad2649dcd271501d2929bb81c4b823b662..c3369954b84d49517936e592993971b386521625 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-02-07 00:07+0100\n"
-"PO-Revision-Date: 2013-02-06 21:40+0000\n"
-"Last-Translator: RÅ«dolfs Mazurs <rudolfs.mazurs@gmail.com>\n"
+"POT-Creation-Date: 2013-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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"
@@ -26,24 +25,24 @@ msgstr "Parole"
 msgid "Submit"
 msgstr "Iesniegt"
 
-#: templates/public.php:9
+#: templates/public.php:10
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s ar jums dalÄ«jÄs ar mapi %s"
 
-#: templates/public.php:11
+#: templates/public.php:13
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s ar jums dalÄ«jÄs ar datni %s"
 
-#: templates/public.php:14 templates/public.php:30
+#: templates/public.php:19 templates/public.php:43
 msgid "Download"
 msgstr "LejupielÄdÄ“t"
 
-#: templates/public.php:29
+#: templates/public.php:40
 msgid "No preview available for"
 msgstr "Nav pieejams priekÅ¡skatÄ«jums priekÅ¡"
 
-#: templates/public.php:35
+#: 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 14de7d18f6249aa4f1c4c0c006356c7b8be54c51..a777ecbef2ab585969bc23aabe012bba68961927 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-03-08 00:25+0100\n"
-"PO-Revision-Date: 2013-03-07 23:25+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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,12 +17,12 @@ msgstr ""
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
-#: ajax/delete.php:40
+#: ajax/delete.php:42
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "NevarÄ“ja pilnÄ«bÄ izdzÄ“st %s"
 
-#: ajax/undelete.php:41
+#: ajax/undelete.php:42
 #, php-format
 msgid "Couldn't restore %s"
 msgstr "NevarÄ“ja atjaunot %s"
@@ -32,6 +31,10 @@ msgstr "NevarÄ“ja atjaunot %s"
 msgid "perform restore operation"
 msgstr "veikt atjaunoÅ¡anu"
 
+#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+msgid "Error"
+msgstr "KÄ¼Å«da"
+
 #: js/trash.js:34
 msgid "delete file permanently"
 msgstr "dzÄ“st datni pavisam"
@@ -78,4 +81,4 @@ msgstr "DzÄ“st"
 
 #: templates/part.breadcrumb.php:9
 msgid "Deleted Files"
-msgstr ""
+msgstr "DzÄ“stÄs datnes"
diff --git a/l10n/lv/files_versions.po b/l10n/lv/files_versions.po
index cfbdfa3db8fb28efb46f01c5e7065e4505504e9b..7b0e211dbf8c771526b757968e4a79b0e8d79e67 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:30+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 e84ed8d84ecb926f132427f0f45a9d53c399c920..c14518b06cc30c1448065a18ce98b6461ad08b91 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-03-01 00:05+0100\n"
-"PO-Revision-Date: 2013-02-28 20:41+0000\n"
-"Last-Translator: RÅ«dolfs Mazurs <rudolfs.mazurs@gmail.com>\n"
+"POT-Creation-Date: 2013-04-28 01:57+0200\n"
+"PO-Revision-Date: 2013-04-27 23:57+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"
@@ -42,19 +41,19 @@ msgstr "Lietotnes"
 msgid "Admin"
 msgstr "Administratori"
 
-#: files.php:202
+#: files.php:209
 msgid "ZIP download is turned off."
 msgstr "ZIP lejupielÄdÄ“Å¡ana ir izslÄ“gta."
 
-#: files.php:203
+#: files.php:210
 msgid "Files need to be downloaded one by one."
 msgstr "Datnes var lejupielÄdÄ“t tikai katru atseviÅ¡Ä·i."
 
-#: files.php:204 files.php:231
+#: files.php:211 files.php:244
 msgid "Back to Files"
 msgstr "AtpakaÄ¼ pie datnÄ“m"
 
-#: files.php:228
+#: files.php:241
 msgid "Selected files too large to generate zip file."
 msgstr "IzvÄ“lÄ“tÄs datnes ir pÄrÄk lielas, lai izveidotu zip datni."
 
@@ -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,72 @@ msgstr "%s datubÄÅ¾u nosaukumos nedrÄ«kst izmantot punktus"
 msgid "%s set the database host."
 msgstr "%s iestatiet datubÄÅ¾u serveri."
 
-#: setup.php:128 setup.php:320 setup.php:365
+#: setup.php:132 setup.php:325 setup.php:370
 msgid "PostgreSQL username and/or password not valid"
 msgstr "Nav derÄ«ga PostgreSQL parole un/vai lietotÄjvÄrds"
 
-#: setup.php:129 setup.php:152 setup.php:229
+#: setup.php:133 setup.php:156 setup.php:234
 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:151 setup.php:453 setup.php:520
+#: setup.php:155 setup.php:458 setup.php:525
 msgid "Oracle username and/or password not valid"
 msgstr "Nav derÄ«ga Oracle parole un/vai lietotÄjvÄrds"
 
-#: setup.php:228
+#: setup.php:233
 msgid "MySQL username and/or password not valid"
 msgstr "Nav derÄ«ga MySQL parole un/vai lietotÄjvÄrds"
 
-#: 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: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:583 setup.php:592 setup.php:600 setup.php:609
+#: setup.php:615
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "DB kÄ¼Å«da â€” â€œ%sâ€"
 
-#: 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:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
+#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
+#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "VainÄ«gÄ komanda bija â€œ%sâ€"
 
-#: setup.php:299
+#: setup.php:304
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "MySQL lietotÄjs %s'@'localhost' jau eksistÄ“."
 
-#: setup.php:300
+#: setup.php:305
 msgid "Drop this user from MySQL"
 msgstr "Izmest Å¡o lietotÄju no MySQL"
 
-#: setup.php:305
+#: setup.php:310
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "MySQL lietotÄjs '%s'@'%%' jau eksistÄ“"
 
-#: setup.php:306
+#: setup.php:311
 msgid "Drop this user from MySQL."
 msgstr "Izmest Å¡o lietotÄju no MySQL."
 
-#: setup.php:579 setup.php:611
+#: setup.php:584 setup.php:616
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "VainÄ«gÄ komanda bija \"%s\", vÄrds: %s, parole: %s"
 
-#: setup.php:631
+#: setup.php:636
 #, 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:849
+#: setup.php:858
 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:850
+#: setup.php:859
 #, 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 +235,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 69f10760294f1130f8e8a0dc5789c410d3e97991..0b232f50be3862f2f24aa8cdff7c48e37fca202a 100644
--- a/l10n/lv/settings.po
+++ b/l10n/lv/settings.po
@@ -3,16 +3,13 @@
 # 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-03-01 00:05+0100\n"
-"PO-Revision-Date: 2013-02-28 20:41+0000\n"
-"Last-Translator: RÅ«dolfs Mazurs <rudolfs.mazurs@gmail.com>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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"
@@ -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"
@@ -95,7 +96,7 @@ msgstr "AtjauninÄt uz {appversion}"
 msgid "Disable"
 msgstr "DeaktivÄ“t"
 
-#: js/apps.js:36 js/apps.js:64
+#: js/apps.js:36 js/apps.js:64 js/apps.js:83
 msgid "Enable"
 msgstr "AktivÄ“t"
 
@@ -103,68 +104,68 @@ msgstr "AktivÄ“t"
 msgid "Please wait...."
 msgstr "LÅ«dzu, uzgaidiet...."
 
-#: js/apps.js:84
+#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+msgid "Error"
+msgstr "KÄ¼Å«da"
+
+#: js/apps.js:90
 msgid "Updating...."
 msgstr "Atjaunina...."
 
-#: js/apps.js:87
+#: js/apps.js:93
 msgid "Error while updating app"
 msgstr "KÄ¼Å«da, atjauninot lietotni"
 
-#: js/apps.js:87
-msgid "Error"
-msgstr "KÄ¼Å«da"
-
-#: js/apps.js:90
+#: js/apps.js:96
 msgid "Updated"
 msgstr "AtjauninÄta"
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr "SaglabÄ..."
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "deleted"
 msgstr "izdzests"
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "undo"
 msgstr "atsaukt"
 
-#: js/users.js:62
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr "Nevar izÅ†emt lietotÄju"
 
-#: js/users.js:75 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
+#: templates/users.php:103
 msgid "Groups"
 msgstr "Grupas"
 
-#: js/users.js:78 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr "Grupas administrators"
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "DzÄ“st"
 
-#: js/users.js:191
+#: js/users.js:269
 msgid "add group"
 msgstr "pievienot grupu"
 
-#: js/users.js:352
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr "JÄnorÄda derÄ«gs lietotÄjvÄrds"
 
-#: js/users.js:353 js/users.js:359 js/users.js:374
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr "KÄ¼Å«da, veidojot lietotÄju"
 
-#: js/users.js:358
+#: js/users.js:426
 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,15 +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:230 templates/personal.php:102
+#: templates/admin.php:228
+msgid "Less"
+msgstr "MazÄk"
+
+#: templates/admin.php:235 templates/personal.php:105
 msgid "Version"
 msgstr "Versija"
 
-#: templates/admin.php:233 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 "
@@ -394,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:77
 msgid "Password"
 msgstr "Parole"
 
@@ -418,82 +423,70 @@ 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:76
 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:68
 msgid "Email"
 msgstr "E-pasts"
 
-#: templates/personal.php:72
+#: templates/personal.php:70
 msgid "Your email address"
 msgstr "JÅ«su e-pasta adrese"
 
-#: templates/personal.php:73
+#: templates/personal.php:71
 msgid "Fill in an email address to enable password recovery"
-msgstr "Ievadiet epasta adresi, lai vÄ“lÄk varÄ“tu atgÅ«t paroli, ja bÅ«s nepiecieÅ¡amÄ«ba"
+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:77 templates/personal.php:78
 msgid "Language"
 msgstr "Valoda"
 
-#: templates/personal.php:86
+#: templates/personal.php:89
 msgid "Help translate"
 msgstr "PalÄ«dzi tulkot"
 
-#: templates/personal.php:91
+#: templates/personal.php:94
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:93
+#: templates/personal.php:96
 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:75
 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:33
 msgid "Default Storage"
 msgstr "NoklusÄ“juma krÄtuve"
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:39 templates/users.php:133
 msgid "Unlimited"
 msgstr "NeierobeÅ¾ota"
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:57 templates/users.php:148
 msgid "Other"
 msgstr "Cits"
 
-#: templates/users.php:84
+#: templates/users.php:82
 msgid "Storage"
 msgstr "KrÄtuve"
 
-#: templates/users.php:95
+#: templates/users.php:93
 msgid "change display name"
 msgstr "mainÄ«t redzamo vÄrdu"
 
-#: templates/users.php:99
+#: templates/users.php:97
 msgid "set new password"
 msgstr "iestatÄ«t jaunu paroli"
 
-#: templates/users.php:134
+#: templates/users.php:128
 msgid "Default"
 msgstr "NoklusÄ“juma"
diff --git a/l10n/lv/user_ldap.po b/l10n/lv/user_ldap.po
index 9a1c7c56faec59060a21e4db7bca62aaee9a5b30..cb1532a7903ff98b57c8458bcbccbcc3dc15e7b6 100644
--- a/l10n/lv/user_ldap.po
+++ b/l10n/lv/user_ldap.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-03-02 00:03+0100\n"
-"PO-Revision-Date: 2013-03-01 23:04+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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,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:18
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr "Pievienot servera konfigurÄciju"
 
-#: templates/settings.php:23
+#: templates/settings.php:37
 msgid "Host"
 msgstr "Resursdators"
 
-#: templates/settings.php:25
+#: 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:26
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "BÄzes DN"
 
-#: templates/settings.php:27
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr "Viena bÄzes DN rindÄ"
 
-#: templates/settings.php:28
+#: 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:30
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "LietotÄja DN"
 
-#: 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 "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:33
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Parole"
 
-#: templates/settings.php:36
+#: 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:37
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "LietotÄja ierakstÄ«Å¡anÄs filtrs"
 
-#: 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 "DefinÄ“ filtru, ko izmantot, kad mÄ“Ä£ina ierakstÄ«ties. %%uid ierakstÄ«Å¡anÄs darbÄ«bÄ aizstÄj lietotÄjvÄrdu."
 
-#: templates/settings.php:41
+#: 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:42
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "LietotÄju saraksta filtrs"
 
-#: templates/settings.php:45
+#: 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:46
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "bez jebkÄdiem vietturiem, piemÄ“ram, \"objectClass=person\"."
 
-#: templates/settings.php:47
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "Grupu filtrs"
 
-#: templates/settings.php:50
+#: 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:51
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "bez jebkÄdiem vietturiem, piemÄ“ram, \"objectClass=posixGroup\"."
 
-#: templates/settings.php:55
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr "Savienojuma iestatÄ«jumi"
 
-#: templates/settings.php:57
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr "KonfigurÄcija ir aktÄ«va"
 
-#: templates/settings.php:57
+#: 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:58
+#: templates/settings.php:72
 msgid "Port"
 msgstr "Ports"
 
-#: templates/settings.php:59
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr "Rezerves (kopija) serveris"
 
-#: 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 "NorÄdi rezerves serveri (nav obligÄti). Tam ir jÄbÅ«t galvenÄ LDAP/AD servera kopijai."
 
-#: templates/settings.php:60
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr "Rezerves (kopijas) ports"
 
-#: templates/settings.php:61
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr "DeaktivÄ“t galveno serveri"
 
-#: templates/settings.php:61
+#: 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:62
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "Lietot TLS"
 
-#: templates/settings.php:62
+#: 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:63
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "ReÄ£istrnejutÄ«gs LDAP serveris (Windows)"
 
-#: templates/settings.php:64
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "IzslÄ“gt SSL sertifikÄtu validÄ“Å¡anu."
 
-#: 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 "Ja savienojums darbojas ar Å¡o opciju, importÄ“ LDAP serveru SSL sertifikÄtu savÄ ownCloud serverÄ«."
 
-#: templates/settings.php:64
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "Nav ieteicams, izmanto tikai testÄ“Å¡anai!"
 
-#: templates/settings.php:65
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
-msgstr ""
+msgstr "KeÅ¡atmiÅ†as dzÄ«vlaiks"
 
-#: templates/settings.php:65
+#: 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:67
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr "Direktorijas iestatÄ«jumi"
 
-#: templates/settings.php:69
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr "LietotÄja redzamÄ vÄrda lauks"
 
-#: templates/settings.php:69
+#: 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:70
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "BÄzes lietotÄju koks"
 
-#: templates/settings.php:70
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr "Viena lietotÄju bÄzes DN rindÄ"
 
-#: templates/settings.php:71
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr "LietotÄju meklÄ“Å¡anas atribÅ«ts"
 
-#: templates/settings.php:71 templates/settings.php:74
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr "NeobligÄti; viens atribÅ«ts rindÄ"
 
-#: templates/settings.php:72
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr "Grupas redzamÄ nosaukuma lauks"
 
-#: templates/settings.php:72
+#: 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:73
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "BÄzes grupu koks"
 
-#: templates/settings.php:73
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr "Viena grupu bÄzes DN rindÄ"
 
-#: templates/settings.php:74
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr "Grupu meklÄ“Å¡anas atribÅ«ts"
 
-#: templates/settings.php:75
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr "Grupu piederÄ«bas asociÄcija"
 
-#: templates/settings.php:77
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr "ÄªpaÅ¡ie atribÅ«ti"
 
-#: templates/settings.php:79
+#: templates/settings.php:93
 msgid "Quota Field"
-msgstr ""
+msgstr "Kvotu lauks"
 
-#: templates/settings.php:80
+#: templates/settings.php:94
 msgid "Quota Default"
-msgstr ""
+msgstr "Kvotas noklusÄ“jums"
 
-#: templates/settings.php:80
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr "baitos"
 
-#: templates/settings.php:81
+#: templates/settings.php:95
 msgid "Email Field"
-msgstr ""
+msgstr "E-pasta lauks"
 
-#: templates/settings.php:82
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
-msgstr ""
+msgstr "LietotÄja mÄjas mapes nosaukÅ¡anas kÄrtula"
 
-#: templates/settings.php:82
+#: 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:86
-msgid "Test Configuration"
+#: templates/settings.php:101
+msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:86
+#: 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:111
 msgid "Help"
 msgstr "PalÄ«dzÄ«ba"
diff --git a/l10n/lv/user_webdavauth.po b/l10n/lv/user_webdavauth.po
index bac06d9c1e37e0c6f4461bf09b87690c1af4896f..d866091dc06c0c8278f5ea302feb892da389f3b8 100644
--- a/l10n/lv/user_webdavauth.po
+++ b/l10n/lv/user_webdavauth.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-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-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/mk/core.po b/l10n/mk/core.po
index 297237da8c72d8c2d06816c8fe85f138d955a37f..cffc24c7a78e923763c19e81b0374af3af9e82ff 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-02-22 00:06+0100\n"
-"PO-Revision-Date: 2013-02-20 23:20+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10: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"
@@ -20,24 +17,24 @@ msgstr ""
 "Language: mk\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
 
-#: ajax/share.php:85
+#: ajax/share.php:97
 #, php-format
 msgid "User %s shared a file with you"
 msgstr "ÐšÐ¾Ñ€Ð¸ÑÐ½Ð¸ÐºÐ¾Ñ‚ %s ÑÐ¿Ð¾Ð´ÐµÐ»Ð¸ Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ° ÑÐ¾ Ð’Ð°Ñ"
 
-#: ajax/share.php:87
+#: ajax/share.php:99
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr "ÐšÐ¾Ñ€Ð¸ÑÐ½Ð¸ÐºÐ¾Ñ‚ %s ÑÐ¿Ð¾Ð´ÐµÐ»Ð¸ Ð¿Ð°Ð¿ÐºÐ° ÑÐ¾ Ð’Ð°Ñ"
 
-#: ajax/share.php:89
+#: ajax/share.php:101
 #, php-format
 msgid ""
 "User %s shared the file \"%s\" with you. It is available for download here: "
 "%s"
 msgstr "ÐšÐ¾Ñ€Ð¸ÑÐ½Ð¸ÐºÐ¾Ñ‚ %s Ñ˜Ð° ÑÐ¿Ð¾Ð´ÐµÐ»Ð¸ Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ° â€ž%sâ€œ ÑÐ¾ Ð’Ð°Ñ. Ð”Ð¾ÑÑ‚Ð°Ð¿Ð½Ð° Ðµ Ð·Ð° Ð¿Ñ€ÐµÐ·ÐµÐ¼Ð°ÑšÐµ Ñ‚ÑƒÐºÐ°: %s"
 
-#: ajax/share.php:91
+#: ajax/share.php:104
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -83,166 +80,168 @@ msgstr "ÐÐµ Ðµ Ð¾Ð´Ð±Ñ€Ð°Ð½Ð° ÐºÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ˜Ð° Ð·Ð° Ð±Ñ€Ð¸ÑˆÐµÑšÐµ."
 msgid "Error removing %s from favorites."
 msgstr "Ð“Ñ€ÐµÑˆÐºÐ° Ð¿Ñ€Ð¸ Ð±Ñ€Ð¸ÑˆÐµÑšÐµ Ð½Ð° %s Ð¾Ð´ Ð¾Ð¼Ð¸Ð»ÐµÐ½Ð¸."
 
-#: js/config.php:32
+#: js/config.php:34
 msgid "Sunday"
 msgstr "ÐÐµÐ´ÐµÐ»Ð°"
 
-#: js/config.php:32
+#: js/config.php:35
 msgid "Monday"
 msgstr "ÐŸÐ¾Ð½ÐµÐ´ÐµÐ»Ð½Ð¸Ðº"
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Tuesday"
 msgstr "Ð’Ñ‚Ð¾Ñ€Ð½Ð¸Ðº"
 
-#: js/config.php:32
+#: js/config.php:37
 msgid "Wednesday"
 msgstr "Ð¡Ñ€ÐµÐ´Ð°"
 
-#: js/config.php:32
+#: js/config.php:38
 msgid "Thursday"
 msgstr "Ð§ÐµÑ‚Ð²Ñ€Ñ‚Ð¾Ðº"
 
-#: js/config.php:32
+#: js/config.php:39
 msgid "Friday"
 msgstr "ÐŸÐµÑ‚Ð¾Ðº"
 
-#: js/config.php:32
+#: js/config.php:40
 msgid "Saturday"
 msgstr "Ð¡Ð°Ð±Ð¾Ñ‚Ð°"
 
-#: js/config.php:33
+#: js/config.php:45
 msgid "January"
 msgstr "ÐˆÐ°Ð½ÑƒÐ°Ñ€Ð¸"
 
-#: js/config.php:33
+#: js/config.php:46
 msgid "February"
 msgstr "Ð¤ÐµÐ²Ñ€ÑƒÐ°Ñ€Ð¸"
 
-#: js/config.php:33
+#: js/config.php:47
 msgid "March"
 msgstr "ÐœÐ°Ñ€Ñ‚"
 
-#: js/config.php:33
+#: js/config.php:48
 msgid "April"
 msgstr "ÐÐ¿Ñ€Ð¸Ð»"
 
-#: js/config.php:33
+#: js/config.php:49
 msgid "May"
 msgstr "ÐœÐ°Ñ˜"
 
-#: js/config.php:33
+#: js/config.php:50
 msgid "June"
 msgstr "ÐˆÑƒÐ½Ð¸"
 
-#: js/config.php:33
+#: js/config.php:51
 msgid "July"
 msgstr "ÐˆÑƒÐ»Ð¸"
 
-#: js/config.php:33
+#: js/config.php:52
 msgid "August"
 msgstr "ÐÐ²Ð³ÑƒÑÑ‚"
 
-#: js/config.php:33
+#: js/config.php:53
 msgid "September"
 msgstr "Ð¡ÐµÐ¿Ñ‚ÐµÐ¼Ð²Ñ€Ð¸"
 
-#: js/config.php:33
+#: js/config.php:54
 msgid "October"
 msgstr "ÐžÐºÑ‚Ð¾Ð¼Ð²Ñ€Ð¸"
 
-#: js/config.php:33
+#: js/config.php:55
 msgid "November"
 msgstr "ÐÐ¾ÐµÐ¼Ð²Ñ€Ð¸"
 
-#: js/config.php:33
+#: js/config.php:56
 msgid "December"
 msgstr "Ð”ÐµÐºÐµÐ¼Ð²Ñ€Ð¸"
 
 #: js/js.js:286
 msgid "Settings"
-msgstr "ÐŸÐ¾ÑÑ‚Ð°Ð²ÐºÐ¸"
+msgstr "ÐŸÐ¾Ð´ÐµÑÑƒÐ²Ð°ÑšÐ°"
 
-#: js/js.js:767
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "Ð¿Ñ€ÐµÐ´ ÑÐµÐºÑƒÐ½Ð´Ð¸"
 
-#: js/js.js:768
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "Ð¿Ñ€ÐµÐ´ 1 Ð¼Ð¸Ð½ÑƒÑ‚Ð°"
 
-#: js/js.js:769
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr "Ð¿Ñ€ÐµÐ´ {minutes} Ð¼Ð¸Ð½ÑƒÑ‚Ð¸"
 
-#: js/js.js:770
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr "Ð¿Ñ€ÐµÐ´ 1 Ñ‡Ð°Ñ"
 
-#: js/js.js:771
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr "Ð¿Ñ€ÐµÐ´ {hours} Ñ‡Ð°ÑÐ¾Ð²Ð¸"
 
-#: js/js.js:772
+#: js/js.js:723
 msgid "today"
 msgstr "Ð´ÐµÐ½ÐµÑÐºÐ°"
 
-#: js/js.js:773
+#: js/js.js:724
 msgid "yesterday"
 msgstr "Ð²Ñ‡ÐµÑ€Ð°"
 
-#: js/js.js:774
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr "Ð¿Ñ€ÐµÐ´ {days} Ð´ÐµÐ½Ð¾Ð²Ð¸"
 
-#: js/js.js:775
+#: js/js.js:726
 msgid "last month"
 msgstr "Ð¼Ð¸Ð½Ð°Ñ‚Ð¸Ð¾Ñ‚ Ð¼ÐµÑÐµÑ†"
 
-#: js/js.js:776
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr "Ð¿Ñ€ÐµÐ´ {months} Ð¼ÐµÑÐµÑ†Ð¸"
 
-#: js/js.js:777
+#: js/js.js:728
 msgid "months ago"
 msgstr "Ð¿Ñ€ÐµÐ´ Ð¼ÐµÑÐµÑ†Ð¸"
 
-#: js/js.js:778
+#: js/js.js:729
 msgid "last year"
 msgstr "Ð¼Ð¸Ð½Ð°Ñ‚Ð°Ñ‚Ð° Ð³Ð¾Ð´Ð¸Ð½Ð°"
 
-#: js/js.js:779
+#: js/js.js:730
 msgid "years ago"
 msgstr "Ð¿Ñ€ÐµÐ´ Ð³Ð¾Ð´Ð¸Ð½Ð¸"
 
-#: js/oc-dialogs.js:126
-msgid "Choose"
-msgstr "Ð˜Ð·Ð±ÐµÑ€Ð¸"
+#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
+msgid "Ok"
+msgstr "Ð’Ð¾ Ñ€ÐµÐ´"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
 msgid "Cancel"
 msgstr "ÐžÑ‚ÐºÐ°Ð¶Ð¸"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "ÐÐµ"
+#: js/oc-dialogs.js:185
+msgid "Choose"
+msgstr "Ð˜Ð·Ð±ÐµÑ€Ð¸"
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:215
 msgid "Yes"
 msgstr "Ð”Ð°"
 
-#: js/oc-dialogs.js:180
-msgid "Ok"
-msgstr "Ð’Ð¾ Ñ€ÐµÐ´"
+#: js/oc-dialogs.js:222
+msgid "No"
+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:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:582
-#: js/share.js:594
+#: 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 "Ð“Ñ€ÐµÑˆÐºÐ°"
 
@@ -254,127 +253,127 @@ msgstr "Ð˜Ð¼ÐµÑ‚Ð¾ Ð½Ð° Ð°Ð¿Ð»Ð¸ÐºÐ°Ñ†Ð¸Ñ˜Ð°Ñ‚Ð° Ð½Ðµ Ðµ ÑÐ¿ÐµÑ†Ð¸Ñ„Ð¸Ñ†Ð¸Ñ€Ð°
 msgid "The required file {file} is not installed!"
 msgstr "Ð—Ð°Ð´Ð¾Ð»Ð¶Ð¸Ñ‚ÐµÐ»Ð½Ð°Ñ‚Ð° Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ° {file} Ð½Ðµ Ðµ Ð¸Ð½ÑÑ‚Ð°Ð»Ð¸Ñ€Ð°Ð½Ð°!"
 
-#: js/share.js:29 js/share.js:43 js/share.js:90
+#: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr ""
 
-#: js/share.js:93
+#: js/share.js:90
 msgid "Share"
 msgstr "Ð¡Ð¿Ð¾Ð´ÐµÐ»Ð¸"
 
-#: js/share.js:141 js/share.js:622
+#: js/share.js:125 js/share.js:617
 msgid "Error while sharing"
 msgstr "Ð“Ñ€ÐµÑˆÐºÐ° Ð¿Ñ€Ð¸ ÑÐ¿Ð¾Ð´ÐµÐ»ÑƒÐ²Ð°ÑšÐµ"
 
-#: js/share.js:152
+#: js/share.js:136
 msgid "Error while unsharing"
 msgstr "Ð“Ñ€ÐµÑˆÐºÐ° Ð¿Ñ€Ð¸ Ð¿Ñ€ÐµÐºÐ¸Ð½ Ð½Ð° ÑÐ¿Ð¾Ð´ÐµÐ»ÑƒÐ²Ð°ÑšÐµ"
 
-#: js/share.js:159
+#: js/share.js:143
 msgid "Error while changing permissions"
 msgstr "Ð“Ñ€ÐµÑˆÐºÐ° Ð¿Ñ€Ð¸ Ð¿Ñ€Ð¾Ð¼ÐµÐ½Ð° Ð½Ð° Ð¿Ñ€Ð¸Ð²Ð¸Ð»ÐµÐ³Ð¸Ð¸"
 
-#: js/share.js:168
+#: js/share.js:152
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Ð¡Ð¿Ð¾Ð´ÐµÐ»ÐµÐ½Ð¾ ÑÐ¾ Ð’Ð°Ñ Ð¸ Ð³Ñ€ÑƒÐ¿Ð°Ñ‚Ð° {group} Ð¾Ð´ {owner}"
 
-#: js/share.js:170
+#: js/share.js:154
 msgid "Shared with you by {owner}"
 msgstr "Ð¡Ð¿Ð¾Ð´ÐµÐ»ÐµÐ½Ð¾ ÑÐ¾ Ð’Ð°Ñ Ð¾Ð´ {owner}"
 
-#: js/share.js:175
+#: js/share.js:159
 msgid "Share with"
 msgstr "Ð¡Ð¿Ð¾Ð´ÐµÐ»Ð¸ ÑÐ¾"
 
-#: js/share.js:180
+#: js/share.js:164
 msgid "Share with link"
 msgstr "Ð¡Ð¿Ð¾Ð´ÐµÐ»Ð¸ ÑÐ¾ Ð²Ñ€ÑÐºÐ°"
 
-#: js/share.js:183
+#: js/share.js:167
 msgid "Password protect"
 msgstr "Ð—Ð°ÑˆÑ‚Ð¸Ñ‚Ð¸ ÑÐ¾ Ð»Ð¾Ð·Ð¸Ð½ÐºÐ°"
 
-#: js/share.js:185 templates/installation.php:44 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Ð›Ð¾Ð·Ð¸Ð½ÐºÐ°"
 
-#: js/share.js:189
+#: js/share.js:173
 msgid "Email link to person"
 msgstr "ÐŸÑ€Ð°Ñ‚Ð¸ Ð²Ñ€ÑÐºÐ° Ð¿Ð¾ Ðµ-Ð¿Ð¾ÑˆÑ‚Ð° Ð½Ð° Ð»Ð¸Ñ‡Ð½Ð¾ÑÑ‚"
 
-#: js/share.js:190
+#: js/share.js:174
 msgid "Send"
 msgstr "ÐŸÑ€Ð°Ñ‚Ð¸"
 
-#: js/share.js:194
+#: js/share.js:178
 msgid "Set expiration date"
 msgstr "ÐŸÐ¾ÑÑ‚Ð°Ð²Ð¸ Ñ€Ð¾Ðº Ð½Ð° Ñ‚Ñ€Ð°ÐµÑšÐµ"
 
-#: js/share.js:195
+#: js/share.js:179
 msgid "Expiration date"
 msgstr "Ð Ð¾Ðº Ð½Ð° Ñ‚Ñ€Ð°ÐµÑšÐµ"
 
-#: js/share.js:227
+#: js/share.js:211
 msgid "Share via email:"
 msgstr "Ð¡Ð¿Ð¾Ð´ÐµÐ»Ð¸ Ð¿Ð¾ Ðµ-Ð¿Ð¾ÑˆÑ‚Ð°:"
 
-#: js/share.js:229
+#: js/share.js:213
 msgid "No people found"
 msgstr "ÐÐµ ÑÐµ Ð½Ð°Ñ˜Ð´ÐµÐ½Ð¸ Ð»ÑƒÑ“Ðµ"
 
-#: js/share.js:256
+#: js/share.js:251
 msgid "Resharing is not allowed"
 msgstr "ÐŸÐ¾Ð²Ñ‚Ð¾Ñ€Ð½Ð¾ ÑÐ¿Ð¾Ð´ÐµÐ»ÑƒÐ²Ð°ÑšÐµ Ð½Ðµ Ðµ Ð´Ð¾Ð·Ð²Ð¾Ð»ÐµÐ½Ð¾"
 
-#: js/share.js:292
+#: js/share.js:287
 msgid "Shared in {item} with {user}"
 msgstr "Ð¡Ð¿Ð¾Ð´ÐµÐ»ÐµÐ½Ð¾ Ð²Ð¾ {item} ÑÐ¾ {user}"
 
-#: js/share.js:313
+#: js/share.js:308
 msgid "Unshare"
 msgstr "ÐÐµ ÑÐ¿Ð¾Ð´ÐµÐ»ÑƒÐ²Ð°Ñ˜"
 
-#: js/share.js:325
+#: js/share.js:320
 msgid "can edit"
 msgstr "Ð¼Ð¾Ð¶Ðµ Ð´Ð° ÑÐµ Ð¸Ð·Ð¼ÐµÐ½Ð¸"
 
-#: js/share.js:327
+#: js/share.js:322
 msgid "access control"
 msgstr "ÐºÐ¾Ð½Ñ‚Ñ€Ð¾Ð»Ð° Ð½Ð° Ð¿Ñ€Ð¸ÑÑ‚Ð°Ð¿"
 
-#: js/share.js:330
+#: js/share.js:325
 msgid "create"
 msgstr "ÐºÑ€ÐµÐ¸Ñ€Ð°Ñ˜"
 
-#: js/share.js:333
+#: js/share.js:328
 msgid "update"
 msgstr "Ð°Ð¶ÑƒÑ€Ð¸Ñ€Ð°Ñ˜"
 
-#: js/share.js:336
+#: js/share.js:331
 msgid "delete"
 msgstr "Ð¸Ð·Ð±Ñ€Ð¸ÑˆÐ¸"
 
-#: js/share.js:339
+#: js/share.js:334
 msgid "share"
 msgstr "ÑÐ¿Ð¾Ð´ÐµÐ»Ð¸"
 
-#: js/share.js:373 js/share.js:569
+#: js/share.js:368 js/share.js:564
 msgid "Password protected"
 msgstr "Ð—Ð°ÑˆÑ‚Ð¸Ñ‚ÐµÐ½Ð¾ ÑÐ¾ Ð»Ð¾Ð·Ð¸Ð½ÐºÐ°"
 
-#: js/share.js:582
+#: js/share.js:577
 msgid "Error unsetting expiration date"
 msgstr "Ð“Ñ€ÐµÑˆÐºÐ° Ð¿Ñ€Ð¸ Ñ‚Ñ€Ð³Ð°ÑšÐµ Ð½Ð° Ñ€Ð¾ÐºÐ¾Ñ‚ Ð½Ð° Ñ‚Ñ€Ð°ÐµÑšÐµ"
 
-#: js/share.js:594
+#: js/share.js:589
 msgid "Error setting expiration date"
 msgstr "Ð“Ñ€ÐµÑˆÐºÐ° Ð¿Ñ€Ð¸ Ð¿Ð¾ÑÑ‚Ð°Ð²ÑƒÐ²Ð°ÑšÐµ Ð½Ð° Ñ€Ð¾Ðº Ð½Ð° Ñ‚Ñ€Ð°ÐµÑšÐµ"
 
-#: js/share.js:609
+#: js/share.js:604
 msgid "Sending ..."
 msgstr "ÐŸÑ€Ð°ÑœÐ°ÑšÐµ..."
 
-#: js/share.js:620
+#: js/share.js:615
 msgid "Email sent"
 msgstr "Ð•-Ð¿Ð¾Ñ€Ð°ÐºÐ° Ð¿Ñ€Ð°Ñ‚ÐµÐ½Ð°"
 
@@ -397,24 +396,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:39
-#: 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 "ÐŸÐ¾Ð±Ð°Ñ€Ð°Ñ˜Ñ‚Ðµ Ñ€ÐµÑÐµÑ‚Ð¸Ñ€Ð°ÑšÐµ"
 
@@ -444,7 +446,7 @@ msgstr "ÐšÐ¾Ñ€Ð¸ÑÐ½Ð¸Ñ†Ð¸"
 
 #: strings.php:7
 msgid "Apps"
-msgstr "ÐÐ¿Ð»Ð¸ÐºÐ°Ñ†Ð¸Ð¸"
+msgstr "ÐÐ¿Ð¿Ð»Ð¸ÐºÐ°Ñ†Ð¸Ð¸"
 
 #: strings.php:8
 msgid "Admin"
@@ -470,115 +472,130 @@ msgstr "Ð£Ñ€ÐµÐ´Ð¸ ÐºÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ð¸"
 msgid "Add"
 msgstr "Ð”Ð¾Ð´Ð°Ð´Ð¸"
 
-#: templates/installation.php:23 templates/installation.php:30
+#: 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 "ÐÐµ Ðµ Ð´Ð¾ÑÑ‚Ð°Ð¿ÐµÐ½ Ð±ÐµÐ·Ð±ÐµÐ´ÐµÐ½ Ð³ÐµÐ½ÐµÑ€Ð°Ñ‚Ð¾Ñ€ Ð½Ð° ÑÐ»ÑƒÑ‡Ð°Ñ˜Ð½Ð¸ Ð±Ñ€Ð¾ÐµÐ²Ð¸, Ð’Ðµ Ð¼Ð¾Ð»Ð°Ð¼ Ð¾Ð·Ð²Ð¾Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð³Ð¾ OpenSSL PHP Ð´Ð¾Ð´Ð°Ñ‚Ð¾ÐºÐ¾Ñ‚."
 
-#: templates/installation.php:25
+#: 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:31
+#: 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:32
+#: 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:36
+#: templates/installation.php:44
 msgid "Create an <strong>admin account</strong>"
 msgstr "ÐÐ°Ð¿Ñ€Ð°Ð²ÐµÑ‚Ðµ <strong>Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑ‚Ñ€Ð°Ñ‚Ð¾Ñ€ÑÐºÐ° ÑÐ¼ÐµÑ‚ÐºÐ°</strong>"
 
-#: templates/installation.php:52
+#: templates/installation.php:62
 msgid "Advanced"
 msgstr "ÐÐ°Ð¿Ñ€ÐµÐ´Ð½Ð¾"
 
-#: templates/installation.php:54
+#: templates/installation.php:64
 msgid "Data folder"
 msgstr "Ð¤Ð¾Ð»Ð´ÐµÑ€ ÑÐ¾ Ð¿Ð¾Ð´Ð°Ñ‚Ð¾Ñ†Ð¸"
 
-#: templates/installation.php:61
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "ÐšÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð¸Ñ€Ð°Ñ˜ Ñ˜Ð° Ð±Ð°Ð·Ð°Ñ‚Ð°"
 
-#: templates/installation.php:66 templates/installation.php:77
-#: templates/installation.php:87 templates/installation.php:97
+#: 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:109
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "ÐšÐ¾Ñ€Ð¸ÑÐ½Ð¸Ðº Ð½Ð° Ð±Ð°Ð·Ð°"
 
-#: templates/installation.php:113
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "Ð›Ð¾Ð·Ð¸Ð½ÐºÐ° Ð½Ð° Ð±Ð°Ð·Ð°"
 
-#: templates/installation.php:117
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "Ð˜Ð¼Ðµ Ð½Ð° Ð±Ð°Ð·Ð°"
 
-#: templates/installation.php:125
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "Ð¢Ð°Ð±ÐµÐ»Ð° Ð²Ð¾ Ð±Ð°Ð·Ð°Ñ‚Ð° Ð½Ð° Ð¿Ð¾Ð´Ð°Ñ‚Ð¾Ñ†Ð¸"
 
-#: templates/installation.php:131
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "Ð¡ÐµÑ€Ð²ÐµÑ€ ÑÐ¾ Ð±Ð°Ð·Ð°"
 
-#: templates/installation.php:136
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "Ð—Ð°Ð²Ñ€ÑˆÐ¸ Ð³Ð¾ Ð¿Ð¾Ð´ÐµÑÑƒÐ²Ð°ÑšÐµÑ‚Ð¾"
 
-#: templates/layout.guest.php:33
+#: templates/layout.guest.php:40
 msgid "web services under your control"
 msgstr "Ð²ÐµÐ± ÑÐµÑ€Ð²Ð¸ÑÐ¸ Ð¿Ð¾Ð´ Ð’Ð°ÑˆÐ° ÐºÐ¾Ð½Ñ‚Ñ€Ð¾Ð»Ð°"
 
-#: templates/layout.user.php:48
+#: 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/mk/files.po b/l10n/mk/files.po
index e0fa96592072c235f95789417c9eea68022b2b58..299b8fd800e1029aa1de6cc9ea15a427a509e73c 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-03-04 00:06+0100\n"
-"PO-Revision-Date: 2013-03-03 23:06+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10: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"
@@ -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"
@@ -73,59 +66,70 @@ msgstr "ÐÐµÑƒÑÐ¿ÐµÐ°Ð² Ð´Ð° Ð·Ð°Ð¿Ð¸ÑˆÐ°Ð¼ Ð½Ð° Ð´Ð¸ÑÐº"
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:10
+#: 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 ""
 
-#: js/fileactions.js:127 templates/index.php:92 templates/index.php:93
+#: 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/files.js:292 js/files.js:408
-#: js/files.js:439
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "Ð§ÐµÐºÐ°"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} Ð²ÐµÑœÐµ Ð¿Ð¾ÑÑ‚Ð¾Ð¸"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "Ð·Ð°Ð¼ÐµÐ½Ð¸"
 
-#: js/filelist.js:251
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "Ð¿Ñ€ÐµÐ´Ð»Ð¾Ð¶Ð¸ Ð¸Ð¼Ðµ"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "Ð¾Ñ‚ÐºÐ°Ð¶Ð¸"
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "Ð·Ð°Ð¼ÐµÐ½ÐµÑ‚Ð° {new_name} ÑÐ¾ {old_name}"
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "undo"
 msgstr "Ð²Ñ€Ð°Ñ‚Ð¸"
 
-#: js/filelist.js:323
+#: 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 ""
@@ -148,77 +152,77 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:225
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:262
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "ÐÐµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° ÑÐµ Ð¿Ñ€ÐµÐ·ÐµÐ¼Ðµ Ð²Ð°ÑˆÐ°Ñ‚Ð° Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ° Ð±Ð¸Ð´ÐµÑ˜ÑœÐ¸ Ñ„Ð¾Ð»Ð´ÐµÑ€Ð¾Ñ‚ Ð²Ð¾ ÐºÐ¾Ñ˜ ÑÐµ Ð½Ð°Ð¾Ñ“Ð° Ñ„Ð°Ñ˜Ð»Ð¾Ñ‚ Ð¸Ð¼Ð° Ð³Ð¾Ð»ÐµÐ¼Ð¸Ð½Ð° Ð¾Ð´ 0 Ð±Ð°Ñ˜Ñ‚Ð¸"
 
-#: js/files.js:262
-msgid "Upload Error"
-msgstr "Ð“Ñ€ÐµÑˆÐºÐ° Ð¿Ñ€Ð¸ Ð¿Ñ€ÐµÐ·ÐµÐ¼Ð°ÑšÐµ"
-
-#: js/files.js:273
-msgid "Close"
-msgstr "Ð—Ð°Ñ‚Ð²Ð¾Ð¸"
-
-#: js/files.js:312
-msgid "1 file uploading"
-msgstr "1 Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ° ÑÐµ Ð¿Ð¾Ð´Ð¸Ð³Ð°"
-
-#: js/files.js:315 js/files.js:370 js/files.js:385
-msgid "{count} files uploading"
-msgstr "{count} Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ¸ ÑÐµ Ð¿Ð¾Ð´Ð¸Ð³Ð°Ð°Ñ‚"
+#: js/files.js:277
+msgid "Not enough space available"
+msgstr ""
 
-#: js/files.js:388 js/files.js:423
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "ÐŸÑ€ÐµÐ·ÐµÐ¼Ð°ÑšÐµÑ‚Ð¾ Ðµ Ð¿Ñ€ÐµÐºÐ¸Ð½Ð°Ñ‚Ð¾."
 
-#: js/files.js:497
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "ÐŸÐ¾Ð´Ð¸Ð³Ð°ÑšÐµ Ð½Ð° Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ° Ðµ Ð²Ð¾ Ñ‚ÐµÐº. ÐÐ°Ð¿ÑƒÑˆÑ‚ÐµÑšÐµ Ð½Ð° ÑÑ‚Ñ€Ð°Ð½Ð¸Ñ†Ð°Ñ‚Ð° ÑœÐµ Ð³Ð¾ Ð¿Ñ€ÐµÐºÐ¸Ð½Ðµ."
 
-#: js/files.js:570
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "ÐÐ´Ñ€ÐµÑÐ°Ñ‚Ð° Ð½ÐµÐ¼Ð¾Ð¶Ðµ Ð´Ð° Ð±Ð¸Ð´Ðµ Ð¿Ñ€Ð°Ð·Ð½Ð°."
 
-#: js/files.js:575
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:953 templates/index.php:68
+#: 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:954 templates/index.php:79
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Ð“Ð¾Ð»ÐµÐ¼Ð¸Ð½Ð°"
 
-#: js/files.js:955 templates/index.php:81
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "ÐŸÑ€Ð¾Ð¼ÐµÐ½ÐµÑ‚Ð¾"
 
-#: js/files.js:974
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 Ð¿Ð°Ð¿ÐºÐ°"
 
-#: js/files.js:976
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} Ð¿Ð°Ð¿ÐºÐ¸"
 
-#: js/files.js:984
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ°"
 
-#: js/files.js:986
+#: 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 "ÐŸÐ¾Ð´Ð¸Ð³Ð½Ð¸"
@@ -271,45 +275,45 @@ msgstr "ÐŸÐ°Ð¿ÐºÐ°"
 msgid "From link"
 msgstr "ÐžÐ´ Ð²Ñ€ÑÐºÐ°"
 
-#: templates/index.php:40
+#: templates/index.php:42
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:48
 msgid "Cancel upload"
 msgstr "ÐžÑ‚ÐºÐ°Ð¶Ð¸ Ð¿Ñ€Ð¸ÐºÐ°Ñ‡ÑƒÐ²Ð°ÑšÐµ"
 
-#: templates/index.php:53
+#: templates/index.php:54
 msgid "You donâ€™t have write permissions here."
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Ð¢ÑƒÐºÐ° Ð½ÐµÐ¼Ð° Ð½Ð¸ÑˆÑ‚Ð¾. Ð¡Ð½Ð¸Ð¼ÐµÑ‚Ðµ Ð½ÐµÑˆÑ‚Ð¾!"
 
-#: templates/index.php:74
+#: templates/index.php:75
 msgid "Download"
 msgstr "ÐŸÑ€ÐµÐ·ÐµÐ¼Ð¸"
 
-#: templates/index.php:86 templates/index.php:87
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "ÐÐµ ÑÐ¿Ð¾Ð´ÐµÐ»ÑƒÐ²Ð°Ñ˜"
 
-#: templates/index.php:106
+#: templates/index.php:107
 msgid "Upload too large"
-msgstr "Ð”Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ°Ñ‚Ð° Ðµ Ð¿Ñ€ÐµÐ¼Ð½Ð¾Ð³Ñƒ Ð³Ð¾Ð»ÐµÐ¼Ð°"
+msgstr "Ð¤Ð°Ñ˜Ð»Ð¾Ñ‚ ÐºÐ¾Ñ˜ ÑÐµ Ð²Ñ‡Ð¸Ñ‚ÑƒÐ²Ð° Ðµ Ð¿Ñ€ÐµÐ³Ð¾Ð»ÐµÐ¼"
 
-#: templates/index.php:108
+#: 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:113
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Ð¡Ðµ ÑÐºÐµÐ½Ð¸Ñ€Ð°Ð°Ñ‚ Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ¸, Ð²Ðµ Ð¼Ð¾Ð»Ð°Ð¼ Ð¿Ð¾Ñ‡ÐµÐºÐ°Ñ˜Ñ‚Ðµ."
 
-#: templates/index.php:116
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "ÐœÐ¾Ð¼ÐµÐ½Ñ‚Ð°Ð»Ð½Ð¾ ÑÐºÐµÐ½Ð¸Ñ€Ð°Ð¼"
 
diff --git a/l10n/mk/files_encryption.po b/l10n/mk/files_encryption.po
index 3eab97885bd975b38368d60a7f71db0f30e93b8f..42d168af09c3abcb8c1c0849a5a69055b0615dba 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/mk/files_external.po b/l10n/mk/files_external.po
index 031ea736aa0968061f10d11aeaa83a8a25dc91bb..c1d7e75e2ecdf68c9bea27d167ed5db8eca7e850 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-01 00:05+0100\n"
-"PO-Revision-Date: 2013-02-27 23:20+0000\n"
+"POT-Creation-Date: 2013-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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: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 "<b>Ð’Ð½Ð¸Ð¼Ð°Ð½Ð¸Ðµ:</b> \"smbclient\" Ð½Ðµ Ðµ Ð¸Ð½ÑÑ‚Ð°Ð»Ð¸Ñ€Ð°Ð½. ÐÐµ Ðµ Ð¼Ð¾Ð¶Ð½Ð¾ Ð¼Ð¾Ð½Ñ‚Ð¸Ñ€Ð°ÑšÐµ Ð½Ð° CIFS/SMB Ð´Ð¸ÑÐºÐ¾Ð²Ð¸. Ð—Ð°Ð¼Ð¾Ð»ÐµÑ‚Ðµ Ð³Ð¾ Ð’Ð°ÑˆÐ¸Ð¾Ñ‚ ÑÐ¸ÑÑ‚ÐµÐ¼ Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑ‚Ñ€Ð°Ñ‚Ð¾Ñ€ Ð´Ð° Ð³Ð¾ Ð¸Ð½ÑÑ‚Ð°Ð»Ð¸Ñ€Ð°."
 
-#: 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 "<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..34a139dd73363a72ed9624cdbde950b4213c9916 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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 7910b81dd0a6a8333dfcc9393620c64299ca2896..f0e618ecbaa7784ee2eb312e0b9b83604008f56f 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-03-08 00:25+0100\n"
-"PO-Revision-Date: 2013-03-07 23:25+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
@@ -17,12 +17,12 @@ msgstr ""
 "Language: mk\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
 
-#: ajax/delete.php:40
+#: ajax/delete.php:42
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
 
-#: ajax/undelete.php:41
+#: ajax/undelete.php:42
 #, php-format
 msgid "Couldn't restore %s"
 msgstr ""
@@ -31,6 +31,10 @@ msgstr ""
 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 ""
diff --git a/l10n/mk/files_versions.po b/l10n/mk/files_versions.po
index f79838b9c078c01798d14116ce501958209dc44e..a25f7e9a24ef8a0ad89fcd676c96274cb81a2de4 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:30+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 f78cd8ab7676e4f0f7eb432ef01fc4b35a645ce1..e64e413995bc93c551fefbfd4bca4f6f9b0be774 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-02-27 14:35+0100\n"
-"PO-Revision-Date: 2013-02-27 13:35+0000\n"
+"POT-Creation-Date: 2013-04-28 01:57+0200\n"
+"PO-Revision-Date: 2013-04-27 23:57+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"
@@ -28,7 +27,7 @@ msgstr "Ð›Ð¸Ñ‡Ð½Ð¾"
 
 #: app.php:373
 msgid "Settings"
-msgstr "ÐŸÐ°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð¸"
+msgstr "ÐŸÐ¾Ð´ÐµÑÑƒÐ²Ð°ÑšÐ°"
 
 #: app.php:385
 msgid "Users"
@@ -42,19 +41,19 @@ msgstr "ÐÐ¿Ð¿Ð»Ð¸ÐºÐ°Ñ†Ð¸Ð¸"
 msgid "Admin"
 msgstr "ÐÐ´Ð¼Ð¸Ð½"
 
-#: files.php:202
+#: files.php:209
 msgid "ZIP download is turned off."
 msgstr "ÐŸÑ€ÐµÐ·ÐµÐ¼Ð°ÑšÐµ Ð²Ð¾ ZIP Ðµ Ð¸ÑÐºÐ»ÑƒÑ‡ÐµÐ½Ð¾"
 
-#: files.php:203
+#: files.php:210
 msgid "Files need to be downloaded one by one."
 msgstr "Ð”Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ¸Ñ‚Ðµ Ñ‚Ñ€ÐµÐ±Ð° Ð´Ð° ÑÐµ ÑÐ¸Ð¼Ð½Ð°Ñ‚ ÐµÐ´Ð½Ð° Ð¿Ð¾ ÐµÐ´Ð½Ð°."
 
-#: files.php:204 files.php:231
+#: files.php:211 files.php:244
 msgid "Back to Files"
 msgstr "ÐÐ°Ð·Ð°Ð´ ÐºÐ¾Ð½ Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ¸"
 
-#: files.php:228
+#: files.php:241
 msgid "Selected files too large to generate zip file."
 msgstr "Ð˜Ð·Ð±Ñ€Ð°Ð½Ð¸Ñ‚Ðµ Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ¸ ÑÐµ Ð¿Ñ€ÐµÐ³Ð¾Ð»ÐµÐ¼Ð¸ Ð·Ð° Ð´Ð° ÑÐµ Ð³ÐµÐ½ÐµÑ€Ð¸Ñ€Ð° zip."
 
@@ -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,72 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:128 setup.php:320 setup.php:365
+#: setup.php:132 setup.php:325 setup.php:370
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:129 setup.php:152 setup.php:229
+#: setup.php:133 setup.php:156 setup.php:234
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:151 setup.php:453 setup.php:520
+#: setup.php:155 setup.php:458 setup.php:525
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:228
+#: setup.php:233
 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: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:583 setup.php:592 setup.php:600 setup.php:609
+#: setup.php:615
 #, 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:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
+#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
+#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:299
+#: setup.php:304
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:300
+#: setup.php:305
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:305
+#: setup.php:310
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:306
+#: setup.php:311
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:579 setup.php:611
+#: setup.php:584 setup.php:616
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:631
+#: setup.php:636
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:849
+#: setup.php:858
 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:859
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
@@ -240,19 +235,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 907f9576c1778b892aad8c94f1845557beb2821d..945c5571dfcb4f20efebc353d2c8ee827c3119ee 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-02-27 14:35+0100\n"
-"PO-Revision-Date: 2013-02-27 13:35+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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"
@@ -95,7 +96,7 @@ msgstr ""
 msgid "Disable"
 msgstr "ÐžÐ½ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð¸"
 
-#: js/apps.js:36 js/apps.js:64
+#: js/apps.js:36 js/apps.js:64 js/apps.js:83
 msgid "Enable"
 msgstr "ÐžÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð¸"
 
@@ -103,68 +104,68 @@ msgstr "ÐžÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð¸"
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:84
+#: 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:87
+#: js/apps.js:93
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:87
-msgid "Error"
-msgstr "Ð“Ñ€ÐµÑˆÐºÐ°"
-
-#: js/apps.js:90
+#: js/apps.js:96
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr "Ð¡Ð½Ð¸Ð¼Ð°Ð¼..."
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "deleted"
 msgstr ""
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "undo"
 msgstr "Ð²Ñ€Ð°Ñ‚Ð¸"
 
-#: js/users.js:62
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:75 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
+#: templates/users.php:103
 msgid "Groups"
 msgstr "Ð“Ñ€ÑƒÐ¿Ð¸"
 
-#: js/users.js:78 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr "ÐÐ´Ð¼Ð¸Ð½Ð¸ÑÑ‚Ñ€Ð°Ñ‚Ð¾Ñ€ Ð½Ð° Ð³Ñ€ÑƒÐ¿Ð°"
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "Ð˜Ð·Ð±Ñ€Ð¸ÑˆÐ¸"
 
-#: js/users.js:191
+#: js/users.js:269
 msgid "add group"
 msgstr ""
 
-#: js/users.js:352
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:353 js/users.js:359 js/users.js:374
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:358
+#: js/users.js:426
 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,21 +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:230 templates/personal.php:102
+#: templates/admin.php:228
+msgid "Less"
+msgstr "ÐŸÐ¾Ð¼Ð°Ð»ÐºÑƒ"
+
+#: templates/admin.php:235 templates/personal.php:105
 msgid "Version"
 msgstr "Ð’ÐµÑ€Ð·Ð¸Ñ˜Ð°"
 
-#: templates/admin.php:233 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 "
@@ -394,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:77
 msgid "Password"
 msgstr "Ð›Ð¾Ð·Ð¸Ð½ÐºÐ°"
 
@@ -418,82 +423,70 @@ msgstr "ÐÐ¾Ð²Ð° Ð»Ð¾Ð·Ð¸Ð½ÐºÐ°"
 msgid "Change password"
 msgstr "Ð¡Ð¼ÐµÐ½Ð¸ Ð»Ð¾Ð·Ð¸Ð½ÐºÐ°"
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:76
 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 "WebDAV"
 
-#: 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:75
 msgid "Login Name"
 msgstr ""
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr "Ð¡Ð¾Ð·Ð´Ð°Ñ˜"
 
-#: templates/users.php:35
+#: templates/users.php:33
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:39 templates/users.php:133
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:57 templates/users.php:148
 msgid "Other"
 msgstr "ÐžÑÑ‚Ð°Ð½Ð°Ñ‚Ð¾"
 
-#: templates/users.php:84
+#: templates/users.php:82
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:95
+#: templates/users.php:93
 msgid "change display name"
 msgstr ""
 
-#: templates/users.php:99
+#: templates/users.php:97
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:134
+#: templates/users.php:128
 msgid "Default"
 msgstr ""
diff --git a/l10n/mk/user_ldap.po b/l10n/mk/user_ldap.po
index d3688a731b490c3a475bcbcbe077bef02dfebca8..9a3f735d5e3a45aad2c4ad3c212e75a4600d70ee 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-02 00:03+0100\n"
-"PO-Revision-Date: 2013-03-01 23:04+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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: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 "ÐœÐ¾Ð¶Ðµ Ð´Ð° Ð³Ð¾ ÑÐºÐ¾ÐºÐ½ÐµÑ‚Ðµ Ð¿Ñ€Ð¾Ñ‚ÐºÐ¾Ð»Ð¾Ñ‚ Ð¾ÑÐ²ÐµÐ½ Ð°ÐºÐ¾ Ð½Ðµ Ð²Ð¸ Ñ‚Ñ€ÐµÐ±Ð° SSL. Ð¢Ð¾Ð³Ð°Ñˆ ÑÑ‚Ð°Ð²ÐµÑ‚Ðµ ldaps://"
 
-#: 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/mk/user_webdavauth.po b/l10n/mk/user_webdavauth.po
index 19b5d3df58ebf06cce6142f5704a6a1dbc9c7027..f396468a5d5b3b5f27d5a3f2b02c7b930f761397 100644
--- a/l10n/mk/user_webdavauth.po
+++ b/l10n/mk/user_webdavauth.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
@@ -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 61b35a09fc77041b1b46c173d88ecf88aeb6c8ae..366bfde66de8ddc0ce66fa8a7530ed874098e39f 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-02-22 00:06+0100\n"
-"PO-Revision-Date: 2013-02-20 23:20+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10: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"
@@ -20,24 +17,24 @@ msgstr ""
 "Language: ms_MY\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/share.php:85
+#: ajax/share.php:97
 #, php-format
 msgid "User %s shared a file with you"
 msgstr ""
 
-#: ajax/share.php:87
+#: ajax/share.php:99
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr ""
 
-#: ajax/share.php:89
+#: 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:91
+#: ajax/share.php:104
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -76,86 +73,86 @@ 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
 msgid "Error removing %s from favorites."
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:34
 msgid "Sunday"
 msgstr "Ahad"
 
-#: js/config.php:32
+#: js/config.php:35
 msgid "Monday"
 msgstr "Isnin"
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Tuesday"
 msgstr "Selasa"
 
-#: js/config.php:32
+#: js/config.php:37
 msgid "Wednesday"
 msgstr "Rabu"
 
-#: js/config.php:32
+#: js/config.php:38
 msgid "Thursday"
 msgstr "Khamis"
 
-#: js/config.php:32
+#: js/config.php:39
 msgid "Friday"
 msgstr "Jumaat"
 
-#: js/config.php:32
+#: js/config.php:40
 msgid "Saturday"
 msgstr "Sabtu"
 
-#: js/config.php:33
+#: js/config.php:45
 msgid "January"
 msgstr "Januari"
 
-#: js/config.php:33
+#: js/config.php:46
 msgid "February"
 msgstr "Februari"
 
-#: js/config.php:33
+#: js/config.php:47
 msgid "March"
 msgstr "Mac"
 
-#: js/config.php:33
+#: js/config.php:48
 msgid "April"
 msgstr "April"
 
-#: js/config.php:33
+#: js/config.php:49
 msgid "May"
 msgstr "Mei"
 
-#: js/config.php:33
+#: js/config.php:50
 msgid "June"
 msgstr "Jun"
 
-#: js/config.php:33
+#: js/config.php:51
 msgid "July"
 msgstr "Julai"
 
-#: js/config.php:33
+#: js/config.php:52
 msgid "August"
 msgstr "Ogos"
 
-#: js/config.php:33
+#: js/config.php:53
 msgid "September"
 msgstr "September"
 
-#: js/config.php:33
+#: js/config.php:54
 msgid "October"
 msgstr "Oktober"
 
-#: js/config.php:33
+#: js/config.php:55
 msgid "November"
 msgstr "November"
 
-#: js/config.php:33
+#: js/config.php:56
 msgid "December"
 msgstr "Disember"
 
@@ -163,86 +160,88 @@ msgstr "Disember"
 msgid "Settings"
 msgstr "Tetapan"
 
-#: js/js.js:767
+#: js/js.js:718
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:768
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:769
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:770
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:771
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:772
+#: js/js.js:723
 msgid "today"
 msgstr ""
 
-#: js/js.js:773
+#: js/js.js:724
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:774
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:775
+#: js/js.js:726
 msgid "last month"
 msgstr ""
 
-#: js/js.js:776
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:777
+#: js/js.js:728
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:778
+#: js/js.js:729
 msgid "last year"
 msgstr ""
 
-#: js/js.js:779
+#: js/js.js:730
 msgid "years ago"
 msgstr ""
 
-#: js/oc-dialogs.js:126
-msgid "Choose"
-msgstr ""
+#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
+msgid "Ok"
+msgstr "Ok"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
 msgid "Cancel"
 msgstr "Batal"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "Tidak"
+#: js/oc-dialogs.js:185
+msgid "Choose"
+msgstr ""
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:215
 msgid "Yes"
 msgstr "Ya"
 
-#: js/oc-dialogs.js:180
-msgid "Ok"
-msgstr "Ok"
+#: js/oc-dialogs.js:222
+msgid "No"
+msgstr "Tidak"
 
 #: 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:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:582
-#: js/share.js:594
+#: 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 "Ralat"
 
@@ -254,127 +253,127 @@ msgstr ""
 msgid "The required file {file} is not installed!"
 msgstr ""
 
-#: js/share.js:29 js/share.js:43 js/share.js:90
+#: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr ""
 
-#: js/share.js:93
+#: js/share.js:90
 msgid "Share"
 msgstr "Kongsi"
 
-#: js/share.js:141 js/share.js:622
+#: js/share.js:125 js/share.js:617
 msgid "Error while sharing"
 msgstr ""
 
-#: js/share.js:152
+#: js/share.js:136
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:159
+#: js/share.js:143
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:168
+#: js/share.js:152
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:170
+#: js/share.js:154
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:175
+#: js/share.js:159
 msgid "Share with"
 msgstr ""
 
-#: js/share.js:180
+#: js/share.js:164
 msgid "Share with link"
 msgstr ""
 
-#: js/share.js:183
+#: js/share.js:167
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:185 templates/installation.php:44 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Kata laluan"
 
-#: js/share.js:189
+#: js/share.js:173
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:190
+#: js/share.js:174
 msgid "Send"
 msgstr ""
 
-#: js/share.js:194
+#: js/share.js:178
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:195
+#: js/share.js:179
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:227
+#: js/share.js:211
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:229
+#: js/share.js:213
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:256
+#: js/share.js:251
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:292
+#: js/share.js:287
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:313
+#: js/share.js:308
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:325
+#: js/share.js:320
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:327
+#: js/share.js:322
 msgid "access control"
 msgstr ""
 
-#: js/share.js:330
+#: js/share.js:325
 msgid "create"
 msgstr ""
 
-#: js/share.js:333
+#: js/share.js:328
 msgid "update"
 msgstr ""
 
-#: js/share.js:336
+#: js/share.js:331
 msgid "delete"
 msgstr ""
 
-#: js/share.js:339
+#: js/share.js:334
 msgid "share"
 msgstr ""
 
-#: js/share.js:373 js/share.js:569
+#: js/share.js:368 js/share.js:564
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:582
+#: js/share.js:577
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:594
+#: js/share.js:589
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:609
+#: js/share.js:604
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:620
+#: js/share.js:615
 msgid "Email sent"
 msgstr ""
 
@@ -397,24 +396,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:39
-#: 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"
 
@@ -464,121 +466,136 @@ 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"
 msgstr "Tambah"
 
-#: templates/installation.php:23 templates/installation.php:30
+#: templates/installation.php:24 templates/installation.php:31
+#: templates/installation.php:38
 msgid "Security Warning"
 msgstr "Amaran keselamatan"
 
-#: 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:25
+#: 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:31
+#: 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:32
+#: 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:36
+#: templates/installation.php:44
 msgid "Create an <strong>admin account</strong>"
 msgstr "buat <strong>akaun admin</strong>"
 
-#: templates/installation.php:52
+#: templates/installation.php:62
 msgid "Advanced"
 msgstr "Maju"
 
-#: templates/installation.php:54
+#: templates/installation.php:64
 msgid "Data folder"
 msgstr "Fail data"
 
-#: templates/installation.php:61
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "Konfigurasi pangkalan data"
 
-#: templates/installation.php:66 templates/installation.php:77
-#: templates/installation.php:87 templates/installation.php:97
+#: 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:109
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "Nama pengguna pangkalan data"
 
-#: templates/installation.php:113
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "Kata laluan pangkalan data"
 
-#: templates/installation.php:117
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "Nama pangkalan data"
 
-#: templates/installation.php:125
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:131
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "Hos pangkalan data"
 
-#: templates/installation.php:136
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "Setup selesai"
 
-#: templates/layout.guest.php:33
+#: templates/layout.guest.php:40
 msgid "web services under your control"
 msgstr "Perkhidmatan web di bawah kawalan anda"
 
-#: templates/layout.user.php:48
+#: 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 "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 476a84415f0723bbb2c354b13db434c155e1fdb8..f213c62924ceeea9f96fc29476ace73bf5a346ca 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-03-04 00:06+0100\n"
-"PO-Revision-Date: 2013-03-03 23:06+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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"
@@ -74,59 +66,70 @@ msgstr "Gagal untuk disimpan"
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:10
+#: 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:92 templates/index.php:93
+#: 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/files.js:292 js/files.js:408
-#: js/files.js:439
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "Dalam proses"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "ganti"
 
-#: js/filelist.js:251
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "Batal"
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:323
+#: 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 ""
@@ -149,77 +152,77 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:225
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:262
+#: 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:262
-msgid "Upload Error"
-msgstr "Muat naik ralat"
-
-#: js/files.js:273
-msgid "Close"
-msgstr "Tutup"
-
-#: js/files.js:312
-msgid "1 file uploading"
+#: js/files.js:277
+msgid "Not enough space available"
 msgstr ""
 
-#: js/files.js:315 js/files.js:370 js/files.js:385
-msgid "{count} files uploading"
-msgstr ""
-
-#: js/files.js:388 js/files.js:423
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "Muatnaik dibatalkan."
 
-#: js/files.js:497
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:570
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:575
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:953 templates/index.php:68
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+msgid "Error"
+msgstr "Ralat"
+
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
-msgstr "Nama "
+msgstr "Nama"
 
-#: js/files.js:954 templates/index.php:79
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Saiz"
 
-#: js/files.js:955 templates/index.php:81
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Dimodifikasi"
 
-#: js/files.js:974
+#: js/files.js:898
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:976
+#: js/files.js:900
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:984
+#: js/files.js:908
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:986
+#: 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"
@@ -272,45 +275,45 @@ msgstr "Folder"
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:42
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:48
 msgid "Cancel upload"
 msgstr "Batal muat naik"
 
-#: templates/index.php:53
+#: templates/index.php:54
 msgid "You donâ€™t have write permissions here."
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Tiada apa-apa di sini. Muat naik sesuatu!"
 
-#: templates/index.php:74
+#: templates/index.php:75
 msgid "Download"
 msgstr "Muat turun"
 
-#: templates/index.php:86 templates/index.php:87
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr ""
 
-#: templates/index.php:106
+#: templates/index.php:107
 msgid "Upload too large"
-msgstr "Muat naik terlalu besar"
+msgstr "Muatnaik terlalu besar"
 
-#: templates/index.php:108
+#: 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:113
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Fail sedang diimbas, harap bersabar."
 
-#: templates/index.php:116
+#: 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..15afa59d328e1e389787a951ab8a9f5c9dfc2dd5 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-04-26 10:00+0200\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ms_MY/files_external.po b/l10n/ms_MY/files_external.po
index 898cd9062a2a31e1db32a164be33b7491bac7c67..f1af46895a0f29e56b6814362f6fd232e960af44 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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..e2dd17359731c2528637480413c6303cd2e843de 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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 ca5700f5ff4d07845e630aade9375de498e2a493..b54157fab2de92c8bc0daf12fe188526ce84a6dc 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-03-08 00:25+0100\n"
-"PO-Revision-Date: 2013-03-07 23:25+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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,12 +17,12 @@ msgstr ""
 "Language: ms_MY\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/delete.php:40
+#: ajax/delete.php:42
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
 
-#: ajax/undelete.php:41
+#: ajax/undelete.php:42
 #, php-format
 msgid "Couldn't restore %s"
 msgstr ""
@@ -31,6 +31,10 @@ msgstr ""
 msgid "perform restore operation"
 msgstr ""
 
+#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+msgid "Error"
+msgstr "Ralat"
+
 #: js/trash.js:34
 msgid "delete file permanently"
 msgstr ""
diff --git a/l10n/ms_MY/files_versions.po b/l10n/ms_MY/files_versions.po
index 5694a0b699af629cfe2b5cfd89be5d7dbd16648a..22e8fd74325595834da9c2265547b543ec207f19 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-04-26 10:00+0200\n"
+"PO-Revision-Date: 2013-04-26 08:02+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -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 398f8ce8d92097cbec486ba347f43d41a53f5097..7d00ce42b9e364a78c9de5ca2b3d96193574a4d7 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-02-27 14:35+0100\n"
-"PO-Revision-Date: 2013-02-27 13:35+0000\n"
+"POT-Creation-Date: 2013-04-28 01:57+0200\n"
+"PO-Revision-Date: 2013-04-27 23:57+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"
@@ -35,25 +35,25 @@ msgstr "Pengguna"
 
 #: app.php:398
 msgid "Apps"
-msgstr ""
+msgstr "Aplikasi"
 
 #: app.php:406
 msgid "Admin"
-msgstr ""
+msgstr "Admin"
 
-#: files.php:202
+#: files.php:209
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:203
+#: files.php:210
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:204 files.php:231
+#: files.php:211 files.php:244
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:228
+#: files.php:241
 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,72 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:128 setup.php:320 setup.php:365
+#: setup.php:132 setup.php:325 setup.php:370
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:129 setup.php:152 setup.php:229
+#: setup.php:133 setup.php:156 setup.php:234
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:151 setup.php:453 setup.php:520
+#: setup.php:155 setup.php:458 setup.php:525
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:228
+#: setup.php:233
 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: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:583 setup.php:592 setup.php:600 setup.php:609
+#: setup.php:615
 #, 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:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
+#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
+#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:299
+#: setup.php:304
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:300
+#: setup.php:305
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:305
+#: setup.php:310
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:306
+#: setup.php:311
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:579 setup.php:611
+#: setup.php:584 setup.php:616
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:631
+#: setup.php:636
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:849
+#: setup.php:858
 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:859
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
@@ -239,19 +235,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 ead0af974b426f96a7eafa94a050eb9c6d9e8581..5f4003d2e8748eaaf40cc0a1ab4943fed20a3325 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-02-27 14:35+0100\n"
-"PO-Revision-Date: 2013-02-27 13:35+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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 ""
 
@@ -96,7 +96,7 @@ msgstr ""
 msgid "Disable"
 msgstr "Nyahaktif"
 
-#: js/apps.js:36 js/apps.js:64
+#: js/apps.js:36 js/apps.js:64 js/apps.js:83
 msgid "Enable"
 msgstr "Aktif"
 
@@ -104,68 +104,68 @@ msgstr "Aktif"
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:84
+#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+msgid "Error"
+msgstr "Ralat"
+
+#: js/apps.js:90
 msgid "Updating...."
 msgstr ""
 
-#: js/apps.js:87
+#: js/apps.js:93
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:87
-msgid "Error"
-msgstr "Ralat"
-
-#: js/apps.js:90
+#: js/apps.js:96
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr "Simpan..."
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "deleted"
 msgstr "dihapus"
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "undo"
 msgstr ""
 
-#: js/users.js:62
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:75 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
+#: templates/users.php:103
 msgid "Groups"
 msgstr "Kumpulan"
 
-#: js/users.js:78 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "Padam"
 
-#: js/users.js:191
+#: js/users.js:269
 msgid "add group"
 msgstr ""
 
-#: js/users.js:352
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:353 js/users.js:359 js/users.js:374
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:358
+#: js/users.js:426
 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,21 +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 "Lanjutan"
+
+#: templates/admin.php:228
+msgid "Less"
 msgstr ""
 
-#: templates/admin.php:230 templates/personal.php:102
+#: templates/admin.php:235 templates/personal.php:105
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:233 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,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:77
 msgid "Password"
-msgstr "Kata laluan "
+msgstr "Kata laluan"
 
 #: templates/personal.php:38
 msgid "Your password was changed"
@@ -419,82 +423,70 @@ 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:76
 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 "Emel"
+msgstr "Email"
 
-#: templates/personal.php:72
+#: templates/personal.php:70
 msgid "Your email address"
 msgstr "Alamat emel anda"
 
-#: templates/personal.php:73
+#: templates/personal.php:71
 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:77 templates/personal.php:78
 msgid "Language"
 msgstr "Bahasa"
 
-#: templates/personal.php:86
+#: templates/personal.php:89
 msgid "Help translate"
 msgstr "Bantu terjemah"
 
-#: 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:75
 msgid "Login Name"
 msgstr ""
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr "Buat"
 
-#: templates/users.php:35
+#: templates/users.php:33
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:39 templates/users.php:133
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:57 templates/users.php:148
 msgid "Other"
 msgstr "Lain"
 
-#: templates/users.php:84
+#: templates/users.php:82
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:95
+#: templates/users.php:93
 msgid "change display name"
 msgstr ""
 
-#: templates/users.php:99
+#: templates/users.php:97
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:134
+#: templates/users.php:128
 msgid "Default"
 msgstr ""
diff --git a/l10n/ms_MY/user_ldap.po b/l10n/ms_MY/user_ldap.po
index 1fea18548a7ba79dfa3c6422022b2696192fb114..784790e0e9e80deb8e68d40a3ec69e690193fa61 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-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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..c2284a13600aa067845fc1e984d60301164731c0 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-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -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 f7b5644106dfa0b8972e250ddd3f3f4cd263fbb6..46e82a3f92c4b1f4c99710263b7de83c0cb982d6 100644
--- a/l10n/my_MM/core.po
+++ b/l10n/my_MM/core.po
@@ -3,14 +3,13 @@
 # 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-02-25 00:05+0100\n"
-"PO-Revision-Date: 2013-02-24 11:20+0000\n"
-"Last-Translator: Pyae Sone <gipsyhnh@gmail.com>\n"
+"POT-Creation-Date: 2013-04-30 01:57+0200\n"
+"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -161,86 +160,88 @@ msgstr "á€’á€®á€‡á€„á€ºá€˜á€¬"
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:767
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "á€…á€€á€¹á€€á€”á€·á€ºá€¡á€”á€Šá€ºá€¸á€„á€šá€ºá€€"
 
-#: js/js.js:768
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "á á€™á€á€”á€…á€ºá€¡á€›á€„á€ºá€€"
 
-#: js/js.js:769
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:770
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr "á á€”á€¬á€›á€® á€¡á€›á€„á€ºá€€"
 
-#: js/js.js:771
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:772
+#: js/js.js:723
 msgid "today"
 msgstr "á€šá€”á€±á€·"
 
-#: js/js.js:773
+#: js/js.js:724
 msgid "yesterday"
 msgstr "á€™á€”á€±á€·á€€"
 
-#: js/js.js:774
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:775
+#: js/js.js:726
 msgid "last month"
 msgstr "á€•á€¼á€®á€¸á€á€²á€·á€žá€±á€¬á€œ"
 
-#: js/js.js:776
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:777
+#: js/js.js:728
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:778
+#: js/js.js:729
 msgid "last year"
 msgstr "á€™á€”á€¾á€…á€ºá€€"
 
-#: js/js.js:779
+#: js/js.js:730
 msgid "years ago"
 msgstr "á€”á€¾á€…á€º á€¡á€›á€„á€ºá€€"
 
-#: js/oc-dialogs.js:126
-msgid "Choose"
-msgstr "á€›á€½á€±á€¸á€á€»á€šá€º"
+#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
+msgid "Ok"
+msgstr "á€¡á€á€¯á€€á€±"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
 msgid "Cancel"
 msgstr "á€•á€šá€ºá€–á€»á€€á€ºá€™á€Šá€º"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "á€™á€Ÿá€¯á€á€ºá€˜á€°á€¸"
+#: js/oc-dialogs.js:185
+msgid "Choose"
+msgstr "á€›á€½á€±á€¸á€á€»á€šá€º"
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:215
 msgid "Yes"
 msgstr "á€Ÿá€¯á€á€º"
 
-#: js/oc-dialogs.js:180
-msgid "Ok"
-msgstr "á€¡á€á€¯á€€á€±"
+#: js/oc-dialogs.js:222
+msgid "No"
+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:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:582
-#: js/share.js:594
+#: 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 ""
 
@@ -252,127 +253,127 @@ msgstr ""
 msgid "The required file {file} is not installed!"
 msgstr ""
 
-#: js/share.js:29 js/share.js:43 js/share.js:90
+#: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr ""
 
-#: js/share.js:93
+#: js/share.js:90
 msgid "Share"
 msgstr ""
 
-#: js/share.js:141 js/share.js:622
+#: js/share.js:125 js/share.js:617
 msgid "Error while sharing"
 msgstr ""
 
-#: js/share.js:152
+#: js/share.js:136
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:159
+#: js/share.js:143
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:168
+#: js/share.js:152
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:170
+#: js/share.js:154
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:175
+#: js/share.js:159
 msgid "Share with"
 msgstr ""
 
-#: js/share.js:180
+#: js/share.js:164
 msgid "Share with link"
 msgstr ""
 
-#: js/share.js:183
+#: js/share.js:167
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:185 templates/installation.php:46 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "á€…á€€á€¬á€¸á€á€¾á€€á€º"
 
-#: js/share.js:189
+#: js/share.js:173
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:190
+#: js/share.js:174
 msgid "Send"
 msgstr ""
 
-#: js/share.js:194
+#: js/share.js:178
 msgid "Set expiration date"
 msgstr "á€žá€€á€ºá€á€™á€ºá€¸á€€á€¯á€”á€ºá€†á€¯á€¶á€¸á€™á€Šá€·á€ºá€›á€€á€ºá€žá€á€ºá€™á€¾á€á€ºá€™á€Šá€º"
 
-#: js/share.js:195
+#: js/share.js:179
 msgid "Expiration date"
 msgstr "á€žá€€á€ºá€á€™á€ºá€¸á€€á€¯á€”á€ºá€†á€¯á€¶á€¸á€™á€Šá€·á€ºá€›á€€á€º"
 
-#: js/share.js:227
+#: js/share.js:211
 msgid "Share via email:"
 msgstr "á€¡á€®á€¸á€™á€±á€¸á€œá€ºá€–á€¼á€„á€·á€ºá€á€±á€™á€»á€¾á€™á€Šá€º -"
 
-#: js/share.js:229
+#: js/share.js:213
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:256
+#: js/share.js:251
 msgid "Resharing is not allowed"
 msgstr "á€•á€¼á€”á€ºá€œá€Šá€ºá€á€±á€™á€»á€¾á€á€¼á€„á€ºá€¸á€á€½á€„á€·á€ºá€™á€•á€¼á€¯á€•á€«"
 
-#: js/share.js:292
+#: js/share.js:287
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:313
+#: js/share.js:308
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:325
+#: js/share.js:320
 msgid "can edit"
 msgstr "á€•á€¼á€„á€ºá€†á€„á€ºá€”á€á€¯á€„á€º"
 
-#: js/share.js:327
+#: js/share.js:322
 msgid "access control"
 msgstr ""
 
-#: js/share.js:330
+#: js/share.js:325
 msgid "create"
 msgstr "á€–á€”á€ºá€á€®á€¸á€™á€Šá€º"
 
-#: js/share.js:333
+#: js/share.js:328
 msgid "update"
 msgstr ""
 
-#: js/share.js:336
+#: js/share.js:331
 msgid "delete"
 msgstr "á€–á€»á€€á€ºá€™á€Šá€º"
 
-#: js/share.js:339
+#: js/share.js:334
 msgid "share"
 msgstr "á€á€±á€™á€»á€¾á€™á€Šá€º"
 
-#: js/share.js:373 js/share.js:569
+#: js/share.js:368 js/share.js:564
 msgid "Password protected"
 msgstr "á€…á€€á€¬á€¸á€á€¾á€€á€ºá€–á€¼á€„á€·á€ºá€€á€¬á€€á€½á€šá€ºá€‘á€¬á€¸á€žá€Šá€º"
 
-#: js/share.js:582
+#: js/share.js:577
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:594
+#: js/share.js:589
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:609
+#: js/share.js:604
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:620
+#: js/share.js:615
 msgid "Email sent"
 msgstr ""
 
@@ -395,24 +396,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:40
-#: 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 ""
 
@@ -468,115 +472,130 @@ msgstr ""
 msgid "Add"
 msgstr "á€•á€±á€«á€„á€ºá€¸á€‘á€Šá€·á€º"
 
-#: templates/installation.php:23 templates/installation.php:30
+#: 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:25
+#: 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:31
+#: 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:32
+#: 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:36
+#: templates/installation.php:44
 msgid "Create an <strong>admin account</strong>"
 msgstr "<strong>á€¡á€€á€ºá€’á€™á€„á€ºá€¡á€€á€±á€¬á€„á€·á€º</strong>á€á€…á€ºá€á€¯á€–á€”á€ºá€á€®á€¸á€™á€Šá€º"
 
-#: templates/installation.php:54
+#: templates/installation.php:62
 msgid "Advanced"
 msgstr "á€¡á€†á€„á€·á€ºá€™á€¼á€„á€·á€º"
 
-#: templates/installation.php:56
+#: templates/installation.php:64
 msgid "Data folder"
 msgstr "á€¡á€á€»á€€á€ºá€¡á€œá€€á€ºá€–á€á€¯á€œá€ºá€’á€«á€œá€º"
 
-#: templates/installation.php:65
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:70 templates/installation.php:82
-#: templates/installation.php:93 templates/installation.php:104
+#: 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:117
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "Database á€žá€¯á€¶á€¸á€…á€½á€²á€žá€°"
 
-#: templates/installation.php:122
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "Database á€…á€€á€¬á€¸á€á€¾á€€á€º"
 
-#: templates/installation.php:127
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "Database á€¡á€™á€Šá€º"
 
-#: templates/installation.php:137
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:144
+#: templates/installation.php:166
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:150
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "á€á€•á€ºá€†á€„á€ºá€á€¼á€„á€ºá€¸á€•á€¼á€®á€¸á€•á€«á€•á€¼á€®á‹"
 
-#: templates/layout.guest.php:35
+#: templates/layout.guest.php:40
 msgid "web services under your control"
 msgstr "á€žá€„á€ºáá€‘á€á€”á€ºá€¸á€á€»á€¯á€•á€ºá€™á€¾á€¯á€·á€¡á€±á€¬á€€á€ºá€á€½á€„á€ºá€›á€¾á€á€žá€±á€¬ Web services"
 
-#: templates/layout.user.php:53
+#: 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/my_MM/files.po b/l10n/my_MM/files.po
index 81075d343ca4f0308b38d6aaf95b29bf0d686da5..fedecb2ad5a8855ca6af54d7c24423e52c584c29 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-03-04 00:06+0100\n"
-"PO-Revision-Date: 2013-03-03 23:06+0000\n"
+"POT-Creation-Date: 2013-05-15 01:59+0200\n"
+"PO-Revision-Date: 2013-05-15 00:00+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
 "MIME-Version: 1.0\n"
@@ -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 ""
@@ -70,59 +66,70 @@ msgstr ""
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:10
+#: 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 ""
 
-#: js/fileactions.js:127 templates/index.php:92 templates/index.php:93
+#: 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/files.js:292 js/files.js:408
-#: js/files.js:439
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:251
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:323
+#: 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 ""
@@ -145,77 +152,77 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:225
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:262
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:262
-msgid "Upload Error"
-msgstr ""
-
-#: js/files.js:273
-msgid "Close"
+#: js/files.js:277
+msgid "Not enough space available"
 msgstr ""
 
-#: js/files.js:312
-msgid "1 file uploading"
-msgstr ""
-
-#: js/files.js:315 js/files.js:370 js/files.js:385
-msgid "{count} files uploading"
-msgstr ""
-
-#: js/files.js:388 js/files.js:423
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:497
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:570
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:575
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:953 templates/index.php:68
+#: 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:954 templates/index.php:79
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr ""
 
-#: js/files.js:955 templates/index.php:81
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:974
+#: js/files.js:898
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:976
+#: js/files.js:900
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:984
+#: js/files.js:908
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:986
+#: 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 ""
@@ -268,45 +275,45 @@ msgstr ""
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:42
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:48
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:53
+#: templates/index.php:54
 msgid "You donâ€™t have write permissions here."
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:74
+#: templates/index.php:75
 msgid "Download"
 msgstr "á€’á€±á€«á€„á€ºá€¸á€œá€¯á€á€º"
 
-#: templates/index.php:86 templates/index.php:87
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr ""
 
-#: templates/index.php:106
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:108
+#: 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:113
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:116
+#: 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..0980592321348d93b44e23715492843cc490f0e8 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-04-26 10:00+0200\n"
+"PO-Revision-Date: 2013-04-26 08:01+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/my_MM/files_external.po b/l10n/my_MM/files_external.po
index 9d597dfe54579944d0c0377b7021337955c3e156..d6fae81ea26f830f83f4017adbf057c7cd8e493f 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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..1105b88661f810939707e59ecf3657f27f798680 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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 f0875b29e8568b60956b174f2e6ee2b9fe032b06..910708197888e0e0ef6658ebd3ebbd147f1677d3 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-03-08 00:25+0100\n"
-"PO-Revision-Date: 2013-03-07 23:25+0000\n"
+"POT-Creation-Date: 2013-04-26 10:00+0200\n"
+"PO-Revision-Date: 2013-04-26 08:01+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,12 +17,12 @@ msgstr ""
 "Language: my_MM\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/delete.php:40
+#: ajax/delete.php:42
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
 
-#: ajax/undelete.php:41
+#: ajax/undelete.php:42
 #, php-format
 msgid "Couldn't restore %s"
 msgstr ""
@@ -31,6 +31,10 @@ msgstr ""
 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 ""
diff --git a/l10n/my_MM/files_versions.po b/l10n/my_MM/files_versions.po
index 1bb8d9af22056ce56755ffeb0b6259f52943fb98..57a0f93840e2bf0d9e1096f270f96099e51d4dff 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-04-26 10:00+0200\n"
+"PO-Revision-Date: 2013-04-26 08: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"
@@ -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 eae78215aa05cc19ac33b4ae7691bd9c3ca41964..f6ebed8ec4184526d70525a9d76796cd4cfb77df 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-02-27 14:35+0100\n"
-"PO-Revision-Date: 2013-02-27 13:36+0000\n"
+"POT-Creation-Date: 2013-04-28 01:57+0200\n"
+"PO-Revision-Date: 2013-04-27 23:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
 "MIME-Version: 1.0\n"
@@ -42,19 +41,19 @@ msgstr "Apps"
 msgid "Admin"
 msgstr "á€¡á€€á€ºá€’á€™á€„á€º"
 
-#: files.php:202
+#: files.php:209
 msgid "ZIP download is turned off."
 msgstr "ZIP á€’á€±á€«á€„á€ºá€¸á€œá€¯á€á€ºá€€á€á€¯á€•á€á€á€ºá€‘á€¬á€¸á€žá€Šá€º"
 
-#: files.php:203
+#: files.php:210
 msgid "Files need to be downloaded one by one."
 msgstr "á€–á€á€¯á€„á€ºá€™á€»á€¬á€¸á€žá€Šá€º á€á€…á€ºá€á€¯á€•á€¼á€®á€¸ á€á€…á€ºá€á€¯á€’á€±á€«á€„á€ºá€¸á€œá€¯á€á€ºá€á€»á€›á€”á€ºá€œá€á€¯á€¡á€•á€ºá€žá€Šá€º"
 
-#: files.php:204 files.php:231
+#: files.php:211 files.php:244
 msgid "Back to Files"
 msgstr "á€–á€á€¯á€„á€ºá€žá€á€¯á€·á€•á€¼á€”á€ºá€žá€½á€¬á€¸á€™á€Šá€º"
 
-#: files.php:228
+#: files.php:241
 msgid "Selected files too large to generate zip file."
 msgstr "zip á€–á€á€¯á€„á€ºá€¡á€–á€¼á€…á€ºá€•á€¼á€¯á€œá€¯á€•á€ºá€›á€”á€º á€›á€½á€±á€¸á€á€»á€šá€ºá€‘á€¬á€¸á€žá€±á€¬á€–á€á€¯á€„á€ºá€™á€»á€¬á€¸á€žá€Šá€º á€¡á€›á€™á€ºá€¸á€€á€¼á€®á€¸á€œá€½á€”á€ºá€¸á€žá€Šá€º"
 
@@ -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,72 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:128 setup.php:320 setup.php:365
+#: setup.php:132 setup.php:325 setup.php:370
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:129 setup.php:152 setup.php:229
+#: setup.php:133 setup.php:156 setup.php:234
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:151 setup.php:453 setup.php:520
+#: setup.php:155 setup.php:458 setup.php:525
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:228
+#: setup.php:233
 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: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:583 setup.php:592 setup.php:600 setup.php:609
+#: setup.php:615
 #, 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:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
+#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
+#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:299
+#: setup.php:304
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:300
+#: setup.php:305
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:305
+#: setup.php:310
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:306
+#: setup.php:311
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:579 setup.php:611
+#: setup.php:584 setup.php:616
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:631
+#: setup.php:636
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:849
+#: setup.php:858
 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:859
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
@@ -240,19 +235,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 4e5175098a3ce1b6847ceddcbe1426e4e6f7eac7..0a56eeb646031fbc71bdd8b125f6317762c70219 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-02-27 14:35+0100\n"
-"PO-Revision-Date: 2013-02-27 13:35+0000\n"
+"POT-Creation-Date: 2013-04-27 02:17+0200\n"
+"PO-Revision-Date: 2013-04-26 08: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"
@@ -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 ""
 
@@ -92,7 +96,7 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: js/apps.js:36 js/apps.js:64
+#: js/apps.js:36 js/apps.js:64 js/apps.js:83
 msgid "Enable"
 msgstr ""
 
@@ -100,68 +104,68 @@ msgstr ""
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:84
-msgid "Updating...."
+#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+msgid "Error"
 msgstr ""
 
-#: js/apps.js:87
-msgid "Error while updating app"
+#: js/apps.js:90
+msgid "Updating...."
 msgstr ""
 
-#: js/apps.js:87
-msgid "Error"
+#: js/apps.js:93
+msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:90
+#: js/apps.js:96
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr ""
 
-#: js/users.js:30
+#: js/users.js:43
 msgid "deleted"
 msgstr ""
 
-#: js/users.js:30
+#: js/users.js:43
 msgid "undo"
 msgstr ""
 
-#: js/users.js:62
+#: js/users.js:75
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:75 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: templates/users.php:103
 msgid "Groups"
 msgstr ""
 
-#: js/users.js:78 templates/users.php:82 templates/users.php:119
+#: js/users.js:91 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:111 templates/users.php:155
 msgid "Delete"
 msgstr ""
 
-#: js/users.js:191
+#: js/users.js:262
 msgid "add group"
 msgstr ""
 
-#: js/users.js:352
+#: js/users.js:414
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:353 js/users.js:359 js/users.js:374
+#: js/users.js:415 js/users.js:421 js/users.js:436
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:358
+#: js/users.js:420
 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,15 +316,19 @@ msgstr ""
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:230 templates/personal.php:102
+#: templates/admin.php:228
+msgid "Less"
+msgstr ""
+
+#: templates/admin.php:235 templates/personal.php:105
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:233 templates/personal.php:105
+#: templates/admin.php:238 templates/personal.php:108
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -391,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:77
 msgid "Password"
 msgstr "á€…á€€á€¬á€¸á€á€¾á€€á€º"
 
@@ -415,82 +423,70 @@ msgstr "á€…á€€á€¬á€¸á€á€¾á€€á€ºá€¡á€žá€…á€º"
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:76
 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:75
 msgid "Login Name"
 msgstr ""
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr ""
 
-#: templates/users.php:35
+#: templates/users.php:33
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:39 templates/users.php:133
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:57 templates/users.php:148
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:84
+#: templates/users.php:82
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:95
+#: templates/users.php:93
 msgid "change display name"
 msgstr ""
 
-#: templates/users.php:99
+#: templates/users.php:97
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:134
+#: templates/users.php:128
 msgid "Default"
 msgstr ""
diff --git a/l10n/my_MM/user_ldap.po b/l10n/my_MM/user_ldap.po
index 14b74ed4d5cb327e6b1ef8edf2f2759bf5227296..edf738755a06d155d3c83f28234cb08eac8cf449 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-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-17 00:04+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..bfba4e1cd6e917482a9b69324d4dae5b15e8c90d 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-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/nb_NO/core.po b/l10n/nb_NO/core.po
index 2f2ef834aacea5743d1d6ebd6a04a9cedc3a52f7..e229487e28cc71562b55f20176f44db219d5f48a 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-03-07 00:16+0100\n"
-"PO-Revision-Date: 2013-03-06 10:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10: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"
@@ -167,86 +160,88 @@ msgstr "Desember"
 msgid "Settings"
 msgstr "Innstillinger"
 
-#: js/js.js:777
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "sekunder siden"
 
-#: js/js.js:778
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "1 minutt siden"
 
-#: js/js.js:779
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr "{minutes} minutter siden"
 
-#: js/js.js:780
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr "1 time siden"
 
-#: js/js.js:781
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr "{hours} timer siden"
 
-#: js/js.js:782
+#: js/js.js:723
 msgid "today"
 msgstr "i dag"
 
-#: js/js.js:783
+#: js/js.js:724
 msgid "yesterday"
 msgstr "i gÃ¥r"
 
-#: js/js.js:784
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr "{days} dager siden"
 
-#: js/js.js:785
+#: js/js.js:726
 msgid "last month"
 msgstr "forrige mÃ¥ned"
 
-#: js/js.js:786
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr "{months} mÃ¥neder siden"
 
-#: js/js.js:787
+#: js/js.js:728
 msgid "months ago"
 msgstr "mÃ¥neder siden"
 
-#: js/js.js:788
+#: js/js.js:729
 msgid "last year"
 msgstr "forrige Ã¥r"
 
-#: js/js.js:789
+#: js/js.js:730
 msgid "years ago"
 msgstr "Ã¥r siden"
 
-#: js/oc-dialogs.js:126
-msgid "Choose"
-msgstr "Velg"
+#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
+msgid "Ok"
+msgstr "Ok"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "Nei"
+#: js/oc-dialogs.js:185
+msgid "Choose"
+msgstr "Velg"
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:215
 msgid "Yes"
 msgstr "Ja"
 
-#: js/oc-dialogs.js:180
-msgid "Ok"
-msgstr "Ok"
+#: js/oc-dialogs.js:222
+msgid "No"
+msgstr "Nei"
 
 #: 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:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:582
-#: js/share.js:594
+#: 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 "Feil"
 
@@ -258,127 +253,127 @@ msgstr ""
 msgid "The required file {file} is not installed!"
 msgstr ""
 
-#: js/share.js:29 js/share.js:43 js/share.js:90
+#: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr ""
 
-#: js/share.js:93
+#: js/share.js:90
 msgid "Share"
 msgstr "Del"
 
-#: js/share.js:141 js/share.js:622
+#: js/share.js:125 js/share.js:617
 msgid "Error while sharing"
 msgstr "Feil under deling"
 
-#: js/share.js:152
+#: js/share.js:136
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:159
+#: js/share.js:143
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:168
+#: js/share.js:152
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:170
+#: js/share.js:154
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:175
+#: js/share.js:159
 msgid "Share with"
 msgstr "Del med"
 
-#: js/share.js:180
+#: js/share.js:164
 msgid "Share with link"
 msgstr "Del med link"
 
-#: js/share.js:183
+#: js/share.js:167
 msgid "Password protect"
 msgstr "Passordbeskyttet"
 
-#: js/share.js:185 templates/installation.php:47 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Passord"
 
-#: js/share.js:189
+#: js/share.js:173
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:190
+#: js/share.js:174
 msgid "Send"
 msgstr "Send"
 
-#: js/share.js:194
+#: js/share.js:178
 msgid "Set expiration date"
 msgstr "Set utlÃ¸psdato"
 
-#: js/share.js:195
+#: js/share.js:179
 msgid "Expiration date"
 msgstr "UtlÃ¸psdato"
 
-#: js/share.js:227
+#: js/share.js:211
 msgid "Share via email:"
 msgstr "Del pÃ¥ epost"
 
-#: js/share.js:229
+#: js/share.js:213
 msgid "No people found"
 msgstr "Ingen personer funnet"
 
-#: js/share.js:256
+#: js/share.js:251
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:292
+#: js/share.js:287
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:313
+#: js/share.js:308
 msgid "Unshare"
 msgstr "Avslutt deling"
 
-#: js/share.js:325
+#: js/share.js:320
 msgid "can edit"
 msgstr "kan endre"
 
-#: js/share.js:327
+#: js/share.js:322
 msgid "access control"
 msgstr "tilgangskontroll"
 
-#: js/share.js:330
+#: js/share.js:325
 msgid "create"
 msgstr "opprett"
 
-#: js/share.js:333
+#: js/share.js:328
 msgid "update"
 msgstr "oppdater"
 
-#: js/share.js:336
+#: js/share.js:331
 msgid "delete"
 msgstr "slett"
 
-#: js/share.js:339
+#: js/share.js:334
 msgid "share"
 msgstr "del"
 
-#: js/share.js:373 js/share.js:569
+#: js/share.js:368 js/share.js:564
 msgid "Password protected"
 msgstr "Passordbeskyttet"
 
-#: js/share.js:582
+#: js/share.js:577
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:594
+#: js/share.js:589
 msgid "Error setting expiration date"
 msgstr "Kan ikke sette utlÃ¸psdato"
 
-#: js/share.js:609
+#: js/share.js:604
 msgid "Sending ..."
 msgstr "Sender..."
 
-#: js/share.js:620
+#: js/share.js:615
 msgid "Email sent"
 msgstr "E-post sendt"
 
@@ -401,24 +396,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:41
-#: 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"
 
@@ -475,115 +473,129 @@ msgid "Add"
 msgstr "Legg til"
 
 #: templates/installation.php:24 templates/installation.php:31
+#: templates/installation.php:38
 msgid "Security Warning"
 msgstr "Sikkerhetsadvarsel"
 
 #: 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:33
+#: 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:37
+#: templates/installation.php:44
 msgid "Create an <strong>admin account</strong>"
 msgstr "opprett en <strong>administrator-konto</strong>"
 
-#: templates/installation.php:55
+#: templates/installation.php:62
 msgid "Advanced"
 msgstr "Avansert"
 
-#: templates/installation.php:57
+#: templates/installation.php:64
 msgid "Data folder"
 msgstr "Datamappe"
 
-#: templates/installation.php:66
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "Konfigurer databasen"
 
-#: templates/installation.php:71 templates/installation.php:83
-#: templates/installation.php:94 templates/installation.php:105
-#: templates/installation.php:117
+#: 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:129
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "Databasebruker"
 
-#: templates/installation.php:134
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "Databasepassord"
 
-#: templates/installation.php:139
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "Databasenavn"
 
-#: templates/installation.php:149
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "Database tabellomrÃ¥de"
 
-#: templates/installation.php:156
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "Databasevert"
 
-#: templates/installation.php:162
+#: 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:36
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr ""
 
-#: templates/layout.user.php:58
+#: templates/layout.user.php:61
 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 eb634477210f945367a6103b29387493471367c7..f1431fbd1f320a8eb41a81c0fc94a9ccee33c11c 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-03-08 00:25+0100\n"
-"PO-Revision-Date: 2013-03-07 21:30+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-20 02:01+0200\n"
+"PO-Revision-Date: 2013-05-19 23:00+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,68 +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:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
-msgstr ""
+msgstr "Ugyldig katalog."
 
-#: appinfo/app.php:10
+#: 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:92 templates/index.php:93
+#: 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/files.js:293 js/files.js:409
-#: js/files.js:440
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "Ventende"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} finnes allerede"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "erstatt"
 
-#: js/filelist.js:251
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "foreslÃ¥ navn"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "avbryt"
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "erstatt {new_name} med {old_name}"
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "undo"
 msgstr "angre"
 
-#: js/filelist.js:323
+#: js/filelist.js:331
 msgid "perform delete operation"
-msgstr ""
+msgstr "utfÃ¸r sletting"
+
+#: js/filelist.js:413
+msgid "1 file uploading"
+msgstr "1 fil lastes opp"
+
+#: js/filelist.js:416 js/filelist.js:470
+msgid "files uploading"
+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 ""
@@ -148,83 +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:263
+#: 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:263
-msgid "Upload Error"
-msgstr "Opplasting feilet"
-
-#: js/files.js:274
-msgid "Close"
-msgstr "Lukk"
-
-#: js/files.js:313
-msgid "1 file uploading"
-msgstr "1 fil lastes opp"
-
-#: js/files.js:316 js/files.js:371 js/files.js:386
-msgid "{count} files uploading"
-msgstr "{count} filer laster opp"
+#: js/files.js:277
+msgid "Not enough space available"
+msgstr "Ikke nok lagringsplass"
 
-#: js/files.js:389 js/files.js:424
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "Opplasting avbrutt."
 
-#: js/files.js:498
+#: 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:571
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "URL-en kan ikke vÃ¦re tom."
 
-#: js/files.js:576
+#: 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:520 js/files.js:536 js/files.js:826 js/files.js:864
+msgid "Error"
+msgstr "Feil"
 
-#: js/files.js:954 templates/index.php:68
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Navn"
 
-#: js/files.js:955 templates/index.php:79
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "StÃ¸rrelse"
 
-#: js/files.js:956 templates/index.php:81
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Endret"
 
-#: js/files.js:975
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 mappe"
 
-#: js/files.js:977
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} mapper"
 
-#: js/files.js:985
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 fil"
 
-#: js/files.js:987
+#: 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"
@@ -277,48 +276,48 @@ msgstr "Mappe"
 msgid "From link"
 msgstr "Fra link"
 
-#: templates/index.php:40
+#: templates/index.php:42
 msgid "Deleted files"
-msgstr ""
+msgstr "Slettet filer"
 
-#: templates/index.php:46
+#: templates/index.php:48
 msgid "Cancel upload"
 msgstr "Avbryt opplasting"
 
-#: templates/index.php:53
+#: templates/index.php:54
 msgid "You donâ€™t have write permissions here."
-msgstr ""
+msgstr "Du har ikke skrivetilgang her."
 
-#: templates/index.php:60
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Ingenting her. Last opp noe!"
 
-#: templates/index.php:74
+#: templates/index.php:75
 msgid "Download"
 msgstr "Last ned"
 
-#: templates/index.php:86 templates/index.php:87
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Avslutt deling"
 
-#: templates/index.php:106
+#: templates/index.php:107
 msgid "Upload too large"
-msgstr "Opplasting for stor"
+msgstr "Filen er for stor"
 
-#: templates/index.php:108
+#: 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:113
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Skanner etter filer, vennligst vent."
 
-#: templates/index.php:116
+#: 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..7fca6d39803889869d180f49cf19d55f56a91f53 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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"
diff --git a/l10n/nb_NO/files_external.po b/l10n/nb_NO/files_external.po
index 5ce4c85c3bcfcad036e47763e2d152aa862ed66a..476b81ff07fe9b0ce144c6a4f8a43e7edd9733d7 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-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-20 02:01+0200\n"
+"PO-Revision-Date: 2013-05-19 12:20+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: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 ""
+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: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 ""
+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..ab1517bb3f17dc83f7eda8885609946f02d8b915 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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 19998898cf628034a8419dadb421d44f8527cd6e..9ee75563d8e9d0b6094eef12d6fcbfa94e48ef1c 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-03-08 00:25+0100\n"
-"PO-Revision-Date: 2013-03-07 23:25+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-20 02:01+0200\n"
+"PO-Revision-Date: 2013-05-19 12:10+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"
@@ -18,12 +18,12 @@ msgstr ""
 "Language: nb_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:40
+#: ajax/delete.php:42
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "Kunne ikke slette %s fullstendig"
 
-#: ajax/undelete.php:41
+#: ajax/undelete.php:42
 #, php-format
 msgid "Couldn't restore %s"
 msgstr "Kunne ikke gjenopprette %s"
@@ -32,6 +32,10 @@ msgstr "Kunne ikke gjenopprette %s"
 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
+msgid "Error"
+msgstr "Feil"
+
 #: js/trash.js:34
 msgid "delete file permanently"
 msgstr "slett filer permanent"
@@ -78,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..2c4717260acc2809872e7715f812424f5bd08d02 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:30+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 37a6960c9820962bf9ee97ca2622720c8628c173..38770e18e43bbc3d4521917dc9f5316a7b912f85 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-03-07 00:16+0100\n"
-"PO-Revision-Date: 2013-03-06 10:30+0000\n"
+"POT-Creation-Date: 2013-05-20 02:03+0200\n"
+"PO-Revision-Date: 2013-05-19 23:30+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"
@@ -46,19 +41,19 @@ msgstr "Apper"
 msgid "Admin"
 msgstr "Admin"
 
-#: files.php:202
+#: files.php:207
 msgid "ZIP download is turned off."
 msgstr "ZIP-nedlasting av avslÃ¥tt"
 
-#: files.php:203
+#: files.php:208
 msgid "Files need to be downloaded one by one."
 msgstr "Filene mÃ¥ lastes ned en om gangen"
 
-#: files.php:204 files.php:231
+#: files.php:209 files.php:242
 msgid "Back to Files"
 msgstr "Tilbake til filer"
 
-#: files.php:228
+#: files.php:239
 msgid "Selected files too large to generate zip file."
 msgstr "De valgte filene er for store til Ã¥ kunne generere ZIP-fil"
 
@@ -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,75 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:128 setup.php:320 setup.php:365
+#: setup.php:132 setup.php:325 setup.php:370
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:129 setup.php:152 setup.php:229
+#: setup.php:133 setup.php:156 setup.php:234
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:151 setup.php:453 setup.php:520
+#: setup.php:155 setup.php:458 setup.php:525
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:228
+#: setup.php:233
 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: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:583 setup.php:592 setup.php:600 setup.php:609
+#: setup.php:615
 #, 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:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
+#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
+#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:299
+#: setup.php:304
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:300
+#: setup.php:305
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:305
+#: setup.php:310
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:306
+#: setup.php:311
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:579 setup.php:611
+#: setup.php:584 setup.php:616
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:631
+#: setup.php:636
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:849
+#: setup.php:859
 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:850
+#: setup.php:860
 #, 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 +229,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 840084f1dab9bf23f751a544a187ee44972b751d..2f581ebbee45f0d12fa28c0ccdfc8b364f317547 100644
--- a/l10n/nb_NO/settings.po
+++ b/l10n/nb_NO/settings.po
@@ -3,21 +3,14 @@
 # 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-03-08 00:25+0100\n"
-"PO-Revision-Date: 2013-03-07 21:30+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-20 02:05+0200\n"
+"PO-Revision-Date: 2013-05-19 23:30+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,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,86 +87,86 @@ 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"
 msgstr "SlÃ¥ avBehandle "
 
-#: js/apps.js:36 js/apps.js:64
+#: 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:84
-msgid "Updating...."
-msgstr ""
-
-#: js/apps.js:87
-msgid "Error while updating app"
-msgstr ""
-
-#: js/apps.js:87
+#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
 msgid "Error"
 msgstr "Feil"
 
 #: js/apps.js:90
+msgid "Updating...."
+msgstr "Oppdaterer..."
+
+#: js/apps.js:93
+msgid "Error while updating app"
+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:30
+#: js/users.js:47
 msgid "deleted"
 msgstr "slettet"
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "undo"
 msgstr "angre"
 
-#: js/users.js:62
+#: js/users.js:79
 msgid "Unable to remove user"
-msgstr ""
+msgstr "Kunne ikke slette bruker"
 
-#: js/users.js:75 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
+#: templates/users.php:103
 msgid "Groups"
 msgstr "Grupper"
 
-#: js/users.js:78 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr "Gruppeadministrator"
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "Slett"
 
-#: js/users.js:191
+#: js/users.js:269
 msgid "add group"
-msgstr ""
+msgstr "legg til gruppe"
 
-#: js/users.js:352
+#: js/users.js:420
 msgid "A valid username must be provided"
-msgstr ""
+msgstr "Oppgi et gyldig brukernavn"
 
-#: js/users.js:353 js/users.js:359 js/users.js:374
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
-msgstr ""
+msgstr "Feil ved oppretting av bruker"
 
-#: js/users.js:358
+#: js/users.js:426
 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,100 +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:230 templates/personal.php:102
+#: templates/admin.php:228
+msgid "Less"
+msgstr "Mindre"
+
+#: templates/admin.php:235 templates/personal.php:105
 msgid "Version"
 msgstr "Versjon"
 
-#: templates/admin.php:233 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 "
@@ -336,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"
@@ -356,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"
@@ -372,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"
@@ -397,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:77
 msgid "Password"
 msgstr "Passord"
 
@@ -423,82 +424,70 @@ msgstr "Nytt passord"
 msgid "Change password"
 msgstr "Endre passord"
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:76
 msgid "Display Name"
-msgstr ""
+msgstr "Visningsnavn"
 
-#: 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 "E-post"
+msgstr "Epost"
 
-#: templates/personal.php:72
+#: templates/personal.php:70
 msgid "Your email address"
 msgstr "Din e-postadresse"
 
-#: templates/personal.php:73
+#: templates/personal.php:71
 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:77 templates/personal.php:78
 msgid "Language"
 msgstr "SprÃ¥k"
 
-#: templates/personal.php:86
+#: templates/personal.php:89
 msgid "Help translate"
 msgstr "Bidra til oversettelsen"
 
-#: templates/personal.php:91
+#: templates/personal.php:94
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:93
+#: templates/personal.php:96
 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:75
 msgid "Login Name"
-msgstr ""
+msgstr "Logginn navn"
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr "Opprett"
 
-#: templates/users.php:35
+#: templates/users.php:33
 msgid "Default Storage"
-msgstr ""
+msgstr "Standard lager"
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:39 templates/users.php:133
 msgid "Unlimited"
-msgstr ""
+msgstr "Ubegrenset"
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:57 templates/users.php:148
 msgid "Other"
 msgstr "Annet"
 
-#: templates/users.php:84
+#: templates/users.php:82
 msgid "Storage"
-msgstr ""
+msgstr "Lager"
 
-#: templates/users.php:95
+#: templates/users.php:93
 msgid "change display name"
-msgstr ""
+msgstr "endre visningsnavn"
 
-#: templates/users.php:99
+#: templates/users.php:97
 msgid "set new password"
-msgstr ""
+msgstr "sett nytt passord"
 
-#: templates/users.php:134
+#: templates/users.php:128
 msgid "Default"
-msgstr ""
+msgstr "Standard"
diff --git a/l10n/nb_NO/user_ldap.po b/l10n/nb_NO/user_ldap.po
index ba8a8273f6b6eba96fd103990fa2b1a6d8cc54b9..f6e688d10288a6abcd498635111f37d21de3e9bb 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-08 00:25+0100\n"
-"PO-Revision-Date: 2013-03-07 22:10+0000\n"
-"Last-Translator: MorphyNOR <ivar.bredesen@gmail.com>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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..0bdc4ebc7b0a95be907bd7ef958c7d06ab4f4b87 100644
--- a/l10n/nb_NO/user_webdavauth.po
+++ b/l10n/nb_NO/user_webdavauth.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Norwegian BokmÃ¥l (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -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
new file mode 100644
index 0000000000000000000000000000000000000000..c5b6a57bbb9d82825326a5c5d07057acf67c0bca
--- /dev/null
+++ b/l10n/ne/core.po
@@ -0,0 +1,613 @@
+# 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-04-30 01:57+0200\n"
+"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ne\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\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 ""
+
+#: 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 js/oc-dialogs.js:247
+msgid "Ok"
+msgstr ""
+
+#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:185
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:215
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:222
+msgid "No"
+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: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/ne/files.po b/l10n/ne/files.po
new file mode 100644
index 0000000000000000000000000000000000000000..a20804fbfeb8deb6bf233ed23d445177451ffd2f
--- /dev/null
+++ b/l10n/ne/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-05-15 01:59+0200\n"
+"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ne\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 ""
+
+#: 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/ne/files_encryption.po b/l10n/ne/files_encryption.po
new file mode 100644
index 0000000000000000000000000000000000000000..4eb8d284c4d50494901250cbd98b39c399fc2167
--- /dev/null
+++ b/l10n/ne/files_encryption.po
@@ -0,0 +1,38 @@
+# 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-04-26 10:00+0200\n"
+"PO-Revision-Date: 2013-04-26 08:01+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"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ne\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: templates/settings-personal.php:4 templates/settings.php:5
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings-personal.php:7
+msgid "File encryption is enabled."
+msgstr ""
+
+#: templates/settings-personal.php:11
+msgid "The following file types will not be encrypted:"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Exclude the following file types from encryption:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "None"
+msgstr ""
diff --git a/l10n/ne/files_external.po b/l10n/ne/files_external.po
new file mode 100644
index 0000000000000000000000000000000000000000..5b2e2ed5979eb376d8b0a022c5df7fa5c20fed2a
--- /dev/null
+++ b/l10n/ne/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-04-26 10:00+0200\n"
+"PO-Revision-Date: 2013-04-26 08:01+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"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ne\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/ne/files_sharing.po b/l10n/ne/files_sharing.po
new file mode 100644
index 0000000000000000000000000000000000000000..6905b432c8e1101f84f0ade4d4b7e4ac231c8179
--- /dev/null
+++ b/l10n/ne/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-04-26 10:00+0200\n"
+"PO-Revision-Date: 2013-04-26 08:01+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"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ne\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\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/ne/files_trashbin.po b/l10n/ne/files_trashbin.po
new file mode 100644
index 0000000000000000000000000000000000000000..3775730782dc5ca8985aa092aedbeb55fa3904ca
--- /dev/null
+++ b/l10n/ne/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-04-26 10:00+0200\n"
+"PO-Revision-Date: 2013-04-26 08:01+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"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ne\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/ne/files_versions.po b/l10n/ne/files_versions.po
new file mode 100644
index 0000000000000000000000000000000000000000..3f57c723bc3abd10fe29f061481d69a391aaa5af
--- /dev/null
+++ b/l10n/ne/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-04-26 10:00+0200\n"
+"PO-Revision-Date: 2013-04-26 08: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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ne\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/ne/lib.po b/l10n/ne/lib.po
new file mode 100644
index 0000000000000000000000000000000000000000..bf5c92bdbfc36fff7ec93f983410910e132430e4
--- /dev/null
+++ b/l10n/ne/lib.po
@@ -0,0 +1,241 @@
+# 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-04-28 01:57+0200\n"
+"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ne\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: app.php:349
+msgid "Help"
+msgstr ""
+
+#: app.php:362
+msgid "Personal"
+msgstr ""
+
+#: app.php:373
+msgid "Settings"
+msgstr ""
+
+#: app.php:385
+msgid "Users"
+msgstr ""
+
+#: app.php:398
+msgid "Apps"
+msgstr ""
+
+#: app.php:406
+msgid "Admin"
+msgstr ""
+
+#: files.php:209
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: files.php:210
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: files.php:211 files.php:244
+msgid "Back to Files"
+msgstr ""
+
+#: files.php:241
+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:325 setup.php:370
+msgid "PostgreSQL username and/or password not valid"
+msgstr ""
+
+#: setup.php:133 setup.php:156 setup.php:234
+msgid "You need to enter either an existing account or the administrator."
+msgstr ""
+
+#: setup.php:155 setup.php:458 setup.php:525
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:233
+msgid "MySQL username and/or password not valid"
+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:583 setup.php:592 setup.php:600 setup.php:609
+#: setup.php:615
+#, php-format
+msgid "DB Error: \"%s\""
+msgstr ""
+
+#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
+#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
+#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#, php-format
+msgid "Offending command was: \"%s\""
+msgstr ""
+
+#: setup.php:304
+#, php-format
+msgid "MySQL user '%s'@'localhost' exists already."
+msgstr ""
+
+#: setup.php:305
+msgid "Drop this user from MySQL"
+msgstr ""
+
+#: setup.php:310
+#, php-format
+msgid "MySQL user '%s'@'%%' already exists"
+msgstr ""
+
+#: setup.php:311
+msgid "Drop this user from MySQL."
+msgstr ""
+
+#: setup.php:584 setup.php:616
+#, php-format
+msgid "Offending command was: \"%s\", name: %s, password: %s"
+msgstr ""
+
+#: setup.php:636
+#, php-format
+msgid "MS SQL username and/or password not valid: %s"
+msgstr ""
+
+#: setup.php:858
+msgid ""
+"Your web server is not yet properly setup to allow files synchronization "
+"because the WebDAV interface seems to be broken."
+msgstr ""
+
+#: setup.php:859
+#, 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/ne/settings.po b/l10n/ne/settings.po
new file mode 100644
index 0000000000000000000000000000000000000000..20957a953ff991844e47cccacb193614f221628b
--- /dev/null
+++ b/l10n/ne/settings.po
@@ -0,0 +1,492 @@
+# 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-04-26 10:00+0200\n"
+"PO-Revision-Date: 2013-04-26 08:00+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ne\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:115
+msgid "Saving..."
+msgstr ""
+
+#: js/users.js:43
+msgid "deleted"
+msgstr ""
+
+#: js/users.js:43
+msgid "undo"
+msgstr ""
+
+#: js/users.js:75
+msgid "Unable to remove user"
+msgstr ""
+
+#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: templates/users.php:103
+msgid "Groups"
+msgstr ""
+
+#: js/users.js:91 templates/users.php:80 templates/users.php:115
+msgid "Group Admin"
+msgstr ""
+
+#: js/users.js:111 templates/users.php:155
+msgid "Delete"
+msgstr ""
+
+#: js/users.js:262
+msgid "add group"
+msgstr ""
+
+#: js/users.js:414
+msgid "A valid username must be provided"
+msgstr ""
+
+#: js/users.js:415 js/users.js:421 js/users.js:436
+msgid "Error creating user"
+msgstr ""
+
+#: js/users.js:420
+msgid "A valid password must be provided"
+msgstr ""
+
+#: personal.php:29 personal.php:30
+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:100
+msgid "Version"
+msgstr ""
+
+#: templates/admin.php:238 templates/personal.php:103
+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:77
+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:76
+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:84
+msgid "Help translate"
+msgstr ""
+
+#: templates/personal.php:89
+msgid "WebDAV"
+msgstr ""
+
+#: templates/personal.php:91
+msgid "Use this address to connect to your ownCloud in your file manager"
+msgstr ""
+
+#: templates/users.php:21 templates/users.php:75
+msgid "Login Name"
+msgstr ""
+
+#: templates/users.php:30
+msgid "Create"
+msgstr ""
+
+#: templates/users.php:33
+msgid "Default Storage"
+msgstr ""
+
+#: templates/users.php:39 templates/users.php:133
+msgid "Unlimited"
+msgstr ""
+
+#: templates/users.php:57 templates/users.php:148
+msgid "Other"
+msgstr ""
+
+#: templates/users.php:82
+msgid "Storage"
+msgstr ""
+
+#: templates/users.php:93
+msgid "change display name"
+msgstr ""
+
+#: templates/users.php:97
+msgid "set new password"
+msgstr ""
+
+#: templates/users.php:128
+msgid "Default"
+msgstr ""
diff --git a/l10n/ne/user_ldap.po b/l10n/ne/user_ldap.po
new file mode 100644
index 0000000000000000000000000000000000000000..8bc9905662c9c164b41b0c160b335439c090844a
--- /dev/null
+++ b/l10n/ne/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-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-17 00:04+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"
+"Content-Transfer-Encoding: 8bit\n"
+"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 ""
+
+#: ajax/testConfiguration.php:36
+msgid "The configuration is valid and the connection could be established!"
+msgstr ""
+
+#: ajax/testConfiguration.php:39
+msgid ""
+"The configuration is valid, but the Bind failed. Please check the server "
+"settings and credentials."
+msgstr ""
+
+#: ajax/testConfiguration.php:43
+msgid ""
+"The configuration is invalid. Please look in the ownCloud log for further "
+"details."
+msgstr ""
+
+#: js/settings.js:66
+msgid "Deletion failed"
+msgstr ""
+
+#: js/settings.js:82
+msgid "Take over settings from recent server configuration?"
+msgstr ""
+
+#: js/settings.js:83
+msgid "Keep settings?"
+msgstr ""
+
+#: js/settings.js:97
+msgid "Cannot add server configuration"
+msgstr ""
+
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
+msgid "Connection test succeeded"
+msgstr ""
+
+#: js/settings.js:146
+msgid "Connection test failed"
+msgstr ""
+
+#: js/settings.js:156
+msgid "Do you really want to delete the current Server Configuration?"
+msgstr ""
+
+#: js/settings.js:157
+msgid "Confirm Deletion"
+msgstr ""
+
+#: templates/settings.php:9
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:12
+msgid ""
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:16
+msgid "Server configuration"
+msgstr ""
+
+#: templates/settings.php:32
+msgid "Add Server Configuration"
+msgstr ""
+
+#: templates/settings.php:37
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:40
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:41
+msgid "One Base DN per line"
+msgstr ""
+
+#: templates/settings.php:42
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:44
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:46
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:47
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:50
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:51
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:54
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:55
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:56
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:59
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:60
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:61
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:65
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Connection Settings"
+msgstr ""
+
+#: templates/settings.php:71
+msgid "Configuration Active"
+msgstr ""
+
+#: templates/settings.php:71
+msgid "When unchecked, this configuration will be skipped."
+msgstr ""
+
+#: templates/settings.php:72
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:73
+msgid "Backup (Replica) Host"
+msgstr ""
+
+#: templates/settings.php:73
+msgid ""
+"Give an optional backup host. It must be a replica of the main LDAP/AD "
+"server."
+msgstr ""
+
+#: templates/settings.php:74
+msgid "Backup (Replica) Port"
+msgstr ""
+
+#: templates/settings.php:75
+msgid "Disable Main Server"
+msgstr ""
+
+#: templates/settings.php:75
+msgid "When switched on, ownCloud will only connect to the replica server."
+msgstr ""
+
+#: templates/settings.php:76
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:76
+msgid "Do not use it additionally for LDAPS connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:77
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:78
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:78
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:78
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:79
+msgid "Cache Time-To-Live"
+msgstr ""
+
+#: templates/settings.php:79
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:81
+msgid "Directory Settings"
+msgstr ""
+
+#: templates/settings.php:83
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:83
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:84
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:84
+msgid "One User Base DN per line"
+msgstr ""
+
+#: templates/settings.php:85
+msgid "User Search Attributes"
+msgstr ""
+
+#: templates/settings.php:85 templates/settings.php:88
+msgid "Optional; one attribute per line"
+msgstr ""
+
+#: templates/settings.php:86
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:86
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:87
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "One Group Base DN per line"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "Group Search Attributes"
+msgstr ""
+
+#: templates/settings.php:89
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "Special Attributes"
+msgstr ""
+
+#: templates/settings.php:93
+msgid "Quota Field"
+msgstr ""
+
+#: templates/settings.php:94
+msgid "Quota Default"
+msgstr ""
+
+#: templates/settings.php:94
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:95
+msgid "Email Field"
+msgstr ""
+
+#: templates/settings.php:96
+msgid "User Home Folder Naming Rule"
+msgstr ""
+
+#: templates/settings.php:96
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
+msgid "Test Configuration"
+msgstr ""
+
+#: templates/settings.php:111
+msgid "Help"
+msgstr ""
diff --git a/l10n/ne/user_webdavauth.po b/l10n/ne/user_webdavauth.po
new file mode 100644
index 0000000000000000000000000000000000000000..64e025a6bec99cad39026ad695d31e51309f2266
--- /dev/null
+++ b/l10n/ne/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-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+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"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ne\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/nl/core.po b/l10n/nl/core.po
index 18f1551101b5c10e92ad11c12a8e5bbfd8698102..d35357a3ad3ac7030090e4f3e9e96e2183ae4da7 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-02-22 00:06+0100\n"
-"PO-Revision-Date: 2013-02-20 23:20+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:15+0000\n"
 "Last-Translator: AndrÃ© Koot <meneer@tken.net>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -31,24 +18,24 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:85
+#: ajax/share.php:97
 #, php-format
 msgid "User %s shared a file with you"
 msgstr "Gebruiker %s deelde een bestand met u"
 
-#: ajax/share.php:87
+#: ajax/share.php:99
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr "Gebruiker %s deelde een map met u"
 
-#: ajax/share.php:89
+#: ajax/share.php:101
 #, php-format
 msgid ""
 "User %s shared the file \"%s\" with you. It is available for download here: "
 "%s"
 msgstr "Gebruiker %s deelde bestand \"%s\" met u. Het is hier te downloaden: %s"
 
-#: ajax/share.php:91
+#: ajax/share.php:104
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -94,79 +81,79 @@ msgstr "Geen categorie geselecteerd voor verwijdering."
 msgid "Error removing %s from favorites."
 msgstr "Verwijderen %s van favorieten is mislukt."
 
-#: js/config.php:32
+#: js/config.php:34
 msgid "Sunday"
 msgstr "Zondag"
 
-#: js/config.php:32
+#: js/config.php:35
 msgid "Monday"
 msgstr "Maandag"
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Tuesday"
 msgstr "Dinsdag"
 
-#: js/config.php:32
+#: js/config.php:37
 msgid "Wednesday"
 msgstr "Woensdag"
 
-#: js/config.php:32
+#: js/config.php:38
 msgid "Thursday"
 msgstr "Donderdag"
 
-#: js/config.php:32
+#: js/config.php:39
 msgid "Friday"
 msgstr "Vrijdag"
 
-#: js/config.php:32
+#: js/config.php:40
 msgid "Saturday"
 msgstr "Zaterdag"
 
-#: js/config.php:33
+#: js/config.php:45
 msgid "January"
 msgstr "januari"
 
-#: js/config.php:33
+#: js/config.php:46
 msgid "February"
 msgstr "februari"
 
-#: js/config.php:33
+#: js/config.php:47
 msgid "March"
 msgstr "maart"
 
-#: js/config.php:33
+#: js/config.php:48
 msgid "April"
 msgstr "april"
 
-#: js/config.php:33
+#: js/config.php:49
 msgid "May"
 msgstr "mei"
 
-#: js/config.php:33
+#: js/config.php:50
 msgid "June"
 msgstr "juni"
 
-#: js/config.php:33
+#: js/config.php:51
 msgid "July"
 msgstr "juli"
 
-#: js/config.php:33
+#: js/config.php:52
 msgid "August"
 msgstr "augustus"
 
-#: js/config.php:33
+#: js/config.php:53
 msgid "September"
 msgstr "september"
 
-#: js/config.php:33
+#: js/config.php:54
 msgid "October"
 msgstr "oktober"
 
-#: js/config.php:33
+#: js/config.php:55
 msgid "November"
 msgstr "november"
 
-#: js/config.php:33
+#: js/config.php:56
 msgid "December"
 msgstr "december"
 
@@ -174,86 +161,88 @@ msgstr "december"
 msgid "Settings"
 msgstr "Instellingen"
 
-#: js/js.js:767
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "seconden geleden"
 
-#: js/js.js:768
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "1 minuut geleden"
 
-#: js/js.js:769
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr "{minutes} minuten geleden"
 
-#: js/js.js:770
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr "1 uur geleden"
 
-#: js/js.js:771
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr "{hours} uren geleden"
 
-#: js/js.js:772
+#: js/js.js:723
 msgid "today"
 msgstr "vandaag"
 
-#: js/js.js:773
+#: js/js.js:724
 msgid "yesterday"
 msgstr "gisteren"
 
-#: js/js.js:774
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr "{days} dagen geleden"
 
-#: js/js.js:775
+#: js/js.js:726
 msgid "last month"
 msgstr "vorige maand"
 
-#: js/js.js:776
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr "{months} maanden geleden"
 
-#: js/js.js:777
+#: js/js.js:728
 msgid "months ago"
 msgstr "maanden geleden"
 
-#: js/js.js:778
+#: js/js.js:729
 msgid "last year"
 msgstr "vorig jaar"
 
-#: js/js.js:779
+#: js/js.js:730
 msgid "years ago"
 msgstr "jaar geleden"
 
-#: js/oc-dialogs.js:126
-msgid "Choose"
-msgstr "Kies"
+#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
+msgid "Ok"
+msgstr "Ok"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
 msgid "Cancel"
-msgstr "Annuleren"
+msgstr "Annuleer"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "Nee"
+#: js/oc-dialogs.js:185
+msgid "Choose"
+msgstr "Kies"
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:215
 msgid "Yes"
 msgstr "Ja"
 
-#: js/oc-dialogs.js:180
-msgid "Ok"
-msgstr "Ok"
+#: js/oc-dialogs.js:222
+msgid "No"
+msgstr "Nee"
 
 #: 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 "Het object type is niet gespecificeerd."
 
-#: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:582
-#: js/share.js:594
+#: 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 "Fout"
 
@@ -265,127 +254,127 @@ msgstr "De app naam is niet gespecificeerd."
 msgid "The required file {file} is not installed!"
 msgstr "Het vereiste bestand {file} is niet geÃ¯nstalleerd!"
 
-#: js/share.js:29 js/share.js:43 js/share.js:90
+#: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr "Gedeeld"
 
-#: js/share.js:93
+#: js/share.js:90
 msgid "Share"
 msgstr "Delen"
 
-#: js/share.js:141 js/share.js:622
+#: js/share.js:125 js/share.js:617
 msgid "Error while sharing"
 msgstr "Fout tijdens het delen"
 
-#: js/share.js:152
+#: js/share.js:136
 msgid "Error while unsharing"
 msgstr "Fout tijdens het stoppen met delen"
 
-#: js/share.js:159
+#: js/share.js:143
 msgid "Error while changing permissions"
 msgstr "Fout tijdens het veranderen van permissies"
 
-#: js/share.js:168
+#: js/share.js:152
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Gedeeld met u en de groep {group} door {owner}"
 
-#: js/share.js:170
+#: js/share.js:154
 msgid "Shared with you by {owner}"
 msgstr "Gedeeld met u door {owner}"
 
-#: js/share.js:175
+#: js/share.js:159
 msgid "Share with"
 msgstr "Deel met"
 
-#: js/share.js:180
+#: js/share.js:164
 msgid "Share with link"
 msgstr "Deel met link"
 
-#: js/share.js:183
+#: js/share.js:167
 msgid "Password protect"
 msgstr "Wachtwoord beveiliging"
 
-#: js/share.js:185 templates/installation.php:44 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Wachtwoord"
 
-#: js/share.js:189
+#: js/share.js:173
 msgid "Email link to person"
 msgstr "E-mail link naar persoon"
 
-#: js/share.js:190
+#: js/share.js:174
 msgid "Send"
 msgstr "Versturen"
 
-#: js/share.js:194
+#: js/share.js:178
 msgid "Set expiration date"
 msgstr "Stel vervaldatum in"
 
-#: js/share.js:195
+#: js/share.js:179
 msgid "Expiration date"
 msgstr "Vervaldatum"
 
-#: js/share.js:227
+#: js/share.js:211
 msgid "Share via email:"
 msgstr "Deel via email:"
 
-#: js/share.js:229
+#: js/share.js:213
 msgid "No people found"
 msgstr "Geen mensen gevonden"
 
-#: js/share.js:256
+#: js/share.js:251
 msgid "Resharing is not allowed"
 msgstr "Verder delen is niet toegestaan"
 
-#: js/share.js:292
+#: js/share.js:287
 msgid "Shared in {item} with {user}"
 msgstr "Gedeeld in {item} met {user}"
 
-#: js/share.js:313
+#: js/share.js:308
 msgid "Unshare"
 msgstr "Stop met delen"
 
-#: js/share.js:325
+#: js/share.js:320
 msgid "can edit"
 msgstr "kan wijzigen"
 
-#: js/share.js:327
+#: js/share.js:322
 msgid "access control"
 msgstr "toegangscontrole"
 
-#: js/share.js:330
+#: js/share.js:325
 msgid "create"
-msgstr "maak"
+msgstr "creÃ«er"
 
-#: js/share.js:333
+#: js/share.js:328
 msgid "update"
 msgstr "bijwerken"
 
-#: js/share.js:336
+#: js/share.js:331
 msgid "delete"
 msgstr "verwijderen"
 
-#: js/share.js:339
+#: js/share.js:334
 msgid "share"
 msgstr "deel"
 
-#: js/share.js:373 js/share.js:569
+#: js/share.js:368 js/share.js:564
 msgid "Password protected"
 msgstr "Wachtwoord beveiligd"
 
-#: js/share.js:582
+#: js/share.js:577
 msgid "Error unsetting expiration date"
 msgstr "Fout tijdens het verwijderen van de verval datum"
 
-#: js/share.js:594
+#: js/share.js:589
 msgid "Error setting expiration date"
 msgstr "Fout tijdens het instellen van de vervaldatum"
 
-#: js/share.js:609
+#: js/share.js:604
 msgid "Sending ..."
 msgstr "Versturen ..."
 
-#: js/share.js:620
+#: js/share.js:615
 msgid "Email sent"
 msgstr "E-mail verzonden"
 
@@ -408,24 +397,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:39
-#: 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"
 
@@ -439,7 +431,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"
@@ -475,121 +467,136 @@ 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"
 msgstr "Toevoegen"
 
-#: templates/installation.php:23 templates/installation.php:30
+#: templates/installation.php:24 templates/installation.php:31
+#: templates/installation.php:38
 msgid "Security Warning"
 msgstr "Beveiligingswaarschuwing"
 
-#: templates/installation.php:24
+#: templates/installation.php:25
+msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
+msgstr "Uw PHP versie is kwetsbaar voor de NULL byte aanval (CVE-2006-7243)"
+
+#: templates/installation.php:26
+msgid "Please update your PHP installation to use ownCloud securely."
+msgstr "Werk uw PHP installatie bij om ownCloud veilig te kunnen gebruiken."
+
+#: templates/installation.php:32
 msgid ""
 "No secure random number generator is available, please enable the PHP "
 "OpenSSL extension."
 msgstr "Er kon geen willekeurig nummer worden gegenereerd. Zet de PHP OpenSSL extentie aan."
 
-#: templates/installation.php:25
+#: templates/installation.php:33
 msgid ""
 "Without a secure random number generator an attacker may be able to predict "
 "password reset tokens and take over your account."
 msgstr "Zonder random nummer generator is het mogelijk voor een aanvaller om de reset tokens van wachtwoorden te voorspellen. Dit kan leiden tot het inbreken op uw account."
 
-#: templates/installation.php:31
+#: templates/installation.php:39
 msgid ""
 "Your data directory and files are probably accessible from the internet "
 "because the .htaccess file does not work."
 msgstr "Uw gegevensdirectory en bestanden zijn vermoedelijk bereikbaar vanaf het internet omdat het .htaccess bestand niet werkt."
 
-#: templates/installation.php:32
+#: templates/installation.php:40
 msgid ""
 "For information how to properly configure your server, please see the <a "
 "href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" "
 "target=\"_blank\">documentation</a>."
 msgstr "Informatie over het configureren van uw server is hier te vinden <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentatie</a>."
 
-#: templates/installation.php:36
+#: templates/installation.php:44
 msgid "Create an <strong>admin account</strong>"
 msgstr "Maak een <strong>beheerdersaccount</strong> aan"
 
-#: templates/installation.php:52
+#: templates/installation.php:62
 msgid "Advanced"
 msgstr "Geavanceerd"
 
-#: templates/installation.php:54
+#: templates/installation.php:64
 msgid "Data folder"
 msgstr "Gegevensmap"
 
-#: templates/installation.php:61
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "Configureer de database"
 
-#: templates/installation.php:66 templates/installation.php:77
-#: templates/installation.php:87 templates/installation.php:97
+#: 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:109
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "Gebruiker database"
 
-#: templates/installation.php:113
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "Wachtwoord database"
 
-#: templates/installation.php:117
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "Naam database"
 
-#: templates/installation.php:125
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "Database tablespace"
 
-#: templates/installation.php:131
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "Database server"
 
-#: templates/installation.php:136
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "Installatie afronden"
 
-#: templates/layout.guest.php:33
+#: templates/layout.guest.php:40
 msgid "web services under your control"
 msgstr "Webdiensten in eigen beheer"
 
-#: templates/layout.user.php:48
+#: templates/layout.user.php:36
+#, 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:61
 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 5443fe2eb4a425ab8789f450205a0e1b5b78bf3f..c394fb203c9d31a9288190867c2912dfa1b9c488 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-03-06 00:07+0100\n"
-"PO-Revision-Date: 2013-03-05 20:10+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:15+0000\n"
 "Last-Translator: AndrÃ© Koot <meneer@tken.net>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -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"
@@ -82,59 +67,70 @@ msgstr "Schrijven naar schijf mislukt"
 msgid "Not enough storage available"
 msgstr "Niet genoeg opslagruimte beschikbaar"
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr "Ongeldige directory."
 
-#: appinfo/app.php:10
+#: appinfo/app.php:12
 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:92 templates/index.php:93
+#: 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/files.js:292 js/files.js:408
-#: js/files.js:439
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
-msgstr "Wachten"
+msgstr "In behandeling"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} bestaat al"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "vervang"
 
-#: js/filelist.js:251
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "Stel een naam voor"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "annuleren"
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "verving {new_name} met {old_name}"
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "undo"
 msgstr "ongedaan maken"
 
-#: js/filelist.js:323
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr "uitvoeren verwijderactie"
 
+#: js/filelist.js:413
+msgid "1 file uploading"
+msgstr "1 bestand wordt ge-upload"
+
+#: js/filelist.js:416 js/filelist.js:470
+msgid "files uploading"
+msgstr "bestanden aan het uploaden"
+
 #: js/files.js:52
 msgid "'.' is an invalid file name."
 msgstr "'.' is een ongeldige bestandsnaam."
@@ -157,80 +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:225
+#: 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:262
+#: 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"
-
-#: js/files.js:262
-msgid "Upload Error"
-msgstr "Upload Fout"
+msgstr "Het lukt niet om uw bestand te uploaded, omdat het een folder of 0 bytes is"
 
-#: js/files.js:273
-msgid "Close"
-msgstr "Sluit"
+#: js/files.js:277
+msgid "Not enough space available"
+msgstr "Niet genoeg ruimte beschikbaar"
 
-#: js/files.js:312
-msgid "1 file uploading"
-msgstr "1 bestand wordt ge-upload"
-
-#: js/files.js:315 js/files.js:370 js/files.js:385
-msgid "{count} files uploading"
-msgstr "{count} bestanden aan het uploaden"
-
-#: js/files.js:388 js/files.js:423
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "Uploaden geannuleerd."
 
-#: js/files.js:497
+#: 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:570
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "URL kan niet leeg zijn."
 
-#: js/files.js:575
+#: 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:953 templates/index.php:68
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+msgid "Error"
+msgstr "Fout"
+
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Naam"
 
-#: js/files.js:954 templates/index.php:79
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
-msgstr "Bestandsgrootte"
+msgstr "Grootte"
 
-#: js/files.js:955 templates/index.php:81
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
-msgstr "Laatst aangepast"
+msgstr "Aangepast"
 
-#: js/files.js:974
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 map"
 
-#: js/files.js:976
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} mappen"
 
-#: js/files.js:984
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 bestand"
 
-#: js/files.js:986
+#: 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"
@@ -262,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"
@@ -280,45 +276,45 @@ msgstr "Map"
 msgid "From link"
 msgstr "Vanaf link"
 
-#: templates/index.php:40
+#: templates/index.php:42
 msgid "Deleted files"
 msgstr "Verwijderde bestanden"
 
-#: templates/index.php:46
+#: templates/index.php:48
 msgid "Cancel upload"
 msgstr "Upload afbreken"
 
-#: templates/index.php:53
+#: templates/index.php:54
 msgid "You donâ€™t have write permissions here."
 msgstr "U hebt hier geen schrijfpermissies."
 
-#: templates/index.php:60
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Er bevindt zich hier niets. Upload een bestand!"
 
-#: templates/index.php:74
+#: templates/index.php:75
 msgid "Download"
-msgstr "Download"
+msgstr "Downloaden"
 
-#: templates/index.php:86 templates/index.php:87
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
-msgstr "Stop delen"
+msgstr "Stop met delen"
 
-#: templates/index.php:106
+#: templates/index.php:107
 msgid "Upload too large"
-msgstr "Bestanden te groot"
+msgstr "Upload is te groot"
 
-#: templates/index.php:108
+#: 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:113
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Bestanden worden gescand, even wachten."
 
-#: templates/index.php:116
+#: 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..548a5be15bdcebd98603b1bce1decfb528fd8a77 100644
--- a/l10n/nl/files_encryption.po
+++ b/l10n/nl/files_encryption.po
@@ -3,15 +3,12 @@
 # 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.
 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/nl/files_external.po b/l10n/nl/files_external.po
index 3c135ef3441c5a2cc3cc116b33678f13ebcda74a..13735200722d942d5c6041d3b6d4f9e6f48bde4f 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-06 00:07+0100\n"
-"PO-Revision-Date: 2013-03-05 20:10+0000\n"
+"POT-Creation-Date: 2013-04-29 01:58+0200\n"
+"PO-Revision-Date: 2013-04-28 06:30+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: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 "<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: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 "<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..75628354dc97ba75d328f79b850a53610c7e843f 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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 a20ba8e0e4d55c1e5e23a2b71a5edf5ee76d9696..ba389cde31c97a8de421f112b6f7d0ed82f96f77 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-03-08 00:25+0100\n"
-"PO-Revision-Date: 2013-03-07 23:25+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -18,12 +17,12 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:40
+#: ajax/delete.php:42
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "Kon %s niet permanent verwijderen"
 
-#: ajax/undelete.php:41
+#: ajax/undelete.php:42
 #, php-format
 msgid "Couldn't restore %s"
 msgstr "Kon %s niet herstellen"
@@ -32,6 +31,10 @@ msgstr "Kon %s niet herstellen"
 msgid "perform restore operation"
 msgstr "uitvoeren restore operatie"
 
+#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+msgid "Error"
+msgstr "Fout"
+
 #: js/trash.js:34
 msgid "delete file permanently"
 msgstr "verwijder bestanden definitief"
@@ -78,4 +81,4 @@ msgstr "Verwijder"
 
 #: templates/part.breadcrumb.php:9
 msgid "Deleted Files"
-msgstr ""
+msgstr "Verwijderde bestanden"
diff --git a/l10n/nl/files_versions.po b/l10n/nl/files_versions.po
index 87ba278235f1297e5af989dbc1490cdda272ae34..4b1bafb81fb1246b2966bfc3aa76073781484547 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:30+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 f226fcaff3af028727dbf47ca71ea502eb0d554b..c56862e9313c4b42630554ec9de4c03cada8401d 100644
--- a/l10n/nl/lib.po
+++ b/l10n/nl/lib.po
@@ -3,17 +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.
 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-04-28 01:57+0200\n"
+"PO-Revision-Date: 2013-04-27 23:57+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"
@@ -45,19 +41,19 @@ msgstr "Apps"
 msgid "Admin"
 msgstr "Beheerder"
 
-#: files.php:202
+#: files.php:209
 msgid "ZIP download is turned off."
 msgstr "ZIP download is uitgeschakeld."
 
-#: files.php:203
+#: files.php:210
 msgid "Files need to be downloaded one by one."
 msgstr "Bestanden moeten Ã©Ã©n voor Ã©Ã©n worden gedownload."
 
-#: files.php:204 files.php:231
+#: files.php:211 files.php:244
 msgid "Back to Files"
 msgstr "Terug naar bestanden"
 
-#: files.php:228
+#: files.php:241
 msgid "Selected files too large to generate zip file."
 msgstr "De geselecteerde bestanden zijn te groot om een zip bestand te maken."
 
@@ -97,10 +93,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,75 +113,75 @@ msgstr "%s er mogen geen puntjes in de databasenaam voorkomen"
 msgid "%s set the database host."
 msgstr "%s instellen databaseservernaam."
 
-#: setup.php:128 setup.php:320 setup.php:365
+#: setup.php:132 setup.php:325 setup.php:370
 msgid "PostgreSQL username and/or password not valid"
 msgstr "PostgreSQL gebruikersnaam en/of wachtwoord ongeldig"
 
-#: setup.php:129 setup.php:152 setup.php:229
+#: setup.php:133 setup.php:156 setup.php:234
 msgid "You need to enter either an existing account or the administrator."
 msgstr "Geef of een bestaand account op of het beheerdersaccount."
 
-#: setup.php:151 setup.php:453 setup.php:520
+#: setup.php:155 setup.php:458 setup.php:525
 msgid "Oracle username and/or password not valid"
 msgstr "Oracle gebruikersnaam en/of wachtwoord ongeldig"
 
-#: setup.php:228
+#: setup.php:233
 msgid "MySQL username and/or password not valid"
 msgstr "MySQL gebruikersnaam en/of wachtwoord ongeldig"
 
-#: 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: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:583 setup.php:592 setup.php:600 setup.php:609
+#: setup.php:615
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "DB Fout: \"%s\""
 
-#: 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:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
+#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
+#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "Onjuiste commande was: \"%s\""
 
-#: setup.php:299
+#: setup.php:304
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "MySQL gebruiker '%s'@'localhost' bestaat al."
 
-#: setup.php:300
+#: setup.php:305
 msgid "Drop this user from MySQL"
 msgstr "Verwijder deze gebruiker uit MySQL"
 
-#: setup.php:305
+#: setup.php:310
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "MySQL gebruiker '%s'@'%%' bestaat al"
 
-#: setup.php:306
+#: setup.php:311
 msgid "Drop this user from MySQL."
 msgstr "Verwijder deze gebruiker uit MySQL."
 
-#: setup.php:579 setup.php:611
+#: setup.php:584 setup.php:616
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Onjuiste commando was: \"%s\", naam: %s, wachtwoord: %s"
 
-#: setup.php:631
+#: setup.php:636
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr "MS SQL gebruikersnaam en/of wachtwoord niet geldig: %s"
 
-#: setup.php:849
+#: setup.php:858
 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:850
+#: setup.php:859
 #, 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."
 
 #: template.php:113
 msgid "seconds ago"
@@ -243,19 +235,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 595fce94d995fce69f9778ca632c4af753331150..24737684e099549a4a79783dc49a4cf157be2aa5 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-03-05 00:18+0100\n"
-"PO-Revision-Date: 2013-03-04 22:30+0000\n"
-"Last-Translator: Wilfred Dijksman <translate@wdijksman.nl>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:15+0000\n"
+"Last-Translator: AndrÃ© Koot <meneer@tken.net>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "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"
@@ -104,76 +97,76 @@ msgstr "Bijwerken naar {appversion}"
 msgid "Disable"
 msgstr "Uitschakelen"
 
-#: js/apps.js:36 js/apps.js:64
+#: 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...."
 msgstr "Even geduld aub...."
 
-#: js/apps.js:84
+#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+msgid "Error"
+msgstr "Fout"
+
+#: js/apps.js:90
 msgid "Updating...."
 msgstr "Bijwerken...."
 
-#: js/apps.js:87
+#: js/apps.js:93
 msgid "Error while updating app"
 msgstr "Fout bij bijwerken app"
 
-#: js/apps.js:87
-msgid "Error"
-msgstr "Fout"
-
-#: js/apps.js:90
+#: js/apps.js:96
 msgid "Updated"
 msgstr "Bijgewerkt"
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
-msgstr "Aan het bewaren....."
+msgstr "Opslaan"
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "deleted"
 msgstr "verwijderd"
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "undo"
 msgstr "ongedaan maken"
 
-#: js/users.js:62
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr "Kon gebruiker niet verwijderen"
 
-#: js/users.js:75 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
+#: templates/users.php:103
 msgid "Groups"
 msgstr "Groepen"
 
-#: js/users.js:78 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr "Groep beheerder"
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
-msgstr "verwijderen"
+msgstr "Verwijder"
 
-#: js/users.js:191
+#: js/users.js:269
 msgid "add group"
 msgstr "toevoegen groep"
 
-#: js/users.js:352
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr "Er moet een geldige gebruikersnaam worden opgegeven"
 
-#: js/users.js:353 js/users.js:359 js/users.js:374
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr "Fout bij aanmaken gebruiker"
 
-#: js/users.js:358
+#: js/users.js:426
 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"
@@ -225,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 "Deze ownCloud server kan de systeemtaal niet instellen op %s. Hierdoor kunnen er mogelijk problemen optreden met bepaalde karakters in bestandsnamen. Het wordt sterk aangeraden om de vereiste pakketen op uw systeem te installeren zodat %s ondersteund wordt."
+msgstr "Deze ownCloud server kan de systeemtaal niet instellen op %s. Hierdoor kunnen er mogelijk problemen optreden met bepaalde tekens in bestandsnamen. Het wordt sterk aangeraden om de vereiste pakketen op uw systeem te installeren zodat %s ondersteund wordt."
 
 #: templates/admin.php:75
 msgid "Internet connection not working"
@@ -324,15 +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:230 templates/personal.php:102
+#: templates/admin.php:228
+msgid "Less"
+msgstr "Minder"
+
+#: templates/admin.php:235 templates/personal.php:105
 msgid "Version"
 msgstr "Versie"
 
-#: templates/admin.php:233 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 "
@@ -403,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:77
 msgid "Password"
 msgstr "Wachtwoord"
 
@@ -421,88 +418,76 @@ 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:76
 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:68
 msgid "Email"
 msgstr "E-mailadres"
 
-#: templates/personal.php:72
+#: templates/personal.php:70
 msgid "Your email address"
 msgstr "Uw e-mailadres"
 
-#: templates/personal.php:73
+#: templates/personal.php:71
 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:77 templates/personal.php:78
 msgid "Language"
 msgstr "Taal"
 
-#: templates/personal.php:86
+#: templates/personal.php:89
 msgid "Help translate"
 msgstr "Help met vertalen"
 
-#: templates/personal.php:91
+#: templates/personal.php:94
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:93
+#: templates/personal.php:96
 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:75
 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:33
 msgid "Default Storage"
 msgstr "Default opslag"
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:39 templates/users.php:133
 msgid "Unlimited"
 msgstr "Ongelimiteerd"
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:57 templates/users.php:148
 msgid "Other"
-msgstr "Andere"
+msgstr "Anders"
 
-#: templates/users.php:84
+#: templates/users.php:82
 msgid "Storage"
 msgstr "Opslag"
 
-#: templates/users.php:95
+#: templates/users.php:93
 msgid "change display name"
 msgstr "wijzig weergavenaam"
 
-#: templates/users.php:99
+#: templates/users.php:97
 msgid "set new password"
 msgstr "Instellen nieuw wachtwoord"
 
-#: templates/users.php:134
+#: templates/users.php:128
 msgid "Default"
 msgstr "Default"
diff --git a/l10n/nl/user_ldap.po b/l10n/nl/user_ldap.po
index bc89175daac9baad8ddf6a49b8b810af83645efe..af11411cb64780d184689e2214f090b404d07408 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-06 00:07+0100\n"
-"PO-Revision-Date: 2013-03-05 20:10+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:15+0000\n"
 "Last-Translator: AndrÃ© Koot <meneer@tken.net>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -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:18
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr "Toevoegen serverconfiguratie"
 
-#: templates/settings.php:23
+#: templates/settings.php:37
 msgid "Host"
 msgstr "Host"
 
-#: templates/settings.php:25
+#: 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:26
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "Base DN"
 
-#: templates/settings.php:27
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr "Een Base DN per regel"
 
-#: templates/settings.php:28
+#: 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:30
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "User DN"
 
-#: 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 "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:33
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Wachtwoord"
 
-#: templates/settings.php:36
+#: 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:37
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "Gebruikers Login Filter"
 
-#: 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 "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:41
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "gebruik %%uid placeholder, bijv. \"uid=%%uid\""
 
-#: templates/settings.php:42
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Gebruikers Lijst Filter"
 
-#: templates/settings.php:45
+#: 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:46
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "zonder een placeholder, bijv. \"objectClass=person\""
 
-#: templates/settings.php:47
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "Groep Filter"
 
-#: templates/settings.php:50
+#: 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:51
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "zonder een placeholder, bijv. \"objectClass=posixGroup\""
 
-#: templates/settings.php:55
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr "Verbindingsinstellingen"
 
-#: templates/settings.php:57
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr "Configuratie actief"
 
-#: templates/settings.php:57
+#: 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:58
+#: templates/settings.php:72
 msgid "Port"
 msgstr "Poort"
 
-#: templates/settings.php:59
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr "Backup (Replica) Host"
 
-#: 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 "Opgeven optionele backup host. Het moet een replica van de hoofd LDAP/AD server."
 
-#: templates/settings.php:60
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr "Backup (Replica) Poort"
 
-#: templates/settings.php:61
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr "Deactiveren hoofdserver"
 
-#: templates/settings.php:61
+#: 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:62
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "Gebruik TLS"
 
-#: templates/settings.php:62
+#: 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:63
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Niet-hoofdlettergevoelige LDAP server (Windows)"
 
-#: templates/settings.php:64
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "Schakel SSL certificaat validatie uit."
 
-#: 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 "Als de connectie alleen werkt met deze optie, importeer dan het LDAP server SSL certificaat naar je ownCloud server."
 
-#: templates/settings.php:64
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "Niet aangeraden, gebruik alleen voor test doeleinden."
 
-#: templates/settings.php:65
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr "Cache time-to-live"
 
-#: templates/settings.php:65
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr "in seconden. Een verandering maakt de cache leeg."
 
-#: templates/settings.php:67
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr "Mapinstellingen"
 
-#: templates/settings.php:69
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr "Gebruikers Schermnaam Veld"
 
-#: templates/settings.php:69
+#: 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:70
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "Basis Gebruikers Structuur"
 
-#: templates/settings.php:70
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr "Een User Base DN per regel"
 
-#: templates/settings.php:71
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr "Attributen voor gebruikerszoekopdrachten"
 
-#: templates/settings.php:71 templates/settings.php:74
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr "Optioneel; Ã©Ã©n attribuut per regel"
 
-#: templates/settings.php:72
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr "Groep Schermnaam Veld"
 
-#: templates/settings.php:72
+#: 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:73
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "Basis Groupen Structuur"
 
-#: templates/settings.php:73
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr "Een Group Base DN per regel"
 
-#: templates/settings.php:74
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr "Attributen voor groepszoekopdrachten"
 
-#: templates/settings.php:75
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr "Groepslid associatie"
 
-#: templates/settings.php:77
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr "Speciale attributen"
 
-#: templates/settings.php:79
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr "Quota veld"
 
-#: templates/settings.php:80
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr "Quota standaard"
 
-#: templates/settings.php:80
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr "in bytes"
 
-#: templates/settings.php:81
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr "E-mailveld"
 
-#: templates/settings.php:82
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr "Gebruikers Home map naamgevingsregel"
 
-#: templates/settings.php:82
+#: 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:86
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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:86
+#: templates/settings.php:111
 msgid "Help"
 msgstr "Help"
diff --git a/l10n/nl/user_webdavauth.po b/l10n/nl/user_webdavauth.po
index 8606d6f3164523219f6ead10df2cff1de19e4bd4..90490f9dd961188f84f57796e7399c11b2c0f494 100644
--- a/l10n/nl/user_webdavauth.po
+++ b/l10n/nl/user_webdavauth.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-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-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+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 9146472fcc906eade2b326cf7279dd058b95cd8e..08adadd957a329e5a8e36ba7925cce904586167e 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-02-09 00:12+0100\n"
-"PO-Revision-Date: 2013-02-08 23:12+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10: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,401 +19,406 @@ msgstr ""
 "Language: nn_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:85
+#: 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:87
+#: 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:89
+#: 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:91
+#: 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:32
+#: js/config.php:34
 msgid "Sunday"
 msgstr "SÃ¸ndag"
 
-#: js/config.php:32
+#: js/config.php:35
 msgid "Monday"
 msgstr "MÃ¥ndag"
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Tuesday"
 msgstr "Tysdag"
 
-#: js/config.php:32
+#: js/config.php:37
 msgid "Wednesday"
 msgstr "Onsdag"
 
-#: js/config.php:32
+#: js/config.php:38
 msgid "Thursday"
 msgstr "Torsdag"
 
-#: js/config.php:32
+#: js/config.php:39
 msgid "Friday"
 msgstr "Fredag"
 
-#: js/config.php:32
+#: js/config.php:40
 msgid "Saturday"
 msgstr "Laurdag"
 
-#: js/config.php:33
+#: js/config.php:45
 msgid "January"
 msgstr "Januar"
 
-#: js/config.php:33
+#: js/config.php:46
 msgid "February"
 msgstr "Februar"
 
-#: js/config.php:33
+#: js/config.php:47
 msgid "March"
 msgstr "Mars"
 
-#: js/config.php:33
+#: js/config.php:48
 msgid "April"
 msgstr "April"
 
-#: js/config.php:33
+#: js/config.php:49
 msgid "May"
 msgstr "Mai"
 
-#: js/config.php:33
+#: js/config.php:50
 msgid "June"
 msgstr "Juni"
 
-#: js/config.php:33
+#: js/config.php:51
 msgid "July"
 msgstr "Juli"
 
-#: js/config.php:33
+#: js/config.php:52
 msgid "August"
 msgstr "August"
 
-#: js/config.php:33
+#: js/config.php:53
 msgid "September"
 msgstr "September"
 
-#: js/config.php:33
+#: js/config.php:54
 msgid "October"
 msgstr "Oktober"
 
-#: js/config.php:33
+#: js/config.php:55
 msgid "November"
 msgstr "November"
 
-#: js/config.php:33
+#: js/config.php:56
 msgid "December"
 msgstr "Desember"
 
-#: js/js.js:284
+#: js/js.js:286
 msgid "Settings"
 msgstr "Innstillingar"
 
-#: js/js.js:764
+#: js/js.js:718
 msgid "seconds ago"
-msgstr ""
+msgstr "sekund sidan"
 
-#: js/js.js:765
+#: js/js.js:719
 msgid "1 minute ago"
-msgstr ""
+msgstr "1 minutt sidan"
 
-#: js/js.js:766
+#: js/js.js:720
 msgid "{minutes} minutes ago"
-msgstr ""
+msgstr "{minutes} minutt sidan"
 
-#: js/js.js:767
+#: js/js.js:721
 msgid "1 hour ago"
-msgstr ""
+msgstr "1 time sidan"
 
-#: js/js.js:768
+#: js/js.js:722
 msgid "{hours} hours ago"
-msgstr ""
+msgstr "{hours} timar sidan"
 
-#: js/js.js:769
+#: js/js.js:723
 msgid "today"
-msgstr ""
+msgstr "i dag"
 
-#: js/js.js:770
+#: js/js.js:724
 msgid "yesterday"
-msgstr ""
+msgstr "i gÃ¥r"
 
-#: js/js.js:771
+#: js/js.js:725
 msgid "{days} days ago"
-msgstr ""
+msgstr "{days} dagar sidan"
 
-#: js/js.js:772
+#: js/js.js:726
 msgid "last month"
-msgstr ""
+msgstr "fÃ¸rre mÃ¥nad"
 
-#: js/js.js:773
+#: js/js.js:727
 msgid "{months} months ago"
-msgstr ""
+msgstr "{months} mÃ¥nadar sidan"
 
-#: js/js.js:774
+#: js/js.js:728
 msgid "months ago"
-msgstr ""
+msgstr "mÃ¥nadar sidan"
 
-#: js/js.js:775
+#: js/js.js:729
 msgid "last year"
-msgstr ""
+msgstr "i fjor"
 
-#: js/js.js:776
+#: js/js.js:730
 msgid "years ago"
-msgstr ""
+msgstr "Ã¥r sidan"
 
-#: js/oc-dialogs.js:126
-msgid "Choose"
-msgstr ""
+#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
+msgid "Ok"
+msgstr "Greitt"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
 msgid "Cancel"
-msgstr "Kanseller"
+msgstr "Avbryt"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr ""
+#: js/oc-dialogs.js:185
+msgid "Choose"
+msgstr "Vel"
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:215
 msgid "Yes"
-msgstr ""
+msgstr "Ja"
 
-#: js/oc-dialogs.js:180
-msgid "Ok"
-msgstr ""
+#: js/oc-dialogs.js:222
+msgid "No"
+msgstr "Nei"
 
 #: 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:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:571
-#: js/share.js:583
+#: 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 "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 ""
-
-#: js/share.js:29 js/share.js:43 js/share.js:90 js/share.js:93
-msgid "Share"
-msgstr ""
+msgstr "Den kravde fila {file} er ikkje installert!"
 
-#: js/share.js:29 js/share.js:43 js/share.js:90 js/share.js:93
+#: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
-msgstr ""
+msgstr "Delt"
+
+#: js/share.js:90
+msgid "Share"
+msgstr "Del"
 
-#: js/share.js:141 js/share.js:611
+#: js/share.js:125 js/share.js:617
 msgid "Error while sharing"
-msgstr ""
+msgstr "Feil ved deling"
 
-#: js/share.js:152
+#: js/share.js:136
 msgid "Error while unsharing"
-msgstr ""
+msgstr "Feil ved udeling"
 
-#: js/share.js:159
+#: js/share.js:143
 msgid "Error while changing permissions"
-msgstr ""
+msgstr "Feil ved endring av tillatingar"
 
-#: js/share.js:168
+#: 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:170
+#: js/share.js:154
 msgid "Shared with you by {owner}"
-msgstr ""
+msgstr "Delt med deg av {owner}"
 
-#: js/share.js:175
+#: js/share.js:159
 msgid "Share with"
-msgstr ""
+msgstr "Del med"
 
-#: js/share.js:180
+#: js/share.js:164
 msgid "Share with link"
-msgstr ""
+msgstr "Del med lenkje"
 
-#: js/share.js:183
+#: js/share.js:167
 msgid "Password protect"
-msgstr ""
+msgstr "Passordvern"
 
-#: js/share.js:185 templates/installation.php:44 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Passord"
 
-#: js/share.js:189
+#: js/share.js:173
 msgid "Email link to person"
-msgstr ""
+msgstr "Send lenkja over e-post"
 
-#: js/share.js:190
+#: js/share.js:174
 msgid "Send"
-msgstr ""
+msgstr "Send"
 
-#: js/share.js:194
+#: js/share.js:178
 msgid "Set expiration date"
-msgstr ""
+msgstr "Set utlÃ¸psdato"
 
-#: js/share.js:195
+#: js/share.js:179
 msgid "Expiration date"
-msgstr ""
+msgstr "UtlÃ¸psdato"
 
-#: js/share.js:227
+#: js/share.js:211
 msgid "Share via email:"
-msgstr ""
+msgstr "Del over e-post:"
 
-#: js/share.js:229
+#: js/share.js:213
 msgid "No people found"
-msgstr ""
+msgstr "Fann ingen personar"
 
-#: js/share.js:256
+#: js/share.js:251
 msgid "Resharing is not allowed"
-msgstr ""
+msgstr "Vidaredeling er ikkje tillate"
 
-#: js/share.js:292
+#: js/share.js:287
 msgid "Shared in {item} with {user}"
-msgstr ""
+msgstr "Delt i {item} med {brukar}"
 
-#: js/share.js:313
+#: js/share.js:308
 msgid "Unshare"
-msgstr ""
+msgstr "Udel"
 
-#: js/share.js:325
+#: js/share.js:320
 msgid "can edit"
-msgstr ""
+msgstr "kan endra"
 
-#: js/share.js:327
+#: js/share.js:322
 msgid "access control"
-msgstr ""
+msgstr "tilgangskontroll"
 
-#: js/share.js:330
+#: js/share.js:325
 msgid "create"
-msgstr ""
+msgstr "lag"
 
-#: js/share.js:333
+#: js/share.js:328
 msgid "update"
-msgstr ""
+msgstr "oppdater"
 
-#: js/share.js:336
+#: js/share.js:331
 msgid "delete"
-msgstr ""
+msgstr "slett"
 
-#: js/share.js:339
+#: js/share.js:334
 msgid "share"
-msgstr ""
+msgstr "del"
 
-#: js/share.js:373 js/share.js:558
+#: js/share.js:368 js/share.js:564
 msgid "Password protected"
-msgstr ""
+msgstr "Passordverna"
 
-#: js/share.js:571
+#: js/share.js:577
 msgid "Error unsetting expiration date"
-msgstr ""
+msgstr "Klarte ikkje fjerna utlÃ¸psdato"
 
-#: js/share.js:583
+#: js/share.js:589
 msgid "Error setting expiration date"
-msgstr ""
+msgstr "Klarte ikkje setja utlÃ¸psdato"
 
-#: js/share.js:598
+#: js/share.js:604
 msgid "Sending ..."
-msgstr ""
+msgstr "Sender â€¦"
 
-#: js/share.js:609
+#: 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:47
+#: 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:39
-#: 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"
 
@@ -423,7 +428,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"
@@ -443,11 +448,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"
@@ -455,7 +460,7 @@ msgstr "Hjelp"
 
 #: templates/403.php:12
 msgid "Access forbidden"
-msgstr ""
+msgstr "Tilgang forbudt"
 
 #: templates/404.php:12
 msgid "Cloud not found"
@@ -463,123 +468,138 @@ 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"
 msgstr "Legg til"
 
-#: templates/installation.php:23 templates/installation.php:30
+#: templates/installation.php:24 templates/installation.php:31
+#: templates/installation.php:38
 msgid "Security Warning"
-msgstr ""
+msgstr "TryggleiksÃ¥tvaring"
 
-#: templates/installation.php:24
+#: templates/installation.php:25
+msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
+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 "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:25
+#: 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:31
+#: 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:32
+#: 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:36
+#: templates/installation.php:44
 msgid "Create an <strong>admin account</strong>"
 msgstr "Lag ein <strong>admin-konto</strong>"
 
-#: templates/installation.php:52
+#: templates/installation.php:62
 msgid "Advanced"
 msgstr "Avansert"
 
-#: templates/installation.php:54
+#: templates/installation.php:64
 msgid "Data folder"
 msgstr "Datamappe"
 
-#: templates/installation.php:61
+#: templates/installation.php:74
 msgid "Configure the database"
-msgstr "Konfigurer databasen"
+msgstr "Set opp databasen"
 
-#: templates/installation.php:66 templates/installation.php:77
-#: templates/installation.php:87 templates/installation.php:97
+#: 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:109
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "Databasebrukar"
 
-#: templates/installation.php:113
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "Databasepassord"
 
-#: templates/installation.php:117
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "Databasenamn"
 
-#: templates/installation.php:125
+#: templates/installation.php:159
 msgid "Database tablespace"
-msgstr ""
+msgstr "Tabellnamnrom for database"
 
-#: templates/installation.php:131
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "Databasetenar"
 
-#: templates/installation.php:136
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "FullfÃ¸r oppsettet"
 
-#: templates/layout.guest.php:33
+#: 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:36
+#, 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:48
+#: templates/layout.user.php:61
 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"
@@ -592,4 +612,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 576b1aad49e73bdf109aaa169856bbbbcf117004..8bf6b233b5c711add7254d459ce7ff66a59a252d 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-03-04 00:06+0100\n"
-"PO-Revision-Date: 2013-03-03 23:06+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-21 02:00+0200\n"
+"PO-Revision-Date: 2013-05-20 13:00+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,157 +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:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
-msgstr ""
+msgstr "Ugyldig mappe."
 
-#: appinfo/app.php:10
+#: 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:92 templates/index.php:93
+#: 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/files.js:292 js/files.js:408
-#: js/files.js:439
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
-msgstr ""
+msgstr "Under vegs"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
-msgstr ""
+msgstr "{new_name} finst allereie"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
-msgstr ""
+msgstr "byt ut"
 
-#: js/filelist.js:251
+#: js/filelist.js:259
 msgid "suggest name"
-msgstr ""
+msgstr "fÃ¸reslÃ¥ namn"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
-msgstr ""
+msgstr "avbryt"
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
-msgstr ""
+msgstr "bytte ut {new_name} med {old_name}"
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "undo"
-msgstr ""
+msgstr "angre"
 
-#: js/filelist.js:323
+#: js/filelist.js:331
 msgid "perform delete operation"
-msgstr ""
+msgstr "utfÃ¸r sletting"
+
+#: js/filelist.js:413
+msgid "1 file uploading"
+msgstr "1 fil lastar opp"
+
+#: js/filelist.js:416 js/filelist.js:470
+msgid "files uploading"
+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:225
+#: 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:262
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr ""
-
-#: js/files.js:262
-msgid "Upload Error"
-msgstr ""
-
-#: js/files.js:273
-msgid "Close"
-msgstr "Lukk"
-
-#: js/files.js:312
-msgid "1 file uploading"
-msgstr ""
+msgstr "Klarte ikkje lasta opp fila sidan ho er ei mappe eller er pÃ¥ 0 byte"
 
-#: js/files.js:315 js/files.js:370 js/files.js:385
-msgid "{count} files uploading"
-msgstr ""
+#: js/files.js:277
+msgid "Not enough space available"
+msgstr "Ikkje nok lagringsplass tilgjengeleg"
 
-#: js/files.js:388 js/files.js:423
+#: js/files.js:317
 msgid "Upload cancelled."
-msgstr ""
+msgstr "Opplasting avbroten."
 
-#: js/files.js:497
+#: 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:570
+#: js/files.js:486
 msgid "URL cannot be empty."
-msgstr ""
+msgstr "Nettadressa kan ikkje vera tom."
 
-#: js/files.js:575
+#: 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:953 templates/index.php:68
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+msgid "Error"
+msgstr "Feil"
+
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Namn"
 
-#: js/files.js:954 templates/index.php:79
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Storleik"
 
-#: js/files.js:955 templates/index.php:81
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Endra"
 
-#: js/files.js:974
+#: js/files.js:898
 msgid "1 folder"
-msgstr ""
+msgstr "1 mappe"
 
-#: js/files.js:976
+#: js/files.js:900
 msgid "{count} folders"
-msgstr ""
+msgstr "{count} mapper"
 
-#: js/files.js:984
+#: js/files.js:908
 msgid "1 file"
-msgstr ""
+msgstr "1 fil"
 
-#: js/files.js:986
+#: 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"
@@ -224,7 +231,7 @@ msgstr "Last opp"
 
 #: templates/admin.php:5
 msgid "File handling"
-msgstr ""
+msgstr "Filhandtering"
 
 #: templates/admin.php:7
 msgid "Maximum upload size"
@@ -232,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"
@@ -268,50 +275,50 @@ msgstr "Mappe"
 
 #: templates/index.php:14
 msgid "From link"
-msgstr ""
+msgstr "FrÃ¥ lenkje"
 
-#: templates/index.php:40
+#: templates/index.php:42
 msgid "Deleted files"
-msgstr ""
+msgstr "Sletta filer"
 
-#: templates/index.php:46
+#: templates/index.php:48
 msgid "Cancel upload"
-msgstr ""
+msgstr "Avbryt opplasting"
 
-#: templates/index.php:53
+#: templates/index.php:54
 msgid "You donâ€™t have write permissions here."
-msgstr ""
+msgstr "Du har ikkje skriverettar her."
 
-#: templates/index.php:60
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Ingenting her. Last noko opp!"
 
-#: templates/index.php:74
+#: templates/index.php:75
 msgid "Download"
 msgstr "Last ned"
 
-#: templates/index.php:86 templates/index.php:87
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
-msgstr ""
+msgstr "Udel"
 
-#: templates/index.php:106
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "For stor opplasting"
 
-#: templates/index.php:108
+#: 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:113
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
-msgstr ""
+msgstr "Skannar filer, ver venleg og vent."
 
-#: templates/index.php:116
+#: 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..8e3b4ed5f772430e4df9173a9e30facad8c510d4 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-04-26 10:00+0200\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/nn_NO/files_external.po b/l10n/nn_NO/files_external.po
index 3ab783c8371ec70e21f69501ff246b2fbda9e04e..444e7be0a1b41fab38e5c925ffd02a4cba6af7e4 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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 ""
diff --git a/l10n/nn_NO/files_sharing.po b/l10n/nn_NO/files_sharing.po
index 6a569d362f5f6f606e3bc263ae88b012fa49537b..1edc28d346e88d56370d09ff779e6cd6f2623dbc 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-05-21 02:00+0200\n"
+"PO-Revision-Date: 2013-05-20 13:00+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 25d68085d96630dc5ba5729340bbbb800c14b7a7..6abeaf62de62e8596146aa1dca74fe735fb0ec6a 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-03-08 00:25+0100\n"
-"PO-Revision-Date: 2013-03-07 23:25+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-21 02:00+0200\n"
+"PO-Revision-Date: 2013-05-20 11:10+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,27 +18,31 @@ msgstr ""
 "Language: nn_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:40
+#: ajax/delete.php:42
 #, php-format
 msgid "Couldn't delete %s permanently"
-msgstr ""
+msgstr "Klarte ikkje sletta %s for godt"
 
-#: ajax/undelete.php:41
+#: 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
 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
+msgid "Error"
+msgstr "Feil"
 
 #: js/trash.js:34
 msgid "delete file permanently"
-msgstr ""
+msgstr "slett fila for godt"
 
 #: js/trash.js:121
 msgid "Delete permanently"
-msgstr ""
+msgstr "Slett for godt"
 
 #: js/trash.js:174 templates/index.php:17
 msgid "Name"
@@ -45,31 +50,31 @@ msgstr "Namn"
 
 #: js/trash.js:175 templates/index.php:27
 msgid "Deleted"
-msgstr ""
+msgstr "Sletta"
 
 #: js/trash.js:184
 msgid "1 folder"
-msgstr ""
+msgstr "1 mappe"
 
 #: js/trash.js:186
 msgid "{count} folders"
-msgstr ""
+msgstr "{count} mapper"
 
 #: js/trash.js:194
 msgid "1 file"
-msgstr ""
+msgstr "1 fil"
 
 #: js/trash.js:196
 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"
@@ -77,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..925f545edd8e14d3488152bd2cb4045224724d54 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-21 02:00+0200\n"
+"PO-Revision-Date: 2013-05-20 15:10+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 043fe1fd0a7aa00747b4f39b05b433fe8836e7cb..0fced10d3216948709a0ba286fa37ce374958648 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-02-27 14:35+0100\n"
-"PO-Revision-Date: 2013-02-27 13:35+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-16 09:30+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"
@@ -35,25 +36,25 @@ msgstr "Brukarar"
 
 #: app.php:398
 msgid "Apps"
-msgstr ""
+msgstr "Program"
 
 #: app.php:406
 msgid "Admin"
-msgstr ""
+msgstr "Administrer"
 
-#: 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 +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,83 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:128 setup.php:320 setup.php:365
+#: setup.php:132 setup.php:325 setup.php:370
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:129 setup.php:152 setup.php:229
+#: setup.php:133 setup.php:156 setup.php:234
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:151 setup.php:453 setup.php:520
+#: setup.php:155 setup.php:458 setup.php:525
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:228
+#: setup.php:233
 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: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:583 setup.php:592 setup.php:600 setup.php:609
+#: setup.php:615
 #, 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:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
+#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
+#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:299
+#: setup.php:304
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:300
+#: setup.php:305
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:305
+#: setup.php:310
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:306
+#: setup.php:311
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:579 setup.php:611
+#: setup.php:584 setup.php:616
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:631
+#: setup.php:636
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:849
+#: setup.php:859
 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:850
+#: setup.php:860
 #, 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 +199,7 @@ msgstr ""
 
 #: template.php:116
 msgid "1 hour ago"
-msgstr ""
+msgstr "1 time sidan"
 
 #: template.php:117
 #, php-format
@@ -211,11 +208,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 +221,7 @@ msgstr ""
 
 #: template.php:121
 msgid "last month"
-msgstr ""
+msgstr "fÃ¸rre mÃ¥nad"
 
 #: template.php:122
 #, php-format
@@ -233,24 +230,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 a4361ebb42e3942b6cf5c66ef5841edccdcea600..7661744100b14c4bf4bc4ee1bba8c8dc49a10bfb 100644
--- a/l10n/nn_NO/settings.po
+++ b/l10n/nn_NO/settings.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-02-27 14:35+0100\n"
-"PO-Revision-Date: 2013-02-27 13:35+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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"
@@ -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,106 +74,106 @@ 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"
 msgstr "SlÃ¥ av"
 
-#: js/apps.js:36 js/apps.js:64
+#: js/apps.js:36 js/apps.js:64 js/apps.js:83
 msgid "Enable"
 msgstr "SlÃ¥ pÃ¥"
 
 #: js/apps.js:55
 msgid "Please wait...."
-msgstr ""
+msgstr "Ver venleg og vent â€¦"
 
-#: js/apps.js:84
-msgid "Updating...."
-msgstr ""
-
-#: js/apps.js:87
-msgid "Error while updating app"
-msgstr ""
-
-#: js/apps.js:87
+#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
 msgid "Error"
 msgstr "Feil"
 
 #: js/apps.js:90
+msgid "Updating...."
+msgstr "Oppdaterer â€¦"
+
+#: js/apps.js:93
+msgid "Error while updating app"
+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:30
+#: js/users.js:47
 msgid "deleted"
-msgstr ""
+msgstr "sletta"
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "undo"
-msgstr ""
+msgstr "angra"
 
-#: js/users.js:62
+#: js/users.js:79
 msgid "Unable to remove user"
-msgstr ""
+msgstr "Klarte ikkje fjerna brukaren"
 
-#: js/users.js:75 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
+#: templates/users.php:103
 msgid "Groups"
 msgstr "Grupper"
 
-#: js/users.js:78 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
-msgstr ""
+msgstr "Gruppestyrar"
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "Slett"
 
-#: js/users.js:191
+#: js/users.js:269
 msgid "add group"
-msgstr ""
+msgstr "legg til gruppe"
 
-#: js/users.js:352
+#: js/users.js:420
 msgid "A valid username must be provided"
-msgstr ""
+msgstr "Du mÃ¥ oppgje eit gyldig brukarnamn"
 
-#: js/users.js:353 js/users.js:359 js/users.js:374
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
-msgstr ""
+msgstr "Feil ved oppretting av brukar"
 
-#: js/users.js:358
+#: js/users.js:426
 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,100 +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:228
+msgid "Less"
+msgstr "Mindre"
 
-#: templates/admin.php:230 templates/personal.php:102
+#: templates/admin.php:235 templates/personal.php:105
 msgid "Version"
-msgstr ""
+msgstr "UtgÃ¥ve"
 
-#: templates/admin.php:233 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 "
@@ -330,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"
@@ -358,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:77
 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"
@@ -417,82 +425,70 @@ msgstr "Nytt passord"
 msgid "Change password"
 msgstr "Endra passord"
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:76
 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 "Visingsnamn"
 
-#: templates/personal.php:70
+#: templates/personal.php:68
 msgid "Email"
-msgstr "Epost"
+msgstr "E-post"
 
-#: templates/personal.php:72
+#: templates/personal.php:70
 msgid "Your email address"
-msgstr "Din epost addresse"
+msgstr "Di epost-adresse"
 
-#: templates/personal.php:73
+#: templates/personal.php:71
 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:77 templates/personal.php:78
 msgid "Language"
 msgstr "SprÃ¥k"
 
-#: templates/personal.php:86
+#: templates/personal.php:89
 msgid "Help translate"
-msgstr "Hjelp oss Ã¥ oversett"
+msgstr "Hjelp oss Ã¥ omsetja"
 
-#: templates/personal.php:91
+#: templates/personal.php:94
 msgid "WebDAV"
-msgstr ""
+msgstr "WebDAV"
 
-#: templates/personal.php:93
+#: templates/personal.php:96
 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:75
 msgid "Login Name"
-msgstr ""
+msgstr "Innloggingsnamn"
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr "Lag"
 
-#: templates/users.php:35
+#: templates/users.php:33
 msgid "Default Storage"
-msgstr ""
+msgstr "Standardlagring"
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:39 templates/users.php:133
 msgid "Unlimited"
-msgstr ""
+msgstr "Ubegrensa"
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:57 templates/users.php:148
 msgid "Other"
 msgstr "Anna"
 
-#: templates/users.php:84
+#: templates/users.php:82
 msgid "Storage"
-msgstr ""
+msgstr "Lagring"
 
-#: templates/users.php:95
+#: templates/users.php:93
 msgid "change display name"
-msgstr ""
+msgstr "endra visingsnamn"
 
-#: templates/users.php:99
+#: templates/users.php:97
 msgid "set new password"
-msgstr ""
+msgstr "lag nytt passord"
 
-#: templates/users.php:134
+#: templates/users.php:128
 msgid "Default"
-msgstr ""
+msgstr "Standard"
diff --git a/l10n/nn_NO/user_ldap.po b/l10n/nn_NO/user_ldap.po
index 33368c43791836fc463f16039f904bbc9615674d..aa60a28904e1de7fee7919a7ad84e2970b392910 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-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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..1b5e93f18ca596f21d2f58475016e5489c4de618 100644
--- a/l10n/nn_NO/user_webdavauth.po
+++ b/l10n/nn_NO/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-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -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/oc/core.po b/l10n/oc/core.po
index a2b487f6866d69ee9f412cf31f98de1d13bb78b6..fb3ea7ee10fabdcdbfc37e369b56e881a5212ce8 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-02-22 00:06+0100\n"
-"PO-Revision-Date: 2013-02-20 23:20+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10: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"
@@ -18,24 +17,24 @@ msgstr ""
 "Language: oc\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ajax/share.php:85
+#: ajax/share.php:97
 #, php-format
 msgid "User %s shared a file with you"
 msgstr ""
 
-#: ajax/share.php:87
+#: ajax/share.php:99
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr ""
 
-#: ajax/share.php:89
+#: 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:91
+#: ajax/share.php:104
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -81,79 +80,79 @@ msgstr "Pas de categorias seleccionadas per escafar."
 msgid "Error removing %s from favorites."
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:34
 msgid "Sunday"
 msgstr "Dimenge"
 
-#: js/config.php:32
+#: js/config.php:35
 msgid "Monday"
 msgstr "Diluns"
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Tuesday"
 msgstr "DimarÃ§"
 
-#: js/config.php:32
+#: js/config.php:37
 msgid "Wednesday"
 msgstr "Dimecres"
 
-#: js/config.php:32
+#: js/config.php:38
 msgid "Thursday"
 msgstr "DijÃ²us"
 
-#: js/config.php:32
+#: js/config.php:39
 msgid "Friday"
 msgstr "Divendres"
 
-#: js/config.php:32
+#: js/config.php:40
 msgid "Saturday"
 msgstr "Dissabte"
 
-#: js/config.php:33
+#: js/config.php:45
 msgid "January"
-msgstr "GeniÃ¨r"
+msgstr "geniÃ¨r"
 
-#: js/config.php:33
+#: js/config.php:46
 msgid "February"
-msgstr "FebriÃ¨r"
+msgstr "febriÃ¨r"
 
-#: js/config.php:33
+#: js/config.php:47
 msgid "March"
-msgstr "MarÃ§"
+msgstr "marÃ§"
 
-#: js/config.php:33
+#: js/config.php:48
 msgid "April"
-msgstr "Abril"
+msgstr "abril"
 
-#: js/config.php:33
+#: js/config.php:49
 msgid "May"
-msgstr "Mai"
+msgstr "mai"
 
-#: js/config.php:33
+#: js/config.php:50
 msgid "June"
-msgstr "Junh"
+msgstr "junh"
 
-#: js/config.php:33
+#: js/config.php:51
 msgid "July"
-msgstr "Julhet"
+msgstr "julhet"
 
-#: js/config.php:33
+#: js/config.php:52
 msgid "August"
-msgstr "Agost"
+msgstr "agost"
 
-#: js/config.php:33
+#: js/config.php:53
 msgid "September"
-msgstr "Septembre"
+msgstr "septembre"
 
-#: js/config.php:33
+#: js/config.php:54
 msgid "October"
-msgstr "Octobre"
+msgstr "octobre"
 
-#: js/config.php:33
+#: js/config.php:55
 msgid "November"
 msgstr "Novembre"
 
-#: js/config.php:33
+#: js/config.php:56
 msgid "December"
 msgstr "Decembre"
 
@@ -161,86 +160,88 @@ msgstr "Decembre"
 msgid "Settings"
 msgstr "Configuracion"
 
-#: js/js.js:767
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "segonda a"
 
-#: js/js.js:768
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "1 minuta a"
 
-#: js/js.js:769
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:770
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:771
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:772
+#: js/js.js:723
 msgid "today"
 msgstr "uÃ¨i"
 
-#: js/js.js:773
+#: js/js.js:724
 msgid "yesterday"
 msgstr "iÃ¨r"
 
-#: js/js.js:774
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:775
+#: js/js.js:726
 msgid "last month"
 msgstr "mes passat"
 
-#: js/js.js:776
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:777
+#: js/js.js:728
 msgid "months ago"
 msgstr "meses  a"
 
-#: js/js.js:778
+#: js/js.js:729
 msgid "last year"
 msgstr "an passat"
 
-#: js/js.js:779
+#: js/js.js:730
 msgid "years ago"
 msgstr "ans a"
 
-#: js/oc-dialogs.js:126
-msgid "Choose"
-msgstr "CausÃs"
+#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
+msgid "Ok"
+msgstr "D'accÃ²rdi"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
 msgid "Cancel"
-msgstr "Anulla"
+msgstr "Annula"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "Non"
+#: js/oc-dialogs.js:185
+msgid "Choose"
+msgstr "CausÃs"
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:215
 msgid "Yes"
 msgstr "Ã’c"
 
-#: js/oc-dialogs.js:180
-msgid "Ok"
-msgstr "D'accÃ²rdi"
+#: js/oc-dialogs.js:222
+msgid "No"
+msgstr "Non"
 
 #: 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:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:582
-#: js/share.js:594
+#: 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 "Error"
 
@@ -252,127 +253,127 @@ msgstr ""
 msgid "The required file {file} is not installed!"
 msgstr ""
 
-#: js/share.js:29 js/share.js:43 js/share.js:90
+#: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr ""
 
-#: js/share.js:93
+#: js/share.js:90
 msgid "Share"
 msgstr "Parteja"
 
-#: js/share.js:141 js/share.js:622
+#: js/share.js:125 js/share.js:617
 msgid "Error while sharing"
 msgstr "Error al partejar"
 
-#: js/share.js:152
+#: js/share.js:136
 msgid "Error while unsharing"
 msgstr "Error al non partejar"
 
-#: js/share.js:159
+#: js/share.js:143
 msgid "Error while changing permissions"
 msgstr "Error al cambiar permissions"
 
-#: js/share.js:168
+#: js/share.js:152
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:170
+#: js/share.js:154
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:175
+#: js/share.js:159
 msgid "Share with"
 msgstr "Parteja amb"
 
-#: js/share.js:180
+#: js/share.js:164
 msgid "Share with link"
 msgstr "Parteja amb lo ligam"
 
-#: js/share.js:183
+#: js/share.js:167
 msgid "Password protect"
 msgstr "Parat per senhal"
 
-#: js/share.js:185 templates/installation.php:44 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Senhal"
 
-#: js/share.js:189
+#: js/share.js:173
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:190
+#: js/share.js:174
 msgid "Send"
 msgstr ""
 
-#: js/share.js:194
+#: js/share.js:178
 msgid "Set expiration date"
 msgstr "Met la data d'expiracion"
 
-#: js/share.js:195
+#: js/share.js:179
 msgid "Expiration date"
 msgstr "Data d'expiracion"
 
-#: js/share.js:227
+#: js/share.js:211
 msgid "Share via email:"
 msgstr "Parteja tras corriÃ¨l :"
 
-#: js/share.js:229
+#: js/share.js:213
 msgid "No people found"
 msgstr "Deguns trobat"
 
-#: js/share.js:256
+#: js/share.js:251
 msgid "Resharing is not allowed"
 msgstr "Tornar partejar es pas permis"
 
-#: js/share.js:292
+#: js/share.js:287
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:313
+#: js/share.js:308
 msgid "Unshare"
-msgstr "Non parteje"
+msgstr "Pas partejador"
 
-#: js/share.js:325
+#: js/share.js:320
 msgid "can edit"
 msgstr "pÃ²t modificar"
 
-#: js/share.js:327
+#: js/share.js:322
 msgid "access control"
 msgstr "ContrarÃ²tle d'acces"
 
-#: js/share.js:330
+#: js/share.js:325
 msgid "create"
 msgstr "crea"
 
-#: js/share.js:333
+#: js/share.js:328
 msgid "update"
 msgstr "met a jorn"
 
-#: js/share.js:336
+#: js/share.js:331
 msgid "delete"
 msgstr "escafa"
 
-#: js/share.js:339
+#: js/share.js:334
 msgid "share"
 msgstr "parteja"
 
-#: js/share.js:373 js/share.js:569
+#: js/share.js:368 js/share.js:564
 msgid "Password protected"
 msgstr "Parat per senhal"
 
-#: js/share.js:582
+#: js/share.js:577
 msgid "Error unsetting expiration date"
 msgstr "Error al metre de la data d'expiracion"
 
-#: js/share.js:594
+#: js/share.js:589
 msgid "Error setting expiration date"
 msgstr "Error setting expiration date"
 
-#: js/share.js:609
+#: js/share.js:604
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:620
+#: js/share.js:615
 msgid "Email sent"
 msgstr ""
 
@@ -395,24 +396,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:39
-#: 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"
 
@@ -426,7 +430,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"
@@ -468,115 +472,130 @@ msgstr "Edita categorias"
 msgid "Add"
 msgstr "Ajusta"
 
-#: templates/installation.php:23 templates/installation.php:30
+#: templates/installation.php:24 templates/installation.php:31
+#: templates/installation.php:38
 msgid "Security Warning"
 msgstr "Avertiment de securitat"
 
-#: 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:25
+#: 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:31
+#: 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:32
+#: 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:36
+#: templates/installation.php:44
 msgid "Create an <strong>admin account</strong>"
 msgstr "Crea un <strong>compte admin</strong>"
 
-#: templates/installation.php:52
+#: templates/installation.php:62
 msgid "Advanced"
 msgstr "AvanÃ§at"
 
-#: templates/installation.php:54
+#: templates/installation.php:64
 msgid "Data folder"
 msgstr "DorsiÃ¨r de donadas"
 
-#: templates/installation.php:61
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "Configura la basa de donadas"
 
-#: templates/installation.php:66 templates/installation.php:77
-#: templates/installation.php:87 templates/installation.php:97
+#: 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:109
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "UsanciÃ¨r de la basa de donadas"
 
-#: templates/installation.php:113
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "Senhal de la basa de donadas"
 
-#: templates/installation.php:117
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "Nom de la basa de donadas"
 
-#: templates/installation.php:125
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "Espandi de taula de basa de donadas"
 
-#: templates/installation.php:131
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "Ã’ste de basa de donadas"
 
-#: templates/installation.php:136
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "Configuracion acabada"
 
-#: templates/layout.guest.php:33
+#: templates/layout.guest.php:40
 msgid "web services under your control"
 msgstr "Services web jos ton contrarÃ²tle"
 
-#: templates/layout.user.php:48
+#: 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 "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 6500ddb024b5fcde4697ed912a40eff82eb5ca33..6add33eaeb9a815fbc085f0d57860b2f8f049ec4 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-03-04 00:06+0100\n"
-"PO-Revision-Date: 2013-03-03 23:06+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10: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"
@@ -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 ""
@@ -71,59 +66,70 @@ msgstr "L'escriptura sul disc a fracassat"
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:10
+#: appinfo/app.php:12
 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:92 templates/index.php:93
+#: 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/files.js:292 js/files.js:408
-#: js/files.js:439
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "Al esperar"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "remplaÃ§a"
 
-#: js/filelist.js:251
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "nom prepausat"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "anulla"
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "undo"
 msgstr "defar"
 
-#: js/filelist.js:323
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr ""
 
+#: js/filelist.js:413
+msgid "1 file uploading"
+msgstr "1 fichiÃ¨r al amontcargar"
+
+#: js/filelist.js:416 js/filelist.js:470
+msgid "files uploading"
+msgstr "fichiÃ¨rs al amontcargar"
+
 #: js/files.js:52
 msgid "'.' is an invalid file name."
 msgstr ""
@@ -146,77 +152,77 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:225
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:262
+#: 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:262
-msgid "Upload Error"
-msgstr "Error d'amontcargar"
-
-#: js/files.js:273
-msgid "Close"
-msgstr ""
-
-#: js/files.js:312
-msgid "1 file uploading"
-msgstr "1 fichiÃ¨r al amontcargar"
-
-#: js/files.js:315 js/files.js:370 js/files.js:385
-msgid "{count} files uploading"
+#: js/files.js:277
+msgid "Not enough space available"
 msgstr ""
 
-#: js/files.js:388 js/files.js:423
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "Amontcargar anullat."
 
-#: js/files.js:497
+#: 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:570
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:575
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:953 templates/index.php:68
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+msgid "Error"
+msgstr "Error"
+
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Nom"
 
-#: js/files.js:954 templates/index.php:79
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Talha"
 
-#: js/files.js:955 templates/index.php:81
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Modificat"
 
-#: js/files.js:974
+#: js/files.js:898
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:976
+#: js/files.js:900
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:984
+#: js/files.js:908
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:986
+#: 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"
@@ -269,45 +275,45 @@ msgstr "DorsiÃ¨r"
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:42
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:48
 msgid "Cancel upload"
 msgstr " Anulla l'amontcargar"
 
-#: templates/index.php:53
+#: templates/index.php:54
 msgid "You donâ€™t have write permissions here."
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Pas res dedins. Amontcarga qualquaren"
 
-#: templates/index.php:74
+#: templates/index.php:75
 msgid "Download"
 msgstr "Avalcarga"
 
-#: templates/index.php:86 templates/index.php:87
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
-msgstr "Non parteja"
+msgstr "Pas partejador"
 
-#: templates/index.php:106
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "Amontcargament trÃ²p grÃ²s"
 
-#: templates/index.php:108
+#: 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:113
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Los fiichiÃ¨rs son a Ã¨sser explorats, "
 
-#: templates/index.php:116
+#: 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..3fbf4c0e83693ce8d0ea9f81ba81e6af8c554c86 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-04-26 10:00+0200\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/oc/files_external.po b/l10n/oc/files_external.po
index b363f8d316d4c9c180c7ecaed24c08c94dfef7c1..d4da7a4ee88cc40cd9c0adcc36973fbb00817047 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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..9f1de7e3bd1b5a7248ca71a97e90fd84b254b85c 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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 c021b24f318e5406479a0ca830ca250d1b8f27cf..68e83d04f5eb67bc8bf25ced5ca5be5eb0e7fcf0 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-03-08 00:25+0100\n"
-"PO-Revision-Date: 2013-03-07 23:25+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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,12 +17,12 @@ msgstr ""
 "Language: oc\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ajax/delete.php:40
+#: ajax/delete.php:42
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
 
-#: ajax/undelete.php:41
+#: ajax/undelete.php:42
 #, php-format
 msgid "Couldn't restore %s"
 msgstr ""
@@ -31,6 +31,10 @@ msgstr ""
 msgid "perform restore operation"
 msgstr ""
 
+#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+msgid "Error"
+msgstr "Error"
+
 #: js/trash.js:34
 msgid "delete file permanently"
 msgstr ""
diff --git a/l10n/oc/files_versions.po b/l10n/oc/files_versions.po
index a84be8cd14bb4d42b26e411ab1300d5e9125c13f..0c9402555233491d6e416fb6d9aa884d48137a9b 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-04-26 10:00+0200\n"
+"PO-Revision-Date: 2013-04-26 08:02+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
 "MIME-Version: 1.0\n"
@@ -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 005e945b230b8d92a32ccc2cbe0028869b62cbfd..68de31380424c4e60fb837771c6937eb4c040066 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-02-27 14:35+0100\n"
-"PO-Revision-Date: 2013-02-27 13:35+0000\n"
+"POT-Creation-Date: 2013-04-28 01:57+0200\n"
+"PO-Revision-Date: 2013-04-27 23:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
 "MIME-Version: 1.0\n"
@@ -42,19 +41,19 @@ msgstr "Apps"
 msgid "Admin"
 msgstr "Admin"
 
-#: files.php:202
+#: files.php:209
 msgid "ZIP download is turned off."
 msgstr "Avalcargar los ZIP es inactiu."
 
-#: files.php:203
+#: files.php:210
 msgid "Files need to be downloaded one by one."
 msgstr "Los fichiÃ¨rs devan Ã¨sser avalcargats un per un."
 
-#: files.php:204 files.php:231
+#: files.php:211 files.php:244
 msgid "Back to Files"
 msgstr "Torna cap als fichiÃ¨rs"
 
-#: files.php:228
+#: files.php:241
 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,72 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:128 setup.php:320 setup.php:365
+#: setup.php:132 setup.php:325 setup.php:370
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:129 setup.php:152 setup.php:229
+#: setup.php:133 setup.php:156 setup.php:234
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:151 setup.php:453 setup.php:520
+#: setup.php:155 setup.php:458 setup.php:525
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:228
+#: setup.php:233
 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: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:583 setup.php:592 setup.php:600 setup.php:609
+#: setup.php:615
 #, 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:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
+#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
+#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:299
+#: setup.php:304
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:300
+#: setup.php:305
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:305
+#: setup.php:310
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:306
+#: setup.php:311
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:579 setup.php:611
+#: setup.php:584 setup.php:616
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:631
+#: setup.php:636
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:849
+#: setup.php:858
 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:859
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
@@ -240,19 +235,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 3dd4a1a3fd4c7fbbfb0279705fab75a104e398f6..cf78308378364d7f79f7ac164b0d72baa6082c24 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-02-27 14:35+0100\n"
-"PO-Revision-Date: 2013-02-27 13:35+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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 ""
 
@@ -93,7 +96,7 @@ msgstr ""
 msgid "Disable"
 msgstr "Desactiva"
 
-#: js/apps.js:36 js/apps.js:64
+#: js/apps.js:36 js/apps.js:64 js/apps.js:83
 msgid "Enable"
 msgstr "Activa"
 
@@ -101,68 +104,68 @@ msgstr "Activa"
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:84
+#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+msgid "Error"
+msgstr "Error"
+
+#: js/apps.js:90
 msgid "Updating...."
 msgstr ""
 
-#: js/apps.js:87
+#: js/apps.js:93
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:87
-msgid "Error"
-msgstr "Error"
-
-#: js/apps.js:90
+#: js/apps.js:96
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr "Enregistra..."
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "deleted"
 msgstr "escafat"
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "undo"
 msgstr "defar"
 
-#: js/users.js:62
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:75 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
+#: templates/users.php:103
 msgid "Groups"
 msgstr "Grops"
 
-#: js/users.js:78 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr "Grop Admin"
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "Escafa"
 
-#: js/users.js:191
+#: js/users.js:269
 msgid "add group"
 msgstr ""
 
-#: js/users.js:352
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:353 js/users.js:359 js/users.js:374
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:358
+#: js/users.js:426
 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,21 +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 "Mai d'aquÃ²"
+
+#: templates/admin.php:228
+msgid "Less"
 msgstr ""
 
-#: templates/admin.php:230 templates/personal.php:102
+#: templates/admin.php:235 templates/personal.php:105
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:233 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 "
@@ -392,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:77
 msgid "Password"
 msgstr "Senhal"
 
@@ -416,82 +423,70 @@ 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:76
 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 "CorriÃ¨l"
 
-#: templates/personal.php:72
+#: templates/personal.php:70
 msgid "Your email address"
 msgstr "Ton adreiÃ§a de corriÃ¨l"
 
-#: templates/personal.php:73
+#: templates/personal.php:71
 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:77 templates/personal.php:78
 msgid "Language"
 msgstr "Lenga"
 
-#: templates/personal.php:86
+#: templates/personal.php:89
 msgid "Help translate"
 msgstr "Ajuda a la revirada"
 
-#: 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:75
 msgid "Login Name"
 msgstr ""
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr "Crea"
 
-#: templates/users.php:35
+#: templates/users.php:33
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:39 templates/users.php:133
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:57 templates/users.php:148
 msgid "Other"
 msgstr "Autres"
 
-#: templates/users.php:84
+#: templates/users.php:82
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:95
+#: templates/users.php:93
 msgid "change display name"
 msgstr ""
 
-#: templates/users.php:99
+#: templates/users.php:97
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:134
+#: templates/users.php:128
 msgid "Default"
 msgstr ""
diff --git a/l10n/oc/user_ldap.po b/l10n/oc/user_ldap.po
index 3c1cdc754b3ef8856aa23fd0f259996db4500868..32a16d4e26a3b0e76afc8ed585bdfcb1a23ed29c 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-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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..28e19ba92c01ca3314bdd576556358c0dce0fa1e 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-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
 "MIME-Version: 1.0\n"
@@ -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 a12e97ff66e3c553224301d7eca166f068bf7e0e..e023ed3428064bf0566313a69129af63bc07d04f 100644
--- a/l10n/pl/core.po
+++ b/l10n/pl/core.po
@@ -3,25 +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.
-# 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.
-#   <mosslar@gmail.com>, 2011.
-#   <mplichta@gmail.com>, 2012.
-# Piotr SokÃ³Å‚ <psokol@jabster.pl>, 2012.
-#   <rightxhere1@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-03-03 00:06+0100\n"
-"PO-Revision-Date: 2013-03-02 14:20+0000\n"
-"Last-Translator: Maciej Tarmas <maciej@tarmas.com>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+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"
@@ -172,86 +161,88 @@ msgstr "GrudzieÅ„"
 msgid "Settings"
 msgstr "Ustawienia"
 
-#: js/js.js:768
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "sekund temu"
 
-#: js/js.js:769
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "1 minutÄ™ temu"
 
-#: js/js.js:770
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr "{minutes} minut temu"
 
-#: js/js.js:771
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr "1 godzinÄ™ temu"
 
-#: js/js.js:772
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr "{hours} godzin temu"
 
-#: js/js.js:773
+#: js/js.js:723
 msgid "today"
 msgstr "dziÅ›"
 
-#: js/js.js:774
+#: js/js.js:724
 msgid "yesterday"
 msgstr "wczoraj"
 
-#: js/js.js:775
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr "{days} dni temu"
 
-#: js/js.js:776
+#: js/js.js:726
 msgid "last month"
 msgstr "w zeszÅ‚ym miesiÄ…cu"
 
-#: js/js.js:777
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr "{months} miesiÄ™cy temu"
 
-#: js/js.js:778
+#: js/js.js:728
 msgid "months ago"
 msgstr "miesiÄ™cy temu"
 
-#: js/js.js:779
+#: js/js.js:729
 msgid "last year"
 msgstr "w zeszÅ‚ym roku"
 
-#: js/js.js:780
+#: js/js.js:730
 msgid "years ago"
 msgstr "lat temu"
 
-#: js/oc-dialogs.js:126
-msgid "Choose"
-msgstr "Wybierz"
+#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
+msgid "Ok"
+msgstr "OK"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "Nie"
+#: js/oc-dialogs.js:185
+msgid "Choose"
+msgstr "Wybierz"
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:215
 msgid "Yes"
 msgstr "Tak"
 
-#: js/oc-dialogs.js:180
-msgid "Ok"
-msgstr "OK"
+#: js/oc-dialogs.js:222
+msgid "No"
+msgstr "Nie"
 
 #: 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 "Nie okreÅ›lono typu obiektu."
 
-#: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:582
-#: js/share.js:594
+#: 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 "BÅ‚Ä…d"
 
@@ -263,127 +254,127 @@ msgstr "Nie okreÅ›lono nazwy aplikacji."
 msgid "The required file {file} is not installed!"
 msgstr "Wymagany plik {file} nie jest zainstalowany!"
 
-#: js/share.js:29 js/share.js:43 js/share.js:90
+#: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr "UdostÄ™pniono"
 
-#: js/share.js:93
+#: js/share.js:90
 msgid "Share"
 msgstr "UdostÄ™pnij"
 
-#: js/share.js:141 js/share.js:622
+#: js/share.js:125 js/share.js:617
 msgid "Error while sharing"
 msgstr "BÅ‚Ä…d podczas wspÃ³Å‚dzielenia"
 
-#: js/share.js:152
+#: js/share.js:136
 msgid "Error while unsharing"
 msgstr "BÅ‚Ä…d podczas zatrzymywania wspÃ³Å‚dzielenia"
 
-#: js/share.js:159
+#: js/share.js:143
 msgid "Error while changing permissions"
 msgstr "BÅ‚Ä…d przy zmianie uprawnieÅ„"
 
-#: js/share.js:168
+#: js/share.js:152
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "UdostÄ™pnione tobie i grupie {group} przez {owner}"
 
-#: js/share.js:170
+#: js/share.js:154
 msgid "Shared with you by {owner}"
 msgstr "UdostÄ™pnione tobie przez {owner}"
 
-#: js/share.js:175
+#: js/share.js:159
 msgid "Share with"
 msgstr "WspÃ³Å‚dziel z"
 
-#: js/share.js:180
+#: js/share.js:164
 msgid "Share with link"
 msgstr "WspÃ³Å‚dziel wraz z odnoÅ›nikiem"
 
-#: js/share.js:183
+#: js/share.js:167
 msgid "Password protect"
 msgstr "Zabezpiecz hasÅ‚em"
 
-#: js/share.js:185 templates/installation.php:47 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "HasÅ‚o"
 
-#: js/share.js:189
+#: js/share.js:173
 msgid "Email link to person"
 msgstr "WyÅ›lij osobie odnoÅ›nik poprzez e-mail"
 
-#: js/share.js:190
+#: js/share.js:174
 msgid "Send"
 msgstr "WyÅ›lij"
 
-#: js/share.js:194
+#: js/share.js:178
 msgid "Set expiration date"
 msgstr "Ustaw datÄ™ wygaÅ›niÄ™cia"
 
-#: js/share.js:195
+#: js/share.js:179
 msgid "Expiration date"
 msgstr "Data wygaÅ›niÄ™cia"
 
-#: js/share.js:227
+#: js/share.js:211
 msgid "Share via email:"
 msgstr "WspÃ³Å‚dziel poprzez e-mail:"
 
-#: js/share.js:229
+#: js/share.js:213
 msgid "No people found"
 msgstr "Nie znaleziono ludzi"
 
-#: js/share.js:256
+#: js/share.js:251
 msgid "Resharing is not allowed"
 msgstr "WspÃ³Å‚dzielenie nie jest moÅ¼liwe"
 
-#: js/share.js:292
+#: js/share.js:287
 msgid "Shared in {item} with {user}"
 msgstr "WspÃ³Å‚dzielone w {item} z {user}"
 
-#: js/share.js:313
+#: js/share.js:308
 msgid "Unshare"
 msgstr "Zatrzymaj wspÃ³Å‚dzielenie"
 
-#: js/share.js:325
+#: js/share.js:320
 msgid "can edit"
 msgstr "moÅ¼e edytowaÄ‡"
 
-#: js/share.js:327
+#: js/share.js:322
 msgid "access control"
 msgstr "kontrola dostÄ™pu"
 
-#: js/share.js:330
+#: js/share.js:325
 msgid "create"
 msgstr "utwÃ³rz"
 
-#: js/share.js:333
+#: js/share.js:328
 msgid "update"
 msgstr "uaktualnij"
 
-#: js/share.js:336
+#: js/share.js:331
 msgid "delete"
 msgstr "usuÅ„"
 
-#: js/share.js:339
+#: js/share.js:334
 msgid "share"
 msgstr "wspÃ³Å‚dziel"
 
-#: js/share.js:373 js/share.js:569
+#: js/share.js:368 js/share.js:564
 msgid "Password protected"
 msgstr "Zabezpieczone hasÅ‚em"
 
-#: js/share.js:582
+#: js/share.js:577
 msgid "Error unsetting expiration date"
 msgstr "BÅ‚Ä…d podczas usuwania daty wygaÅ›niÄ™cia"
 
-#: js/share.js:594
+#: js/share.js:589
 msgid "Error setting expiration date"
 msgstr "BÅ‚Ä…d podczas ustawiania daty wygaÅ›niÄ™cia"
 
-#: js/share.js:609
+#: js/share.js:604
 msgid "Sending ..."
 msgstr "WysyÅ‚anie..."
 
-#: js/share.js:620
+#: js/share.js:615
 msgid "Email sent"
 msgstr "E-mail wysÅ‚any"
 
@@ -406,24 +397,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 ""
 
-#: 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:41
-#: 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"
 
@@ -480,115 +474,129 @@ msgid "Add"
 msgstr "Dodaj"
 
 #: templates/installation.php:24 templates/installation.php:31
+#: templates/installation.php:38
 msgid "Security Warning"
 msgstr "OstrzeÅ¼enie o zabezpieczeniach"
 
 #: templates/installation.php:25
+msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
+msgstr "TwÃ³ja wersja PHP jest naraÅ¼ona na NULL Byte attack (CVE-2006-7243)"
+
+#: templates/installation.php:26
+msgid "Please update your PHP installation to use ownCloud securely."
+msgstr "ProszÄ™ uaktualnij swojÄ… instalacje PHP, aby uÅ¼ywaÄ‡ ownCloud bezpiecznie."
+
+#: templates/installation.php:32
 msgid ""
 "No secure random number generator is available, please enable the PHP "
 "OpenSSL extension."
 msgstr "Bezpieczny generator liczb losowych jest niedostÄ™pny. WÅ‚Ä…cz rozszerzenie OpenSSL w PHP."
 
-#: 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 "Bez bezpiecznego generatora liczb losowych, osoba atakujÄ…ca moÅ¼e przewidzieÄ‡ token resetujÄ…cy hasÅ‚o i przejÄ…Ä‡ kontrolÄ™ nad twoim kontem."
 
-#: 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 "TwÃ³j katalog danych i pliki sÄ… prawdopodobnie dostÄ™pne z poziomu internetu, poniewaÅ¼ plik .htaccess nie dziaÅ‚a."
 
-#: templates/installation.php:33
+#: 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 "Aby uzyskaÄ‡ informacje dotyczÄ…ce prawidÅ‚owej konfiguracji serwera, siÄ™gnij do <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">dokumentacji</a>."
 
-#: templates/installation.php:37
+#: templates/installation.php:44
 msgid "Create an <strong>admin account</strong>"
 msgstr "UtwÃ³rz <strong>konta administratora</strong>"
 
-#: templates/installation.php:55
+#: templates/installation.php:62
 msgid "Advanced"
 msgstr "Zaawansowane"
 
-#: templates/installation.php:57
+#: templates/installation.php:64
 msgid "Data folder"
 msgstr "Katalog danych"
 
-#: templates/installation.php:66
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "Skonfiguruj bazÄ™ danych"
 
-#: templates/installation.php:71 templates/installation.php:83
-#: templates/installation.php:94 templates/installation.php:105
-#: templates/installation.php:117
+#: 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:129
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "UÅ¼ytkownik bazy danych"
 
-#: templates/installation.php:134
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "HasÅ‚o do bazy danych"
 
-#: templates/installation.php:139
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "Nazwa bazy danych"
 
-#: templates/installation.php:149
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "Obszar tabel bazy danych"
 
-#: templates/installation.php:156
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "Komputer bazy danych"
 
-#: templates/installation.php:162
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "ZakoÅ„cz konfigurowanie"
 
-#: templates/layout.guest.php:35
+#: templates/layout.guest.php:40
 msgid "web services under your control"
-msgstr "usÅ‚ugi internetowe pod kontrolÄ…"
+msgstr "Kontrolowane serwisy"
+
+#: templates/layout.user.php:36
+#, 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:53
+#: templates/layout.user.php:61
 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 aa0c7c7b15a7049e59cc00ef6ce3c36d0ae3f23a..bd2888a2b8140d076297053a910e2163800e4023 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-03-04 00:06+0100\n"
-"PO-Revision-Date: 2013-03-03 23:06+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+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"
@@ -80,59 +67,70 @@ msgstr "BÅ‚Ä…d zapisu na dysk"
 msgid "Not enough storage available"
 msgstr "Za maÅ‚o dostÄ™pnego miejsca"
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr "ZÅ‚a Å›cieÅ¼ka."
 
-#: appinfo/app.php:10
+#: appinfo/app.php:12
 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:92 templates/index.php:93
+#: 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/files.js:292 js/files.js:408
-#: js/files.js:439
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "OczekujÄ…ce"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} juÅ¼ istnieje"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "zastÄ…p"
 
-#: js/filelist.js:251
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "zasugeruj nazwÄ™"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "anuluj"
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "zastÄ…piono {new_name} przez {old_name}"
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "undo"
 msgstr "cofnij"
 
-#: js/filelist.js:323
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr "wykonaj operacjÄ™ usuniÄ™cia"
 
+#: js/filelist.js:413
+msgid "1 file uploading"
+msgstr "1 plik wczytywany"
+
+#: js/filelist.js:416 js/filelist.js:470
+msgid "files uploading"
+msgstr "pliki wczytane"
+
 #: js/files.js:52
 msgid "'.' is an invalid file name."
 msgstr "â€ž.â€ jest nieprawidÅ‚owÄ… nazwÄ… pliku."
@@ -155,80 +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:225
+#: 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:262
+#: 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:262
-msgid "Upload Error"
-msgstr "BÅ‚Ä…d wczytywania"
-
-#: js/files.js:273
-msgid "Close"
-msgstr "Zamknij"
+#: js/files.js:277
+msgid "Not enough space available"
+msgstr "Za maÅ‚o miejsca"
 
-#: js/files.js:312
-msgid "1 file uploading"
-msgstr "1 plik wczytywany"
-
-#: js/files.js:315 js/files.js:370 js/files.js:385
-msgid "{count} files uploading"
-msgstr "IloÅ›Ä‡ przesyÅ‚anych plikÃ³w: {count}"
-
-#: js/files.js:388 js/files.js:423
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "Wczytywanie anulowane."
 
-#: js/files.js:497
+#: 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:570
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "URL nie moÅ¼e byÄ‡ pusty."
 
-#: js/files.js:575
+#: 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:953 templates/index.php:68
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+msgid "Error"
+msgstr "BÅ‚Ä…d"
+
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Nazwa"
 
-#: js/files.js:954 templates/index.php:79
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Rozmiar"
 
-#: js/files.js:955 templates/index.php:81
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Modyfikacja"
 
-#: js/files.js:974
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 folder"
 
-#: js/files.js:976
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "IloÅ›Ä‡ folderÃ³w: {count}"
 
-#: js/files.js:984
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 plik"
 
-#: js/files.js:986
+#: 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"
@@ -272,51 +270,51 @@ msgstr "Plik tekstowy"
 
 #: templates/index.php:12
 msgid "Folder"
-msgstr "Katalog"
+msgstr "Folder"
 
 #: templates/index.php:14
 msgid "From link"
 msgstr "Z odnoÅ›nika"
 
-#: templates/index.php:40
+#: templates/index.php:42
 msgid "Deleted files"
 msgstr "Pliki usuniÄ™te"
 
-#: templates/index.php:46
+#: templates/index.php:48
 msgid "Cancel upload"
 msgstr "Anuluj wysyÅ‚anie"
 
-#: templates/index.php:53
+#: templates/index.php:54
 msgid "You donâ€™t have write permissions here."
 msgstr "Nie masz uprawnieÅ„ do zapisu w tym miejscu."
 
-#: templates/index.php:60
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Pusto. WyÅ›lij coÅ›!"
 
-#: templates/index.php:74
+#: templates/index.php:75
 msgid "Download"
 msgstr "Pobierz"
 
-#: templates/index.php:86 templates/index.php:87
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
-msgstr "Nie udostÄ™pniaj"
+msgstr "Zatrzymaj wspÃ³Å‚dzielenie"
 
-#: templates/index.php:106
+#: 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:108
+#: 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:113
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Skanowanie plikÃ³w, proszÄ™ czekaÄ‡."
 
-#: templates/index.php:116
+#: 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..7fd0d19e5c7bfc3ea466ba84fe4fec80f444dbfb 100644
--- a/l10n/pl/files_encryption.po
+++ b/l10n/pl/files_encryption.po
@@ -3,15 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Bartek Krawczyk <bbartlomiej@gmail.com>, 2013.
-# Cyryl Sochacki <>, 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: bbartlomiej <bbartlomiej@gmail.com>\n"
+"POT-Creation-Date: 2013-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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"
@@ -37,4 +35,4 @@ msgstr "WyÅ‚Ä…cz poniÅ¼sze typy plikÃ³w z szyfrowania:"
 
 #: templates/settings.php:12
 msgid "None"
-msgstr "Brak"
+msgstr "Nic"
diff --git a/l10n/pl/files_external.po b/l10n/pl/files_external.po
index 9111a967f72c99f863d8e597e3c841f7d2b7717a..d363de4780ff58c834658b178fd6fd7a20599726 100644
--- a/l10n/pl/files_external.po
+++ b/l10n/pl/files_external.po
@@ -3,17 +3,13 @@
 # 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.
 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: Maciej Tarmas <maciej@tarmas.com>\n"
+"POT-Creation-Date: 2013-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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"
@@ -41,19 +37,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: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 "<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: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 "<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 ""
+
 #: 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..e97f578322f32d156e39fdbf33958b8facab1a72 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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 a226bea7473c177940db25b6cfeec51fcf9f36ac..0b1495b8d0f9836a901b4bf10329a9df9ef00117 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-03-08 00:25+0100\n"
-"PO-Revision-Date: 2013-03-07 23:25+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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"
@@ -18,12 +17,12 @@ 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/delete.php:40
+#: ajax/delete.php:42
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "Nie moÅ¼na trwale usunÄ…Ä‡ %s"
 
-#: ajax/undelete.php:41
+#: ajax/undelete.php:42
 #, php-format
 msgid "Couldn't restore %s"
 msgstr "Nie moÅ¼na przywrÃ³ciÄ‡ %s"
@@ -32,6 +31,10 @@ msgstr "Nie moÅ¼na przywrÃ³ciÄ‡ %s"
 msgid "perform restore operation"
 msgstr "wykonywanie operacji przywracania"
 
+#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+msgid "Error"
+msgstr "BÅ‚Ä…d"
+
 #: js/trash.js:34
 msgid "delete file permanently"
 msgstr "trwale usuÅ„ plik"
@@ -54,7 +57,7 @@ msgstr "1 folder"
 
 #: js/trash.js:186
 msgid "{count} folders"
-msgstr "{count} foldery"
+msgstr "IloÅ›Ä‡ folderÃ³w: {count}"
 
 #: js/trash.js:194
 msgid "1 file"
@@ -62,7 +65,7 @@ msgstr "1 plik"
 
 #: js/trash.js:196
 msgid "{count} files"
-msgstr "{count} pliki"
+msgstr "IloÅ›Ä‡ plikÃ³w: {count}"
 
 #: templates/index.php:9
 msgid "Nothing in here. Your trash bin is empty!"
@@ -78,4 +81,4 @@ msgstr "UsuÅ„"
 
 #: templates/part.breadcrumb.php:9
 msgid "Deleted Files"
-msgstr ""
+msgstr "UsuniÄ™te pliki"
diff --git a/l10n/pl/files_versions.po b/l10n/pl/files_versions.po
index 54824d793e71939227f1ccbb9b3ad25ba97dbc33..f06438de5b69bd9e2ec1e0a363ad92b389682b66 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:30+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 47111cb368f681ad89b6673d81c136f2bb49c2d3..db80af0529977c999f9886ca64b4727efedb6a25 100644
--- a/l10n/pl/lib.po
+++ b/l10n/pl/lib.po
@@ -3,17 +3,13 @@
 # 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.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-04 00:06+0100\n"
-"PO-Revision-Date: 2013-03-03 07:30+0000\n"
-"Last-Translator: Maciej Tarmas <maciej@tarmas.com>\n"
+"POT-Creation-Date: 2013-04-28 01:57+0200\n"
+"PO-Revision-Date: 2013-04-27 23:57+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"
@@ -45,19 +41,19 @@ msgstr "Aplikacje"
 msgid "Admin"
 msgstr "Administrator"
 
-#: files.php:202
+#: files.php:209
 msgid "ZIP download is turned off."
 msgstr "Pobieranie ZIP jest wyÅ‚Ä…czone."
 
-#: files.php:203
+#: files.php:210
 msgid "Files need to be downloaded one by one."
 msgstr "Pliki muszÄ… zostaÄ‡ pobrane pojedynczo."
 
-#: files.php:204 files.php:231
+#: files.php:211 files.php:244
 msgid "Back to Files"
 msgstr "WrÃ³Ä‡ do plikÃ³w"
 
-#: files.php:228
+#: files.php:241
 msgid "Selected files too large to generate zip file."
 msgstr "Wybrane pliki sÄ… zbyt duÅ¼e, aby wygenerowaÄ‡ plik zip."
 
@@ -97,10 +93,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 +113,75 @@ 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:128 setup.php:320 setup.php:365
+#: setup.php:132 setup.php:325 setup.php:370
 msgid "PostgreSQL username and/or password not valid"
 msgstr "PostgreSQL: Nazwa uÅ¼ytkownika i/lub hasÅ‚o jest niepoprawne"
 
-#: setup.php:129 setup.php:152 setup.php:229
+#: setup.php:133 setup.php:156 setup.php:234
 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:151 setup.php:453 setup.php:520
+#: setup.php:155 setup.php:458 setup.php:525
 msgid "Oracle username and/or password not valid"
 msgstr "Oracle: Nazwa uÅ¼ytkownika i/lub hasÅ‚o jest niepoprawne"
 
-#: setup.php:228
+#: setup.php:233
 msgid "MySQL username and/or password not valid"
 msgstr "MySQL: Nazwa uÅ¼ytkownika i/lub hasÅ‚o jest niepoprawne"
 
-#: 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: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:583 setup.php:592 setup.php:600 setup.php:609
+#: setup.php:615
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "BÅ‚Ä…d DB: \"%s\""
 
-#: 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:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
+#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
+#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "Niepoprawna komenda: \"%s\""
 
-#: setup.php:299
+#: setup.php:304
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "UÅ¼ytkownik MySQL  '%s'@'localhost' juÅ¼ istnieje"
 
-#: setup.php:300
+#: setup.php:305
 msgid "Drop this user from MySQL"
 msgstr "UsuÅ„ tego uÅ¼ytkownika z MySQL"
 
-#: setup.php:305
+#: setup.php:310
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "UÅ¼ytkownik MySQL  '%s'@'%%t' juÅ¼ istnieje"
 
-#: setup.php:306
+#: setup.php:311
 msgid "Drop this user from MySQL."
 msgstr "UsuÅ„ tego uÅ¼ytkownika z MySQL."
 
-#: setup.php:579 setup.php:611
+#: setup.php:584 setup.php:616
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Niepoprawne polecania:  \"%s\", nazwa: %s, hasÅ‚o: %s"
 
-#: setup.php:631
+#: setup.php:636
 #, 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:849
+#: setup.php:858
 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:850
+#: setup.php:859
 #, 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 +198,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 +207,7 @@ msgstr "%d godzin temu"
 
 #: template.php:118
 msgid "today"
-msgstr "dzisiaj"
+msgstr "dziÅ›"
 
 #: template.php:119
 msgid "yesterday"
@@ -228,7 +220,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 +229,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 66b58472169269f981272daf66283dc6f0dfd8f2..569af9fbc98e18baa9951454c9cc23aedf03fee7 100644
--- a/l10n/pl/settings.po
+++ b/l10n/pl/settings.po
@@ -3,27 +3,14 @@
 # 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.
+# 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-03-03 00:06+0100\n"
-"PO-Revision-Date: 2013-03-02 22:39+0000\n"
-"Last-Translator: Maciej Tarmas <maciej@tarmas.com>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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"
@@ -35,12 +22,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"
 
@@ -106,7 +97,7 @@ msgstr "Aktualizacja do {appversion}"
 msgid "Disable"
 msgstr "WyÅ‚Ä…cz"
 
-#: js/apps.js:36 js/apps.js:64
+#: js/apps.js:36 js/apps.js:64 js/apps.js:83
 msgid "Enable"
 msgstr "WÅ‚Ä…cz"
 
@@ -114,68 +105,68 @@ msgstr "WÅ‚Ä…cz"
 msgid "Please wait...."
 msgstr "ProszÄ™ czekaÄ‡..."
 
-#: js/apps.js:84
+#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+msgid "Error"
+msgstr "BÅ‚Ä…d"
+
+#: js/apps.js:90
 msgid "Updating...."
 msgstr "Aktualizacja w toku..."
 
-#: js/apps.js:87
+#: js/apps.js:93
 msgid "Error while updating app"
 msgstr "BÅ‚Ä…d podczas aktualizacji aplikacji"
 
-#: js/apps.js:87
-msgid "Error"
-msgstr "BÅ‚Ä…d"
-
-#: js/apps.js:90
+#: js/apps.js:96
 msgid "Updated"
 msgstr "Zaktualizowano"
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr "Zapisywanie..."
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "deleted"
 msgstr "usuniÄ™to"
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "undo"
 msgstr "cofnij"
 
-#: js/users.js:62
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr "Nie moÅ¼na usunÄ…Ä‡ uÅ¼ytkownika"
 
-#: js/users.js:75 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
+#: templates/users.php:103
 msgid "Groups"
 msgstr "Grupy"
 
-#: js/users.js:78 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr "Administrator grupy"
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "UsuÅ„"
 
-#: js/users.js:191
+#: js/users.js:269
 msgid "add group"
 msgstr "dodaj grupÄ™"
 
-#: js/users.js:352
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr "NaleÅ¼y podaÄ‡ prawidÅ‚owÄ… nazwÄ™ uÅ¼ytkownika"
 
-#: js/users.js:353 js/users.js:359 js/users.js:374
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr "BÅ‚Ä…d podczas tworzenia uÅ¼ytkownika"
 
-#: js/users.js:358
+#: js/users.js:426
 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,15 +317,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:230 templates/personal.php:102
+#: templates/admin.php:228
+msgid "Less"
+msgstr "Mniej"
+
+#: templates/admin.php:235 templates/personal.php:105
 msgid "Version"
 msgstr "Wersja"
 
-#: templates/admin.php:233 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 "
@@ -366,7 +361,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"
@@ -405,7 +400,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:77
 msgid "Password"
 msgstr "HasÅ‚o"
 
@@ -429,82 +424,70 @@ 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:76
 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:68
 msgid "Email"
-msgstr "E-mail"
+msgstr "Email"
 
-#: templates/personal.php:72
+#: templates/personal.php:70
 msgid "Your email address"
 msgstr "TwÃ³j adres e-mail"
 
-#: templates/personal.php:73
+#: templates/personal.php:71
 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:77 templates/personal.php:78
 msgid "Language"
 msgstr "JÄ™zyk"
 
-#: templates/personal.php:86
+#: templates/personal.php:89
 msgid "Help translate"
 msgstr "PomÃ³Å¼ w tÅ‚umaczeniu"
 
-#: templates/personal.php:91
+#: templates/personal.php:94
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:93
+#: templates/personal.php:96
 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:75
 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:33
 msgid "Default Storage"
 msgstr "Magazyn domyÅ›lny"
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:39 templates/users.php:133
 msgid "Unlimited"
 msgstr "Bez limitu"
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:57 templates/users.php:148
 msgid "Other"
 msgstr "Inne"
 
-#: templates/users.php:84
+#: templates/users.php:82
 msgid "Storage"
 msgstr "Magazyn"
 
-#: templates/users.php:95
+#: templates/users.php:93
 msgid "change display name"
 msgstr "zmieÅ„ wyÅ›wietlanÄ… nazwÄ™"
 
-#: templates/users.php:99
+#: templates/users.php:97
 msgid "set new password"
 msgstr "ustaw nowe hasÅ‚o"
 
-#: templates/users.php:134
+#: templates/users.php:128
 msgid "Default"
 msgstr "DomyÅ›lny"
diff --git a/l10n/pl/user_ldap.po b/l10n/pl/user_ldap.po
index e788ca48f596af0e158c2639b8b47f4d73b310f5..1cd3ec895b8a9ce2d14d0588c525020f00d86e2f 100644
--- a/l10n/pl/user_ldap.po
+++ b/l10n/pl/user_ldap.po
@@ -3,18 +3,13 @@
 # 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.
 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 13:30+0000\n"
-"Last-Translator: Maciej Tarmas <maciej@tarmas.com>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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"
@@ -22,6 +17,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 ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr "Nie moÅ¼na usunÄ…Ä‡ konfiguracji serwera"
@@ -44,7 +43,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 +57,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 ""
+
+#: 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:18
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr "Dodaj konfiguracjÄ™ servera"
 
-#: templates/settings.php:23
+#: templates/settings.php:37
 msgid "Host"
 msgstr "Host"
 
-#: templates/settings.php:25
+#: 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:26
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "Baza DN"
 
-#: templates/settings.php:27
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr "Jedna baza DN na liniÄ™"
 
-#: templates/settings.php:28
+#: 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:30
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "UÅ¼ytkownik DN"
 
-#: 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 "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:33
+#: templates/settings.php:47
 msgid "Password"
 msgstr "HasÅ‚o"
 
-#: templates/settings.php:36
+#: 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:37
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "Filtr logowania uÅ¼ytkownika"
 
-#: 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 "Definiuje filtr do zastosowania, gdy podejmowana jest prÃ³ba logowania. %%uid zastÄ™puje nazwÄ™ uÅ¼ytkownika w dziaÅ‚aniu logowania."
 
-#: templates/settings.php:41
+#: 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:42
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Lista filtrÃ³w uÅ¼ytkownika"
 
-#: templates/settings.php:45
+#: 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:46
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "bez Å¼adnych symboli zastÄ™pczych np. \"objectClass=person\"."
 
-#: templates/settings.php:47
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "Grupa filtrÃ³w"
 
-#: templates/settings.php:50
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Definiuje filtry do zastosowania, podczas pobierania grup."
 
-#: templates/settings.php:51
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "bez Å¼adnych symboli zastÄ™pczych np. \"objectClass=posixGroup\"."
 
-#: templates/settings.php:55
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr "Konfiguracja poÅ‚Ä…czeÅ„"
 
-#: templates/settings.php:57
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr "Konfiguracja archiwum"
 
-#: templates/settings.php:57
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr "Gdy niezaznaczone, ta konfiguracja zostanie pominiÄ™ta."
 
-#: templates/settings.php:58
+#: templates/settings.php:72
 msgid "Port"
 msgstr "Port"
 
-#: templates/settings.php:59
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr "Kopia zapasowa (repliki) host"
 
-#: 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 "DaÄ‡ opcjonalnie  hosta kopii zapasowej . To musi byÄ‡ replikÄ… gÅ‚Ã³wnego serwera LDAP/AD."
 
-#: templates/settings.php:60
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr "Kopia zapasowa (repliki) Port"
 
-#: templates/settings.php:61
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr "WyÅ‚Ä…cz serwer gÅ‚Ã³wny"
 
-#: templates/settings.php:61
+#: 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:62
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "UÅ¼yj TLS"
 
-#: templates/settings.php:62
+#: 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:63
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "WielkoÅ›Ä‡ liter serwera LDAP (Windows)"
 
-#: templates/settings.php:64
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "WyÅ‚Ä…czyÄ‡ sprawdzanie poprawnoÅ›ci certyfikatu SSL."
 
-#: 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 "JeÅ›li poÅ‚Ä…czenie dziaÅ‚a tylko z tÄ… opcjÄ…, zaimportuj certyfikat SSL serwera LDAP w serwerze ownCloud."
 
-#: templates/settings.php:64
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "Niezalecane, uÅ¼yj tylko testowo."
 
-#: templates/settings.php:65
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr "Przechowuj czas Å¼ycia"
 
-#: templates/settings.php:65
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr "w sekundach. Zmiana oprÃ³Å¼nia pamiÄ™Ä‡ podrÄ™cznÄ…."
 
-#: templates/settings.php:67
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr "Ustawienia katalogÃ³w"
 
-#: templates/settings.php:69
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr "Pole wyÅ›wietlanej nazwy uÅ¼ytkownika"
 
-#: templates/settings.php:69
+#: 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:70
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "Drzewo bazy uÅ¼ytkownikÃ³w"
 
-#: templates/settings.php:70
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr "Jeden uÅ¼ytkownik Bazy DN na liniÄ™"
 
-#: templates/settings.php:71
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr "Szukaj atrybutÃ³w"
 
-#: templates/settings.php:71 templates/settings.php:74
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr "Opcjonalnie; jeden atrybut w wierszu"
 
-#: templates/settings.php:72
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr "Pole wyÅ›wietlanej nazwy grupy"
 
-#: templates/settings.php:72
+#: 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:73
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "Drzewo bazy grup"
 
-#: templates/settings.php:73
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr "Jedna grupa bazy DN na liniÄ™"
 
-#: templates/settings.php:74
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr "Grupa atrybutÃ³w wyszukaj"
 
-#: templates/settings.php:75
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr "CzÅ‚onek grupy stowarzyszenia"
 
-#: templates/settings.php:77
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr "Specjalne atrybuty"
 
-#: templates/settings.php:79
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr "Pole przydziaÅ‚u"
 
-#: templates/settings.php:80
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr "PrzydziaÅ‚ domyÅ›lny"
 
-#: templates/settings.php:80
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr "w bajtach"
 
-#: templates/settings.php:81
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr "Pole email"
 
-#: templates/settings.php:82
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr "ReguÅ‚y nazewnictwa folderu domowego uÅ¼ytkownika"
 
-#: templates/settings.php:82
+#: 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: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 "Konfiguracja testowa"
 
-#: templates/settings.php:86
+#: templates/settings.php:111
 msgid "Help"
 msgstr "Pomoc"
diff --git a/l10n/pl/user_webdavauth.po b/l10n/pl/user_webdavauth.po
index 44e963a5a43418d911619eb251586c76198e1753..437dc1175dacc711e32645ee92ab72551a5cd9a9 100644
--- a/l10n/pl/user_webdavauth.po
+++ b/l10n/pl/user_webdavauth.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-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-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -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 fd6666ba2ddbbb7b5bf46e34e19ac1546b085858..39727ca3bad8467f4f1b278c7e5f61b732b6932d 100644
--- a/l10n/pl_PL/core.po
+++ b/l10n/pl_PL/core.po
@@ -7,34 +7,34 @@ 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: 2013-02-08 23:12+0000\n"
+"POT-Creation-Date: 2013-04-30 01:57+0200\n"
+"PO-Revision-Date: 2013-04-29 23:57+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"
+"Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "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/share.php:85
+#: ajax/share.php:97
 #, php-format
 msgid "User %s shared a file with you"
 msgstr ""
 
-#: ajax/share.php:87
+#: ajax/share.php:99
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr ""
 
-#: ajax/share.php:89
+#: 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:91
+#: ajax/share.php:104
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -80,156 +80,156 @@ msgstr ""
 msgid "Error removing %s from favorites."
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:34
 msgid "Sunday"
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:35
 msgid "Monday"
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Tuesday"
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:37
 msgid "Wednesday"
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:38
 msgid "Thursday"
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:39
 msgid "Friday"
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:40
 msgid "Saturday"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:45
 msgid "January"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:46
 msgid "February"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:47
 msgid "March"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:48
 msgid "April"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:49
 msgid "May"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:50
 msgid "June"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:51
 msgid "July"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:52
 msgid "August"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:53
 msgid "September"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:54
 msgid "October"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:55
 msgid "November"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:56
 msgid "December"
 msgstr ""
 
-#: js/js.js:284
+#: js/js.js:286
 msgid "Settings"
 msgstr "Ustawienia"
 
-#: js/js.js:764
+#: js/js.js:718
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:765
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:766
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:767
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:768
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:769
+#: js/js.js:723
 msgid "today"
 msgstr ""
 
-#: js/js.js:770
+#: js/js.js:724
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:771
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:772
+#: js/js.js:726
 msgid "last month"
 msgstr ""
 
-#: js/js.js:773
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:774
+#: js/js.js:728
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:775
+#: js/js.js:729
 msgid "last year"
 msgstr ""
 
-#: js/js.js:776
+#: js/js.js:730
 msgid "years ago"
 msgstr ""
 
-#: js/oc-dialogs.js:126
-msgid "Choose"
+#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
+msgid "Ok"
 msgstr ""
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
 msgid "Cancel"
 msgstr ""
 
-#: js/oc-dialogs.js:162
-msgid "No"
+#: js/oc-dialogs.js:185
+msgid "Choose"
 msgstr ""
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:215
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:180
-msgid "Ok"
+#: js/oc-dialogs.js:222
+msgid "No"
 msgstr ""
 
 #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
@@ -237,9 +237,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:152 js/share.js:159 js/share.js:571
-#: js/share.js:583
+#: 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 ""
 
@@ -251,127 +253,127 @@ msgstr ""
 msgid "The required file {file} is not installed!"
 msgstr ""
 
-#: js/share.js:29 js/share.js:43 js/share.js:90 js/share.js:93
-msgid "Share"
+#: js/share.js:30 js/share.js:45 js/share.js:87
+msgid "Shared"
 msgstr ""
 
-#: js/share.js:29 js/share.js:43 js/share.js:90 js/share.js:93
-msgid "Shared"
+#: js/share.js:90
+msgid "Share"
 msgstr ""
 
-#: js/share.js:141 js/share.js:611
+#: js/share.js:125 js/share.js:617
 msgid "Error while sharing"
 msgstr ""
 
-#: js/share.js:152
+#: js/share.js:136
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:159
+#: js/share.js:143
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:168
+#: js/share.js:152
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:170
+#: js/share.js:154
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:175
+#: js/share.js:159
 msgid "Share with"
 msgstr ""
 
-#: js/share.js:180
+#: js/share.js:164
 msgid "Share with link"
 msgstr ""
 
-#: js/share.js:183
+#: js/share.js:167
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:185 templates/installation.php:44 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr ""
 
-#: js/share.js:189
+#: js/share.js:173
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:190
+#: js/share.js:174
 msgid "Send"
 msgstr ""
 
-#: js/share.js:194
+#: js/share.js:178
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:195
+#: js/share.js:179
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:227
+#: js/share.js:211
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:229
+#: js/share.js:213
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:256
+#: js/share.js:251
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:292
+#: js/share.js:287
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:313
+#: js/share.js:308
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:325
+#: js/share.js:320
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:327
+#: js/share.js:322
 msgid "access control"
 msgstr ""
 
-#: js/share.js:330
+#: js/share.js:325
 msgid "create"
 msgstr ""
 
-#: js/share.js:333
+#: js/share.js:328
 msgid "update"
 msgstr ""
 
-#: js/share.js:336
+#: js/share.js:331
 msgid "delete"
 msgstr ""
 
-#: js/share.js:339
+#: js/share.js:334
 msgid "share"
 msgstr ""
 
-#: js/share.js:373 js/share.js:558
+#: js/share.js:368 js/share.js:564
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:571
+#: js/share.js:577
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:583
+#: js/share.js:589
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:598
+#: js/share.js:604
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:609
+#: js/share.js:615
 msgid "Email sent"
 msgstr ""
 
@@ -386,7 +388,7 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:47
+#: lostpassword/controller.php:48
 msgid "ownCloud password reset"
 msgstr ""
 
@@ -394,24 +396,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:39
-#: 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 ""
 
@@ -467,115 +472,130 @@ msgstr ""
 msgid "Add"
 msgstr ""
 
-#: templates/installation.php:23 templates/installation.php:30
+#: 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:25
+#: 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:31
+#: 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:32
+#: 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:36
+#: templates/installation.php:44
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
-#: templates/installation.php:52
+#: templates/installation.php:62
 msgid "Advanced"
 msgstr ""
 
-#: templates/installation.php:54
+#: templates/installation.php:64
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:61
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:66 templates/installation.php:77
-#: templates/installation.php:87 templates/installation.php:97
+#: 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:109
+#: templates/installation.php:137
 msgid "Database user"
 msgstr ""
 
-#: templates/installation.php:113
+#: templates/installation.php:144
 msgid "Database password"
 msgstr ""
 
-#: templates/installation.php:117
+#: templates/installation.php:149
 msgid "Database name"
 msgstr ""
 
-#: templates/installation.php:125
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:131
+#: templates/installation.php:166
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:136
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr ""
 
-#: templates/layout.guest.php:33
+#: templates/layout.guest.php:40
 msgid "web services under your control"
 msgstr ""
 
-#: templates/layout.user.php:48
+#: 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/pl_PL/files.po b/l10n/pl_PL/files.po
index a3b275e94fa8bb0b4bd15cbda36ab5f653085e06..8e524496642b6e56201af77d9017195929ada877 100644
--- a/l10n/pl_PL/files.po
+++ b/l10n/pl_PL/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-03-04 00:06+0100\n"
-"PO-Revision-Date: 2013-03-03 23:06+0000\n"
+"POT-Creation-Date: 2013-05-15 01:59+0200\n"
+"PO-Revision-Date: 2013-05-15 00:00+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"
+"Language-Team: LANGUAGE <LL@li.org>\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 ""
@@ -70,59 +66,70 @@ msgstr ""
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:10
+#: 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 ""
 
-#: js/fileactions.js:127 templates/index.php:92 templates/index.php:93
+#: 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/files.js:292 js/files.js:408
-#: js/files.js:439
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:251
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:323
+#: 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 ""
@@ -145,77 +152,77 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:225
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:262
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:262
-msgid "Upload Error"
-msgstr ""
-
-#: js/files.js:273
-msgid "Close"
+#: js/files.js:277
+msgid "Not enough space available"
 msgstr ""
 
-#: js/files.js:312
-msgid "1 file uploading"
-msgstr ""
-
-#: js/files.js:315 js/files.js:370 js/files.js:385
-msgid "{count} files uploading"
-msgstr ""
-
-#: js/files.js:388 js/files.js:423
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:497
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:570
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:575
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:953 templates/index.php:68
+#: 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:954 templates/index.php:79
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr ""
 
-#: js/files.js:955 templates/index.php:81
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:974
+#: js/files.js:898
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:976
+#: js/files.js:900
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:984
+#: js/files.js:908
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:986
+#: 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 ""
@@ -268,45 +275,45 @@ msgstr ""
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:42
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:48
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:53
+#: templates/index.php:54
 msgid "You donâ€™t have write permissions here."
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:74
+#: templates/index.php:75
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:86 templates/index.php:87
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr ""
 
-#: templates/index.php:106
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:108
+#: 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:113
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:116
+#: 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..13ec81b2fa52b2cbacf5d105da444582ea580410 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-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/pl_PL/files_external.po b/l10n/pl_PL/files_external.po
index abd87d253b8b65416d0c841084e8a584975c02a2..aec6c07a33f401d635c00e9e44ab6153d2638a42 100644
--- a/l10n/pl_PL/files_external.po
+++ b/l10n/pl_PL/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-04-24 01:57+0200\n"
+"PO-Revision-Date: 2013-04-23 23:58+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"
@@ -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..6bd035fa98c10a6455f216441eca58de45f71f4d 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-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+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"
 "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 3de7aff0fae4c1ddc19a3f4f190356294adbdeaa..7920003d18cd3d73b01fb3610930bbf6a598f2b4 100644
--- a/l10n/pl_PL/files_trashbin.po
+++ b/l10n/pl_PL/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-08 00:25+0100\n"
-"PO-Revision-Date: 2013-03-07 23:25+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+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,12 +17,12 @@ 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/delete.php:40
+#: ajax/delete.php:42
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
 
-#: ajax/undelete.php:41
+#: ajax/undelete.php:42
 #, php-format
 msgid "Couldn't restore %s"
 msgstr ""
@@ -31,6 +31,10 @@ msgstr ""
 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 ""
diff --git a/l10n/pl_PL/files_versions.po b/l10n/pl_PL/files_versions.po
index 8634a4a3e6a649fc4119ccdb39ad926584281e87..f20407f561a4ce3ab3be4c5a0440da824c13de47 100644
--- a/l10n/pl_PL/files_versions.po
+++ b/l10n/pl_PL/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-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+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"
@@ -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 3a14af541f8912cb071316e2df74dd0e0e77d8c6..d30c8af65263eab644413de4e71d00ac79df06ba 100644
--- a/l10n/pl_PL/lib.po
+++ b/l10n/pl_PL/lib.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-27 14:35+0100\n"
-"PO-Revision-Date: 2013-02-27 13:35+0000\n"
+"POT-Creation-Date: 2013-04-28 01:57+0200\n"
+"PO-Revision-Date: 2013-04-27 23:57+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"
+"Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -41,19 +41,19 @@ msgstr ""
 msgid "Admin"
 msgstr ""
 
-#: files.php:202
+#: files.php:209
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:203
+#: files.php:210
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:204 files.php:231
+#: files.php:211 files.php:244
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:228
+#: files.php:241
 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,72 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:128 setup.php:320 setup.php:365
+#: setup.php:132 setup.php:325 setup.php:370
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:129 setup.php:152 setup.php:229
+#: setup.php:133 setup.php:156 setup.php:234
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:151 setup.php:453 setup.php:520
+#: setup.php:155 setup.php:458 setup.php:525
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:228
+#: setup.php:233
 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: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:583 setup.php:592 setup.php:600 setup.php:609
+#: setup.php:615
 #, 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:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
+#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
+#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:299
+#: setup.php:304
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:300
+#: setup.php:305
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:305
+#: setup.php:310
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:306
+#: setup.php:311
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:579 setup.php:611
+#: setup.php:584 setup.php:616
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:631
+#: setup.php:636
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:849
+#: setup.php:858
 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:859
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
@@ -239,19 +235,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 3a1780a3529c09fa493350b1126598b7af0b3ccc..6624c31b203531649842866ac762507598c6badb 100644
--- a/l10n/pl_PL/settings.po
+++ b/l10n/pl_PL/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-02-27 14:35+0100\n"
-"PO-Revision-Date: 2013-02-27 13:35+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"
+"POT-Creation-Date: 2013-04-27 02:17+0200\n"
+"PO-Revision-Date: 2013-04-26 08:00+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\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 ""
 
@@ -92,7 +96,7 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: js/apps.js:36 js/apps.js:64
+#: js/apps.js:36 js/apps.js:64 js/apps.js:83
 msgid "Enable"
 msgstr ""
 
@@ -100,68 +104,68 @@ msgstr ""
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:84
-msgid "Updating...."
+#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+msgid "Error"
 msgstr ""
 
-#: js/apps.js:87
-msgid "Error while updating app"
+#: js/apps.js:90
+msgid "Updating...."
 msgstr ""
 
-#: js/apps.js:87
-msgid "Error"
+#: js/apps.js:93
+msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:90
+#: js/apps.js:96
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr ""
 
-#: js/users.js:30
+#: js/users.js:43
 msgid "deleted"
 msgstr ""
 
-#: js/users.js:30
+#: js/users.js:43
 msgid "undo"
 msgstr ""
 
-#: js/users.js:62
+#: js/users.js:75
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:75 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: templates/users.php:103
 msgid "Groups"
 msgstr ""
 
-#: js/users.js:78 templates/users.php:82 templates/users.php:119
+#: js/users.js:91 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:111 templates/users.php:155
 msgid "Delete"
 msgstr ""
 
-#: js/users.js:191
+#: js/users.js:262
 msgid "add group"
 msgstr ""
 
-#: js/users.js:352
+#: js/users.js:414
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:353 js/users.js:359 js/users.js:374
+#: js/users.js:415 js/users.js:421 js/users.js:436
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:358
+#: js/users.js:420
 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,15 +316,19 @@ msgstr ""
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:230 templates/personal.php:102
+#: templates/admin.php:228
+msgid "Less"
+msgstr ""
+
+#: templates/admin.php:235 templates/personal.php:105
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:233 templates/personal.php:105
+#: templates/admin.php:238 templates/personal.php:108
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -391,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:77
 msgid "Password"
 msgstr ""
 
@@ -415,82 +423,70 @@ msgstr ""
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:76
 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 "Email"
 
-#: 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:75
 msgid "Login Name"
 msgstr ""
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr ""
 
-#: templates/users.php:35
+#: templates/users.php:33
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:39 templates/users.php:133
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:57 templates/users.php:148
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:84
+#: templates/users.php:82
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:95
+#: templates/users.php:93
 msgid "change display name"
 msgstr ""
 
-#: templates/users.php:99
+#: templates/users.php:97
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:134
+#: templates/users.php:128
 msgid "Default"
 msgstr ""
diff --git a/l10n/pl_PL/user_ldap.po b/l10n/pl_PL/user_ldap.po
index 34b3f1b71578e51934807c738ba48da60dba6f69..9d3f142fb47f23ab1a2a6eb77d05b62812731ddc 100644
--- a/l10n/pl_PL/user_ldap.po
+++ b/l10n/pl_PL/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-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+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"
@@ -86,248 +86,248 @@ msgstr ""
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:18
+#: templates/settings.php:31
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:36
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:38
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:39
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:40
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:28
+#: templates/settings.php:41
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:30
+#: templates/settings.php:43
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:32
+#: templates/settings.php:45
 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:46
 msgid "Password"
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:49
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:50
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:53
 #, 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:54
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:55
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:58
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:59
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:47
+#: templates/settings.php:60
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:63
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:64
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:68
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:70
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:70
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:71
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:72
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:72
 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:73
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:74
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:74
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:62
+#: templates/settings.php:75
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:62
+#: templates/settings.php:75
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:63
+#: templates/settings.php:76
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:64
+#: templates/settings.php:77
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:64
+#: templates/settings.php:77
 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:77
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:65
+#: templates/settings.php:78
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:65
+#: templates/settings.php:78
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:67
+#: templates/settings.php:80
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:82
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:82
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:83
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:83
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:84
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:71 templates/settings.php:74
+#: templates/settings.php:84 templates/settings.php:87
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:85
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:85
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:86
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:86
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:87
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:88
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:90
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:92
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:80
+#: templates/settings.php:93
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:80
+#: templates/settings.php:93
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:81
+#: templates/settings.php:94
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:95
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:95
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:99
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:99
 msgid "Help"
 msgstr ""
diff --git a/l10n/pl_PL/user_webdavauth.po b/l10n/pl_PL/user_webdavauth.po
index 2ffe7523c4db1a9d706ea27a6e82aeac667ce821..8056a470e9904c6d6ea615f0ede9b8e3db69cef1 100644
--- a/l10n/pl_PL/user_webdavauth.po
+++ b/l10n/pl_PL/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-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+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"
@@ -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 f89a43e9dd01cd5e9752d7ca80ab2c2b2c2bbb98..e92342be50451f1320b2a49ae1c60dc7f5b36e4a 100644
--- a/l10n/pt_BR/core.po
+++ b/l10n/pt_BR/core.po
@@ -3,24 +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.
-# 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-02-22 00:06+0100\n"
-"PO-Revision-Date: 2013-02-20 23:20+0000\n"
-"Last-Translator: rodrigost23 <rodrigo.st23@hotmail.com>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:15+0000\n"
+"Last-Translator: FlÃ¡vio Veras <flaviove@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -28,24 +18,24 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ajax/share.php:85
+#: ajax/share.php:97
 #, php-format
 msgid "User %s shared a file with you"
 msgstr "O usuÃ¡rio %s compartilhou um arquivo com vocÃª"
 
-#: ajax/share.php:87
+#: ajax/share.php:99
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr "O usuÃ¡rio %s compartilhou uma pasta com vocÃª"
 
-#: ajax/share.php:89
+#: ajax/share.php:101
 #, php-format
 msgid ""
 "User %s shared the file \"%s\" with you. It is available for download here: "
 "%s"
 msgstr "O usuÃ¡rio %s compartilhou com vocÃª o arquivo \"%s\", que estÃ¡ disponÃvel para download em: %s"
 
-#: ajax/share.php:91
+#: ajax/share.php:104
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -84,173 +74,175 @@ 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
 msgid "Error removing %s from favorites."
 msgstr "Erro ao remover %s dos favoritos."
 
-#: js/config.php:32
+#: js/config.php:34
 msgid "Sunday"
 msgstr "Domingo"
 
-#: js/config.php:32
+#: js/config.php:35
 msgid "Monday"
 msgstr "Segunda-feira"
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Tuesday"
 msgstr "TerÃ§a-feira"
 
-#: js/config.php:32
+#: js/config.php:37
 msgid "Wednesday"
 msgstr "Quarta-feira"
 
-#: js/config.php:32
+#: js/config.php:38
 msgid "Thursday"
 msgstr "Quinta-feira"
 
-#: js/config.php:32
+#: js/config.php:39
 msgid "Friday"
 msgstr "Sexta-feira"
 
-#: js/config.php:32
+#: js/config.php:40
 msgid "Saturday"
 msgstr "SÃ¡bado"
 
-#: js/config.php:33
+#: js/config.php:45
 msgid "January"
 msgstr "janeiro"
 
-#: js/config.php:33
+#: js/config.php:46
 msgid "February"
 msgstr "fevereiro"
 
-#: js/config.php:33
+#: js/config.php:47
 msgid "March"
 msgstr "marÃ§o"
 
-#: js/config.php:33
+#: js/config.php:48
 msgid "April"
 msgstr "abril"
 
-#: js/config.php:33
+#: js/config.php:49
 msgid "May"
 msgstr "maio"
 
-#: js/config.php:33
+#: js/config.php:50
 msgid "June"
 msgstr "junho"
 
-#: js/config.php:33
+#: js/config.php:51
 msgid "July"
 msgstr "julho"
 
-#: js/config.php:33
+#: js/config.php:52
 msgid "August"
 msgstr "agosto"
 
-#: js/config.php:33
+#: js/config.php:53
 msgid "September"
 msgstr "setembro"
 
-#: js/config.php:33
+#: js/config.php:54
 msgid "October"
 msgstr "outubro"
 
-#: js/config.php:33
+#: js/config.php:55
 msgid "November"
 msgstr "novembro"
 
-#: js/config.php:33
+#: js/config.php:56
 msgid "December"
 msgstr "dezembro"
 
 #: js/js.js:286
 msgid "Settings"
-msgstr "ConfiguraÃ§Ãµes"
+msgstr "Ajustes"
 
-#: js/js.js:767
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "segundos atrÃ¡s"
 
-#: js/js.js:768
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "1 minuto atrÃ¡s"
 
-#: js/js.js:769
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr "{minutes} minutos atrÃ¡s"
 
-#: js/js.js:770
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr "1 hora atrÃ¡s"
 
-#: js/js.js:771
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr "{hours} horas atrÃ¡s"
 
-#: js/js.js:772
+#: js/js.js:723
 msgid "today"
 msgstr "hoje"
 
-#: js/js.js:773
+#: js/js.js:724
 msgid "yesterday"
 msgstr "ontem"
 
-#: js/js.js:774
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr "{days} dias atrÃ¡s"
 
-#: js/js.js:775
+#: js/js.js:726
 msgid "last month"
 msgstr "Ãºltimo mÃªs"
 
-#: js/js.js:776
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr "{months} meses atrÃ¡s"
 
-#: js/js.js:777
+#: js/js.js:728
 msgid "months ago"
 msgstr "meses atrÃ¡s"
 
-#: js/js.js:778
+#: js/js.js:729
 msgid "last year"
 msgstr "Ãºltimo ano"
 
-#: js/js.js:779
+#: js/js.js:730
 msgid "years ago"
 msgstr "anos atrÃ¡s"
 
-#: js/oc-dialogs.js:126
-msgid "Choose"
-msgstr "Escolha"
+#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
+msgid "Ok"
+msgstr "Ok"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "NÃ£o"
+#: js/oc-dialogs.js:185
+msgid "Choose"
+msgstr "Escolha"
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:215
 msgid "Yes"
 msgstr "Sim"
 
-#: js/oc-dialogs.js:180
-msgid "Ok"
-msgstr "Ok"
+#: js/oc-dialogs.js:222
+msgid "No"
+msgstr "NÃ£o"
 
 #: 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 "O tipo de objeto nÃ£o foi especificado."
 
-#: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:582
-#: js/share.js:594
+#: 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 "Erro"
 
@@ -262,127 +254,127 @@ msgstr "O nome do app nÃ£o foi especificado."
 msgid "The required file {file} is not installed!"
 msgstr "O arquivo {file} necessÃ¡rio nÃ£o estÃ¡ instalado!"
 
-#: js/share.js:29 js/share.js:43 js/share.js:90
+#: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr "Compartilhados"
 
-#: js/share.js:93
+#: js/share.js:90
 msgid "Share"
 msgstr "Compartilhar"
 
-#: js/share.js:141 js/share.js:622
+#: js/share.js:125 js/share.js:617
 msgid "Error while sharing"
 msgstr "Erro ao compartilhar"
 
-#: js/share.js:152
+#: js/share.js:136
 msgid "Error while unsharing"
 msgstr "Erro ao descompartilhar"
 
-#: js/share.js:159
+#: js/share.js:143
 msgid "Error while changing permissions"
 msgstr "Erro ao mudar permissÃµes"
 
-#: js/share.js:168
+#: js/share.js:152
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Compartilhado com vocÃª e com o grupo {group} por {owner}"
 
-#: js/share.js:170
+#: js/share.js:154
 msgid "Shared with you by {owner}"
 msgstr "Compartilhado com vocÃª por {owner}"
 
-#: js/share.js:175
+#: js/share.js:159
 msgid "Share with"
 msgstr "Compartilhar com"
 
-#: js/share.js:180
+#: js/share.js:164
 msgid "Share with link"
 msgstr "Compartilhar com link"
 
-#: js/share.js:183
+#: js/share.js:167
 msgid "Password protect"
 msgstr "Proteger com senha"
 
-#: js/share.js:185 templates/installation.php:44 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Senha"
 
-#: js/share.js:189
+#: js/share.js:173
 msgid "Email link to person"
 msgstr "Enviar link por e-mail"
 
-#: js/share.js:190
+#: js/share.js:174
 msgid "Send"
 msgstr "Enviar"
 
-#: js/share.js:194
+#: js/share.js:178
 msgid "Set expiration date"
 msgstr "Definir data de expiraÃ§Ã£o"
 
-#: js/share.js:195
+#: js/share.js:179
 msgid "Expiration date"
 msgstr "Data de expiraÃ§Ã£o"
 
-#: js/share.js:227
+#: js/share.js:211
 msgid "Share via email:"
 msgstr "Compartilhar via e-mail:"
 
-#: js/share.js:229
+#: js/share.js:213
 msgid "No people found"
 msgstr "Nenhuma pessoa encontrada"
 
-#: js/share.js:256
+#: js/share.js:251
 msgid "Resharing is not allowed"
 msgstr "NÃ£o Ã© permitido re-compartilhar"
 
-#: js/share.js:292
+#: js/share.js:287
 msgid "Shared in {item} with {user}"
 msgstr "Compartilhado em {item} com {user}"
 
-#: js/share.js:313
+#: js/share.js:308
 msgid "Unshare"
 msgstr "Descompartilhar"
 
-#: js/share.js:325
+#: js/share.js:320
 msgid "can edit"
 msgstr "pode editar"
 
-#: js/share.js:327
+#: js/share.js:322
 msgid "access control"
 msgstr "controle de acesso"
 
-#: js/share.js:330
+#: js/share.js:325
 msgid "create"
 msgstr "criar"
 
-#: js/share.js:333
+#: js/share.js:328
 msgid "update"
 msgstr "atualizar"
 
-#: js/share.js:336
+#: js/share.js:331
 msgid "delete"
 msgstr "remover"
 
-#: js/share.js:339
+#: js/share.js:334
 msgid "share"
 msgstr "compartilhar"
 
-#: js/share.js:373 js/share.js:569
+#: js/share.js:368 js/share.js:564
 msgid "Password protected"
 msgstr "Protegido com senha"
 
-#: js/share.js:582
+#: js/share.js:577
 msgid "Error unsetting expiration date"
 msgstr "Erro ao remover data de expiraÃ§Ã£o"
 
-#: js/share.js:594
+#: js/share.js:589
 msgid "Error setting expiration date"
 msgstr "Erro ao definir data de expiraÃ§Ã£o"
 
-#: js/share.js:609
+#: js/share.js:604
 msgid "Sending ..."
 msgstr "Enviando ..."
 
-#: js/share.js:620
+#: js/share.js:615
 msgid "Email sent"
 msgstr "E-mail enviado"
 
@@ -405,24 +397,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:39
-#: 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"
 
@@ -452,7 +447,7 @@ msgstr "UsuÃ¡rios"
 
 #: strings.php:7
 msgid "Apps"
-msgstr "Apps"
+msgstr "AplicaÃ§Ãµes"
 
 #: strings.php:8
 msgid "Admin"
@@ -478,115 +473,130 @@ msgstr "Editar categorias"
 msgid "Add"
 msgstr "Adicionar"
 
-#: templates/installation.php:23 templates/installation.php:30
+#: templates/installation.php:24 templates/installation.php:31
+#: templates/installation.php:38
 msgid "Security Warning"
 msgstr "Aviso de SeguranÃ§a"
 
-#: templates/installation.php:24
+#: templates/installation.php:25
+msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
+msgstr "Sua versÃ£o do PHP estÃ¡ vulnerÃ¡vel ao ataque NULL Byte (CVE-2006-7243)"
+
+#: templates/installation.php:26
+msgid "Please update your PHP installation to use ownCloud securely."
+msgstr "Por favor atualize sua instalaÃ§Ã£o do PHP para utilizar o ownCloud de forma segura."
+
+#: templates/installation.php:32
 msgid ""
 "No secure random number generator is available, please enable the PHP "
 "OpenSSL extension."
 msgstr "Nenhum gerador de nÃºmero aleatÃ³rio de seguranÃ§a disponÃvel. Habilite a extensÃ£o OpenSSL do PHP."
 
-#: templates/installation.php:25
+#: 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 "Sem um gerador de nÃºmero aleatÃ³rio de seguranÃ§a, um invasor pode ser capaz de prever os sÃmbolos de redefiniÃ§Ã£o de senhas e assumir sua conta."
 
-#: templates/installation.php:31
+#: templates/installation.php:39
 msgid ""
 "Your data directory and files are probably accessible from the internet "
 "because the .htaccess file does not work."
 msgstr "Seu diretÃ³rio de dados e arquivos sÃ£o provavelmente acessÃveis pela internet, porque o .htaccess nÃ£o funciona."
 
-#: templates/installation.php:32
+#: 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 "Para obter informaÃ§Ãµes sobre como configurar corretamente o seu servidor, consulte a <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentaÃ§Ã£o</a>."
 
-#: templates/installation.php:36
+#: templates/installation.php:44
 msgid "Create an <strong>admin account</strong>"
 msgstr "Criar uma <strong>conta de administrador</strong>"
 
-#: templates/installation.php:52
+#: templates/installation.php:62
 msgid "Advanced"
 msgstr "AvanÃ§ado"
 
-#: templates/installation.php:54
+#: templates/installation.php:64
 msgid "Data folder"
 msgstr "Pasta de dados"
 
-#: templates/installation.php:61
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "Configurar o banco de dados"
 
-#: templates/installation.php:66 templates/installation.php:77
-#: templates/installation.php:87 templates/installation.php:97
+#: 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:109
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "UsuÃ¡rio do banco de dados"
 
-#: templates/installation.php:113
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "Senha do banco de dados"
 
-#: templates/installation.php:117
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "Nome do banco de dados"
 
-#: templates/installation.php:125
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "EspaÃ§o de tabela do banco de dados"
 
-#: templates/installation.php:131
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "Host do banco de dados"
 
-#: templates/installation.php:136
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "Concluir configuraÃ§Ã£o"
 
-#: templates/layout.guest.php:33
+#: templates/layout.guest.php:40
 msgid "web services under your control"
 msgstr "serviÃ§os web sob seu controle"
 
-#: templates/layout.user.php:48
+#: templates/layout.user.php:36
+#, 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:61
 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 9bf36d86207f039cbdb177b36bbffd5980f441e1..5d86a5195a4304c60498a846b4c454293753aa3f 100644
--- a/l10n/pt_BR/files.po
+++ b/l10n/pt_BR/files.po
@@ -3,24 +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.
-#   <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-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-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:15+0000\n"
+"Last-Translator: FlÃ¡vio Veras <flaviove@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -38,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 ""
@@ -59,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"
@@ -81,59 +67,70 @@ msgstr "Falha ao escrever no disco"
 msgid "Not enough storage available"
 msgstr "EspaÃ§o de armazenamento insuficiente"
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr "DiretÃ³rio invÃ¡lido."
 
-#: appinfo/app.php:10
+#: appinfo/app.php:12
 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:92 templates/index.php:93
+#: 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/files.js:293 js/files.js:409
-#: js/files.js:440
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "Pendente"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} jÃ¡ existe"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "substituir"
 
-#: js/filelist.js:251
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "sugerir nome"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "cancelar"
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "SubstituÃdo {old_name} por {new_name} "
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "undo"
 msgstr "desfazer"
 
-#: js/filelist.js:323
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr "realizar operaÃ§Ã£o de exclusÃ£o"
 
+#: js/filelist.js:413
+msgid "1 file uploading"
+msgstr "enviando 1 arquivo"
+
+#: js/filelist.js:416 js/filelist.js:470
+msgid "files uploading"
+msgstr "enviando arquivos"
+
 #: js/files.js:52
 msgid "'.' is an invalid file name."
 msgstr "'.' Ã© um nome de arquivo invÃ¡lido."
@@ -156,80 +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:263
+#: 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:263
-msgid "Upload Error"
-msgstr "Erro de envio"
-
-#: js/files.js:274
-msgid "Close"
-msgstr "Fechar"
-
-#: js/files.js:313
-msgid "1 file uploading"
-msgstr "enviando 1 arquivo"
-
-#: js/files.js:316 js/files.js:371 js/files.js:386
-msgid "{count} files uploading"
-msgstr "Enviando {count} arquivos"
+#: js/files.js:277
+msgid "Not enough space available"
+msgstr "EspaÃ§o de armazenamento insuficiente"
 
-#: js/files.js:389 js/files.js:424
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "Envio cancelado."
 
-#: js/files.js:498
+#: 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:571
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "URL nÃ£o pode ficar em branco"
 
-#: js/files.js:576
+#: 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:954 templates/index.php:68
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+msgid "Error"
+msgstr "Erro"
+
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Nome"
 
-#: js/files.js:955 templates/index.php:79
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Tamanho"
 
-#: js/files.js:956 templates/index.php:81
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Modificado"
 
-#: js/files.js:975
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 pasta"
 
-#: js/files.js:977
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} pastas"
 
-#: js/files.js:985
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 arquivo"
 
-#: js/files.js:987
+#: 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"
@@ -279,45 +276,45 @@ msgstr "Pasta"
 msgid "From link"
 msgstr "Do link"
 
-#: templates/index.php:40
+#: templates/index.php:42
 msgid "Deleted files"
 msgstr "Arquivos apagados"
 
-#: templates/index.php:46
+#: templates/index.php:48
 msgid "Cancel upload"
 msgstr "Cancelar upload"
 
-#: templates/index.php:53
+#: 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:60
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Nada aqui.Carrege alguma coisa!"
 
-#: templates/index.php:74
+#: templates/index.php:75
 msgid "Download"
 msgstr "Baixar"
 
-#: templates/index.php:86 templates/index.php:87
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Descompartilhar"
 
-#: templates/index.php:106
+#: templates/index.php:107
 msgid "Upload too large"
-msgstr "Arquivo muito grande"
+msgstr "Upload muito grande"
 
-#: templates/index.php:108
+#: 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:113
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Arquivos sendo escaneados, por favor aguarde."
 
-#: templates/index.php:116
+#: 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..76932c4a277c406812ee823ffc73cad749b0af41 100644
--- a/l10n/pt_BR/files_encryption.po
+++ b/l10n/pt_BR/files_encryption.po
@@ -3,15 +3,13 @@
 # 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.
 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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"
@@ -37,4 +35,4 @@ msgstr "Excluir os seguintes tipos de arquivo da criptografia:"
 
 #: templates/settings.php:12
 msgid "None"
-msgstr "Nenhuma"
+msgstr "Nada"
diff --git a/l10n/pt_BR/files_external.po b/l10n/pt_BR/files_external.po
index 830dad23e37724842494f6b19cfdb3c3bffb7b85..2ff8ade49decc978aa3df1534b56e6dd528e3260 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-08 00:25+0100\n"
-"PO-Revision-Date: 2013-03-07 12:40+0000\n"
-"Last-Translator: dudanogueira <dudanogueira@gmail.com>\n"
+"POT-Creation-Date: 2013-04-28 01:57+0200\n"
+"PO-Revision-Date: 2013-04-27 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"
@@ -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: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 "<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: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 "<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..cbd0b6110f251ecc910b7ce488b214a872ea0a3d 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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 71df0cbd868f07632326f63f3167618780395c22..c9a34e60931205034806943c0152448f40931a22 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-03-08 00:25+0100\n"
-"PO-Revision-Date: 2013-03-07 23:25+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -18,12 +17,12 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ajax/delete.php:40
+#: ajax/delete.php:42
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "NÃ£o foi possÃvel excluir %s permanentemente"
 
-#: ajax/undelete.php:41
+#: ajax/undelete.php:42
 #, php-format
 msgid "Couldn't restore %s"
 msgstr "NÃ£o foi possÃvel restaurar %s"
@@ -32,6 +31,10 @@ msgstr "NÃ£o foi possÃvel restaurar %s"
 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
+msgid "Error"
+msgstr "Erro"
+
 #: js/trash.js:34
 msgid "delete file permanently"
 msgstr "excluir arquivo permanentemente"
@@ -78,4 +81,4 @@ msgstr "Excluir"
 
 #: templates/part.breadcrumb.php:9
 msgid "Deleted Files"
-msgstr ""
+msgstr "Arquivos Apagados"
diff --git a/l10n/pt_BR/files_versions.po b/l10n/pt_BR/files_versions.po
index 88db88761f5a99a605c17f06139669fa61b5ce8f..133e452f03e3637d67551c58cdbf1c29c432a840 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:30+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 5acde385452cc68e1bdb87c81e3d6e79a4aa33f9..d2ecaa02167c5c50397f05bfb0c10e3637c90188 100644
--- a/l10n/pt_BR/lib.po
+++ b/l10n/pt_BR/lib.po
@@ -3,18 +3,13 @@
 # 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.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-03 00:06+0100\n"
-"PO-Revision-Date: 2013-03-01 23:10+0000\n"
-"Last-Translator: fboaventura <fboaventura@live.com>\n"
+"POT-Creation-Date: 2013-04-28 01:57+0200\n"
+"PO-Revision-Date: 2013-04-27 23:57+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"
@@ -46,19 +41,19 @@ msgstr "AplicaÃ§Ãµes"
 msgid "Admin"
 msgstr "Admin"
 
-#: files.php:202
+#: files.php:209
 msgid "ZIP download is turned off."
 msgstr "Download ZIP estÃ¡ desligado."
 
-#: files.php:203
+#: files.php:210
 msgid "Files need to be downloaded one by one."
 msgstr "Arquivos precisam ser baixados um de cada vez."
 
-#: files.php:204 files.php:231
+#: files.php:211 files.php:244
 msgid "Back to Files"
 msgstr "Voltar para Arquivos"
 
-#: files.php:228
+#: files.php:241
 msgid "Selected files too large to generate zip file."
 msgstr "Arquivos selecionados sÃ£o muito grandes para gerar arquivo zip."
 
@@ -98,10 +93,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 +113,72 @@ 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:128 setup.php:320 setup.php:365
+#: setup.php:132 setup.php:325 setup.php:370
 msgid "PostgreSQL username and/or password not valid"
 msgstr "Nome de usuÃ¡rio e/ou senha PostgreSQL invÃ¡lido(s)"
 
-#: setup.php:129 setup.php:152 setup.php:229
+#: setup.php:133 setup.php:156 setup.php:234
 msgid "You need to enter either an existing account or the administrator."
 msgstr "VocÃª precisa inserir uma conta existente ou o administrador."
 
-#: setup.php:151 setup.php:453 setup.php:520
+#: setup.php:155 setup.php:458 setup.php:525
 msgid "Oracle username and/or password not valid"
 msgstr "Nome de usuÃ¡rio e/ou senha Oracle invÃ¡lido(s)"
 
-#: setup.php:228
+#: setup.php:233
 msgid "MySQL username and/or password not valid"
 msgstr "Nome de usuÃ¡rio e/ou senha MySQL invÃ¡lido(s)"
 
-#: 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: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:583 setup.php:592 setup.php:600 setup.php:609
+#: setup.php:615
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Erro no BD: \"%s\""
 
-#: 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:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
+#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
+#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "Comando ofensivo era: \"%s\""
 
-#: setup.php:299
+#: setup.php:304
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "O usuÃ¡rio MySQL '%s'@'localhost' jÃ¡ existe."
 
-#: setup.php:300
+#: setup.php:305
 msgid "Drop this user from MySQL"
 msgstr "Derrubar este usuÃ¡rio do MySQL"
 
-#: setup.php:305
+#: setup.php:310
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "UsuÃ¡rio MySQL '%s'@'%%' jÃ¡ existe"
 
-#: setup.php:306
+#: setup.php:311
 msgid "Drop this user from MySQL."
 msgstr "Derrube este usuÃ¡rio do MySQL."
 
-#: setup.php:579 setup.php:611
+#: setup.php:584 setup.php:616
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Comando ofensivo era: \"%s\", nome: %s, senha: %s"
 
-#: setup.php:631
+#: setup.php:636
 #, 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:849
+#: setup.php:858
 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:850
+#: setup.php:859
 #, 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 +235,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 c29a840ce614057ad2e8c743e02ee966f0faee0e..c5cf67cadd25663fb662fa2157e710b62991a860 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-03-03 00:06+0100\n"
-"PO-Revision-Date: 2013-03-01 23:10+0000\n"
-"Last-Translator: fboaventura <fboaventura@live.com>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:15+0000\n"
+"Last-Translator: FlÃ¡vio Veras <flaviove@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "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}"
@@ -103,7 +97,7 @@ msgstr "Atualizar para {appversion}"
 msgid "Disable"
 msgstr "Desabilitar"
 
-#: js/apps.js:36 js/apps.js:64
+#: js/apps.js:36 js/apps.js:64 js/apps.js:83
 msgid "Enable"
 msgstr "Habilitar"
 
@@ -111,68 +105,68 @@ msgstr "Habilitar"
 msgid "Please wait...."
 msgstr "Por favor, aguarde..."
 
-#: js/apps.js:84
+#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+msgid "Error"
+msgstr "Erro"
+
+#: js/apps.js:90
 msgid "Updating...."
 msgstr "Atualizando..."
 
-#: js/apps.js:87
+#: js/apps.js:93
 msgid "Error while updating app"
 msgstr "Erro ao atualizar aplicativo"
 
-#: js/apps.js:87
-msgid "Error"
-msgstr "Erro"
-
-#: js/apps.js:90
+#: js/apps.js:96
 msgid "Updated"
 msgstr "Atualizado"
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
-msgstr "Guardando..."
+msgstr "Salvando..."
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "deleted"
 msgstr "excluÃdo"
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "undo"
 msgstr "desfazer"
 
-#: js/users.js:62
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr "ImpossÃvel remover usuÃ¡rio"
 
-#: js/users.js:75 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
+#: templates/users.php:103
 msgid "Groups"
 msgstr "Grupos"
 
-#: js/users.js:78 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr "Grupo Administrativo"
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "Excluir"
 
-#: js/users.js:191
+#: js/users.js:269
 msgid "add group"
 msgstr "adicionar grupo"
 
-#: js/users.js:352
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr "ForneÃ§a um nome de usuÃ¡rio vÃ¡lido"
 
-#: js/users.js:353 js/users.js:359 js/users.js:374
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr "Erro ao criar usuÃ¡rio"
 
-#: js/users.js:358
+#: js/users.js:426
 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,15 +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:230 templates/personal.php:102
+#: templates/admin.php:228
+msgid "Less"
+msgstr "Menos"
+
+#: templates/admin.php:235 templates/personal.php:105
 msgid "Version"
 msgstr "VersÃ£o"
 
-#: templates/admin.php:233 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 "
@@ -402,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:77
 msgid "Password"
 msgstr "Senha"
 
@@ -426,82 +424,70 @@ msgstr "Nova senha"
 msgid "Change password"
 msgstr "Alterar senha"
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:76
 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:68
 msgid "Email"
 msgstr "E-mail"
 
-#: templates/personal.php:72
+#: templates/personal.php:70
 msgid "Your email address"
 msgstr "Seu endereÃ§o de e-mail"
 
-#: templates/personal.php:73
+#: templates/personal.php:71
 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:77 templates/personal.php:78
 msgid "Language"
 msgstr "Idioma"
 
-#: templates/personal.php:86
+#: templates/personal.php:89
 msgid "Help translate"
 msgstr "Ajude a traduzir"
 
-#: templates/personal.php:91
+#: templates/personal.php:94
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:93
+#: templates/personal.php:96
 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:75
 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:33
 msgid "Default Storage"
 msgstr "Armazenamento PadrÃ£o"
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:39 templates/users.php:133
 msgid "Unlimited"
 msgstr "Ilimitado"
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:57 templates/users.php:148
 msgid "Other"
 msgstr "Outro"
 
-#: templates/users.php:84
+#: templates/users.php:82
 msgid "Storage"
 msgstr "Armazenamento"
 
-#: templates/users.php:95
+#: templates/users.php:93
 msgid "change display name"
 msgstr "alterar nome de exibiÃ§Ã£o"
 
-#: templates/users.php:99
+#: templates/users.php:97
 msgid "set new password"
 msgstr "definir nova senha"
 
-#: templates/users.php:134
+#: templates/users.php:128
 msgid "Default"
 msgstr "PadrÃ£o"
diff --git a/l10n/pt_BR/user_ldap.po b/l10n/pt_BR/user_ldap.po
index 7558c7b05ac8e7907be8e9c02d76f66c062fd290..eb862c273a126afcb765730419ef7fa0b736df84 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-08 00:25+0100\n"
-"PO-Revision-Date: 2013-03-07 12:31+0000\n"
-"Last-Translator: dudanogueira <dudanogueira@gmail.com>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:15+0000\n"
+"Last-Translator: FlÃ¡vio Veras <flaviove@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "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..c68169faea49ab228acd0f61599f658e8bb700b8 100644
--- a/l10n/pt_BR/user_webdavauth.po
+++ b/l10n/pt_BR/user_webdavauth.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-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-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+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 3a972374e6dd8eff97b981182d3630238451de38..3e8b32a2e5fded3d31494982cdffc4a682033f72 100644
--- a/l10n/pt_PT/core.po
+++ b/l10n/pt_PT/core.po
@@ -3,20 +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.
-#  <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.
+# 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-02-22 00:06+0100\n"
-"PO-Revision-Date: 2013-02-20 23:20+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+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"
@@ -25,24 +18,24 @@ msgstr ""
 "Language: pt_PT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:85
+#: ajax/share.php:97
 #, php-format
 msgid "User %s shared a file with you"
 msgstr "O utilizador %s partilhou um ficheiro consigo."
 
-#: ajax/share.php:87
+#: ajax/share.php:99
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr "O utilizador %s partilhou uma pasta consigo."
 
-#: ajax/share.php:89
+#: ajax/share.php:101
 #, php-format
 msgid ""
 "User %s shared the file \"%s\" with you. It is available for download here: "
 "%s"
 msgstr "O utilizador %s partilhou o ficheiro \"%s\" consigo. EstÃ¡ disponÃvel para download aqui: %s"
 
-#: ajax/share.php:91
+#: ajax/share.php:104
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -81,173 +74,175 @@ 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
 msgid "Error removing %s from favorites."
 msgstr "Erro a remover %s dos favoritos."
 
-#: js/config.php:32
+#: js/config.php:34
 msgid "Sunday"
 msgstr "Domingo"
 
-#: js/config.php:32
+#: js/config.php:35
 msgid "Monday"
 msgstr "Segunda"
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Tuesday"
 msgstr "TerÃ§a"
 
-#: js/config.php:32
+#: js/config.php:37
 msgid "Wednesday"
 msgstr "Quarta"
 
-#: js/config.php:32
+#: js/config.php:38
 msgid "Thursday"
 msgstr "Quinta"
 
-#: js/config.php:32
+#: js/config.php:39
 msgid "Friday"
 msgstr "Sexta"
 
-#: js/config.php:32
+#: js/config.php:40
 msgid "Saturday"
 msgstr "SÃ¡bado"
 
-#: js/config.php:33
+#: js/config.php:45
 msgid "January"
 msgstr "Janeiro"
 
-#: js/config.php:33
+#: js/config.php:46
 msgid "February"
 msgstr "Fevereiro"
 
-#: js/config.php:33
+#: js/config.php:47
 msgid "March"
 msgstr "MarÃ§o"
 
-#: js/config.php:33
+#: js/config.php:48
 msgid "April"
 msgstr "Abril"
 
-#: js/config.php:33
+#: js/config.php:49
 msgid "May"
 msgstr "Maio"
 
-#: js/config.php:33
+#: js/config.php:50
 msgid "June"
 msgstr "Junho"
 
-#: js/config.php:33
+#: js/config.php:51
 msgid "July"
 msgstr "Julho"
 
-#: js/config.php:33
+#: js/config.php:52
 msgid "August"
 msgstr "Agosto"
 
-#: js/config.php:33
+#: js/config.php:53
 msgid "September"
 msgstr "Setembro"
 
-#: js/config.php:33
+#: js/config.php:54
 msgid "October"
 msgstr "Outubro"
 
-#: js/config.php:33
+#: js/config.php:55
 msgid "November"
 msgstr "Novembro"
 
-#: js/config.php:33
+#: js/config.php:56
 msgid "December"
 msgstr "Dezembro"
 
 #: js/js.js:286
 msgid "Settings"
-msgstr "DefiniÃ§Ãµes"
+msgstr "ConfiguraÃ§Ãµes"
 
-#: js/js.js:767
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "Minutos atrÃ¡s"
 
-#: js/js.js:768
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "HÃ¡ 1 minuto"
 
-#: js/js.js:769
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr "{minutes} minutos atrÃ¡s"
 
-#: js/js.js:770
+#: js/js.js:721
 msgid "1 hour ago"
-msgstr "HÃ¡ 1 hora"
+msgstr "HÃ¡ 1 horas"
 
-#: js/js.js:771
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr "HÃ¡ {hours} horas atrÃ¡s"
 
-#: js/js.js:772
+#: js/js.js:723
 msgid "today"
 msgstr "hoje"
 
-#: js/js.js:773
+#: js/js.js:724
 msgid "yesterday"
 msgstr "ontem"
 
-#: js/js.js:774
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr "{days} dias atrÃ¡s"
 
-#: js/js.js:775
+#: js/js.js:726
 msgid "last month"
 msgstr "ultÃmo mÃªs"
 
-#: js/js.js:776
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr "HÃ¡ {months} meses atrÃ¡s"
 
-#: js/js.js:777
+#: js/js.js:728
 msgid "months ago"
 msgstr "meses atrÃ¡s"
 
-#: js/js.js:778
+#: js/js.js:729
 msgid "last year"
 msgstr "ano passado"
 
-#: js/js.js:779
+#: js/js.js:730
 msgid "years ago"
 msgstr "anos atrÃ¡s"
 
-#: js/oc-dialogs.js:126
-msgid "Choose"
-msgstr "Escolha"
+#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
+msgid "Ok"
+msgstr "Ok"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "NÃ£o"
+#: js/oc-dialogs.js:185
+msgid "Choose"
+msgstr "Escolha"
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:215
 msgid "Yes"
 msgstr "Sim"
 
-#: js/oc-dialogs.js:180
-msgid "Ok"
-msgstr "Ok"
+#: js/oc-dialogs.js:222
+msgid "No"
+msgstr "NÃ£o"
 
 #: 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 "O tipo de objecto nÃ£o foi especificado"
 
-#: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:582
-#: js/share.js:594
+#: 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 "Erro"
 
@@ -259,127 +254,127 @@ msgstr "O nome da aplicaÃ§Ã£o nÃ£o foi especificado"
 msgid "The required file {file} is not installed!"
 msgstr "O ficheiro necessÃ¡rio {file} nÃ£o estÃ¡ instalado!"
 
-#: js/share.js:29 js/share.js:43 js/share.js:90
+#: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr "Partilhado"
 
-#: js/share.js:93
+#: js/share.js:90
 msgid "Share"
 msgstr "Partilhar"
 
-#: js/share.js:141 js/share.js:622
+#: js/share.js:125 js/share.js:617
 msgid "Error while sharing"
 msgstr "Erro ao partilhar"
 
-#: js/share.js:152
+#: js/share.js:136
 msgid "Error while unsharing"
 msgstr "Erro ao deixar de partilhar"
 
-#: js/share.js:159
+#: js/share.js:143
 msgid "Error while changing permissions"
 msgstr "Erro ao mudar permissÃµes"
 
-#: js/share.js:168
+#: js/share.js:152
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Partilhado consigo e com o grupo {group} por {owner}"
 
-#: js/share.js:170
+#: js/share.js:154
 msgid "Shared with you by {owner}"
 msgstr "Partilhado consigo por {owner}"
 
-#: js/share.js:175
+#: js/share.js:159
 msgid "Share with"
 msgstr "Partilhar com"
 
-#: js/share.js:180
+#: js/share.js:164
 msgid "Share with link"
 msgstr "Partilhar com link"
 
-#: js/share.js:183
+#: js/share.js:167
 msgid "Password protect"
 msgstr "Proteger com palavra-passe"
 
-#: js/share.js:185 templates/installation.php:44 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:189
+#: js/share.js:173
 msgid "Email link to person"
 msgstr "Enviar o link por e-mail"
 
-#: js/share.js:190
+#: js/share.js:174
 msgid "Send"
 msgstr "Enviar"
 
-#: js/share.js:194
+#: js/share.js:178
 msgid "Set expiration date"
 msgstr "Especificar data de expiraÃ§Ã£o"
 
-#: js/share.js:195
+#: js/share.js:179
 msgid "Expiration date"
 msgstr "Data de expiraÃ§Ã£o"
 
-#: js/share.js:227
+#: js/share.js:211
 msgid "Share via email:"
 msgstr "Partilhar via email:"
 
-#: js/share.js:229
+#: js/share.js:213
 msgid "No people found"
 msgstr "NÃ£o foi encontrado ninguÃ©m"
 
-#: js/share.js:256
+#: js/share.js:251
 msgid "Resharing is not allowed"
 msgstr "NÃ£o Ã© permitido partilhar de novo"
 
-#: js/share.js:292
+#: js/share.js:287
 msgid "Shared in {item} with {user}"
 msgstr "Partilhado em {item} com {user}"
 
-#: js/share.js:313
+#: js/share.js:308
 msgid "Unshare"
 msgstr "Deixar de partilhar"
 
-#: js/share.js:325
+#: js/share.js:320
 msgid "can edit"
 msgstr "pode editar"
 
-#: js/share.js:327
+#: js/share.js:322
 msgid "access control"
 msgstr "Controlo de acesso"
 
-#: js/share.js:330
+#: js/share.js:325
 msgid "create"
 msgstr "criar"
 
-#: js/share.js:333
+#: js/share.js:328
 msgid "update"
 msgstr "actualizar"
 
-#: js/share.js:336
+#: js/share.js:331
 msgid "delete"
 msgstr "apagar"
 
-#: js/share.js:339
+#: js/share.js:334
 msgid "share"
 msgstr "partilhar"
 
-#: js/share.js:373 js/share.js:569
+#: js/share.js:368 js/share.js:564
 msgid "Password protected"
 msgstr "Protegido com palavra-passe"
 
-#: js/share.js:582
+#: js/share.js:577
 msgid "Error unsetting expiration date"
 msgstr "Erro ao retirar a data de expiraÃ§Ã£o"
 
-#: js/share.js:594
+#: js/share.js:589
 msgid "Error setting expiration date"
 msgstr "Erro ao aplicar a data de expiraÃ§Ã£o"
 
-#: js/share.js:609
+#: js/share.js:604
 msgid "Sending ..."
 msgstr "A Enviar..."
 
-#: js/share.js:620
+#: js/share.js:615
 msgid "Email sent"
 msgstr "E-mail enviado"
 
@@ -402,24 +397,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:39
-#: 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"
 
@@ -433,7 +431,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"
@@ -475,115 +473,130 @@ msgstr "Editar categorias"
 msgid "Add"
 msgstr "Adicionar"
 
-#: templates/installation.php:23 templates/installation.php:30
+#: templates/installation.php:24 templates/installation.php:31
+#: templates/installation.php:38
 msgid "Security Warning"
 msgstr "Aviso de SeguranÃ§a"
 
-#: templates/installation.php:24
+#: templates/installation.php:25
+msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
+msgstr "A sua versÃ£o do PHP Ã© vulnerÃ¡vel ao ataque Byte Null (CVE-2006-7243)"
+
+#: templates/installation.php:26
+msgid "Please update your PHP installation to use ownCloud securely."
+msgstr "Por favor atualize a sua versÃ£o PHP instalada para usar o ownCloud com seguranÃ§a."
+
+#: templates/installation.php:32
 msgid ""
 "No secure random number generator is available, please enable the PHP "
 "OpenSSL extension."
 msgstr "NÃ£o existe nenhum gerador seguro de nÃºmeros aleatÃ³rios, por favor, active a extensÃ£o OpenSSL no PHP."
 
-#: templates/installation.php:25
+#: 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 "Sem nenhum gerador seguro de nÃºmeros aleatÃ³rios, uma pessoa mal intencionada pode prever a sua password, reiniciar as seguranÃ§as adicionais e tomar conta da sua conta. "
 
-#: templates/installation.php:31
+#: templates/installation.php:39
 msgid ""
 "Your data directory and files are probably accessible from the internet "
 "because the .htaccess file does not work."
 msgstr "A pasta de dados do ownCloud e os respectivos ficheiros, estarÃ£o provavelmente acessÃveis a partir da internet, pois o ficheiros .htaccess nÃ£o funciona."
 
-#: templates/installation.php:32
+#: 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 "Para obter informaÃ§Ãµes de como configurar correctamente o servidor, veja em: <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>."
 
-#: templates/installation.php:36
+#: templates/installation.php:44
 msgid "Create an <strong>admin account</strong>"
 msgstr "Criar uma <strong>conta administrativa</strong>"
 
-#: templates/installation.php:52
+#: templates/installation.php:62
 msgid "Advanced"
 msgstr "AvanÃ§ado"
 
-#: templates/installation.php:54
+#: templates/installation.php:64
 msgid "Data folder"
 msgstr "Pasta de dados"
 
-#: templates/installation.php:61
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "Configure a base de dados"
 
-#: templates/installation.php:66 templates/installation.php:77
-#: templates/installation.php:87 templates/installation.php:97
+#: 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:109
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "Utilizador da base de dados"
 
-#: templates/installation.php:113
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "Password da base de dados"
 
-#: templates/installation.php:117
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "Nome da base de dados"
 
-#: templates/installation.php:125
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "Tablespace da base de dados"
 
-#: templates/installation.php:131
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "AnfitriÃ£o da base de dados"
 
-#: templates/installation.php:136
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "Acabar instalaÃ§Ã£o"
 
-#: templates/layout.guest.php:33
+#: templates/layout.guest.php:40
 msgid "web services under your control"
 msgstr "serviÃ§os web sob o seu controlo"
 
-#: templates/layout.user.php:48
+#: templates/layout.user.php:36
+#, 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:61
 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 55c2ec26ca9ca29752df7a0836a02815846fd928..45addc54d27f89f4038bcda296b25d9ab2e0e433 100644
--- a/l10n/pt_PT/files.po
+++ b/l10n/pt_PT/files.po
@@ -3,21 +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.
-#  <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.
 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:39+0000\n"
-"Last-Translator: Helder Meneses <helder.meneses@gmail.com>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10: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"
@@ -35,17 +27,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 +44,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"
@@ -78,59 +66,70 @@ msgstr "Falhou a escrita no disco"
 msgid "Not enough storage available"
 msgstr "NÃ£o hÃ¡ espaÃ§o suficiente em disco"
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr "DirectÃ³rio InvÃ¡lido"
 
-#: appinfo/app.php:10
+#: appinfo/app.php:12
 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:92 templates/index.php:93
+#: 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/files.js:292 js/files.js:408
-#: js/files.js:439
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "Pendente"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "O nome {new_name} jÃ¡ existe"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "substituir"
 
-#: js/filelist.js:251
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "sugira um nome"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "cancelar"
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "substituido {new_name} por {old_name}"
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "undo"
 msgstr "desfazer"
 
-#: js/filelist.js:323
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr "Executar a tarefa de apagar"
 
+#: js/filelist.js:413
+msgid "1 file uploading"
+msgstr "A enviar 1 ficheiro"
+
+#: js/filelist.js:416 js/filelist.js:470
+msgid "files uploading"
+msgstr "A enviar os ficheiros"
+
 #: js/files.js:52
 msgid "'.' is an invalid file name."
 msgstr "'.' nÃ£o Ã© um nome de ficheiro vÃ¡lido!"
@@ -153,80 +152,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:225
+#: 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:262
+#: 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:262
-msgid "Upload Error"
-msgstr "Erro no envio"
+#: js/files.js:277
+msgid "Not enough space available"
+msgstr "EspaÃ§o em disco insuficiente!"
 
-#: js/files.js:273
-msgid "Close"
-msgstr "Fechar"
-
-#: js/files.js:312
-msgid "1 file uploading"
-msgstr "A enviar 1 ficheiro"
-
-#: js/files.js:315 js/files.js:370 js/files.js:385
-msgid "{count} files uploading"
-msgstr "A carregar {count} ficheiros"
-
-#: js/files.js:388 js/files.js:423
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "Envio cancelado."
 
-#: js/files.js:497
+#: 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:570
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "O URL nÃ£o pode estar vazio."
 
-#: js/files.js:575
+#: 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:953 templates/index.php:68
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+msgid "Error"
+msgstr "Erro"
+
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Nome"
 
-#: js/files.js:954 templates/index.php:79
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Tamanho"
 
-#: js/files.js:955 templates/index.php:81
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Modificado"
 
-#: js/files.js:974
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 pasta"
 
-#: js/files.js:976
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} pastas"
 
-#: js/files.js:984
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 ficheiro"
 
-#: js/files.js:986
+#: 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 ""
+
+#: 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"
@@ -242,7 +241,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"
@@ -276,45 +275,45 @@ msgstr "Pasta"
 msgid "From link"
 msgstr "Da ligaÃ§Ã£o"
 
-#: templates/index.php:40
+#: templates/index.php:42
 msgid "Deleted files"
 msgstr "Ficheiros eliminados"
 
-#: templates/index.php:46
+#: templates/index.php:48
 msgid "Cancel upload"
 msgstr "Cancelar envio"
 
-#: templates/index.php:53
+#: templates/index.php:54
 msgid "You donâ€™t have write permissions here."
 msgstr "NÃ£o tem permissÃµes de escrita aqui."
 
-#: templates/index.php:60
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Vazio. Envie alguma coisa!"
 
-#: templates/index.php:74
+#: templates/index.php:75
 msgid "Download"
 msgstr "Transferir"
 
-#: templates/index.php:86 templates/index.php:87
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Deixar de partilhar"
 
-#: templates/index.php:106
+#: templates/index.php:107
 msgid "Upload too large"
-msgstr "Envio muito grande"
+msgstr "Upload muito grande"
 
-#: templates/index.php:108
+#: 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:113
+#: 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:116
+#: 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..d8cfa5891f79835fadc3de46480c11abbe7c2137 100644
--- a/l10n/pt_PT/files_encryption.po
+++ b/l10n/pt_PT/files_encryption.po
@@ -3,15 +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.
 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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/files_external.po b/l10n/pt_PT/files_external.po
index 6a1dd0910b8f4376184585b5d8d88816edeb3793..57de8c823efa9116493afcbfda80cb5bda8d3547 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-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-12 02:01+0200\n"
+"PO-Revision-Date: 2013-05-06 16:40+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: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 "<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: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 "<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..91d49b0b9a3212708e3325ad37317f5349db877c 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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 abd247504d069915fb5f1086149eb8b574ba015c..2b2ad1fa7b3ade35c9f4ed336ed94da0b9dfb631 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-03-08 00:25+0100\n"
-"PO-Revision-Date: 2013-03-07 23:25+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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"
@@ -18,19 +17,23 @@ msgstr ""
 "Language: pt_PT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:40
+#: ajax/delete.php:42
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "NÃ£o foi possÃvel eliminar %s de forma permanente"
 
-#: ajax/undelete.php:41
+#: ajax/undelete.php:42
 #, php-format
 msgid "Couldn't restore %s"
 msgstr "NÃ£o foi possÃvel restaurar %s"
 
 #: js/trash.js:7 js/trash.js:96
 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
+msgid "Error"
+msgstr "Erro"
 
 #: js/trash.js:34
 msgid "delete file permanently"
@@ -66,7 +69,7 @@ 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"
@@ -74,8 +77,8 @@ msgstr "Restaurar"
 
 #: templates/index.php:30 templates/index.php:31
 msgid "Delete"
-msgstr "Apagar"
+msgstr "Eliminar"
 
 #: templates/part.breadcrumb.php:9
 msgid "Deleted Files"
-msgstr ""
+msgstr "Ficheiros Apagados"
diff --git a/l10n/pt_PT/files_versions.po b/l10n/pt_PT/files_versions.po
index 54018e45527e41bd0480898f883867d1cabf566b..7cfc0d4b7fa571d36a036b5b3cc0d35c17f66bd0 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:30+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 e251c49b92848feda8f99050afca7dadfe8996ee..73f120fd81ceb8ae1ece8714ae307458823b56fc 100644
--- a/l10n/pt_PT/lib.po
+++ b/l10n/pt_PT/lib.po
@@ -3,17 +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.
 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-04-28 01:57+0200\n"
+"PO-Revision-Date: 2013-04-27 23:57+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"
@@ -45,19 +41,19 @@ msgstr "AplicaÃ§Ãµes"
 msgid "Admin"
 msgstr "Admin"
 
-#: files.php:202
+#: files.php:209
 msgid "ZIP download is turned off."
 msgstr "Descarregamento em ZIP estÃ¡ desligado."
 
-#: files.php:203
+#: files.php:210
 msgid "Files need to be downloaded one by one."
 msgstr "Os ficheiros precisam de ser descarregados um por um."
 
-#: files.php:204 files.php:231
+#: files.php:211 files.php:244
 msgid "Back to Files"
 msgstr "Voltar a Ficheiros"
 
-#: files.php:228
+#: files.php:241
 msgid "Selected files too large to generate zip file."
 msgstr "Os ficheiros seleccionados sÃ£o grandes demais para gerar um ficheiro zip."
 
@@ -97,10 +93,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 +113,83 @@ 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:128 setup.php:320 setup.php:365
+#: setup.php:132 setup.php:325 setup.php:370
 msgid "PostgreSQL username and/or password not valid"
 msgstr "Nome de utilizador/password do PostgreSQL invÃ¡lido"
 
-#: setup.php:129 setup.php:152 setup.php:229
+#: setup.php:133 setup.php:156 setup.php:234
 msgid "You need to enter either an existing account or the administrator."
 msgstr "Precisa de introduzir uma conta existente ou de administrador"
 
-#: setup.php:151 setup.php:453 setup.php:520
+#: setup.php:155 setup.php:458 setup.php:525
 msgid "Oracle username and/or password not valid"
 msgstr "Nome de utilizador/password do Oracle invÃ¡lida"
 
-#: setup.php:228
+#: setup.php:233
 msgid "MySQL username and/or password not valid"
 msgstr "Nome de utilizador/password do MySQL invÃ¡lida"
 
-#: 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: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:583 setup.php:592 setup.php:600 setup.php:609
+#: setup.php:615
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Erro na BD: \"%s\""
 
-#: 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:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
+#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
+#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "O comando gerador de erro foi: \"%s\""
 
-#: setup.php:299
+#: setup.php:304
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "O utilizador '%s'@'localhost' do MySQL jÃ¡ existe."
 
-#: setup.php:300
+#: setup.php:305
 msgid "Drop this user from MySQL"
 msgstr "Eliminar este utilizador do MySQL"
 
-#: setup.php:305
+#: setup.php:310
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "O utilizador '%s'@'%%' do MySQL jÃ¡ existe"
 
-#: setup.php:306
+#: setup.php:311
 msgid "Drop this user from MySQL."
 msgstr "Eliminar este utilizador do MySQL"
 
-#: setup.php:579 setup.php:611
+#: setup.php:584 setup.php:616
 #, 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:631
+#: setup.php:636
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr "Nome de utilizador/password do MySQL Ã© invÃ¡lido: %s"
 
-#: setup.php:849
+#: setup.php:858
 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:850
+#: setup.php:859
 #, 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 +220,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 +233,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 84f9f0950299d2949b25277788bcff6ab8041199..8ac1ac314ae0de4b1c834a86c4e7616d0a23b880 100644
--- a/l10n/pt_PT/settings.po
+++ b/l10n/pt_PT/settings.po
@@ -3,21 +3,14 @@
 # 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.
+# 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-06 00:07+0100\n"
-"PO-Revision-Date: 2013-03-05 11:39+0000\n"
-"Last-Translator: Helder Meneses <helder.meneses@gmail.com>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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"
@@ -29,12 +22,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 +69,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"
@@ -100,7 +97,7 @@ msgstr "Actualizar para a versÃ£o {appversion}"
 msgid "Disable"
 msgstr "Desactivar"
 
-#: js/apps.js:36 js/apps.js:64
+#: js/apps.js:36 js/apps.js:64 js/apps.js:83
 msgid "Enable"
 msgstr "Activar"
 
@@ -108,68 +105,68 @@ msgstr "Activar"
 msgid "Please wait...."
 msgstr "Por favor aguarde..."
 
-#: js/apps.js:84
+#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+msgid "Error"
+msgstr "Erro"
+
+#: js/apps.js:90
 msgid "Updating...."
 msgstr "A Actualizar..."
 
-#: js/apps.js:87
+#: js/apps.js:93
 msgid "Error while updating app"
 msgstr "Erro enquanto actualizava a aplicaÃ§Ã£o"
 
-#: js/apps.js:87
-msgid "Error"
-msgstr "Erro"
-
-#: js/apps.js:90
+#: js/apps.js:96
 msgid "Updated"
 msgstr "Actualizado"
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr "A guardar..."
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "deleted"
 msgstr "apagado"
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "undo"
 msgstr "desfazer"
 
-#: js/users.js:62
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr "NÃ£o foi possÃvel remover o utilizador"
 
-#: js/users.js:75 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
+#: templates/users.php:103
 msgid "Groups"
 msgstr "Grupos"
 
-#: js/users.js:78 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr "Grupo Administrador"
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
-msgstr "Apagar"
+msgstr "Eliminar"
 
-#: js/users.js:191
+#: js/users.js:269
 msgid "add group"
 msgstr "Adicionar grupo"
 
-#: js/users.js:352
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr "Um nome de utilizador vÃ¡lido deve ser fornecido"
 
-#: js/users.js:353 js/users.js:359 js/users.js:374
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr "Erro a criar utilizador"
 
-#: js/users.js:358
+#: js/users.js:426
 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,15 +317,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:230 templates/personal.php:102
+#: templates/admin.php:228
+msgid "Less"
+msgstr "Menos"
+
+#: templates/admin.php:235 templates/personal.php:105
 msgid "Version"
 msgstr "VersÃ£o"
 
-#: templates/admin.php:233 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 "
@@ -399,9 +400,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:77
 msgid "Password"
-msgstr "Palavra-chave"
+msgstr "Password"
 
 #: templates/personal.php:38
 msgid "Your password was changed"
@@ -423,82 +424,70 @@ 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:76
 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:68
 msgid "Email"
-msgstr "endereÃ§o de email"
+msgstr "Email"
 
-#: templates/personal.php:72
+#: templates/personal.php:70
 msgid "Your email address"
 msgstr "O seu endereÃ§o de email"
 
-#: templates/personal.php:73
+#: templates/personal.php:71
 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:77 templates/personal.php:78
 msgid "Language"
 msgstr "Idioma"
 
-#: templates/personal.php:86
+#: templates/personal.php:89
 msgid "Help translate"
 msgstr "Ajude a traduzir"
 
-#: templates/personal.php:91
+#: templates/personal.php:94
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:93
+#: templates/personal.php:96
 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:75
 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:33
 msgid "Default Storage"
 msgstr "Armazenamento PadrÃ£o"
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:39 templates/users.php:133
 msgid "Unlimited"
 msgstr "Ilimitado"
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:57 templates/users.php:148
 msgid "Other"
 msgstr "Outro"
 
-#: templates/users.php:84
+#: templates/users.php:82
 msgid "Storage"
 msgstr "Armazenamento"
 
-#: templates/users.php:95
+#: templates/users.php:93
 msgid "change display name"
 msgstr "modificar nome exibido"
 
-#: templates/users.php:99
+#: templates/users.php:97
 msgid "set new password"
 msgstr "definir nova palavra-passe"
 
-#: templates/users.php:134
+#: templates/users.php:128
 msgid "Default"
 msgstr "PadrÃ£o"
diff --git a/l10n/pt_PT/user_ldap.po b/l10n/pt_PT/user_ldap.po
index 594e6693abe1fce7faa9ada99a9bfcc0efd88e69..35d7b778aa758f6d0bc8e389ccc05cb5fa30ec74 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-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-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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:18
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr "Adicionar configuraÃ§Ãµes do servidor"
 
-#: templates/settings.php:23
+#: templates/settings.php:37
 msgid "Host"
 msgstr "AnfitriÃ£o"
 
-#: templates/settings.php:25
+#: 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:26
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "DN base"
 
-#: templates/settings.php:27
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr "Uma base DN por linho"
 
-#: templates/settings.php:28
+#: 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:30
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "DN do utilizador"
 
-#: 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 "O DN to cliente "
 
-#: templates/settings.php:33
+#: templates/settings.php:47
 msgid "Password"
-msgstr "Palavra-passe"
+msgstr "Password"
 
-#: templates/settings.php:36
+#: 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:37
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "Filtro de login de utilizador"
 
-#: 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 "Define o filtro a aplicar, para aquando de uma tentativa de login. %%uid substitui o nome de utilizador utilizado."
 
-#: templates/settings.php:41
+#: 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:42
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Utilizar filtro"
 
-#: templates/settings.php:45
+#: 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:46
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "Sem variÃ¡vel. Exemplo: \"objectClass=pessoa\"."
 
-#: templates/settings.php:47
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "Filtrar por grupo"
 
-#: templates/settings.php:50
+#: 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:51
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "Sem nenhuma variÃ¡vel. Exemplo: \"objectClass=posixGroup\"."
 
-#: templates/settings.php:55
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr "DefiniÃ§Ãµes de ligaÃ§Ã£o"
 
-#: templates/settings.php:57
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr "ConfiguraÃ§Ã£o activa"
 
-#: templates/settings.php:57
+#: 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:58
+#: templates/settings.php:72
 msgid "Port"
 msgstr "Porto"
 
-#: templates/settings.php:59
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr "Servidor de Backup (RÃ©plica)"
 
-#: 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 "ForneÃ§a um servidor (anfitriÃ£o) de backup. Deve ser uma rÃ©plica do servidor principal de LDAP/AD "
 
-#: templates/settings.php:60
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr "Porta do servidor de backup (Replica)"
 
-#: templates/settings.php:61
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr "Desactivar servidor principal"
 
-#: templates/settings.php:61
+#: 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:62
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "Usar TLS"
 
-#: templates/settings.php:62
+#: 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:63
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Servidor LDAP (Windows) nÃ£o sensÃvel a maiÃºsculas."
 
-#: templates/settings.php:64
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "Desligar a validaÃ§Ã£o de certificado SSL."
 
-#: 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 "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:64
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "NÃ£o recomendado, utilizado apenas para testes!"
 
-#: templates/settings.php:65
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr "Cache do tempo de vida dos objetos no servidor"
 
-#: templates/settings.php:65
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr "em segundos. Uma alteraÃ§Ã£o esvazia a cache."
 
-#: templates/settings.php:67
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr "DefiniÃ§Ãµes de directorias"
 
-#: templates/settings.php:69
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr "Mostrador do nome de utilizador."
 
-#: templates/settings.php:69
+#: 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:70
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "Base da Ã¡rvore de utilizadores."
 
-#: templates/settings.php:70
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr "Uma base de utilizador DN por linha"
 
-#: templates/settings.php:71
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr "Utilizar atributos de pesquisa"
 
-#: templates/settings.php:71 templates/settings.php:74
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr "Opcional; Um atributo por linha"
 
-#: templates/settings.php:72
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr "Mostrador do nome do grupo."
 
-#: templates/settings.php:72
+#: 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:73
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "Base da Ã¡rvore de grupos."
 
-#: templates/settings.php:73
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr "Uma base de grupo DN por linha"
 
-#: templates/settings.php:74
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr "Atributos de pesquisa de grupo"
 
-#: templates/settings.php:75
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr "Associar utilizador ao grupo."
 
-#: templates/settings.php:77
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr "Atributos especiais"
 
-#: templates/settings.php:79
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr "Quota"
 
-#: templates/settings.php:80
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr "Quota padrÃ£o"
 
-#: templates/settings.php:80
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr "em bytes"
 
-#: templates/settings.php:81
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr "Campo de email"
 
-#: templates/settings.php:82
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr "Regra da pasta inicial do utilizador"
 
-#: templates/settings.php:82
+#: 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: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 "Testar a configuraÃ§Ã£o"
 
-#: templates/settings.php:86
+#: 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..ba3adcee8647bd628445ec4b794a5bb5c5097633 100644
--- a/l10n/pt_PT/user_webdavauth.po
+++ b/l10n/pt_PT/user_webdavauth.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-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-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+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 6a1ff327f340907505e5572b2062343bde1d91c4..cb0f3da3c4d50bc608e123be16b2b5a21497ca56 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-02-22 00:06+0100\n"
-"PO-Revision-Date: 2013-02-20 23:20+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10: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"
@@ -23,24 +18,24 @@ msgstr ""
 "Language: ro\n"
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
 
-#: ajax/share.php:85
+#: ajax/share.php:97
 #, php-format
 msgid "User %s shared a file with you"
 msgstr "Utilizatorul %s a partajat un fiÈ™ier cu tine"
 
-#: ajax/share.php:87
+#: ajax/share.php:99
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr "Utilizatorul %s a partajat un dosar cu tine"
 
-#: ajax/share.php:89
+#: ajax/share.php:101
 #, php-format
 msgid ""
 "User %s shared the file \"%s\" with you. It is available for download here: "
 "%s"
 msgstr "Utilizatorul %s a partajat fiÈ™ierul \"%s\" cu tine. ÃŽl poÈ›i descÄƒrca de aici: %s"
 
-#: ajax/share.php:91
+#: ajax/share.php:104
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -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
@@ -86,166 +81,168 @@ msgstr "Nici o categorie selectatÄƒ pentru È™tergere."
 msgid "Error removing %s from favorites."
 msgstr "Eroare la È™tergerea %s din favorite"
 
-#: js/config.php:32
+#: js/config.php:34
 msgid "Sunday"
 msgstr "DuminicÄƒ"
 
-#: js/config.php:32
+#: js/config.php:35
 msgid "Monday"
 msgstr "Luni"
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Tuesday"
 msgstr "MarÈ›i"
 
-#: js/config.php:32
+#: js/config.php:37
 msgid "Wednesday"
 msgstr "Miercuri"
 
-#: js/config.php:32
+#: js/config.php:38
 msgid "Thursday"
 msgstr "Joi"
 
-#: js/config.php:32
+#: js/config.php:39
 msgid "Friday"
 msgstr "Vineri"
 
-#: js/config.php:32
+#: js/config.php:40
 msgid "Saturday"
 msgstr "SÃ¢mbÄƒtÄƒ"
 
-#: js/config.php:33
+#: js/config.php:45
 msgid "January"
 msgstr "Ianuarie"
 
-#: js/config.php:33
+#: js/config.php:46
 msgid "February"
 msgstr "Februarie"
 
-#: js/config.php:33
+#: js/config.php:47
 msgid "March"
 msgstr "Martie"
 
-#: js/config.php:33
+#: js/config.php:48
 msgid "April"
 msgstr "Aprilie"
 
-#: js/config.php:33
+#: js/config.php:49
 msgid "May"
 msgstr "Mai"
 
-#: js/config.php:33
+#: js/config.php:50
 msgid "June"
 msgstr "Iunie"
 
-#: js/config.php:33
+#: js/config.php:51
 msgid "July"
 msgstr "Iulie"
 
-#: js/config.php:33
+#: js/config.php:52
 msgid "August"
 msgstr "August"
 
-#: js/config.php:33
+#: js/config.php:53
 msgid "September"
 msgstr "Septembrie"
 
-#: js/config.php:33
+#: js/config.php:54
 msgid "October"
 msgstr "Octombrie"
 
-#: js/config.php:33
+#: js/config.php:55
 msgid "November"
 msgstr "Noiembrie"
 
-#: js/config.php:33
+#: js/config.php:56
 msgid "December"
 msgstr "Decembrie"
 
 #: js/js.js:286
 msgid "Settings"
-msgstr "ConfigurÄƒri"
+msgstr "SetÄƒri"
 
-#: js/js.js:767
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "secunde Ã®n urmÄƒ"
 
-#: js/js.js:768
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "1 minut Ã®n urmÄƒ"
 
-#: js/js.js:769
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr "{minutes} minute in urma"
 
-#: js/js.js:770
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr "Acum o ora"
 
-#: js/js.js:771
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr "{hours} ore Ã®n urmÄƒ"
 
-#: js/js.js:772
+#: js/js.js:723
 msgid "today"
 msgstr "astÄƒzi"
 
-#: js/js.js:773
+#: js/js.js:724
 msgid "yesterday"
 msgstr "ieri"
 
-#: js/js.js:774
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr "{days} zile in urma"
 
-#: js/js.js:775
+#: js/js.js:726
 msgid "last month"
 msgstr "ultima lunÄƒ"
 
-#: js/js.js:776
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr "{months} luni Ã®n urmÄƒ"
 
-#: js/js.js:777
+#: js/js.js:728
 msgid "months ago"
 msgstr "luni Ã®n urmÄƒ"
 
-#: js/js.js:778
+#: js/js.js:729
 msgid "last year"
 msgstr "ultimul an"
 
-#: js/js.js:779
+#: js/js.js:730
 msgid "years ago"
 msgstr "ani Ã®n urmÄƒ"
 
-#: js/oc-dialogs.js:126
-msgid "Choose"
-msgstr "Alege"
+#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
+msgid "Ok"
+msgstr "Ok"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
 msgid "Cancel"
 msgstr "Anulare"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "Nu"
+#: js/oc-dialogs.js:185
+msgid "Choose"
+msgstr "Alege"
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:215
 msgid "Yes"
 msgstr "Da"
 
-#: js/oc-dialogs.js:180
-msgid "Ok"
-msgstr "Ok"
+#: js/oc-dialogs.js:222
+msgid "No"
+msgstr "Nu"
 
 #: 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 "Tipul obiectului nu a fost specificat"
 
-#: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:582
-#: js/share.js:594
+#: 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 "Eroare"
 
@@ -257,127 +254,127 @@ msgstr "Numele aplicaÈ›iei nu a fost specificat"
 msgid "The required file {file} is not installed!"
 msgstr "FiÈ™ierul obligatoriu {file} nu este instalat!"
 
-#: js/share.js:29 js/share.js:43 js/share.js:90
+#: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
-msgstr ""
+msgstr "Partajat"
 
-#: js/share.js:93
+#: js/share.js:90
 msgid "Share"
 msgstr "PartajeazÄƒ"
 
-#: js/share.js:141 js/share.js:622
+#: js/share.js:125 js/share.js:617
 msgid "Error while sharing"
 msgstr "Eroare la partajare"
 
-#: js/share.js:152
+#: js/share.js:136
 msgid "Error while unsharing"
 msgstr "Eroare la anularea partajÄƒrii"
 
-#: js/share.js:159
+#: js/share.js:143
 msgid "Error while changing permissions"
 msgstr "Eroare la modificarea permisiunilor"
 
-#: js/share.js:168
+#: js/share.js:152
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Distribuie cu tine si grupul {group} de {owner}"
 
-#: js/share.js:170
+#: js/share.js:154
 msgid "Shared with you by {owner}"
 msgstr "Distribuie cu tine de {owner}"
 
-#: js/share.js:175
+#: js/share.js:159
 msgid "Share with"
 msgstr "Partajat cu"
 
-#: js/share.js:180
+#: js/share.js:164
 msgid "Share with link"
 msgstr "Partajare cu legÄƒturÄƒ"
 
-#: js/share.js:183
+#: js/share.js:167
 msgid "Password protect"
 msgstr "Protejare cu parolÄƒ"
 
-#: js/share.js:185 templates/installation.php:44 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:189
+#: js/share.js:173
 msgid "Email link to person"
 msgstr "ExpediazÄƒ legÄƒtura prin poÈ™ta electronicÄƒ"
 
-#: js/share.js:190
+#: js/share.js:174
 msgid "Send"
 msgstr "ExpediazÄƒ"
 
-#: js/share.js:194
+#: js/share.js:178
 msgid "Set expiration date"
 msgstr "SpecificÄƒ data expirÄƒrii"
 
-#: js/share.js:195
+#: js/share.js:179
 msgid "Expiration date"
 msgstr "Data expirÄƒrii"
 
-#: js/share.js:227
+#: js/share.js:211
 msgid "Share via email:"
 msgstr "Distribuie prin email:"
 
-#: js/share.js:229
+#: js/share.js:213
 msgid "No people found"
 msgstr "Nici o persoanÄƒ gÄƒsitÄƒ"
 
-#: js/share.js:256
+#: js/share.js:251
 msgid "Resharing is not allowed"
 msgstr "Repartajarea nu este permisÄƒ"
 
-#: js/share.js:292
+#: js/share.js:287
 msgid "Shared in {item} with {user}"
 msgstr "Distribuie in {item} si {user}"
 
-#: js/share.js:313
+#: js/share.js:308
 msgid "Unshare"
 msgstr "Anulare partajare"
 
-#: js/share.js:325
+#: js/share.js:320
 msgid "can edit"
 msgstr "poate edita"
 
-#: js/share.js:327
+#: js/share.js:322
 msgid "access control"
 msgstr "control acces"
 
-#: js/share.js:330
+#: js/share.js:325
 msgid "create"
 msgstr "creare"
 
-#: js/share.js:333
+#: js/share.js:328
 msgid "update"
 msgstr "actualizare"
 
-#: js/share.js:336
+#: js/share.js:331
 msgid "delete"
 msgstr "È™tergere"
 
-#: js/share.js:339
+#: js/share.js:334
 msgid "share"
 msgstr "partajare"
 
-#: js/share.js:373 js/share.js:569
+#: js/share.js:368 js/share.js:564
 msgid "Password protected"
 msgstr "Protejare cu parolÄƒ"
 
-#: js/share.js:582
+#: js/share.js:577
 msgid "Error unsetting expiration date"
 msgstr "Eroare la anularea datei de expirare"
 
-#: js/share.js:594
+#: js/share.js:589
 msgid "Error setting expiration date"
 msgstr "Eroare la specificarea datei de expirare"
 
-#: js/share.js:609
+#: js/share.js:604
 msgid "Sending ..."
 msgstr "Se expediazÄƒ..."
 
-#: js/share.js:620
+#: js/share.js:615
 msgid "Email sent"
 msgstr "Mesajul a fost expediat"
 
@@ -386,11 +383,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"
@@ -400,24 +397,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:39
-#: 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Äƒ"
 
@@ -451,7 +451,7 @@ msgstr "AplicaÈ›ii"
 
 #: strings.php:8
 msgid "Admin"
-msgstr "Administrator"
+msgstr "Admin"
 
 #: strings.php:9
 msgid "Help"
@@ -467,123 +467,138 @@ 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"
 msgstr "AdaugÄƒ"
 
-#: templates/installation.php:23 templates/installation.php:30
+#: templates/installation.php:24 templates/installation.php:31
+#: templates/installation.php:38
 msgid "Security Warning"
 msgstr "Avertisment de securitate"
 
-#: templates/installation.php:24
+#: templates/installation.php:25
+msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
+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 "VÄƒ rugÄƒm sÄƒ actualizaÈ›i instalarea dvs. PHP pentru a utiliza ownCloud in siguranÈ›Äƒ."
+
+#: templates/installation.php:32
 msgid ""
 "No secure random number generator is available, please enable the PHP "
 "OpenSSL extension."
 msgstr "Generatorul de numere pentru securitate nu este disponibil, va rog activati extensia PHP OpenSSL"
 
-#: templates/installation.php:25
+#: 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 "Fara generatorul pentru numere de securitate , un atacator poate afla parola si reseta contul tau"
 
-#: templates/installation.php:31
+#: 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 "Directorul de date È™i fiÈ™iere sunt, probabil, accesibile de pe Internet, deoarece .htaccess nu funcÈ›ioneazÄƒ."
 
-#: templates/installation.php:32
+#: 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:36
+#: templates/installation.php:44
 msgid "Create an <strong>admin account</strong>"
 msgstr "CreazÄƒ un <strong>cont de administrator</strong>"
 
-#: templates/installation.php:52
+#: templates/installation.php:62
 msgid "Advanced"
 msgstr "Avansat"
 
-#: templates/installation.php:54
+#: templates/installation.php:64
 msgid "Data folder"
 msgstr "Director date"
 
-#: templates/installation.php:61
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "ConfigureazÄƒ baza de date"
 
-#: templates/installation.php:66 templates/installation.php:77
-#: templates/installation.php:87 templates/installation.php:97
+#: 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:109
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "Utilizatorul bazei de date"
 
-#: templates/installation.php:113
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "Parola bazei de date"
 
-#: templates/installation.php:117
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "Numele bazei de date"
 
-#: templates/installation.php:125
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "Tabela de spaÈ›iu a bazei de date"
 
-#: templates/installation.php:131
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "BazÄƒ date"
 
-#: templates/installation.php:136
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "FinalizeazÄƒ instalarea"
 
-#: templates/layout.guest.php:33
+#: templates/layout.guest.php:40
 msgid "web services under your control"
 msgstr "servicii web controlate de tine"
 
-#: templates/layout.user.php:48
+#: 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 "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 e7f7597e8e0283fea12ed29db78978dd0f4ddbe0..4d7f89ed97a32e6c8046fc6338cbaf4ecc282585 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-03-04 00:06+0100\n"
-"PO-Revision-Date: 2013-03-03 23:06+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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,60 +65,71 @@ 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:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr "Director invalid."
 
-#: appinfo/app.php:10
+#: appinfo/app.php:12
 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:92 templates/index.php:93
+#: 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/files.js:292 js/files.js:408
-#: js/files.js:439
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "ÃŽn aÈ™teptare"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} deja exista"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "Ã®nlocuire"
 
-#: js/filelist.js:251
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "sugereazÄƒ nume"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "anulare"
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "{new_name} inlocuit cu {old_name}"
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "undo"
 msgstr "AnuleazÄƒ ultima acÈ›iune"
 
-#: js/filelist.js:323
+#: js/filelist.js:331
 msgid "perform delete operation"
-msgstr ""
+msgstr "efectueaza operatiunea de stergere"
+
+#: js/filelist.js:413
+msgid "1 file uploading"
+msgstr "un fiÈ™ier se Ã®ncarcÄƒ"
+
+#: js/filelist.js:416 js/filelist.js:470
+msgid "files uploading"
+msgstr "fiÈ™iere se Ã®ncarcÄƒ"
 
 #: js/files.js:52
 msgid "'.' is an invalid file name."
@@ -145,86 +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:225
+#: 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:262
+#: 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:262
-msgid "Upload Error"
-msgstr "Eroare la Ã®ncÄƒrcare"
-
-#: js/files.js:273
-msgid "Close"
-msgstr "ÃŽnchide"
+#: js/files.js:277
+msgid "Not enough space available"
+msgstr "Nu este suficient spaÈ›iu disponibil"
 
-#: js/files.js:312
-msgid "1 file uploading"
-msgstr "un fiÈ™ier se Ã®ncarcÄƒ"
-
-#: js/files.js:315 js/files.js:370 js/files.js:385
-msgid "{count} files uploading"
-msgstr "{count} fisiere incarcate"
-
-#: js/files.js:388 js/files.js:423
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "ÃŽncÄƒrcare anulatÄƒ."
 
-#: js/files.js:497
+#: 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:570
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "Adresa URL nu poate fi goalÄƒ."
 
-#: js/files.js:575
+#: 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:953 templates/index.php:68
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+msgid "Error"
+msgstr "Eroare"
+
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Nume"
 
-#: js/files.js:954 templates/index.php:79
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Dimensiune"
 
-#: js/files.js:955 templates/index.php:81
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Modificat"
 
-#: js/files.js:974
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 folder"
 
-#: js/files.js:976
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} foldare"
 
-#: js/files.js:984
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 fisier"
 
-#: js/files.js:986
+#: 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"
@@ -256,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"
@@ -274,48 +276,48 @@ msgstr "Dosar"
 msgid "From link"
 msgstr "de la adresa"
 
-#: templates/index.php:40
+#: templates/index.php:42
 msgid "Deleted files"
-msgstr ""
+msgstr "Sterge fisierele"
 
-#: templates/index.php:46
+#: templates/index.php:48
 msgid "Cancel upload"
 msgstr "AnuleazÄƒ Ã®ncÄƒrcarea"
 
-#: templates/index.php:53
+#: 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:60
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Nimic aici. ÃŽncarcÄƒ ceva!"
 
-#: templates/index.php:74
+#: templates/index.php:75
 msgid "Download"
 msgstr "DescarcÄƒ"
 
-#: templates/index.php:86 templates/index.php:87
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
-msgstr "AnuleazÄƒ partajarea"
+msgstr "Anulare partajare"
 
-#: templates/index.php:106
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "FiÈ™ierul Ã®ncÄƒrcat este prea mare"
 
-#: templates/index.php:108
+#: 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:113
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "FiÈ™ierele sunt scanate, te rog aÈ™teptÄƒ."
 
-#: templates/index.php:116
+#: 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..91a23afb23d2db3ee393dda83e4a960e9b5e00bc 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ro/files_external.po b/l10n/ro/files_external.po
index c97be8f9cc989ba91e182bb549fd8581f38a2f3e..1823f0d97d41f99facecbbd6ab9696a663b433c7 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-01 00:05+0100\n"
-"PO-Revision-Date: 2013-02-27 23:20+0000\n"
+"POT-Creation-Date: 2013-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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: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 "<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: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 "<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..c6b95b107082091800fc7f382b223b02882499f3 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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 facd2efe40d35614fa981e099d5e4a94f5a5990a..c4888b41a062cef923149450676ce8e7a8d964d9 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-03-08 00:25+0100\n"
-"PO-Revision-Date: 2013-03-07 23:25+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -17,12 +17,12 @@ msgstr ""
 "Language: ro\n"
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
 
-#: ajax/delete.php:40
+#: ajax/delete.php:42
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
 
-#: ajax/undelete.php:41
+#: ajax/undelete.php:42
 #, php-format
 msgid "Couldn't restore %s"
 msgstr ""
@@ -31,13 +31,17 @@ msgstr ""
 msgid "perform restore operation"
 msgstr ""
 
+#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+msgid "Error"
+msgstr "Eroare"
+
 #: js/trash.js:34
 msgid "delete file permanently"
 msgstr ""
 
 #: js/trash.js:121
 msgid "Delete permanently"
-msgstr ""
+msgstr "Stergere permanenta"
 
 #: js/trash.js:174 templates/index.php:17
 msgid "Name"
diff --git a/l10n/ro/files_versions.po b/l10n/ro/files_versions.po
index 9a6c076a43c2a0fd01a130172ac28119dac0ccec..4ae67ab2bc69a347f7d4d77823b1ee622aa5f6a5 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:30+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 e8cff99f648ab901854c8e1988f9929a5241d296..7d85c7044f42777ca166d3ce5bcdd8857f0a0a56 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-02-27 14:35+0100\n"
-"PO-Revision-Date: 2013-02-27 13:35+0000\n"
+"POT-Creation-Date: 2013-04-28 01:57+0200\n"
+"PO-Revision-Date: 2013-04-27 23:57+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"
@@ -44,19 +41,19 @@ msgstr "AplicaÈ›ii"
 msgid "Admin"
 msgstr "Admin"
 
-#: files.php:202
+#: files.php:209
 msgid "ZIP download is turned off."
 msgstr "DescÄƒrcarea ZIP este dezactivatÄƒ."
 
-#: files.php:203
+#: files.php:210
 msgid "Files need to be downloaded one by one."
 msgstr "FiÈ™ierele trebuie descÄƒrcate unul cÃ¢te unul."
 
-#: files.php:204 files.php:231
+#: files.php:211 files.php:244
 msgid "Back to Files"
 msgstr "ÃŽnapoi la fiÈ™iere"
 
-#: files.php:228
+#: files.php:241
 msgid "Selected files too large to generate zip file."
 msgstr "FiÈ™ierele selectate sunt prea mari pentru a genera un fiÈ™ier zip."
 
@@ -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,72 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:128 setup.php:320 setup.php:365
+#: setup.php:132 setup.php:325 setup.php:370
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:129 setup.php:152 setup.php:229
+#: setup.php:133 setup.php:156 setup.php:234
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:151 setup.php:453 setup.php:520
+#: setup.php:155 setup.php:458 setup.php:525
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:228
+#: setup.php:233
 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: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:583 setup.php:592 setup.php:600 setup.php:609
+#: setup.php:615
 #, 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:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
+#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
+#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:299
+#: setup.php:304
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:300
+#: setup.php:305
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:305
+#: setup.php:310
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:306
+#: setup.php:311
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:579 setup.php:611
+#: setup.php:584 setup.php:616
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:631
+#: setup.php:636
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:849
+#: setup.php:858
 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:859
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
@@ -242,19 +235,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 ac2965b4d758e9486f6c4c3d23bb6c076b5d58c1..b3c9bd49afb066da4912b8273d13e1ea4a732aca 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-02-27 14:35+0100\n"
-"PO-Revision-Date: 2013-02-27 13:35+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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 ""
 
@@ -99,76 +96,76 @@ msgstr ""
 msgid "Disable"
 msgstr "DezactivaÈ›i"
 
-#: js/apps.js:36 js/apps.js:64
+#: 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...."
 msgstr ""
 
-#: js/apps.js:84
+#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+msgid "Error"
+msgstr "Eroare"
+
+#: js/apps.js:90
 msgid "Updating...."
 msgstr ""
 
-#: js/apps.js:87
+#: js/apps.js:93
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:87
-msgid "Error"
-msgstr "Eroare"
-
-#: js/apps.js:90
+#: js/apps.js:96
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
-msgstr "Salvez..."
+msgstr "Se salveazÄƒ..."
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "deleted"
 msgstr "È™ters"
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "undo"
 msgstr "AnuleazÄƒ ultima acÈ›iune"
 
-#: js/users.js:62
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:75 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
+#: templates/users.php:103
 msgid "Groups"
 msgstr "Grupuri"
 
-#: js/users.js:78 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr "Grupul Admin "
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "È˜terge"
 
-#: js/users.js:191
+#: js/users.js:269
 msgid "add group"
 msgstr ""
 
-#: js/users.js:352
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:353 js/users.js:359 js/users.js:374
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:358
+#: js/users.js:426
 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,21 +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:230 templates/personal.php:102
+#: templates/admin.php:228
+msgid "Less"
+msgstr "Mai puÈ›in"
+
+#: templates/admin.php:235 templates/personal.php:105
 msgid "Version"
 msgstr "Versiunea"
 
-#: templates/admin.php:233 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 "
@@ -392,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:77
 msgid "Password"
 msgstr "ParolÄƒ"
 
@@ -422,82 +423,70 @@ msgstr "Noua parolÄƒ"
 msgid "Change password"
 msgstr "SchimbÄƒ parola"
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:76
 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 "Email"
 
-#: templates/personal.php:72
+#: templates/personal.php:70
 msgid "Your email address"
 msgstr "Adresa ta de email"
 
-#: templates/personal.php:73
+#: templates/personal.php:71
 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:77 templates/personal.php:78
 msgid "Language"
 msgstr "Limba"
 
-#: templates/personal.php:86
+#: templates/personal.php:89
 msgid "Help translate"
 msgstr "AjutÄƒ la traducere"
 
-#: templates/personal.php:91
+#: templates/personal.php:94
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:93
+#: templates/personal.php:96
 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:75
 msgid "Login Name"
 msgstr ""
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr "CreazÄƒ"
 
-#: templates/users.php:35
+#: templates/users.php:33
 msgid "Default Storage"
 msgstr "Stocare implicitÄƒ"
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:39 templates/users.php:133
 msgid "Unlimited"
 msgstr "NelimitatÄƒ"
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:57 templates/users.php:148
 msgid "Other"
 msgstr "Altele"
 
-#: templates/users.php:84
+#: templates/users.php:82
 msgid "Storage"
 msgstr "Stocare"
 
-#: templates/users.php:95
+#: templates/users.php:93
 msgid "change display name"
 msgstr ""
 
-#: templates/users.php:99
+#: templates/users.php:97
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:134
+#: templates/users.php:128
 msgid "Default"
 msgstr "ImplicitÄƒ"
diff --git a/l10n/ro/user_ldap.po b/l10n/ro/user_ldap.po
index 3f4d630d95b4b402f0fb4887175b52ffe8011a96..46778737fa5b0a171489ff6c886d8717d96da25f 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-02 00:03+0100\n"
-"PO-Revision-Date: 2013-03-01 23:04+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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:18
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:37
 msgid "Host"
 msgstr "GazdÄƒ"
 
-#: templates/settings.php:25
+#: 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:26
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "DN de bazÄƒ"
 
-#: templates/settings.php:27
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr "Un Base DN pe linie"
 
-#: templates/settings.php:28
+#: 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:30
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "DN al utilizatorului"
 
-#: 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 "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:33
+#: templates/settings.php:47
 msgid "Password"
 msgstr "ParolÄƒ"
 
-#: templates/settings.php:36
+#: 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:37
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "Filtrare dupÄƒ Nume Utilizator"
 
-#: 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 "DefineÈ™te fitrele care trebuie aplicate, cÃ¢nd se Ã®ncearcÄƒ conectarea. %%uid Ã®nlocuieÈ™te numele utilizatorului Ã®n procesul de conectare."
 
-#: templates/settings.php:41
+#: 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:42
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Filtrarea dupÄƒ lista utilizatorilor"
 
-#: templates/settings.php:45
+#: 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:46
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "fÄƒrÄƒ substituenÈ›i, d.e. \"objectClass=person\"."
 
-#: templates/settings.php:47
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "Fitrare Grup"
 
-#: templates/settings.php:50
+#: 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:51
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "fÄƒrÄƒ substituenÈ›i, d.e. \"objectClass=posixGroup\""
 
-#: 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 "Portul"
 
-#: 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 "UtilizeazÄƒ 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 "Server LDAP insensibil la majuscule (Windows)"
 
-#: templates/settings.php:64
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "OpreÈ™te validarea certificatelor SSL "
 
-#: 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 "DacÄƒ conexiunea lucreazÄƒ doar cu aceastÄƒ opÈ›iune, importeazÄƒ certificatul SSL al serverului LDAP Ã®n serverul ownCloud."
 
-#: templates/settings.php:64
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "Nu este recomandat, a se utiliza doar pentru testare."
 
-#: 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 "Ã®n secunde. O schimbare curÄƒÈ›Äƒ memoria tampon."
 
-#: 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 "CÃ¢mpul cu numele vizibil al utilizatorului"
 
-#: templates/settings.php:69
+#: 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:70
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "Arborele de bazÄƒ al Utilizatorilor"
 
-#: templates/settings.php:70
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr "Un User Base DN pe linie"
 
-#: 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 "CÃ¢mpul cu numele grupului"
 
-#: templates/settings.php:72
+#: 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:73
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "Arborele de bazÄƒ al Grupurilor"
 
-#: templates/settings.php:73
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr "Un Group Base DN pe linie"
 
-#: 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 "Asocierea Grup-Membru"
 
-#: 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 "Ã®n octeÈ›i"
 
-#: 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 "LÄƒsaÈ›i gol pentru numele de utilizator (implicit). ÃŽn caz contrar, specificaÈ›i un atribut LDAP / AD."
 
-#: 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 "Ajutor"
diff --git a/l10n/ro/user_webdavauth.po b/l10n/ro/user_webdavauth.po
index 1f11c76068bbe3713e58adf9250894ae60087fb1..637e3bf026950670e92bf3d747c6d56a471f3b3d 100644
--- a/l10n/ro/user_webdavauth.po
+++ b/l10n/ro/user_webdavauth.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-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-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
 "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 21dfba20b358e8c3c2c674c7627604221c17d63f..fbe806ab0ec3bda00d637223101ea0310d7074ac 100644
--- a/l10n/ru/core.po
+++ b/l10n/ru/core.po
@@ -3,25 +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
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-22 00:06+0100\n"
-"PO-Revision-Date: 2013-02-20 23:20+0000\n"
-"Last-Translator: Langaru <langaru@gmail.com>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"Last-Translator: foool <andrglad@mail.ru>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -29,24 +19,24 @@ 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/share.php:85
+#: ajax/share.php:97
 #, php-format
 msgid "User %s shared a file with you"
 msgstr "ÐŸÐ¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒ %s Ð¿Ð¾Ð´ÐµÐ»Ð¸Ð»ÑÑ Ñ Ð²Ð°Ð¼Ð¸ Ñ„Ð°Ð¹Ð»Ð¾Ð¼"
 
-#: ajax/share.php:87
+#: ajax/share.php:99
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr "ÐŸÐ¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒ %s Ð¾Ñ‚ÐºÑ€Ñ‹Ð» Ð²Ð°Ð¼ Ð´Ð¾ÑÑ‚ÑƒÐ¿ Ðº Ð¿Ð°Ð¿ÐºÐµ"
 
-#: ajax/share.php:89
+#: ajax/share.php:101
 #, php-format
 msgid ""
 "User %s shared the file \"%s\" with you. It is available for download here: "
 "%s"
 msgstr "ÐŸÐ¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒ %s Ð¾Ñ‚ÐºÑ€Ñ‹Ð» Ð²Ð°Ð¼ Ð´Ð¾ÑÑ‚ÑƒÐ¿ Ðº Ñ„Ð°Ð¹Ð»Ñƒ \"%s\". ÐžÐ½ Ð´Ð¾ÑÑ‚ÑƒÐ¿ÐµÐ½ Ð´Ð»Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸ Ð·Ð´ÐµÑÑŒ: %s"
 
-#: ajax/share.php:91
+#: ajax/share.php:104
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -92,166 +82,168 @@ msgstr "ÐÐµÑ‚ ÐºÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ð¹ Ð´Ð»Ñ ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ."
 msgid "Error removing %s from favorites."
 msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ %s Ð¸Ð· Ð¸Ð·Ð±Ñ€Ð°Ð½Ð½Ð¾Ð³Ð¾"
 
-#: js/config.php:32
+#: js/config.php:34
 msgid "Sunday"
 msgstr "Ð’Ð¾ÑÐºÑ€ÐµÑÐµÐ½ÑŒÐµ"
 
-#: js/config.php:32
+#: js/config.php:35
 msgid "Monday"
 msgstr "ÐŸÐ¾Ð½ÐµÐ´ÐµÐ»ÑŒÐ½Ð¸Ðº"
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Tuesday"
 msgstr "Ð’Ñ‚Ð¾Ñ€Ð½Ð¸Ðº"
 
-#: js/config.php:32
+#: js/config.php:37
 msgid "Wednesday"
 msgstr "Ð¡Ñ€ÐµÐ´Ð°"
 
-#: js/config.php:32
+#: js/config.php:38
 msgid "Thursday"
 msgstr "Ð§ÐµÑ‚Ð²ÐµÑ€Ð³"
 
-#: js/config.php:32
+#: js/config.php:39
 msgid "Friday"
 msgstr "ÐŸÑÑ‚Ð½Ð¸Ñ†Ð°"
 
-#: js/config.php:32
+#: js/config.php:40
 msgid "Saturday"
 msgstr "Ð¡ÑƒÐ±Ð±Ð¾Ñ‚Ð°"
 
-#: js/config.php:33
+#: js/config.php:45
 msgid "January"
 msgstr "Ð¯Ð½Ð²Ð°Ñ€ÑŒ"
 
-#: js/config.php:33
+#: js/config.php:46
 msgid "February"
 msgstr "Ð¤ÐµÐ²Ñ€Ð°Ð»ÑŒ"
 
-#: js/config.php:33
+#: js/config.php:47
 msgid "March"
 msgstr "ÐœÐ°Ñ€Ñ‚"
 
-#: js/config.php:33
+#: js/config.php:48
 msgid "April"
 msgstr "ÐÐ¿Ñ€ÐµÐ»ÑŒ"
 
-#: js/config.php:33
+#: js/config.php:49
 msgid "May"
 msgstr "ÐœÐ°Ð¹"
 
-#: js/config.php:33
+#: js/config.php:50
 msgid "June"
 msgstr "Ð˜ÑŽÐ½ÑŒ"
 
-#: js/config.php:33
+#: js/config.php:51
 msgid "July"
 msgstr "Ð˜ÑŽÐ»ÑŒ"
 
-#: js/config.php:33
+#: js/config.php:52
 msgid "August"
 msgstr "ÐÐ²Ð³ÑƒÑÑ‚"
 
-#: js/config.php:33
+#: js/config.php:53
 msgid "September"
 msgstr "Ð¡ÐµÐ½Ñ‚ÑÐ±Ñ€ÑŒ"
 
-#: js/config.php:33
+#: js/config.php:54
 msgid "October"
 msgstr "ÐžÐºÑ‚ÑÐ±Ñ€ÑŒ"
 
-#: js/config.php:33
+#: js/config.php:55
 msgid "November"
 msgstr "ÐÐ¾ÑÐ±Ñ€ÑŒ"
 
-#: js/config.php:33
+#: js/config.php:56
 msgid "December"
 msgstr "Ð”ÐµÐºÐ°Ð±Ñ€ÑŒ"
 
 #: js/js.js:286
 msgid "Settings"
-msgstr "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸"
+msgstr "ÐšÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ"
 
-#: js/js.js:767
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "Ð½ÐµÑÐºÐ¾Ð»ÑŒÐºÐ¾ ÑÐµÐºÑƒÐ½Ð´ Ð½Ð°Ð·Ð°Ð´"
 
-#: js/js.js:768
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "1 Ð¼Ð¸Ð½ÑƒÑ‚Ñƒ Ð½Ð°Ð·Ð°Ð´"
 
-#: js/js.js:769
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr "{minutes} Ð¼Ð¸Ð½ÑƒÑ‚ Ð½Ð°Ð·Ð°Ð´"
 
-#: js/js.js:770
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr "Ñ‡Ð°Ñ Ð½Ð°Ð·Ð°Ð´"
 
-#: js/js.js:771
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr "{hours} Ñ‡Ð°ÑÐ¾Ð² Ð½Ð°Ð·Ð°Ð´"
 
-#: js/js.js:772
+#: js/js.js:723
 msgid "today"
 msgstr "ÑÐµÐ³Ð¾Ð´Ð½Ñ"
 
-#: js/js.js:773
+#: js/js.js:724
 msgid "yesterday"
 msgstr "Ð²Ñ‡ÐµÑ€Ð°"
 
-#: js/js.js:774
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr "{days} Ð´Ð½ÐµÐ¹ Ð½Ð°Ð·Ð°Ð´"
 
-#: js/js.js:775
+#: js/js.js:726
 msgid "last month"
 msgstr "Ð² Ð¿Ñ€Ð¾ÑˆÐ»Ð¾Ð¼ Ð¼ÐµÑÑÑ†Ðµ"
 
-#: js/js.js:776
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr "{months} Ð¼ÐµÑÑÑ†ÐµÐ² Ð½Ð°Ð·Ð°Ð´"
 
-#: js/js.js:777
+#: js/js.js:728
 msgid "months ago"
 msgstr "Ð½ÐµÑÐºÐ¾Ð»ÑŒÐºÐ¾ Ð¼ÐµÑÑÑ†ÐµÐ² Ð½Ð°Ð·Ð°Ð´"
 
-#: js/js.js:778
+#: js/js.js:729
 msgid "last year"
 msgstr "Ð² Ð¿Ñ€Ð¾ÑˆÐ»Ð¾Ð¼ Ð³Ð¾Ð´Ñƒ"
 
-#: js/js.js:779
+#: js/js.js:730
 msgid "years ago"
 msgstr "Ð½ÐµÑÐºÐ¾Ð»ÑŒÐºÐ¾ Ð»ÐµÑ‚ Ð½Ð°Ð·Ð°Ð´"
 
-#: js/oc-dialogs.js:126
-msgid "Choose"
-msgstr "Ð’Ñ‹Ð±Ñ€Ð°Ñ‚ÑŒ"
+#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
+msgid "Ok"
+msgstr "ÐžÐº"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
 msgid "Cancel"
-msgstr "ÐžÑ‚Ð¼ÐµÐ½Ð°"
+msgstr "ÐžÑ‚Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "ÐÐµÑ‚"
+#: js/oc-dialogs.js:185
+msgid "Choose"
+msgstr "Ð’Ñ‹Ð±Ñ€Ð°Ñ‚ÑŒ"
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:215
 msgid "Yes"
 msgstr "Ð”Ð°"
 
-#: js/oc-dialogs.js:180
-msgid "Ok"
-msgstr "ÐžÐº"
+#: js/oc-dialogs.js:222
+msgid "No"
+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:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:582
-#: js/share.js:594
+#: 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 "ÐžÑˆÐ¸Ð±ÐºÐ°"
 
@@ -263,127 +255,127 @@ msgstr "Ð˜Ð¼Ñ Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð½Ðµ ÑƒÐºÐ°Ð·Ð°Ð½Ð¾"
 msgid "The required file {file} is not installed!"
 msgstr "ÐÐµÐ¾Ð±Ñ…Ð¾Ð´Ð¸Ð¼Ñ‹Ð¹ Ñ„Ð°Ð¹Ð» {file} Ð½Ðµ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½!"
 
-#: js/share.js:29 js/share.js:43 js/share.js:90
+#: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr "ÐžÐ±Ñ‰Ð¸Ðµ"
 
-#: js/share.js:93
+#: js/share.js:90
 msgid "Share"
 msgstr "ÐžÑ‚ÐºÑ€Ñ‹Ñ‚ÑŒ Ð´Ð¾ÑÑ‚ÑƒÐ¿"
 
-#: js/share.js:141 js/share.js:622
+#: js/share.js:125 js/share.js:617
 msgid "Error while sharing"
 msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° Ð¿Ñ€Ð¸ Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ð¸Ð¸ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð°"
 
-#: js/share.js:152
+#: js/share.js:136
 msgid "Error while unsharing"
 msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° Ð¿Ñ€Ð¸ Ð·Ð°ÐºÑ€Ñ‹Ñ‚Ð¸Ð¸ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð°"
 
-#: js/share.js:159
+#: js/share.js:143
 msgid "Error while changing permissions"
 msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° Ð¿Ñ€Ð¸ ÑÐ¼ÐµÐ½Ðµ Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¸Ð¹"
 
-#: js/share.js:168
+#: js/share.js:152
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "{owner} Ð¾Ñ‚ÐºÑ€Ñ‹Ð» Ð´Ð¾ÑÑ‚ÑƒÐ¿ Ð´Ð»Ñ Ð’Ð°Ñ Ð¸ Ð³Ñ€ÑƒÐ¿Ð¿Ñ‹ {group} "
 
-#: js/share.js:170
+#: js/share.js:154
 msgid "Shared with you by {owner}"
 msgstr "{owner} Ð¾Ñ‚ÐºÑ€Ñ‹Ð» Ð´Ð¾ÑÑ‚ÑƒÐ¿ Ð´Ð»Ñ Ð’Ð°Ñ"
 
-#: js/share.js:175
+#: js/share.js:159
 msgid "Share with"
 msgstr "ÐŸÐ¾Ð´ÐµÐ»Ð¸Ñ‚ÑŒÑÑ Ñ"
 
-#: js/share.js:180
+#: js/share.js:164
 msgid "Share with link"
 msgstr "ÐŸÐ¾Ð´ÐµÐ»Ð¸Ñ‚ÑŒÑÑ Ñ ÑÑÑ‹Ð»ÐºÐ¾Ð¹"
 
-#: js/share.js:183
+#: js/share.js:167
 msgid "Password protect"
 msgstr "Ð—Ð°Ñ‰Ð¸Ñ‚Ð¸Ñ‚ÑŒ Ð¿Ð°Ñ€Ð¾Ð»ÐµÐ¼"
 
-#: js/share.js:185 templates/installation.php:44 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "ÐŸÐ°Ñ€Ð¾Ð»ÑŒ"
 
-#: js/share.js:189
+#: js/share.js:173
 msgid "Email link to person"
 msgstr "ÐŸÐ¾Ñ‡Ñ‚Ð¾Ð²Ð°Ñ ÑÑÑ‹Ð»ÐºÐ° Ð½Ð° Ð¿ÐµÑ€ÑÐ¾Ð½Ñƒ"
 
-#: js/share.js:190
+#: js/share.js:174
 msgid "Send"
 msgstr "ÐžÑ‚Ð¿Ñ€Ð°Ð²Ð¸Ñ‚ÑŒ"
 
-#: js/share.js:194
+#: js/share.js:178
 msgid "Set expiration date"
 msgstr "Ð£ÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ ÑÑ€Ð¾Ðº Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð°"
 
-#: js/share.js:195
+#: js/share.js:179
 msgid "Expiration date"
 msgstr "Ð”Ð°Ñ‚Ð° Ð¾ÐºÐ¾Ð½Ñ‡Ð°Ð½Ð¸Ñ"
 
-#: js/share.js:227
+#: js/share.js:211
 msgid "Share via email:"
 msgstr "ÐŸÐ¾Ð´ÐµÐ»Ð¸Ñ‚ÑÑ Ñ‡ÐµÑ€ÐµÐ· ÑÐ»ÐµÐºÑ‚Ñ€Ð¾Ð½Ð½ÑƒÑŽ Ð¿Ð¾Ñ‡Ñ‚Ñƒ:"
 
-#: js/share.js:229
+#: js/share.js:213
 msgid "No people found"
 msgstr "ÐÐ¸ Ð¾Ð´Ð¸Ð½ Ñ‡ÐµÐ»Ð¾Ð²ÐµÐº Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½"
 
-#: js/share.js:256
+#: js/share.js:251
 msgid "Resharing is not allowed"
 msgstr "ÐžÐ±Ñ‰Ð¸Ð¹ Ð´Ð¾ÑÑ‚ÑƒÐ¿ Ð½Ðµ Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½"
 
-#: js/share.js:292
+#: js/share.js:287
 msgid "Shared in {item} with {user}"
 msgstr "ÐžÐ±Ñ‰Ð¸Ð¹ Ð´Ð¾ÑÑ‚ÑƒÐ¿ Ðº {item} Ñ {user}"
 
-#: js/share.js:313
+#: js/share.js:308
 msgid "Unshare"
 msgstr "Ð—Ð°ÐºÑ€Ñ‹Ñ‚ÑŒ Ð¾Ð±Ñ‰Ð¸Ð¹ Ð´Ð¾ÑÑ‚ÑƒÐ¿"
 
-#: js/share.js:325
+#: js/share.js:320
 msgid "can edit"
 msgstr "Ð¼Ð¾Ð¶ÐµÑ‚ Ñ€ÐµÐ´Ð°ÐºÑ‚Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ"
 
-#: js/share.js:327
+#: js/share.js:322
 msgid "access control"
 msgstr "ÐºÐ¾Ð½Ñ‚Ñ€Ð¾Ð»ÑŒ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð°"
 
-#: js/share.js:330
+#: js/share.js:325
 msgid "create"
 msgstr "ÑÐ¾Ð·Ð´Ð°Ñ‚ÑŒ"
 
-#: js/share.js:333
+#: js/share.js:328
 msgid "update"
 msgstr "Ð¾Ð±Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ"
 
-#: js/share.js:336
+#: js/share.js:331
 msgid "delete"
 msgstr "ÑƒÐ´Ð°Ð»Ð¸Ñ‚ÑŒ"
 
-#: js/share.js:339
+#: js/share.js:334
 msgid "share"
 msgstr "Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚ÑŒ Ð´Ð¾ÑÑ‚ÑƒÐ¿"
 
-#: js/share.js:373 js/share.js:569
+#: js/share.js:368 js/share.js:564
 msgid "Password protected"
 msgstr "Ð—Ð°Ñ‰Ð¸Ñ‰ÐµÐ½Ð¾ Ð¿Ð°Ñ€Ð¾Ð»ÐµÐ¼"
 
-#: js/share.js:582
+#: js/share.js:577
 msgid "Error unsetting expiration date"
 msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° Ð¿Ñ€Ð¸ Ð¾Ñ‚Ð¼ÐµÐ½Ðµ ÑÑ€Ð¾ÐºÐ° Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð°"
 
-#: js/share.js:594
+#: js/share.js:589
 msgid "Error setting expiration date"
 msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° Ð¿Ñ€Ð¸ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐµ ÑÑ€Ð¾ÐºÐ° Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð°"
 
-#: js/share.js:609
+#: js/share.js:604
 msgid "Sending ..."
 msgstr "ÐžÑ‚Ð¿Ñ€Ð°Ð²Ð»ÑÐµÑ‚ÑÑ ..."
 
-#: js/share.js:620
+#: js/share.js:615
 msgid "Email sent"
 msgstr "ÐŸÐ¸ÑÑŒÐ¼Ð¾ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¾"
 
@@ -406,24 +398,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:39
-#: 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 "Ð—Ð°Ð¿Ñ€Ð¾ÑÐ¸Ñ‚ÑŒ ÑÐ±Ñ€Ð¾Ñ"
 
@@ -457,7 +452,7 @@ msgstr "ÐŸÑ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ"
 
 #: strings.php:8
 msgid "Admin"
-msgstr "ÐÐ´Ð¼Ð¸Ð½Ð¸ÑÑ‚Ñ€Ð°Ñ‚Ð¾Ñ€"
+msgstr "Admin"
 
 #: strings.php:9
 msgid "Help"
@@ -473,121 +468,136 @@ msgstr "ÐžÐ±Ð»Ð°ÐºÐ¾ Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
-msgstr "Ð ÐµÐ´Ð°ÐºÑ‚Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ ÐºÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ð¸"
+msgstr "Ð ÐµÐ´Ð°ÐºÑ‚Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ ÐºÐ°Ñ‚ÐµÐ³Ñ€Ð¸Ð¸"
 
 #: templates/edit_categories_dialog.php:16
 msgid "Add"
 msgstr "Ð”Ð¾Ð±Ð°Ð²Ð¸Ñ‚ÑŒ"
 
-#: templates/installation.php:23 templates/installation.php:30
+#: 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 "Ð’Ð°ÑˆÐ° Ð²ÐµÑ€ÑÐ¸Ñ PHP ÑƒÑÐ·Ð²Ð¸Ð¼Ð° Ðº Ð°Ñ‚Ð°ÐºÐµ NULL Byte (CVE-2006-7243)"
+
+#: templates/installation.php:26
+msgid "Please update your PHP installation to use ownCloud securely."
+msgstr "ÐŸÐ¾Ð¶Ð°Ð»ÑƒÐ¹ÑÑ‚Ð° Ð¾Ð±Ð½Ð¾Ð²Ð¸Ñ‚Ðµ Ð’Ð°Ñˆ PHP Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ ownCloud Ð±ÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾."
+
+#: templates/installation.php:32
 msgid ""
 "No secure random number generator is available, please enable the PHP "
 "OpenSSL extension."
 msgstr "ÐÐµÑ‚ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ð¾Ð³Ð¾ Ð·Ð°Ñ‰Ð¸Ñ‰ÐµÐ½Ð½Ð¾Ð³Ð¾ Ð³ÐµÐ½ÐµÑ€Ð°Ñ‚Ð¾Ñ€Ð° ÑÐ»ÑƒÑ‡Ð°Ð¹Ð½Ñ‹Ñ… Ñ‡Ð¸ÑÐµÐ», Ð¿Ð¾Ð¶Ð°Ð»ÑƒÐ¹ÑÑ‚Ð°, Ð²ÐºÐ»ÑŽÑ‡Ð¸Ñ‚Ðµ Ñ€Ð°ÑÑˆÐ¸Ñ€ÐµÐ½Ð¸Ðµ PHP OpenSSL."
 
-#: templates/installation.php:25
+#: 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:31
+#: 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 Ð½Ðµ Ñ€Ð°Ð±Ð¾Ñ‚Ð°ÐµÑ‚."
 
-#: templates/installation.php:32
+#: 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>."
 
-#: templates/installation.php:36
+#: templates/installation.php:44
 msgid "Create an <strong>admin account</strong>"
 msgstr "Ð¡Ð¾Ð·Ð´Ð°Ñ‚ÑŒ <strong>ÑƒÑ‡Ñ‘Ñ‚Ð½ÑƒÑŽ Ð·Ð°Ð¿Ð¸ÑÑŒ Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑ‚Ñ€Ð°Ñ‚Ð¾Ñ€Ð°</strong>"
 
-#: templates/installation.php:52
+#: templates/installation.php:62
 msgid "Advanced"
 msgstr "Ð”Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾"
 
-#: templates/installation.php:54
+#: templates/installation.php:64
 msgid "Data folder"
 msgstr "Ð”Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ñ Ð´Ð°Ð½Ð½Ñ‹Ð¼Ð¸"
 
-#: templates/installation.php:61
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ° Ð±Ð°Ð·Ñ‹ Ð´Ð°Ð½Ð½Ñ‹Ñ…"
 
-#: templates/installation.php:66 templates/installation.php:77
-#: templates/installation.php:87 templates/installation.php:97
+#: 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:109
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð´Ð»Ñ Ð±Ð°Ð·Ñ‹ Ð´Ð°Ð½Ð½Ñ‹Ñ…"
 
-#: templates/installation.php:113
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "ÐŸÐ°Ñ€Ð¾Ð»ÑŒ Ð´Ð»Ñ Ð±Ð°Ð·Ñ‹ Ð´Ð°Ð½Ð½Ñ‹Ñ…"
 
-#: templates/installation.php:117
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "ÐÐ°Ð·Ð²Ð°Ð½Ð¸Ðµ Ð±Ð°Ð·Ñ‹ Ð´Ð°Ð½Ð½Ñ‹Ñ…"
 
-#: templates/installation.php:125
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "Ð¢Ð°Ð±Ð»Ð¸Ñ‡Ð¾Ðµ Ð¿Ñ€Ð¾ÑÑ‚Ñ€Ð°Ð½ÑÑ‚Ð²Ð¾ Ð±Ð°Ð·Ñ‹ Ð´Ð°Ð½Ð½Ñ‹Ñ…"
 
-#: templates/installation.php:131
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "Ð¥Ð¾ÑÑ‚ Ð±Ð°Ð·Ñ‹ Ð´Ð°Ð½Ð½Ñ‹Ñ…"
 
-#: templates/installation.php:136
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "Ð—Ð°Ð²ÐµÑ€ÑˆÐ¸Ñ‚ÑŒ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÑƒ"
 
-#: templates/layout.guest.php:33
+#: templates/layout.guest.php:40
 msgid "web services under your control"
-msgstr "Ð¡ÐµÑ‚ÐµÐ²Ñ‹Ðµ ÑÐ»ÑƒÐ¶Ð±Ñ‹ Ð¿Ð¾Ð´ Ñ‚Ð²Ð¾Ð¸Ð¼ ÐºÐ¾Ð½Ñ‚Ñ€Ð¾Ð»ÐµÐ¼"
+msgstr "Ð²ÐµÐ±-ÑÐµÑ€Ð²Ð¸ÑÑ‹ Ð¿Ð¾Ð´ Ð²Ð°ÑˆÐ¸Ð¼ ÑƒÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸ÐµÐ¼"
 
-#: templates/layout.user.php:48
+#: templates/layout.user.php:36
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr "%s Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ð¾. ÐŸÐ¾Ð»ÑƒÑ‡Ð¸Ñ‚ÑŒ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½ÑƒÑŽ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸ÑŽ Ð¾ Ð¿Ð¾Ñ€ÑÐ´ÐºÐµ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ."
+
+#: 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/ru/files.po b/l10n/ru/files.po
index 7748313329630df7268c8e2cb28a4695f1a3e688..99301a68747233f0f4e51ab7ce7e608d5c2baa09 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-03-04 00:06+0100\n"
-"PO-Revision-Date: 2013-03-03 23:06+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10: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"
@@ -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"
@@ -84,59 +66,70 @@ msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° Ð·Ð°Ð¿Ð¸ÑÐ¸ Ð½Ð° Ð´Ð¸ÑÐº"
 msgid "Not enough storage available"
 msgstr "ÐÐµÐ´Ð¾ÑÑ‚Ð°Ñ‚Ð¾Ñ‡Ð½Ð¾ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ð¾Ð³Ð¾ Ð¼ÐµÑÑ‚Ð° Ð² Ñ…Ñ€Ð°Ð½Ð¸Ð»Ð¸Ñ‰Ðµ"
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr "ÐÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ñ‹Ð¹ ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³."
 
-#: appinfo/app.php:10
+#: 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 "Ð£Ð´Ð°Ð»ÐµÐ½Ð¾ Ð½Ð°Ð²ÑÐµÐ³Ð´Ð°"
 
-#: js/fileactions.js:127 templates/index.php:92 templates/index.php:93
+#: 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/files.js:292 js/files.js:408
-#: js/files.js:439
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "ÐžÐ¶Ð¸Ð´Ð°Ð½Ð¸Ðµ"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} ÑƒÐ¶Ðµ ÑÑƒÑ‰ÐµÑÑ‚Ð²ÑƒÐµÑ‚"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "Ð·Ð°Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ"
 
-#: js/filelist.js:251
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "Ð¿Ñ€ÐµÐ´Ð»Ð¾Ð¶Ð¸Ñ‚ÑŒ Ð½Ð°Ð·Ð²Ð°Ð½Ð¸Ðµ"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "Ð¾Ñ‚Ð¼ÐµÐ½Ð°"
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "Ð·Ð°Ð¼ÐµÐ½ÐµÐ½Ð¾ {new_name} Ð½Ð° {old_name}"
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "undo"
 msgstr "Ð¾Ñ‚Ð¼ÐµÐ½Ð°"
 
-#: js/filelist.js:323
+#: 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 "'.' - Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð¾Ðµ Ð¸Ð¼Ñ Ñ„Ð°Ð¹Ð»Ð°."
@@ -159,80 +152,80 @@ msgstr "Ð’Ð°ÑˆÐµ Ð´Ð¸ÑÐºÐ¾Ð²Ð¾Ðµ Ð¿Ñ€Ð¾ÑÑ‚Ñ€Ð°Ð½ÑÑ‚Ð²Ð¾ Ð¿Ð¾Ð»Ð½Ð¾ÑÑ‚ÑŒÑŽ Ð·
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Ð’Ð°ÑˆÐµ Ñ…Ñ€Ð°Ð½Ð¸Ð»Ð¸Ñ‰Ðµ Ð¿Ð¾Ñ‡Ñ‚Ð¸ Ð·Ð°Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¾ ({usedSpacePercent}%)"
 
-#: js/files.js:225
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Ð—Ð°Ð³Ñ€ÑƒÐ·ÐºÐ° Ð½Ð°Ñ‡Ð°Ð»Ð°ÑÑŒ. ÐÑ‚Ð¾ Ð¼Ð¾Ð¶ÐµÑ‚ Ð¿Ð¾Ñ‚Ñ€ÐµÐ±Ð¾Ð²Ð°Ñ‚ÑŒ Ð¼Ð½Ð¾Ð³Ð¾ Ð²Ñ€ÐµÐ¼ÐµÐ½Ð¸, ÐµÑÐ»Ð¸ Ñ„Ð°Ð¹Ð» Ð±Ð¾Ð»ÑŒÑˆÐ¾Ð³Ð¾ Ñ€Ð°Ð·Ð¼ÐµÑ€Ð°."
 
-#: js/files.js:262
+#: 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:262
-msgid "Upload Error"
-msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸"
+#: js/files.js:277
+msgid "Not enough space available"
+msgstr "ÐÐµÐ´Ð¾ÑÑ‚Ð°Ñ‚Ð¾Ñ‡Ð½Ð¾ ÑÐ²Ð¾Ð±Ð¾Ð´Ð½Ð¾Ð³Ð¾ Ð¼ÐµÑÑ‚Ð°"
 
-#: js/files.js:273
-msgid "Close"
-msgstr "Ð—Ð°ÐºÑ€Ñ‹Ñ‚ÑŒ"
-
-#: js/files.js:312
-msgid "1 file uploading"
-msgstr "Ð·Ð°Ð³Ñ€ÑƒÐ¶Ð°ÐµÑ‚ÑÑ 1 Ñ„Ð°Ð¹Ð»"
-
-#: js/files.js:315 js/files.js:370 js/files.js:385
-msgid "{count} files uploading"
-msgstr "{count} Ñ„Ð°Ð¹Ð»Ð¾Ð² Ð·Ð°Ð³Ñ€ÑƒÐ¶Ð°ÐµÑ‚ÑÑ"
-
-#: js/files.js:388 js/files.js:423
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "Ð—Ð°Ð³Ñ€ÑƒÐ·ÐºÐ° Ð¾Ñ‚Ð¼ÐµÐ½ÐµÐ½Ð°."
 
-#: js/files.js:497
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Ð¤Ð°Ð¹Ð» Ð² Ð¿Ñ€Ð¾Ñ†ÐµÑÑÐµ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸. ÐŸÐ¾ÐºÐ¸Ð½ÑƒÐ² ÑÑ‚Ñ€Ð°Ð½Ð¸Ñ†Ñƒ Ð²Ñ‹ Ð¿Ñ€ÐµÑ€Ð²Ñ‘Ñ‚Ðµ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÑƒ."
 
-#: js/files.js:570
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "Ð¡ÑÑ‹Ð»ÐºÐ° Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ‚ Ð±Ñ‹Ñ‚ÑŒ Ð¿ÑƒÑÑ‚Ð¾Ð¹."
 
-#: js/files.js:575
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "ÐÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð¾Ðµ Ð¸Ð¼Ñ ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³Ð°. Ð˜Ð¼Ñ 'Shared' Ð·Ð°Ñ€ÐµÐ·ÐµÑ€Ð²Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¾."
 
-#: js/files.js:953 templates/index.php:68
+#: 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 "ÐÐ°Ð·Ð²Ð°Ð½Ð¸Ðµ"
+msgstr "Ð˜Ð¼Ñ"
 
-#: js/files.js:954 templates/index.php:79
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Ð Ð°Ð·Ð¼ÐµÑ€"
 
-#: js/files.js:955 templates/index.php:81
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Ð˜Ð·Ð¼ÐµÐ½Ñ‘Ð½"
 
-#: js/files.js:974
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 Ð¿Ð°Ð¿ÐºÐ°"
 
-#: js/files.js:976
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} Ð¿Ð°Ð¿Ð¾Ðº"
 
-#: js/files.js:984
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 Ñ„Ð°Ð¹Ð»"
 
-#: js/files.js:986
+#: 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"
@@ -282,45 +275,45 @@ msgstr "ÐŸÐ°Ð¿ÐºÐ°"
 msgid "From link"
 msgstr "Ð˜Ð· ÑÑÑ‹Ð»ÐºÐ¸"
 
-#: templates/index.php:40
+#: templates/index.php:42
 msgid "Deleted files"
 msgstr "Ð£Ð´Ð°Ð»Ñ‘Ð½Ð½Ñ‹Ðµ Ñ„Ð°Ð¹Ð»Ñ‹"
 
-#: templates/index.php:46
+#: templates/index.php:48
 msgid "Cancel upload"
 msgstr "ÐžÑ‚Ð¼ÐµÐ½Ð° Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸"
 
-#: templates/index.php:53
+#: templates/index.php:54
 msgid "You donâ€™t have write permissions here."
 msgstr "Ð£ Ð²Ð°Ñ Ð½ÐµÑ‚ Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¸Ð¹ Ð½Ð° Ð·Ð°Ð¿Ð¸ÑÑŒ Ð·Ð´ÐµÑÑŒ."
 
-#: templates/index.php:60
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Ð—Ð´ÐµÑÑŒ Ð½Ð¸Ñ‡ÐµÐ³Ð¾ Ð½ÐµÑ‚. Ð—Ð°Ð³Ñ€ÑƒÐ·Ð¸Ñ‚Ðµ Ñ‡Ñ‚Ð¾-Ð½Ð¸Ð±ÑƒÐ´ÑŒ!"
 
-#: templates/index.php:74
+#: templates/index.php:75
 msgid "Download"
 msgstr "Ð¡ÐºÐ°Ñ‡Ð°Ñ‚ÑŒ"
 
-#: templates/index.php:86 templates/index.php:87
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
-msgstr "ÐžÑ‚Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ Ð¿ÑƒÐ±Ð»Ð¸ÐºÐ°Ñ†Ð¸ÑŽ"
+msgstr "Ð—Ð°ÐºÑ€Ñ‹Ñ‚ÑŒ Ð¾Ð±Ñ‰Ð¸Ð¹ Ð´Ð¾ÑÑ‚ÑƒÐ¿"
 
-#: templates/index.php:106
+#: templates/index.php:107
 msgid "Upload too large"
-msgstr "Ð¤Ð°Ð¹Ð» ÑÐ»Ð¸ÑˆÐºÐ¾Ð¼ Ð±Ð¾Ð»ÑŒÑˆÐ¾Ð¹"
+msgstr "Ð¤Ð°Ð¹Ð» ÑÐ»Ð¸ÑˆÐºÐ¾Ð¼ Ð²ÐµÐ»Ð¸Ðº"
 
-#: templates/index.php:108
+#: 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:113
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "ÐŸÐ¾Ð´Ð¾Ð¶Ð´Ð¸Ñ‚Ðµ, Ñ„Ð°Ð¹Ð»Ñ‹ ÑÐºÐ°Ð½Ð¸Ñ€ÑƒÑŽÑ‚ÑÑ."
 
-#: templates/index.php:116
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "Ð¢ÐµÐºÑƒÑ‰ÐµÐµ ÑÐºÐ°Ð½Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ðµ"
 
diff --git a/l10n/ru/files_encryption.po b/l10n/ru/files_encryption.po
index 1244183e43b039381c2fe04567c059ff71a75866..a43bdd216ccb68f09447f3dd73e840eeba53439d 100644
--- a/l10n/ru/files_encryption.po
+++ b/l10n/ru/files_encryption.po
@@ -3,14 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Denis  <reg.transifex.net@demitel.ru>, 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-02-10 00:08+0100\n"
-"PO-Revision-Date: 2013-02-09 23:09+0000\n"
+"POT-Creation-Date: 2013-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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"
@@ -37,4 +35,4 @@ msgstr "Ð˜ÑÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ ÑÐ»ÐµÐ´ÑƒÑŽÑ‰Ð¸Ðµ Ñ‚Ð¸Ð¿Ñ‹ Ñ„Ð°Ð¹Ð»Ð¾Ð² Ð¸Ð· ÑˆÐ¸Ñ„
 
 #: templates/settings.php:12
 msgid "None"
-msgstr "ÐÐ¸Ñ‡ÐµÐ³Ð¾"
+msgstr "ÐÐµÑ‚ Ð½Ð¾Ð²Ð¾ÑÑ‚ÐµÐ¹"
diff --git a/l10n/ru/files_external.po b/l10n/ru/files_external.po
index 36c362cae6b6d1bb8e2a6da579c106b24b974ad7..e418fb322cc0a02f3827cbfcfbd5409d95bc9e08 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-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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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: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 "<b>Ð’Ð½Ð¸Ð¼Ð°Ð½Ð¸Ðµ:</b> \"smbclient\" Ð½Ðµ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½. ÐŸÐ¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ðµ Ð¿Ð¾ CIFS/SMB Ð½ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾. ÐŸÐ¾Ð¶Ð°Ð»ÑƒÐ¹ÑÑ‚Ð°, Ð¾Ð±Ñ€Ð°Ñ‚Ð¸Ñ‚ÐµÑÑŒ Ðº ÑÐ¸ÑÑ‚ÐµÐ¼Ð½Ð¾Ð¼Ñƒ Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑ‚Ñ€Ð°Ñ‚Ð¾Ñ€Ñƒ, Ñ‡Ñ‚Ð¾Ð±Ñ‹ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ ÐµÐ³Ð¾."
 
-#: 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 "<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..0e1c7422f8e64b8d07e1740b3b92ef9a5ebd075f 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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 b30bcd85ec26b7c10447e39f8eaa78f7f809cd19..42f971ee765fcd7e1c34a5ddac826924a16f837c 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-03-08 00:25+0100\n"
-"PO-Revision-Date: 2013-03-07 23:25+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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"
@@ -18,12 +17,12 @@ 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/delete.php:40
+#: ajax/delete.php:42
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "%s Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ‚ Ð±Ñ‹Ñ‚ÑŒ ÑƒÐ´Ð°Ð»Ñ‘Ð½ Ð½Ð°Ð²ÑÐµÐ³Ð´Ð°"
 
-#: ajax/undelete.php:41
+#: ajax/undelete.php:42
 #, php-format
 msgid "Couldn't restore %s"
 msgstr "%s Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ‚ Ð±Ñ‹Ñ‚ÑŒ Ð²Ð¾ÑÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½"
@@ -32,6 +31,10 @@ msgstr "%s Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ‚ Ð±Ñ‹Ñ‚ÑŒ Ð²Ð¾ÑÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½"
 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 "ÑƒÐ´Ð°Ð»Ð¸Ñ‚ÑŒ Ñ„Ð°Ð¹Ð» Ð½Ð°Ð²ÑÐµÐ³Ð´Ð°"
@@ -78,4 +81,4 @@ msgstr "Ð£Ð´Ð°Ð»Ð¸Ñ‚ÑŒ"
 
 #: templates/part.breadcrumb.php:9
 msgid "Deleted Files"
-msgstr ""
+msgstr "Ð£Ð´Ð°Ð»ÐµÐ½Ð½Ñ‹Ðµ Ñ„Ð°Ð¹Ð»Ñ‹"
diff --git a/l10n/ru/files_versions.po b/l10n/ru/files_versions.po
index 8709b06612f4c687a87dfbabf4f88c47c05b8ad4..24bebd364f481e49bd2fc5fe991931ea8b1701db 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:30+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 ccb02d12a01791b93a8b902fb75e0153d078f3ba..79b382794b12d8140bee3380d087613155af0fc2 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-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-04-28 01:57+0200\n"
+"PO-Revision-Date: 2013-04-27 23:57+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"
@@ -35,7 +27,7 @@ msgstr "Ð›Ð¸Ñ‡Ð½Ð¾Ðµ"
 
 #: app.php:373
 msgid "Settings"
-msgstr "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸"
+msgstr "ÐšÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ"
 
 #: app.php:385
 msgid "Users"
@@ -49,19 +41,19 @@ msgstr "ÐŸÑ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ"
 msgid "Admin"
 msgstr "Admin"
 
-#: files.php:202
+#: files.php:209
 msgid "ZIP download is turned off."
 msgstr "ZIP-ÑÐºÐ°Ñ‡Ð¸Ð²Ð°Ð½Ð¸Ðµ Ð¾Ñ‚ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¾."
 
-#: files.php:203
+#: files.php:210
 msgid "Files need to be downloaded one by one."
 msgstr "Ð¤Ð°Ð¹Ð»Ñ‹ Ð´Ð¾Ð»Ð¶Ð½Ñ‹ Ð±Ñ‹Ñ‚ÑŒ Ð·Ð°Ð³Ñ€ÑƒÐ¶ÐµÐ½Ñ‹ Ð¿Ð¾ Ð¾Ð´Ð½Ð¾Ð¼Ñƒ."
 
-#: files.php:204 files.php:231
+#: files.php:211 files.php:244
 msgid "Back to Files"
 msgstr "ÐÐ°Ð·Ð°Ð´ Ðº Ñ„Ð°Ð¹Ð»Ð°Ð¼"
 
-#: files.php:228
+#: files.php:241
 msgid "Selected files too large to generate zip file."
 msgstr "Ð’Ñ‹Ð±Ñ€Ð°Ð½Ð½Ñ‹Ðµ Ñ„Ð°Ð¹Ð»Ñ‹ ÑÐ»Ð¸ÑˆÐºÐ¾Ð¼ Ð²ÐµÐ»Ð¸ÐºÐ¸, Ñ‡Ñ‚Ð¾Ð±Ñ‹ ÑÐ¾Ð·Ð´Ð°Ñ‚ÑŒ zip Ñ„Ð°Ð¹Ð»."
 
@@ -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,79 @@ msgstr "%s Ð’Ñ‹ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ Ñ‚Ð¾Ñ‡ÐºÐ¸ Ð² Ð¸Ð¼Ðµ
 msgid "%s set the database host."
 msgstr "%s Ð·Ð°Ð´Ð°Ð¹Ñ‚Ðµ Ñ…Ð¾ÑÑ‚ Ð±Ð°Ð·Ñ‹ Ð´Ð°Ð½Ð½Ñ‹Ñ…."
 
-#: setup.php:128 setup.php:320 setup.php:365
+#: setup.php:132 setup.php:325 setup.php:370
 msgid "PostgreSQL username and/or password not valid"
 msgstr "ÐÐµÐ²ÐµÑ€Ð½Ð¾Ðµ Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¸/Ð¸Ð»Ð¸ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ PostgreSQL"
 
-#: setup.php:129 setup.php:152 setup.php:229
+#: setup.php:133 setup.php:156 setup.php:234
 msgid "You need to enter either an existing account or the administrator."
 msgstr "Ð’Ñ‹ Ð´Ð¾Ð»Ð¶Ð½Ñ‹ Ð²Ð¾Ð¹Ñ‚Ð¸ Ð¸Ð»Ð¸ Ð² ÑÑƒÑ‰ÐµÑÑ‚Ð²ÑƒÑŽÑ‰Ð¸Ð¹ Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚ Ð¸Ð»Ð¸ Ð¿Ð¾Ð´ Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑ‚Ñ€Ð°Ñ‚Ð¾Ñ€Ð¾Ð¼."
 
-#: setup.php:151 setup.php:453 setup.php:520
+#: setup.php:155 setup.php:458 setup.php:525
 msgid "Oracle username and/or password not valid"
 msgstr "ÐÐµÐ²ÐµÑ€Ð½Ð¾Ðµ Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¸/Ð¸Ð»Ð¸ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ Oracle"
 
-#: setup.php:228
+#: setup.php:233
 msgid "MySQL username and/or password not valid"
 msgstr "ÐÐµÐ²ÐµÑ€Ð½Ð¾Ðµ Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¸/Ð¸Ð»Ð¸ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ MySQL"
 
-#: 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: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:583 setup.php:592 setup.php:600 setup.php:609
+#: setup.php:615
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° Ð‘Ð”: \"%s\""
 
-#: 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:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
+#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
+#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "Ð’Ñ‹Ð·Ñ‹Ð²Ð°ÐµÐ¼Ð°Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° Ð±Ñ‹Ð»Ð°: \"%s\""
 
-#: setup.php:299
+#: setup.php:304
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "ÐŸÐ¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒ MySQL '%s'@'localhost' ÑƒÐ¶Ðµ ÑÑƒÑ‰ÐµÑÑ‚Ð²ÑƒÐµÑ‚."
 
-#: setup.php:300
+#: setup.php:305
 msgid "Drop this user from MySQL"
 msgstr "Ð£Ð´Ð°Ð»Ð¸Ñ‚ÑŒ ÑÑ‚Ð¾Ð³Ð¾ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¸Ð· MySQL"
 
-#: setup.php:305
+#: setup.php:310
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "ÐŸÐ¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒ MySQL '%s'@'%%' ÑƒÐ¶Ðµ ÑÑƒÑ‰ÐµÑÑ‚Ð²ÑƒÐµÑ‚"
 
-#: setup.php:306
+#: setup.php:311
 msgid "Drop this user from MySQL."
 msgstr "Ð£Ð´Ð°Ð»Ð¸Ñ‚ÑŒ ÑÑ‚Ð¾Ð³Ð¾ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¸Ð· MySQL."
 
-#: setup.php:579 setup.php:611
+#: setup.php:584 setup.php:616
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Ð’Ñ‹Ð·Ñ‹Ð²Ð°ÐµÐ¼Ð°Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° Ð±Ñ‹Ð»Ð°: \"%s\", Ð¸Ð¼Ñ: %s, Ð¿Ð°Ñ€Ð¾Ð»ÑŒ: %s"
 
-#: setup.php:631
+#: setup.php:636
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr "Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¸/Ð¸Ð»Ð¸ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ MS SQL Ð½Ðµ Ð¿Ð¾Ð´Ñ…Ð¾Ð´Ð¸Ñ‚: %s"
 
-#: setup.php:849
+#: setup.php:858
 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:850
+#: setup.php:859
 #, 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 +233,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 9fc87e4aad9f0dfac1ad56ba2f0665be0e34a405..7b98bf3705b0cc2c6e8cd923edbc402a468104e3 100644
--- a/l10n/ru/settings.po
+++ b/l10n/ru/settings.po
@@ -3,28 +3,14 @@
 # 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-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-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"Last-Translator: eurekafag <eurekafag@eureka7.ru>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -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"
@@ -107,7 +97,7 @@ msgstr "ÐžÐ±Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ Ð´Ð¾ {Ð²ÐµÑ€ÑÐ¸Ñ Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ}"
 msgid "Disable"
 msgstr "Ð’Ñ‹ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ"
 
-#: js/apps.js:36 js/apps.js:64
+#: js/apps.js:36 js/apps.js:64 js/apps.js:83
 msgid "Enable"
 msgstr "Ð’ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ"
 
@@ -115,68 +105,68 @@ msgstr "Ð’ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ"
 msgid "Please wait...."
 msgstr "ÐŸÐ¾Ð²Ñ€ÐµÐ¼ÐµÐ½Ð¸..."
 
-#: js/apps.js:84
+#: 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:87
+#: js/apps.js:93
 msgid "Error while updating app"
 msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° Ð² Ð¿Ñ€Ð¾Ñ†ÐµÑÑÐµ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ"
 
-#: js/apps.js:87
-msgid "Error"
-msgstr "ÐžÑˆÐ¸Ð±ÐºÐ°"
-
-#: js/apps.js:90
+#: js/apps.js:96
 msgid "Updated"
 msgstr "ÐžÐ±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¾"
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr "Ð¡Ð¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ðµ..."
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "deleted"
 msgstr "ÑƒÐ´Ð°Ð»ÐµÐ½"
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "undo"
 msgstr "Ð¾Ñ‚Ð¼ÐµÐ½Ð°"
 
-#: js/users.js:62
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr "ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ ÑƒÐ´Ð°Ð»Ð¸Ñ‚ÑŒ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ"
 
-#: js/users.js:75 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
+#: templates/users.php:103
 msgid "Groups"
 msgstr "Ð“Ñ€ÑƒÐ¿Ð¿Ñ‹"
 
-#: js/users.js:78 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr "Ð“Ñ€ÑƒÐ¿Ð¿Ð° ÐÐ´Ð¼Ð¸Ð½Ð¸ÑÑ‚Ñ€Ð°Ñ‚Ð¾Ñ€Ñ‹"
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "Ð£Ð´Ð°Ð»Ð¸Ñ‚ÑŒ"
 
-#: js/users.js:191
+#: js/users.js:269
 msgid "add group"
 msgstr "Ð´Ð¾Ð±Ð°Ð²Ð¸Ñ‚ÑŒ Ð³Ñ€ÑƒÐ¿Ð¿Ñƒ"
 
-#: js/users.js:352
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr "ÐŸÑ€ÐµÐ´Ð¾ÑÑ‚Ð°Ð²Ñ‚Ðµ Ð¿Ð¾Ð´Ñ…Ð¾Ð´ÑÑ‰ÐµÐµ Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ"
 
-#: js/users.js:353 js/users.js:359 js/users.js:374
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ"
 
-#: js/users.js:358
+#: js/users.js:426
 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,15 +317,19 @@ msgstr "Ð›Ð¾Ð³"
 msgid "Log level"
 msgstr "Ð£Ñ€Ð¾Ð²ÐµÐ½ÑŒ Ð»Ð¾Ð³Ð°"
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
 msgstr "Ð‘Ð¾Ð»ÑŒÑˆÐµ"
 
-#: templates/admin.php:230 templates/personal.php:102
+#: templates/admin.php:228
+msgid "Less"
+msgstr "ÐœÐµÐ½ÑŒÑˆÐµ"
+
+#: templates/admin.php:235 templates/personal.php:105
 msgid "Version"
 msgstr "Ð’ÐµÑ€ÑÐ¸Ñ"
 
-#: templates/admin.php:233 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 "
@@ -406,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:77
 msgid "Password"
 msgstr "ÐŸÐ°Ñ€Ð¾Ð»ÑŒ"
 
@@ -430,82 +424,70 @@ msgstr "ÐÐ¾Ð²Ñ‹Ð¹ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ"
 msgid "Change password"
 msgstr "Ð¡Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ"
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:76
 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 "e-mail"
+msgstr "E-mail"
 
-#: 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 "Ð’Ð²ÐµÐ´Ð¸Ñ‚Ðµ Ð°Ð´Ñ€ÐµÑ ÑÐ»ÐµÐºÑ‚Ñ€Ð¾Ð½Ð½Ð¾Ð¹ Ð¿Ð¾Ñ‡Ñ‚Ñ‹, Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ð¿Ð¾ÑÐ²Ð¸Ð»Ð°ÑÑŒ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ÑÑ‚ÑŒ Ð²Ð¾ÑÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð¿Ð°Ñ€Ð¾Ð»Ñ"
+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 "WebDAV"
 
-#: templates/personal.php:93
+#: templates/personal.php:96
 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:75
 msgid "Login Name"
 msgstr "Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ"
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr "Ð¡Ð¾Ð·Ð´Ð°Ñ‚ÑŒ"
 
-#: templates/users.php:35
+#: templates/users.php:33
 msgid "Default Storage"
 msgstr "Ð¥Ñ€Ð°Ð½Ð¸Ð»Ð¸Ñ‰Ðµ Ð¿Ð¾-ÑƒÐ¼Ð¾Ð»Ñ‡Ð°Ð½Ð¸ÑŽ"
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:39 templates/users.php:133
 msgid "Unlimited"
 msgstr "ÐÐµÐ¾Ð³Ñ€Ð°Ð½Ð¸Ñ‡ÐµÐ½Ð½Ð¾"
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:57 templates/users.php:148
 msgid "Other"
 msgstr "Ð”Ñ€ÑƒÐ³Ð¾Ðµ"
 
-#: templates/users.php:84
+#: templates/users.php:82
 msgid "Storage"
 msgstr "Ð¥Ñ€Ð°Ð½Ð¸Ð»Ð¸Ñ‰Ðµ"
 
-#: templates/users.php:95
+#: templates/users.php:93
 msgid "change display name"
 msgstr "Ð¸Ð·Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ Ð¾Ñ‚Ð¾Ð±Ñ€Ð°Ð¶Ð°ÐµÐ¼Ð¾Ðµ Ð¸Ð¼Ñ"
 
-#: templates/users.php:99
+#: templates/users.php:97
 msgid "set new password"
 msgstr "ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ Ð½Ð¾Ð²Ñ‹Ð¹ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ"
 
-#: templates/users.php:134
+#: templates/users.php:128
 msgid "Default"
 msgstr "ÐŸÐ¾-ÑƒÐ¼Ð¾Ð»Ñ‡Ð°Ð½Ð¸ÑŽ"
diff --git a/l10n/ru/user_ldap.po b/l10n/ru/user_ldap.po
index e419106c75046fa65b314d6cf484248bffc43b83..4b20940944123e21897223edec4aed973030f1c1 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-03 00:05+0100\n"
-"PO-Revision-Date: 2013-03-02 15:30+0000\n"
-"Last-Translator: Langaru <langaru@gmail.com>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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: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 "ÐœÐ¾Ð¶Ð½Ð¾ Ð¾Ð¿ÑƒÑÑ‚Ð¸Ñ‚ÑŒ Ð¿Ñ€Ð¾Ñ‚Ð¾ÐºÐ¾Ð», Ð·Ð° Ð¸ÑÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸ÐµÐ¼ Ñ‚Ð¾Ð³Ð¾, ÐºÐ¾Ð³Ð´Ð° Ð²Ð°Ð¼ Ñ‚Ñ€ÐµÐ±ÑƒÐµÑ‚ÑÑ SSL. Ð¢Ð¾Ð³Ð´Ð° Ð½Ð°Ñ‡Ð½Ð¸Ñ‚Ðµ Ñ ldaps :/ /"
 
-#: templates/settings.php:26
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "Ð‘Ð°Ð·Ð¾Ð²Ñ‹Ð¹ DN"
 
-#: templates/settings.php:27
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr "ÐŸÐ¾ Ð¾Ð´Ð½Ð¾Ð¼Ñƒ Ð±Ð°Ð·Ð¾Ð²Ð¾Ð¼Ñƒ DN Ð² ÑÑ‚Ñ€Ð¾ÐºÐµ."
 
-#: templates/settings.php:28
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "Ð’Ñ‹ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð·Ð°Ð´Ð°Ñ‚ÑŒ Base DN Ð´Ð»Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¹ Ð¸ Ð³Ñ€ÑƒÐ¿Ð¿ Ð½Ð° Ð²ÐºÐ»Ð°Ð´ÐºÐµ \"Ð Ð°ÑÑˆÐ¸Ñ€ÐµÐ½Ð½Ð¾Ðµ\""
 
-#: templates/settings.php:30
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "DN Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ"
 
-#: 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 "DN-ÐºÐ»Ð¸ÐµÐ½Ñ‚Ð° Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ, Ñ ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ð¼ ÑÐ²ÑÐ·Ñ‹Ð²Ð°ÑŽÑ‚ Ð´Ð¾Ð»Ð¶Ð½Ð¾ Ð±Ñ‹Ñ‚ÑŒ Ð·Ð°Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¾, Ð½Ð°Ð¿Ñ€Ð¸Ð¼ÐµÑ€, uid=Ð°Ð³ÐµÐ½Ñ‚, dc=Ð¿Ñ€Ð¸Ð¼ÐµÑ€, dc=com. Ð”Ð»Ñ Ð°Ð½Ð¾Ð½Ð¸Ð¼Ð½Ð¾Ð³Ð¾ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð°, Ð¾ÑÑ‚Ð°Ð²ÑŒÑ‚Ðµ DN Ð¸ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ Ð¿ÑƒÑÑ‚Ñ‹Ð¼Ð¸."
 
-#: 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 "Ð”Ð»Ñ Ð°Ð½Ð¾Ð½Ð¸Ð¼Ð½Ð¾Ð³Ð¾ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð° Ð¾ÑÑ‚Ð°Ð²ÑŒÑ‚Ðµ DN Ð¸ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ Ð¿ÑƒÑÑ‚Ñ‹Ð¼Ð¸."
 
-#: 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 "ÐžÐ¿Ñ€ÐµÐ´ÐµÐ»ÑÐµÑ‚ Ñ„Ð¸Ð»ÑŒÑ‚Ñ€ Ð´Ð»Ñ Ð¿Ñ€Ð¸Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¸ Ð¿Ð¾Ð¿Ñ‹Ñ‚ÐºÐµ Ð²Ñ…Ð¾Ð´Ð°. %%uid Ð·Ð°Ð¼ÐµÐ½ÑÐµÑ‚ Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¿Ñ€Ð¸ Ð²Ñ…Ð¾Ð´Ðµ Ð² ÑÐ¸ÑÑ‚ÐµÐ¼Ñƒ."
 
-#: templates/settings.php:41
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÐ¹Ñ‚Ðµ Ð·Ð°Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒ %%uid, Ð½Ð°Ð¿Ñ€Ð¸Ð¼ÐµÑ€: \"uid=%%uid\""
 
-#: 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 "Ð±ÐµÐ· Ð·Ð°Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»Ñ, Ð½Ð°Ð¿Ñ€Ð¸Ð¼ÐµÑ€: \"objectClass=person\"."
 
-#: 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 "Ð±ÐµÐ· Ð·Ð°Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ, Ð½Ð°Ð¿Ñ€Ð¸Ð¼ÐµÑ€ \"objectClass=posixGroup\"."
 
-#: 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 "Ð£ÐºÐ°Ð¶Ð¸Ñ‚Ðµ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ñ‹Ð¹ Ñ€ÐµÐ·ÐµÑ€Ð²Ð½Ñ‹Ð¹ ÑÐµÑ€Ð²ÐµÑ€. ÐžÐ½ Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð±Ñ‹Ñ‚ÑŒ Ñ€ÐµÐ¿Ð»Ð¸ÐºÐ¾Ð¹ Ð³Ð»Ð°Ð²Ð½Ð¾Ð³Ð¾ LDAP/AD ÑÐµÑ€Ð²ÐµÑ€Ð°."
 
-#: 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 "ÐšÐ¾Ð³Ð´Ð° Ð²ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¾, ownCloud Ð±ÑƒÐ´ÐµÑ‚ ÑÐ¾ÐµÐ´Ð¸Ð½ÑÑ‚ÑŒÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ Ñ Ñ€ÐµÐ·ÐµÑ€Ð²Ð½Ñ‹Ð¼ ÑÐµÑ€Ð²ÐµÑ€Ð¾Ð¼."
 
-#: templates/settings.php:62
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "Ð˜ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ TLS"
 
-#: templates/settings.php:62
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr "ÐÐµ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÐ¹Ñ‚Ðµ ÑÐ¾Ð²Ð¼ÐµÑÑ‚Ð½Ð¾ Ñ Ð±ÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ñ‹Ð¼Ð¸ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸ÑÐ¼Ð¸ (LDAPS), ÑÑ‚Ð¾ Ð½Ðµ ÑÑ€Ð°Ð±Ð¾Ñ‚Ð°ÐµÑ‚."
 
-#: templates/settings.php:63
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "ÐÐµÑ‡ÑƒÐ²ÑÑ‚Ð²Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ñ‹Ð¹ Ðº Ñ€ÐµÐ³Ð¸ÑÑ‚Ñ€Ñƒ ÑÐµÑ€Ð²ÐµÑ€ LDAP (Windows)"
 
-#: templates/settings.php:64
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "ÐžÑ‚ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ Ð¿Ñ€Ð¾Ð²ÐµÑ€ÐºÑƒ ÑÐµÑ€Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ‚Ð° SSL."
 
-#: 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 "Ð•ÑÐ»Ð¸ ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ðµ Ñ€Ð°Ð±Ð¾Ñ‚Ð°ÐµÑ‚ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ Ñ ÑÑ‚Ð¾Ð¹ Ð¾Ð¿Ñ†Ð¸ÐµÐ¹, Ð¸Ð¼Ð¿Ð¾Ñ€Ñ‚Ð¸Ñ€ÑƒÐ¹Ñ‚Ðµ Ð½Ð° Ð²Ð°Ñˆ ÑÐµÑ€Ð²ÐµÑ€ ownCloud ÑÐµÑ€Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ‚ SSL ÑÐµÑ€Ð²ÐµÑ€Ð° LDAP."
 
-#: 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 "ÐÑ‚Ñ€Ð¸Ð±ÑƒÑ‚ LDAP Ð´Ð»Ñ Ð³ÐµÐ½ÐµÑ€Ð°Ñ†Ð¸Ð¸ Ð¸Ð¼ÐµÐ½Ð¸ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ ownCloud."
 
-#: 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 "ÐŸÐ¾ Ð¾Ð´Ð½Ð¾Ð¹ Ð±Ð°Ð·Ð¾Ð²Ð¾Ð¼Ñƒ DN Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¹ Ð² ÑÑ‚Ñ€Ð¾ÐºÐµ."
 
-#: 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 "ÐÑ‚Ñ€Ð¸Ð±ÑƒÑ‚ LDAP Ð´Ð»Ñ Ð³ÐµÐ½ÐµÑ€Ð°Ñ†Ð¸Ð¸ Ð¸Ð¼ÐµÐ½Ð¸ Ð³Ñ€ÑƒÐ¿Ð¿Ñ‹ ownCloud."
 
-#: 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 "ÐŸÐ¾ Ð¾Ð´Ð½Ð¾Ð¹ Ð±Ð°Ð·Ð¾Ð²Ð¾Ð¼Ñƒ DN Ð³Ñ€ÑƒÐ¿Ð¿ Ð² ÑÑ‚Ñ€Ð¾ÐºÐµ."
 
-#: 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 "ÐžÑÑ‚Ð°Ð²ÑŒÑ‚Ðµ Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¿ÑƒÑÑ‚Ñ‹Ð¼ (Ð¿Ð¾ ÑƒÐ¼Ð¾Ð»Ñ‡Ð°Ð½Ð¸ÑŽ). Ð˜Ð½Ð°Ñ‡Ðµ ÑƒÐºÐ°Ð¶Ð¸Ñ‚Ðµ Ð°Ñ‚Ñ€Ð¸Ð±ÑƒÑ‚ LDAP/AD."
 
-#: 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/ru/user_webdavauth.po b/l10n/ru/user_webdavauth.po
index c66ccc74b9912194faa7e5db53e9fa3790a85b4c..c402a174582882fb20a8610226eb4db333bbcf33 100644
--- a/l10n/ru/user_webdavauth.po
+++ b/l10n/ru/user_webdavauth.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-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-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/ru_RU/core.po b/l10n/ru_RU/core.po
index b3fdce00f69f4dc527b7d6e15254e9f5e7636832..a63e62e68ae85923ff451deadc156c42050d9cb9 100644
--- a/l10n/ru_RU/core.po
+++ b/l10n/ru_RU/core.po
@@ -3,594 +3,611 @@
 # 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-02-22 00:06+0100\n"
-"PO-Revision-Date: 2013-02-20 23:20+0000\n"
-"Last-Translator: Langaru <langaru@gmail.com>\n"
-"Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:20+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "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/share.php:85
+#: ajax/share.php:97
 #, php-format
 msgid "User %s shared a file with you"
-msgstr "ÐŸÐ¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒ %s Ð¾Ñ‚ÐºÑ€Ñ‹Ð» Ð’Ð°Ð¼ Ð´Ð¾ÑÑ‚ÑƒÐ¿ Ðº Ñ„Ð°Ð¹Ð»Ñƒ"
+msgstr ""
 
-#: ajax/share.php:87
+#: ajax/share.php:99
 #, php-format
 msgid "User %s shared a folder with you"
-msgstr "ÐŸÐ¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒ %s Ð¾Ñ‚ÐºÑ€Ñ‹Ð» Ð’Ð°Ð¼ Ð´Ð¾ÑÑ‚ÑƒÐ¿ Ðº Ð¿Ð°Ð¿ÐºÐµ"
+msgstr ""
 
-#: ajax/share.php:89
+#: 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:91
+#: 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:32
+#: js/config.php:34
 msgid "Sunday"
-msgstr "Ð’Ð¾ÑÐºÑ€ÐµÑÐµÐ½ÑŒÐµ"
+msgstr ""
 
-#: js/config.php:32
+#: js/config.php:35
 msgid "Monday"
-msgstr "ÐŸÐ¾Ð½ÐµÐ´ÐµÐ»ÑŒÐ½Ð¸Ðº"
+msgstr ""
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Tuesday"
-msgstr "Ð’Ñ‚Ð¾Ñ€Ð½Ð¸Ðº"
+msgstr ""
 
-#: js/config.php:32
+#: js/config.php:37
 msgid "Wednesday"
-msgstr "Ð¡Ñ€ÐµÐ´Ð°"
+msgstr ""
 
-#: js/config.php:32
+#: js/config.php:38
 msgid "Thursday"
-msgstr "Ð§ÐµÑ‚Ð²ÐµÑ€Ð³"
+msgstr ""
 
-#: js/config.php:32
+#: js/config.php:39
 msgid "Friday"
-msgstr "ÐŸÑÑ‚Ð½Ð¸Ñ†Ð°"
+msgstr ""
 
-#: js/config.php:32
+#: js/config.php:40
 msgid "Saturday"
-msgstr "Ð¡ÑƒÐ±Ð±Ð¾Ñ‚Ð°"
+msgstr ""
 
-#: js/config.php:33
+#: js/config.php:45
 msgid "January"
-msgstr "Ð¯Ð½Ð²Ð°Ñ€ÑŒ"
+msgstr ""
 
-#: js/config.php:33
+#: js/config.php:46
 msgid "February"
-msgstr "Ð¤ÐµÐ²Ñ€Ð°Ð»ÑŒ"
+msgstr ""
 
-#: js/config.php:33
+#: js/config.php:47
 msgid "March"
-msgstr "ÐœÐ°Ñ€Ñ‚"
+msgstr ""
 
-#: js/config.php:33
+#: js/config.php:48
 msgid "April"
-msgstr "ÐÐ¿Ñ€ÐµÐ»ÑŒ"
+msgstr ""
 
-#: js/config.php:33
+#: js/config.php:49
 msgid "May"
-msgstr "ÐœÐ°Ð¹"
+msgstr ""
 
-#: js/config.php:33
+#: js/config.php:50
 msgid "June"
-msgstr "Ð˜ÑŽÐ½ÑŒ"
+msgstr ""
 
-#: js/config.php:33
+#: js/config.php:51
 msgid "July"
-msgstr "Ð˜ÑŽÐ»ÑŒ"
+msgstr ""
 
-#: js/config.php:33
+#: js/config.php:52
 msgid "August"
-msgstr "ÐÐ²Ð³ÑƒÑÑ‚"
+msgstr ""
 
-#: js/config.php:33
+#: js/config.php:53
 msgid "September"
-msgstr "Ð¡ÐµÐ½Ñ‚ÑÐ±Ñ€ÑŒ"
+msgstr ""
 
-#: js/config.php:33
+#: js/config.php:54
 msgid "October"
-msgstr "ÐžÐºÑ‚ÑÐ±Ñ€ÑŒ"
+msgstr ""
 
-#: js/config.php:33
+#: js/config.php:55
 msgid "November"
-msgstr "ÐÐ¾ÑÐ±Ñ€ÑŒ"
+msgstr ""
 
-#: js/config.php:33
+#: js/config.php:56
 msgid "December"
-msgstr "Ð”ÐµÐºÐ°Ð±Ñ€ÑŒ"
+msgstr ""
 
 #: js/js.js:286
 msgid "Settings"
 msgstr "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸"
 
-#: js/js.js:767
+#: js/js.js:718
 msgid "seconds ago"
-msgstr "ÑÐµÐºÑƒÐ½Ð´ Ð½Ð°Ð·Ð°Ð´"
+msgstr ""
 
-#: js/js.js:768
+#: js/js.js:719
 msgid "1 minute ago"
-msgstr " 1 Ð¼Ð¸Ð½ÑƒÑ‚Ñƒ Ð½Ð°Ð·Ð°Ð´"
+msgstr ""
 
-#: js/js.js:769
+#: js/js.js:720
 msgid "{minutes} minutes ago"
-msgstr "{Ð¼Ð¸Ð½ÑƒÑ‚Ñ‹} Ð¼Ð¸Ð½ÑƒÑ‚ Ð½Ð°Ð·Ð°Ð´"
+msgstr ""
 
-#: js/js.js:770
+#: js/js.js:721
 msgid "1 hour ago"
-msgstr "1 Ñ‡Ð°Ñ Ð½Ð°Ð·Ð°Ð´"
+msgstr ""
 
-#: js/js.js:771
+#: js/js.js:722
 msgid "{hours} hours ago"
-msgstr "{Ñ‡Ð°ÑÑ‹} Ñ‡Ð°ÑÐ¾Ð² Ð½Ð°Ð·Ð°Ð´"
+msgstr ""
 
-#: js/js.js:772
+#: js/js.js:723
 msgid "today"
-msgstr "ÑÐµÐ³Ð¾Ð´Ð½Ñ"
+msgstr ""
 
-#: js/js.js:773
+#: js/js.js:724
 msgid "yesterday"
-msgstr "Ð²Ñ‡ÐµÑ€Ð°"
+msgstr ""
 
-#: js/js.js:774
+#: js/js.js:725
 msgid "{days} days ago"
-msgstr "{Ð´Ð½Ð¸} Ð´Ð½ÐµÐ¹ Ð½Ð°Ð·Ð°Ð´"
+msgstr ""
 
-#: js/js.js:775
+#: js/js.js:726
 msgid "last month"
-msgstr "Ð² Ð¿Ñ€Ð¾ÑˆÐ»Ð¾Ð¼ Ð¼ÐµÑÑÑ†Ðµ"
+msgstr ""
 
-#: js/js.js:776
+#: js/js.js:727
 msgid "{months} months ago"
-msgstr "{Ð¼ÐµÑÑÑ†Ñ‹} Ð¼ÐµÑÑÑ†ÐµÐ² Ð½Ð°Ð·Ð°Ð´"
+msgstr ""
 
-#: js/js.js:777
+#: js/js.js:728
 msgid "months ago"
-msgstr "Ð¼ÐµÑÑÑ† Ð½Ð°Ð·Ð°Ð´"
+msgstr ""
 
-#: js/js.js:778
+#: js/js.js:729
 msgid "last year"
-msgstr "Ð² Ð¿Ñ€Ð¾ÑˆÐ»Ð¾Ð¼ Ð³Ð¾Ð´Ñƒ"
+msgstr ""
 
-#: js/js.js:779
+#: js/js.js:730
 msgid "years ago"
-msgstr "Ð»ÐµÑ‚ Ð½Ð°Ð·Ð°Ð´"
+msgstr ""
 
-#: js/oc-dialogs.js:126
-msgid "Choose"
-msgstr "Ð’Ñ‹Ð±Ñ€Ð°Ñ‚ÑŒ"
+#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
+msgid "Ok"
+msgstr ""
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
 msgid "Cancel"
-msgstr "ÐžÑ‚Ð¼ÐµÐ½Ð°"
+msgstr ""
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "ÐÐµÑ‚"
+#: js/oc-dialogs.js:185
+msgid "Choose"
+msgstr ""
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:215
 msgid "Yes"
-msgstr "Ð”Ð°"
+msgstr ""
 
-#: js/oc-dialogs.js:180
-msgid "Ok"
-msgstr "Ð”Ð°"
+#: js/oc-dialogs.js:222
+msgid "No"
+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:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:582
-#: js/share.js:594
+#: 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 "Ð˜Ð¼Ñ Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð½Ðµ ÑƒÐºÐ°Ð·Ð°Ð½Ð¾."
+msgstr ""
 
 #: js/oc-vcategories.js:194
 msgid "The required file {file} is not installed!"
-msgstr "Ð¢Ñ€ÐµÐ±ÑƒÐµÐ¼Ñ‹Ð¹ Ñ„Ð°Ð¹Ð» {Ñ„Ð°Ð¹Ð»} Ð½Ðµ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½!"
+msgstr ""
 
-#: js/share.js:29 js/share.js:43 js/share.js:90
+#: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
-msgstr "ÐžÐ¿ÑƒÐ±Ð»Ð¸ÐºÐ¾Ð²Ð°Ð½Ð¾"
+msgstr ""
 
-#: js/share.js:93
+#: js/share.js:90
 msgid "Share"
-msgstr "Ð¡Ð´ÐµÐ»Ð°Ñ‚ÑŒ Ð¾Ð±Ñ‰Ð¸Ð¼"
+msgstr ""
 
-#: js/share.js:141 js/share.js:622
+#: js/share.js:125 js/share.js:617
 msgid "Error while sharing"
-msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð¾Ð±Ñ‰ÐµÐ³Ð¾ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð°"
+msgstr ""
 
-#: js/share.js:152
+#: js/share.js:136
 msgid "Error while unsharing"
-msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° Ð¾Ñ‚ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ð¾Ð±Ñ‰ÐµÐ³Ð¾ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð°"
+msgstr ""
 
-#: js/share.js:159
+#: js/share.js:143
 msgid "Error while changing permissions"
-msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° Ð¿Ñ€Ð¸ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¸ Ð¿Ñ€Ð°Ð² Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð°"
+msgstr ""
 
-#: js/share.js:168
+#: js/share.js:152
 msgid "Shared with you and the group {group} by {owner}"
-msgstr "ÐžÐ¿ÑƒÐ±Ð»Ð¸ÐºÐ¾Ð²Ð°Ð½Ð¾ Ð´Ð»Ñ Ð’Ð°Ñ Ð¸ Ð³Ñ€ÑƒÐ¿Ð¿Ñ‹ {Ð³Ñ€ÑƒÐ¿Ð¿Ð°} {ÑÐ¾Ð±ÑÑ‚Ð²ÐµÐ½Ð½Ð¸Ðº}"
+msgstr ""
 
-#: js/share.js:170
+#: js/share.js:154
 msgid "Shared with you by {owner}"
-msgstr "ÐžÐ¿ÑƒÐ±Ð»Ð¸ÐºÐ¾Ð²Ð°Ð½Ð¾ Ð´Ð»Ñ Ð’Ð°Ñ {ÑÐ¾Ð±ÑÑ‚Ð²ÐµÐ½Ð½Ð¸Ðº}"
+msgstr ""
 
-#: js/share.js:175
+#: js/share.js:159
 msgid "Share with"
-msgstr "Ð¡Ð´ÐµÐ»Ð°Ñ‚ÑŒ Ð¾Ð±Ñ‰Ð¸Ð¼ Ñ"
+msgstr ""
 
-#: js/share.js:180
+#: js/share.js:164
 msgid "Share with link"
-msgstr "ÐžÐ¿ÑƒÐ±Ð»Ð¸ÐºÐ¾Ð²Ð°Ñ‚ÑŒ Ñ ÑÑÑ‹Ð»ÐºÐ¾Ð¹"
+msgstr ""
 
-#: js/share.js:183
+#: js/share.js:167
 msgid "Password protect"
-msgstr "Ð—Ð°Ñ‰Ð¸Ñ‚Ð¸Ñ‚ÑŒ Ð¿Ð°Ñ€Ð¾Ð»ÐµÐ¼"
+msgstr ""
 
-#: js/share.js:185 templates/installation.php:44 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
-msgstr "ÐŸÐ°Ñ€Ð¾Ð»ÑŒ"
+msgstr ""
 
-#: js/share.js:189
+#: js/share.js:173
 msgid "Email link to person"
-msgstr "Ð¡ÑÑ‹Ð»ÐºÐ° Ð½Ð° Ð°Ð´Ñ€ÐµÑ ÑÐ»ÐµÐºÑ‚Ñ€Ð¾Ð½Ð½Ð¾Ð¹ Ð¿Ð¾Ñ‡Ñ‚Ñ‹"
+msgstr ""
 
-#: js/share.js:190
+#: js/share.js:174
 msgid "Send"
-msgstr "ÐžÑ‚Ð¿Ñ€Ð°Ð²Ð¸Ñ‚ÑŒ"
+msgstr ""
 
-#: js/share.js:194
+#: js/share.js:178
 msgid "Set expiration date"
-msgstr "Ð£ÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ ÑÑ€Ð¾Ðº Ð´ÐµÐ¹ÑÑ‚Ð²Ð¸Ñ"
+msgstr ""
 
-#: js/share.js:195
+#: js/share.js:179
 msgid "Expiration date"
-msgstr "Ð”Ð°Ñ‚Ð° Ð¸ÑÑ‚ÐµÑ‡ÐµÐ½Ð¸Ñ ÑÑ€Ð¾ÐºÐ° Ð´ÐµÐ¹ÑÑ‚Ð²Ð¸Ñ"
+msgstr ""
 
-#: js/share.js:227
+#: js/share.js:211
 msgid "Share via email:"
-msgstr "Ð¡Ð´ÐµÐ»Ð°Ñ‚ÑŒ Ð¾Ð±Ñ‰ÐµÐ´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ñ‹Ð¼ Ð¿Ð¾ÑÑ€ÐµÐ´ÑÑ‚Ð²Ð¾Ð¼ email:"
+msgstr ""
 
-#: js/share.js:229
+#: js/share.js:213
 msgid "No people found"
-msgstr "ÐÐµ Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾ Ð»ÑŽÐ´ÐµÐ¹"
+msgstr ""
 
-#: js/share.js:256
+#: js/share.js:251
 msgid "Resharing is not allowed"
-msgstr "Ð ÐµÐºÑƒÑ€ÑÐ¸Ð²Ð½Ñ‹Ð¹ Ð¾Ð±Ñ‰Ð¸Ð¹ Ð´Ð¾ÑÑ‚ÑƒÐ¿ Ð½Ðµ Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½"
+msgstr ""
 
-#: js/share.js:292
+#: js/share.js:287
 msgid "Shared in {item} with {user}"
-msgstr "Ð¡Ð¾Ð²Ð¼ÐµÑÑ‚Ð½Ð¾Ðµ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ Ð² {Ð¾Ð±ÑŠÐµÐºÑ‚} Ñ {Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒ}"
+msgstr ""
 
-#: js/share.js:313
+#: js/share.js:308
 msgid "Unshare"
-msgstr "ÐžÑ‚ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ Ð¾Ð±Ñ‰Ð¸Ð¹ Ð´Ð¾ÑÑ‚ÑƒÐ¿"
+msgstr ""
 
-#: js/share.js:325
+#: js/share.js:320
 msgid "can edit"
-msgstr "Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ñ€ÐµÐ´Ð°ÐºÑ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ðµ"
+msgstr ""
 
-#: js/share.js:327
+#: js/share.js:322
 msgid "access control"
-msgstr "ÐºÐ¾Ð½Ñ‚Ñ€Ð¾Ð»ÑŒ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð°"
+msgstr ""
 
-#: js/share.js:330
+#: js/share.js:325
 msgid "create"
-msgstr "ÑÐ¾Ð·Ð´Ð°Ñ‚ÑŒ"
+msgstr ""
 
-#: js/share.js:333
+#: js/share.js:328
 msgid "update"
-msgstr "Ð¾Ð±Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ"
+msgstr ""
 
-#: js/share.js:336
+#: js/share.js:331
 msgid "delete"
-msgstr "ÑƒÐ´Ð°Ð»Ð¸Ñ‚ÑŒ"
+msgstr ""
 
-#: js/share.js:339
+#: js/share.js:334
 msgid "share"
-msgstr "ÑÐ´ÐµÐ»Ð°Ñ‚ÑŒ Ð¾Ð±Ñ‰Ð¸Ð¼"
+msgstr ""
 
-#: js/share.js:373 js/share.js:569
+#: js/share.js:368 js/share.js:564
 msgid "Password protected"
-msgstr "ÐŸÐ°Ñ€Ð¾Ð»ÑŒ Ð·Ð°Ñ‰Ð¸Ñ‰ÐµÐ½"
+msgstr ""
 
-#: js/share.js:582
+#: js/share.js:577
 msgid "Error unsetting expiration date"
-msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° Ð¿Ñ€Ð¸ Ð¾Ñ‚ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ð¸ Ð´Ð°Ñ‚Ñ‹ Ð¸ÑÑ‚ÐµÑ‡ÐµÐ½Ð¸Ñ ÑÑ€Ð¾ÐºÐ° Ð´ÐµÐ¹ÑÑ‚Ð²Ð¸Ñ"
+msgstr ""
 
-#: js/share.js:594
+#: js/share.js:589
 msgid "Error setting expiration date"
-msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° Ð¿Ñ€Ð¸ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐµ Ð´Ð°Ñ‚Ñ‹ Ð¸ÑÑ‚ÐµÑ‡ÐµÐ½Ð¸Ñ ÑÑ€Ð¾ÐºÐ° Ð´ÐµÐ¹ÑÑ‚Ð²Ð¸Ñ"
+msgstr ""
 
-#: js/share.js:609
+#: js/share.js:604
 msgid "Sending ..."
-msgstr "ÐžÑ‚Ð¿Ñ€Ð°Ð²ÐºÐ° ..."
+msgstr ""
 
-#: js/share.js:620
+#: 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:39
-#: 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"
-msgstr "Ð”Ð¾Ð±Ð°Ð²Ð¸Ñ‚ÑŒ"
+msgstr ""
 
-#: templates/installation.php:23 templates/installation.php:30
+#: templates/installation.php:24 templates/installation.php:31
+#: templates/installation.php:38
 msgid "Security Warning"
-msgstr "ÐŸÑ€ÐµÐ´ÑƒÐ¿Ñ€ÐµÐ¶Ð´ÐµÐ½Ð¸Ðµ ÑÐ¸ÑÑ‚ÐµÐ¼Ñ‹ Ð±ÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾ÑÑ‚Ð¸"
+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 "ÐÐµÑ‚ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ð¾Ð³Ð¾ Ð·Ð°Ñ‰Ð¸Ñ‰ÐµÐ½Ð½Ð¾Ð³Ð¾ Ð³ÐµÐ½ÐµÑ€Ð°Ñ‚Ð¾Ñ€Ð° ÑÐ»ÑƒÑ‡Ð°Ð¹Ð½Ñ‹Ñ… Ñ‡Ð¸ÑÐµÐ», Ð¿Ð¾Ð¶Ð°Ð»ÑƒÐ¹ÑÑ‚Ð°, Ð²ÐºÐ»ÑŽÑ‡Ð¸Ñ‚Ðµ Ñ€Ð°ÑÑˆÐ¸Ñ€ÐµÐ½Ð¸Ðµ PHP OpenSSL."
+msgstr ""
 
-#: templates/installation.php:25
+#: 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:31
+#: 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:32
+#: 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:36
+#: templates/installation.php:44
 msgid "Create an <strong>admin account</strong>"
-msgstr "Ð¡Ð¾Ð·Ð´Ð°Ñ‚ÑŒ <strong>admin account</strong>"
+msgstr ""
 
-#: templates/installation.php:52
+#: templates/installation.php:62
 msgid "Advanced"
-msgstr "Ð Ð°ÑÑˆÐ¸Ñ€ÐµÐ½Ð½Ñ‹Ð¹"
+msgstr ""
 
-#: templates/installation.php:54
+#: templates/installation.php:64
 msgid "Data folder"
-msgstr "ÐŸÐ°Ð¿ÐºÐ° Ð´Ð°Ð½Ð½Ñ‹Ñ…"
+msgstr ""
 
-#: templates/installation.php:61
+#: templates/installation.php:74
 msgid "Configure the database"
-msgstr "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¸Ñ‚ÑŒ Ð±Ð°Ð·Ñƒ Ð´Ð°Ð½Ð½Ñ‹Ñ…"
+msgstr ""
 
-#: templates/installation.php:66 templates/installation.php:77
-#: templates/installation.php:87 templates/installation.php:97
+#: 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:109
+#: templates/installation.php:137
 msgid "Database user"
-msgstr "ÐŸÐ¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒ Ð±Ð°Ð·Ñ‹ Ð´Ð°Ð½Ð½Ñ‹Ñ…"
+msgstr ""
 
-#: templates/installation.php:113
+#: templates/installation.php:144
 msgid "Database password"
-msgstr "ÐŸÐ°Ñ€Ð¾Ð»ÑŒ Ð±Ð°Ð·Ñ‹ Ð´Ð°Ð½Ð½Ñ‹Ñ…"
+msgstr ""
 
-#: templates/installation.php:117
+#: templates/installation.php:149
 msgid "Database name"
-msgstr "Ð˜Ð¼Ñ Ð±Ð°Ð·Ñ‹ Ð´Ð°Ð½Ð½Ñ‹Ñ…"
+msgstr ""
 
-#: templates/installation.php:125
+#: templates/installation.php:159
 msgid "Database tablespace"
-msgstr "Ð¢Ð°Ð±Ð»Ð¸Ñ‡Ð½Ð°Ñ Ð¾Ð±Ð»Ð°ÑÑ‚ÑŒ Ð±Ð°Ð·Ñ‹ Ð´Ð°Ð½Ð½Ñ‹Ñ…"
+msgstr ""
 
-#: templates/installation.php:131
+#: templates/installation.php:166
 msgid "Database host"
-msgstr "Ð¡ÐµÑ€Ð²ÐµÑ€ Ð±Ð°Ð·Ñ‹ Ð´Ð°Ð½Ð½Ñ‹Ñ…"
+msgstr ""
 
-#: templates/installation.php:136
+#: templates/installation.php:172
 msgid "Finish setup"
-msgstr "Ð—Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð¸Ðµ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸"
+msgstr ""
 
-#: templates/layout.guest.php:33
+#: templates/layout.guest.php:40
 msgid "web services under your control"
-msgstr "Ð²ÐµÐ±-ÑÐµÑ€Ð²Ð¸ÑÑ‹ Ð¿Ð¾Ð´ Ð’Ð°ÑˆÐ¸Ð¼ ÐºÐ¾Ð½Ñ‚Ñ€Ð¾Ð»ÐµÐ¼"
+msgstr ""
 
-#: templates/layout.user.php:48
+#: 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 "Ð’Ñ‹Ð¹Ñ‚Ð¸"
+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 0ae9fc53840781c212a16a4dd424bc6e361b6df8..9803ad4bf83a13daa4a7fb20d2ef74195ee96016 100644
--- a/l10n/ru_RU/files.po
+++ b/l10n/ru_RU/files.po
@@ -3,18 +3,14 @@
 # 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-03-04 00:06+0100\n"
-"PO-Revision-Date: 2013-03-03 23:06+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"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-04-26 08:00+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,296 +20,303 @@ 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"
-msgstr "Ð¤Ð°Ð¹Ð» Ð½Ðµ Ð±Ñ‹Ð» Ð·Ð°Ð³Ñ€ÑƒÐ¶ÐµÐ½. ÐÐµÐ¸Ð·Ð²ÐµÑÑ‚Ð½Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°"
+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 ""
 
 #: 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"
-msgstr "ÐÐµ ÑƒÐ´Ð°Ð»Ð¾ÑÑŒ Ð·Ð°Ð¿Ð¸ÑÐ°Ñ‚ÑŒ Ð½Ð° Ð´Ð¸ÑÐº"
+msgstr ""
 
 #: ajax/upload.php:51
 msgid "Not enough storage available"
-msgstr "ÐÐµÐ´Ð¾ÑÑ‚Ð°Ñ‚Ð¾Ñ‡Ð½Ð¾ Ð¼ÐµÑÑ‚Ð° Ð² Ñ…Ñ€Ð°Ð½Ð¸Ð»Ð¸Ñ‰Ðµ"
+msgstr ""
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
-msgstr "ÐÐµÐ²ÐµÑ€Ð½Ñ‹Ð¹ ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³."
+msgstr ""
 
-#: appinfo/app.php:10
+#: 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:92 templates/index.php:93
+#: 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 "ÐŸÐµÑ€ÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ñ‚ÑŒ"
+msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
-#: js/files.js:439
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
-msgstr "ÐžÐ¶Ð¸Ð´Ð°ÑŽÑ‰Ð¸Ð¹ Ñ€ÐµÑˆÐµÐ½Ð¸Ñ"
+msgstr ""
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
-msgstr "{Ð½Ð¾Ð²Ð¾Ðµ_Ð¸Ð¼Ñ} ÑƒÐ¶Ðµ ÑÑƒÑ‰ÐµÑÑ‚Ð²ÑƒÐµÑ‚"
+msgstr ""
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
-msgstr "Ð¾Ñ‚Ð¼ÐµÐ½Ð°"
+msgstr ""
 
-#: js/filelist.js:251
+#: js/filelist.js:259
 msgid "suggest name"
-msgstr "Ð¿Ð¾Ð´Ð¾Ð±Ñ€Ð°Ñ‚ÑŒ Ð½Ð°Ð·Ð²Ð°Ð½Ð¸Ðµ"
+msgstr ""
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
-msgstr "Ð¾Ñ‚Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ"
+msgstr ""
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
-msgstr "Ð·Ð°Ð¼ÐµÐ½ÐµÐ½Ð¾ {Ð½Ð¾Ð²Ð¾Ðµ_Ð¸Ð¼Ñ} Ñ {ÑÑ‚Ð°Ñ€Ð¾Ðµ_Ð¸Ð¼Ñ}"
+msgstr ""
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "undo"
-msgstr "Ð¾Ñ‚Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ Ð´ÐµÐ¹ÑÑ‚Ð²Ð¸Ðµ"
+msgstr ""
 
-#: js/filelist.js:323
+#: js/filelist.js:331
 msgid "perform delete operation"
-msgstr "Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÑÐµÑ‚ÑÑ Ð¿Ñ€Ð¾Ñ†ÐµÑÑ ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ"
+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 "'.' ÑÐ²Ð»ÑÐµÑ‚ÑÑ Ð½ÐµÐ²ÐµÑ€Ð½Ñ‹Ð¼ Ð¸Ð¼ÐµÐ½ÐµÐ¼ Ñ„Ð°Ð¹Ð»Ð°."
+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:225
+#: 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:262
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð·Ð°Ð³Ñ€ÑƒÐ·Ð¸Ñ‚ÑŒ Ñ„Ð°Ð¹Ð»,\n Ñ‚Ð°Ðº ÐºÐ°Ðº Ð¾Ð½ Ð¸Ð¼ÐµÐµÑ‚ Ð½ÑƒÐ»ÐµÐ²Ð¾Ð¹ Ñ€Ð°Ð·Ð¼ÐµÑ€ Ð¸Ð»Ð¸ ÑÐ²Ð»ÑÐµÑ‚ÑÑ Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸ÐµÐ¹"
-
-#: js/files.js:262
-msgid "Upload Error"
-msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸"
-
-#: js/files.js:273
-msgid "Close"
-msgstr "Ð—Ð°ÐºÑ€Ñ‹Ñ‚ÑŒ"
-
-#: js/files.js:312
-msgid "1 file uploading"
-msgstr "Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ° 1 Ñ„Ð°Ð¹Ð»Ð°"
+msgstr ""
 
-#: js/files.js:315 js/files.js:370 js/files.js:385
-msgid "{count} files uploading"
-msgstr "{ÐºÐ¾Ð»Ð¸Ñ‡ÐµÑÑ‚Ð²Ð¾} Ð·Ð°Ð³Ñ€ÑƒÐ¶ÐµÐ½Ð¾ Ñ„Ð°Ð¹Ð»Ð¾Ð²"
+#: js/files.js:277
+msgid "Not enough space available"
+msgstr ""
 
-#: js/files.js:388 js/files.js:423
+#: js/files.js:317
 msgid "Upload cancelled."
-msgstr "Ð—Ð°Ð³Ñ€ÑƒÐ·ÐºÐ° Ð¾Ñ‚Ð¼ÐµÐ½ÐµÐ½Ð°"
+msgstr ""
 
-#: js/files.js:497
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
-msgstr "ÐŸÑ€Ð¾Ñ†ÐµÑÑ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸ Ñ„Ð°Ð¹Ð»Ð°. Ð•ÑÐ»Ð¸ Ð¿Ð¾ÐºÐ¸Ð½ÑƒÑ‚ÑŒ ÑÑ‚Ñ€Ð°Ð½Ð¸Ñ†Ñƒ ÑÐµÐ¹Ñ‡Ð°Ñ, Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ° Ð±ÑƒÐ´ÐµÑ‚ Ð¾Ñ‚Ð¼ÐµÐ½ÐµÐ½Ð°."
+msgstr ""
 
-#: js/files.js:570
+#: js/files.js:486
 msgid "URL cannot be empty."
-msgstr "URL Ð½Ðµ Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð±Ñ‹Ñ‚ÑŒ Ð¿ÑƒÑÑ‚Ñ‹Ð¼."
+msgstr ""
 
-#: js/files.js:575
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr "ÐÐµÐ²ÐµÑ€Ð½Ð¾Ðµ Ð¸Ð¼Ñ Ð¿Ð°Ð¿ÐºÐ¸. Ð˜ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ Ð½Ð°Ð¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ð½Ð¸Ñ 'ÐžÐ¿ÑƒÐ±Ð»Ð¸ÐºÐ¾Ð²Ð°Ð½Ð¾' Ð·Ð°Ñ€ÐµÐ·ÐµÑ€Ð²Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¾ Owncloud"
+msgstr ""
+
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+msgid "Error"
+msgstr "ÐžÑˆÐ¸Ð±ÐºÐ°"
 
-#: js/files.js:953 templates/index.php:68
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
-msgstr "Ð˜Ð¼Ñ"
+msgstr ""
 
-#: js/files.js:954 templates/index.php:79
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
-msgstr "Ð Ð°Ð·Ð¼ÐµÑ€"
+msgstr ""
 
-#: js/files.js:955 templates/index.php:81
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
-msgstr "Ð˜Ð·Ð¼ÐµÐ½ÐµÐ½"
+msgstr ""
 
-#: js/files.js:974
+#: js/files.js:898
 msgid "1 folder"
-msgstr "1 Ð¿Ð°Ð¿ÐºÐ°"
+msgstr ""
 
-#: js/files.js:976
+#: js/files.js:900
 msgid "{count} folders"
-msgstr "{ÐºÐ¾Ð»Ð¸Ñ‡ÐµÑÑ‚Ð²Ð¾} Ð¿Ð°Ð¿Ð¾Ðº"
+msgstr ""
 
-#: js/files.js:984
+#: js/files.js:908
 msgid "1 file"
-msgstr "1 Ñ„Ð°Ð¹Ð»"
+msgstr ""
 
-#: js/files.js:986
+#: 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"
-msgstr "Ð¡Ð¾Ñ…Ñ€Ð°Ð½Ð¸Ñ‚ÑŒ"
+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:40
+#: templates/index.php:42
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:48
 msgid "Cancel upload"
-msgstr "ÐžÑ‚Ð¼ÐµÐ½Ð° Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸"
+msgstr ""
 
-#: templates/index.php:53
+#: templates/index.php:54
 msgid "You donâ€™t have write permissions here."
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
-msgstr "Ð—Ð´ÐµÑÑŒ Ð½Ð¸Ñ‡ÐµÐ³Ð¾ Ð½ÐµÑ‚. Ð—Ð°Ð³Ñ€ÑƒÐ·Ð¸Ñ‚Ðµ Ñ‡Ñ‚Ð¾-Ð½Ð¸Ð±ÑƒÐ´ÑŒ!"
+msgstr ""
 
-#: templates/index.php:74
+#: templates/index.php:75
 msgid "Download"
-msgstr "Ð—Ð°Ð³Ñ€ÑƒÐ·Ð¸Ñ‚ÑŒ"
+msgstr ""
 
-#: templates/index.php:86 templates/index.php:87
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
-msgstr "Ð¡ÐºÑ€Ñ‹Ñ‚ÑŒ"
+msgstr ""
 
-#: templates/index.php:106
+#: templates/index.php:107
 msgid "Upload too large"
-msgstr "Ð—Ð°Ð³Ñ€ÑƒÐ·ÐºÐ° ÑÐ»Ð¸ÑˆÐºÐ¾Ð¼ Ð²ÐµÐ»Ð¸ÐºÐ°"
+msgstr ""
 
-#: templates/index.php:108
+#: 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:113
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
-msgstr "Ð¤Ð°Ð¹Ð»Ñ‹ ÑÐºÐ°Ð½Ð¸Ñ€ÑƒÑŽÑ‚ÑÑ, Ð¿Ð¾Ð¶Ð°Ð»ÑƒÐ¹ÑÑ‚Ð°, Ð¿Ð¾Ð´Ð¾Ð¶Ð´Ð¸Ñ‚Ðµ."
+msgstr ""
 
-#: templates/index.php:116
+#: 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..e9f3e4b2039a80f045316b528b3e147de0ac6036 100644
--- a/l10n/ru_RU/files_encryption.po
+++ b/l10n/ru_RU/files_encryption.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-10 00:08+0100\n"
-"PO-Revision-Date: 2013-02-09 23:09+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ru_RU/files_external.po b/l10n/ru_RU/files_external.po
index 4938cb4d6ada54c17c5f3c5842d0a84e4db4d24c..1410e66849f978cf2f4d57498335a5d9f000af11 100644
--- a/l10n/ru_RU/files_external.po
+++ b/l10n/ru_RU/files_external.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <cdewqazxsqwe@gmail.com>, 2012.
+# AnnaSch <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-01 00:05+0100\n"
-"PO-Revision-Date: 2013-02-27 23:20+0000\n"
+"POT-Creation-Date: 2013-04-24 01:57+0200\n"
+"PO-Revision-Date: 2013-04-23 23:58+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"
@@ -38,19 +38,26 @@ msgstr "ÐŸÐ¾Ð¶Ð°Ð»ÑƒÐ¹ÑÑ‚Ð° Ð¿Ñ€ÐµÐ´ÑÑ‚Ð°Ð²ÑŒÑ‚Ðµ Ð´Ð¾Ð¿ÑƒÑÑ‚Ð¸Ð¼Ñ‹Ð¹ ÐºÐ»ÑŽ
 msgid "Error configuring Google Drive storage"
 msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ Ñ…Ñ€Ð°Ð½Ð¸Ð»Ð¸Ñ‰Ð° Google Drive"
 
-#: 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 "<b>ÐŸÑ€ÐµÐ´ÑƒÐ¿Ñ€ÐµÐ¶Ð´ÐµÐ½Ð¸Ðµ:</b> \"smbclient\" Ð½Ðµ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½. ÐŸÐ¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ðµ Ð¾Ð±Ñ‰Ð¸Ñ… Ð¿Ð°Ð¿Ð¾Ðº CIFS/SMB Ð½ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾. ÐŸÐ¾Ð¶Ð°Ð»ÑƒÐ¹ÑÑ‚Ð°, Ð¾Ð±Ñ€Ð°Ñ‚Ð¸Ñ‚ÐµÑÑŒ Ðº ÑÐ¸ÑÑ‚ÐµÐ¼Ð½Ð¾Ð¼Ñƒ Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑ‚Ñ€Ð°Ñ‚Ð¾Ñ€Ñƒ, Ñ‡Ñ‚Ð¾Ð±Ñ‹ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ ÐµÐ³Ð¾."
 
-#: 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 "<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/ru_RU/files_sharing.po b/l10n/ru_RU/files_sharing.po
index 7f31cb63091ddd5be7c19da7def8c80a4bac5030..2f1f872d545eff092fd2a8360f8f3e58070c1e7a 100644
--- a/l10n/ru_RU/files_sharing.po
+++ b/l10n/ru_RU/files_sharing.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 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-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,24 +26,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_RU/files_trashbin.po b/l10n/ru_RU/files_trashbin.po
index 5d352379365593b7c8f05cff1f2c15a2a4aa8468..4e65e5d446d1f47a1e6c6d8bcb51b6e5331abf22 100644
--- a/l10n/ru_RU/files_trashbin.po
+++ b/l10n/ru_RU/files_trashbin.po
@@ -3,78 +3,81 @@
 # 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-03-08 00:25+0100\n"
-"PO-Revision-Date: 2013-03-07 23:25+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"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "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/delete.php:40
+#: ajax/delete.php:42
 #, php-format
 msgid "Couldn't delete %s permanently"
-msgstr "%s Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ‚ Ð±Ñ‹Ñ‚ÑŒ ÑƒÐ´Ð°Ð»Ñ‘Ð½ Ð½Ð°Ð²ÑÐµÐ³Ð´Ð°"
+msgstr ""
 
-#: ajax/undelete.php:41
+#: ajax/undelete.php:42
 #, php-format
 msgid "Couldn't restore %s"
-msgstr "%s Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ‚ Ð±Ñ‹Ñ‚ÑŒ Ð²Ð¾ÑÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½"
+msgstr ""
 
 #: js/trash.js:7 js/trash.js:96
 msgid "perform restore operation"
-msgstr "Ð²Ñ‹Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÑŒ Ð¾Ð¿ÐµÑ€Ð°Ñ†Ð¸ÑŽ Ð²Ð¾ÑÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ"
+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 "ÑƒÐ´Ð°Ð»Ð¸Ñ‚ÑŒ Ñ„Ð°Ð¹Ð» Ð½Ð°Ð²ÑÐµÐ³Ð´Ð°"
+msgstr ""
 
 #: js/trash.js:121
 msgid "Delete permanently"
-msgstr "Ð£Ð´Ð°Ð»Ð¸Ñ‚ÑŒ Ð½Ð°Ð²ÑÐµÐ³Ð´Ð°"
+msgstr ""
 
 #: js/trash.js:174 templates/index.php:17
 msgid "Name"
-msgstr "Ð˜Ð¼Ñ"
+msgstr ""
 
 #: js/trash.js:175 templates/index.php:27
 msgid "Deleted"
-msgstr "Ð£Ð´Ð°Ð»Ñ‘Ð½"
+msgstr ""
 
 #: js/trash.js:184
 msgid "1 folder"
-msgstr "1 Ð¿Ð°Ð¿ÐºÐ°"
+msgstr ""
 
 #: js/trash.js:186
 msgid "{count} folders"
-msgstr "{ÐºÐ¾Ð»Ð¸Ñ‡ÐµÑÑ‚Ð²Ð¾} Ð¿Ð°Ð¿Ð¾Ðº"
+msgstr ""
 
 #: js/trash.js:194
 msgid "1 file"
-msgstr "1 Ñ„Ð°Ð¹Ð»"
+msgstr ""
 
 #: js/trash.js:196
 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"
-msgstr "Ð£Ð´Ð°Ð»Ð¸Ñ‚ÑŒ"
+msgstr ""
 
 #: templates/part.breadcrumb.php:9
 msgid "Deleted Files"
diff --git a/l10n/ru_RU/files_versions.po b/l10n/ru_RU/files_versions.po
index 202ace6ab3c411ed5f838725059741d159993313..8931ebb796c487e3d2511f28d89c97ae9f6f296f 100644
--- a/l10n/ru_RU/files_versions.po
+++ b/l10n/ru_RU/files_versions.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-28 00:04+0100\n"
-"PO-Revision-Date: 2013-02-27 23:04+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+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"
@@ -41,11 +41,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 2ffed90f68e5f38f5e85423ebf384455b17b9c8f..540aefaac48fc4344f70a6bcd9d26c17cdb25647 100644
--- a/l10n/ru_RU/lib.po
+++ b/l10n/ru_RU/lib.po
@@ -3,17 +3,14 @@
 # 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-02-27 14:35+0100\n"
-"PO-Revision-Date: 2013-02-27 13:35+0000\n"
+"POT-Creation-Date: 2013-04-28 01:57+0200\n"
+"PO-Revision-Date: 2013-04-27 23:57+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"
+"Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -22,11 +19,11 @@ msgstr ""
 
 #: app.php:349
 msgid "Help"
-msgstr "ÐŸÐ¾Ð¼Ð¾Ñ‰ÑŒ"
+msgstr ""
 
 #: app.php:362
 msgid "Personal"
-msgstr "ÐŸÐµÑ€ÑÐ¾Ð½Ð°Ð»ÑŒÐ½Ñ‹Ð¹"
+msgstr ""
 
 #: app.php:373
 msgid "Settings"
@@ -34,59 +31,59 @@ msgstr "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸"
 
 #: app.php:385
 msgid "Users"
-msgstr "ÐŸÐ¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ð¸"
+msgstr ""
 
 #: app.php:398
 msgid "Apps"
-msgstr "ÐŸÑ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ"
+msgstr ""
 
 #: app.php:406
 msgid "Admin"
-msgstr "ÐÐ´Ð¼Ð¸Ð½"
+msgstr ""
 
-#: files.php:202
+#: files.php:209
 msgid "ZIP download is turned off."
-msgstr "Ð—Ð°Ð³Ñ€ÑƒÐ·ÐºÐ° ZIP Ð²Ñ‹ÐºÐ»ÑŽÑ‡ÐµÐ½Ð°."
+msgstr ""
 
-#: files.php:203
+#: files.php:210
 msgid "Files need to be downloaded one by one."
-msgstr "Ð¤Ð°Ð¹Ð»Ñ‹ Ð´Ð¾Ð»Ð¶Ð½Ñ‹ Ð±Ñ‹Ñ‚ÑŒ Ð·Ð°Ð³Ñ€ÑƒÐ¶ÐµÐ½Ñ‹ Ð¾Ð´Ð¸Ð½ Ð·Ð° Ð´Ñ€ÑƒÐ³Ð¸Ð¼."
+msgstr ""
 
-#: files.php:204 files.php:231
+#: files.php:211 files.php:244
 msgid "Back to Files"
-msgstr "ÐžÐ±Ñ€Ð°Ñ‚Ð½Ð¾ Ðº Ñ„Ð°Ð¹Ð»Ð°Ð¼"
+msgstr ""
 
-#: files.php:228
+#: files.php:241
 msgid "Selected files too large to generate zip file."
-msgstr "Ð’Ñ‹Ð±Ñ€Ð°Ð½Ð½Ñ‹Ðµ Ñ„Ð°Ð¹Ð»Ñ‹ ÑÐ»Ð¸ÑˆÐºÐ¾Ð¼ Ð²ÐµÐ»Ð¸ÐºÐ¸ Ð´Ð»Ñ Ð³ÐµÐ½ÐµÑ€Ð°Ñ†Ð¸Ð¸ zip-Ð°Ñ€Ñ…Ð¸Ð²Ð°."
+msgstr ""
 
 #: helper.php:228
 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"
-msgstr "Ð¢ÐµÐºÑÑ‚"
+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,129 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:128 setup.php:320 setup.php:365
+#: setup.php:132 setup.php:325 setup.php:370
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:129 setup.php:152 setup.php:229
+#: setup.php:133 setup.php:156 setup.php:234
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:151 setup.php:453 setup.php:520
+#: setup.php:155 setup.php:458 setup.php:525
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:228
+#: setup.php:233
 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: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:583 setup.php:592 setup.php:600 setup.php:609
+#: setup.php:615
 #, 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:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
+#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
+#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:299
+#: setup.php:304
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:300
+#: setup.php:305
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:305
+#: setup.php:310
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:306
+#: setup.php:311
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:579 setup.php:611
+#: setup.php:584 setup.php:616
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:631
+#: setup.php:636
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:849
+#: setup.php:858
 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:850
+#: setup.php:859
 #, 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 cfc0f39c99faa165c862c497902c9b127164d8f0..5fc2851ce67fb503d563e358d076edc0b83d689b 100644
--- a/l10n/ru_RU/settings.po
+++ b/l10n/ru_RU/settings.po
@@ -3,16 +3,14 @@
 # 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-27 14:35+0100\n"
-"PO-Revision-Date: 2013-02-27 13:35+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"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-04-26 08:00+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\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:31
+msgid "Your display name has been changed."
+msgstr ""
 
-#: ajax/changedisplayname.php:32
+#: 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,84 +94,84 @@ msgstr ""
 
 #: js/apps.js:36 js/apps.js:76
 msgid "Disable"
-msgstr "ÐžÑ‚ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ"
+msgstr ""
 
-#: js/apps.js:36 js/apps.js:64
+#: js/apps.js:36 js/apps.js:64 js/apps.js:83
 msgid "Enable"
-msgstr "Ð’ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ"
+msgstr ""
 
 #: js/apps.js:55
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:84
+#: 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:87
+#: js/apps.js:93
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:87
-msgid "Error"
-msgstr "ÐžÑˆÐ¸Ð±ÐºÐ°"
-
-#: js/apps.js:90
+#: js/apps.js:96
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
-msgstr "Ð¡Ð¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ðµ"
+msgstr ""
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "deleted"
 msgstr "ÑƒÐ´Ð°Ð»ÐµÐ½Ð¾"
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "undo"
-msgstr "Ð¾Ñ‚Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ Ð´ÐµÐ¹ÑÑ‚Ð²Ð¸Ðµ"
+msgstr ""
 
-#: js/users.js:62
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:75 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
+#: templates/users.php:103
 msgid "Groups"
-msgstr "Ð“Ñ€ÑƒÐ¿Ð¿Ñ‹"
+msgstr ""
 
-#: js/users.js:78 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
-msgstr "Ð“Ñ€ÑƒÐ¿Ð¿Ð° Admin"
+msgstr ""
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
-msgstr "Ð£Ð´Ð°Ð»Ð¸Ñ‚ÑŒ"
+msgstr ""
 
-#: js/users.js:191
+#: js/users.js:269
 msgid "add group"
 msgstr ""
 
-#: js/users.js:352
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:353 js/users.js:359 js/users.js:374
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:358
+#: js/users.js:426
 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,15 +316,19 @@ msgstr ""
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
-msgstr "ÐŸÐ¾Ð´Ñ€Ð¾Ð±Ð½ÐµÐµ"
+msgstr ""
+
+#: templates/admin.php:228
+msgid "Less"
+msgstr ""
 
-#: templates/admin.php:230 templates/personal.php:102
+#: templates/admin.php:235 templates/personal.php:105
 msgid "Version"
-msgstr "Ð’ÐµÑ€ÑÐ¸Ñ"
+msgstr ""
 
-#: templates/admin.php:233 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 "
@@ -330,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"
@@ -391,108 +397,96 @@ 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:77
 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"
+#: templates/personal.php:56 templates/users.php:76
+msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:61
-msgid "Change display name"
+#: templates/personal.php:68
+msgid "Email"
 msgstr ""
 
 #: templates/personal.php:70
-msgid "Email"
-msgstr "ÐÐ»ÐµÐºÑ‚Ñ€Ð¾Ð½Ð½Ð°Ñ Ð¿Ð¾Ñ‡Ñ‚Ð°"
-
-#: templates/personal.php:72
 msgid "Your email address"
-msgstr "ÐÐ´Ñ€ÐµÑ Ð’Ð°ÑˆÐµÐ¹ ÑÐ»ÐµÐºÑ‚Ñ€Ð¾Ð½Ð½Ð¾Ð¹ Ð¿Ð¾Ñ‡Ñ‚Ñ‹"
+msgstr ""
 
-#: templates/personal.php:73
+#: templates/personal.php:71
 msgid "Fill in an email address to enable password recovery"
-msgstr "Ð’Ð²ÐµÐ´Ð¸Ñ‚Ðµ Ð°Ð´Ñ€ÐµÑ ÑÐ»ÐµÐºÑ‚Ñ€Ð¾Ð½Ð½Ð¾Ð¹ Ð¿Ð¾Ñ‡Ñ‚Ñ‹ Ð´Ð»Ñ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ÑÑ‚Ð¸ Ð²Ð¾ÑÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð¿Ð°Ñ€Ð¾Ð»Ñ"
+msgstr ""
 
-#: templates/personal.php:79 templates/personal.php:80
+#: templates/personal.php:77 templates/personal.php:78
 msgid "Language"
-msgstr "Ð¯Ð·Ñ‹Ðº"
+msgstr ""
 
-#: templates/personal.php:86
+#: templates/personal.php:89
 msgid "Help translate"
-msgstr "ÐŸÐ¾Ð¼Ð¾Ð³Ð¸Ñ‚Ðµ Ð¿ÐµÑ€ÐµÐ²ÐµÑÑ‚Ð¸"
+msgstr ""
 
-#: templates/personal.php:91
+#: templates/personal.php:94
 msgid "WebDAV"
-msgstr "WebDAV"
+msgstr ""
 
-#: templates/personal.php:93
+#: templates/personal.php:96
 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:75
 msgid "Login Name"
 msgstr ""
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
-msgstr "Ð¡Ð¾Ð·Ð´Ð°Ñ‚ÑŒ"
+msgstr ""
 
-#: templates/users.php:35
+#: templates/users.php:33
 msgid "Default Storage"
-msgstr "Ð¥Ñ€Ð°Ð½Ð¸Ð»Ð¸Ñ‰Ðµ Ð¿Ð¾ ÑƒÐ¼Ð¾Ð»Ñ‡Ð°Ð½Ð¸ÑŽ"
+msgstr ""
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:39 templates/users.php:133
 msgid "Unlimited"
-msgstr "ÐÐµÐ¾Ð³Ñ€Ð°Ð½Ð¸Ñ‡ÐµÐ½Ð½Ñ‹Ð¹"
+msgstr ""
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:57 templates/users.php:148
 msgid "Other"
-msgstr "Ð”Ñ€ÑƒÐ³Ð¾Ð¹"
+msgstr ""
 
-#: templates/users.php:84
+#: templates/users.php:82
 msgid "Storage"
-msgstr "Ð¥Ñ€Ð°Ð½Ð¸Ð»Ð¸Ñ‰Ðµ"
+msgstr ""
 
-#: templates/users.php:95
+#: templates/users.php:93
 msgid "change display name"
 msgstr ""
 
-#: templates/users.php:99
+#: templates/users.php:97
 msgid "set new password"
-msgstr "Ð½Ð°Ð·Ð½Ð°Ñ‡Ð¸Ñ‚ÑŒ Ð½Ð¾Ð²Ñ‹Ð¹ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ"
+msgstr ""
 
-#: templates/users.php:134
+#: templates/users.php:128
 msgid "Default"
-msgstr "ÐŸÐ¾ ÑƒÐ¼Ð¾Ð»Ñ‡Ð°Ð½Ð¸ÑŽ"
+msgstr ""
diff --git a/l10n/ru_RU/user_ldap.po b/l10n/ru_RU/user_ldap.po
index 72f9dfc6cf9e9a719e9588c2c81066fdbdaafe70..5d247f8926875551b876ce71f5a11c50c38937b7 100644
--- a/l10n/ru_RU/user_ldap.po
+++ b/l10n/ru_RU/user_ldap.po
@@ -3,22 +3,24 @@
 # 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-02 00:03+0100\n"
-"PO-Revision-Date: 2013-03-01 23:04+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"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "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:18
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:37
 msgid "Host"
-msgstr "Ð¥Ð¾ÑÑ‚"
+msgstr ""
 
-#: templates/settings.php:25
+#: 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:26
+#: templates/settings.php:40
 msgid "Base DN"
-msgstr "Ð‘Ð°Ð·Ð° DN"
+msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:41
 msgid "One Base DN per line"
-msgstr "ÐžÐ´Ð½Ð¾ Ð±Ð°Ð·Ð¾Ð²Ð¾Ðµ DN Ð½Ð° Ð»Ð¸Ð½Ð¸ÑŽ"
+msgstr ""
 
-#: templates/settings.php:28
+#: 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:30
+#: templates/settings.php:44
 msgid "User DN"
-msgstr "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 "DN ÐºÐ»Ð¸ÐµÐ½Ñ‚ÑÐºÐ¾Ð³Ð¾ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ, Ñ ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ð³Ð¾ Ð´Ð¾Ð»Ð¶Ð½Ð° Ð¾ÑÑƒÑ‰ÐµÑÑ‚Ð²Ð»ÑÑ‚ÑŒÑÑ Ð¿Ñ€Ð¸Ð²ÑÐ·ÐºÐ°, Ð½Ð°Ð¿Ñ€Ð¸Ð¼ÐµÑ€, uid=agent,dc=example,dc=com. Ð”Ð»Ñ Ð°Ð½Ð¾Ð½Ð¸Ð¼Ð½Ð¾Ð³Ð¾ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð° Ð¾ÑÑ‚Ð°Ð²ÑŒÑ‚Ðµ Ð¿Ð¾Ð»Ñ DN Ð¸ ÐŸÐ°Ñ€Ð¾Ð»ÑŒ Ð¿ÑƒÑÑ‚Ñ‹Ð¼Ð¸."
+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 "Ð”Ð»Ñ Ð°Ð½Ð¾Ð½Ð¸Ð¼Ð½Ð¾Ð³Ð¾ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð° Ð¾ÑÑ‚Ð°Ð²ÑŒÑ‚Ðµ Ð¿Ð¾Ð»Ñ DN Ð¸ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ Ð¿ÑƒÑÑ‚Ñ‹Ð¼Ð¸."
+msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:51
 msgid "User Login Filter"
-msgstr "Ð¤Ð¸Ð»ÑŒÑ‚Ñ€ Ð¸Ð¼ÐµÐ½ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¹"
+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 "Ð—Ð°Ð´Ð°ÐµÑ‚ Ñ„Ð¸Ð»ÑŒÑ‚Ñ€, Ð¿Ñ€Ð¸Ð¼ÐµÐ½ÑÐµÐ¼Ñ‹Ð¹ Ð¿Ñ€Ð¸ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐµ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ. %%uid Ð·Ð°Ð¼ÐµÐ½ÑÐµÑ‚ Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¿Ñ€Ð¸ Ð²Ñ…Ð¾Ð´Ðµ."
+msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr "Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÐ¹Ñ‚Ðµ %%uid Ð·Ð°Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒ, Ð½Ð°Ð¿Ñ€Ð¸Ð¼ÐµÑ€, \"uid=%%uid\""
+msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:56
 msgid "User List Filter"
-msgstr "Ð¤Ð¸Ð»ÑŒÑ‚Ñ€ ÑÐ¿Ð¸ÑÐºÐ° Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¹"
+msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
-msgstr "Ð—Ð°Ð´Ð°ÐµÑ‚ Ñ„Ð¸Ð»ÑŒÑ‚Ñ€, Ð¿Ñ€Ð¸Ð¼ÐµÐ½ÑÐµÐ¼Ñ‹Ð¹ Ð¿Ñ€Ð¸ Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ð¸ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¹."
+msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr "Ð±ÐµÐ· ÐºÐ°ÐºÐ¸Ñ…-Ð»Ð¸Ð±Ð¾ Ð·Ð°Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÐµÐ¹, Ð½Ð°Ð¿Ñ€Ð¸Ð¼ÐµÑ€, \"objectClass=person\"."
+msgstr ""
 
-#: templates/settings.php:47
+#: templates/settings.php:61
 msgid "Group Filter"
-msgstr "Ð“Ñ€ÑƒÐ¿Ð¿Ð¾Ð²Ð¾Ð¹ Ñ„Ð¸Ð»ÑŒÑ‚Ñ€"
+msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
-msgstr "Ð—Ð°Ð´Ð°ÐµÑ‚ Ñ„Ð¸Ð»ÑŒÑ‚Ñ€, Ð¿Ñ€Ð¸Ð¼ÐµÐ½ÑÐµÐ¼Ñ‹Ð¹ Ð¿Ñ€Ð¸ Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ð¸ Ð³Ñ€ÑƒÐ¿Ð¿."
+msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr "Ð±ÐµÐ· ÐºÐ°ÐºÐ¸Ñ…-Ð»Ð¸Ð±Ð¾ Ð·Ð°Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÐµÐ¹, Ð½Ð°Ð¿Ñ€Ð¸Ð¼ÐµÑ€, \"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 "ÐŸÐ¾Ñ€Ñ‚"
+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 "Ð˜ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ 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 "ÐÐµÑ‡ÑƒÐ²ÑÑ‚Ð²Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ñ‹Ð¹ Ðº Ñ€ÐµÐ³Ð¸ÑÑ‚Ñ€Ñƒ LDAP-ÑÐµÑ€Ð²ÐµÑ€ (Windows)"
+msgstr ""
 
-#: templates/settings.php:64
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
-msgstr "Ð’Ñ‹ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ Ð¿Ñ€Ð¾Ð²ÐµÑ€ÐºÑƒ ÑÐµÑ€Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ‚Ð° SSL."
+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 "Ð•ÑÐ»Ð¸ ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ðµ Ñ€Ð°Ð±Ð¾Ñ‚Ð°ÐµÑ‚ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ Ñ ÑÑ‚Ð¾Ð¹ Ð¾Ð¿Ñ†Ð¸ÐµÐ¹, Ð¸Ð¼Ð¿Ð¾Ñ€Ñ‚Ð¸Ñ€ÑƒÐ¹Ñ‚Ðµ SSL-ÑÐµÑ€Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ‚ LDAP ÑÐµÑ€Ð²ÐµÑ€Ð° Ð² Ð²Ð°Ñˆ ownCloud ÑÐµÑ€Ð²ÐµÑ€."
+msgstr ""
 
-#: templates/settings.php:64
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
-msgstr "ÐÐµ Ñ€ÐµÐºÐ¾Ð¼ÐµÐ½Ð´Ð¾Ð²Ð°Ð½Ð¾, Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÐ¹Ñ‚Ðµ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ Ð´Ð»Ñ Ñ‚ÐµÑÑ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ."
+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 "Ð² ÑÐµÐºÑƒÐ½Ð´Ð°Ñ…. Ð˜Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ðµ Ð¾Ñ‡Ð¸Ñ‰Ð°ÐµÑ‚ ÐºÑÑˆ."
+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 "ÐŸÐ¾Ð»Ðµ, Ð¾Ñ‚Ð¾Ð±Ñ€Ð°Ð¶Ð°ÐµÐ¼Ð¾Ðµ ÐºÐ°Ðº Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ"
+msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
-msgstr "ÐÑ‚Ñ€Ð¸Ð±ÑƒÑ‚ LDAP, Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÐµÐ¼Ñ‹Ð¹ Ð´Ð»Ñ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð¸Ð¼ÐµÐ½Ð¸ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð² ownCloud."
+msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:84
 msgid "Base User Tree"
-msgstr "Ð‘Ð°Ð·Ð¾Ð²Ð¾Ðµ Ð´ÐµÑ€ÐµÐ²Ð¾ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¹"
+msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:84
 msgid "One User Base DN per line"
-msgstr "ÐžÐ´Ð½Ð¾ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒÑÐºÐ¾Ðµ Ð±Ð°Ð·Ð¾Ð²Ð¾Ðµ DN Ð½Ð° Ð»Ð¸Ð½Ð¸ÑŽ"
+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 "ÐŸÐ¾Ð»Ðµ, Ð¾Ñ‚Ð¾Ð±Ñ€Ð°Ð¶Ð°ÐµÐ¼Ð¾Ðµ ÐºÐ°Ðº Ð¸Ð¼Ñ Ð³Ñ€ÑƒÐ¿Ð¿Ñ‹"
+msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
-msgstr "ÐÑ‚Ñ€Ð¸Ð±ÑƒÑ‚ LDAP, Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÐµÐ¼Ñ‹Ð¹ Ð´Ð»Ñ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð³Ñ€ÑƒÐ¿Ð¿Ð¾Ð²Ð¾Ð³Ð¾ Ð¸Ð¼ÐµÐ½Ð¸ Ð² ownCloud."
+msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:87
 msgid "Base Group Tree"
-msgstr "Ð‘Ð°Ð·Ð¾Ð²Ð¾Ðµ Ð´ÐµÑ€ÐµÐ²Ð¾ Ð³Ñ€ÑƒÐ¿Ð¿"
+msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
-msgstr "ÐžÐ´Ð½Ð¾ Ð³Ñ€ÑƒÐ¿Ð¿Ð¾Ð²Ð¾Ðµ Ð±Ð°Ð·Ð¾Ð²Ð¾Ðµ DN Ð½Ð° Ð»Ð¸Ð½Ð¸ÑŽ"
+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 "Ð¡Ð²ÑÐ·ÑŒ Ñ‡Ð»ÐµÐ½-Ð³Ñ€ÑƒÐ¿Ð¿Ð°"
+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 "Ð² Ð±Ð°Ð¹Ñ‚Ð°Ñ…"
+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 "ÐžÑÑ‚Ð°Ð²ÑŒÑ‚Ðµ Ð¿ÑƒÑÑ‚Ñ‹Ð¼ Ð¿Ð¾Ð´ Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ (Ð¿Ð¾ ÑƒÐ¼Ð¾Ð»Ñ‡Ð°Ð½Ð¸ÑŽ). Ð’ Ð¿Ñ€Ð¾Ñ‚Ð¸Ð²Ð½Ð¾Ð¼ ÑÐ»ÑƒÑ‡Ð°Ðµ Ð·Ð°Ð´Ð°Ð¹Ñ‚Ðµ LDAP/AD Ð°Ñ‚Ñ€Ð¸Ð±ÑƒÑ‚."
+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 "ÐŸÐ¾Ð¼Ð¾Ñ‰ÑŒ"
+msgstr ""
diff --git a/l10n/ru_RU/user_webdavauth.po b/l10n/ru_RU/user_webdavauth.po
index 48ae554ac04cbfd0015c4bfea1ba26787f5ee12d..8223c3dc9ba4af8d253cb4b1176da5ca206b28aa 100644
--- a/l10n/ru_RU/user_webdavauth.po
+++ b/l10n/ru_RU/user_webdavauth.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-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-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -28,7 +28,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/si_LK/core.po b/l10n/si_LK/core.po
index 7ea576ef3202f5a6a0768c25797899b2854e71de..21ffdc00b28a6f88e6c979e42230504e7d62f98c 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-02-22 00:06+0100\n"
-"PO-Revision-Date: 2013-02-20 23:20+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10: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"
@@ -20,24 +17,24 @@ msgstr ""
 "Language: si_LK\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:85
+#: ajax/share.php:97
 #, php-format
 msgid "User %s shared a file with you"
 msgstr ""
 
-#: ajax/share.php:87
+#: ajax/share.php:99
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr ""
 
-#: ajax/share.php:89
+#: 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:91
+#: ajax/share.php:104
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -83,166 +80,168 @@ msgstr "à¶¸à¶šà· à¶¯à·à¶¸à·“à¶¸ à·ƒà¶³à·„à· à¶´à·Šâ€à¶»à·€à¶»à·Šà¶œà¶ºà¶±à·Š
 msgid "Error removing %s from favorites."
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:34
 msgid "Sunday"
 msgstr "à¶‰à¶»à·’à¶¯à·"
 
-#: js/config.php:32
+#: js/config.php:35
 msgid "Monday"
 msgstr "à·ƒà¶³à·”à¶¯à·"
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Tuesday"
 msgstr "à¶…à¶Ÿà·„à¶»à·”à·€à·à¶¯à·"
 
-#: js/config.php:32
+#: js/config.php:37
 msgid "Wednesday"
 msgstr "à¶¶à¶¯à·à¶¯à·"
 
-#: js/config.php:32
+#: js/config.php:38
 msgid "Thursday"
 msgstr "à¶¶à·Šâ€à¶»à·„à·ƒà·Šà¶´à¶à·’à¶±à·Šà¶¯à·"
 
-#: js/config.php:32
+#: js/config.php:39
 msgid "Friday"
 msgstr "à·ƒà·’à¶šà·”à¶»à·à¶¯à·"
 
-#: js/config.php:32
+#: js/config.php:40
 msgid "Saturday"
 msgstr "à·ƒà·™à¶±à·ƒà·”à¶»à·à¶¯à·"
 
-#: js/config.php:33
+#: js/config.php:45
 msgid "January"
 msgstr "à¶¢à¶±à·€à·à¶»à·’"
 
-#: js/config.php:33
+#: js/config.php:46
 msgid "February"
 msgstr "à¶´à·™à¶¶à¶»à·€à·à¶»à·’"
 
-#: js/config.php:33
+#: js/config.php:47
 msgid "March"
 msgstr "à¶¸à·à¶»à·Šà¶à·”"
 
-#: js/config.php:33
+#: js/config.php:48
 msgid "April"
 msgstr "à¶…à¶´à·Šâ€à¶»à·šà¶½à·Š"
 
-#: js/config.php:33
+#: js/config.php:49
 msgid "May"
 msgstr "à¶¸à·à¶ºà·’"
 
-#: js/config.php:33
+#: js/config.php:50
 msgid "June"
 msgstr "à¶¢à·–à¶±à·’"
 
-#: js/config.php:33
+#: js/config.php:51
 msgid "July"
 msgstr "à¶¢à·–à¶½à·’"
 
-#: js/config.php:33
+#: js/config.php:52
 msgid "August"
 msgstr "à¶…à¶œà·à·ƒà·Šà¶à·”"
 
-#: js/config.php:33
+#: js/config.php:53
 msgid "September"
 msgstr "à·ƒà·à¶´à·Šà¶à·à¶¸à·Šà¶¶à¶»à·Š"
 
-#: js/config.php:33
+#: js/config.php:54
 msgid "October"
-msgstr "à¶”à¶šà·Šà¶à·à¶¶à¶»à·Š"
+msgstr "à¶”à¶šà·Šà¶à·à¶¶à¶»"
 
-#: js/config.php:33
+#: js/config.php:55
 msgid "November"
 msgstr "à¶±à·œà·€à·à¶¸à·Šà¶¶à¶»à·Š"
 
-#: js/config.php:33
+#: js/config.php:56
 msgid "December"
 msgstr "à¶¯à·™à·ƒà·à¶¸à·Šà¶¶à¶»à·Š"
 
 #: js/js.js:286
 msgid "Settings"
-msgstr "à·ƒà·à¶šà·ƒà·”à¶¸à·Š"
+msgstr "à·ƒà·’à¶§à·”à·€à¶¸à·Š"
 
-#: js/js.js:767
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "à¶à¶à·Šà¶´à¶»à¶ºà¶±à·Šà¶§ à¶´à·™à¶»"
 
-#: js/js.js:768
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "1 à¶¸à·’à¶±à·’à¶à·Šà¶à·”à·€à¶šà¶§ à¶´à·™à¶»"
 
-#: js/js.js:769
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:770
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:771
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:772
+#: js/js.js:723
 msgid "today"
 msgstr "à¶…à¶¯"
 
-#: js/js.js:773
+#: js/js.js:724
 msgid "yesterday"
 msgstr "à¶Šà¶ºà·š"
 
-#: js/js.js:774
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:775
+#: js/js.js:726
 msgid "last month"
 msgstr "à¶´à·™à¶» à¶¸à·à·ƒà¶ºà·š"
 
-#: js/js.js:776
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:777
+#: js/js.js:728
 msgid "months ago"
 msgstr "à¶¸à·à·ƒ à¶šà·“à¶´à¶ºà¶šà¶§ à¶´à·™à¶»"
 
-#: js/js.js:778
+#: js/js.js:729
 msgid "last year"
 msgstr "à¶´à·™à¶» à¶…à·€à·”à¶»à·”à¶¯à·Šà¶¯à·š"
 
-#: js/js.js:779
+#: js/js.js:730
 msgid "years ago"
 msgstr "à¶…à·€à·”à¶»à·”à¶¯à·” à¶šà·“à¶´à¶ºà¶šà¶§ à¶´à·™à¶»"
 
-#: js/oc-dialogs.js:126
-msgid "Choose"
-msgstr "à¶à·à¶»à¶±à·Šà¶±"
+#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
+msgid "Ok"
+msgstr "à·„à¶»à·’"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
 msgid "Cancel"
 msgstr "à¶‘à¶´à·"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "à¶±à·à·„à·"
+#: js/oc-dialogs.js:185
+msgid "Choose"
+msgstr "à¶à·à¶»à¶±à·Šà¶±"
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:215
 msgid "Yes"
 msgstr "à¶”à·€à·Š"
 
-#: js/oc-dialogs.js:180
-msgid "Ok"
-msgstr "à·„à¶»à·’"
+#: js/oc-dialogs.js:222
+msgid "No"
+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:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:582
-#: js/share.js:594
+#: 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 "à¶¯à·à·‚à¶ºà¶šà·Š"
 
@@ -254,127 +253,127 @@ msgstr ""
 msgid "The required file {file} is not installed!"
 msgstr ""
 
-#: js/share.js:29 js/share.js:43 js/share.js:90
+#: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr ""
 
-#: js/share.js:93
+#: js/share.js:90
 msgid "Share"
 msgstr "à¶¶à·™à¶¯à· à·„à¶¯à· à¶œà¶±à·Šà¶±"
 
-#: js/share.js:141 js/share.js:622
+#: js/share.js:125 js/share.js:617
 msgid "Error while sharing"
 msgstr ""
 
-#: js/share.js:152
+#: js/share.js:136
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:159
+#: js/share.js:143
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:168
+#: js/share.js:152
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:170
+#: js/share.js:154
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:175
+#: js/share.js:159
 msgid "Share with"
 msgstr "à¶¶à·™à¶¯à·à¶œà¶±à·Šà¶±"
 
-#: js/share.js:180
+#: js/share.js:164
 msgid "Share with link"
 msgstr "à¶ºà·œà¶¸à·”à·€à¶šà·Š à¶¸à¶Ÿà·’à¶±à·Š à¶¶à·™à¶¯à·à¶œà¶±à·Šà¶±"
 
-#: js/share.js:183
+#: js/share.js:167
 msgid "Password protect"
 msgstr "à¶¸à·”à¶» à¶´à¶¯à¶ºà¶šà·’à¶±à·Š à¶†à¶»à¶šà·Šà·à·à¶šà¶»à¶±à·Šà¶±"
 
-#: js/share.js:185 templates/installation.php:44 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
-msgstr "à¶¸à·”à¶» à¶´à¶¯à¶º "
+msgstr "à¶¸à·”à¶» à¶´à¶¯à¶º"
 
-#: js/share.js:189
+#: js/share.js:173
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:190
+#: js/share.js:174
 msgid "Send"
 msgstr ""
 
-#: js/share.js:194
+#: js/share.js:178
 msgid "Set expiration date"
 msgstr "à¶šà¶½à·Š à¶‰à¶šà·”à¶à·Š à·€à·’à¶¸à·š à¶¯à·’à¶±à¶º à¶¯à¶¸à¶±à·Šà¶±"
 
-#: js/share.js:195
+#: js/share.js:179
 msgid "Expiration date"
 msgstr "à¶šà¶½à·Š à¶‰à¶šà·”à¶à·Š à·€à·’à¶¸à·š à¶¯à·’à¶±à¶º"
 
-#: js/share.js:227
+#: js/share.js:211
 msgid "Share via email:"
 msgstr "à·€à·’à¶¯à·Šâ€à¶ºà·”à¶à·Š à¶à·à¶´à·‘à¶½ à¶¸à¶Ÿà·’à¶±à·Š à¶¶à·™à¶¯à·à¶œà¶±à·Šà¶±: "
 
-#: js/share.js:229
+#: js/share.js:213
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:256
+#: js/share.js:251
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:292
+#: js/share.js:287
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:313
+#: js/share.js:308
 msgid "Unshare"
 msgstr "à¶±à·œà¶¶à·™à¶¯à·”"
 
-#: js/share.js:325
+#: js/share.js:320
 msgid "can edit"
 msgstr "à·ƒà¶‚à·ƒà·Šà¶šà¶»à¶«à¶º à¶šà·… à·„à·à¶š"
 
-#: js/share.js:327
+#: js/share.js:322
 msgid "access control"
 msgstr "à¶´à·Šâ€à¶»à·€à·šà· à¶´à·à¶½à¶±à¶º"
 
-#: js/share.js:330
+#: js/share.js:325
 msgid "create"
 msgstr "à·ƒà¶¯à¶±à·Šà¶±"
 
-#: js/share.js:333
+#: js/share.js:328
 msgid "update"
 msgstr "à¶ºà·à·€à¶à·Šà¶šà·à¶½à·“à¶± à¶šà¶»à¶±à·Šà¶±"
 
-#: js/share.js:336
+#: js/share.js:331
 msgid "delete"
 msgstr "à¶¸à¶šà¶±à·Šà¶±"
 
-#: js/share.js:339
+#: js/share.js:334
 msgid "share"
 msgstr "à¶¶à·™à¶¯à·à·„à¶¯à·à¶œà¶±à·Šà¶±"
 
-#: js/share.js:373 js/share.js:569
+#: js/share.js:368 js/share.js:564
 msgid "Password protected"
 msgstr "à¶¸à·”à¶» à¶´à¶¯à¶ºà¶šà·’à¶±à·Š à¶†à¶»à¶šà·Šà·à·à¶šà¶» à¶‡à¶"
 
-#: js/share.js:582
+#: js/share.js:577
 msgid "Error unsetting expiration date"
 msgstr "à¶šà¶½à·Š à¶‰à¶šà·”à¶à·Š à¶¯à·’à¶±à¶º à¶‰à·€à¶à·Š à¶šà·’à¶»à·“à¶¸à·š à¶¯à·à·‚à¶ºà¶šà·Š"
 
-#: js/share.js:594
+#: js/share.js:589
 msgid "Error setting expiration date"
 msgstr "à¶šà¶½à·Š à¶‰à¶šà·”à¶à·Š à¶¯à·’à¶±à¶º à·ƒà·Šà¶®à·à¶´à¶±à¶º à¶šà·’à¶»à·“à¶¸à·š à¶¯à·à·‚à¶ºà¶šà·Š"
 
-#: js/share.js:609
+#: js/share.js:604
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:620
+#: js/share.js:615
 msgid "Email sent"
 msgstr ""
 
@@ -397,24 +396,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:39
-#: 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 ""
 
@@ -428,7 +430,7 @@ msgstr "à¶´à·’à·€à·’à·ƒà·”à¶¸à·Š à¶´à·’à¶§à·”à·€à¶§"
 
 #: lostpassword/templates/resetpassword.php:8
 msgid "New password"
-msgstr "à¶±à·€ à¶¸à·”à¶» à¶´à¶¯à¶ºà¶šà·Š"
+msgstr "à¶±à·€ à¶¸à·”à¶»à¶´à¶¯à¶º"
 
 #: lostpassword/templates/resetpassword.php:11
 msgid "Reset password"
@@ -468,117 +470,132 @@ msgstr "à¶´à·Šâ€à¶»à¶·à·šà¶¯à¶ºà¶±à·Š à·ƒà¶‚à·ƒà·Šà¶šà¶»à¶«à¶º"
 
 #: templates/edit_categories_dialog.php:16
 msgid "Add"
-msgstr "à¶‘à¶šà·Š à¶šà¶»à¶±à·Šà¶±"
+msgstr "à¶‘à¶šà¶à·” à¶šà¶»à¶±à·Šà¶±"
 
-#: templates/installation.php:23 templates/installation.php:30
+#: 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:25
+#: 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:31
+#: 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:32
+#: 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:36
+#: templates/installation.php:44
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
-#: templates/installation.php:52
+#: templates/installation.php:62
 msgid "Advanced"
 msgstr "à¶¯à·’à¶ºà·”à¶«à·”/à¶‹à·ƒà·ƒà·Š"
 
-#: templates/installation.php:54
+#: templates/installation.php:64
 msgid "Data folder"
 msgstr "à¶¯à¶à·Šà¶ à·†à·à¶½à·Šà¶©à¶»à¶º"
 
-#: templates/installation.php:61
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "à¶¯à¶à·Šà¶ à·ƒà¶¸à·”à¶¯à·à¶º à·„à·à¶©à¶œà·à·ƒà·“à¶¸"
 
-#: templates/installation.php:66 templates/installation.php:77
-#: templates/installation.php:87 templates/installation.php:97
+#: 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:109
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "à¶¯à¶à·Šà¶à¶œà¶¶à¶©à· à¶·à·à·€à·’à¶à·à¶šà¶»à·”"
 
-#: templates/installation.php:113
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "à¶¯à¶à·Šà¶à¶œà¶¶à¶©à·à·€à·š à¶¸à·”à¶»à¶´à¶¯à¶º"
 
-#: templates/installation.php:117
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "à¶¯à¶à·Šà¶à¶œà¶¶à¶©à·à·€à·š à¶±à¶¸"
 
-#: templates/installation.php:125
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:131
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "à¶¯à¶à·Šà¶à¶œà¶¶à¶©à· à·ƒà·šà·€à·à¶¯à·à¶ºà¶šà¶ºà·"
 
-#: templates/installation.php:136
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "à·ƒà·Šà¶®à·à¶´à¶±à¶º à¶šà·’à¶»à·“à¶¸ à¶…à·€à·ƒà¶±à·Š à¶šà¶»à¶±à·Šà¶±"
 
-#: templates/layout.guest.php:33
+#: templates/layout.guest.php:40
 msgid "web services under your control"
 msgstr "à¶”à¶¶à¶§ à¶´à·à¶½à¶±à¶º à¶šà·… à·„à·à¶šà·’ à·€à·™à¶¶à·Š à·ƒà·šà·€à·à·€à¶±à·Š"
 
-#: templates/layout.user.php:48
+#: 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/si_LK/files.po b/l10n/si_LK/files.po
index c745c9d510b3d67fdfd2ed60c0fabcbbffa29333..ba42d3104178d83fd8583b4ae8258849f7e29855 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-03-04 00:06+0100\n"
-"PO-Revision-Date: 2013-03-03 23:06+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10: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"
@@ -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"
@@ -72,59 +66,70 @@ msgstr "à¶à·à¶§à·’à¶œà¶ à¶šà·’à¶»à·“à¶¸ à¶…à·ƒà·à¶»à·Šà¶®à¶šà¶ºà·’"
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:10
+#: 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 ""
 
-#: js/fileactions.js:127 templates/index.php:92 templates/index.php:93
+#: 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/files.js:292 js/files.js:408
-#: js/files.js:439
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "à¶´à·Šâ€à¶»à¶à·’à·ƒà·Šà¶®à·à¶´à¶±à¶º à¶šà¶»à¶±à·Šà¶±"
 
-#: js/filelist.js:251
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "à¶±à¶¸à¶šà·Š à¶ºà·à¶¢à¶±à· à¶šà¶»à¶±à·Šà¶±"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "à¶…à¶à·Š à·„à¶»à·’à¶±à·Šà¶±"
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "undo"
 msgstr "à¶±à·’à·‚à·Šà¶´à·Šâ€à¶»à¶· à¶šà¶»à¶±à·Šà¶±"
 
-#: js/filelist.js:323
+#: 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 ""
@@ -147,80 +152,80 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:225
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:262
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:262
-msgid "Upload Error"
-msgstr "à¶‹à¶©à·”à¶œà¶ à¶šà·’à¶»à·“à¶¸à·š à¶¯à·à·à¶ºà¶šà·Š"
-
-#: js/files.js:273
-msgid "Close"
-msgstr "à·€à·ƒà¶±à·Šà¶±"
-
-#: js/files.js:312
-msgid "1 file uploading"
-msgstr "1 à¶œà·œà¶±à·”à·€à¶šà·Š à¶‹à¶©à¶œà¶ à¶šà·™à¶»à·š"
-
-#: js/files.js:315 js/files.js:370 js/files.js:385
-msgid "{count} files uploading"
+#: js/files.js:277
+msgid "Not enough space available"
 msgstr ""
 
-#: js/files.js:388 js/files.js:423
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "à¶‹à¶©à·”à¶œà¶ à¶šà·’à¶»à·“à¶¸ à¶…à¶à·Š à·„à¶»à·’à¶±à·Šà¶± à¶½à¶¯à·“"
 
-#: js/files.js:497
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "à¶‹à¶©à·”à¶œà¶à¶šà·’à¶»à·“à¶¸à¶šà·Š à·ƒà·’à¶¯à·”à·€à·š. à¶´à·’à¶§à·”à·€ à·„à·à¶» à¶ºà·à¶¸à·™à¶±à·Š à¶‘à¶º à¶±à·à·€à¶à·™à¶±à·” à¶‡à¶"
 
-#: js/files.js:570
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "à¶ºà·œà¶¸à·”à·€ à·„à·’à·ƒà·Š à·€à·’à¶º à¶±à·œà·„à·à¶š"
 
-#: js/files.js:575
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:953 templates/index.php:68
+#: 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:954 templates/index.php:79
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "à¶´à·Šâ€à¶»à¶¸à·à¶«à¶º"
 
-#: js/files.js:955 templates/index.php:81
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "à·€à·™à¶±à·ƒà·Š à¶šà·…"
 
-#: js/files.js:974
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 à·†à·œà¶½à·Šà¶©à¶»à¶ºà¶šà·Š"
 
-#: js/files.js:976
+#: js/files.js:900
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:984
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 à¶œà·œà¶±à·”à·€à¶šà·Š"
 
-#: js/files.js:986
+#: 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"
@@ -270,45 +275,45 @@ msgstr "à·†à·à¶½à·Šà¶©à¶»à¶º"
 msgid "From link"
 msgstr "à¶ºà·œà¶¸à·”à·€à·™à¶±à·Š"
 
-#: templates/index.php:40
+#: templates/index.php:42
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:48
 msgid "Cancel upload"
 msgstr "à¶‹à¶©à·”à¶œà¶ à¶šà·’à¶»à·“à¶¸ à¶…à¶à·Š à·„à¶»à·’à¶±à·Šà¶±"
 
-#: templates/index.php:53
+#: templates/index.php:54
 msgid "You donâ€™t have write permissions here."
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "à¶¸à·™à·„à·’ à¶šà·’à·ƒà·’à·€à¶šà·Š à¶±à·œà¶¸à·à¶. à¶ºà¶¸à¶šà·Š à¶‹à¶©à·”à¶œà¶ à¶šà¶»à¶±à·Šà¶±"
 
-#: templates/index.php:74
+#: templates/index.php:75
 msgid "Download"
-msgstr "à¶¶à·à¶œà¶ à¶šà·’à¶»à·“à¶¸"
+msgstr "à¶¶à·à¶±à·Šà¶±"
 
-#: templates/index.php:86 templates/index.php:87
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "à¶±à·œà¶¶à·™à¶¯à·”"
 
-#: templates/index.php:106
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "à¶‹à¶©à·”à¶œà¶ à¶šà·’à¶»à·“à¶¸ à·€à·’à·à·à¶½ à·€à·à¶©à·’à¶º"
 
-#: templates/index.php:108
+#: 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:113
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "à¶œà·œà¶±à·” à¶´à¶»à·’à¶šà·Šà·‚à· à¶šà·™à¶»à·š. à¶¸à¶³à¶šà·Š à¶»à·à¶³à·“ à·ƒà·’à¶§à·’à¶±à·Šà¶±"
 
-#: templates/index.php:116
+#: 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..4f64e1d7f581ac7841a5605e70c8ece321ccd2ef 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/si_LK/files_external.po b/l10n/si_LK/files_external.po
index 938dfbfadab8ef1f4dd4d23388d7b70b75407edf..170cf71d032295091e0d83f8a289d1322e9258ea 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-01 00:05+0100\n"
-"PO-Revision-Date: 2013-02-27 23:20+0000\n"
+"POT-Creation-Date: 2013-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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: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/si_LK/files_sharing.po b/l10n/si_LK/files_sharing.po
index 6308f9a772fc3f12d7c8f20cb604b88ccf047f1c..e0e7c51d287b62e9d8f7479f5b00c21f48de649a 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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 fd1a2c1ae8c51c9544c189a5f07325e930ef0c63..872a72761b56d8ad7035826b1ae3f02ddba73e83 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-03-08 00:25+0100\n"
-"PO-Revision-Date: 2013-03-07 23:25+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -17,12 +17,12 @@ msgstr ""
 "Language: si_LK\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:40
+#: ajax/delete.php:42
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
 
-#: ajax/undelete.php:41
+#: ajax/undelete.php:42
 #, php-format
 msgid "Couldn't restore %s"
 msgstr ""
@@ -31,6 +31,10 @@ msgstr ""
 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 ""
diff --git a/l10n/si_LK/files_versions.po b/l10n/si_LK/files_versions.po
index 66e6bcb8f644c6f1fc1e129650ebfd149ba9a31b..e25ea0e116c6a348325c1df0b5a7a2af961b7ca6 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:30+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 ea4c6cdb755e2f652abd6e5df913415538540277..992b3a584f988b0d3718d47bb8a9270a8f5a2bbe 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-02-27 14:35+0100\n"
-"PO-Revision-Date: 2013-02-27 13:36+0000\n"
+"POT-Creation-Date: 2013-04-28 01:57+0200\n"
+"PO-Revision-Date: 2013-04-27 23:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -43,19 +41,19 @@ msgstr "à¶ºà·™à¶¯à·”à¶¸à·Š"
 msgid "Admin"
 msgstr "à¶´à¶»à·’à¶´à·à¶½à¶š"
 
-#: files.php:202
+#: files.php:209
 msgid "ZIP download is turned off."
 msgstr "ZIP à¶·à·à¶œà¶ à¶šà·’à¶»à·“à¶¸à·Š à¶…à¶šà·Šâ€à¶»à·’à¶ºà¶ºà·’"
 
-#: files.php:203
+#: files.php:210
 msgid "Files need to be downloaded one by one."
 msgstr "à¶œà·œà¶±à·” à¶‘à¶šà·’à¶±à·Š à¶‘à¶š à¶·à·à¶œà¶ à¶ºà·”à¶à·”à¶ºà·’"
 
-#: files.php:204 files.php:231
+#: files.php:211 files.php:244
 msgid "Back to Files"
 msgstr "à¶œà·œà¶±à·” à·€à·™à¶à¶§ à¶±à·à·€à¶ à¶ºà¶±à·Šà¶±"
 
-#: files.php:228
+#: files.php:241
 msgid "Selected files too large to generate zip file."
 msgstr "à¶à·à¶»à·à¶œà¶à·Š à¶œà·œà¶±à·” ZIP à¶œà·œà¶±à·”à·€à¶šà·Š à¶à·à¶±à·“à¶¸à¶§ à·€à·’à·à·à¶½ à·€à·à¶©à·’à¶º."
 
@@ -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,72 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:128 setup.php:320 setup.php:365
+#: setup.php:132 setup.php:325 setup.php:370
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:129 setup.php:152 setup.php:229
+#: setup.php:133 setup.php:156 setup.php:234
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:151 setup.php:453 setup.php:520
+#: setup.php:155 setup.php:458 setup.php:525
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:228
+#: setup.php:233
 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: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:583 setup.php:592 setup.php:600 setup.php:609
+#: setup.php:615
 #, 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:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
+#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
+#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:299
+#: setup.php:304
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:300
+#: setup.php:305
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:305
+#: setup.php:310
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:306
+#: setup.php:311
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:579 setup.php:611
+#: setup.php:584 setup.php:616
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:631
+#: setup.php:636
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:849
+#: setup.php:858
 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:859
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
@@ -241,19 +235,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 faa4cd05a42a5e0f8688c3fae8c01a4379d8a65d..dcbbfc411ad308e0a36b1bfca7a5f238fabf2a45 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-02-27 14:35+0100\n"
-"PO-Revision-Date: 2013-02-27 13:35+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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"
@@ -95,76 +96,76 @@ msgstr ""
 msgid "Disable"
 msgstr "à¶…à¶šà·Šâ€à¶»à·’à¶º à¶šà¶»à¶±à·Šà¶±"
 
-#: js/apps.js:36 js/apps.js:64
+#: js/apps.js:36 js/apps.js:64 js/apps.js:83
 msgid "Enable"
-msgstr "à¶šà·Šâ€à¶»à·’à¶ºà¶à·Šà¶¸à¶š à¶šà¶»à¶±à·Šà¶±"
+msgstr "à·ƒà¶šà·Šâ€à¶»à·’à¶º à¶šà¶»à¶±à·Šà¶±"
 
 #: js/apps.js:55
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:84
+#: 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:87
+#: js/apps.js:93
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:87
-msgid "Error"
-msgstr "à¶¯à·à·‚à¶ºà¶šà·Š"
-
-#: js/apps.js:90
+#: js/apps.js:96
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr "à·ƒà·”à¶»à·à¶šà·™à¶¸à·’à¶±à·Š à¶´à·€à¶à·“..."
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "deleted"
 msgstr ""
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "undo"
 msgstr "à¶±à·’à·‚à·Šà¶´à·Šâ€à¶»à¶· à¶šà¶»à¶±à·Šà¶±"
 
-#: js/users.js:62
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:75 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
+#: templates/users.php:103
 msgid "Groups"
-msgstr "à·ƒà¶¸à·–à·„à¶º"
+msgstr "à¶šà¶«à·Šà¶©à·à¶ºà¶¸à·Š"
 
-#: js/users.js:78 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr "à¶šà·à¶«à·Šà¶© à¶´à¶»à·’à¶´à·à¶½à¶š"
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
-msgstr "à¶¸à¶šà· à¶¯à¶¸à¶±à·€à·"
+msgstr "à¶¸à¶šà· à¶¯à¶¸à¶±à·Šà¶±"
 
-#: js/users.js:191
+#: js/users.js:269
 msgid "add group"
 msgstr ""
 
-#: js/users.js:352
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:353 js/users.js:359 js/users.js:374
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:358
+#: js/users.js:426
 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,21 +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:230 templates/personal.php:102
+#: templates/admin.php:228
+msgid "Less"
+msgstr "à¶…à¶©à·”"
+
+#: templates/admin.php:235 templates/personal.php:105
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:233 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 "
@@ -394,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:77
 msgid "Password"
-msgstr "à¶¸à·”à¶»à¶´à¶¯à¶º"
+msgstr "à¶¸à·”à¶» à¶´à¶¯à¶º"
 
 #: templates/personal.php:38
 msgid "Your password was changed"
@@ -418,82 +423,70 @@ msgstr "à¶±à·€ à¶¸à·”à¶»à¶´à¶¯à¶º"
 msgid "Change password"
 msgstr "à¶¸à·”à¶»à¶´à¶¯à¶º à·€à·™à¶±à·ƒà·Š à¶šà·’à¶»à·“à¶¸"
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:76
 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:75
 msgid "Login Name"
 msgstr ""
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr "à¶à¶±à¶±à·Šà¶±"
 
-#: templates/users.php:35
+#: templates/users.php:33
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:39 templates/users.php:133
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:57 templates/users.php:148
 msgid "Other"
 msgstr "à·€à·™à¶±à¶à·Š"
 
-#: templates/users.php:84
+#: templates/users.php:82
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:95
+#: templates/users.php:93
 msgid "change display name"
 msgstr ""
 
-#: templates/users.php:99
+#: templates/users.php:97
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:134
+#: templates/users.php:128
 msgid "Default"
 msgstr ""
diff --git a/l10n/si_LK/user_ldap.po b/l10n/si_LK/user_ldap.po
index a08af3b4ceea9407b4264d9e27f2de41d95005e0..76caf1c7709db00255468cea79af8e9493ccbcea 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-02 00:03+0100\n"
-"PO-Revision-Date: 2013-03-01 23:04+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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: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 "SSL à¶…à·€à·à·Šâ€à¶ºà¶º à·€à¶± à·€à·’à¶§ à¶´à¶¸à¶«à¶šà·Š à·„à·à¶», à¶…à¶±à·Š à¶…à·€à·ƒà·Šà¶®à·à·€à¶±à·Šà·„à·’à¶¯à·“ à¶´à·Šâ€à¶»à·œà¶§à·œà¶šà·à¶½à¶º à¶…à¶à·Š à·„à·à¶»à·’à¶º à·„à·à¶š. à¶·à·à·€à·’à¶à· à¶šà¶»à¶± à·€à·’à¶§ ldaps:// à¶½à·™à·ƒ à¶†à¶»à¶¸à·Šà¶· à¶šà¶»à¶±à·Šà¶±"
 
-#: 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 "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 ""
 
-#: 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/si_LK/user_webdavauth.po b/l10n/si_LK/user_webdavauth.po
index a6141d359c90502e160602e73ecdcac30140a92c..cb5a2e879d31b7d6bc8fcdfe96adcd39ed81a1d8 100644
--- a/l10n/si_LK/user_webdavauth.po
+++ b/l10n/si_LK/user_webdavauth.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -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 5986e77ed44fb2cf725af486e3f7b2acad8831e0..267759adeceb26ab009f90c4cc52cdd6db01f93a 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-02-09 00:12+0100\n"
-"PO-Revision-Date: 2013-02-08 23:12+0000\n"
+"POT-Creation-Date: 2013-04-30 01:57+0200\n"
+"PO-Revision-Date: 2013-04-29 23:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
 "MIME-Version: 1.0\n"
@@ -17,24 +17,24 @@ msgstr ""
 "Language: sk\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: ajax/share.php:85
+#: ajax/share.php:97
 #, php-format
 msgid "User %s shared a file with you"
 msgstr ""
 
-#: ajax/share.php:87
+#: ajax/share.php:99
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr ""
 
-#: ajax/share.php:89
+#: 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:91
+#: ajax/share.php:104
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -80,156 +80,156 @@ msgstr ""
 msgid "Error removing %s from favorites."
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:34
 msgid "Sunday"
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:35
 msgid "Monday"
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Tuesday"
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:37
 msgid "Wednesday"
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:38
 msgid "Thursday"
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:39
 msgid "Friday"
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:40
 msgid "Saturday"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:45
 msgid "January"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:46
 msgid "February"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:47
 msgid "March"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:48
 msgid "April"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:49
 msgid "May"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:50
 msgid "June"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:51
 msgid "July"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:52
 msgid "August"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:53
 msgid "September"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:54
 msgid "October"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:55
 msgid "November"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:56
 msgid "December"
 msgstr ""
 
-#: js/js.js:284
+#: js/js.js:286
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:764
+#: js/js.js:718
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:765
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:766
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:767
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:768
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:769
+#: js/js.js:723
 msgid "today"
 msgstr ""
 
-#: js/js.js:770
+#: js/js.js:724
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:771
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:772
+#: js/js.js:726
 msgid "last month"
 msgstr ""
 
-#: js/js.js:773
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:774
+#: js/js.js:728
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:775
+#: js/js.js:729
 msgid "last year"
 msgstr ""
 
-#: js/js.js:776
+#: js/js.js:730
 msgid "years ago"
 msgstr ""
 
-#: js/oc-dialogs.js:126
-msgid "Choose"
+#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
+msgid "Ok"
 msgstr ""
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
 msgid "Cancel"
 msgstr ""
 
-#: js/oc-dialogs.js:162
-msgid "No"
+#: js/oc-dialogs.js:185
+msgid "Choose"
 msgstr ""
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:215
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:180
-msgid "Ok"
+#: js/oc-dialogs.js:222
+msgid "No"
 msgstr ""
 
 #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
@@ -237,9 +237,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:152 js/share.js:159 js/share.js:571
-#: js/share.js:583
+#: 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 ""
 
@@ -251,127 +253,127 @@ msgstr ""
 msgid "The required file {file} is not installed!"
 msgstr ""
 
-#: js/share.js:29 js/share.js:43 js/share.js:90 js/share.js:93
-msgid "Share"
+#: js/share.js:30 js/share.js:45 js/share.js:87
+msgid "Shared"
 msgstr ""
 
-#: js/share.js:29 js/share.js:43 js/share.js:90 js/share.js:93
-msgid "Shared"
+#: js/share.js:90
+msgid "Share"
 msgstr ""
 
-#: js/share.js:141 js/share.js:611
+#: js/share.js:125 js/share.js:617
 msgid "Error while sharing"
 msgstr ""
 
-#: js/share.js:152
+#: js/share.js:136
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:159
+#: js/share.js:143
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:168
+#: js/share.js:152
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:170
+#: js/share.js:154
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:175
+#: js/share.js:159
 msgid "Share with"
 msgstr ""
 
-#: js/share.js:180
+#: js/share.js:164
 msgid "Share with link"
 msgstr ""
 
-#: js/share.js:183
+#: js/share.js:167
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:185 templates/installation.php:44 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr ""
 
-#: js/share.js:189
+#: js/share.js:173
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:190
+#: js/share.js:174
 msgid "Send"
 msgstr ""
 
-#: js/share.js:194
+#: js/share.js:178
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:195
+#: js/share.js:179
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:227
+#: js/share.js:211
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:229
+#: js/share.js:213
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:256
+#: js/share.js:251
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:292
+#: js/share.js:287
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:313
+#: js/share.js:308
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:325
+#: js/share.js:320
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:327
+#: js/share.js:322
 msgid "access control"
 msgstr ""
 
-#: js/share.js:330
+#: js/share.js:325
 msgid "create"
 msgstr ""
 
-#: js/share.js:333
+#: js/share.js:328
 msgid "update"
 msgstr ""
 
-#: js/share.js:336
+#: js/share.js:331
 msgid "delete"
 msgstr ""
 
-#: js/share.js:339
+#: js/share.js:334
 msgid "share"
 msgstr ""
 
-#: js/share.js:373 js/share.js:558
+#: js/share.js:368 js/share.js:564
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:571
+#: js/share.js:577
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:583
+#: js/share.js:589
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:598
+#: js/share.js:604
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:609
+#: js/share.js:615
 msgid "Email sent"
 msgstr ""
 
@@ -386,7 +388,7 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:47
+#: lostpassword/controller.php:48
 msgid "ownCloud password reset"
 msgstr ""
 
@@ -394,24 +396,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:39
-#: 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 ""
 
@@ -467,115 +472,130 @@ msgstr ""
 msgid "Add"
 msgstr ""
 
-#: templates/installation.php:23 templates/installation.php:30
+#: 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:25
+#: 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:31
+#: 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:32
+#: 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:36
+#: templates/installation.php:44
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
-#: templates/installation.php:52
+#: templates/installation.php:62
 msgid "Advanced"
 msgstr ""
 
-#: templates/installation.php:54
+#: templates/installation.php:64
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:61
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:66 templates/installation.php:77
-#: templates/installation.php:87 templates/installation.php:97
+#: 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:109
+#: templates/installation.php:137
 msgid "Database user"
 msgstr ""
 
-#: templates/installation.php:113
+#: templates/installation.php:144
 msgid "Database password"
 msgstr ""
 
-#: templates/installation.php:117
+#: templates/installation.php:149
 msgid "Database name"
 msgstr ""
 
-#: templates/installation.php:125
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:131
+#: templates/installation.php:166
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:136
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr ""
 
-#: templates/layout.guest.php:33
+#: templates/layout.guest.php:40
 msgid "web services under your control"
 msgstr ""
 
-#: templates/layout.user.php:48
+#: 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 dc487bdeeb258e1c097ab3e3c71fc890693b140e..29c0e202761089822737956de93ffce0a3b3aa28 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-03-04 00:06+0100\n"
-"PO-Revision-Date: 2013-03-03 23:06+0000\n"
+"POT-Creation-Date: 2013-05-15 01:59+0200\n"
+"PO-Revision-Date: 2013-05-15 00:00+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
 "MIME-Version: 1.0\n"
@@ -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 ""
@@ -70,59 +66,70 @@ msgstr ""
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:10
+#: 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 ""
 
-#: js/fileactions.js:127 templates/index.php:92 templates/index.php:93
+#: 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/files.js:292 js/files.js:408
-#: js/files.js:439
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:251
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:323
+#: 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 ""
@@ -145,77 +152,77 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:225
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:262
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:262
-msgid "Upload Error"
-msgstr ""
-
-#: js/files.js:273
-msgid "Close"
+#: js/files.js:277
+msgid "Not enough space available"
 msgstr ""
 
-#: js/files.js:312
-msgid "1 file uploading"
-msgstr ""
-
-#: js/files.js:315 js/files.js:370 js/files.js:385
-msgid "{count} files uploading"
-msgstr ""
-
-#: js/files.js:388 js/files.js:423
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:497
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:570
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:575
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:953 templates/index.php:68
+#: 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:954 templates/index.php:79
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr ""
 
-#: js/files.js:955 templates/index.php:81
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:974
+#: js/files.js:898
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:976
+#: js/files.js:900
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:984
+#: js/files.js:908
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:986
+#: 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 ""
@@ -268,45 +275,45 @@ msgstr ""
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:42
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:48
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:53
+#: templates/index.php:54
 msgid "You donâ€™t have write permissions here."
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:74
+#: templates/index.php:75
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:86 templates/index.php:87
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr ""
 
-#: templates/index.php:106
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:108
+#: 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:113
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:116
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr ""
 
diff --git a/l10n/sk/files_encryption.po b/l10n/sk/files_encryption.po
index eb687048cabbdc79857a0ba08158f5a8a2ef1f25..e1bece6b033097e3cf4413f9c72eff1b723508b4 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-04-26 10:00+0200\n"
+"PO-Revision-Date: 2013-04-26 08:01+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_external.po b/l10n/sk/files_external.po
index 685594af3ea5fe4aa1f9cbc87f09f987949e8a62..6addb65af317b3e5d018ad5fe9b3fc2dba055554 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-04-26 10:00+0200\n"
+"PO-Revision-Date: 2013-04-26 08:01+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..934833781424388897df2be59e3729022a02ee2b 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-04-26 10:00+0200\n"
+"PO-Revision-Date: 2013-04-26 08:01+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 39049d7953472c5ff5c098aafb92dce40ad51cb8..d363a222d42a877b80dd7b6b6a903d6e8cdf8347 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-03-08 00:25+0100\n"
-"PO-Revision-Date: 2013-03-07 23:25+0000\n"
+"POT-Creation-Date: 2013-04-26 10:00+0200\n"
+"PO-Revision-Date: 2013-04-26 08:01+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,12 +17,12 @@ msgstr ""
 "Language: sk\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: ajax/delete.php:40
+#: ajax/delete.php:42
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
 
-#: ajax/undelete.php:41
+#: ajax/undelete.php:42
 #, php-format
 msgid "Couldn't restore %s"
 msgstr ""
@@ -31,6 +31,10 @@ msgstr ""
 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 ""
diff --git a/l10n/sk/files_versions.po b/l10n/sk/files_versions.po
index c273fd68fbdc2917eb6b2edc2afdb6c32b0352ce..1a9009a2aeb2d8f796de2a4c22217b56181e6c61 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-04-26 10:00+0200\n"
+"PO-Revision-Date: 2013-04-26 08: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"
@@ -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..50d96efd7798169ebf0bf7c791321afdf79329fa 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-04-28 01:57+0200\n"
+"PO-Revision-Date: 2013-04-27 23:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
 "MIME-Version: 1.0\n"
@@ -41,19 +41,19 @@ msgstr ""
 msgid "Admin"
 msgstr ""
 
-#: files.php:202
+#: files.php:209
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:203
+#: files.php:210
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:204 files.php:231
+#: files.php:211 files.php:244
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:228
+#: files.php:241
 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,72 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:128 setup.php:320 setup.php:365
+#: setup.php:132 setup.php:325 setup.php:370
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:129 setup.php:152 setup.php:229
+#: setup.php:133 setup.php:156 setup.php:234
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:151 setup.php:453 setup.php:520
+#: setup.php:155 setup.php:458 setup.php:525
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:228
+#: setup.php:233
 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: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:583 setup.php:592 setup.php:600 setup.php:609
+#: setup.php:615
 #, 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:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
+#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
+#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:299
+#: setup.php:304
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:300
+#: setup.php:305
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:305
+#: setup.php:310
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:306
+#: setup.php:311
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:579 setup.php:611
+#: setup.php:584 setup.php:616
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:631
+#: setup.php:636
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:849
+#: setup.php:858
 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:859
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
@@ -239,19 +235,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 f2e8a802d76a408e2d05be35c1da481edaa97f24..1c2339b2dc05969f0065116d5bc33e873eadff76 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-02-27 14:35+0100\n"
-"PO-Revision-Date: 2013-02-27 13:35+0000\n"
+"POT-Creation-Date: 2013-04-26 10:00+0200\n"
+"PO-Revision-Date: 2013-04-26 08:00+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
 "MIME-Version: 1.0\n"
@@ -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 ""
 
@@ -92,7 +96,7 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: js/apps.js:36 js/apps.js:64
+#: js/apps.js:36 js/apps.js:64 js/apps.js:83
 msgid "Enable"
 msgstr ""
 
@@ -100,64 +104,64 @@ msgstr ""
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:84
-msgid "Updating...."
+#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+msgid "Error"
 msgstr ""
 
-#: js/apps.js:87
-msgid "Error while updating app"
+#: js/apps.js:90
+msgid "Updating...."
 msgstr ""
 
-#: js/apps.js:87
-msgid "Error"
+#: js/apps.js:93
+msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:90
+#: js/apps.js:96
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:99
+#: js/personal.js:115
 msgid "Saving..."
 msgstr ""
 
-#: js/users.js:30
+#: js/users.js:43
 msgid "deleted"
 msgstr ""
 
-#: js/users.js:30
+#: js/users.js:43
 msgid "undo"
 msgstr ""
 
-#: js/users.js:62
+#: js/users.js:75
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:75 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: templates/users.php:103
 msgid "Groups"
 msgstr ""
 
-#: js/users.js:78 templates/users.php:82 templates/users.php:119
+#: js/users.js:91 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:111 templates/users.php:155
 msgid "Delete"
 msgstr ""
 
-#: js/users.js:191
+#: js/users.js:262
 msgid "add group"
 msgstr ""
 
-#: js/users.js:352
+#: js/users.js:414
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:353 js/users.js:359 js/users.js:374
+#: js/users.js:415 js/users.js:421 js/users.js:436
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:358
+#: js/users.js:420
 msgid "A valid password must be provided"
 msgstr ""
 
@@ -312,15 +316,19 @@ msgstr ""
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:230 templates/personal.php:102
+#: templates/admin.php:228
+msgid "Less"
+msgstr ""
+
+#: templates/admin.php:235 templates/personal.php:100
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:233 templates/personal.php:105
+#: templates/admin.php:238 templates/personal.php:103
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -391,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:77
 msgid "Password"
 msgstr ""
 
@@ -415,82 +423,70 @@ msgstr ""
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:76
 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:84
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:91
+#: templates/personal.php:89
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:93
+#: templates/personal.php:91
 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:75
 msgid "Login Name"
 msgstr ""
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr ""
 
-#: templates/users.php:35
+#: templates/users.php:33
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:39 templates/users.php:133
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:57 templates/users.php:148
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:84
+#: templates/users.php:82
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:95
+#: templates/users.php:93
 msgid "change display name"
 msgstr ""
 
-#: templates/users.php:99
+#: templates/users.php:97
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:134
+#: templates/users.php:128
 msgid "Default"
 msgstr ""
diff --git a/l10n/sk/user_ldap.po b/l10n/sk/user_ldap.po
index a22107c718ce8de2310f3769d1bac920a21f2892..7e555cc8df96b9e9b626a15709fe794256d705ea 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-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-17 00:04+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..4a5a83a1eaba6d652657daf7595895802700ad64 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-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+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 f190736828ffbc22cab89fad3a989019b614f753..0d1e882f635004c247b9190f8a68017ab1c2fc5b 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-03-04 00:06+0100\n"
-"PO-Revision-Date: 2013-03-03 14:40+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10: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"
@@ -167,86 +161,88 @@ msgstr "December"
 msgid "Settings"
 msgstr "Nastavenia"
 
-#: js/js.js:777
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "pred sekundami"
 
-#: js/js.js:778
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "pred minÃºtou"
 
-#: js/js.js:779
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr "pred {minutes} minÃºtami"
 
-#: js/js.js:780
+#: js/js.js:721
 msgid "1 hour ago"
-msgstr "Pred 1 hodinou."
+msgstr "Pred 1 hodinou"
 
-#: js/js.js:781
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr "Pred {hours} hodinami."
 
-#: js/js.js:782
+#: js/js.js:723
 msgid "today"
 msgstr "dnes"
 
-#: js/js.js:783
+#: js/js.js:724
 msgid "yesterday"
 msgstr "vÄera"
 
-#: js/js.js:784
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr "pred {days} dÅˆami"
 
-#: js/js.js:785
+#: js/js.js:726
 msgid "last month"
 msgstr "minulÃ½ mesiac"
 
-#: js/js.js:786
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr "Pred {months} mesiacmi."
 
-#: js/js.js:787
+#: js/js.js:728
 msgid "months ago"
 msgstr "pred mesiacmi"
 
-#: js/js.js:788
+#: js/js.js:729
 msgid "last year"
 msgstr "minulÃ½ rok"
 
-#: js/js.js:789
+#: js/js.js:730
 msgid "years ago"
 msgstr "pred rokmi"
 
-#: js/oc-dialogs.js:126
-msgid "Choose"
-msgstr "VÃ½ber"
+#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
+msgid "Ok"
+msgstr "Ok"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
 msgid "Cancel"
 msgstr "ZruÅ¡iÅ¥"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "Nie"
+#: js/oc-dialogs.js:185
+msgid "Choose"
+msgstr "VÃ½ber"
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:215
 msgid "Yes"
 msgstr "Ãno"
 
-#: js/oc-dialogs.js:180
-msgid "Ok"
-msgstr "Ok"
+#: js/oc-dialogs.js:222
+msgid "No"
+msgstr "Nie"
 
 #: 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 "NeÅ¡pecifikovanÃ½ typ objektu."
 
-#: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:582
-#: js/share.js:594
+#: 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 "Chyba"
 
@@ -258,127 +254,127 @@ msgstr "NeÅ¡pecifikovanÃ© meno aplikÃ¡cie."
 msgid "The required file {file} is not installed!"
 msgstr "PoÅ¾adovanÃ½ sÃºbor {file} nie je nainÅ¡talovanÃ½!"
 
-#: js/share.js:29 js/share.js:43 js/share.js:90
+#: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr "ZdieÄ¾anÃ©"
 
-#: js/share.js:93
+#: js/share.js:90
 msgid "Share"
 msgstr "ZdieÄ¾aÅ¥"
 
-#: js/share.js:141 js/share.js:622
+#: js/share.js:125 js/share.js:617
 msgid "Error while sharing"
 msgstr "Chyba poÄas zdieÄ¾ania"
 
-#: js/share.js:152
+#: js/share.js:136
 msgid "Error while unsharing"
 msgstr "Chyba poÄas ukonÄenia zdieÄ¾ania"
 
-#: js/share.js:159
+#: js/share.js:143
 msgid "Error while changing permissions"
 msgstr "Chyba poÄas zmeny oprÃ¡vnenÃ"
 
-#: js/share.js:168
+#: js/share.js:152
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "ZdieÄ¾anÃ© s vami a so skupinou {group} pouÅ¾ÃvateÄ¾om {owner}"
 
-#: js/share.js:170
+#: js/share.js:154
 msgid "Shared with you by {owner}"
 msgstr "ZdieÄ¾anÃ© s vami pouÅ¾ÃvateÄ¾om {owner}"
 
-#: js/share.js:175
+#: js/share.js:159
 msgid "Share with"
 msgstr "ZdieÄ¾aÅ¥ s"
 
-#: js/share.js:180
+#: js/share.js:164
 msgid "Share with link"
 msgstr "ZdieÄ¾aÅ¥ cez odkaz"
 
-#: js/share.js:183
+#: js/share.js:167
 msgid "Password protect"
 msgstr "ChrÃ¡niÅ¥ heslom"
 
-#: js/share.js:185 templates/installation.php:47 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Heslo"
 
-#: js/share.js:189
+#: js/share.js:173
 msgid "Email link to person"
 msgstr "OdoslaÅ¥ odkaz emailom"
 
-#: js/share.js:190
+#: js/share.js:174
 msgid "Send"
 msgstr "OdoslaÅ¥"
 
-#: js/share.js:194
+#: js/share.js:178
 msgid "Set expiration date"
 msgstr "NastaviÅ¥ dÃ¡tum expirÃ¡cie"
 
-#: js/share.js:195
+#: js/share.js:179
 msgid "Expiration date"
 msgstr "DÃ¡tum expirÃ¡cie"
 
-#: js/share.js:227
+#: js/share.js:211
 msgid "Share via email:"
 msgstr "ZdieÄ¾aÅ¥ cez e-mail:"
 
-#: js/share.js:229
+#: js/share.js:213
 msgid "No people found"
 msgstr "PouÅ¾ÃvateÄ¾ nenÃ¡jdenÃ½"
 
-#: js/share.js:256
+#: js/share.js:251
 msgid "Resharing is not allowed"
 msgstr "ZdieÄ¾anie uÅ¾ zdieÄ¾anej poloÅ¾ky nie je povolenÃ©"
 
-#: js/share.js:292
+#: js/share.js:287
 msgid "Shared in {item} with {user}"
 msgstr "ZdieÄ¾anÃ© v {item} s {user}"
 
-#: js/share.js:313
+#: js/share.js:308
 msgid "Unshare"
 msgstr "ZruÅ¡iÅ¥ zdieÄ¾anie"
 
-#: js/share.js:325
+#: js/share.js:320
 msgid "can edit"
 msgstr "mÃ´Å¾e upraviÅ¥"
 
-#: js/share.js:327
+#: js/share.js:322
 msgid "access control"
 msgstr "prÃstupovÃ© prÃ¡va"
 
-#: js/share.js:330
+#: js/share.js:325
 msgid "create"
 msgstr "vytvoriÅ¥"
 
-#: js/share.js:333
+#: js/share.js:328
 msgid "update"
 msgstr "aktualizovaÅ¥"
 
-#: js/share.js:336
+#: js/share.js:331
 msgid "delete"
 msgstr "vymazaÅ¥"
 
-#: js/share.js:339
+#: js/share.js:334
 msgid "share"
 msgstr "zdieÄ¾aÅ¥"
 
-#: js/share.js:373 js/share.js:569
+#: js/share.js:368 js/share.js:564
 msgid "Password protected"
 msgstr "ChrÃ¡nenÃ© heslom"
 
-#: js/share.js:582
+#: js/share.js:577
 msgid "Error unsetting expiration date"
 msgstr "Chyba pri odstraÅˆovanÃ dÃ¡tumu expirÃ¡cie"
 
-#: js/share.js:594
+#: js/share.js:589
 msgid "Error setting expiration date"
 msgstr "Chyba pri nastavenÃ dÃ¡tumu expirÃ¡cie"
 
-#: js/share.js:609
+#: js/share.js:604
 msgid "Sending ..."
 msgstr "Odosielam ..."
 
-#: js/share.js:620
+#: js/share.js:615
 msgid "Email sent"
 msgstr "Email odoslanÃ½"
 
@@ -401,24 +397,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:41
-#: 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"
 
@@ -452,7 +451,7 @@ msgstr "AplikÃ¡cie"
 
 #: strings.php:8
 msgid "Admin"
-msgstr "AdministrÃ¡cia"
+msgstr "AdministrÃ¡tor"
 
 #: strings.php:9
 msgid "Help"
@@ -468,122 +467,136 @@ 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"
 msgstr "PridaÅ¥"
 
 #: templates/installation.php:24 templates/installation.php:31
+#: templates/installation.php:38
 msgid "Security Warning"
 msgstr "BezpeÄnostnÃ© varovanie"
 
 #: templates/installation.php:25
+msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
+msgstr "Verzia VÃ¡Å¡ho PHP je napadnuteÄ¾nÃ¡ pomocou techniky \"NULL Byte\" (CVE-2006-7243)"
+
+#: templates/installation.php:26
+msgid "Please update your PHP installation to use ownCloud securely."
+msgstr "Aktualizujte prosÃm VaÅ¡u inÅ¡tanciu PHP pre bezpeÄnÃ© pouÅ¾Ãvanie ownCloud."
+
+#: templates/installation.php:32
 msgid ""
 "No secure random number generator is available, please enable the PHP "
 "OpenSSL extension."
 msgstr "Nie je dostupnÃ½ Å¾iadny bezpeÄnÃ½ generÃ¡tor nÃ¡hodnÃ½ch ÄÃsel, prosÃm, povoÄ¾te rozÅ¡Ãrenie OpenSSL v PHP."
 
-#: 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 "Bez bezpeÄnÃ©ho generÃ¡tora nÃ¡hodnÃ½ch ÄÃsel mÃ´Å¾e ÃºtoÄnÃk predpovedaÅ¥ token pre obnovu hesla a prevziaÅ¥ kontrolu nad vaÅ¡Ãm kontom."
 
-#: 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 "VÃ¡Å¡ prieÄinok s dÃ¡tami a sÃºbormi je dostupnÃ½ z internetu, lebo sÃºbor .htaccess nefunguje."
 
-#: templates/installation.php:33
+#: 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 "Pre informÃ¡cie, ako sprÃ¡vne nastaviÅ¥ VÃ¡Å¡ server sa pozrite do <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">dokumentÃ¡cie</a>."
 
-#: templates/installation.php:37
+#: templates/installation.php:44
 msgid "Create an <strong>admin account</strong>"
 msgstr "VytvoriÅ¥ <strong>administrÃ¡torskÃ½ ÃºÄet</strong>"
 
-#: templates/installation.php:55
+#: templates/installation.php:62
 msgid "Advanced"
 msgstr "RozÅ¡ÃrenÃ©"
 
-#: templates/installation.php:57
+#: templates/installation.php:64
 msgid "Data folder"
 msgstr "PrieÄinok dÃ¡t"
 
-#: templates/installation.php:66
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "NastaviÅ¥ databÃ¡zu"
 
-#: templates/installation.php:71 templates/installation.php:83
-#: templates/installation.php:94 templates/installation.php:105
-#: templates/installation.php:117
+#: 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:129
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "HostiteÄ¾ databÃ¡zy"
 
-#: templates/installation.php:134
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "Heslo databÃ¡zy"
 
-#: templates/installation.php:139
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "Meno databÃ¡zy"
 
-#: templates/installation.php:149
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "TabuÄ¾kovÃ½ priestor databÃ¡zy"
 
-#: templates/installation.php:156
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "Server databÃ¡zy"
 
-#: templates/installation.php:162
+#: 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:36
+#, 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:61
 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 f810df29b21c87c9bf16a8f7d5399bbd3124cd8a..09050750255ea861603e1595525e0cf8fc433ce2 100644
--- a/l10n/sk_SK/files.po
+++ b/l10n/sk_SK/files.po
@@ -3,18 +3,12 @@
 # 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.
-# Roman Priesol <roman@priesol.net>, 2012.
-#   <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-03-04 00:06+0100\n"
-"PO-Revision-Date: 2013-03-03 23:06+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10: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"
@@ -33,10 +27,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"
@@ -54,19 +44,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"
@@ -76,59 +66,70 @@ msgstr "ZÃ¡pis na disk sa nepodaril"
 msgid "Not enough storage available"
 msgstr "Nedostatok dostupnÃ©ho ÃºloÅ¾nÃ©ho priestoru"
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr "NeplatnÃ½ prieÄinok"
 
-#: appinfo/app.php:10
+#: appinfo/app.php:12
 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:92 templates/index.php:93
+#: 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/files.js:292 js/files.js:408
-#: js/files.js:439
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
-msgstr "ÄŒakÃ¡ sa"
+msgstr "Prebieha"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} uÅ¾ existuje"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "nahradiÅ¥"
 
-#: js/filelist.js:251
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "pomÃ´cÅ¥ s menom"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "zruÅ¡iÅ¥"
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "prepÃsanÃ½ {new_name} sÃºborom {old_name}"
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "undo"
 msgstr "vrÃ¡tiÅ¥"
 
-#: js/filelist.js:323
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr "vykonaÅ¥ zmazanie"
 
+#: js/filelist.js:413
+msgid "1 file uploading"
+msgstr "1 sÃºbor sa posiela "
+
+#: js/filelist.js:416 js/filelist.js:470
+msgid "files uploading"
+msgstr "nahrÃ¡vanie sÃºborov"
+
 #: js/files.js:52
 msgid "'.' is an invalid file name."
 msgstr "'.' je neplatnÃ© meno sÃºboru."
@@ -151,77 +152,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:225
+#: 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:262
+#: 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:262
-msgid "Upload Error"
-msgstr "Chyba odosielania"
+#: js/files.js:277
+msgid "Not enough space available"
+msgstr "Nie je k dispozÃcii dostatok miesta"
 
-#: js/files.js:273
-msgid "Close"
-msgstr "ZavrieÅ¥"
-
-#: js/files.js:312
-msgid "1 file uploading"
-msgstr "1 sÃºbor sa posiela "
-
-#: js/files.js:315 js/files.js:370 js/files.js:385
-msgid "{count} files uploading"
-msgstr "{count} sÃºborov odosielanÃ½ch"
-
-#: js/files.js:388 js/files.js:423
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "Odosielanie zruÅ¡enÃ©"
 
-#: js/files.js:497
+#: 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:570
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "URL nemÃ´Å¾e byÅ¥ prÃ¡zdne"
 
-#: js/files.js:575
+#: 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:953 templates/index.php:68
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+msgid "Error"
+msgstr "Chyba"
+
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
-msgstr "Meno"
+msgstr "NÃ¡zov"
 
-#: js/files.js:954 templates/index.php:79
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "VeÄ¾kosÅ¥"
 
-#: js/files.js:955 templates/index.php:81
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "UpravenÃ©"
 
-#: js/files.js:974
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 prieÄinok"
 
-#: js/files.js:976
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} prieÄinkov"
 
-#: js/files.js:984
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 sÃºbor"
 
-#: js/files.js:986
+#: 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 ""
+
+#: 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 +261,7 @@ msgstr "UloÅ¾iÅ¥"
 
 #: templates/index.php:7
 msgid "New"
-msgstr "NovÃ½"
+msgstr "NovÃ¡"
 
 #: templates/index.php:10
 msgid "Text file"
@@ -274,45 +275,45 @@ msgstr "PrieÄinok"
 msgid "From link"
 msgstr "Z odkazu"
 
-#: templates/index.php:40
+#: templates/index.php:42
 msgid "Deleted files"
 msgstr "ZmazanÃ© sÃºbory"
 
-#: templates/index.php:46
+#: templates/index.php:48
 msgid "Cancel upload"
 msgstr "ZruÅ¡iÅ¥ odosielanie"
 
-#: templates/index.php:53
+#: templates/index.php:54
 msgid "You donâ€™t have write permissions here."
 msgstr "NemÃ¡te oprÃ¡vnenie na zÃ¡pis."
 
-#: templates/index.php:60
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Å½iadny sÃºbor. Nahrajte nieÄo!"
 
-#: templates/index.php:74
+#: templates/index.php:75
 msgid "Download"
-msgstr "StiahnuÅ¥"
+msgstr "SÅ¥ahovanie"
 
-#: templates/index.php:86 templates/index.php:87
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
-msgstr "NezdielaÅ¥"
+msgstr "ZruÅ¡iÅ¥ zdieÄ¾anie"
 
-#: templates/index.php:106
+#: 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:108
+#: 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:113
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "ÄŒakajte, sÃºbory sÃº prehÄ¾adÃ¡vanÃ©."
 
-#: templates/index.php:116
+#: 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..3c5194e64cb5874955e1345eaaa2800158f96938 100644
--- a/l10n/sk_SK/files_encryption.po
+++ b/l10n/sk_SK/files_encryption.po
@@ -3,16 +3,13 @@
 # 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.
 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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"
@@ -38,4 +35,4 @@ msgstr "NeÅ¡ifrovaÅ¥ uvedenÃ© typy sÃºborov"
 
 #: templates/settings.php:12
 msgid "None"
-msgstr "Å½iadne"
+msgstr "Å½iadny"
diff --git a/l10n/sk_SK/files_external.po b/l10n/sk_SK/files_external.po
index 9e8b7b49330f996493d472eca94ce897105caa9e..fdd045ce137d4bb13be40eb36300e0717ee22d5b 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-01 00:05+0100\n"
-"PO-Revision-Date: 2013-02-28 15:20+0000\n"
+"POT-Creation-Date: 2013-04-29 01:58+0200\n"
+"PO-Revision-Date: 2013-04-28 19:00+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: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 "<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: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 "<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..4dbc07b1aca7cbb25bea48952be88edbde60483c 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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 9e51dd8cd252d50f658f93c3fd2631a39fc4e86a..2ae6687e6948b651b0c0de725bfe4b003d6aeaf0 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-03-08 00:25+0100\n"
-"PO-Revision-Date: 2013-03-07 23:25+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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"
@@ -19,12 +17,12 @@ msgstr ""
 "Language: sk_SK\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: ajax/delete.php:40
+#: ajax/delete.php:42
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "NemoÅ¾no zmazaÅ¥ %s navÅ¾dy"
 
-#: ajax/undelete.php:41
+#: ajax/undelete.php:42
 #, php-format
 msgid "Couldn't restore %s"
 msgstr "NemoÅ¾no obnoviÅ¥ %s"
@@ -33,6 +31,10 @@ msgstr "NemoÅ¾no obnoviÅ¥ %s"
 msgid "perform restore operation"
 msgstr "vykonaÅ¥ obnovu"
 
+#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+msgid "Error"
+msgstr "Chyba"
+
 #: js/trash.js:34
 msgid "delete file permanently"
 msgstr "trvalo zmazaÅ¥ sÃºbor"
@@ -43,7 +45,7 @@ msgstr "ZmazaÅ¥  trvalo"
 
 #: js/trash.js:174 templates/index.php:17
 msgid "Name"
-msgstr "Meno"
+msgstr "NÃ¡zov"
 
 #: js/trash.js:175 templates/index.php:27
 msgid "Deleted"
@@ -79,4 +81,4 @@ msgstr "ZmazaÅ¥"
 
 #: templates/part.breadcrumb.php:9
 msgid "Deleted Files"
-msgstr ""
+msgstr "ZmazanÃ© sÃºbory"
diff --git a/l10n/sk_SK/files_versions.po b/l10n/sk_SK/files_versions.po
index 0face773183b617945fb1fc726a3de8a9641e913..e7044592ad5d67ec33daf6d422111f5ccaf048d1 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:30+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 2c5e5a1c881b4e8f696836b4a54d33ef1643da68..2db5eafdca7583e5953b7dfe26935173e23a9599 100644
--- a/l10n/sk_SK/lib.po
+++ b/l10n/sk_SK/lib.po
@@ -3,17 +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.
 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:10+0000\n"
-"Last-Translator: mhh <marian.hvolka@stuba.sk>\n"
+"POT-Creation-Date: 2013-04-28 01:57+0200\n"
+"PO-Revision-Date: 2013-04-27 23:57+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"
@@ -45,19 +41,19 @@ msgstr "AplikÃ¡cie"
 msgid "Admin"
 msgstr "AdministrÃ¡tor"
 
-#: files.php:202
+#: files.php:209
 msgid "ZIP download is turned off."
 msgstr "SÅ¥ahovanie sÃºborov ZIP je vypnutÃ©."
 
-#: files.php:203
+#: files.php:210
 msgid "Files need to be downloaded one by one."
 msgstr "SÃºbory musia byÅ¥ nahrÃ¡vanÃ© jeden za druhÃ½m."
 
-#: files.php:204 files.php:231
+#: files.php:211 files.php:244
 msgid "Back to Files"
 msgstr "SpÃ¤Å¥ na sÃºbory"
 
-#: files.php:228
+#: files.php:241
 msgid "Selected files too large to generate zip file."
 msgstr "ZvolenÃ© sÃºbory sÃº prÃliÅ¡ veÄ¾kÃ© na vygenerovanie zip sÃºboru."
 
@@ -97,10 +93,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 +113,72 @@ 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:128 setup.php:320 setup.php:365
+#: setup.php:132 setup.php:325 setup.php:370
 msgid "PostgreSQL username and/or password not valid"
 msgstr "PouÅ¾ÃvateÄ¾skÃ© meno a/alebo heslo pre PostgreSQL databÃ¡zu je neplatnÃ©"
 
-#: setup.php:129 setup.php:152 setup.php:229
+#: setup.php:133 setup.php:156 setup.php:234
 msgid "You need to enter either an existing account or the administrator."
 msgstr "MusÃte zadaÅ¥ jestvujÃºci ÃºÄet alebo administrÃ¡tora."
 
-#: setup.php:151 setup.php:453 setup.php:520
+#: setup.php:155 setup.php:458 setup.php:525
 msgid "Oracle username and/or password not valid"
 msgstr "PouÅ¾ÃvateÄ¾skÃ© meno a/alebo heslo pre Oracle databÃ¡zu je neplatnÃ©"
 
-#: setup.php:228
+#: setup.php:233
 msgid "MySQL username and/or password not valid"
 msgstr "PouÅ¾ÃvateÄ¾skÃ© meno a/alebo heslo pre MySQL databÃ¡zu je neplatnÃ©"
 
-#: 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: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:583 setup.php:592 setup.php:600 setup.php:609
+#: setup.php:615
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Chyba DB: \"%s\""
 
-#: 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:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
+#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
+#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "PodozrivÃ½ prÃkaz bol: \"%s\""
 
-#: setup.php:299
+#: setup.php:304
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "PouÅ¾ÃvateÄ¾ '%s'@'localhost' uÅ¾ v MySQL existuje."
 
-#: setup.php:300
+#: setup.php:305
 msgid "Drop this user from MySQL"
 msgstr "ZahodiÅ¥ pouÅ¾ÃvateÄ¾a z MySQL."
 
-#: setup.php:305
+#: setup.php:310
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "PouÅ¾ÃvateÄ¾ '%s'@'%%' uÅ¾ v MySQL existuje"
 
-#: setup.php:306
+#: setup.php:311
 msgid "Drop this user from MySQL."
 msgstr "ZahodiÅ¥ pouÅ¾ÃvateÄ¾a z MySQL."
 
-#: setup.php:579 setup.php:611
+#: setup.php:584 setup.php:616
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "PodozrivÃ½ prÃkaz bol: \"%s\", meno: %s, heslo: %s"
 
-#: setup.php:631
+#: setup.php:636
 #, 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:849
+#: setup.php:858
 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:850
+#: setup.php:859
 #, 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 +189,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 +235,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 0d12e6c1d74d0f457fb148b9924f445b2ca5d82b..a440dde63960baa85cf3da0856af7d63eca8c1a4 100644
--- a/l10n/sk_SK/settings.po
+++ b/l10n/sk_SK/settings.po
@@ -3,18 +3,13 @@
 # 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-03-01 00:05+0100\n"
-"PO-Revision-Date: 2013-02-28 15:10+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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"
@@ -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"
 
@@ -98,76 +97,76 @@ msgstr "AktualizovaÅ¥ na {appversion}"
 msgid "Disable"
 msgstr "ZakÃ¡zaÅ¥"
 
-#: js/apps.js:36 js/apps.js:64
+#: 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...."
 msgstr "ÄŒakajte prosÃm..."
 
-#: js/apps.js:84
+#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+msgid "Error"
+msgstr "Chyba"
+
+#: js/apps.js:90
 msgid "Updating...."
 msgstr "Aktualizujem..."
 
-#: js/apps.js:87
+#: js/apps.js:93
 msgid "Error while updating app"
 msgstr "chyba pri aktualizÃ¡cii aplikÃ¡cie"
 
-#: js/apps.js:87
-msgid "Error"
-msgstr "Chyba"
-
-#: js/apps.js:90
+#: js/apps.js:96
 msgid "Updated"
 msgstr "AktualizovanÃ©"
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr "UkladÃ¡m..."
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "deleted"
 msgstr "zmazanÃ©"
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "undo"
 msgstr "vrÃ¡tiÅ¥"
 
-#: js/users.js:62
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr "NemoÅ¾no odobraÅ¥ pouÅ¾ÃvateÄ¾a"
 
-#: js/users.js:75 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
+#: templates/users.php:103
 msgid "Groups"
 msgstr "Skupiny"
 
-#: js/users.js:78 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr "SprÃ¡vca skupiny"
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
-msgstr "OdstrÃ¡niÅ¥"
+msgstr "ZmazaÅ¥"
 
-#: js/users.js:191
+#: js/users.js:269
 msgid "add group"
 msgstr "pridaÅ¥ skupinu"
 
-#: js/users.js:352
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr "MusÃte zadaÅ¥ platnÃ© pouÅ¾ÃvateÄ¾skÃ© meno"
 
-#: js/users.js:353 js/users.js:359 js/users.js:374
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr "Chyba pri vytvÃ¡ranÃ pouÅ¾ÃvateÄ¾a"
 
-#: js/users.js:358
+#: js/users.js:426
 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,15 +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:230 templates/personal.php:102
+#: templates/admin.php:228
+msgid "Less"
+msgstr "Menej"
+
+#: templates/admin.php:235 templates/personal.php:105
 msgid "Version"
 msgstr "Verzia"
 
-#: templates/admin.php:233 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 "
@@ -397,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:77
 msgid "Password"
 msgstr "Heslo"
 
@@ -421,82 +424,70 @@ msgstr "NovÃ© heslo"
 msgid "Change password"
 msgstr "ZmeniÅ¥ heslo"
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:76
 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:68
 msgid "Email"
 msgstr "Email"
 
-#: templates/personal.php:72
+#: templates/personal.php:70
 msgid "Your email address"
 msgstr "VaÅ¡a emailovÃ¡ adresa"
 
-#: templates/personal.php:73
+#: templates/personal.php:71
 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:77 templates/personal.php:78
 msgid "Language"
 msgstr "Jazyk"
 
-#: templates/personal.php:86
+#: templates/personal.php:89
 msgid "Help translate"
 msgstr "PomÃ´cÅ¥ s prekladom"
 
-#: templates/personal.php:91
+#: templates/personal.php:94
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:93
+#: templates/personal.php:96
 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:75
 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:33
 msgid "Default Storage"
 msgstr "PredvolenÃ© ÃºloÅ¾isko"
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:39 templates/users.php:133
 msgid "Unlimited"
 msgstr "NelimitovanÃ©"
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:57 templates/users.php:148
 msgid "Other"
 msgstr "InÃ©"
 
-#: templates/users.php:84
+#: templates/users.php:82
 msgid "Storage"
 msgstr "ÃšloÅ¾isko"
 
-#: templates/users.php:95
+#: templates/users.php:93
 msgid "change display name"
 msgstr "zmeniÅ¥ zobrazovanÃ© meno"
 
-#: templates/users.php:99
+#: templates/users.php:97
 msgid "set new password"
 msgstr "nastaviÅ¥ novÃ© heslo"
 
-#: templates/users.php:134
+#: templates/users.php:128
 msgid "Default"
 msgstr "PredvolenÃ©"
diff --git a/l10n/sk_SK/user_ldap.po b/l10n/sk_SK/user_ldap.po
index e8ae844a7394e6bad263cee2db0fd41d745675b0..740f7040fb90395bf16d5a90020ebdd695cab756 100644
--- a/l10n/sk_SK/user_ldap.po
+++ b/l10n/sk_SK/user_ldap.po
@@ -3,15 +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.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-04 00:06+0100\n"
-"PO-Revision-Date: 2013-03-03 14:10+0000\n"
-"Last-Translator: mhh <marian.hvolka@stuba.sk>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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"
@@ -19,6 +17,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 ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr "Zlyhalo zmazanie nastavenia servera."
@@ -55,281 +57,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 ""
+
+#: 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:18
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr "PridaÅ¥ nastavenia servera."
 
-#: templates/settings.php:23
+#: templates/settings.php:37
 msgid "Host"
 msgstr "HostiteÄ¾"
 
-#: templates/settings.php:25
+#: 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:26
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "ZÃ¡kladnÃ© DN"
 
-#: templates/settings.php:27
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr "Jedno zÃ¡kladnÃ© DN na riadok"
 
-#: templates/settings.php:28
+#: 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:30
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "PouÅ¾ÃvateÄ¾skÃ© DN"
 
-#: 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 "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:33
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Heslo"
 
-#: templates/settings.php:36
+#: 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:37
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "Filter prihlÃ¡senia pouÅ¾ÃvateÄ¾ov"
 
-#: 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 "UrÄuje pouÅ¾itÃ½ filter, pri pokuse o prihlÃ¡senie. %%uid nahradzuje pouÅ¾ÃvateÄ¾skÃ© meno v Äinnosti prihlÃ¡senia."
 
-#: templates/settings.php:41
+#: 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:42
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Filter zoznamov pouÅ¾ÃvateÄ¾ov"
 
-#: templates/settings.php:45
+#: 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:46
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "bez zÃ¡stupnÃ½ch znakov, napr. \"objectClass=person\""
 
-#: templates/settings.php:47
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "Filter skupiny"
 
-#: templates/settings.php:50
+#: 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:51
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "bez zÃ¡stupnÃ½ch znakov, napr. \"objectClass=posixGroup\""
 
-#: templates/settings.php:55
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr "Nastavenie pripojenia"
 
-#: templates/settings.php:57
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr "Nastavenia sÃº aktÃvne "
 
-#: templates/settings.php:57
+#: 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:58
+#: templates/settings.php:72
 msgid "Port"
 msgstr "Port"
 
-#: templates/settings.php:59
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr "ZÃ¡loÅ¾nÃ½ server (kÃ³pia) hosÅ¥"
 
-#: 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 "Zadajte zÃ¡loÅ¾nÃ½ LDAP/AD. MusÃ to byÅ¥ kÃ³pia hlavnÃ©ho LDAP/AD servera."
 
-#: templates/settings.php:60
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr "ZÃ¡loÅ¾nÃ½ server (kÃ³pia) port"
 
-#: templates/settings.php:61
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr "ZakÃ¡zaÅ¥ hlavnÃ½ server"
 
-#: templates/settings.php:61
+#: 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:62
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "PouÅ¾i TLS"
 
-#: templates/settings.php:62
+#: 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:63
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "LDAP server nerozliÅ¡uje veÄ¾kosÅ¥ znakov (Windows)"
 
-#: templates/settings.php:64
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "VypnÃºÅ¥ overovanie SSL certifikÃ¡tu."
 
-#: 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 "Ak pripojenie pracuje len s touto moÅ¾nosÅ¥ou, tak importujte SSL certifikÃ¡t LDAP serveru do vÃ¡Å¡ho servera ownCloud."
 
-#: templates/settings.php:64
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "Nie je doporuÄovanÃ©, len pre testovacie ÃºÄely."
 
-#: templates/settings.php:65
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr "Å½ivotnosÅ¥ objektov v cache"
 
-#: templates/settings.php:65
+#: 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:67
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr "Nastavenie prieÄinka"
 
-#: templates/settings.php:69
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr "Pole pre zobrazenia mena pouÅ¾ÃvateÄ¾a"
 
-#: templates/settings.php:69
+#: 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:70
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "ZÃ¡kladnÃ½ pouÅ¾ÃvateÄ¾skÃ½ strom"
 
-#: templates/settings.php:70
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr "Jedna pouÅ¾ÃvateÄ¾skÃ¡ zÃ¡kladnÃ¡ DN na riadok"
 
-#: templates/settings.php:71
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr "AtribÃºty vyhÄ¾adÃ¡vania pouÅ¾ÃvateÄ¾ov"
 
-#: templates/settings.php:71 templates/settings.php:74
+#: 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:72
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr "Pole pre zobrazenie mena skupiny"
 
-#: templates/settings.php:72
+#: 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:73
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "ZÃ¡kladnÃ½ skupinovÃ½ strom"
 
-#: templates/settings.php:73
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr "Jedna skupinovÃ¡ zÃ¡kladnÃ¡ DN na riadok"
 
-#: templates/settings.php:74
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr "AtribÃºty vyhÄ¾adÃ¡vania skupÃn"
 
-#: templates/settings.php:75
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr "Priradenie Älena skupiny"
 
-#: templates/settings.php:77
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr "Å peciÃ¡lne atribÃºty"
 
-#: templates/settings.php:79
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr "Pole kvÃ³ty"
 
-#: templates/settings.php:80
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr "PredvolenÃ¡ kvÃ³ta"
 
-#: templates/settings.php:80
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr "v bajtoch"
 
-#: templates/settings.php:81
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr "Pole email"
 
-#: templates/settings.php:82
+#: 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:82
+#: 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: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 "Test nastavenia"
 
-#: templates/settings.php:86
+#: 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..e20d8617a6c167522b14d3df4376a7ec3a9b65a1 100644
--- a/l10n/sk_SK/user_webdavauth.po
+++ b/l10n/sk_SK/user_webdavauth.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-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-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -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 3237325869e49104e6b47b6f7cddd2ed89525cc1..c16d289f19d4b0b4e22f1ad6898270b19f666071 100644
--- a/l10n/sl/core.po
+++ b/l10n/sl/core.po
@@ -3,17 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <>, 2012.
-#   <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-02-22 00:06+0100\n"
-"PO-Revision-Date: 2013-02-20 23:20+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"Last-Translator: mateju <>\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"
@@ -21,29 +18,29 @@ 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/share.php:85
+#: ajax/share.php:97
 #, php-format
 msgid "User %s shared a file with you"
-msgstr "Uporanik %s je dal datoteko v souporabo z vami"
+msgstr "Uporabnik %s je omogoÄil souporabo datoteke"
 
-#: ajax/share.php:87
+#: ajax/share.php:99
 #, php-format
 msgid "User %s shared a folder with you"
-msgstr "Uporanik %s je dal mapo v souporabo z vami"
+msgstr "Uporabnik %s je omogoÄil souporabo mape"
 
-#: ajax/share.php:89
+#: ajax/share.php:101
 #, php-format
 msgid ""
 "User %s shared the file \"%s\" with you. It is available for download here: "
 "%s"
-msgstr "Uporanik %s je dal datoteko \"%s\" v souporabo z vami. Prenesete jo lahko tukaj: %s"
+msgstr "Uporabnik %s je omogoÄil souporabo datoteke \"%s\". Prejmete jo lahko preko povezave: %s"
 
-#: ajax/share.php:91
+#: ajax/share.php:104
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
 "here: %s"
-msgstr "Uporanik %s je dal mapo \"%s\" v souporabo z vami. Prenesete je lahko tukaj: %s"
+msgstr "Uporabnik %s je omogoÄil souporabo mape \"%s\". Prejmete jo lahko preko povezave: %s"
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -51,12 +48,12 @@ msgstr "Vrsta kategorije ni podana."
 
 #: ajax/vcategories/add.php:30
 msgid "No category to add?"
-msgstr "Ni kategorije za dodajanje?"
+msgstr "Ali ni kategorije za dodajanje?"
 
 #: ajax/vcategories/add.php:37
 #, php-format
 msgid "This category already exists: %s"
-msgstr ""
+msgstr "Kategorija Å¾e obstaja: %s"
 
 #: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
 #: ajax/vcategories/favorites.php:24
@@ -68,12 +65,12 @@ msgstr "Vrsta predmeta ni podana."
 #: ajax/vcategories/removeFromFavorites.php:30
 #, php-format
 msgid "%s ID not provided."
-msgstr "%s ID ni podan."
+msgstr "ID %s ni podan."
 
 #: ajax/vcategories/addToFavorites.php:35
 #, php-format
 msgid "Error adding %s to favorites."
-msgstr "Napaka pri dodajanju %s med priljubljene."
+msgstr "Napaka dodajanja %s med priljubljene predmete."
 
 #: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
 msgid "No categories selected for deletion."
@@ -82,81 +79,81 @@ msgstr "Za izbris ni izbrana nobena kategorija."
 #: ajax/vcategories/removeFromFavorites.php:35
 #, php-format
 msgid "Error removing %s from favorites."
-msgstr "Napaka pri odstranjevanju %s iz priljubljenih."
+msgstr "Napaka odstranjevanja %s iz priljubljenih predmetov."
 
-#: js/config.php:32
+#: js/config.php:34
 msgid "Sunday"
 msgstr "nedelja"
 
-#: js/config.php:32
+#: js/config.php:35
 msgid "Monday"
 msgstr "ponedeljek"
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Tuesday"
 msgstr "torek"
 
-#: js/config.php:32
+#: js/config.php:37
 msgid "Wednesday"
 msgstr "sreda"
 
-#: js/config.php:32
+#: js/config.php:38
 msgid "Thursday"
 msgstr "Äetrtek"
 
-#: js/config.php:32
+#: js/config.php:39
 msgid "Friday"
 msgstr "petek"
 
-#: js/config.php:32
+#: js/config.php:40
 msgid "Saturday"
 msgstr "sobota"
 
-#: js/config.php:33
+#: js/config.php:45
 msgid "January"
 msgstr "januar"
 
-#: js/config.php:33
+#: js/config.php:46
 msgid "February"
 msgstr "februar"
 
-#: js/config.php:33
+#: js/config.php:47
 msgid "March"
 msgstr "marec"
 
-#: js/config.php:33
+#: js/config.php:48
 msgid "April"
 msgstr "april"
 
-#: js/config.php:33
+#: js/config.php:49
 msgid "May"
 msgstr "maj"
 
-#: js/config.php:33
+#: js/config.php:50
 msgid "June"
 msgstr "junij"
 
-#: js/config.php:33
+#: js/config.php:51
 msgid "July"
 msgstr "julij"
 
-#: js/config.php:33
+#: js/config.php:52
 msgid "August"
 msgstr "avgust"
 
-#: js/config.php:33
+#: js/config.php:53
 msgid "September"
 msgstr "september"
 
-#: js/config.php:33
+#: js/config.php:54
 msgid "October"
 msgstr "oktober"
 
-#: js/config.php:33
+#: js/config.php:55
 msgid "November"
 msgstr "november"
 
-#: js/config.php:33
+#: js/config.php:56
 msgid "December"
 msgstr "december"
 
@@ -164,264 +161,269 @@ msgstr "december"
 msgid "Settings"
 msgstr "Nastavitve"
 
-#: js/js.js:767
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "pred nekaj sekundami"
 
-#: js/js.js:768
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "pred minuto"
 
-#: js/js.js:769
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr "pred {minutes} minutami"
 
-#: js/js.js:770
+#: js/js.js:721
 msgid "1 hour ago"
-msgstr "pred 1 uro"
+msgstr "Pred 1 uro"
 
-#: js/js.js:771
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr "pred {hours} urami"
 
-#: js/js.js:772
+#: js/js.js:723
 msgid "today"
 msgstr "danes"
 
-#: js/js.js:773
+#: js/js.js:724
 msgid "yesterday"
 msgstr "vÄeraj"
 
-#: js/js.js:774
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr "pred {days} dnevi"
 
-#: js/js.js:775
+#: js/js.js:726
 msgid "last month"
 msgstr "zadnji mesec"
 
-#: js/js.js:776
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr "pred {months} meseci"
 
-#: js/js.js:777
+#: js/js.js:728
 msgid "months ago"
 msgstr "mesecev nazaj"
 
-#: js/js.js:778
+#: js/js.js:729
 msgid "last year"
 msgstr "lansko leto"
 
-#: js/js.js:779
+#: js/js.js:730
 msgid "years ago"
 msgstr "let nazaj"
 
-#: js/oc-dialogs.js:126
-msgid "Choose"
-msgstr "Izbor"
+#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
+msgid "Ok"
+msgstr "V redu"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
 msgid "Cancel"
 msgstr "PrekliÄi"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "Ne"
+#: js/oc-dialogs.js:185
+msgid "Choose"
+msgstr "Izbor"
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:215
 msgid "Yes"
 msgstr "Da"
 
-#: js/oc-dialogs.js:180
-msgid "Ok"
-msgstr "V redu"
+#: js/oc-dialogs.js:222
+msgid "No"
+msgstr "Ne"
 
 #: 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 "Vrsta predmeta ni podana."
 
-#: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:582
-#: js/share.js:594
+#: 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 "Napaka"
 
 #: js/oc-vcategories.js:179
 msgid "The app name is not specified."
-msgstr "Ime aplikacije ni podano."
+msgstr "Ime programa ni podano."
 
 #: js/oc-vcategories.js:194
 msgid "The required file {file} is not installed!"
 msgstr "Zahtevana datoteka {file} ni nameÅ¡Äena!"
 
-#: js/share.js:29 js/share.js:43 js/share.js:90
+#: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
-msgstr ""
+msgstr "V souporabi"
 
-#: js/share.js:93
+#: js/share.js:90
 msgid "Share"
 msgstr "Souporaba"
 
-#: js/share.js:141 js/share.js:622
+#: js/share.js:125 js/share.js:617
 msgid "Error while sharing"
 msgstr "Napaka med souporabo"
 
-#: js/share.js:152
+#: js/share.js:136
 msgid "Error while unsharing"
 msgstr "Napaka med odstranjevanjem souporabe"
 
-#: js/share.js:159
+#: js/share.js:143
 msgid "Error while changing permissions"
 msgstr "Napaka med spreminjanjem dovoljenj"
 
-#: js/share.js:168
+#: js/share.js:152
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "V souporabi z vami in skupino {group}. Lastnik je {owner}."
 
-#: js/share.js:170
+#: js/share.js:154
 msgid "Shared with you by {owner}"
 msgstr "V souporabi z vami. Lastnik je {owner}."
 
-#: js/share.js:175
+#: js/share.js:159
 msgid "Share with"
 msgstr "OmogoÄi souporabo z"
 
-#: js/share.js:180
+#: js/share.js:164
 msgid "Share with link"
-msgstr "OmogoÄi souporabo s povezavo"
+msgstr "OmogoÄi souporabo preko povezave"
 
-#: js/share.js:183
+#: js/share.js:167
 msgid "Password protect"
 msgstr "ZaÅ¡Äiti z geslom"
 
-#: js/share.js:185 templates/installation.php:44 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Geslo"
 
-#: js/share.js:189
+#: js/share.js:173
 msgid "Email link to person"
-msgstr "Posreduj povezavo po e-poÅ¡ti"
+msgstr "Posreduj povezavo po elektronski poÅ¡ti"
 
-#: js/share.js:190
+#: js/share.js:174
 msgid "Send"
 msgstr "PoÅ¡lji"
 
-#: js/share.js:194
+#: js/share.js:178
 msgid "Set expiration date"
 msgstr "Nastavi datum preteka"
 
-#: js/share.js:195
+#: js/share.js:179
 msgid "Expiration date"
 msgstr "Datum preteka"
 
-#: js/share.js:227
+#: js/share.js:211
 msgid "Share via email:"
 msgstr "Souporaba preko elektronske poÅ¡te:"
 
-#: js/share.js:229
+#: js/share.js:213
 msgid "No people found"
 msgstr "Ni najdenih uporabnikov"
 
-#: js/share.js:256
+#: js/share.js:251
 msgid "Resharing is not allowed"
-msgstr "Ponovna souporaba ni omogoÄena"
+msgstr "Nadaljnja souporaba ni dovoljena"
 
-#: js/share.js:292
+#: js/share.js:287
 msgid "Shared in {item} with {user}"
 msgstr "V souporabi v {item} z {user}"
 
-#: js/share.js:313
+#: js/share.js:308
 msgid "Unshare"
-msgstr "Odstrani souporabo"
+msgstr "PrekliÄi souporabo"
 
-#: js/share.js:325
+#: js/share.js:320
 msgid "can edit"
 msgstr "lahko ureja"
 
-#: js/share.js:327
+#: js/share.js:322
 msgid "access control"
 msgstr "nadzor dostopa"
 
-#: js/share.js:330
+#: js/share.js:325
 msgid "create"
 msgstr "ustvari"
 
-#: js/share.js:333
+#: js/share.js:328
 msgid "update"
 msgstr "posodobi"
 
-#: js/share.js:336
+#: js/share.js:331
 msgid "delete"
-msgstr "izbriÅ¡e"
+msgstr "izbriÅ¡i"
 
-#: js/share.js:339
+#: js/share.js:334
 msgid "share"
 msgstr "doloÄi souporabo"
 
-#: js/share.js:373 js/share.js:569
+#: js/share.js:368 js/share.js:564
 msgid "Password protected"
 msgstr "ZaÅ¡Äiteno z geslom"
 
-#: js/share.js:582
+#: js/share.js:577
 msgid "Error unsetting expiration date"
 msgstr "Napaka brisanja datuma preteka"
 
-#: js/share.js:594
+#: js/share.js:589
 msgid "Error setting expiration date"
 msgstr "Napaka med nastavljanjem datuma preteka"
 
-#: js/share.js:609
+#: js/share.js:604
 msgid "Sending ..."
-msgstr "PoÅ¡iljam ..."
+msgstr "PoÅ¡iljanje ..."
 
-#: js/share.js:620
+#: js/share.js:615
 msgid "Email sent"
-msgstr "E-poÅ¡ta je bila poslana"
+msgstr "Elektronska poÅ¡ta je poslana"
 
 #: 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 "Posodobitev ni uspela. PoÅ¡ljite poroÄilo o napaki na sistemu <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud</a>."
 
 #: js/update.js:18
 msgid "The update was successful. Redirecting you to ownCloud now."
-msgstr ""
+msgstr "Posodobitev je uspeÅ¡no konÄana. Stran bo preusmerjena na oblak ownCloud."
 
 #: lostpassword/controller.php:48
 msgid "ownCloud password reset"
-msgstr "Ponastavitev gesla ownCloud"
+msgstr "Ponastavitev gesla za oblak ownCloud"
 
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
-msgstr "Uporabite naslednjo povezavo za ponastavitev gesla: {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 "E-poÅ¡ta za ponastavitev je bila poslana."
+#: 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 "Zahtevek je spodletel!"
+#: 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:39
-#: 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 ponastavitev"
+msgstr "Zahtevaj ponovno nastavitev"
 
 #: lostpassword/templates/resetpassword.php:4
 msgid "Your password was reset"
-msgstr "Geslo je ponastavljeno"
+msgstr "Geslo je ponovno nastavljeno"
 
 #: lostpassword/templates/resetpassword.php:5
 msgid "To login page"
@@ -471,117 +473,132 @@ msgstr "Uredi kategorije"
 msgid "Add"
 msgstr "Dodaj"
 
-#: templates/installation.php:23 templates/installation.php:30
+#: templates/installation.php:24 templates/installation.php:31
+#: templates/installation.php:38
 msgid "Security Warning"
 msgstr "Varnostno opozorilo"
 
-#: templates/installation.php:24
+#: templates/installation.php:25
+msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
+msgstr "Uporabljena razliÄica PHP je ranljiva za napad NULL Byte (CVE-2006-7243)"
+
+#: templates/installation.php:26
+msgid "Please update your PHP installation to use ownCloud securely."
+msgstr "PriporoÄeno je posodobiti namestitev PHP in varno uporabljati oblak ownCloud"
+
+#: templates/installation.php:32
 msgid ""
 "No secure random number generator is available, please enable the PHP "
 "OpenSSL extension."
-msgstr "Na voljo ni varnega generatorja nakljuÄnih Å¡tevil. Prosimo, Äe omogoÄite PHP OpenSSL razÅ¡iritev."
+msgstr "Na voljo ni nobenega varnega ustvarjalnika nakljuÄnih Å¡tevil. OmogoÄiti je treba razÅ¡iritev PHP OpenSSL."
 
-#: templates/installation.php:25
+#: 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 "Brez varnega generatorja nakljuÄnih Å¡tevil lahko napadalec napove Å¾etone za ponastavitev gesla, kar mu omogoÄa, da prevzame vaÅ¡ â€‹â€‹raÄun."
+msgstr "Brez varnega ustvarjalnika nakljuÄnih Å¡tevil je mogoÄe napovedati Å¾etone za ponastavitev gesla, s Äimer je mogoÄe prevzeti nadzor nad raÄunom."
 
-#: templates/installation.php:31
+#: 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 "Podatkovna mapa in datoteke so najverjetneje javno dostopni preko interneta, saj datoteka .htaccess ni ustrezno nastavljena."
 
-#: templates/installation.php:32
+#: 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 "Navodila, kako pravilno namestiti streÅ¾nik, so na straneh <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">dokumentacije</a>."
 
-#: templates/installation.php:36
+#: templates/installation.php:44
 msgid "Create an <strong>admin account</strong>"
 msgstr "Ustvari <strong>skrbniÅ¡ki raÄun</strong>"
 
-#: templates/installation.php:52
+#: templates/installation.php:62
 msgid "Advanced"
 msgstr "Napredne moÅ¾nosti"
 
-#: templates/installation.php:54
+#: templates/installation.php:64
 msgid "Data folder"
-msgstr "Mapa s podatki"
+msgstr "Podatkovna mapa"
 
-#: templates/installation.php:61
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "Nastavi podatkovno zbirko"
 
-#: templates/installation.php:66 templates/installation.php:77
-#: templates/installation.php:87 templates/installation.php:97
+#: 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:109
+#: templates/installation.php:137
 msgid "Database user"
-msgstr "Uporabnik zbirke"
+msgstr "Uporabnik podatkovne zbirke"
 
-#: templates/installation.php:113
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "Geslo podatkovne zbirke"
 
-#: templates/installation.php:117
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "Ime podatkovne zbirke"
 
-#: templates/installation.php:125
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "Razpredelnica podatkovne zbirke"
 
-#: templates/installation.php:131
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "Gostitelj podatkovne zbirke"
 
-#: templates/installation.php:136
+#: templates/installation.php:172
 msgid "Finish setup"
-msgstr "DokonÄaj namestitev"
+msgstr "KonÄaj namestitev"
 
-#: templates/layout.guest.php:33
+#: templates/layout.guest.php:40
 msgid "web services under your control"
 msgstr "spletne storitve pod vaÅ¡im nadzorom"
 
-#: templates/layout.user.php:48
+#: templates/layout.user.php:36
+#, 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:61
 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 "ÄŒe vaÅ¡ega gesla niste nedavno spremenili, je vaÅ¡ raÄun lahko ogroÅ¾en!"
+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 me"
+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 ""
+msgstr "Druge prijavne moÅ¾nosti"
 
 #: templates/part.pagenavi.php:3
 msgid "prev"
@@ -594,4 +611,4 @@ msgstr "naprej"
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
-msgstr ""
+msgstr "Posodabljanje sistema ownCloud na razliÄico %s je lahko dolgotrajno."
diff --git a/l10n/sl/files.po b/l10n/sl/files.po
index 4ba12451df4ac1fef87a79948bad95b6a08490d7..76edc3fd319d21794963b267a84155f479b4d9c5 100644
--- a/l10n/sl/files.po
+++ b/l10n/sl/files.po
@@ -3,16 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <>, 2012.
-#   <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-03-04 00:06+0100\n"
-"PO-Revision-Date: 2013-03-03 23:06+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10: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"
@@ -24,43 +20,39 @@ msgstr ""
 #: ajax/move.php:17
 #, php-format
 msgid "Could not move %s - File with this name already exists"
-msgstr ""
+msgstr "Ni mogoÄe premakniti %s - datoteka s tem imenom Å¾e obstaja"
 
 #: 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 "Ni mogoÄe premakniti %s"
 
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
-msgstr "Nobena datoteka ni naloÅ¾ena. 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 naloÅ¾ena brez napak."
+msgstr "Datoteka je uspeÅ¡no naloÅ¾ena."
 
 #: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
-msgstr "NaloÅ¾ena datoteka presega dovoljeno velikost. Le-ta je doloÄena z vrstico upload_max_filesize v datoteki php.ini:"
+msgstr "Poslana datoteka presega dovoljeno velikost, ki je doloÄena z moÅ¾nostjo upload_max_filesize v datoteki php.ini:"
 
 #: ajax/upload.php:29
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
-msgstr "NaloÅ¾ena datoteka presega velikost, ki jo doloÄa parameter MAX_FILE_SIZE v HTML obrazcu"
+msgstr "Poslana datoteka presega velikost, ki jo doloÄa parameter najveÄje dovoljene velikosti v obrazcu HTML."
 
 #: 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"
@@ -72,68 +64,79 @@ msgstr "Pisanje na disk je spodletelo"
 
 #: ajax/upload.php:51
 msgid "Not enough storage available"
-msgstr ""
+msgstr "Na voljo ni dovolj prostora"
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
-msgstr ""
+msgstr "Neveljavna mapa."
 
-#: appinfo/app.php:10
+#: appinfo/app.php:12
 msgid "Files"
 msgstr "Datoteke"
 
-#: js/fileactions.js:125
+#: js/fileactions.js:116
+msgid "Share"
+msgstr "Souporaba"
+
+#: js/fileactions.js:126
 msgid "Delete permanently"
-msgstr ""
+msgstr "IzbriÅ¡i dokonÄno"
 
-#: js/fileactions.js:127 templates/index.php:92 templates/index.php:93
+#: 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/files.js:292 js/files.js:408
-#: js/files.js:439
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "V Äakanju ..."
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} Å¾e obstaja"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "zamenjaj"
 
-#: js/filelist.js:251
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "predlagaj ime"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "prekliÄi"
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
-msgstr "zamenjano ime {new_name} z imenom {old_name}"
+msgstr "preimenovano ime {new_name} z imenom {old_name}"
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "undo"
 msgstr "razveljavi"
 
-#: js/filelist.js:323
+#: js/filelist.js:331
 msgid "perform delete operation"
-msgstr ""
+msgstr "izvedi opravilo brisanja"
+
+#: js/filelist.js:413
+msgid "1 file uploading"
+msgstr "PoÅ¡iljanje 1 datoteke"
+
+#: js/filelist.js:416 js/filelist.js:470
+msgid "files uploading"
+msgstr "poteka poÅ¡iljanje datotek"
 
 #: js/files.js:52
 msgid "'.' is an invalid file name."
-msgstr ""
+msgstr "'.' je neveljavno ime datoteke."
 
 #: js/files.js:56
 msgid "File name cannot be empty."
-msgstr ""
+msgstr "Ime datoteke ne sme biti prazno polje."
 
 #: js/files.js:64
 msgid ""
@@ -143,83 +146,83 @@ msgstr "Neveljavno ime, znaki '\\', '/', '<', '>', ':', '\"', '|', '?' in '*' ni
 
 #: js/files.js:78
 msgid "Your storage is full, files can not be updated or synced anymore!"
-msgstr ""
+msgstr "Shramba je povsem napolnjena. Datotek ni veÄ mogoÄe posodabljati in usklajevati!"
 
 #: js/files.js:82
 msgid "Your storage is almost full ({usedSpacePercent}%)"
-msgstr ""
+msgstr "Mesto za shranjevanje je skoraj polno ({usedSpacePercent}%)"
 
-#: js/files.js:225
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
-msgstr ""
+msgstr "Postopek priprave datoteke za prejem je lahko dolgotrajen, Äe je datoteka zelo velika."
 
-#: js/files.js:262
+#: 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."
-
-#: js/files.js:262
-msgid "Upload Error"
-msgstr "Napaka med nalaganjem"
-
-#: js/files.js:273
-msgid "Close"
-msgstr "Zapri"
+msgstr "PoÅ¡iljanja ni mogoÄe izvesti, saj gre za mapo oziroma datoteko velikosti 0 bajtov."
 
-#: js/files.js:312
-msgid "1 file uploading"
-msgstr "PoÅ¡iljanje 1 datoteke"
+#: js/files.js:277
+msgid "Not enough space available"
+msgstr "Na voljo ni dovolj prostora."
 
-#: js/files.js:315 js/files.js:370 js/files.js:385
-msgid "{count} files uploading"
-msgstr "nalagam {count} datotek"
-
-#: js/files.js:388 js/files.js:423
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "PoÅ¡iljanje je preklicano."
 
-#: js/files.js:497
+#: 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:570
+#: js/files.js:486
 msgid "URL cannot be empty."
-msgstr "Naslov URL ne sme biti prazen."
+msgstr "Naslov URL ne sme biti prazna vrednost."
 
-#: js/files.js:575
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr ""
+msgstr "Neveljavno ime mape. Uporaba oznake \"Souporaba\" je zadrÅ¾an za sistem ownCloud."
 
-#: js/files.js:953 templates/index.php:68
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+msgid "Error"
+msgstr "Napaka"
+
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Ime"
 
-#: js/files.js:954 templates/index.php:79
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Velikost"
 
-#: js/files.js:955 templates/index.php:81
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Spremenjeno"
 
-#: js/files.js:974
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 mapa"
 
-#: js/files.js:976
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} map"
 
-#: js/files.js:984
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 datoteka"
 
-#: js/files.js:986
+#: 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"
@@ -238,7 +241,7 @@ msgstr "najveÄ mogoÄe:"
 
 #: templates/admin.php:15
 msgid "Needed for multi-file and folder downloads."
-msgstr "Uporabljeno za prenos veÄ datotek in map."
+msgstr "Uporabljeno za prejem veÄ datotek in map."
 
 #: templates/admin.php:17
 msgid "Enable ZIP-download"
@@ -246,7 +249,7 @@ msgstr "OmogoÄi prejemanje arhivov ZIP"
 
 #: templates/admin.php:20
 msgid "0 is unlimited"
-msgstr "0 je neskonÄno"
+msgstr "0 predstavlja neomejeno vrednost"
 
 #: templates/admin.php:22
 msgid "Maximum input size for ZIP files"
@@ -258,7 +261,7 @@ msgstr "Shrani"
 
 #: templates/index.php:7
 msgid "New"
-msgstr "Nova"
+msgstr "Novo"
 
 #: templates/index.php:10
 msgid "Text file"
@@ -272,48 +275,48 @@ msgstr "Mapa"
 msgid "From link"
 msgstr "Iz povezave"
 
-#: templates/index.php:40
+#: templates/index.php:42
 msgid "Deleted files"
-msgstr ""
+msgstr "Izbrisane datoteke"
 
-#: templates/index.php:46
+#: templates/index.php:48
 msgid "Cancel upload"
 msgstr "PrekliÄi poÅ¡iljanje"
 
-#: templates/index.php:53
+#: templates/index.php:54
 msgid "You donâ€™t have write permissions here."
-msgstr ""
+msgstr "Za to mesto ni ustreznih dovoljenj za pisanje."
 
-#: templates/index.php:60
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
-msgstr "Tukaj ni niÄesar. NaloÅ¾ite kaj!"
+msgstr "Tukaj Å¡e ni niÄesar. Najprej je treba kakÅ¡no datoteko poslati v oblak!"
 
-#: templates/index.php:74
+#: templates/index.php:75
 msgid "Download"
 msgstr "Prejmi"
 
-#: templates/index.php:86 templates/index.php:87
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
-msgstr "Odstrani iz souporabe"
+msgstr "PrekliÄi souporabo"
 
-#: templates/index.php:106
+#: templates/index.php:107
 msgid "Upload too large"
-msgstr "Nalaganje ni mogoÄe, ker je preveliko"
+msgstr "PrekoraÄenje omejitve velikosti"
 
-#: templates/index.php:108
+#: 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 naloÅ¾iti, presegajo najveÄjo dovoljeno velikost na tem streÅ¾niku."
+msgstr "Datoteke, ki jih Å¾elite poslati, presegajo najveÄjo dovoljeno velikost na streÅ¾niku."
 
-#: templates/index.php:113
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Poteka preuÄevanje datotek, poÄakajte ..."
 
-#: templates/index.php:116
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "Trenutno poteka preuÄevanje"
 
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
-msgstr ""
+msgstr "Nadgrajevanje predpomnilnika datoteÄnega sistema ..."
diff --git a/l10n/sl/files_encryption.po b/l10n/sl/files_encryption.po
index 86d2a0d7d36ea951441dff37aa414ff1fb506623..716091a2f022b9dbb1f1c5db19820b013b066711 100644
--- a/l10n/sl/files_encryption.po
+++ b/l10n/sl/files_encryption.po
@@ -3,14 +3,12 @@
 # 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-02-10 00:08+0100\n"
-"PO-Revision-Date: 2013-02-09 23:09+0000\n"
+"POT-Creation-Date: 2013-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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"
@@ -25,15 +23,15 @@ msgstr "Å ifriranje"
 
 #: templates/settings-personal.php:7
 msgid "File encryption is enabled."
-msgstr ""
+msgstr "Å ifriranje datotek je omogoÄeno."
 
 #: templates/settings-personal.php:11
 msgid "The following file types will not be encrypted:"
-msgstr ""
+msgstr "Navedene vrste datotek ne bodo Å¡ifrirane:"
 
 #: templates/settings.php:7
 msgid "Exclude the following file types from encryption:"
-msgstr ""
+msgstr "Ne Å¡ifriraj navedenih vrst datotek:"
 
 #: templates/settings.php:12
 msgid "None"
diff --git a/l10n/sl/files_external.po b/l10n/sl/files_external.po
index 1eb81c770892548bb472846ac3ecbaaa8e628054..9b4711622892d0d21b175654b6a25c1b08477207 100644
--- a/l10n/sl/files_external.po
+++ b/l10n/sl/files_external.po
@@ -3,15 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <>, 2012.
-# 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-01 00:05+0100\n"
-"PO-Revision-Date: 2013-02-27 23:20+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-04-30 01:57+0200\n"
+"PO-Revision-Date: 2013-04-29 18:20+0000\n"
+"Last-Translator: mateju <>\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"
@@ -33,24 +32,31 @@ msgstr "Odobri dostop"
 
 #: js/dropbox.js:101
 msgid "Please provide a valid Dropbox app key and secret."
-msgstr "VpiÅ¡ite veljaven kljuÄ programa in kodo za Dropbox"
+msgstr "Vpisati je treba veljaven kljuÄ programa in kodo za Dropbox"
 
 #: js/google.js:36 js/google.js:93
 msgid "Error configuring Google Drive storage"
 msgstr "Napaka nastavljanja shrambe Google Drive"
 
-#: 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 "<b>Opozorilo:</b> \"smbclient\" ni nameÅ¡Äen. Priklapljanje CIFS/SMB pogonov ni mogoÄe. Prosimo, prosite vaÅ¡ega skrbnika, Äe ga namesti."
+msgstr "<b>Opozorilo:</b> paket \"smbclient\" ni nameÅ¡Äen. Priklapljanje pogonov CIFS/SMB ne bo mogoÄe."
 
-#: 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 "<b>Opozorilo:</b> FTP podpora v PHP ni omogoÄena ali nameÅ¡Äena. Priklapljanje FTP pogonov ni mogoÄe. Prosimo, prosite vaÅ¡ega skrbnika, Äe jo namesti ali omogoÄi."
+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"
@@ -62,7 +68,7 @@ msgstr "Ime mape"
 
 #: templates/settings.php:10
 msgid "External storage"
-msgstr ""
+msgstr "Zunanja shramba"
 
 #: templates/settings.php:11
 msgid "Configuration"
@@ -78,7 +84,7 @@ msgstr "Se uporablja"
 
 #: templates/settings.php:33
 msgid "Add storage"
-msgstr ""
+msgstr "Dodaj shrambo"
 
 #: templates/settings.php:90
 msgid "None set"
@@ -103,7 +109,7 @@ msgstr "IzbriÅ¡i"
 
 #: templates/settings.php:129
 msgid "Enable User External Storage"
-msgstr "OmogoÄi uporabo zunanje podatkovne shrambe za uporabnike"
+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 00395c37a29e1369972e7bb8a61a82efaeb8b445..e1d7adc7910f275af20a9067ea68dcec436ce118 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: 2012-10-23 02:02+0200\n"
-"PO-Revision-Date: 2012-10-22 16:59+0000\n"
-"Last-Translator: mateju <>\n"
+"POT-Creation-Date: 2013-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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"
@@ -27,24 +25,24 @@ msgstr "Geslo"
 msgid "Submit"
 msgstr "PoÅ¡lji"
 
-#: templates/public.php:9
+#: templates/public.php:10
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "Oseba %s je doloÄila mapo %s za souporabo"
 
-#: templates/public.php:11
+#: templates/public.php:13
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "Oseba %s je doloÄila datoteko %s za souporabo"
 
-#: templates/public.php:14 templates/public.php:30
+#: templates/public.php:19 templates/public.php:43
 msgid "Download"
 msgstr "Prejmi"
 
-#: templates/public.php:29
+#: templates/public.php:40
 msgid "No preview available for"
 msgstr "Predogled ni na voljo za"
 
-#: templates/public.php:35
+#: templates/public.php:50
 msgid "web services under your control"
 msgstr "spletne storitve pod vaÅ¡im nadzorom"
diff --git a/l10n/sl/files_trashbin.po b/l10n/sl/files_trashbin.po
index 6731c6eb2b99aa6a02573f2a650a904cae533490..2ce8f9f03e69acfdb29822e34a71675707b92ce3 100644
--- a/l10n/sl/files_trashbin.po
+++ b/l10n/sl/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-08 00:25+0100\n"
-"PO-Revision-Date: 2013-03-07 23:25+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -17,27 +17,31 @@ 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/delete.php:40
+#: ajax/delete.php:42
 #, php-format
 msgid "Couldn't delete %s permanently"
-msgstr ""
+msgstr "Datoteke %s ni mogoÄe dokonÄno izbrisati."
 
-#: ajax/undelete.php:41
+#: ajax/undelete.php:42
 #, php-format
 msgid "Couldn't restore %s"
-msgstr ""
+msgstr "Ni mogoÄe obnoviti %s"
 
 #: js/trash.js:7 js/trash.js:96
 msgid "perform restore operation"
-msgstr ""
+msgstr "izvedi opravilo obnavljanja"
+
+#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+msgid "Error"
+msgstr "Napaka"
 
 #: js/trash.js:34
 msgid "delete file permanently"
-msgstr ""
+msgstr "dokonÄno izbriÅ¡i datoteko"
 
 #: js/trash.js:121
 msgid "Delete permanently"
-msgstr ""
+msgstr "IzbriÅ¡i dokonÄno"
 
 #: js/trash.js:174 templates/index.php:17
 msgid "Name"
@@ -45,7 +49,7 @@ msgstr "Ime"
 
 #: js/trash.js:175 templates/index.php:27
 msgid "Deleted"
-msgstr ""
+msgstr "Izbrisano"
 
 #: js/trash.js:184
 msgid "1 folder"
@@ -65,11 +69,11 @@ msgstr "{count} datotek"
 
 #: templates/index.php:9
 msgid "Nothing in here. Your trash bin is empty!"
-msgstr ""
+msgstr "Mapa smeti je prazna."
 
 #: templates/index.php:20 templates/index.php:22
 msgid "Restore"
-msgstr ""
+msgstr "Obnovi"
 
 #: templates/index.php:30 templates/index.php:31
 msgid "Delete"
@@ -77,4 +81,4 @@ msgstr "IzbriÅ¡i"
 
 #: templates/part.breadcrumb.php:9
 msgid "Deleted Files"
-msgstr ""
+msgstr "Izbrisane datoteke"
diff --git a/l10n/sl/files_versions.po b/l10n/sl/files_versions.po
index d2588528b0c3f474b01f3937b29a592175fabcd8..72f744258c63faf148a699d70ef57e70b3599900 100644
--- a/l10n/sl/files_versions.po
+++ b/l10n/sl/files_versions.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-2013.
 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 08:31+0000\n"
-"Last-Translator: Peter PeroÅ¡a <peter.perosa@gmail.com>\n"
+"POT-Creation-Date: 2013-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:30+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"
@@ -22,38 +20,38 @@ msgstr ""
 #: ajax/rollbackVersion.php:15
 #, php-format
 msgid "Could not revert: %s"
-msgstr ""
+msgstr "Ni mogoÄe povrniti: %s"
 
 #: history.php:40
 msgid "success"
-msgstr ""
+msgstr "uspeÅ¡no"
 
 #: history.php:42
 #, php-format
 msgid "File %s was reverted to version %s"
-msgstr ""
+msgstr "Datoteka %s je povrnjena na razliÄico %s."
 
 #: history.php:49
 msgid "failure"
-msgstr ""
+msgstr "spodletelo"
 
 #: history.php:51
 #, php-format
 msgid "File %s could not be reverted to version %s"
-msgstr ""
+msgstr "Datoteke %s ni mogoÄe povrniti na razliÄico %s."
 
 #: history.php:69
 msgid "No old versions available"
-msgstr "StarejÅ¡ih razliÄic ni na voljo"
+msgstr "Ni starejÅ¡ih razliÄic."
 
 #: history.php:74
 msgid "No path specified"
-msgstr ""
+msgstr "Ni doloÄene poti"
 
 #: js/versions.js:6
 msgid "Versions"
-msgstr ""
+msgstr "RazliÄice"
 
 #: templates/history.php:20
 msgid "Revert a file to a previous version by clicking on its revert button"
-msgstr ""
+msgstr "Povrni datoteko na predhodno razliÄico s klikom na gumb za povrnitev."
diff --git a/l10n/sl/lib.po b/l10n/sl/lib.po
index 620819da9ffde505c4c0765f08b86799dfedf208..636c2a101d75bd97d7254579ed37d6493c9ac15b 100644
--- a/l10n/sl/lib.po
+++ b/l10n/sl/lib.po
@@ -3,14 +3,12 @@
 # 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-02-27 14:35+0100\n"
-"PO-Revision-Date: 2013-02-27 13:35+0000\n"
+"POT-Creation-Date: 2013-04-30 01:57+0200\n"
+"PO-Revision-Date: 2013-04-29 18:10+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -43,25 +41,25 @@ msgstr "Programi"
 msgid "Admin"
 msgstr "SkrbniÅ¡tvo"
 
-#: files.php:202
+#: files.php:209
 msgid "ZIP download is turned off."
-msgstr "Prejem datotek ZIP je onemogoÄen."
+msgstr "Prejemanje datotek v paketu ZIP je onemogoÄeno."
 
-#: files.php:203
+#: files.php:210
 msgid "Files need to be downloaded one by one."
-msgstr "Datoteke je mogoÄe prejeti le posamiÄ."
+msgstr "Datoteke je mogoÄe prejeti le posamiÄno."
 
-#: files.php:204 files.php:231
+#: files.php:211 files.php:244
 msgid "Back to Files"
 msgstr "Nazaj na datoteke"
 
-#: files.php:228
+#: files.php:241
 msgid "Selected files too large to generate zip file."
 msgstr "Izbrane datoteke so prevelike za ustvarjanje datoteke arhiva zip."
 
 #: helper.php:228
 msgid "couldn't be determined"
-msgstr ""
+msgstr "ni mogoÄe doloÄiti"
 
 #: json.php:28
 msgid "Application is not enabled"
@@ -69,11 +67,11 @@ 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."
-msgstr "Å½eton je potekel. SpletiÅ¡Äe je traba znova naloÅ¾iti."
+msgstr "Å½eton je potekel. Stran je treba ponovno naloÅ¾iti."
 
 #: search/provider/file.php:17 search/provider/file.php:35
 msgid "Files"
@@ -89,105 +87,101 @@ msgstr "Slike"
 
 #: setup.php:34
 msgid "Set an admin username."
-msgstr ""
+msgstr "Nastavi uporabniÅ¡ko ime skrbnika."
 
 #: setup.php:37
 msgid "Set an admin password."
-msgstr ""
-
-#: setup.php:40
-msgid "Specify a data folder."
-msgstr ""
+msgstr "Nastavi geslo skrbnika."
 
 #: setup.php:55
 #, php-format
 msgid "%s enter the database username."
-msgstr ""
+msgstr "%s - vnos uporabniÅ¡kega imena podatkovne zbirke."
 
 #: setup.php:58
 #, php-format
 msgid "%s enter the database name."
-msgstr ""
+msgstr "%s - vnos imena podatkovne zbirke."
 
 #: setup.php:61
 #, php-format
 msgid "%s you may not use dots in the database name"
-msgstr ""
+msgstr "%s - v imenu podatkovne zbirke ni dovoljeno uporabljati pik."
 
 #: setup.php:64
 #, php-format
 msgid "%s set the database host."
-msgstr ""
+msgstr "%s - vnos gostitelja podatkovne zbirke."
 
-#: setup.php:128 setup.php:320 setup.php:365
+#: setup.php:132 setup.php:325 setup.php:370
 msgid "PostgreSQL username and/or password not valid"
-msgstr ""
+msgstr "UporabniÅ¡ko ime ali geslo PostgreSQL ni veljavno"
 
-#: setup.php:129 setup.php:152 setup.php:229
+#: setup.php:133 setup.php:156 setup.php:234
 msgid "You need to enter either an existing account or the administrator."
-msgstr ""
+msgstr "Prijaviti se je treba v obstojeÄi ali pa skrbniÅ¡ki raÄun."
 
-#: setup.php:151 setup.php:453 setup.php:520
+#: setup.php:155 setup.php:458 setup.php:525
 msgid "Oracle username and/or password not valid"
-msgstr ""
+msgstr "UporabniÅ¡ko ime ali geslo Oracle ni veljavno"
 
-#: setup.php:228
+#: setup.php:233
 msgid "MySQL username and/or password not valid"
-msgstr ""
+msgstr "UporabniÅ¡ko ime ali geslo MySQL ni veljavno"
 
-#: 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: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:583 setup.php:592 setup.php:600 setup.php:609
+#: setup.php:615
 #, php-format
 msgid "DB Error: \"%s\""
-msgstr ""
+msgstr "Napaka podatkovne zbirke: \"%s\""
 
-#: 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:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
+#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
+#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
 #, php-format
 msgid "Offending command was: \"%s\""
-msgstr ""
+msgstr "NapaÄni ukaz je: \"%s\""
 
-#: setup.php:299
+#: setup.php:304
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
-msgstr ""
+msgstr "Uporabnik MySQL '%s'@'localhost' Å¾e obstaja."
 
-#: setup.php:300
+#: setup.php:305
 msgid "Drop this user from MySQL"
-msgstr ""
+msgstr "Odstrani uporabnika s podatkovne zbirke MySQL"
 
-#: setup.php:305
+#: setup.php:310
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
-msgstr ""
+msgstr "Uporabnik MySQL '%s'@'%%' Å¾e obstaja."
 
-#: setup.php:306
+#: setup.php:311
 msgid "Drop this user from MySQL."
-msgstr ""
+msgstr "Odstrani uporabnika s podatkovne zbirke MySQL"
 
-#: setup.php:579 setup.php:611
+#: setup.php:584 setup.php:616
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
-msgstr ""
+msgstr "NapaÄni ukaz je: \"%s\", ime: %s, geslo: %s"
 
-#: setup.php:631
+#: setup.php:636
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
-msgstr ""
+msgstr "UporabniÅ¡ko ime ali geslo MS SQL ni veljavno: %s"
 
-#: setup.php:849
+#: setup.php:858
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
-msgstr ""
+msgstr "Spletni straÅ¾nik Å¡e ni ustrezno nastavljen in ne omogoÄa usklajevanja, saj je nastavitev WebDAV okvarjena."
 
-#: setup.php:850
+#: setup.php:859
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr ""
+msgstr "Preverite <a href='%s'>navodila namestitve</a>."
 
 #: template.php:113
 msgid "seconds ago"
@@ -226,7 +220,7 @@ msgstr "pred %d dnevi"
 
 #: template.php:121
 msgid "last month"
-msgstr "prejÅ¡nji mesec"
+msgstr "zadnji mesec"
 
 #: template.php:122
 #, php-format
@@ -235,26 +229,13 @@ msgstr "Pred %d meseci"
 
 #: template.php:123
 msgid "last year"
-msgstr "lani"
+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
 msgid "Could not find category \"%s\""
-msgstr "Kategorije \"%s\" ni bilo mogoÄe najti."
+msgstr "Kategorije \"%s\" ni mogoÄe najti."
diff --git a/l10n/sl/settings.po b/l10n/sl/settings.po
index 3eb120c5f5e2fbfc043e40a93cc6e27f95c5075b..b4b74e10e0de4eb3999f3742baacfa5a9b1e39fc 100644
--- a/l10n/sl/settings.po
+++ b/l10n/sl/settings.po
@@ -3,17 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <>, 2012.
-#   <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-03-04 00:06+0100\n"
-"PO-Revision-Date: 2013-03-03 08:20+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"Last-Translator: mateju <>\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"
@@ -23,16 +20,20 @@ msgstr ""
 
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
-msgstr "Ni mogoÄe naloÅ¾iti seznama iz 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 ""
+msgstr "Prikazanega imena ni mogoÄe spremeniti."
 
 #: ajax/creategroup.php:10
 msgid "Group already exists"
@@ -40,7 +41,7 @@ msgstr "Skupina Å¾e obstaja"
 
 #: ajax/creategroup.php:19
 msgid "Unable to add group"
-msgstr "Ni mogoÄe dodati skupine"
+msgstr "Skupine ni mogoÄe dodati"
 
 #: ajax/enableapp.php:11
 msgid "Could not enable app. "
@@ -56,15 +57,15 @@ msgstr "Neveljaven elektronski naslov"
 
 #: ajax/removegroup.php:13
 msgid "Unable to delete group"
-msgstr "Ni mogoÄe izbrisati skupine"
+msgstr "Skupine ni mogoÄe izbrisati"
 
 #: ajax/removeuser.php:24
 msgid "Unable to delete user"
-msgstr "Ni mogoÄe izbrisati uporabnika"
+msgstr "Uporabnika ni mogoÄe izbrisati"
 
 #: ajax/setlanguage.php:15
 msgid "Language changed"
-msgstr "Jezik je bil spremenjen"
+msgstr "Jezik je spremenjen"
 
 #: ajax/setlanguage.php:17 ajax/setlanguage.php:20
 msgid "Invalid request"
@@ -72,7 +73,7 @@ msgstr "Neveljavna zahteva"
 
 #: ajax/togglegroups.php:12
 msgid "Admins can't remove themself from the admin group"
-msgstr "Administratorji sebe ne morejo odstraniti iz skupine admin"
+msgstr "Skrbnikov ni mogoÄe odstraniti iz skupine skrbnikov (admin)"
 
 #: ajax/togglegroups.php:30
 #, php-format
@@ -86,88 +87,88 @@ msgstr "Uporabnika ni mogoÄe odstraniti iz skupine %s"
 
 #: ajax/updateapp.php:14
 msgid "Couldn't update app."
-msgstr ""
+msgstr "Programa ni mogoÄe posodobiti."
 
 #: js/apps.js:30
 msgid "Update to {appversion}"
-msgstr ""
+msgstr "Posodobi na {appversion}"
 
 #: js/apps.js:36 js/apps.js:76
 msgid "Disable"
 msgstr "OnemogoÄi"
 
-#: js/apps.js:36 js/apps.js:64
+#: js/apps.js:36 js/apps.js:64 js/apps.js:83
 msgid "Enable"
 msgstr "OmogoÄi"
 
 #: js/apps.js:55
 msgid "Please wait...."
-msgstr ""
-
-#: js/apps.js:84
-msgid "Updating...."
-msgstr ""
+msgstr "PoÄakajte ..."
 
-#: js/apps.js:87
-msgid "Error while updating app"
-msgstr ""
-
-#: js/apps.js:87
+#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
 msgid "Error"
 msgstr "Napaka"
 
 #: js/apps.js:90
+msgid "Updating...."
+msgstr "Poteka posodabljanje ..."
+
+#: js/apps.js:93
+msgid "Error while updating app"
+msgstr "PriÅ¡lo je do napake med posodabljanjem programa."
+
+#: js/apps.js:96
 msgid "Updated"
-msgstr ""
+msgstr "Posodobljeno"
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr "Poteka shranjevanje ..."
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "deleted"
 msgstr "izbrisano"
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "undo"
 msgstr "razveljavi"
 
-#: js/users.js:62
+#: js/users.js:79
 msgid "Unable to remove user"
-msgstr ""
+msgstr "Uporabnika ni mogoÄe odstraniti"
 
-#: js/users.js:75 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
+#: templates/users.php:103
 msgid "Groups"
 msgstr "Skupine"
 
-#: js/users.js:78 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr "Skrbnik skupine"
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "IzbriÅ¡i"
 
-#: js/users.js:191
+#: js/users.js:269
 msgid "add group"
-msgstr ""
+msgstr "dodaj skupino"
 
-#: js/users.js:352
+#: js/users.js:420
 msgid "A valid username must be provided"
-msgstr ""
+msgstr "Navedeno mora biti veljavno uporabniÅ¡ko ime"
 
-#: js/users.js:353 js/users.js:359 js/users.js:374
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
-msgstr ""
+msgstr "Napaka ustvarjanja uporabnika"
 
-#: js/users.js:358
+#: js/users.js:426
 msgid "A valid password must be provided"
-msgstr ""
+msgstr "Navedeno mora biti veljavno geslo"
 
-#: personal.php:29 personal.php:30
+#: personal.php:35 personal.php:36
 msgid "__language_name__"
-msgstr "__ime_jezika__"
+msgstr "SlovenÅ¡Äina"
 
 #: templates/admin.php:15
 msgid "Security Warning"
@@ -180,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 "Trenutno je dostop do podatkovne mape in datotek najverjetneje omogoÄen vsem uporabnikom na omreÅ¾ju. Datoteka .htaccess, vkljuÄena v ownCloud namreÄ ni omogoÄena. MoÄno priporoÄamo nastavitev spletnega streÅ¾nika tako, da mapa podatkov ne bo javno dostopna ali pa, da jo prestavite ven iz korenske mape spletnega streÅ¾nika."
+msgstr "Trenutno je dostop do podatkovne mape in datotek najverjetneje omogoÄen vsem uporabnikom na omreÅ¾ju. Datoteka .htaccess, vkljuÄena v ownCloud, namreÄ ni ustrezno nastavljena. PriporoÄljivo je nastaviti spletni streÅ¾nik tako, da mapa podatkov ne bo javno dostopna, ali pa, da jo prestavite v podrejeno mapo korenske mape spletnega streÅ¾nika."
 
 #: templates/admin.php:29
 msgid "Setup Warning"
-msgstr ""
+msgstr "Opozorilo nastavitve"
 
 #: 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 "Spletni straÅ¾nik Å¡e ni ustrezno nastavljen in ne omogoÄa usklajevanja, saj je nastavitev WebDAV okvarjena."
 
 #: templates/admin.php:33
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr ""
+msgstr "Preverite <a href='%s'>navodila namestitve</a>."
 
 #: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
-msgstr ""
+msgstr "Manjka modul '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 "Manjka modul PHP 'fileinfo'. PriporoÄljivo je omogoÄiti ta modul za popolno zaznavanje vrst MIME."
 
 #: templates/admin.php:58
 msgid "Locale not working"
-msgstr ""
+msgstr "Jezikovne prilagoditve ne delujejo."
 
 #: templates/admin.php:63
 #, php-format
@@ -217,11 +218,11 @@ msgid ""
 "This ownCloud server can't set system locale to %s. This means that there "
 "might be problems with certain characters in file names. We strongly suggest"
 " to install the required packages on your system to support %s."
-msgstr ""
+msgstr "Na streÅ¾niku ownCloud ni mogoÄe nastaviti jezikovnih doloÄil na jezik %s. Najverjetneje so teÅ¾ave s posebnimi znaki v imenih datotek. PriporoÄljivo je namestiti zahtevane pakete za podporo jeziku %s."
 
 #: templates/admin.php:75
 msgid "Internet connection not working"
-msgstr ""
+msgstr "Internetna povezava ne deluje."
 
 #: templates/admin.php:78
 msgid ""
@@ -231,100 +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 "StreÅ¾nik ownCloud je brez delujoÄe internetne povezave. To pomeni, da bodo nekatere moÅ¾nosti onemogoÄene. Ne bo mogoÄe priklapljati zunanjih priklopnih toÄk, ne bo obvestil o posodobitvah ali namestitvah programske opreme, prav tako najverjetneje ne bo mogoÄe poÅ¡iljati obvestilnih sporoÄil preko elektronske poÅ¡te. Za uporabo vseh zmoÅ¾nosti oblaka ownCloud, mora biti internetna povezava vzpostavljena in delujoÄa."
 
 #: templates/admin.php:92
 msgid "Cron"
-msgstr ""
+msgstr "PeriodiÄno opravilo"
 
 #: templates/admin.php:101
 msgid "Execute one task with each page loaded"
-msgstr ""
+msgstr "Izvedi eno nalogo z vsako naloÅ¾eno stranjo."
 
 #: 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 "Datoteka cron.php je vpisana pri storitvi webcron. Preko protokola HTTP je datoteka cron.php, ki se nahaja v korenski mapi ownCloud, klicana enkrat na minuto."
 
 #: 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 "Uporaba sistemske storitve cron. Preko sistemskega posla cron je datoteka cron.php, ki se nahaja v mapi ownCloud, klicana enkrat na minuto."
 
 #: templates/admin.php:128
 msgid "Sharing"
-msgstr ""
+msgstr "Souporaba"
 
 #: templates/admin.php:134
 msgid "Enable Share API"
-msgstr ""
+msgstr "OmogoÄi API souporabe"
 
 #: templates/admin.php:135
 msgid "Allow apps to use the Share API"
-msgstr ""
+msgstr "Dovoli programom uporabo vmesnika API souporabe"
 
 #: templates/admin.php:142
 msgid "Allow links"
-msgstr ""
+msgstr "Dovoli povezave"
 
 #: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
-msgstr ""
+msgstr "Uporabnikom dovoli souporabo predmetov z javnimi povezavami"
 
 #: templates/admin.php:150
 msgid "Allow resharing"
-msgstr ""
+msgstr "Dovoli nadaljnjo souporabo"
 
 #: templates/admin.php:151
 msgid "Allow users to share items shared with them again"
-msgstr ""
+msgstr "Uporabnikom dovoli nadaljnjo souporabo predmetov"
 
 #: templates/admin.php:158
 msgid "Allow users to share with anyone"
-msgstr ""
+msgstr "Uporabnikom dovoli souporabo s komerkoli"
 
 #: templates/admin.php:161
 msgid "Allow users to only share with users in their groups"
-msgstr ""
+msgstr "Uporabnikom dovoli souporabo z ostalimi uporabniki njihove skupine"
 
 #: templates/admin.php:168
 msgid "Security"
-msgstr ""
+msgstr "Varnost"
 
 #: templates/admin.php:181
 msgid "Enforce HTTPS"
-msgstr ""
+msgstr "Zahtevaj uporabo HTTPS"
 
 #: templates/admin.php:182
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
-msgstr ""
+msgstr "Zahtevaj Å¡ifrirano povezovanje odjemalcev v oblak ownCloud"
 
 #: templates/admin.php:185
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
-msgstr ""
+msgstr "Prijava mora biti vzpostavljena z uporabo protokola HTTPS za omogoÄanje Å¡ifriranja SSL."
 
 #: templates/admin.php:195
 msgid "Log"
-msgstr ""
+msgstr "Dnevnik"
 
 #: templates/admin.php:196
 msgid "Log level"
-msgstr ""
+msgstr "Raven beleÅ¾enja"
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
 msgstr "VeÄ"
 
-#: templates/admin.php:230 templates/personal.php:102
+#: templates/admin.php:228
+msgid "Less"
+msgstr "Manj"
+
+#: templates/admin.php:235 templates/personal.php:105
 msgid "Version"
 msgstr "RazliÄica"
 
-#: templates/admin.php:233 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 "
@@ -332,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 "Programski paket razvija <a href=\"http://ownCloud.org/contact\" target=\"_blank\">skupnost ownCloud</a>. <a href=\"https://github.com/owncloud\" target=\"_blank\">Izvorna koda</a> je objavljena pod pogoji dovoljenja <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"SploÅ¡no javno dovoljenje Affero\">AGPL</abbr></a>."
+msgstr "Programski paket razvija <a href=\"http://ownCloud.org/contact\" target=\"_blank\">skupnost ownCloud</a>. <a href=\"https://github.com/owncloud\" target=\"_blank\">Izvorna koda</a> je objavljena pod pogoji <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"SploÅ¡nega javnega dovoljenja Affero\">AGPL</abbr></a>."
 
 #: templates/apps.php:11
 msgid "Add your App"
@@ -344,7 +349,7 @@ msgstr "VeÄ programov"
 
 #: templates/apps.php:28
 msgid "Select an App"
-msgstr "Izberite program"
+msgstr "Izbor programa"
 
 #: templates/apps.php:34
 msgid "See application page at apps.owncloud.com"
@@ -352,7 +357,7 @@ msgstr "ObiÅ¡Äite spletno stran programa na apps.owncloud.com"
 
 #: templates/apps.php:36
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
-msgstr "<span class=\"licence\"></span>-z dovoljenjem s strani <span class=\"author\"></span>"
+msgstr "<span class=\"licence\"></span>-z dovoljenjem <span class=\"author\"></span>"
 
 #: templates/apps.php:38
 msgid "Update"
@@ -364,7 +369,7 @@ msgstr "UporabniÅ¡ka dokumentacija"
 
 #: templates/help.php:6
 msgid "Administrator Documentation"
-msgstr "Administratorjeva dokumentacija"
+msgstr "SkrbniÅ¡ka dokumentacija"
 
 #: templates/help.php:9
 msgid "Online Documentation"
@@ -376,16 +381,16 @@ msgstr "Forum"
 
 #: templates/help.php:14
 msgid "Bugtracker"
-msgstr "Sistem za sledenje napakam"
+msgstr "Sledilnik hroÅ¡Äev"
 
 #: templates/help.php:17
 msgid "Commercial Support"
-msgstr "Komercialna podpora"
+msgstr "Podpora strankam"
 
 #: templates/personal.php:8
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr "Uporabljate <strong>%s</strong> od razpoloÅ¾ljivih <strong>%s</strong>"
+msgstr "Uporabljenega je <strong>%s</strong> od razpoloÅ¾ljivih <strong>%s</strong> prostora."
 
 #: templates/personal.php:15
 msgid "Get the apps to sync your files"
@@ -393,15 +398,15 @@ msgstr "Pridobi programe za usklajevanje datotek"
 
 #: templates/personal.php:26
 msgid "Show First Run Wizard again"
-msgstr ""
+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:77
 msgid "Password"
 msgstr "Geslo"
 
 #: templates/personal.php:38
 msgid "Your password was changed"
-msgstr "VaÅ¡e geslo je spremenjeno"
+msgstr "Geslo je spremenjeno"
 
 #: templates/personal.php:39
 msgid "Unable to change your password"
@@ -419,82 +424,70 @@ msgstr "Novo geslo"
 msgid "Change password"
 msgstr "Spremeni geslo"
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:76
 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 ""
+msgstr "Prikazano ime"
 
-#: templates/personal.php:61
-msgid "Change display name"
-msgstr ""
-
-#: templates/personal.php:70
+#: templates/personal.php:68
 msgid "Email"
-msgstr "Elektronska poÅ¡ta"
+msgstr "Elektronski naslov"
 
-#: templates/personal.php:72
+#: templates/personal.php:70
 msgid "Your email address"
-msgstr "VaÅ¡ elektronski poÅ¡tni naslov"
+msgstr "Osebni elektronski naslov"
 
-#: templates/personal.php:73
+#: templates/personal.php:71
 msgid "Fill in an email address to enable password recovery"
-msgstr "VpiÅ¡ite vaÅ¡ elektronski naslov in s tem omogoÄite obnovitev gesla"
+msgstr "VpiÅ¡ite osebni elektronski naslov in s tem omogoÄite obnovitev gesla"
 
-#: templates/personal.php:79 templates/personal.php:80
+#: templates/personal.php:77 templates/personal.php:78
 msgid "Language"
 msgstr "Jezik"
 
-#: templates/personal.php:86
+#: templates/personal.php:89
 msgid "Help translate"
-msgstr "Pomagajte pri prevajanju"
+msgstr "Sodelujte pri prevajanju"
 
-#: templates/personal.php:91
+#: templates/personal.php:94
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:93
+#: templates/personal.php:96
 msgid "Use this address to connect to your ownCloud in your file manager"
-msgstr "Uporabite ta naslov za povezavo do ownCloud v vaÅ¡em upravljalniku datotek."
+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:75
 msgid "Login Name"
-msgstr ""
+msgstr "Prijavno ime"
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr "Ustvari"
 
-#: templates/users.php:35
+#: templates/users.php:33
 msgid "Default Storage"
 msgstr "Privzeta shramba"
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:39 templates/users.php:133
 msgid "Unlimited"
 msgstr "Neomejeno"
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:57 templates/users.php:148
 msgid "Other"
 msgstr "Drugo"
 
-#: templates/users.php:84
+#: templates/users.php:82
 msgid "Storage"
 msgstr "Shramba"
 
-#: templates/users.php:95
+#: templates/users.php:93
 msgid "change display name"
-msgstr ""
+msgstr "spremeni prikazano ime"
 
-#: templates/users.php:99
+#: templates/users.php:97
 msgid "set new password"
-msgstr ""
+msgstr "nastavi novo geslo"
 
-#: templates/users.php:134
+#: templates/users.php:128
 msgid "Default"
 msgstr "Privzeto"
diff --git a/l10n/sl/user_ldap.po b/l10n/sl/user_ldap.po
index e4a0d78c54a9f11a5774eda95b564502bbae9539..b3d02a17606b343c7752998dcd91b82af9615e6f 100644
--- a/l10n/sl/user_ldap.po
+++ b/l10n/sl/user_ldap.po
@@ -3,14 +3,12 @@
 # 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-03-02 00:03+0100\n"
-"PO-Revision-Date: 2013-03-01 23:04+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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"
@@ -19,25 +17,29 @@ 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 ""
+msgstr "Brisanje nastavitev streÅ¾nika je spodletelo."
 
 #: ajax/testConfiguration.php:36
 msgid "The configuration is valid and the connection could be established!"
-msgstr ""
+msgstr "Nastavitev je veljavna, zato je povezavo mogoÄe vzpostaviti!"
 
 #: ajax/testConfiguration.php:39
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
-msgstr ""
+msgstr "Nastavitev je veljavna, vendar pa je vez Bind spodletela. Preveriti je treba nastavitve streÅ¾nika in ustreznost poveril."
 
 #: ajax/testConfiguration.php:43
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
-msgstr ""
+msgstr "Nastavitev je veljavna. VeÄ podrobnosti je zapisanih v dnevniku ownCloud."
 
 #: js/settings.js:66
 msgid "Deletion failed"
@@ -45,291 +47,373 @@ msgstr "Brisanje je spodletelo."
 
 #: js/settings.js:82
 msgid "Take over settings from recent server configuration?"
-msgstr ""
+msgstr "Ali naj se prevzame nastavitve nedavne nastavitve streÅ¾nika?"
 
 #: js/settings.js:83
 msgid "Keep settings?"
-msgstr ""
+msgstr "Ali nas se nastavitve ohranijo?"
 
 #: js/settings.js:97
 msgid "Cannot add server configuration"
+msgstr "Ni mogoÄe dodati nastavitev streÅ¾nika"
+
+#: js/settings.js:111
+msgid "mappings cleared"
 msgstr ""
 
-#: js/settings.js:121
+#: 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 ""
+msgstr "Preizkus povezave je uspeÅ¡no konÄan."
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
-msgstr ""
+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 ""
+msgstr "Ali res Å¾elite izbrisati trenutne nastavitve streÅ¾nika?"
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
-msgstr ""
+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> Aplikaciji user_ldap in user_webdavauth nista zdruÅ¾ljivi. Morda boste opazili nepriÄakovano obnaÅ¡anje sistema. Prosimo, prosite vaÅ¡ega skrbnika, da eno od aplikacij onemogoÄi."
+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 ""
+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 ""
+msgstr "Nastavitev streÅ¾nika"
 
-#: templates/settings.php:18
+#: templates/settings.php:32
 msgid "Add Server Configuration"
-msgstr ""
+msgstr "Dodaj nastavitve streÅ¾nika"
 
-#: templates/settings.php:23
+#: templates/settings.php:37
 msgid "Host"
 msgstr "Gostitelj"
 
-#: templates/settings.php:25
+#: 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:26
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "Osnovni DN"
 
-#: templates/settings.php:27
+#: templates/settings.php:41
 msgid "One Base DN per line"
-msgstr ""
+msgstr "En osnovni DN na vrstico"
 
-#: templates/settings.php:28
+#: 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 Napredno"
+msgstr "Osnovni DN za uporabnike in skupine lahko doloÄite v zavihku naprednih moÅ¾nosti."
 
-#: templates/settings.php:30
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "Uporabnik DN"
 
-#: 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 "DN uporabnikovega odjemalca, s katerim naj se opravi vezava, npr. uid=agent,dc=example,dc=com. Za anonimni dostop sta polji DN in geslo prazni."
+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:33
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Geslo"
 
-#: templates/settings.php:36
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
-msgstr "Za anonimni dostop sta polji DN in geslo prazni."
+msgstr "Za brezimni dostop sta polji DN in geslo prazni."
 
-#: templates/settings.php:37
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "Filter prijav uporabnikov"
 
-#: 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 "DoloÄi filter, uporabljen pri prijavi. %%uid nadomesti uporabniÅ¡ko ime za prijavo."
+msgstr "DoloÄi filter, uporabljen pri prijavi. %%uid nadomesti uporabniÅ¡ko ime v postopku prijave."
 
-#: templates/settings.php:41
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "Uporabite vsebnik %%uid, npr. \"uid=%%uid\"."
 
-#: templates/settings.php:42
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Filter seznama uporabnikov"
 
-#: templates/settings.php:45
+#: 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:46
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "Brez kateregakoli vsebnika, npr. \"objectClass=person\"."
 
-#: templates/settings.php:47
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "Filter skupin"
 
-#: templates/settings.php:50
+#: 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:51
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "Brez katerekoli vsebnika, npr. \"objectClass=posixGroup\"."
 
-#: templates/settings.php:55
+#: templates/settings.php:69
 msgid "Connection Settings"
-msgstr ""
+msgstr "Nastavitve povezave"
 
-#: templates/settings.php:57
+#: templates/settings.php:71
 msgid "Configuration Active"
-msgstr ""
+msgstr "Dejavna nastavitev"
 
-#: templates/settings.php:57
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
-msgstr ""
+msgstr "Neizbrana moÅ¾nost preskoÄi nastavitev."
 
-#: templates/settings.php:58
+#: templates/settings.php:72
 msgid "Port"
 msgstr "Vrata"
 
-#: templates/settings.php:59
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
-msgstr ""
+msgstr "Varnostna kopija (replika) podatkov gostitelja"
 
-#: 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 ""
+msgstr "Podati je treba izbirno varnostno kopijo gostitelja. Ta mora biti natanÄna replika streÅ¾nika LDAP/AD."
 
-#: templates/settings.php:60
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
-msgstr ""
+msgstr "Varnostna kopija (replika) podatka vrat"
 
-#: templates/settings.php:61
+#: templates/settings.php:75
 msgid "Disable Main Server"
-msgstr ""
+msgstr "OnemogoÄi glavni streÅ¾nik"
 
-#: templates/settings.php:61
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
-msgstr ""
+msgstr "Ob priklopu bo streÅ¾nik ownCloud povezan le s kopijo (repliko) streÅ¾nika."
 
-#: templates/settings.php:62
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "Uporabi TLS"
 
-#: templates/settings.php:62
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
-msgstr ""
+msgstr "StreÅ¾nika ni priporoÄljivo uporabljati za povezave LDAPS. Povezava bo spodletela."
 
-#: templates/settings.php:63
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "StreÅ¾nik LDAP ne upoÅ¡teva velikosti Ärk (Windows)"
 
-#: templates/settings.php:64
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
-msgstr "OnemogoÄi potrditev veljavnosti potrdila SSL."
+msgstr "OnemogoÄi doloÄanje veljavnosti potrdila SSL."
 
-#: 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 "V primeru, da povezava deluje le s to moÅ¾nostjo, uvozite potrdilo SSL iz streÅ¾nika LDAP na vaÅ¡ streÅ¾nik ownCloud."
+msgstr "Kadar deluje povezava le s to moÅ¾nostjo, uvozite potrdilo SSL iz streÅ¾nika LDAP na vaÅ¡ streÅ¾nik ownCloud."
 
-#: templates/settings.php:64
+#: 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:65
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
-msgstr ""
+msgstr "Predpomni podatke TTL"
 
-#: templates/settings.php:65
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr "v sekundah. Sprememba izprazni predpomnilnik."
 
-#: templates/settings.php:67
+#: templates/settings.php:81
 msgid "Directory Settings"
-msgstr ""
+msgstr "Nastavitve mape"
 
-#: templates/settings.php:69
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr "Polje za uporabnikovo prikazano ime"
 
-#: templates/settings.php:69
+#: 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:70
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "Osnovno uporabniÅ¡ko drevo"
 
-#: templates/settings.php:70
+#: templates/settings.php:84
 msgid "One User Base DN per line"
-msgstr ""
+msgstr "Eno osnovno uporabniÅ¡ko ime DN na vrstico"
 
-#: templates/settings.php:71
+#: templates/settings.php:85
 msgid "User Search Attributes"
-msgstr ""
+msgstr "Uporabi atribute iskanja"
 
-#: templates/settings.php:71 templates/settings.php:74
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
-msgstr ""
+msgstr "Izbirno; en atribut na vrstico"
 
-#: templates/settings.php:72
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr "Polje za prikazano ime skupine"
 
-#: templates/settings.php:72
+#: 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:73
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "Osnovno drevo skupine"
 
-#: templates/settings.php:73
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
-msgstr ""
+msgstr "Eno osnovno ime skupine DN na vrstico"
 
-#: templates/settings.php:74
+#: templates/settings.php:88
 msgid "Group Search Attributes"
-msgstr ""
+msgstr "Atributi iskanja skupine"
 
-#: templates/settings.php:75
+#: templates/settings.php:89
 msgid "Group-Member association"
-msgstr "Povezava Älana skupine"
+msgstr "Povezava Älan-skupina"
 
-#: templates/settings.php:77
+#: templates/settings.php:91
 msgid "Special Attributes"
-msgstr ""
+msgstr "Posebni atributi"
 
-#: templates/settings.php:79
+#: templates/settings.php:93
 msgid "Quota Field"
-msgstr ""
+msgstr "Polje koliÄinske omejitve"
 
-#: templates/settings.php:80
+#: templates/settings.php:94
 msgid "Quota Default"
-msgstr ""
+msgstr "Privzeta koliÄinska omejitev"
 
-#: templates/settings.php:80
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr "v bajtih"
 
-#: templates/settings.php:81
+#: templates/settings.php:95
 msgid "Email Field"
-msgstr ""
+msgstr "Polje elektronske poÅ¡te"
 
-#: templates/settings.php:82
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
-msgstr ""
+msgstr "Pravila poimenovanja uporabniÅ¡ke osebne mape"
 
-#: templates/settings.php:82
+#: 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). V nasprotnem primeru navedite atribut LDAP/AD."
+msgstr "Pustite prazno za uporabniÅ¡ko ime (privzeto), sicer navedite atribut LDAP/AD."
 
-#: templates/settings.php:86
-msgid "Test Configuration"
+#: templates/settings.php:101
+msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:86
+#: 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:111
 msgid "Help"
 msgstr "PomoÄ"
diff --git a/l10n/sl/user_webdavauth.po b/l10n/sl/user_webdavauth.po
index 05172dc5b954ff05bdc862587c0a17f613b18d88..dc42b6b156404617e9baf08f5f654e884ab495f0 100644
--- a/l10n/sl/user_webdavauth.po
+++ b/l10n/sl/user_webdavauth.po
@@ -3,13 +3,14 @@
 # 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.
 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-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -20,15 +21,15 @@ msgstr ""
 
 #: templates/settings.php:3
 msgid "WebDAV Authentication"
-msgstr ""
+msgstr "Overitev WebDAV"
 
 #: templates/settings.php:4
 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 "
 "credentials, and all other responses as valid credentials."
-msgstr ""
+msgstr "Sistem ownCloud bo poslal uporabniÅ¡ka poverila na navedeni naslov URL. Ta vstavek preveri odziv in tolmaÄi kode stanja HTTP 401 in HTTP 403 kot spodletel odgovor in vse ostale odzive kot veljavna poverila."
diff --git a/l10n/sq/core.po b/l10n/sq/core.po
index 4c77ff63f84f368e0398b1f5253805751e4bf509..758cd937b6126d146be30e7ada41f5bd2a34d74c 100644
--- a/l10n/sq/core.po
+++ b/l10n/sq/core.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# 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-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:03+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10: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"
@@ -17,549 +18,597 @@ msgstr ""
 "Language: sq\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:84
+#: ajax/share.php:97
 #, php-format
 msgid "User %s shared a file with you"
-msgstr ""
+msgstr "PÃ«rdoruesi %s ndau me ju njÃ« skedar"
 
-#: ajax/share.php:86
+#: ajax/share.php:99
 #, php-format
 msgid "User %s shared a folder with you"
-msgstr ""
+msgstr "PÃ«rdoruesi %s ndau me ju njÃ« dosje"
 
-#: ajax/share.php:88
+#: ajax/share.php:101
 #, php-format
 msgid ""
 "User %s shared the file \"%s\" with you. It is available for download here: "
 "%s"
-msgstr ""
+msgstr "PÃ«rdoruesi %s ndau me ju skedarin \"%s\". Ky skedar Ã«shtÃ« gati pÃ«r shkarkim nga kÃ«tu: %s"
 
-#: ajax/share.php:90
+#: ajax/share.php:104
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
 "here: %s"
-msgstr ""
+msgstr "PÃ«rdoruesi %s ndau me ju dosjen \"%s\". Kjo dosje Ã«shtÃ« gati pÃ«r shkarkim nga kÃ«to: %s"
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
-msgstr ""
+msgstr "Mungon tipi i kategorisÃ«."
 
 #: ajax/vcategories/add.php:30
 msgid "No category to add?"
-msgstr ""
+msgstr "AsnjÃ« kategori pÃ«r tÃ« shtuar?"
 
 #: ajax/vcategories/add.php:37
-msgid "This category already exists: "
-msgstr ""
+#, php-format
+msgid "This category already exists: %s"
+msgstr "Kjo kategori tashmÃ« ekziston: %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 "Mungon tipi i objektit."
 
 #: ajax/vcategories/addToFavorites.php:30
 #: ajax/vcategories/removeFromFavorites.php:30
 #, php-format
 msgid "%s ID not provided."
-msgstr ""
+msgstr "Mungon ID-ja e %s."
 
 #: ajax/vcategories/addToFavorites.php:35
 #, php-format
 msgid "Error adding %s to favorites."
-msgstr ""
+msgstr "Veprim i gabuar gjatÃ« shtimit tÃ« %s tek tÃ« parapÃ«lqyerat."
 
 #: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "Nuk selektuar pÃ«r tu eliminuar asnjÃ« kategori."
 
 #: ajax/vcategories/removeFromFavorites.php:35
 #, php-format
 msgid "Error removing %s from favorites."
-msgstr ""
+msgstr "Veprim i gabuar gjatÃ« heqjes sÃ« %s nga tÃ« parapÃ«lqyerat."
+
+#: js/config.php:34
+msgid "Sunday"
+msgstr "E djelÃ«"
+
+#: js/config.php:35
+msgid "Monday"
+msgstr "E hÃ«nÃ«"
+
+#: js/config.php:36
+msgid "Tuesday"
+msgstr "E martÃ«"
+
+#: js/config.php:37
+msgid "Wednesday"
+msgstr "E mÃ«rkurÃ«"
+
+#: js/config.php:38
+msgid "Thursday"
+msgstr "E enjte"
+
+#: js/config.php:39
+msgid "Friday"
+msgstr "E premte"
+
+#: js/config.php:40
+msgid "Saturday"
+msgstr "E shtunÃ«"
+
+#: js/config.php:45
+msgid "January"
+msgstr "Janar"
+
+#: js/config.php:46
+msgid "February"
+msgstr "Shkurt"
+
+#: js/config.php:47
+msgid "March"
+msgstr "Mars"
+
+#: js/config.php:48
+msgid "April"
+msgstr "Prill"
+
+#: js/config.php:49
+msgid "May"
+msgstr "Maj"
+
+#: js/config.php:50
+msgid "June"
+msgstr "Qershor"
+
+#: js/config.php:51
+msgid "July"
+msgstr "Korrik"
+
+#: js/config.php:52
+msgid "August"
+msgstr "Gusht"
+
+#: js/config.php:53
+msgid "September"
+msgstr "Shtator"
+
+#: js/config.php:54
+msgid "October"
+msgstr "Tetor"
+
+#: js/config.php:55
+msgid "November"
+msgstr "NÃ«ntor"
+
+#: js/config.php:56
+msgid "December"
+msgstr "Dhjetor"
 
-#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:286
 msgid "Settings"
-msgstr ""
+msgstr "Parametra"
 
-#: js/js.js:711
+#: js/js.js:718
 msgid "seconds ago"
-msgstr ""
+msgstr "sekonda mÃ« parÃ«"
 
-#: js/js.js:712
+#: js/js.js:719
 msgid "1 minute ago"
-msgstr ""
+msgstr "1 minutÃ« mÃ« parÃ«"
 
-#: js/js.js:713
+#: js/js.js:720
 msgid "{minutes} minutes ago"
-msgstr ""
+msgstr "{minutes} minuta mÃ« parÃ«"
 
-#: js/js.js:714
+#: js/js.js:721
 msgid "1 hour ago"
-msgstr ""
+msgstr "1 orÃ« mÃ« parÃ«"
 
-#: js/js.js:715
+#: js/js.js:722
 msgid "{hours} hours ago"
-msgstr ""
+msgstr "{hours} orÃ« mÃ« parÃ«"
 
-#: js/js.js:716
+#: js/js.js:723
 msgid "today"
-msgstr ""
+msgstr "sot"
 
-#: js/js.js:717
+#: js/js.js:724
 msgid "yesterday"
-msgstr ""
+msgstr "dje"
 
-#: js/js.js:718
+#: js/js.js:725
 msgid "{days} days ago"
-msgstr ""
+msgstr "{days} ditÃ« mÃ« parÃ«"
 
-#: js/js.js:719
+#: js/js.js:726
 msgid "last month"
-msgstr ""
+msgstr "muajin e shkuar"
 
-#: js/js.js:720
+#: js/js.js:727
 msgid "{months} months ago"
-msgstr ""
+msgstr "{months} muaj mÃ« parÃ«"
 
-#: js/js.js:721
+#: js/js.js:728
 msgid "months ago"
-msgstr ""
+msgstr "muaj mÃ« parÃ«"
 
-#: js/js.js:722
+#: js/js.js:729
 msgid "last year"
-msgstr ""
+msgstr "vitin e shkuar"
 
-#: js/js.js:723
+#: js/js.js:730
 msgid "years ago"
-msgstr ""
+msgstr "vite mÃ« parÃ«"
 
-#: js/oc-dialogs.js:126
-msgid "Choose"
-msgstr ""
+#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
+msgid "Ok"
+msgstr "NÃ« rregull"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
 msgid "Cancel"
-msgstr ""
+msgstr "Anulo"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr ""
+#: js/oc-dialogs.js:185
+msgid "Choose"
+msgstr "Zgjidh"
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:215
 msgid "Yes"
-msgstr ""
+msgstr "Po"
 
-#: js/oc-dialogs.js:180
-msgid "Ok"
-msgstr ""
+#: js/oc-dialogs.js:222
+msgid "No"
+msgstr "Jo"
 
 #: 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 "Nuk Ã«shtÃ« specifikuar tipi i objektit."
 
-#: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:554
-#: js/share.js:566
+#: 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 "Veprim i gabuar"
 
 #: js/oc-vcategories.js:179
 msgid "The app name is not specified."
-msgstr ""
+msgstr "Nuk Ã«shtÃ« specifikuar emri i app-it."
 
 #: js/oc-vcategories.js:194
 msgid "The required file {file} is not installed!"
-msgstr ""
+msgstr "Skedari i nevojshÃ«m {file} nuk Ã«shtÃ« i instaluar!"
 
-#: js/share.js:124 js/share.js:594
+#: js/share.js:30 js/share.js:45 js/share.js:87
+msgid "Shared"
+msgstr "NdarÃ«"
+
+#: js/share.js:90
+msgid "Share"
+msgstr "Nda"
+
+#: js/share.js:125 js/share.js:617
 msgid "Error while sharing"
-msgstr ""
+msgstr "Veprim i gabuar gjatÃ« ndarjes"
 
-#: js/share.js:135
+#: js/share.js:136
 msgid "Error while unsharing"
-msgstr ""
+msgstr "Veprim i gabuar gjatÃ« heqjes sÃ« ndarjes"
 
-#: js/share.js:142
+#: js/share.js:143
 msgid "Error while changing permissions"
-msgstr ""
+msgstr "Veprim i gabuar gjatÃ« ndryshimit tÃ« lejeve"
 
-#: js/share.js:151
+#: js/share.js:152
 msgid "Shared with you and the group {group} by {owner}"
-msgstr ""
+msgstr "NdarÃ« me ju dhe me grupin {group} nga {owner}"
 
-#: js/share.js:153
+#: js/share.js:154
 msgid "Shared with you by {owner}"
-msgstr ""
+msgstr "NdarÃ« me ju nga {owner}"
 
-#: js/share.js:158
+#: js/share.js:159
 msgid "Share with"
-msgstr ""
+msgstr "Nda me"
 
-#: js/share.js:163
+#: js/share.js:164
 msgid "Share with link"
-msgstr ""
+msgstr "Nda me lidhje"
 
-#: js/share.js:166
+#: js/share.js:167
 msgid "Password protect"
-msgstr ""
+msgstr "Mbro me kod"
 
-#: js/share.js:168 templates/installation.php:44 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
-msgstr ""
+msgstr "Kodi"
 
-#: js/share.js:172
+#: js/share.js:173
 msgid "Email link to person"
-msgstr ""
+msgstr "DÃ«rgo email me lidhjen"
 
-#: js/share.js:173
+#: js/share.js:174
 msgid "Send"
-msgstr ""
+msgstr "DÃ«rgo"
 
-#: js/share.js:177
+#: js/share.js:178
 msgid "Set expiration date"
-msgstr ""
+msgstr "Cakto datÃ«n e pÃ«rfundimit"
 
-#: js/share.js:178
+#: js/share.js:179
 msgid "Expiration date"
-msgstr ""
+msgstr "Data e pÃ«rfundimit"
 
-#: js/share.js:210
+#: js/share.js:211
 msgid "Share via email:"
-msgstr ""
+msgstr "Nda me email:"
 
-#: js/share.js:212
+#: js/share.js:213
 msgid "No people found"
-msgstr ""
+msgstr "Nuk u gjet asnjÃ« person"
 
-#: js/share.js:239
+#: js/share.js:251
 msgid "Resharing is not allowed"
-msgstr ""
+msgstr "Rindarja nuk lejohet"
 
-#: js/share.js:275
+#: js/share.js:287
 msgid "Shared in {item} with {user}"
-msgstr ""
+msgstr "NdarÃ« nÃ« {item} me {user}"
 
-#: js/share.js:296
+#: js/share.js:308
 msgid "Unshare"
-msgstr ""
+msgstr "Hiq ndarjen"
 
-#: js/share.js:308
+#: js/share.js:320
 msgid "can edit"
-msgstr ""
+msgstr "mund tÃ« ndryshosh"
 
-#: js/share.js:310
+#: js/share.js:322
 msgid "access control"
-msgstr ""
+msgstr "kontrollimi i hyrjeve"
 
-#: js/share.js:313
+#: js/share.js:325
 msgid "create"
-msgstr ""
+msgstr "krijo"
 
-#: js/share.js:316
+#: js/share.js:328
 msgid "update"
-msgstr ""
+msgstr "azhurno"
 
-#: js/share.js:319
+#: js/share.js:331
 msgid "delete"
-msgstr ""
+msgstr "elimino"
 
-#: js/share.js:322
+#: js/share.js:334
 msgid "share"
-msgstr ""
+msgstr "nda"
 
-#: js/share.js:356 js/share.js:541
+#: js/share.js:368 js/share.js:564
 msgid "Password protected"
-msgstr ""
+msgstr "Mbrojtur me kod"
 
-#: js/share.js:554
+#: js/share.js:577
 msgid "Error unsetting expiration date"
-msgstr ""
+msgstr "Veprim i gabuar gjatÃ« heqjes sÃ« datÃ«s sÃ« pÃ«rfundimit"
 
-#: js/share.js:566
+#: js/share.js:589
 msgid "Error setting expiration date"
-msgstr ""
+msgstr "Veprim i gabuar gjatÃ« caktimit tÃ« datÃ«s sÃ« pÃ«rfundimit"
 
-#: js/share.js:581
+#: js/share.js:604
 msgid "Sending ..."
-msgstr ""
+msgstr "Duke dÃ«rguar..."
 
-#: js/share.js:592
+#: js/share.js:615
 msgid "Email sent"
-msgstr ""
+msgstr "Email-i u dÃ«rgua"
 
-#: lostpassword/controller.php:47
+#: 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 "Azhurnimi dÃ«shtoi. Ju lutemi njoftoni pÃ«r kÃ«tÃ« problem <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">komunitetin ownCloud</a>."
+
+#: js/update.js:18
+msgid "The update was successful. Redirecting you to ownCloud now."
+msgstr "Azhurnimi u krye. Tani do t'ju kaloj tek ownCloud-i."
+
+#: lostpassword/controller.php:48
 msgid "ownCloud password reset"
-msgstr ""
+msgstr "Rivendosja e kodit tÃ« ownCloud-it"
 
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
-msgstr ""
+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 ""
+#: 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 ""
+#: 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 ""
+#: 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:39
-#: templates/login.php:28
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: templates/login.php:19
 msgid "Username"
-msgstr ""
+msgstr "PÃ«rdoruesi"
 
-#: lostpassword/templates/lostpassword.php:14
+#: lostpassword/templates/lostpassword.php:21
 msgid "Request reset"
-msgstr ""
+msgstr "BÃ«j kÃ«rkesÃ« pÃ«r rivendosjen"
 
 #: lostpassword/templates/resetpassword.php:4
 msgid "Your password was reset"
-msgstr ""
+msgstr "Kodi yt u rivendos"
 
 #: lostpassword/templates/resetpassword.php:5
 msgid "To login page"
-msgstr ""
+msgstr "Tek faqja e hyrjes"
 
 #: lostpassword/templates/resetpassword.php:8
 msgid "New password"
-msgstr ""
+msgstr "Kodi i ri"
 
 #: lostpassword/templates/resetpassword.php:11
 msgid "Reset password"
-msgstr ""
+msgstr "Rivendos kodin"
 
 #: strings.php:5
 msgid "Personal"
-msgstr ""
+msgstr "Personale"
 
 #: strings.php:6
 msgid "Users"
-msgstr ""
+msgstr "PÃ«rdoruesit"
 
 #: strings.php:7
 msgid "Apps"
-msgstr ""
+msgstr "App"
 
 #: strings.php:8
 msgid "Admin"
-msgstr ""
+msgstr "Admin"
 
 #: strings.php:9
 msgid "Help"
-msgstr ""
+msgstr "NdihmÃ«"
 
 #: templates/403.php:12
 msgid "Access forbidden"
-msgstr ""
+msgstr "Ndalohet hyrja"
 
 #: templates/404.php:12
 msgid "Cloud not found"
-msgstr ""
+msgstr "Cloud-i nuk u gjet"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
-msgstr ""
+msgstr "Ndrysho kategoritÃ«"
 
 #: templates/edit_categories_dialog.php:16
 msgid "Add"
-msgstr ""
+msgstr "Shto"
 
-#: templates/installation.php:23 templates/installation.php:31
+#: templates/installation.php:24 templates/installation.php:31
+#: templates/installation.php:38
 msgid "Security Warning"
-msgstr ""
+msgstr "ParalajmÃ«rim sigurie"
 
-#: templates/installation.php:24
+#: templates/installation.php:25
+msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
+msgstr "Versioni juaj i PHP-sÃ« Ã«shtÃ« i cÃ«nueshÃ«m nga sulmi NULL Byte (CVE-2006-7243)"
+
+#: templates/installation.php:26
+msgid "Please update your PHP installation to use ownCloud securely."
+msgstr "Ju lutem azhurnoni instalimin tuaj tÃ« PHP-sÃ« qÃ« tÃ« pÃ«rdorni ownCloud-in nÃ« mÃ«nyrÃ« tÃ« sigurt."
+
+#: templates/installation.php:32
 msgid ""
 "No secure random number generator is available, please enable the PHP "
 "OpenSSL extension."
-msgstr ""
+msgstr "Nuk disponohet asnjÃ« krijues numrash tÃ« rastÃ«sishÃ«m, ju lutem aktivizoni shtesÃ«n PHP OpenSSL."
 
-#: 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 ""
+msgstr "Pa njÃ« krijues numrash tÃ« rastÃ«sishÃ«m tÃ« sigurt njÃ« person i huaj mund tÃ« jetÃ« nÃ« gjendje tÃ« parashikojÃ« kodin dhe tÃ« marri llogarinÃ« tuaj."
 
-#: templates/installation.php:32
+#: templates/installation.php:39
 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 ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr "Dosja dhe skedarÃ«t e tÃ« dhÃ«nave tuaja mbase janÃ« tÃ« arritshme nga interneti sepse skedari .htaccess nuk po punon."
+
+#: 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 "PÃ«r mÃ« shumÃ« informacion mbi konfigurimin e duhur tÃ« serverit tuaj, ju lutem shikoni <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">dokumentacionin</a>."
 
-#: templates/installation.php:36
+#: templates/installation.php:44
 msgid "Create an <strong>admin account</strong>"
-msgstr ""
+msgstr "Krijo njÃ« <strong>llogari administruesi</strong>"
 
-#: templates/installation.php:50
+#: templates/installation.php:62
 msgid "Advanced"
-msgstr ""
+msgstr "TÃ« pÃ«rparuara"
 
-#: templates/installation.php:52
+#: templates/installation.php:64
 msgid "Data folder"
-msgstr ""
+msgstr "Emri i dosjes"
 
-#: templates/installation.php:59
+#: templates/installation.php:74
 msgid "Configure the database"
-msgstr ""
+msgstr "Konfiguro database-in"
 
-#: templates/installation.php:64 templates/installation.php:75
-#: templates/installation.php:85 templates/installation.php:95
+#: 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 "do tÃ« pÃ«rdoret"
 
-#: templates/installation.php:107
+#: templates/installation.php:137
 msgid "Database user"
-msgstr ""
+msgstr "PÃ«rdoruesi i database-it"
 
-#: templates/installation.php:111
+#: templates/installation.php:144
 msgid "Database password"
-msgstr ""
+msgstr "Kodi i database-it"
 
-#: templates/installation.php:115
+#: templates/installation.php:149
 msgid "Database name"
-msgstr ""
+msgstr "Emri i database-it"
 
-#: templates/installation.php:123
+#: templates/installation.php:159
 msgid "Database tablespace"
-msgstr ""
+msgstr "Tablespace-i i database-it"
 
-#: templates/installation.php:129
+#: templates/installation.php:166
 msgid "Database host"
-msgstr ""
+msgstr "Pozicioni (host) i database-it"
 
-#: templates/installation.php:134
+#: templates/installation.php:172
 msgid "Finish setup"
-msgstr ""
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Sunday"
-msgstr ""
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Monday"
-msgstr ""
+msgstr "Mbaro setup-in"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Tuesday"
-msgstr ""
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Wednesday"
-msgstr ""
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Thursday"
-msgstr ""
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Friday"
-msgstr ""
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Saturday"
-msgstr ""
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "January"
-msgstr ""
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "February"
-msgstr ""
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "March"
-msgstr ""
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "April"
-msgstr ""
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "May"
-msgstr ""
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "June"
-msgstr ""
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "July"
-msgstr ""
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "August"
-msgstr ""
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "September"
-msgstr ""
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "October"
-msgstr ""
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "November"
-msgstr ""
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "December"
-msgstr ""
-
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:40
 msgid "web services under your control"
+msgstr "shÃ«rbime web nÃ«n kontrollin tÃ«nd"
+
+#: templates/layout.user.php:36
+#, php-format
+msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:45
+#: templates/layout.user.php:61
 msgid "Log out"
-msgstr ""
+msgstr "Dalje"
 
-#: templates/login.php:10
+#: templates/login.php:9
 msgid "Automatic logon rejected!"
-msgstr ""
+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 ""
+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 ""
+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 ""
+msgstr "Ke humbur kodin?"
 
 #: templates/login.php:39
 msgid "remember"
-msgstr ""
+msgstr "kujto"
 
 #: templates/login.php:41
 msgid "Log in"
-msgstr ""
+msgstr "Hyrje"
+
+#: templates/login.php:47
+msgid "Alternative Logins"
+msgstr "Hyrje alternative"
 
 #: templates/part.pagenavi.php:3
 msgid "prev"
-msgstr ""
+msgstr "mbrapa"
 
 #: templates/part.pagenavi.php:20
 msgid "next"
-msgstr ""
+msgstr "para"
 
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
-msgstr ""
+msgstr "Po azhurnoj ownCloud-in me versionin %s. Mund tÃ« zgjasi pak."
diff --git a/l10n/sq/files.po b/l10n/sq/files.po
index ea89733fef69cbc2717940f039da92814917e99b..56ec4bbaf9c1fae52734fc99dfe41c0a22865eff 100644
--- a/l10n/sq/files.po
+++ b/l10n/sq/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-20 00:05+0100\n"
-"PO-Revision-Date: 2013-01-19 23:05+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
 "MIME-Version: 1.0\n"
@@ -17,291 +17,306 @@ msgstr ""
 "Language: sq\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:28 ajax/getstoragestats.php:11 ajax/upload.php:17
-#: ajax/upload.php:76 templates/index.php:18
-msgid "Upload"
-msgstr ""
-
 #: ajax/move.php:17
 #, php-format
 msgid "Could not move %s - File with this name already exists"
-msgstr ""
+msgstr "%s nuk u spostua - Aty ekziston njÃ« skedar me tÃ« njÃ«jtin emÃ«r"
 
-#: ajax/move.php:24
+#: ajax/move.php:27 ajax/move.php:30
 #, php-format
 msgid "Could not move %s"
-msgstr ""
-
-#: ajax/rename.php:19
-msgid "Unable to rename file"
-msgstr ""
+msgstr "%s nuk u spostua"
 
-#: ajax/upload.php:20
+#: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
-msgstr ""
+msgstr "Nuk u ngarkua asnjÃ« skedar. Veprim i gabuar i panjohur"
 
-#: ajax/upload.php:30
+#: ajax/upload.php:26
 msgid "There is no error, the file uploaded with success"
-msgstr ""
+msgstr "Nuk pati veprime tÃ« gabuara, skedari u ngarkua me sukses"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
-msgstr ""
+msgstr "Skedari i ngarkuar tejkalon udhÃ«zimin upload_max_filesize tek php.ini:"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:29
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
-msgstr ""
+msgstr "Skedari i ngarkuar tejkalon udhÃ«zimin MAX_FILE_SIZE tÃ« specifikuar nÃ« formularin HTML"
 
-#: ajax/upload.php:35
+#: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
-msgstr ""
+msgstr "Skedari i ngarkuar u ngarkua vetÃ«m pjesÃ«risht"
 
-#: ajax/upload.php:36
+#: ajax/upload.php:31
 msgid "No file was uploaded"
-msgstr ""
+msgstr "Nuk u ngarkua asnjÃ« skedar"
 
-#: ajax/upload.php:37
+#: ajax/upload.php:32
 msgid "Missing a temporary folder"
-msgstr ""
+msgstr "NjÃ« dosje e pÃ«rkohshme nuk u gjet"
 
-#: ajax/upload.php:38
+#: ajax/upload.php:33
 msgid "Failed to write to disk"
-msgstr ""
+msgstr "Ruajtja nÃ« disk dÃ«shtoi"
 
-#: ajax/upload.php:57
-msgid "Not enough space available"
-msgstr ""
+#: ajax/upload.php:51
+msgid "Not enough storage available"
+msgstr "Nuk ka mbetur hapÃ«sirÃ« memorizimi e mjaftueshme"
 
-#: ajax/upload.php:91
+#: ajax/upload.php:83
 msgid "Invalid directory."
-msgstr ""
+msgstr "Dosje e pavlefshme."
 
-#: appinfo/app.php:10
+#: appinfo/app.php:12
 msgid "Files"
-msgstr ""
+msgstr "SkedarÃ«t"
 
-#: js/fileactions.js:117 templates/index.php:82 templates/index.php:83
-msgid "Unshare"
-msgstr ""
+#: js/fileactions.js:116
+msgid "Share"
+msgstr "Nda"
 
-#: js/fileactions.js:119 templates/index.php:88 templates/index.php:89
+#: js/fileactions.js:126
+msgid "Delete permanently"
+msgstr "Elimino pÃ«rfundimisht"
+
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
-msgstr ""
+msgstr "Elimino"
 
-#: js/fileactions.js:181
+#: js/fileactions.js:194
 msgid "Rename"
-msgstr ""
+msgstr "RiemÃ«rto"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
+msgid "Pending"
+msgstr "Pezulluar"
+
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
-msgstr ""
+msgstr "{new_name} ekziston"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
-msgstr ""
+msgstr "zÃ«vÃ«ndÃ«so"
 
-#: js/filelist.js:205
+#: js/filelist.js:259
 msgid "suggest name"
-msgstr ""
+msgstr "sugjero njÃ« emÃ«r"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
-msgstr ""
+msgstr "anulo"
 
-#: js/filelist.js:254
-msgid "replaced {new_name}"
-msgstr ""
+#: 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:254 js/filelist.js:256 js/filelist.js:288 js/filelist.js:290
+#: js/filelist.js:306
 msgid "undo"
-msgstr ""
+msgstr "anulo"
 
-#: js/filelist.js:256
-msgid "replaced {new_name} with {old_name}"
-msgstr ""
+#: js/filelist.js:331
+msgid "perform delete operation"
+msgstr "ekzekuto operacionin e eliminimit"
 
-#: js/filelist.js:288
-msgid "unshared {files}"
-msgstr ""
+#: js/filelist.js:413
+msgid "1 file uploading"
+msgstr "Po ngarkohet 1 skedar"
 
-#: js/filelist.js:290
-msgid "deleted {files}"
-msgstr ""
+#: js/filelist.js:416 js/filelist.js:470
+msgid "files uploading"
+msgstr "po ngarkoj skedarÃ«t"
 
-#: js/files.js:48
+#: js/files.js:52
 msgid "'.' is an invalid file name."
-msgstr ""
+msgstr "'.' Ã«shtÃ« emÃ«r i pavlefshÃ«m."
 
-#: js/files.js:53
+#: js/files.js:56
 msgid "File name cannot be empty."
-msgstr ""
+msgstr "Emri i skedarit nuk mund tÃ« jetÃ« bosh."
 
-#: js/files.js:62
+#: js/files.js:64
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
-msgstr ""
+msgstr "EmÃ«r i pavlefshÃ«m, '\\', '/', '<', '>', ':', '\"', '|', '?' dhe '*' nuk lejohen."
+
+#: js/files.js:78
+msgid "Your storage is full, files can not be updated or synced anymore!"
+msgstr "HapÃ«sira juaj e memorizimit Ã«shtÃ« plot, nuk mund tÃ« ngarkoni apo sinkronizoni mÃ« skedarÃ«t."
 
-#: js/files.js:204
+#: js/files.js:82
+msgid "Your storage is almost full ({usedSpacePercent}%)"
+msgstr "HapÃ«sira juaj e memorizimit Ã«shtÃ« gati plot ({usedSpacePercent}%)"
+
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
-msgstr ""
+msgstr "Shkarkimi juaj po pÃ«rgatitet. Mund tÃ« duhet pak kohÃ« nqse skedarÃ«t janÃ« tÃ« mÃ«dhenj."
 
-#: js/files.js:242
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr ""
-
-#: js/files.js:242
-msgid "Upload Error"
-msgstr ""
-
-#: js/files.js:259
-msgid "Close"
-msgstr ""
-
-#: js/files.js:278 js/files.js:397 js/files.js:431
-msgid "Pending"
-msgstr ""
-
-#: js/files.js:298
-msgid "1 file uploading"
-msgstr ""
+msgstr "Nuk Ã«shtÃ« i mundur ngarkimi i skedarit tuaj sepse Ã«shtÃ« dosje ose ka dimension 0 byte"
 
-#: js/files.js:301 js/files.js:357 js/files.js:372
-msgid "{count} files uploading"
-msgstr ""
+#: js/files.js:277
+msgid "Not enough space available"
+msgstr "Nuk ka hapÃ«sirÃ« memorizimi e mjaftueshme"
 
-#: js/files.js:376 js/files.js:414
+#: js/files.js:317
 msgid "Upload cancelled."
-msgstr ""
+msgstr "Ngarkimi u anulua."
 
-#: js/files.js:486
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
-msgstr ""
+msgstr "Ngarkimi i skedarit Ã«shtÃ« nÃ« vazhdim. Nqse ndÃ«rroni faqen tani ngarkimi do tÃ« anulohet."
 
-#: js/files.js:559
+#: js/files.js:486
 msgid "URL cannot be empty."
-msgstr ""
+msgstr "URL-i nuk mund tÃ« jetÃ« bosh."
 
-#: js/files.js:565
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr ""
-
-#: js/files.js:775
-msgid "{count} files scanned"
-msgstr ""
+msgstr "Emri i dosjes Ã«shtÃ« i pavlefshÃ«m. PÃ«rdorimi i \"Shared\" Ã«shtÃ« i rezervuar nga Owncloud-i."
 
-#: js/files.js:783
-msgid "error while scanning"
-msgstr ""
+#: 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:857 templates/index.php:64
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
-msgstr ""
+msgstr "Emri"
 
-#: js/files.js:858 templates/index.php:75
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
-msgstr ""
+msgstr "Dimensioni"
 
-#: js/files.js:859 templates/index.php:77
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
-msgstr ""
+msgstr "Modifikuar"
 
-#: js/files.js:878
+#: js/files.js:898
 msgid "1 folder"
-msgstr ""
+msgstr "1 dosje"
 
-#: js/files.js:880
+#: js/files.js:900
 msgid "{count} folders"
-msgstr ""
+msgstr "{count} dosje"
 
-#: js/files.js:888
+#: js/files.js:908
 msgid "1 file"
-msgstr ""
+msgstr "1 skedar"
 
-#: js/files.js:890
+#: 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"
+
 #: templates/admin.php:5
 msgid "File handling"
-msgstr ""
+msgstr "Trajtimi i skedarit"
 
 #: templates/admin.php:7
 msgid "Maximum upload size"
-msgstr ""
+msgstr "Dimensioni maksimal i ngarkimit"
 
 #: templates/admin.php:10
 msgid "max. possible: "
-msgstr ""
+msgstr "maks. i mundur:"
 
 #: templates/admin.php:15
 msgid "Needed for multi-file and folder downloads."
-msgstr ""
+msgstr "Duhet pÃ«r shkarkimin e dosjeve dhe tÃ« skedarÃ«ve"
 
 #: templates/admin.php:17
 msgid "Enable ZIP-download"
-msgstr ""
+msgstr "Aktivizo shkarkimin e ZIP-eve"
 
 #: templates/admin.php:20
 msgid "0 is unlimited"
-msgstr ""
+msgstr "0 Ã«shtÃ« i pakufizuar"
 
 #: templates/admin.php:22
 msgid "Maximum input size for ZIP files"
-msgstr ""
+msgstr "Dimensioni maksimal i ngarkimit tÃ« skedarÃ«ve ZIP"
 
 #: templates/admin.php:26
 msgid "Save"
-msgstr ""
+msgstr "Ruaj"
 
 #: templates/index.php:7
 msgid "New"
-msgstr ""
+msgstr "I ri"
 
 #: templates/index.php:10
 msgid "Text file"
-msgstr ""
+msgstr "Skedar teksti"
 
 #: templates/index.php:12
 msgid "Folder"
-msgstr ""
+msgstr "Dosje"
 
 #: templates/index.php:14
 msgid "From link"
-msgstr ""
+msgstr "Nga lidhja"
+
+#: templates/index.php:42
+msgid "Deleted files"
+msgstr "SkedarÃ« tÃ« eliminuar"
 
-#: templates/index.php:41
+#: templates/index.php:48
 msgid "Cancel upload"
-msgstr ""
+msgstr "Anulo ngarkimin"
+
+#: 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:56
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
-msgstr ""
+msgstr "KÃ«tu nuk ka asgjÃ«. Ngarkoni diÃ§ka!"
 
-#: templates/index.php:70
+#: templates/index.php:75
 msgid "Download"
-msgstr ""
+msgstr "Shkarko"
 
-#: templates/index.php:102
+#: templates/index.php:87 templates/index.php:88
+msgid "Unshare"
+msgstr "Hiq ndarjen"
+
+#: templates/index.php:107
 msgid "Upload too large"
-msgstr ""
+msgstr "Ngarkimi Ã«shtÃ« shumÃ« i madh"
 
-#: templates/index.php:104
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
-msgstr ""
+msgstr "SkedarÃ«t qÃ« doni tÃ« ngarkoni tejkalojnÃ« dimensionet maksimale pÃ«r ngarkimet nÃ« kÃ«tÃ« server."
 
-#: templates/index.php:109
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
-msgstr ""
+msgstr "SkedarÃ«t po analizohen, ju lutemi pritni."
 
-#: templates/index.php:112
+#: templates/index.php:117
 msgid "Current scanning"
-msgstr ""
+msgstr "Analizimi aktual"
+
+#: templates/upgrade.php:2
+msgid "Upgrading filesystem cache..."
+msgstr "Po pÃ«rmirÃ«soj memorjen e filesystem-it..."
diff --git a/l10n/sq/files_encryption.po b/l10n/sq/files_encryption.po
index e62739f8f212a605b8e6bf6ebab042c1295f8bdb..bccdde2ed2ff00031954ee0e17d2a96af678904c 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: 2012-11-27 00:09+0100\n"
-"PO-Revision-Date: 2012-08-12 22:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-04-26 10:00+0200\n"
+"PO-Revision-Date: 2013-04-26 08:01+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,18 +17,22 @@ msgstr ""
 "Language: sq\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: templates/settings.php:3
+#: templates/settings-personal.php:4 templates/settings.php:5
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings.php:4
-msgid "Exclude the following file types from encryption"
+#: templates/settings-personal.php:7
+msgid "File encryption is enabled."
 msgstr ""
 
-#: templates/settings.php:5
-msgid "None"
+#: templates/settings-personal.php:11
+msgid "The following file types will not be encrypted:"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Exclude the following file types from encryption:"
 msgstr ""
 
-#: templates/settings.php:10
-msgid "Enable Encryption"
+#: templates/settings.php:12
+msgid "None"
 msgstr ""
diff --git a/l10n/sq/files_external.po b/l10n/sq/files_external.po
index e48f1229d3e9ac474af66a9ed9c70b968ed2bebb..7e3f1dba765ba5056eb5d47b26ea6d1c3f14d8fb 100644
--- a/l10n/sq/files_external.po
+++ b/l10n/sq/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-11 23:22+0000\n"
+"POT-Creation-Date: 2013-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
 "MIME-Version: 1.0\n"
@@ -17,104 +17,107 @@ msgstr ""
 "Language: sq\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:434
+#: 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:435
+#: 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:8 templates/settings.php:22
-msgid "Mount point"
+#: templates/settings.php:9 templates/settings.php:28
+msgid "Folder name"
 msgstr ""
 
-#: templates/settings.php:9
-msgid "Backend"
+#: templates/settings.php:10
+msgid "External storage"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:11
 msgid "Configuration"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid "Options"
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:13
 msgid "Applicable"
 msgstr ""
 
-#: templates/settings.php:27
-msgid "Add mount point"
+#: templates/settings.php:33
+msgid "Add storage"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:90
 msgid "None set"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:91
 msgid "All Users"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:92
 msgid "Groups"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:100
 msgid "Users"
-msgstr ""
+msgstr "PÃ«rdoruesit"
 
-#: templates/settings.php:108 templates/settings.php:109
+#: templates/settings.php:113 templates/settings.php:114
 #: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
-msgstr ""
+msgstr "Elimino"
 
-#: templates/settings.php:124
+#: templates/settings.php:129
 msgid "Enable User External Storage"
 msgstr ""
 
-#: templates/settings.php:125
+#: templates/settings.php:130
 msgid "Allow users to mount their own external storage"
 msgstr ""
 
-#: templates/settings.php:139
+#: templates/settings.php:141
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:158
+#: templates/settings.php:159
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/sq/files_sharing.po b/l10n/sq/files_sharing.po
index 110e4b2ac2b02defe4713356883cad5c39452f29..2ce9c10dbba27af2abb558d9855ea6fc3baebb68 100644
--- a/l10n/sq/files_sharing.po
+++ b/l10n/sq/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-11-27 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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"
@@ -19,30 +19,30 @@ msgstr ""
 
 #: templates/authenticate.php:4
 msgid "Password"
-msgstr ""
+msgstr "Kodi"
 
 #: templates/authenticate.php:6
 msgid "Submit"
-msgstr ""
+msgstr "Parashtro"
 
-#: templates/public.php:17
+#: templates/public.php:10
 #, php-format
 msgid "%s shared the folder %s with you"
-msgstr ""
+msgstr "%s ndau me ju dosjen %s"
 
-#: templates/public.php:19
+#: templates/public.php:13
 #, php-format
 msgid "%s shared the file %s with you"
-msgstr ""
+msgstr "%s ndau me ju skedarin %s"
 
-#: templates/public.php:22 templates/public.php:38
+#: templates/public.php:19 templates/public.php:43
 msgid "Download"
-msgstr ""
+msgstr "Shkarko"
 
-#: templates/public.php:37
+#: templates/public.php:40
 msgid "No preview available for"
-msgstr ""
+msgstr "Shikimi paraprak nuk Ã«shtÃ« i mundur pÃ«r"
 
-#: templates/public.php:43
+#: templates/public.php:50
 msgid "web services under your control"
-msgstr ""
+msgstr "shÃ«rbime web nÃ«n kontrollin tÃ«nd"
diff --git a/l10n/sq/files_trashbin.po b/l10n/sq/files_trashbin.po
new file mode 100644
index 0000000000000000000000000000000000000000..630e921b32fa4dc9113f87cd4b40b6335343f655
--- /dev/null
+++ b/l10n/sq/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-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sq\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/delete.php:42
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr "Nuk munda ta eliminoj pÃ«rfundimisht %s"
+
+#: ajax/undelete.php:42
+#, php-format
+msgid "Couldn't restore %s"
+msgstr "Nuk munda ta rivendos %s"
+
+#: js/trash.js:7 js/trash.js:96
+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
+msgid "Error"
+msgstr "Veprim i gabuar"
+
+#: js/trash.js:34
+msgid "delete file permanently"
+msgstr "eliminoje pÃ«rfundimisht skedarin"
+
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr "Elimino pÃ«rfundimisht"
+
+#: js/trash.js:174 templates/index.php:17
+msgid "Name"
+msgstr "Emri"
+
+#: js/trash.js:175 templates/index.php:27
+msgid "Deleted"
+msgstr "Eliminuar"
+
+#: js/trash.js:184
+msgid "1 folder"
+msgstr "1 dosje"
+
+#: js/trash.js:186
+msgid "{count} folders"
+msgstr "{count} dosje"
+
+#: js/trash.js:194
+msgid "1 file"
+msgstr "1 skedar"
+
+#: js/trash.js:196
+msgid "{count} files"
+msgstr "{count} skedarÃ«"
+
+#: templates/index.php:9
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr "KÃ«tu nuk ka asgjÃ«. Koshi juaj Ã«shtÃ« bosh!"
+
+#: templates/index.php:20 templates/index.php:22
+msgid "Restore"
+msgstr "Rivendos"
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr "Elimino"
+
+#: templates/part.breadcrumb.php:9
+msgid "Deleted Files"
+msgstr "SkedarÃ« tÃ« eliminuar"
diff --git a/l10n/sq/files_versions.po b/l10n/sq/files_versions.po
index 5128bf7cf1b90d70bef206dfdbaba55c5f7a8fd0..4520df0880ff05f779e09f437d1a167b7aca2253 100644
--- a/l10n/sq/files_versions.po
+++ b/l10n/sq/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-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"POT-Creation-Date: 2013-04-26 10:00+0200\n"
+"PO-Revision-Date: 2013-04-26 08:02+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
 "MIME-Version: 1.0\n"
@@ -17,14 +17,41 @@ msgstr ""
 "Language: sq\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/versions.js:16
-msgid "History"
+#: ajax/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
 msgstr ""
 
-#: templates/settings.php:3
-msgid "Files Versioning"
+#: history.php:40
+msgid "success"
 msgstr ""
 
-#: templates/settings.php:4
-msgid "Enable"
+#: 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/sq/lib.po b/l10n/sq/lib.po
index ce2ab5c3311d4103b3dd0e982bf88a302c9f5190..15687a76d36df670c23f41ce6abc1790d8218253 100644
--- a/l10n/sq/lib.po
+++ b/l10n/sq/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-17 00:26+0100\n"
-"PO-Revision-Date: 2013-01-16 23:26+0000\n"
+"POT-Creation-Date: 2013-04-28 01:57+0200\n"
+"PO-Revision-Date: 2013-04-27 23:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
 "MIME-Version: 1.0\n"
@@ -17,140 +17,225 @@ msgstr ""
 "Language: sq\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:301
+#: app.php:349
 msgid "Help"
-msgstr ""
+msgstr "NdihmÃ«"
 
-#: app.php:308
+#: app.php:362
 msgid "Personal"
-msgstr ""
+msgstr "Personale"
 
-#: app.php:313
+#: app.php:373
 msgid "Settings"
-msgstr ""
+msgstr "Parametra"
 
-#: app.php:318
+#: app.php:385
 msgid "Users"
-msgstr ""
+msgstr "PÃ«rdoruesit"
 
-#: app.php:325
+#: app.php:398
 msgid "Apps"
-msgstr ""
+msgstr "App"
 
-#: app.php:327
+#: app.php:406
 msgid "Admin"
-msgstr ""
+msgstr "Admin"
 
-#: files.php:365
+#: files.php:209
 msgid "ZIP download is turned off."
-msgstr ""
+msgstr "Shkarimi i skedarÃ«ve ZIP Ã«shtÃ« i Ã§aktivizuar."
 
-#: files.php:366
+#: files.php:210
 msgid "Files need to be downloaded one by one."
-msgstr ""
+msgstr "SkedarÃ«t duhet tÃ« shkarkohen njÃ« nga njÃ«."
 
-#: files.php:366 files.php:391
+#: files.php:211 files.php:244
 msgid "Back to Files"
-msgstr ""
+msgstr "Kthehu tek skedarÃ«t"
 
-#: files.php:390
+#: files.php:241
 msgid "Selected files too large to generate zip file."
-msgstr ""
+msgstr "SkedarÃ«t e selektuar janÃ« shumÃ« tÃ« mÃ«dhenj pÃ«r tÃ« krijuar njÃ« skedar ZIP."
 
 #: helper.php:228
 msgid "couldn't be determined"
-msgstr ""
+msgstr "nuk u vendos dot"
 
 #: json.php:28
 msgid "Application is not enabled"
-msgstr ""
+msgstr "Programi nuk Ã«shtÃ« i aktivizuar."
 
 #: json.php:39 json.php:62 json.php:73
 msgid "Authentication error"
-msgstr ""
+msgstr "Veprim i gabuar gjatÃ« vÃ«rtetimit tÃ« identitetit"
 
 #: json.php:51
 msgid "Token expired. Please reload page."
-msgstr ""
+msgstr "PÃ«rmbajtja ka skaduar. Ju lutemi ringarkoni faqen."
 
 #: search/provider/file.php:17 search/provider/file.php:35
 msgid "Files"
-msgstr ""
+msgstr "SkedarÃ«t"
 
 #: search/provider/file.php:26 search/provider/file.php:33
 msgid "Text"
-msgstr ""
+msgstr "Tekst"
 
 #: search/provider/file.php:29
 msgid "Images"
-msgstr ""
+msgstr "Foto"
+
+#: setup.php:34
+msgid "Set an admin username."
+msgstr "Cakto emrin e administratorit."
+
+#: setup.php:37
+msgid "Set an admin password."
+msgstr "Cakto kodin e administratorit."
+
+#: setup.php:55
+#, php-format
+msgid "%s enter the database username."
+msgstr "% shkruani pÃ«rdoruesin e database-it."
+
+#: setup.php:58
+#, php-format
+msgid "%s enter the database name."
+msgstr "%s shkruani emrin e database-it."
+
+#: setup.php:61
+#, php-format
+msgid "%s you may not use dots in the database name"
+msgstr "%s nuk mund tÃ« pÃ«rdorni pikat tek emri i database-it"
+
+#: setup.php:64
+#, php-format
+msgid "%s set the database host."
+msgstr "%s caktoni pozicionin (host) e database-it."
+
+#: setup.php:132 setup.php:325 setup.php:370
+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:234
+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:458 setup.php:525
+msgid "Oracle username and/or password not valid"
+msgstr "PÃ«rdoruesi dhe/apo kodi i Oracle-it i pavlefshÃ«m"
+
+#: setup.php:233
+msgid "MySQL username and/or password not valid"
+msgstr "PÃ«rdoruesi dhe/apo kodi i MySQL-it i pavlefshÃ«m."
+
+#: 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:583 setup.php:592 setup.php:600 setup.php:609
+#: setup.php:615
+#, php-format
+msgid "DB Error: \"%s\""
+msgstr "Veprim i gabuar i DB-it: \"%s\""
+
+#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
+#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
+#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#, php-format
+msgid "Offending command was: \"%s\""
+msgstr "Komanda e gabuar ishte: \"%s\""
+
+#: setup.php:304
+#, php-format
+msgid "MySQL user '%s'@'localhost' exists already."
+msgstr "PÃ«rdoruesi MySQL '%s'@'localhost' ekziston."
+
+#: setup.php:305
+msgid "Drop this user from MySQL"
+msgstr "Eliminoni kÃ«tÃ« pÃ«rdorues nga MySQL"
+
+#: setup.php:310
+#, php-format
+msgid "MySQL user '%s'@'%%' already exists"
+msgstr "PÃ«rdoruesi MySQL '%s'@'%%' ekziston"
+
+#: setup.php:311
+msgid "Drop this user from MySQL."
+msgstr "Eliminoni kÃ«tÃ« pÃ«rdorues nga MySQL."
+
+#: setup.php:584 setup.php:616
+#, php-format
+msgid "Offending command was: \"%s\", name: %s, password: %s"
+msgstr "Komanda e gabuar ishte: \"%s\", pÃ«rdoruesi: %s, kodi: %s"
+
+#: setup.php:636
+#, 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:858
+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:859
+#, 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>."
 
 #: template.php:113
 msgid "seconds ago"
-msgstr ""
+msgstr "sekonda mÃ« parÃ«"
 
 #: template.php:114
 msgid "1 minute ago"
-msgstr ""
+msgstr "1 minutÃ« mÃ« parÃ«"
 
 #: template.php:115
 #, php-format
 msgid "%d minutes ago"
-msgstr ""
+msgstr "%d minuta mÃ« parÃ«"
 
 #: template.php:116
 msgid "1 hour ago"
-msgstr ""
+msgstr "1 orÃ« mÃ« parÃ«"
 
 #: template.php:117
 #, php-format
 msgid "%d hours ago"
-msgstr ""
+msgstr "%d orÃ« mÃ« parÃ«"
 
 #: template.php:118
 msgid "today"
-msgstr ""
+msgstr "sot"
 
 #: template.php:119
 msgid "yesterday"
-msgstr ""
+msgstr "dje"
 
 #: template.php:120
 #, php-format
 msgid "%d days ago"
-msgstr ""
+msgstr "%d ditÃ« mÃ« parÃ«"
 
 #: template.php:121
 msgid "last month"
-msgstr ""
+msgstr "muajin e shkuar"
 
 #: template.php:122
 #, php-format
 msgid "%d months ago"
-msgstr ""
+msgstr "%d muaj mÃ« parÃ«"
 
 #: template.php:123
 msgid "last year"
-msgstr ""
+msgstr "vitin e shkuar"
 
 #: template.php:124
 msgid "years ago"
-msgstr ""
-
-#: updater.php:75
-#, php-format
-msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr ""
-
-#: updater.php:77
-msgid "up to date"
-msgstr ""
-
-#: updater.php:80
-msgid "updates check is disabled"
-msgstr ""
+msgstr "vite mÃ« parÃ«"
 
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
-msgstr ""
+msgstr "Kategoria \"%s\" nuk u gjet"
diff --git a/l10n/sq/settings.po b/l10n/sq/settings.po
index 7d7d18a26f7abd14a4ac58d9e7b1c8c41e77919e..4c1226537b114908af633193a3a4e782293dee7b 100644
--- a/l10n/sq/settings.po
+++ b/l10n/sq/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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"
@@ -21,6 +21,19 @@ msgstr ""
 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 "Veprim i gabuar gjatÃ« vÃ«rtetimit tÃ« identitetit"
+
+#: 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 ""
@@ -45,10 +58,6 @@ msgstr ""
 msgid "Unable to delete group"
 msgstr ""
 
-#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr ""
-
 #: ajax/removeuser.php:24
 msgid "Unable to delete user"
 msgstr ""
@@ -65,73 +74,315 @@ msgstr ""
 msgid "Admins can't remove themself from the admin group"
 msgstr ""
 
-#: ajax/togglegroups.php:28
+#: ajax/togglegroups.php:30
 #, php-format
 msgid "Unable to add user to group %s"
 msgstr ""
 
-#: ajax/togglegroups.php:34
+#: ajax/togglegroups.php:36
 #, php-format
 msgid "Unable to remove user from group %s"
 msgstr ""
 
-#: js/apps.js:28 js/apps.js:67
+#: 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:55
+#: 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 "Veprim i gabuar"
+
+#: 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:42 personal.php:43
+#: js/users.js:47
+msgid "deleted"
+msgstr ""
+
+#: js/users.js:47
+msgid "undo"
+msgstr "anulo"
+
+#: js/users.js:79
+msgid "Unable to remove user"
+msgstr ""
+
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
+#: templates/users.php:103
+msgid "Groups"
+msgstr ""
+
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
+msgid "Group Admin"
+msgstr ""
+
+#: js/users.js:115 templates/users.php:155
+msgid "Delete"
+msgstr "Elimino"
+
+#: js/users.js:269
+msgid "add group"
+msgstr ""
+
+#: js/users.js:420
+msgid "A valid username must be provided"
+msgstr ""
+
+#: js/users.js:421 js/users.js:427 js/users.js:442
+msgid "Error creating user"
+msgstr ""
+
+#: js/users.js:426
+msgid "A valid password must be provided"
+msgstr ""
+
+#: personal.php:35 personal.php:36
 msgid "__language_name__"
 msgstr ""
 
-#: templates/apps.php:10
-msgid "Add your App"
+#: templates/admin.php:15
+msgid "Security Warning"
+msgstr "ParalajmÃ«rim sigurie"
+
+#: 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 "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."
+
+#: templates/admin.php:33
+#, 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>."
+
+#: 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: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:3
+#: templates/apps.php:38
+msgid "Update"
+msgstr "Azhurno"
+
+#: templates/help.php:4
 msgid "User Documentation"
 msgstr ""
 
-#: templates/help.php:4
+#: templates/help.php:6
 msgid "Administrator Documentation"
 msgstr ""
 
-#: templates/help.php:6
+#: templates/help.php:9
 msgid "Online Documentation"
 msgstr ""
 
-#: templates/help.php:7
+#: templates/help.php:11
 msgid "Forum"
 msgstr ""
 
-#: templates/help.php:9
+#: templates/help.php:14
 msgid "Bugtracker"
 msgstr ""
 
-#: templates/help.php:11
+#: templates/help.php:17
 msgid "Commercial Support"
 msgstr ""
 
@@ -140,128 +391,102 @@ msgstr ""
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:12
-msgid "Clients"
-msgstr ""
-
-#: templates/personal.php:13
-msgid "Download Desktop Clients"
-msgstr ""
-
-#: templates/personal.php:14
-msgid "Download Android Client"
-msgstr ""
-
 #: templates/personal.php:15
-msgid "Download iOS Client"
+msgid "Get the apps to sync your files"
+msgstr "Merrni app-et pÃ«r sinkronizimin e skedarÃ«ve tuaj"
+
+#: templates/personal.php:26
+msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
 msgid "Password"
-msgstr ""
+msgstr "Kodi"
 
-#: templates/personal.php:22
+#: templates/personal.php:38
 msgid "Your password was changed"
 msgstr ""
 
-#: templates/personal.php:23
+#: templates/personal.php:39
 msgid "Unable to change your password"
 msgstr ""
 
-#: templates/personal.php:24
+#: templates/personal.php:40
 msgid "Current password"
 msgstr ""
 
-#: templates/personal.php:25
+#: templates/personal.php:42
 msgid "New password"
-msgstr ""
+msgstr "Kodi i ri"
 
-#: templates/personal.php:26
-msgid "show"
+#: templates/personal.php:44
+msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:27
-msgid "Change password"
+#: templates/personal.php:56 templates/users.php:76
+msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:33
+#: templates/personal.php:68
 msgid "Email"
-msgstr ""
+msgstr "Email-i"
 
-#: templates/personal.php:34
+#: templates/personal.php:70
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:35
+#: templates/personal.php:71
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:41 templates/personal.php:42
+#: templates/personal.php:77 templates/personal.php:78
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:47
+#: templates/personal.php:89
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:52
+#: templates/personal.php:94
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:54
+#: templates/personal.php:96
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
-#: templates/personal.php:63
-msgid "Version"
+#: templates/users.php:21 templates/users.php:75
+msgid "Login Name"
 msgstr ""
 
-#: templates/personal.php:65
-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/users.php:21 templates/users.php:81
-msgid "Name"
-msgstr ""
-
-#: templates/users.php:26 templates/users.php:83 templates/users.php:103
-msgid "Groups"
-msgstr ""
-
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr ""
 
-#: templates/users.php:35
+#: templates/users.php:33
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:42 templates/users.php:138
+#: templates/users.php:39 templates/users.php:133
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:60 templates/users.php:153
+#: templates/users.php:57 templates/users.php:148
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:85 templates/users.php:117
-msgid "Group Admin"
+#: templates/users.php:82
+msgid "Storage"
 msgstr ""
 
-#: templates/users.php:87
-msgid "Storage"
+#: templates/users.php:93
+msgid "change display name"
 msgstr ""
 
-#: templates/users.php:133
-msgid "Default"
+#: templates/users.php:97
+msgid "set new password"
 msgstr ""
 
-#: templates/users.php:161
-msgid "Delete"
+#: templates/users.php:128
+msgid "Default"
 msgstr ""
diff --git a/l10n/sq/user_ldap.po b/l10n/sq/user_ldap.po
index 4c54b0c5724f2e02e595329e84b90ab93aea775c..839c6616a816f12a380802f7b3f9112e9c4972f9 100644
--- a/l10n/sq/user_ldap.po
+++ b/l10n/sq/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-16 00:19+0100\n"
-"PO-Revision-Date: 2013-01-15 23:20+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
 "MIME-Version: 1.0\n"
@@ -17,179 +17,403 @@ msgstr ""
 "Language: sq\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 "Veprim i gabuar"
+
+#: 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: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:32
+msgid "Add Server Configuration"
+msgstr ""
+
+#: templates/settings.php:37
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:15
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:16
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:16
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:16
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:17
+#: templates/settings.php:44
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:17
+#: 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:18
+#: templates/settings.php:47
 msgid "Password"
-msgstr ""
+msgstr "Kodi"
 
-#: templates/settings.php:18
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:19
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:19
+#: 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:19
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:20
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:20
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:20
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:24
+#: 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:25
-msgid "Base User Tree"
+#: templates/settings.php:73
+msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:25
-msgid "One User Base DN per line"
+#: 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:26
-msgid "Base Group Tree"
+#: templates/settings.php:74
+msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:26
-msgid "One Group Base DN per line"
+#: templates/settings.php:75
+msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:27
-msgid "Group-Member association"
+#: templates/settings.php:75
+msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:28
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:28
-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:29
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:30
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:30
+#: 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:30
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:31
+#: 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:31
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:32
+#: 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:32
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:34
+#: 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:36
-msgid "in seconds. A change empties the cache."
+#: templates/settings.php:95
+msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:37
+#: 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:39
-msgid "Help"
+#: 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 "NdihmÃ«"
diff --git a/l10n/sq/user_webdavauth.po b/l10n/sq/user_webdavauth.po
index 1a2d007461b34c326325b5577d1a33af7db7b8eb..9449bd231d54fe5bbcd0b3170def20e838bf0d39 100644
--- a/l10n/sq/user_webdavauth.po
+++ b/l10n/sq/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
 "MIME-Version: 1.0\n"
@@ -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/sr/core.po b/l10n/sr/core.po
index 1c71933f89d473b1ef184fbfde2fce7044ef71d1..6866ad5df6965a369fc84dad9a84d591e5ec7911 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-02-22 00:06+0100\n"
-"PO-Revision-Date: 2013-02-20 23:20+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10: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"
@@ -20,24 +17,24 @@ 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/share.php:85
+#: ajax/share.php:97
 #, php-format
 msgid "User %s shared a file with you"
 msgstr "ÐšÐ¾Ñ€Ð¸ÑÐ½Ð¸Ðº %s Ð´ÐµÐ»Ð¸ ÑÐ° Ð²Ð°Ð¼Ð° Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÑƒ"
 
-#: ajax/share.php:87
+#: ajax/share.php:99
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr "ÐšÐ¾Ñ€Ð¸ÑÐ½Ð¸Ðº %s Ð´ÐµÐ»Ð¸ ÑÐ° Ð²Ð°Ð¼Ð° Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ˜ÑƒÐ¼"
 
-#: ajax/share.php:89
+#: 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:91
+#: ajax/share.php:104
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -83,166 +80,168 @@ msgstr "ÐÐ¸ Ñ˜ÐµÐ´Ð½Ð° ÐºÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ˜Ð° Ð½Ð¸Ñ˜Ðµ Ð¾Ð·Ð½Ð°Ñ‡ÐµÐ½Ð° Ð·Ð° Ð±Ñ€
 msgid "Error removing %s from favorites."
 msgstr "Ð“Ñ€ÐµÑˆÐºÐ° Ð¿Ñ€Ð¸Ð»Ð¸ÐºÐ¾Ð¼ ÑƒÐºÐ»Ð°ÑšÐ°ÑšÐ° %s Ð¸Ð· Ð¾Ð¼Ð¸Ñ™ÐµÐ½Ð¸Ñ…"
 
-#: js/config.php:32
+#: js/config.php:34
 msgid "Sunday"
 msgstr "ÐÐµÐ´ÐµÑ™Ð°"
 
-#: js/config.php:32
+#: js/config.php:35
 msgid "Monday"
 msgstr "ÐŸÐ¾Ð½ÐµÐ´ÐµÑ™Ð°Ðº"
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Tuesday"
 msgstr "Ð£Ñ‚Ð¾Ñ€Ð°Ðº"
 
-#: js/config.php:32
+#: js/config.php:37
 msgid "Wednesday"
 msgstr "Ð¡Ñ€ÐµÐ´Ð°"
 
-#: js/config.php:32
+#: js/config.php:38
 msgid "Thursday"
 msgstr "Ð§ÐµÑ‚Ð²Ñ€Ñ‚Ð°Ðº"
 
-#: js/config.php:32
+#: js/config.php:39
 msgid "Friday"
 msgstr "ÐŸÐµÑ‚Ð°Ðº"
 
-#: js/config.php:32
+#: js/config.php:40
 msgid "Saturday"
 msgstr "Ð¡ÑƒÐ±Ð¾Ñ‚Ð°"
 
-#: js/config.php:33
+#: js/config.php:45
 msgid "January"
 msgstr "ÐˆÐ°Ð½ÑƒÐ°Ñ€"
 
-#: js/config.php:33
+#: js/config.php:46
 msgid "February"
 msgstr "Ð¤ÐµÐ±Ñ€ÑƒÐ°Ñ€"
 
-#: js/config.php:33
+#: js/config.php:47
 msgid "March"
 msgstr "ÐœÐ°Ñ€Ñ‚"
 
-#: js/config.php:33
+#: js/config.php:48
 msgid "April"
 msgstr "ÐÐ¿Ñ€Ð¸Ð»"
 
-#: js/config.php:33
+#: js/config.php:49
 msgid "May"
 msgstr "ÐœÐ°Ñ˜"
 
-#: js/config.php:33
+#: js/config.php:50
 msgid "June"
 msgstr "ÐˆÑƒÐ½"
 
-#: js/config.php:33
+#: js/config.php:51
 msgid "July"
 msgstr "ÐˆÑƒÐ»"
 
-#: js/config.php:33
+#: js/config.php:52
 msgid "August"
 msgstr "ÐÐ²Ð³ÑƒÑÑ‚"
 
-#: js/config.php:33
+#: js/config.php:53
 msgid "September"
 msgstr "Ð¡ÐµÐ¿Ñ‚ÐµÐ¼Ð±Ð°Ñ€"
 
-#: js/config.php:33
+#: js/config.php:54
 msgid "October"
 msgstr "ÐžÐºÑ‚Ð¾Ð±Ð°Ñ€"
 
-#: js/config.php:33
+#: js/config.php:55
 msgid "November"
 msgstr "ÐÐ¾Ð²ÐµÐ¼Ð±Ð°Ñ€"
 
-#: js/config.php:33
+#: js/config.php:56
 msgid "December"
 msgstr "Ð”ÐµÑ†ÐµÐ¼Ð±Ð°Ñ€"
 
 #: js/js.js:286
 msgid "Settings"
-msgstr "ÐŸÐ¾Ð´ÐµÑˆÐ°Ð²Ð°ÑšÐ°"
+msgstr "ÐŸÐ¾ÑÑ‚Ð°Ð²ÐºÐµ"
 
-#: js/js.js:767
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "Ð¿Ñ€Ðµ Ð½ÐµÐºÐ¾Ð»Ð¸ÐºÐ¾ ÑÐµÐºÑƒÐ½Ð´Ð¸"
 
-#: js/js.js:768
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "Ð¿Ñ€Ðµ 1 Ð¼Ð¸Ð½ÑƒÑ‚"
 
-#: js/js.js:769
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr "Ð¿Ñ€Ðµ {minutes} Ð¼Ð¸Ð½ÑƒÑ‚Ð°"
 
-#: js/js.js:770
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr "ÐŸÑ€Ðµ Ñ˜ÐµÐ´Ð½Ð¾Ð³ ÑÐ°Ñ‚Ð°"
 
-#: js/js.js:771
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr "ÐŸÑ€Ðµ {hours} ÑÐ°Ñ‚Ð° (ÑÐ°Ñ‚Ð¸)"
 
-#: js/js.js:772
+#: js/js.js:723
 msgid "today"
 msgstr "Ð´Ð°Ð½Ð°Ñ"
 
-#: js/js.js:773
+#: js/js.js:724
 msgid "yesterday"
 msgstr "Ñ˜ÑƒÑ‡Ðµ"
 
-#: js/js.js:774
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr "Ð¿Ñ€Ðµ {days} Ð´Ð°Ð½Ð°"
 
-#: js/js.js:775
+#: js/js.js:726
 msgid "last month"
 msgstr "Ð¿Ñ€Ð¾ÑˆÐ»Ð¾Ð³ Ð¼ÐµÑÐµÑ†Ð°"
 
-#: js/js.js:776
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr "ÐŸÑ€Ðµ {months} Ð¼ÐµÑÐµÑ†Ð° (Ð¼ÐµÑÐµÑ†Ð¸)"
 
-#: js/js.js:777
+#: js/js.js:728
 msgid "months ago"
 msgstr "Ð¼ÐµÑÐµÑ†Ð¸ Ñ€Ð°Ð½Ð¸Ñ˜Ðµ"
 
-#: js/js.js:778
+#: js/js.js:729
 msgid "last year"
 msgstr "Ð¿Ñ€Ð¾ÑˆÐ»Ðµ Ð³Ð¾Ð´Ð¸Ð½Ðµ"
 
-#: js/js.js:779
+#: js/js.js:730
 msgid "years ago"
 msgstr "Ð³Ð¾Ð´Ð¸Ð½Ð° Ñ€Ð°Ð½Ð¸Ñ˜Ðµ"
 
-#: js/oc-dialogs.js:126
-msgid "Choose"
-msgstr "ÐžÐ´Ð°Ð±ÐµÑ€Ð¸"
+#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
+msgid "Ok"
+msgstr "Ð£ Ñ€ÐµÐ´Ñƒ"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
 msgid "Cancel"
 msgstr "ÐžÑ‚ÐºÐ°Ð¶Ð¸"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "ÐÐµ"
+#: js/oc-dialogs.js:185
+msgid "Choose"
+msgstr "ÐžÐ´Ð°Ð±ÐµÑ€Ð¸"
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:215
 msgid "Yes"
 msgstr "Ð”Ð°"
 
-#: js/oc-dialogs.js:180
-msgid "Ok"
-msgstr "Ð£ Ñ€ÐµÐ´Ñƒ"
+#: js/oc-dialogs.js:222
+msgid "No"
+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:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:582
-#: js/share.js:594
+#: 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 "Ð“Ñ€ÐµÑˆÐºÐ°"
 
@@ -254,127 +253,127 @@ msgstr "Ð˜Ð¼Ðµ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð° Ð½Ð¸Ñ˜Ðµ ÑƒÐ½ÐµÑ‚Ð¾."
 msgid "The required file {file} is not installed!"
 msgstr "ÐŸÐ¾Ñ‚Ñ€ÐµÐ±Ð½Ð° Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ° {file} Ð½Ð¸Ñ˜Ðµ Ð¸Ð½ÑÑ‚Ð°Ð»Ð¸Ñ€Ð°Ð½Ð°."
 
-#: js/share.js:29 js/share.js:43 js/share.js:90
+#: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr ""
 
-#: js/share.js:93
+#: js/share.js:90
 msgid "Share"
-msgstr "Ð”ÐµÑ™ÐµÑšÐµ"
+msgstr "Ð”ÐµÐ»Ð¸"
 
-#: js/share.js:141 js/share.js:622
+#: js/share.js:125 js/share.js:617
 msgid "Error while sharing"
 msgstr "Ð“Ñ€ÐµÑˆÐºÐ° Ñƒ Ð´ÐµÑ™ÐµÑšÑƒ"
 
-#: js/share.js:152
+#: js/share.js:136
 msgid "Error while unsharing"
 msgstr "Ð“Ñ€ÐµÑˆÐºÐ° ÐºÐ¾Ð´ Ð¸ÑÐºÑ™ÑƒÑ‡ÐµÑšÐ° Ð´ÐµÑ™ÐµÑšÐ°"
 
-#: js/share.js:159
+#: js/share.js:143
 msgid "Error while changing permissions"
 msgstr "Ð“Ñ€ÐµÑˆÐºÐ° ÐºÐ¾Ð´ Ð¿Ñ€Ð¾Ð¼ÐµÐ½Ðµ Ð´Ð¾Ð·Ð²Ð¾Ð»Ð°"
 
-#: js/share.js:168
+#: js/share.js:152
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Ð”ÐµÑ™ÐµÐ½Ð¾ ÑÐ° Ð²Ð°Ð¼Ð° Ð¸ ÑÐ° Ð³Ñ€ÑƒÐ¿Ð¾Ð¼ {group}. ÐŸÐ¾Ð´ÐµÐ»Ð¸Ð¾ {owner}."
 
-#: js/share.js:170
+#: js/share.js:154
 msgid "Shared with you by {owner}"
 msgstr "ÐŸÐ¾Ð´ÐµÐ»Ð¸Ð¾ ÑÐ° Ð²Ð°Ð¼Ð° {owner}"
 
-#: js/share.js:175
+#: js/share.js:159
 msgid "Share with"
 msgstr "ÐŸÐ¾Ð´ÐµÐ»Ð¸ ÑÐ°"
 
-#: js/share.js:180
+#: js/share.js:164
 msgid "Share with link"
 msgstr "ÐŸÐ¾Ð´ÐµÐ»Ð¸ Ð»Ð¸Ð½Ðº"
 
-#: js/share.js:183
+#: js/share.js:167
 msgid "Password protect"
 msgstr "Ð—Ð°ÑˆÑ‚Ð¸Ñ›ÐµÐ½Ð¾ Ð»Ð¾Ð·Ð¸Ð½ÐºÐ¾Ð¼"
 
-#: js/share.js:185 templates/installation.php:44 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Ð›Ð¾Ð·Ð¸Ð½ÐºÐ°"
 
-#: js/share.js:189
+#: js/share.js:173
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:190
+#: js/share.js:174
 msgid "Send"
 msgstr "ÐŸÐ¾ÑˆÐ°Ñ™Ð¸"
 
-#: js/share.js:194
+#: js/share.js:178
 msgid "Set expiration date"
 msgstr "ÐŸÐ¾ÑÑ‚Ð°Ð²Ð¸ Ð´Ð°Ñ‚ÑƒÐ¼ Ð¸ÑÑ‚ÐµÐºÐ°"
 
-#: js/share.js:195
+#: js/share.js:179
 msgid "Expiration date"
 msgstr "Ð”Ð°Ñ‚ÑƒÐ¼ Ð¸ÑÑ‚ÐµÐºÐ°"
 
-#: js/share.js:227
+#: js/share.js:211
 msgid "Share via email:"
 msgstr "ÐŸÐ¾Ð´ÐµÐ»Ð¸ Ð¿Ð¾ÑˆÑ‚Ð¾Ð¼:"
 
-#: js/share.js:229
+#: js/share.js:213
 msgid "No people found"
 msgstr "ÐžÑÐ¾Ð±Ðµ Ð½Ð¸ÑÑƒ Ð¿Ñ€Ð¾Ð½Ð°Ñ’ÐµÐ½Ðµ."
 
-#: js/share.js:256
+#: js/share.js:251
 msgid "Resharing is not allowed"
 msgstr "ÐŸÐ¾Ð½Ð¾Ð²Ð½Ð¾ Ð´ÐµÑ™ÐµÑšÐµ Ð½Ð¸Ñ˜Ðµ Ð´Ð¾Ð·Ð²Ð¾Ñ™ÐµÐ½Ð¾"
 
-#: js/share.js:292
+#: js/share.js:287
 msgid "Shared in {item} with {user}"
 msgstr "ÐŸÐ¾Ð´ÐµÑ™ÐµÐ½Ð¾ ÑƒÐ½ÑƒÑ‚Ð°Ñ€ {item} ÑÐ° {user}"
 
-#: js/share.js:313
+#: js/share.js:308
 msgid "Unshare"
-msgstr "ÐÐµ Ð´ÐµÐ»Ð¸"
+msgstr "Ð£ÐºÐ¸Ð½Ð¸ Ð´ÐµÑ™ÐµÑšÐµ"
 
-#: js/share.js:325
+#: js/share.js:320
 msgid "can edit"
 msgstr "Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð¼ÐµÑšÐ°"
 
-#: js/share.js:327
+#: js/share.js:322
 msgid "access control"
 msgstr "Ð¿Ñ€Ð°Ð²Ð° Ð¿Ñ€Ð¸ÑÑ‚ÑƒÐ¿Ð°"
 
-#: js/share.js:330
+#: js/share.js:325
 msgid "create"
 msgstr "Ð½Ð°Ð¿Ñ€Ð°Ð²Ð¸"
 
-#: js/share.js:333
+#: js/share.js:328
 msgid "update"
 msgstr "Ð°Ð¶ÑƒÑ€Ð¸Ñ€Ð°Ñ˜"
 
-#: js/share.js:336
+#: js/share.js:331
 msgid "delete"
 msgstr "Ð¾Ð±Ñ€Ð¸ÑˆÐ¸"
 
-#: js/share.js:339
+#: js/share.js:334
 msgid "share"
 msgstr "Ð¿Ð¾Ð´ÐµÐ»Ð¸"
 
-#: js/share.js:373 js/share.js:569
+#: js/share.js:368 js/share.js:564
 msgid "Password protected"
 msgstr "Ð—Ð°ÑˆÑ‚Ð¸Ñ›ÐµÐ½Ð¾ Ð»Ð¾Ð·Ð¸Ð½ÐºÐ¾Ð¼"
 
-#: js/share.js:582
+#: js/share.js:577
 msgid "Error unsetting expiration date"
 msgstr "Ð“Ñ€ÐµÑˆÐºÐ° ÐºÐ¾Ð´ Ð¿Ð¾Ð½Ð¸ÑˆÑ‚Ð°Ð²Ð°ÑšÐ° Ð´Ð°Ñ‚ÑƒÐ¼Ð° Ð¸ÑÑ‚ÐµÐºÐ°"
 
-#: js/share.js:594
+#: js/share.js:589
 msgid "Error setting expiration date"
 msgstr "Ð“Ñ€ÐµÑˆÐºÐ° ÐºÐ¾Ð´ Ð¿Ð¾ÑÑ‚Ð°Ð²Ñ™Ð°ÑšÐ° Ð´Ð°Ñ‚ÑƒÐ¼Ð° Ð¸ÑÑ‚ÐµÐºÐ°"
 
-#: js/share.js:609
+#: js/share.js:604
 msgid "Sending ..."
 msgstr "Ð¨Ð°Ñ™ÐµÐ¼..."
 
-#: js/share.js:620
+#: js/share.js:615
 msgid "Email sent"
 msgstr "ÐŸÐ¾Ñ€ÑƒÐºÐ° Ñ˜Ðµ Ð¿Ð¾ÑÐ»Ð°Ñ‚Ð°"
 
@@ -397,24 +396,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:39
-#: 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 "Ð—Ð°Ñ…Ñ‚ÐµÐ²Ð°Ñ˜ Ñ€ÐµÑÐµÑ‚Ð¾Ð²Ð°ÑšÐµ"
 
@@ -436,7 +438,7 @@ msgstr "Ð ÐµÑÐµÑ‚ÑƒÑ˜ Ð»Ð¾Ð·Ð¸Ð½ÐºÑƒ"
 
 #: strings.php:5
 msgid "Personal"
-msgstr "Ð›Ð¸Ñ‡Ð½Ð°"
+msgstr "Ð›Ð¸Ñ‡Ð½Ð¾"
 
 #: strings.php:6
 msgid "Users"
@@ -444,11 +446,11 @@ msgstr "ÐšÐ¾Ñ€Ð¸ÑÐ½Ð¸Ñ†Ð¸"
 
 #: strings.php:7
 msgid "Apps"
-msgstr "ÐŸÑ€Ð¾Ð³Ñ€Ð°Ð¼Ð¸"
+msgstr "ÐÐ¿Ð»Ð¸ÐºÐ°Ñ†Ð¸Ñ˜Ðµ"
 
 #: strings.php:8
 msgid "Admin"
-msgstr "ÐÐ´Ð½Ð¸Ð½Ð¸ÑÑ‚Ñ€Ð°Ñ†Ð¸Ñ˜Ð°"
+msgstr "ÐÐ´Ð¼Ð¸Ð½Ð¸ÑÑ‚Ñ€Ð°Ñ‚Ð¾Ñ€"
 
 #: strings.php:9
 msgid "Help"
@@ -470,115 +472,130 @@ msgstr "Ð˜Ð·Ð¼ÐµÐ½Ð¸ ÐºÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ˜Ðµ"
 msgid "Add"
 msgstr "Ð”Ð¾Ð´Ð°Ñ˜"
 
-#: templates/installation.php:23 templates/installation.php:30
+#: 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 "ÐŸÐ¾ÑƒÐ·Ð´Ð°Ð½ Ð³ÐµÐ½ÐµÑ€Ð°Ñ‚Ð¾Ñ€ ÑÐ»ÑƒÑ‡Ð°Ñ˜Ð½Ð¸Ñ… Ð±Ñ€Ð¾Ñ˜ÐµÐ²Ð° Ð½Ð¸Ñ˜Ðµ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð°Ð½, Ð¿Ñ€ÐµÐ´Ð»Ð°Ð¶ÐµÐ¼Ð¾ Ð´Ð° ÑƒÐºÑ™ÑƒÑ‡Ð¸Ñ‚Ðµ PHP Ð¿Ñ€Ð¾ÑˆÐ¸Ñ€ÐµÑšÐµ OpenSSL."
 
-#: templates/installation.php:25
+#: 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:31
+#: 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:32
+#: 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:36
+#: templates/installation.php:44
 msgid "Create an <strong>admin account</strong>"
 msgstr "ÐÐ°Ð¿Ñ€Ð°Ð²Ð¸ <strong>Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑ‚Ñ€Ð°Ñ‚Ð¸Ð²Ð½Ð¸ Ð½Ð°Ð»Ð¾Ð³</strong>"
 
-#: templates/installation.php:52
+#: templates/installation.php:62
 msgid "Advanced"
 msgstr "ÐÐ°Ð¿Ñ€ÐµÐ´Ð½Ð¾"
 
-#: templates/installation.php:54
+#: templates/installation.php:64
 msgid "Data folder"
 msgstr "Ð¤Ð°Ñ†Ð¸ÐºÐ»Ð° Ð¿Ð¾Ð´Ð°Ñ‚Ð°ÐºÐ°"
 
-#: templates/installation.php:61
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "ÐŸÐ¾Ð´ÐµÑˆÐ°Ð²Ð°ÑšÐµ Ð±Ð°Ð·Ðµ"
 
-#: templates/installation.php:66 templates/installation.php:77
-#: templates/installation.php:87 templates/installation.php:97
+#: 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:109
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "ÐšÐ¾Ñ€Ð¸ÑÐ½Ð¸Ðº Ð±Ð°Ð·Ðµ"
 
-#: templates/installation.php:113
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "Ð›Ð¾Ð·Ð¸Ð½ÐºÐ° Ð±Ð°Ð·Ðµ"
 
-#: templates/installation.php:117
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "Ð˜Ð¼Ðµ Ð±Ð°Ð·Ðµ"
 
-#: templates/installation.php:125
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "Ð Ð°Ð´Ð½Ð¸ Ð¿Ñ€Ð¾ÑÑ‚Ð¾Ñ€ Ð±Ð°Ð·Ðµ Ð¿Ð¾Ð´Ð°Ñ‚Ð°ÐºÐ°"
 
-#: templates/installation.php:131
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "Ð”Ð¾Ð¼Ð°Ñ›Ð¸Ð½ Ð±Ð°Ð·Ðµ"
 
-#: templates/installation.php:136
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "Ð—Ð°Ð²Ñ€ÑˆÐ¸ Ð¿Ð¾Ð´ÐµÑˆÐ°Ð²Ð°ÑšÐµ"
 
-#: templates/layout.guest.php:33
+#: templates/layout.guest.php:40
 msgid "web services under your control"
 msgstr "Ð²ÐµÐ± ÑÐµÑ€Ð²Ð¸ÑÐ¸ Ð¿Ð¾Ð´ ÐºÐ¾Ð½Ñ‚Ñ€Ð¾Ð»Ð¾Ð¼"
 
-#: templates/layout.user.php:48
+#: 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/sr/files.po b/l10n/sr/files.po
index 90690956b721aec586bd9684231af419290080eb..008e27f634be9a979cb3dbe67855c1f023ead2de 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-03-04 00:06+0100\n"
-"PO-Revision-Date: 2013-03-03 23:06+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10: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"
@@ -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,68 +64,79 @@ msgstr "ÐÐµ Ð¼Ð¾Ð³Ñƒ Ð´Ð° Ð¿Ð¸ÑˆÐµÐ¼ Ð½Ð° Ð´Ð¸ÑÐº"
 
 #: ajax/upload.php:51
 msgid "Not enough storage available"
-msgstr ""
+msgstr "ÐÐµÐ¼Ð° Ð´Ð¾Ð²Ð¾Ñ™Ð½Ð¾ Ð¿Ñ€Ð¾ÑÑ‚Ð¾Ñ€Ð°"
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
-msgstr ""
+msgstr "Ð½ÐµÐ¸ÑÐ¿Ñ€Ð°Ð²Ð½Ð° Ñ„Ð°ÑÑ†Ð¸ÐºÐ»Ð°."
 
-#: appinfo/app.php:10
+#: 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:92 templates/index.php:93
+#: 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/files.js:292 js/files.js:408
-#: js/files.js:439
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "ÐÐ° Ñ‡ÐµÐºÐ°ÑšÑƒ"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} Ð²ÐµÑ› Ð¿Ð¾ÑÑ‚Ð¾Ñ˜Ð¸"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "Ð·Ð°Ð¼ÐµÐ½Ð¸"
 
-#: js/filelist.js:251
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "Ð¿Ñ€ÐµÐ´Ð»Ð¾Ð¶Ð¸ Ð½Ð°Ð·Ð¸Ð²"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "Ð¾Ñ‚ÐºÐ°Ð¶Ð¸"
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "Ð·Ð°Ð¼ÐµÑšÐµÐ½Ð¾ {new_name} ÑÐ° {old_name}"
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "undo"
 msgstr "Ð¾Ð¿Ð¾Ð·Ð¾Ð²Ð¸"
 
-#: js/filelist.js:323
+#: js/filelist.js:331
 msgid "perform delete operation"
-msgstr ""
+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 ""
+msgstr "Ð”Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ° â€ž.â€œ Ñ˜Ðµ Ð½ÐµÐ¸ÑÐ¿Ñ€Ð°Ð²Ð½Ð¾Ð³ Ð¸Ð¼ÐµÐ½Ð°."
 
 #: js/files.js:56
 msgid "File name cannot be empty."
-msgstr ""
+msgstr "Ð˜Ð¼Ðµ Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐµ Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð±Ð¸Ñ‚Ð¸ Ð¿Ñ€Ð°Ð·Ð½Ð¾."
 
 #: js/files.js:64
 msgid ""
@@ -142,83 +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:225
+#: 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:262
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "ÐÐµ Ð¼Ð¾Ð³Ñƒ Ð´Ð° Ð¾Ñ‚Ð¿Ñ€ÐµÐ¼Ð¸Ð¼ Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÑƒ ÐºÐ°Ð¾ Ñ„Ð°ÑÑ†Ð¸ÐºÐ»Ñƒ Ð¸Ð»Ð¸ Ð¾Ð½Ð° Ð¸Ð¼Ð° 0 Ð±Ð°Ñ˜Ñ‚Ð¾Ð²Ð°"
 
-#: js/files.js:262
-msgid "Upload Error"
-msgstr "Ð“Ñ€ÐµÑˆÐºÐ° Ð¿Ñ€Ð¸ Ð¾Ñ‚Ð¿Ñ€ÐµÐ¼Ð°ÑšÑƒ"
-
-#: js/files.js:273
-msgid "Close"
-msgstr "Ð—Ð°Ñ‚Ð²Ð¾Ñ€Ð¸"
+#: js/files.js:277
+msgid "Not enough space available"
+msgstr "ÐÐµÐ¼Ð° Ð´Ð¾Ð²Ð¾Ñ™Ð½Ð¾ Ð¿Ñ€Ð¾ÑÑ‚Ð¾Ñ€Ð°"
 
-#: js/files.js:312
-msgid "1 file uploading"
-msgstr "ÐžÑ‚Ð¿Ñ€ÐµÐ¼Ð°Ð¼ 1 Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÑƒ"
-
-#: js/files.js:315 js/files.js:370 js/files.js:385
-msgid "{count} files uploading"
-msgstr "ÐžÑ‚Ð¿Ñ€ÐµÐ¼Ð°Ð¼ {count} Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐµ/Ð°"
-
-#: js/files.js:388 js/files.js:423
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "ÐžÑ‚Ð¿Ñ€ÐµÐ¼Ð°ÑšÐµ Ñ˜Ðµ Ð¿Ñ€ÐµÐºÐ¸Ð½ÑƒÑ‚Ð¾."
 
-#: js/files.js:497
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "ÐžÑ‚Ð¿Ñ€ÐµÐ¼Ð°ÑšÐµ Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐµ Ñ˜Ðµ Ñƒ Ñ‚Ð¾ÐºÑƒ. ÐÐºÐ¾ ÑÐ°Ð´Ð° Ð½Ð°Ð¿ÑƒÑÑ‚Ð¸Ñ‚Ðµ ÑÑ‚Ñ€Ð°Ð½Ð¸Ñ†Ñƒ, Ð¿Ñ€ÐµÐºÐ¸Ð½ÑƒÑ›ÐµÑ‚Ðµ Ð¾Ñ‚Ð¿Ñ€ÐµÐ¼Ð°ÑšÐµ."
 
-#: js/files.js:570
+#: js/files.js:486
 msgid "URL cannot be empty."
-msgstr ""
+msgstr "ÐÐ´Ñ€ÐµÑÐ° Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð±Ð¸Ñ‚Ð¸ Ð¿Ñ€Ð°Ð·Ð½Ð°."
 
-#: js/files.js:575
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr ""
+msgstr "ÐÐµÐ¸ÑÐ¿Ñ€Ð°Ð²Ð½Ð¾ Ð¸Ð¼Ðµ Ñ„Ð°ÑÑ†Ð¸ÐºÐ»Ðµ. Ð¤Ð°ÑÑ†Ð¸ÐºÐ»Ð° â€žSharedâ€œ Ñ˜Ðµ Ñ€ÐµÐ·ÐµÑ€Ð²Ð¸ÑÐ°Ð½Ð° Ð·Ð° ownCloud."
 
-#: js/files.js:953 templates/index.php:68
+#: 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 "ÐÐ°Ð·Ð¸Ð²"
+msgstr "Ð˜Ð¼Ðµ"
 
-#: js/files.js:954 templates/index.php:79
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Ð’ÐµÐ»Ð¸Ñ‡Ð¸Ð½Ð°"
 
-#: js/files.js:955 templates/index.php:81
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Ð˜Ð·Ð¼ÐµÑšÐµÐ½Ð¾"
 
-#: js/files.js:974
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 Ñ„Ð°ÑÑ†Ð¸ÐºÐ»Ð°"
 
-#: js/files.js:976
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} Ñ„Ð°ÑÑ†Ð¸ÐºÐ»Ðµ/Ð¸"
 
-#: js/files.js:984
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ°"
 
-#: js/files.js:986
+#: 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 "ÐžÑ‚Ð¿Ñ€ÐµÐ¼Ð¸"
@@ -271,48 +275,48 @@ msgstr "Ñ„Ð°ÑÑ†Ð¸ÐºÐ»Ð°"
 msgid "From link"
 msgstr "Ð¡Ð° Ð²ÐµÐ·Ðµ"
 
-#: templates/index.php:40
+#: templates/index.php:42
 msgid "Deleted files"
-msgstr ""
+msgstr "ÐžÐ±Ñ€Ð¸ÑÐ°Ð½Ðµ Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐµ"
 
-#: templates/index.php:46
+#: templates/index.php:48
 msgid "Cancel upload"
 msgstr "ÐŸÑ€ÐµÐºÐ¸Ð½Ð¸ Ð¾Ñ‚Ð¿Ñ€ÐµÐ¼Ð°ÑšÐµ"
 
-#: templates/index.php:53
+#: templates/index.php:54
 msgid "You donâ€™t have write permissions here."
-msgstr ""
+msgstr "ÐžÐ²Ð´Ðµ Ð½ÐµÐ¼Ð°Ñ‚Ðµ Ð´Ð¾Ð·Ð²Ð¾Ð»Ñƒ Ð·Ð° Ð¿Ð¸ÑÐ°ÑšÐµ."
 
-#: templates/index.php:60
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "ÐžÐ²Ð´Ðµ Ð½ÐµÐ¼Ð° Ð½Ð¸Ñ‡ÐµÐ³. ÐžÑ‚Ð¿Ñ€ÐµÐ¼Ð¸Ñ‚Ðµ Ð½ÐµÑˆÑ‚Ð¾!"
 
-#: templates/index.php:74
+#: templates/index.php:75
 msgid "Download"
 msgstr "ÐŸÑ€ÐµÑƒÐ·Ð¼Ð¸"
 
-#: templates/index.php:86 templates/index.php:87
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Ð£ÐºÐ¸Ð½Ð¸ Ð´ÐµÑ™ÐµÑšÐµ"
 
-#: templates/index.php:106
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "Ð”Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ° Ñ˜Ðµ Ð¿Ñ€ÐµÐ²ÐµÐ»Ð¸ÐºÐ°"
 
-#: templates/index.php:108
+#: 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:113
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Ð¡ÐºÐµÐ½Ð¸Ñ€Ð°Ð¼ Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐµâ€¦"
 
-#: templates/index.php:116
+#: 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..22a63dce3005482ed0ed6dec7ddf4a87d6698e42 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/sr/files_external.po b/l10n/sr/files_external.po
index f9dec54fe8b2e11961a8d4f6972bb4f641546e46..83105656cf1ab5a10a016066aef4ca1ebe7fab42 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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..60f8cfce70e7c8862df025ff833469044de5a7f6 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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 b02e31e10988f7bb047c967682224b3cf8990cd1..0c35b3793672f7fcd0b7f273a281a255b8a11c03 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-03-08 00:25+0100\n"
-"PO-Revision-Date: 2013-03-07 23:25+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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,12 +17,12 @@ 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/delete.php:40
+#: ajax/delete.php:42
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
 
-#: ajax/undelete.php:41
+#: ajax/undelete.php:42
 #, php-format
 msgid "Couldn't restore %s"
 msgstr ""
@@ -32,13 +31,17 @@ msgstr ""
 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 ""
+msgstr "ÐžÐ±Ñ€Ð¸ÑˆÐ¸ Ð·Ð° ÑÑ‚Ð°Ð»Ð½Ð¾"
 
 #: js/trash.js:174 templates/index.php:17
 msgid "Name"
diff --git a/l10n/sr/files_versions.po b/l10n/sr/files_versions.po
index 402e0c7165b11e81e1874dfd78a3bb67445f74e8..2c8b97da34dadc67430c0c5754a1c220cf14b7fe 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-04-26 10:00+0200\n"
+"PO-Revision-Date: 2013-04-26 08:02+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -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 4b7461a06db9217f005ef0f63189e0eb40a39e75..f2b8abefc58337e5cc54bfa998e1e5831a9782dc 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-02-27 14:35+0100\n"
-"PO-Revision-Date: 2013-02-27 13:35+0000\n"
+"POT-Creation-Date: 2013-04-28 01:57+0200\n"
+"PO-Revision-Date: 2013-04-27 23:57+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"
@@ -44,19 +41,19 @@ msgstr "ÐÐ¿Ð»Ð¸ÐºÐ°Ñ†Ð¸Ñ˜Ðµ"
 msgid "Admin"
 msgstr "ÐÐ´Ð¼Ð¸Ð½Ð¸ÑÑ‚Ñ€Ð°Ñ‚Ð¾Ñ€"
 
-#: files.php:202
+#: files.php:209
 msgid "ZIP download is turned off."
 msgstr "ÐŸÑ€ÐµÑƒÐ·Ð¸Ð¼Ð°ÑšÐµ ZIP-Ð° Ñ˜Ðµ Ð¸ÑÐºÑ™ÑƒÑ‡ÐµÐ½Ð¾."
 
-#: files.php:203
+#: files.php:210
 msgid "Files need to be downloaded one by one."
 msgstr "Ð”Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐµ Ð¼Ð¾Ñ€Ð°Ñ‚Ðµ Ð¿Ñ€ÐµÑƒÐ·Ð¸Ð¼Ð°Ñ‚Ð¸ Ñ˜ÐµÐ´Ð½Ñƒ Ð¿Ð¾ Ñ˜ÐµÐ´Ð½Ñƒ."
 
-#: files.php:204 files.php:231
+#: files.php:211 files.php:244
 msgid "Back to Files"
 msgstr "ÐÐ°Ð·Ð°Ð´ Ð½Ð° Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐµ"
 
-#: files.php:228
+#: files.php:241
 msgid "Selected files too large to generate zip file."
 msgstr "Ð˜Ð·Ð°Ð±Ñ€Ð°Ð½Ðµ Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐµ ÑÑƒ Ð¿Ñ€ÐµÐ²ÐµÐ»Ð¸ÐºÐµ Ð´Ð° Ð±Ð¸ÑÑ‚Ðµ Ð½Ð°Ð¿Ñ€Ð°Ð²Ð¸Ð»Ð¸ ZIP Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÑƒ."
 
@@ -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,75 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:128 setup.php:320 setup.php:365
+#: setup.php:132 setup.php:325 setup.php:370
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:129 setup.php:152 setup.php:229
+#: setup.php:133 setup.php:156 setup.php:234
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:151 setup.php:453 setup.php:520
+#: setup.php:155 setup.php:458 setup.php:525
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:228
+#: setup.php:233
 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: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:583 setup.php:592 setup.php:600 setup.php:609
+#: setup.php:615
 #, 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:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
+#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
+#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:299
+#: setup.php:304
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:300
+#: setup.php:305
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:305
+#: setup.php:310
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:306
+#: setup.php:311
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:579 setup.php:611
+#: setup.php:584 setup.php:616
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:631
+#: setup.php:636
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:849
+#: setup.php:858
 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:850
+#: setup.php:859
 #, 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 +198,7 @@ msgstr "Ð¿Ñ€Ðµ %d Ð¼Ð¸Ð½ÑƒÑ‚Ð°"
 
 #: template.php:116
 msgid "1 hour ago"
-msgstr "Ð¿Ñ€Ðµ 1 ÑÐ°Ñ‚"
+msgstr "ÐŸÑ€Ðµ Ñ˜ÐµÐ´Ð½Ð¾Ð³ ÑÐ°Ñ‚Ð°"
 
 #: template.php:117
 #, php-format
@@ -242,19 +235,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 6e248a0cdde39e3d018f4eb2a6485096bf381b97..372c87d23e7d47319a8aa3081aabb110fa766751 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-02-27 14:35+0100\n"
-"PO-Revision-Date: 2013-02-27 13:35+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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,86 +86,86 @@ 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"
 msgstr "Ð˜ÑÐºÑ™ÑƒÑ‡Ð¸"
 
-#: js/apps.js:36 js/apps.js:64
+#: 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:84
-msgid "Updating...."
-msgstr ""
-
-#: js/apps.js:87
-msgid "Error while updating app"
-msgstr ""
-
-#: js/apps.js:87
+#: 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 ""
+msgstr "ÐÐ¶ÑƒÑ€Ð¸Ñ€Ð°Ð½Ð¾"
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr "Ð§ÑƒÐ²Ð°ÑšÐµ Ñƒ Ñ‚Ð¾ÐºÑƒ..."
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "deleted"
-msgstr ""
+msgstr "Ð¾Ð±Ñ€Ð¸ÑÐ°Ð½Ð¾"
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "undo"
 msgstr "Ð¾Ð¿Ð¾Ð·Ð¾Ð²Ð¸"
 
-#: js/users.js:62
+#: js/users.js:79
 msgid "Unable to remove user"
-msgstr ""
+msgstr "ÐÐµ Ð¼Ð¾Ð³Ñƒ Ð´Ð° ÑƒÐºÐ»Ð¾Ð½Ð¸Ð¼ ÐºÐ¾Ñ€Ð¸ÑÐ½Ð¸ÐºÐ°"
 
-#: js/users.js:75 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
+#: templates/users.php:103
 msgid "Groups"
 msgstr "Ð“Ñ€ÑƒÐ¿Ðµ"
 
-#: js/users.js:78 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr "Ð£Ð¿Ñ€Ð°Ð²Ð½Ð¸Ðº Ð³Ñ€ÑƒÐ¿Ðµ"
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "ÐžÐ±Ñ€Ð¸ÑˆÐ¸"
 
-#: js/users.js:191
+#: js/users.js:269
 msgid "add group"
-msgstr ""
+msgstr "Ð´Ð¾Ð´Ð°Ñ˜ Ð³Ñ€ÑƒÐ¿Ñƒ"
 
-#: js/users.js:352
+#: js/users.js:420
 msgid "A valid username must be provided"
-msgstr ""
+msgstr "ÐœÐ¾Ñ€Ð°Ñ‚Ðµ ÑƒÐ½ÐµÑ‚Ð¸ Ð¸ÑÐ¿Ñ€Ð°Ð²Ð½Ð¾ ÐºÐ¾Ñ€Ð¸ÑÐ½Ð¸Ñ‡ÐºÐ¾ Ð¸Ð¼Ðµ"
 
-#: js/users.js:353 js/users.js:359 js/users.js:374
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
-msgstr ""
+msgstr "Ð“Ñ€ÐµÑˆÐºÐ° Ð¿Ñ€Ð¸ Ð¿Ñ€Ð°Ð²Ñ™ÐµÑšÑƒ ÐºÐ¾Ñ€Ð¸ÑÐ½Ð¸ÐºÐ°"
 
-#: js/users.js:358
+#: js/users.js:426
 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,21 +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:230 templates/personal.php:102
+#: templates/admin.php:228
+msgid "Less"
+msgstr "ÐœÐ°ÑšÐµ"
+
+#: templates/admin.php:235 templates/personal.php:105
 msgid "Version"
-msgstr ""
+msgstr "Ð’ÐµÑ€Ð·Ð¸Ñ˜Ð°"
 
-#: templates/admin.php:233 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 "
@@ -358,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
@@ -387,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:77
 msgid "Password"
 msgstr "Ð›Ð¾Ð·Ð¸Ð½ÐºÐ°"
 
@@ -417,82 +423,70 @@ msgstr "ÐÐ¾Ð²Ð° Ð»Ð¾Ð·Ð¸Ð½ÐºÐ°"
 msgid "Change password"
 msgstr "Ð˜Ð·Ð¼ÐµÐ½Ð¸ Ð»Ð¾Ð·Ð¸Ð½ÐºÑƒ"
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:76
 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 ""
+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 ""
+msgstr "WebDAV"
 
-#: templates/personal.php:93
+#: templates/personal.php:96
 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:75
 msgid "Login Name"
-msgstr ""
+msgstr "ÐšÐ¾Ñ€Ð¸ÑÐ½Ð¸Ñ‡ÐºÐ¾ Ð¸Ð¼Ðµ"
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr "ÐÐ°Ð¿Ñ€Ð°Ð²Ð¸"
 
-#: templates/users.php:35
+#: templates/users.php:33
 msgid "Default Storage"
-msgstr ""
+msgstr "ÐŸÐ¾Ð´Ñ€Ð°Ð·ÑƒÐ¼ÐµÐ²Ð°Ð½Ð¾ ÑÐºÐ»Ð°Ð´Ð¸ÑˆÑ‚Ðµ"
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:39 templates/users.php:133
 msgid "Unlimited"
-msgstr ""
+msgstr "ÐÐµÐ¾Ð³Ñ€Ð°Ð½Ð¸Ñ‡ÐµÐ½Ð¾"
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:57 templates/users.php:148
 msgid "Other"
 msgstr "Ð”Ñ€ÑƒÐ³Ð¾"
 
-#: templates/users.php:84
+#: templates/users.php:82
 msgid "Storage"
-msgstr ""
+msgstr "Ð¡ÐºÐ»Ð°Ð´Ð¸ÑˆÑ‚Ðµ"
 
-#: templates/users.php:95
+#: templates/users.php:93
 msgid "change display name"
-msgstr ""
+msgstr "Ð¿Ñ€Ð¾Ð¼ÐµÐ½Ð¸ Ð¸Ð¼Ðµ Ð·Ð° Ð¿Ñ€Ð¸ÐºÐ°Ð·"
 
-#: templates/users.php:99
+#: templates/users.php:97
 msgid "set new password"
-msgstr ""
+msgstr "Ð¿Ð¾ÑÑ‚Ð°Ð²Ð¸ Ð½Ð¾Ð²Ñƒ Ð»Ð¾Ð·Ð¸Ð½ÐºÑƒ"
 
-#: templates/users.php:134
+#: templates/users.php:128
 msgid "Default"
-msgstr ""
+msgstr "ÐŸÐ¾Ð´Ñ€Ð°Ð·ÑƒÐ¼ÐµÐ²Ð°Ð½Ð¾"
diff --git a/l10n/sr/user_ldap.po b/l10n/sr/user_ldap.po
index 604cf33cd58a5e7989cd2834e7a743441a8fe357..d13753c822ec0de009ae9a3cf673c793ae96b830 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-02 00:03+0100\n"
-"PO-Revision-Date: 2013-03-01 23:04+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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: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 "ÐœÐ¾Ð¶ÐµÑ‚Ðµ Ð´Ð° Ð¸Ð·Ð¾ÑÑ‚Ð°Ð²Ð¸Ñ‚Ðµ Ð¿Ñ€Ð¾Ñ‚Ð¾ÐºÐ¾Ð», Ð¾ÑÐ¸Ð¼ Ð°ÐºÐ¾ Ð·Ð°Ñ…Ñ‚ÐµÐ²Ð°Ñ‚Ðµ SSL. Ð£ Ñ‚Ð¾Ð¼ ÑÐ»ÑƒÑ‡Ð°Ñ˜Ñƒ Ð¿Ð¾Ñ‡Ð½Ð¸Ñ‚Ðµ ÑÐ° ldaps://."
 
-#: templates/settings.php:26
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "Ð‘Ð°Ð·Ð° DN"
 
-#: 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 "ÐšÐ¾Ñ€Ð¸ÑÐ½Ð¸Ðº DN"
 
-#: 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 "DN ÐºÐ¾Ñ€Ð¸ÑÐ½Ð¸ÐºÐ° ÐºÐ»Ð¸Ñ˜ÐµÐ½Ñ‚Ð° ÑÐ° ÐºÐ¾Ñ˜Ð¸Ð¼ Ñ‚Ñ€ÐµÐ±Ð° Ð´Ð° ÑÐµ ÑƒÑÐ¿Ð¾ÑÑ‚Ð°Ð²Ð¸ Ð²ÐµÐ·Ð°, Ð½Ð¿Ñ€. uid=agent,dc=example,dc=com. Ð—Ð° Ð°Ð½Ð¾Ð½Ð¸Ð¼Ð°Ð½ Ð¿Ñ€Ð¸ÑÑ‚ÑƒÐ¿, Ð¾ÑÑ‚Ð°Ð²Ð¸Ñ‚Ðµ Ð¿Ð¾Ñ™Ð° DN Ð¸ Ð»Ð¾Ð·Ð¸Ð½ÐºÐ° Ð¿Ñ€Ð°Ð·Ð½Ð¸Ð¼."
 
-#: 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 "Ð—Ð° Ð°Ð½Ð¾Ð½Ð¸Ð¼Ð°Ð½ Ð¿Ñ€Ð¸ÑÑ‚ÑƒÐ¿, Ð¾ÑÑ‚Ð°Ð²Ð¸Ñ‚Ðµ Ð¿Ð¾Ñ™Ð° DN Ð¸ Ð»Ð¾Ð·Ð¸Ð½ÐºÐ° Ð¿Ñ€Ð°Ð·Ð½Ð¸Ð¼."
 
-#: 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 "ÐžÐ´Ñ€ÐµÑ’ÑƒÑ˜Ðµ Ñ„Ð¸Ð»Ñ‚ÐµÑ€ Ð·Ð° Ð¿Ñ€Ð¸Ð¼ÐµÑšÐ¸Ð²Ð°ÑšÐµ Ð¿Ñ€Ð¸ Ð¿Ð¾ÐºÑƒÑˆÐ°Ñ˜Ñƒ Ð¿Ñ€Ð¸Ñ˜Ð°Ð²Ðµ. %%uid Ð·Ð°Ð¼ÐµÑšÑƒÑ˜Ðµ ÐºÐ¾Ñ€Ð¸ÑÐ½Ð¸Ñ‡ÐºÐ¾ Ð¸Ð¼Ðµ."
 
-#: templates/settings.php:41
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð¸Ñ‚Ðµ Ñ‡ÑƒÐ²Ð°Ñ€ Ð¼ÐµÑÑ‚Ð° %%uid, Ð½Ð¿Ñ€. â€žuid=%%uid\""
 
-#: 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 "Ð±ÐµÐ· Ð¸ÐºÐ°ÐºÐ²Ð¾Ð³ Ñ‡ÑƒÐ²Ð°Ñ€Ð° Ð¼ÐµÑÑ‚Ð°, Ð½Ð¿Ñ€. â€žobjectClass=personâ€œ."
 
-#: 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 "Ð±ÐµÐ· Ð¸ÐºÐ°ÐºÐ²Ð¾Ð³ Ñ‡ÑƒÐ²Ð°Ñ€Ð° Ð¼ÐµÑÑ‚Ð°, Ð½Ð¿Ñ€. â€žobjectClass=posixGroupâ€œ."
 
-#: 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 "ÐšÐ¾Ñ€Ð¸ÑÑ‚Ð¸ 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 "LDAP ÑÐµÑ€Ð²ÐµÑ€ Ð¾ÑÐµÑ‚Ñ™Ð¸Ð² Ð½Ð° Ð²ÐµÐ»Ð¸ÐºÐ° Ð¸ Ð¼Ð°Ð»Ð° ÑÐ»Ð¾Ð²Ð° (Windows)"
 
-#: templates/settings.php:64
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "Ð˜ÑÐºÑ™ÑƒÑ‡Ð¸Ñ‚Ðµ Ð¿Ð¾Ñ‚Ð²Ñ€Ð´Ñƒ SSL ÑÐµÑ€Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ‚Ð°."
 
-#: 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 "Ð£Ð²ÐµÐ·Ð¸Ñ‚Ðµ SSL ÑÐµÑ€Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ‚ LDAP ÑÐµÑ€Ð²ÐµÑ€Ð° Ñƒ ÑÐ²Ð¾Ñ˜ ownCloud Ð°ÐºÐ¾ Ð²ÐµÐ·Ð° Ñ€Ð°Ð´Ð¸ ÑÐ°Ð¼Ð¾ ÑÐ° Ð¾Ð²Ð¾Ð¼ Ð¾Ð¿Ñ†Ð¸Ñ˜Ð¾Ð¼."
 
-#: 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 "LDAP Ð°Ñ‚Ñ€Ð¸Ð±ÑƒÑ‚ Ð·Ð° ÑÑ‚Ð²Ð°Ñ€Ð°ÑšÐµ Ð¸Ð¼ÐµÐ½Ð° ownCloud-Ð° ÐºÐ¾Ñ€Ð¸ÑÐ½Ð¸ÐºÐ°."
 
-#: 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 "LDAP Ð°Ñ‚Ñ€Ð¸Ð±ÑƒÑ‚ Ð·Ð° ÑÑ‚Ð²Ð°Ñ€Ð°ÑšÐµ Ð¸Ð¼ÐµÐ½Ð° ownCloud-Ð° Ð³Ñ€ÑƒÐ¿Ðµ."
 
-#: 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/sr/user_webdavauth.po b/l10n/sr/user_webdavauth.po
index 764d45ef4080787a054b1ebfebca12c64df88417..c72a84c03cb0d4743918d0e5567c498572cb6de3 100644
--- a/l10n/sr/user_webdavauth.po
+++ b/l10n/sr/user_webdavauth.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-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-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
 "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 dea4d27d0675f53c961e368805242db802897a91..555da08b9e8a74546481524df8b6b008998c948a 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-02-09 00:12+0100\n"
-"PO-Revision-Date: 2013-02-08 23:12+0000\n"
+"POT-Creation-Date: 2013-04-30 01:57+0200\n"
+"PO-Revision-Date: 2013-04-29 23:57+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"
@@ -18,24 +17,24 @@ 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/share.php:85
+#: ajax/share.php:97
 #, php-format
 msgid "User %s shared a file with you"
 msgstr ""
 
-#: ajax/share.php:87
+#: ajax/share.php:99
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr ""
 
-#: ajax/share.php:89
+#: 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:91
+#: ajax/share.php:104
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -81,156 +80,156 @@ msgstr ""
 msgid "Error removing %s from favorites."
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:34
 msgid "Sunday"
 msgstr "Nedelja"
 
-#: js/config.php:32
+#: js/config.php:35
 msgid "Monday"
 msgstr "Ponedeljak"
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Tuesday"
 msgstr "Utorak"
 
-#: js/config.php:32
+#: js/config.php:37
 msgid "Wednesday"
 msgstr "Sreda"
 
-#: js/config.php:32
+#: js/config.php:38
 msgid "Thursday"
 msgstr "ÄŒetvrtak"
 
-#: js/config.php:32
+#: js/config.php:39
 msgid "Friday"
 msgstr "Petak"
 
-#: js/config.php:32
+#: js/config.php:40
 msgid "Saturday"
 msgstr "Subota"
 
-#: js/config.php:33
+#: js/config.php:45
 msgid "January"
 msgstr "Januar"
 
-#: js/config.php:33
+#: js/config.php:46
 msgid "February"
 msgstr "Februar"
 
-#: js/config.php:33
+#: js/config.php:47
 msgid "March"
 msgstr "Mart"
 
-#: js/config.php:33
+#: js/config.php:48
 msgid "April"
 msgstr "April"
 
-#: js/config.php:33
+#: js/config.php:49
 msgid "May"
 msgstr "Maj"
 
-#: js/config.php:33
+#: js/config.php:50
 msgid "June"
 msgstr "Jun"
 
-#: js/config.php:33
+#: js/config.php:51
 msgid "July"
 msgstr "Jul"
 
-#: js/config.php:33
+#: js/config.php:52
 msgid "August"
 msgstr "Avgust"
 
-#: js/config.php:33
+#: js/config.php:53
 msgid "September"
 msgstr "Septembar"
 
-#: js/config.php:33
+#: js/config.php:54
 msgid "October"
 msgstr "Oktobar"
 
-#: js/config.php:33
+#: js/config.php:55
 msgid "November"
 msgstr "Novembar"
 
-#: js/config.php:33
+#: js/config.php:56
 msgid "December"
 msgstr "Decembar"
 
-#: js/js.js:284
+#: js/js.js:286
 msgid "Settings"
 msgstr "PodeÅ¡avanja"
 
-#: js/js.js:764
+#: js/js.js:718
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:765
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:766
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:767
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:768
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:769
+#: js/js.js:723
 msgid "today"
 msgstr ""
 
-#: js/js.js:770
+#: js/js.js:724
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:771
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:772
+#: js/js.js:726
 msgid "last month"
 msgstr ""
 
-#: js/js.js:773
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:774
+#: js/js.js:728
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:775
+#: js/js.js:729
 msgid "last year"
 msgstr ""
 
-#: js/js.js:776
+#: js/js.js:730
 msgid "years ago"
 msgstr ""
 
-#: js/oc-dialogs.js:126
-msgid "Choose"
+#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
+msgid "Ok"
 msgstr ""
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
 msgid "Cancel"
 msgstr "OtkaÅ¾i"
 
-#: js/oc-dialogs.js:162
-msgid "No"
+#: js/oc-dialogs.js:185
+msgid "Choose"
 msgstr ""
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:215
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:180
-msgid "Ok"
+#: js/oc-dialogs.js:222
+msgid "No"
 msgstr ""
 
 #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
@@ -238,9 +237,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:152 js/share.js:159 js/share.js:571
-#: js/share.js:583
+#: 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 ""
 
@@ -252,127 +253,127 @@ msgstr ""
 msgid "The required file {file} is not installed!"
 msgstr ""
 
-#: js/share.js:29 js/share.js:43 js/share.js:90 js/share.js:93
-msgid "Share"
+#: js/share.js:30 js/share.js:45 js/share.js:87
+msgid "Shared"
 msgstr ""
 
-#: js/share.js:29 js/share.js:43 js/share.js:90 js/share.js:93
-msgid "Shared"
+#: js/share.js:90
+msgid "Share"
 msgstr ""
 
-#: js/share.js:141 js/share.js:611
+#: js/share.js:125 js/share.js:617
 msgid "Error while sharing"
 msgstr ""
 
-#: js/share.js:152
+#: js/share.js:136
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:159
+#: js/share.js:143
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:168
+#: js/share.js:152
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:170
+#: js/share.js:154
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:175
+#: js/share.js:159
 msgid "Share with"
 msgstr ""
 
-#: js/share.js:180
+#: js/share.js:164
 msgid "Share with link"
 msgstr ""
 
-#: js/share.js:183
+#: js/share.js:167
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:185 templates/installation.php:44 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Lozinka"
 
-#: js/share.js:189
+#: js/share.js:173
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:190
+#: js/share.js:174
 msgid "Send"
 msgstr ""
 
-#: js/share.js:194
+#: js/share.js:178
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:195
+#: js/share.js:179
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:227
+#: js/share.js:211
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:229
+#: js/share.js:213
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:256
+#: js/share.js:251
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:292
+#: js/share.js:287
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:313
+#: js/share.js:308
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:325
+#: js/share.js:320
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:327
+#: js/share.js:322
 msgid "access control"
 msgstr ""
 
-#: js/share.js:330
+#: js/share.js:325
 msgid "create"
 msgstr ""
 
-#: js/share.js:333
+#: js/share.js:328
 msgid "update"
 msgstr ""
 
-#: js/share.js:336
+#: js/share.js:331
 msgid "delete"
 msgstr ""
 
-#: js/share.js:339
+#: js/share.js:334
 msgid "share"
 msgstr ""
 
-#: js/share.js:373 js/share.js:558
+#: js/share.js:368 js/share.js:564
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:571
+#: js/share.js:577
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:583
+#: js/share.js:589
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:598
+#: js/share.js:604
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:609
+#: js/share.js:615
 msgid "Email sent"
 msgstr ""
 
@@ -387,7 +388,7 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:47
+#: lostpassword/controller.php:48
 msgid "ownCloud password reset"
 msgstr ""
 
@@ -395,24 +396,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:39
-#: 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 +438,7 @@ msgstr "Resetuj lozinku"
 
 #: strings.php:5
 msgid "Personal"
-msgstr "LiÄna"
+msgstr "LiÄno"
 
 #: strings.php:6
 msgid "Users"
@@ -468,115 +472,130 @@ msgstr ""
 msgid "Add"
 msgstr ""
 
-#: templates/installation.php:23 templates/installation.php:30
+#: 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:25
+#: 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:31
+#: 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:32
+#: 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:36
+#: templates/installation.php:44
 msgid "Create an <strong>admin account</strong>"
 msgstr "Napravi <strong>administrativni nalog</strong>"
 
-#: templates/installation.php:52
+#: templates/installation.php:62
 msgid "Advanced"
 msgstr "Napredno"
 
-#: templates/installation.php:54
+#: templates/installation.php:64
 msgid "Data folder"
 msgstr "Facikla podataka"
 
-#: templates/installation.php:61
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "PodeÅ¡avanje baze"
 
-#: templates/installation.php:66 templates/installation.php:77
-#: templates/installation.php:87 templates/installation.php:97
+#: 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:109
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "Korisnik baze"
 
-#: templates/installation.php:113
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "Lozinka baze"
 
-#: templates/installation.php:117
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "Ime baze"
 
-#: templates/installation.php:125
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:131
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "DomaÄ‡in baze"
 
-#: templates/installation.php:136
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "ZavrÅ¡i podeÅ¡avanje"
 
-#: templates/layout.guest.php:33
+#: templates/layout.guest.php:40
 msgid "web services under your control"
 msgstr ""
 
-#: templates/layout.user.php:48
+#: 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 "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 49adfe19322f0b0e53591e1a9503a515932d8e65..e7c6cc4f5301cf47a0a2b6c44e6a4e8122edf53f 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-03-04 00:06+0100\n"
-"PO-Revision-Date: 2013-03-03 23:06+0000\n"
+"POT-Creation-Date: 2013-05-15 01:59+0200\n"
+"PO-Revision-Date: 2013-05-15 00:00+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -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 ""
@@ -71,59 +66,70 @@ msgstr ""
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:10
+#: appinfo/app.php:12
 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:92 templates/index.php:93
+#: 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/files.js:292 js/files.js:408
-#: js/files.js:439
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:251
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:323
+#: 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 ""
@@ -146,77 +152,77 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:225
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:262
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:262
-msgid "Upload Error"
+#: js/files.js:277
+msgid "Not enough space available"
 msgstr ""
 
-#: js/files.js:273
-msgid "Close"
-msgstr "Zatvori"
-
-#: js/files.js:312
-msgid "1 file uploading"
-msgstr ""
-
-#: js/files.js:315 js/files.js:370 js/files.js:385
-msgid "{count} files uploading"
-msgstr ""
-
-#: js/files.js:388 js/files.js:423
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:497
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:570
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:575
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:953 templates/index.php:68
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+msgid "Error"
+msgstr ""
+
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Ime"
 
-#: js/files.js:954 templates/index.php:79
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "VeliÄina"
 
-#: js/files.js:955 templates/index.php:81
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Zadnja izmena"
 
-#: js/files.js:974
+#: js/files.js:898
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:976
+#: js/files.js:900
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:984
+#: js/files.js:908
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:986
+#: 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"
@@ -269,45 +275,45 @@ msgstr ""
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:42
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:48
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:53
+#: templates/index.php:54
 msgid "You donâ€™t have write permissions here."
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Ovde nema niÄeg. PoÅ¡aljite neÅ¡to!"
 
-#: templates/index.php:74
+#: templates/index.php:75
 msgid "Download"
 msgstr "Preuzmi"
 
-#: templates/index.php:86 templates/index.php:87
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr ""
 
-#: templates/index.php:106
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "PoÅ¡iljka je prevelika"
 
-#: templates/index.php:108
+#: 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:113
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:116
+#: 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..457c34823add72b5850803e12b498d7388f064f7 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-04-26 10:00+0200\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/sr@latin/files_external.po b/l10n/sr@latin/files_external.po
index ccf11b6140c1cdc77776b000a8cb0c7a28b2c535..1c91965f2921582b4f0abc77303ad5b409465175 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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..a36fa20faea7aa7d482b01c6c8052d3aea3e0921 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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 65e0a7afc15ddc1804a0c7c52fe6481c0bb01db7..717696ba371837d4c0cc72726eae06178034e194 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-03-08 00:25+0100\n"
-"PO-Revision-Date: 2013-03-07 23:25+0000\n"
+"POT-Creation-Date: 2013-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:30+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,12 +17,12 @@ 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/delete.php:40
+#: ajax/delete.php:42
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
 
-#: ajax/undelete.php:41
+#: ajax/undelete.php:42
 #, php-format
 msgid "Couldn't restore %s"
 msgstr ""
@@ -31,6 +31,10 @@ msgstr ""
 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 ""
diff --git a/l10n/sr@latin/files_versions.po b/l10n/sr@latin/files_versions.po
index 53af96aaac6e7066b540a4a3aed4cba5cca1027d..2f888ae0aa0c2680cbc3cd5fd170fa3adadf5606 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-04-26 10:00+0200\n"
+"PO-Revision-Date: 2013-04-26 08:02+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -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 f5d0fd7b3f791e037c2e2c073c8a7a10513cf3ac..d2b1782668e23aa775f1fc468d93979d4c06ef15 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-02-27 14:35+0100\n"
-"PO-Revision-Date: 2013-02-27 13:35+0000\n"
+"POT-Creation-Date: 2013-04-28 01:57+0200\n"
+"PO-Revision-Date: 2013-04-27 23:57+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"
@@ -35,25 +35,25 @@ msgstr "Korisnici"
 
 #: app.php:398
 msgid "Apps"
-msgstr ""
+msgstr "Programi"
 
 #: app.php:406
 msgid "Admin"
-msgstr ""
+msgstr "Adninistracija"
 
-#: files.php:202
+#: files.php:209
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:203
+#: files.php:210
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:204 files.php:231
+#: files.php:211 files.php:244
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:228
+#: files.php:241
 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,72 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:128 setup.php:320 setup.php:365
+#: setup.php:132 setup.php:325 setup.php:370
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:129 setup.php:152 setup.php:229
+#: setup.php:133 setup.php:156 setup.php:234
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:151 setup.php:453 setup.php:520
+#: setup.php:155 setup.php:458 setup.php:525
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:228
+#: setup.php:233
 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: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:583 setup.php:592 setup.php:600 setup.php:609
+#: setup.php:615
 #, 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:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
+#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
+#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:299
+#: setup.php:304
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:300
+#: setup.php:305
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:305
+#: setup.php:310
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:306
+#: setup.php:311
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:579 setup.php:611
+#: setup.php:584 setup.php:616
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:631
+#: setup.php:636
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:849
+#: setup.php:858
 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:859
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
@@ -239,19 +235,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 02323fa5e0556f5140fdfa019159b982ed8d070e..dbfe43bcfc3d7e3f277f5cd312ef4d70062a21ad 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-02-27 14:35+0100\n"
-"PO-Revision-Date: 2013-02-27 13:35+0000\n"
+"POT-Creation-Date: 2013-04-27 02:17+0200\n"
+"PO-Revision-Date: 2013-04-26 08:31+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 ""
 
@@ -93,7 +96,7 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: js/apps.js:36 js/apps.js:64
+#: js/apps.js:36 js/apps.js:64 js/apps.js:83
 msgid "Enable"
 msgstr ""
 
@@ -101,68 +104,68 @@ msgstr ""
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:84
-msgid "Updating...."
+#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+msgid "Error"
 msgstr ""
 
-#: js/apps.js:87
-msgid "Error while updating app"
+#: js/apps.js:90
+msgid "Updating...."
 msgstr ""
 
-#: js/apps.js:87
-msgid "Error"
+#: js/apps.js:93
+msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:90
+#: js/apps.js:96
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr ""
 
-#: js/users.js:30
+#: js/users.js:43
 msgid "deleted"
 msgstr ""
 
-#: js/users.js:30
+#: js/users.js:43
 msgid "undo"
 msgstr ""
 
-#: js/users.js:62
+#: js/users.js:75
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:75 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: templates/users.php:103
 msgid "Groups"
 msgstr "Grupe"
 
-#: js/users.js:78 templates/users.php:82 templates/users.php:119
+#: js/users.js:91 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:111 templates/users.php:155
 msgid "Delete"
 msgstr "ObriÅ¡i"
 
-#: js/users.js:191
+#: js/users.js:262
 msgid "add group"
 msgstr ""
 
-#: js/users.js:352
+#: js/users.js:414
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:353 js/users.js:359 js/users.js:374
+#: js/users.js:415 js/users.js:421 js/users.js:436
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:358
+#: js/users.js:420
 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,15 +316,19 @@ msgstr ""
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:230 templates/personal.php:102
+#: templates/admin.php:228
+msgid "Less"
+msgstr ""
+
+#: templates/admin.php:235 templates/personal.php:105
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:233 templates/personal.php:105
+#: templates/admin.php:238 templates/personal.php:108
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -392,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:77
 msgid "Password"
 msgstr "Lozinka"
 
@@ -416,82 +423,70 @@ msgstr "Nova lozinka"
 msgid "Change password"
 msgstr "Izmeni lozinku"
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:76
 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 "E-mail"
 
-#: 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 "Jezik"
 
-#: 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:75
 msgid "Login Name"
 msgstr ""
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr "Napravi"
 
-#: templates/users.php:35
+#: templates/users.php:33
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:39 templates/users.php:133
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:57 templates/users.php:148
 msgid "Other"
 msgstr "Drugo"
 
-#: templates/users.php:84
+#: templates/users.php:82
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:95
+#: templates/users.php:93
 msgid "change display name"
 msgstr ""
 
-#: templates/users.php:99
+#: templates/users.php:97
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:134
+#: templates/users.php:128
 msgid "Default"
 msgstr ""
diff --git a/l10n/sr@latin/user_ldap.po b/l10n/sr@latin/user_ldap.po
index 05f0229b2ed08f15b2e965c1b2eb84a3a06ab4e8..f3a97db15e8b0eeaab01191c395408eb9ceeea9f 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-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-17 00:04+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..44c82fe664f3fc14a0c82d46744dd8ce7c85f755 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-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -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 66e9d73211aac5211e3ada08257d0398a1e8d15a..bd03e0f4876bcac1413395e7c1e3a7884161c3c6 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-02-22 00:06+0100\n"
-"PO-Revision-Date: 2013-02-20 23:20+0000\n"
-"Last-Translator: Magnus HÃ¶glund <magnus@linux.com>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10: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"
@@ -24,24 +17,24 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:85
+#: ajax/share.php:97
 #, php-format
 msgid "User %s shared a file with you"
 msgstr "AnvÃ¤ndare %s delade en fil med dig"
 
-#: ajax/share.php:87
+#: ajax/share.php:99
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr "AnvÃ¤ndare %s delade en mapp med dig"
 
-#: ajax/share.php:89
+#: ajax/share.php:101
 #, php-format
 msgid ""
 "User %s shared the file \"%s\" with you. It is available for download here: "
 "%s"
 msgstr "AnvÃ¤ndare %s delade filen \"%s\" med dig. Den finns att ladda ner hÃ¤r: %s"
 
-#: ajax/share.php:91
+#: ajax/share.php:104
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -87,79 +80,79 @@ msgstr "Inga kategorier valda fÃ¶r radering."
 msgid "Error removing %s from favorites."
 msgstr "Fel vid borttagning av %s frÃ¥n favoriter."
 
-#: js/config.php:32
+#: js/config.php:34
 msgid "Sunday"
 msgstr "SÃ¶ndag"
 
-#: js/config.php:32
+#: js/config.php:35
 msgid "Monday"
 msgstr "MÃ¥ndag"
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Tuesday"
 msgstr "Tisdag"
 
-#: js/config.php:32
+#: js/config.php:37
 msgid "Wednesday"
 msgstr "Onsdag"
 
-#: js/config.php:32
+#: js/config.php:38
 msgid "Thursday"
 msgstr "Torsdag"
 
-#: js/config.php:32
+#: js/config.php:39
 msgid "Friday"
 msgstr "Fredag"
 
-#: js/config.php:32
+#: js/config.php:40
 msgid "Saturday"
 msgstr "LÃ¶rdag"
 
-#: js/config.php:33
+#: js/config.php:45
 msgid "January"
 msgstr "Januari"
 
-#: js/config.php:33
+#: js/config.php:46
 msgid "February"
 msgstr "Februari"
 
-#: js/config.php:33
+#: js/config.php:47
 msgid "March"
 msgstr "Mars"
 
-#: js/config.php:33
+#: js/config.php:48
 msgid "April"
 msgstr "April"
 
-#: js/config.php:33
+#: js/config.php:49
 msgid "May"
 msgstr "Maj"
 
-#: js/config.php:33
+#: js/config.php:50
 msgid "June"
 msgstr "Juni"
 
-#: js/config.php:33
+#: js/config.php:51
 msgid "July"
 msgstr "Juli"
 
-#: js/config.php:33
+#: js/config.php:52
 msgid "August"
 msgstr "Augusti"
 
-#: js/config.php:33
+#: js/config.php:53
 msgid "September"
 msgstr "September"
 
-#: js/config.php:33
+#: js/config.php:54
 msgid "October"
 msgstr "Oktober"
 
-#: js/config.php:33
+#: js/config.php:55
 msgid "November"
 msgstr "November"
 
-#: js/config.php:33
+#: js/config.php:56
 msgid "December"
 msgstr "December"
 
@@ -167,86 +160,88 @@ msgstr "December"
 msgid "Settings"
 msgstr "InstÃ¤llningar"
 
-#: js/js.js:767
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "sekunder sedan"
 
-#: js/js.js:768
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "1 minut sedan"
 
-#: js/js.js:769
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr "{minutes} minuter sedan"
 
-#: js/js.js:770
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr "1 timme sedan"
 
-#: js/js.js:771
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr "{hours} timmar sedan"
 
-#: js/js.js:772
+#: js/js.js:723
 msgid "today"
 msgstr "i dag"
 
-#: js/js.js:773
+#: js/js.js:724
 msgid "yesterday"
 msgstr "i gÃ¥r"
 
-#: js/js.js:774
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr "{days} dagar sedan"
 
-#: js/js.js:775
+#: js/js.js:726
 msgid "last month"
 msgstr "fÃ¶rra mÃ¥naden"
 
-#: js/js.js:776
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr "{months} mÃ¥nader sedan"
 
-#: js/js.js:777
+#: js/js.js:728
 msgid "months ago"
 msgstr "mÃ¥nader sedan"
 
-#: js/js.js:778
+#: js/js.js:729
 msgid "last year"
 msgstr "fÃ¶rra Ã¥ret"
 
-#: js/js.js:779
+#: js/js.js:730
 msgid "years ago"
 msgstr "Ã¥r sedan"
 
-#: js/oc-dialogs.js:126
-msgid "Choose"
-msgstr "VÃ¤lj"
+#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
+msgid "Ok"
+msgstr "Ok"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "Nej"
+#: js/oc-dialogs.js:185
+msgid "Choose"
+msgstr "VÃ¤lj"
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:215
 msgid "Yes"
 msgstr "Ja"
 
-#: js/oc-dialogs.js:180
-msgid "Ok"
-msgstr "Ok"
+#: js/oc-dialogs.js:222
+msgid "No"
+msgstr "Nej"
 
 #: 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 "Objekttypen Ã¤r inte specificerad."
 
-#: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:582
-#: js/share.js:594
+#: 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 "Fel"
 
@@ -258,127 +253,127 @@ msgstr " Namnet pÃ¥ appen Ã¤r inte specificerad."
 msgid "The required file {file} is not installed!"
 msgstr "Den nÃ¶dvÃ¤ndiga filen {file} Ã¤r inte installerad!"
 
-#: js/share.js:29 js/share.js:43 js/share.js:90
+#: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr "Delad"
 
-#: js/share.js:93
+#: js/share.js:90
 msgid "Share"
 msgstr "Dela"
 
-#: js/share.js:141 js/share.js:622
+#: js/share.js:125 js/share.js:617
 msgid "Error while sharing"
 msgstr "Fel vid delning"
 
-#: js/share.js:152
+#: js/share.js:136
 msgid "Error while unsharing"
 msgstr "Fel nÃ¤r delning skulle avslutas"
 
-#: js/share.js:159
+#: js/share.js:143
 msgid "Error while changing permissions"
 msgstr "Fel vid Ã¤ndring av rÃ¤ttigheter"
 
-#: js/share.js:168
+#: js/share.js:152
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Delad med dig och gruppen {group} av {owner}"
 
-#: js/share.js:170
+#: js/share.js:154
 msgid "Shared with you by {owner}"
 msgstr "Delad med dig av {owner}"
 
-#: js/share.js:175
+#: js/share.js:159
 msgid "Share with"
 msgstr "Delad med"
 
-#: js/share.js:180
+#: js/share.js:164
 msgid "Share with link"
 msgstr "Delad med lÃ¤nk"
 
-#: js/share.js:183
+#: js/share.js:167
 msgid "Password protect"
 msgstr "LÃ¶senordsskydda"
 
-#: js/share.js:185 templates/installation.php:44 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "LÃ¶senord"
 
-#: js/share.js:189
+#: js/share.js:173
 msgid "Email link to person"
 msgstr "E-posta lÃ¤nk till person"
 
-#: js/share.js:190
+#: js/share.js:174
 msgid "Send"
 msgstr "Skicka"
 
-#: js/share.js:194
+#: js/share.js:178
 msgid "Set expiration date"
 msgstr "SÃ¤tt utgÃ¥ngsdatum"
 
-#: js/share.js:195
+#: js/share.js:179
 msgid "Expiration date"
 msgstr "UtgÃ¥ngsdatum"
 
-#: js/share.js:227
+#: js/share.js:211
 msgid "Share via email:"
 msgstr "Dela via e-post:"
 
-#: js/share.js:229
+#: js/share.js:213
 msgid "No people found"
 msgstr "Hittar inga anvÃ¤ndare"
 
-#: js/share.js:256
+#: js/share.js:251
 msgid "Resharing is not allowed"
 msgstr "Dela vidare Ã¤r inte tillÃ¥tet"
 
-#: js/share.js:292
+#: js/share.js:287
 msgid "Shared in {item} with {user}"
 msgstr "Delad i {item} med {user}"
 
-#: js/share.js:313
+#: js/share.js:308
 msgid "Unshare"
 msgstr "Sluta dela"
 
-#: js/share.js:325
+#: js/share.js:320
 msgid "can edit"
 msgstr "kan redigera"
 
-#: js/share.js:327
+#: js/share.js:322
 msgid "access control"
 msgstr "Ã¥tkomstkontroll"
 
-#: js/share.js:330
+#: js/share.js:325
 msgid "create"
 msgstr "skapa"
 
-#: js/share.js:333
+#: js/share.js:328
 msgid "update"
 msgstr "uppdatera"
 
-#: js/share.js:336
+#: js/share.js:331
 msgid "delete"
 msgstr "radera"
 
-#: js/share.js:339
+#: js/share.js:334
 msgid "share"
 msgstr "dela"
 
-#: js/share.js:373 js/share.js:569
+#: js/share.js:368 js/share.js:564
 msgid "Password protected"
 msgstr "LÃ¶senordsskyddad"
 
-#: js/share.js:582
+#: js/share.js:577
 msgid "Error unsetting expiration date"
 msgstr "Fel vid borttagning av utgÃ¥ngsdatum"
 
-#: js/share.js:594
+#: js/share.js:589
 msgid "Error setting expiration date"
 msgstr "Fel vid sÃ¤ttning av utgÃ¥ngsdatum"
 
-#: js/share.js:609
+#: js/share.js:604
 msgid "Sending ..."
 msgstr "Skickar ..."
 
-#: js/share.js:620
+#: js/share.js:615
 msgid "Email sent"
 msgstr "E-post skickat"
 
@@ -401,24 +396,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:39
-#: 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"
 
@@ -468,121 +466,136 @@ 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"
 msgstr "LÃ¤gg till"
 
-#: templates/installation.php:23 templates/installation.php:30
+#: templates/installation.php:24 templates/installation.php:31
+#: templates/installation.php:38
 msgid "Security Warning"
 msgstr "SÃ¤kerhetsvarning"
 
-#: templates/installation.php:24
+#: templates/installation.php:25
+msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
+msgstr "Din version av PHP Ã¤r sÃ¥rbar fÃ¶r NULL byte attack (CVE-2006-7243)"
+
+#: templates/installation.php:26
+msgid "Please update your PHP installation to use ownCloud securely."
+msgstr "Uppdatera din PHP-installation fÃ¶r att anvÃ¤nda ownCloud sÃ¤kert."
+
+#: templates/installation.php:32
 msgid ""
 "No secure random number generator is available, please enable the PHP "
 "OpenSSL extension."
 msgstr "Ingen sÃ¤ker slumptalsgenerator finns tillgÃ¤nglig. Du bÃ¶r aktivera PHP OpenSSL-tillÃ¤gget."
 
-#: templates/installation.php:25
+#: 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 "Utan en sÃ¤ker slumptalsgenerator kan angripare fÃ¥ mÃ¶jlighet att fÃ¶rutsÃ¤ga lÃ¶senordsÃ¥terstÃ¤llningar och ta Ã¶ver ditt konto."
 
-#: templates/installation.php:31
+#: templates/installation.php:39
 msgid ""
 "Your data directory and files are probably accessible from the internet "
 "because the .htaccess file does not work."
 msgstr "Din datakatalog och filer Ã¤r fÃ¶rmodligen tillgÃ¤ngliga frÃ¥n Internet, eftersom .htaccess-filen inte fungerar."
 
-#: templates/installation.php:32
+#: 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 "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>."
 
-#: templates/installation.php:36
+#: templates/installation.php:44
 msgid "Create an <strong>admin account</strong>"
 msgstr "Skapa ett <strong>administratÃ¶rskonto</strong>"
 
-#: templates/installation.php:52
+#: templates/installation.php:62
 msgid "Advanced"
-msgstr "Avancerat"
+msgstr "Avancerad"
 
-#: templates/installation.php:54
+#: templates/installation.php:64
 msgid "Data folder"
 msgstr "Datamapp"
 
-#: templates/installation.php:61
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "Konfigurera databasen"
 
-#: templates/installation.php:66 templates/installation.php:77
-#: templates/installation.php:87 templates/installation.php:97
+#: 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:109
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "DatabasanvÃ¤ndare"
 
-#: templates/installation.php:113
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "LÃ¶senord till databasen"
 
-#: templates/installation.php:117
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "Databasnamn"
 
-#: templates/installation.php:125
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "Databas tabellutrymme"
 
-#: templates/installation.php:131
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "Databasserver"
 
-#: templates/installation.php:136
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "Avsluta installation"
 
-#: templates/layout.guest.php:33
+#: templates/layout.guest.php:40
 msgid "web services under your control"
 msgstr "webbtjÃ¤nster under din kontroll"
 
-#: templates/layout.user.php:48
+#: 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 "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 c965ecb646ec8d48e5f168e9b1d1833bcbd7acd7..f99535735abf7af1b4af5cb416a422b3dd614189 100644
--- a/l10n/sv/files.po
+++ b/l10n/sv/files.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.
-# 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-03-07 00:16+0100\n"
-"PO-Revision-Date: 2013-03-06 01:40+0000\n"
-"Last-Translator: Lokal_Profil <lokal_profil@hotmail.com>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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"
@@ -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"
@@ -77,59 +66,70 @@ msgstr "Misslyckades spara till disk"
 msgid "Not enough storage available"
 msgstr "Inte tillrÃ¤ckligt med lagringsutrymme tillgÃ¤ngligt"
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr "Felaktig mapp."
 
-#: appinfo/app.php:10
+#: appinfo/app.php:12
 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:92 templates/index.php:93
+#: 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/files.js:292 js/files.js:408
-#: js/files.js:439
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "VÃ¤ntar"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} finns redan"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "ersÃ¤tt"
 
-#: js/filelist.js:251
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "fÃ¶reslÃ¥ namn"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "avbryt"
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "ersatt {new_name} med {old_name}"
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "undo"
 msgstr "Ã¥ngra"
 
-#: js/filelist.js:323
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr "utfÃ¶r raderingen"
 
+#: js/filelist.js:413
+msgid "1 file uploading"
+msgstr "1 filuppladdning"
+
+#: js/filelist.js:416 js/filelist.js:470
+msgid "files uploading"
+msgstr "filer laddas upp"
+
 #: js/files.js:52
 msgid "'.' is an invalid file name."
 msgstr "'.' Ã¤r ett ogiltigt filnamn."
@@ -152,77 +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:225
+#: 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:262
+#: 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:262
-msgid "Upload Error"
-msgstr "Uppladdningsfel"
+#: js/files.js:277
+msgid "Not enough space available"
+msgstr "Inte tillrÃ¤ckligt med utrymme tillgÃ¤ngligt"
 
-#: js/files.js:273
-msgid "Close"
-msgstr "StÃ¤ng"
-
-#: js/files.js:312
-msgid "1 file uploading"
-msgstr "1 filuppladdning"
-
-#: js/files.js:315 js/files.js:370 js/files.js:385
-msgid "{count} files uploading"
-msgstr "{count} filer laddas upp"
-
-#: js/files.js:388 js/files.js:423
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "Uppladdning avbruten."
 
-#: js/files.js:497
+#: 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:570
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "URL kan inte vara tom."
 
-#: js/files.js:575
+#: 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:953 templates/index.php:68
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+msgid "Error"
+msgstr "Fel"
+
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Namn"
 
-#: js/files.js:954 templates/index.php:79
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Storlek"
 
-#: js/files.js:955 templates/index.php:81
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Ã„ndrad"
 
-#: js/files.js:974
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 mapp"
 
-#: js/files.js:976
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} mappar"
 
-#: js/files.js:984
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 fil"
 
-#: js/files.js:986
+#: 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"
@@ -275,45 +275,45 @@ msgstr "Mapp"
 msgid "From link"
 msgstr "FrÃ¥n lÃ¤nk"
 
-#: templates/index.php:40
+#: templates/index.php:42
 msgid "Deleted files"
 msgstr "Raderade filer"
 
-#: templates/index.php:46
+#: templates/index.php:48
 msgid "Cancel upload"
 msgstr "Avbryt uppladdning"
 
-#: templates/index.php:53
+#: templates/index.php:54
 msgid "You donâ€™t have write permissions here."
 msgstr "Du saknar skrivbehÃ¶righet hÃ¤r."
 
-#: templates/index.php:60
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Ingenting hÃ¤r. Ladda upp nÃ¥got!"
 
-#: templates/index.php:74
+#: templates/index.php:75
 msgid "Download"
 msgstr "Ladda ner"
 
-#: templates/index.php:86 templates/index.php:87
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Sluta dela"
 
-#: templates/index.php:106
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "FÃ¶r stor uppladdning"
 
-#: templates/index.php:108
+#: 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:113
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Filer skannas, var god vÃ¤nta"
 
-#: templates/index.php:116
+#: 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..990e7bf1763c8291b0deea16a411875c78f8155d 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/sv/files_external.po b/l10n/sv/files_external.po
index edcc1e79da000cf811cabf45ac77e46238857c59..9ebda80a2dd67c154ccc1314951e2beb3738fe3b 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-07 00:16+0100\n"
-"PO-Revision-Date: 2013-03-06 01:40+0000\n"
-"Last-Translator: Lokal_Profil <lokal_profil@hotmail.com>\n"
+"POT-Creation-Date: 2013-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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: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 "<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: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 "<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..2ba2bb298c956434f5df87b0fcbd415312fc2c42 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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 48a48d9ad757d32d6e880f20c133c66e19f1f94e..33c448aa9e39de94dd733916d0d884055337efb8 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-03-08 00:25+0100\n"
-"PO-Revision-Date: 2013-03-07 23:25+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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,12 +17,12 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:40
+#: ajax/delete.php:42
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "Kunde inte radera %s permanent"
 
-#: ajax/undelete.php:41
+#: ajax/undelete.php:42
 #, php-format
 msgid "Couldn't restore %s"
 msgstr "Kunde inte Ã¥terstÃ¤lla %s"
@@ -33,6 +31,10 @@ msgstr "Kunde inte Ã¥terstÃ¤lla %s"
 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
+msgid "Error"
+msgstr "Fel"
+
 #: js/trash.js:34
 msgid "delete file permanently"
 msgstr "radera filen permanent"
@@ -79,4 +81,4 @@ msgstr "Radera"
 
 #: templates/part.breadcrumb.php:9
 msgid "Deleted Files"
-msgstr ""
+msgstr "Raderade filer"
diff --git a/l10n/sv/files_versions.po b/l10n/sv/files_versions.po
index f092111cf652b4f081793c8d2f89476fd922c26b..7f6c0a26be09aeca33d2edc635d8d9a8f6212ad3 100644
--- a/l10n/sv/files_versions.po
+++ b/l10n/sv/files_versions.po
@@ -3,13 +3,12 @@
 # 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-02-28 00:04+0100\n"
-"PO-Revision-Date: 2013-02-27 23:04+0000\n"
+"POT-Creation-Date: 2013-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:30+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"
@@ -41,17 +40,17 @@ msgstr "misslyckades"
 msgid "File %s could not be reverted to version %s"
 msgstr "Filen %s kunde inte Ã¥terstÃ¤llas till version %s"
 
-#: history.php:68
+#: history.php:69
 msgid "No old versions available"
 msgstr "Inga gamla versioner finns tillgÃ¤ngliga"
 
-#: history.php:73
+#: history.php:74
 msgid "No path specified"
 msgstr "Ingen sÃ¶kvÃ¤g angiven"
 
 #: js/versions.js:6
 msgid "Versions"
-msgstr ""
+msgstr "Versioner"
 
 #: templates/history.php:20
 msgid "Revert a file to a previous version by clicking on its revert button"
diff --git a/l10n/sv/lib.po b/l10n/sv/lib.po
index 44ec1427c251e473838c34698917dc3bf70e387e..d02feb64ea7df811987f5f862169ad440f3b55bc 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-02-27 14:35+0100\n"
-"PO-Revision-Date: 2013-02-27 13:35+0000\n"
+"POT-Creation-Date: 2013-04-28 01:57+0200\n"
+"PO-Revision-Date: 2013-04-27 23:57+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"
@@ -43,19 +41,19 @@ msgstr "Program"
 msgid "Admin"
 msgstr "Admin"
 
-#: files.php:202
+#: files.php:209
 msgid "ZIP download is turned off."
 msgstr "Nerladdning av ZIP Ã¤r avstÃ¤ngd."
 
-#: files.php:203
+#: files.php:210
 msgid "Files need to be downloaded one by one."
 msgstr "Filer laddas ner en Ã¥t gÃ¥ngen."
 
-#: files.php:204 files.php:231
+#: files.php:211 files.php:244
 msgid "Back to Files"
 msgstr "Tillbaka till Filer"
 
-#: files.php:228
+#: files.php:241
 msgid "Selected files too large to generate zip file."
 msgstr "Valda filer Ã¤r fÃ¶r stora fÃ¶r att skapa zip-fil."
 
@@ -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,72 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:128 setup.php:320 setup.php:365
+#: setup.php:132 setup.php:325 setup.php:370
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:129 setup.php:152 setup.php:229
+#: setup.php:133 setup.php:156 setup.php:234
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:151 setup.php:453 setup.php:520
+#: setup.php:155 setup.php:458 setup.php:525
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:228
+#: setup.php:233
 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: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:583 setup.php:592 setup.php:600 setup.php:609
+#: setup.php:615
 #, 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:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
+#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
+#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:299
+#: setup.php:304
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:300
+#: setup.php:305
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:305
+#: setup.php:310
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:306
+#: setup.php:311
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:579 setup.php:611
+#: setup.php:584 setup.php:616
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:631
+#: setup.php:636
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:849
+#: setup.php:858
 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:850
+#: setup.php:859
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Var god kontrollera <a href='%s'>installationsguiden</a>."
@@ -213,11 +207,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 +235,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 bf1d01a7e9595e65ef4b756e165f2d8c78e2cb7e..3be85181fede47801dc1475d59b54d989b0670fb 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-03-07 00:16+0100\n"
-"PO-Revision-Date: 2013-03-06 01:50+0000\n"
-"Last-Translator: Lokal_Profil <lokal_profil@hotmail.com>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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"
 
@@ -101,7 +96,7 @@ msgstr "Uppdaterar till {appversion}"
 msgid "Disable"
 msgstr "Deaktivera"
 
-#: js/apps.js:36 js/apps.js:64
+#: js/apps.js:36 js/apps.js:64 js/apps.js:83
 msgid "Enable"
 msgstr "Aktivera"
 
@@ -109,68 +104,68 @@ msgstr "Aktivera"
 msgid "Please wait...."
 msgstr "Var god vÃ¤nta..."
 
-#: js/apps.js:84
+#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+msgid "Error"
+msgstr "Fel"
+
+#: js/apps.js:90
 msgid "Updating...."
 msgstr "Uppdaterar..."
 
-#: js/apps.js:87
+#: js/apps.js:93
 msgid "Error while updating app"
 msgstr "Fel uppstod vid uppdatering av appen"
 
-#: js/apps.js:87
-msgid "Error"
-msgstr "Fel"
-
-#: js/apps.js:90
+#: js/apps.js:96
 msgid "Updated"
 msgstr "Uppdaterad"
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr "Sparar..."
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "deleted"
 msgstr "raderad"
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "undo"
 msgstr "Ã¥ngra"
 
-#: js/users.js:62
+#: js/users.js:79
 msgid "Unable to remove user"
-msgstr ""
+msgstr "Kan inte ta bort anvÃ¤ndare"
 
-#: js/users.js:75 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
+#: templates/users.php:103
 msgid "Groups"
 msgstr "Grupper"
 
-#: js/users.js:78 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr "GruppadministratÃ¶r"
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "Radera"
 
-#: js/users.js:191
+#: js/users.js:269
 msgid "add group"
 msgstr "lÃ¤gg till grupp"
 
-#: js/users.js:352
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr "Ett giltigt anvÃ¤ndarnamn mÃ¥ste anges"
 
-#: js/users.js:353 js/users.js:359 js/users.js:374
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr "Fel vid skapande av anvÃ¤ndare"
 
-#: js/users.js:358
+#: js/users.js:426
 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__"
 
@@ -189,7 +184,7 @@ msgstr "Din datakatalog och dina filer Ã¤r fÃ¶rmodligen tillgÃ¤ngliga frÃ¥n Inte
 
 #: templates/admin.php:29
 msgid "Setup Warning"
-msgstr ""
+msgstr "Installationsvarning"
 
 #: templates/admin.php:32
 msgid ""
@@ -210,7 +205,7 @@ msgstr "Modulen \"fileinfo\" saknas"
 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' saknas. Vi rekommenderar starkt att aktivera den hÃ¤r modulen fÃ¶r att kunna upptÃ¤cka korrekt mime-typ."
 
 #: templates/admin.php:58
 msgid "Locale not working"
@@ -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,17 +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:230 templates/personal.php:102
+#: templates/admin.php:228
+msgid "Less"
+msgstr "Mindre"
+
+#: templates/admin.php:235 templates/personal.php:105
 msgid "Version"
 msgstr "Version"
 
-#: templates/admin.php:233 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 "
@@ -394,13 +393,13 @@ msgstr "Du har anvÃ¤nt <strong>%s</strong> av tillgÃ¤ngliga <strong>%s</strong>"
 
 #: templates/personal.php:15
 msgid "Get the apps to sync your files"
-msgstr ""
+msgstr "Skaffa appar fÃ¶r att synkronisera dina filer"
 
 #: templates/personal.php:26
 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:77
 msgid "Password"
 msgstr "LÃ¶senord"
 
@@ -424,82 +423,70 @@ 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:76
 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:68
 msgid "Email"
 msgstr "E-post"
 
-#: templates/personal.php:72
+#: templates/personal.php:70
 msgid "Your email address"
 msgstr "Din e-postadress"
 
-#: templates/personal.php:73
+#: templates/personal.php:71
 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:77 templates/personal.php:78
 msgid "Language"
 msgstr "SprÃ¥k"
 
-#: templates/personal.php:86
+#: templates/personal.php:89
 msgid "Help translate"
 msgstr "HjÃ¤lp att Ã¶versÃ¤tta"
 
-#: templates/personal.php:91
+#: templates/personal.php:94
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:93
+#: templates/personal.php:96
 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:75
 msgid "Login Name"
 msgstr "Inloggningsnamn"
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr "Skapa"
 
-#: templates/users.php:35
+#: templates/users.php:33
 msgid "Default Storage"
 msgstr "FÃ¶rvald lagring"
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:39 templates/users.php:133
 msgid "Unlimited"
 msgstr "ObegrÃ¤nsad"
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:57 templates/users.php:148
 msgid "Other"
 msgstr "Annat"
 
-#: templates/users.php:84
+#: templates/users.php:82
 msgid "Storage"
 msgstr "Lagring"
 
-#: templates/users.php:95
+#: templates/users.php:93
 msgid "change display name"
 msgstr "Ã¤ndra visat namn"
 
-#: templates/users.php:99
+#: templates/users.php:97
 msgid "set new password"
 msgstr "ange nytt lÃ¶senord"
 
-#: templates/users.php:134
+#: templates/users.php:128
 msgid "Default"
 msgstr "FÃ¶rvald"
diff --git a/l10n/sv/user_ldap.po b/l10n/sv/user_ldap.po
index 2a936630928473f176b5e46c861a927dc9153001..9fca84c6571ca0806b3d54cec1e4d2fd338c64ef 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-03-07 00:16+0100\n"
-"PO-Revision-Date: 2013-03-06 01:40+0000\n"
-"Last-Translator: Lokal_Profil <lokal_profil@hotmail.com>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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 ""
+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 ""
+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 ""
+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
-msgid "Test Configuration"
+#: 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:99
+#: 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:111
 msgid "Help"
 msgstr "HjÃ¤lp"
diff --git a/l10n/sv/user_webdavauth.po b/l10n/sv/user_webdavauth.po
index 98475a8bd9775afb679e26b017dc40cc6af859f8..0cb54a97da1e6dc12ac5bc776cbe0ab7e62a6cba 100644
--- a/l10n/sv/user_webdavauth.po
+++ b/l10n/sv/user_webdavauth.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-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-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+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 e6919ac84dadf31f94405ecf98d97dfe6321e98e..09988ffea27b97ae2b446eeb4b55934befba49c8 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-02-09 00:12+0100\n"
-"PO-Revision-Date: 2013-02-08 23:12+0000\n"
+"POT-Creation-Date: 2013-04-30 01:57+0200\n"
+"PO-Revision-Date: 2013-04-29 23:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
 "MIME-Version: 1.0\n"
@@ -17,24 +17,24 @@ msgstr ""
 "Language: sw_KE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:85
+#: ajax/share.php:97
 #, php-format
 msgid "User %s shared a file with you"
 msgstr ""
 
-#: ajax/share.php:87
+#: ajax/share.php:99
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr ""
 
-#: ajax/share.php:89
+#: 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:91
+#: ajax/share.php:104
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -80,156 +80,156 @@ msgstr ""
 msgid "Error removing %s from favorites."
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:34
 msgid "Sunday"
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:35
 msgid "Monday"
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Tuesday"
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:37
 msgid "Wednesday"
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:38
 msgid "Thursday"
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:39
 msgid "Friday"
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:40
 msgid "Saturday"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:45
 msgid "January"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:46
 msgid "February"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:47
 msgid "March"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:48
 msgid "April"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:49
 msgid "May"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:50
 msgid "June"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:51
 msgid "July"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:52
 msgid "August"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:53
 msgid "September"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:54
 msgid "October"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:55
 msgid "November"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:56
 msgid "December"
 msgstr ""
 
-#: js/js.js:284
+#: js/js.js:286
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:764
+#: js/js.js:718
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:765
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:766
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:767
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:768
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:769
+#: js/js.js:723
 msgid "today"
 msgstr ""
 
-#: js/js.js:770
+#: js/js.js:724
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:771
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:772
+#: js/js.js:726
 msgid "last month"
 msgstr ""
 
-#: js/js.js:773
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:774
+#: js/js.js:728
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:775
+#: js/js.js:729
 msgid "last year"
 msgstr ""
 
-#: js/js.js:776
+#: js/js.js:730
 msgid "years ago"
 msgstr ""
 
-#: js/oc-dialogs.js:126
-msgid "Choose"
+#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
+msgid "Ok"
 msgstr ""
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
 msgid "Cancel"
 msgstr ""
 
-#: js/oc-dialogs.js:162
-msgid "No"
+#: js/oc-dialogs.js:185
+msgid "Choose"
 msgstr ""
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:215
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:180
-msgid "Ok"
+#: js/oc-dialogs.js:222
+msgid "No"
 msgstr ""
 
 #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
@@ -237,9 +237,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:152 js/share.js:159 js/share.js:571
-#: js/share.js:583
+#: 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 ""
 
@@ -251,127 +253,127 @@ msgstr ""
 msgid "The required file {file} is not installed!"
 msgstr ""
 
-#: js/share.js:29 js/share.js:43 js/share.js:90 js/share.js:93
-msgid "Share"
+#: js/share.js:30 js/share.js:45 js/share.js:87
+msgid "Shared"
 msgstr ""
 
-#: js/share.js:29 js/share.js:43 js/share.js:90 js/share.js:93
-msgid "Shared"
+#: js/share.js:90
+msgid "Share"
 msgstr ""
 
-#: js/share.js:141 js/share.js:611
+#: js/share.js:125 js/share.js:617
 msgid "Error while sharing"
 msgstr ""
 
-#: js/share.js:152
+#: js/share.js:136
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:159
+#: js/share.js:143
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:168
+#: js/share.js:152
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:170
+#: js/share.js:154
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:175
+#: js/share.js:159
 msgid "Share with"
 msgstr ""
 
-#: js/share.js:180
+#: js/share.js:164
 msgid "Share with link"
 msgstr ""
 
-#: js/share.js:183
+#: js/share.js:167
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:185 templates/installation.php:44 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr ""
 
-#: js/share.js:189
+#: js/share.js:173
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:190
+#: js/share.js:174
 msgid "Send"
 msgstr ""
 
-#: js/share.js:194
+#: js/share.js:178
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:195
+#: js/share.js:179
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:227
+#: js/share.js:211
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:229
+#: js/share.js:213
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:256
+#: js/share.js:251
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:292
+#: js/share.js:287
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:313
+#: js/share.js:308
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:325
+#: js/share.js:320
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:327
+#: js/share.js:322
 msgid "access control"
 msgstr ""
 
-#: js/share.js:330
+#: js/share.js:325
 msgid "create"
 msgstr ""
 
-#: js/share.js:333
+#: js/share.js:328
 msgid "update"
 msgstr ""
 
-#: js/share.js:336
+#: js/share.js:331
 msgid "delete"
 msgstr ""
 
-#: js/share.js:339
+#: js/share.js:334
 msgid "share"
 msgstr ""
 
-#: js/share.js:373 js/share.js:558
+#: js/share.js:368 js/share.js:564
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:571
+#: js/share.js:577
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:583
+#: js/share.js:589
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:598
+#: js/share.js:604
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:609
+#: js/share.js:615
 msgid "Email sent"
 msgstr ""
 
@@ -386,7 +388,7 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:47
+#: lostpassword/controller.php:48
 msgid "ownCloud password reset"
 msgstr ""
 
@@ -394,24 +396,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:39
-#: 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 ""
 
@@ -467,115 +472,130 @@ msgstr ""
 msgid "Add"
 msgstr ""
 
-#: templates/installation.php:23 templates/installation.php:30
+#: 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:25
+#: 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:31
+#: 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:32
+#: 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:36
+#: templates/installation.php:44
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
-#: templates/installation.php:52
+#: templates/installation.php:62
 msgid "Advanced"
 msgstr ""
 
-#: templates/installation.php:54
+#: templates/installation.php:64
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:61
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:66 templates/installation.php:77
-#: templates/installation.php:87 templates/installation.php:97
+#: 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:109
+#: templates/installation.php:137
 msgid "Database user"
 msgstr ""
 
-#: templates/installation.php:113
+#: templates/installation.php:144
 msgid "Database password"
 msgstr ""
 
-#: templates/installation.php:117
+#: templates/installation.php:149
 msgid "Database name"
 msgstr ""
 
-#: templates/installation.php:125
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:131
+#: templates/installation.php:166
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:136
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr ""
 
-#: templates/layout.guest.php:33
+#: templates/layout.guest.php:40
 msgid "web services under your control"
 msgstr ""
 
-#: templates/layout.user.php:48
+#: 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 c6160aff80e4e8b5b7236cd2e8092f1c5e2e3ddc..a8b0ef83d0892b632824018f0fa4db669383fba6 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-03-04 00:06+0100\n"
-"PO-Revision-Date: 2013-03-03 23:06+0000\n"
+"POT-Creation-Date: 2013-05-15 01:59+0200\n"
+"PO-Revision-Date: 2013-05-15 00:00+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
 "MIME-Version: 1.0\n"
@@ -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 ""
@@ -70,59 +66,70 @@ msgstr ""
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:10
+#: 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 ""
 
-#: js/fileactions.js:127 templates/index.php:92 templates/index.php:93
+#: 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/files.js:292 js/files.js:408
-#: js/files.js:439
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:251
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:323
+#: 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 ""
@@ -145,77 +152,77 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:225
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:262
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:262
-msgid "Upload Error"
-msgstr ""
-
-#: js/files.js:273
-msgid "Close"
+#: js/files.js:277
+msgid "Not enough space available"
 msgstr ""
 
-#: js/files.js:312
-msgid "1 file uploading"
-msgstr ""
-
-#: js/files.js:315 js/files.js:370 js/files.js:385
-msgid "{count} files uploading"
-msgstr ""
-
-#: js/files.js:388 js/files.js:423
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:497
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:570
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:575
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:953 templates/index.php:68
+#: 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:954 templates/index.php:79
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr ""
 
-#: js/files.js:955 templates/index.php:81
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:974
+#: js/files.js:898
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:976
+#: js/files.js:900
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:984
+#: js/files.js:908
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:986
+#: 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 ""
@@ -268,45 +275,45 @@ msgstr ""
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:42
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:48
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:53
+#: templates/index.php:54
 msgid "You donâ€™t have write permissions here."
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:74
+#: templates/index.php:75
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:86 templates/index.php:87
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr ""
 
-#: templates/index.php:106
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:108
+#: 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:113
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:116
+#: 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..84ed219358a0932144777cf184bff94165f333ea 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-04-26 10:00+0200\n"
+"PO-Revision-Date: 2013-04-26 08:01+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_external.po b/l10n/sw_KE/files_external.po
index 2054bbb707ea136765c9be0ed94706f9035c26c9..9a1b8f84a9c0f65092ac85e14f3e43b56f906b44 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-04-26 10:00+0200\n"
+"PO-Revision-Date: 2013-04-26 08:01+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..327c56dc2f04ae24248745719eff93b8d8d716c2 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-04-26 10:00+0200\n"
+"PO-Revision-Date: 2013-04-26 08:01+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 441869baaba1c193a658da094ba3e3661dfd9ca5..b865f9f8a675b2251fda23cb1f01b130cb9d25c1 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-03-08 00:25+0100\n"
-"PO-Revision-Date: 2013-03-07 23:25+0000\n"
+"POT-Creation-Date: 2013-04-26 10:00+0200\n"
+"PO-Revision-Date: 2013-04-26 08:01+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,12 +17,12 @@ msgstr ""
 "Language: sw_KE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:40
+#: ajax/delete.php:42
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
 
-#: ajax/undelete.php:41
+#: ajax/undelete.php:42
 #, php-format
 msgid "Couldn't restore %s"
 msgstr ""
@@ -31,6 +31,10 @@ msgstr ""
 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 ""
diff --git a/l10n/sw_KE/files_versions.po b/l10n/sw_KE/files_versions.po
index e8849bf702f65f5b2e7f5ac1b674532c6f511af9..2a223ee7bba5f7bff314050ab64ee762cea77936 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-04-26 10:00+0200\n"
+"PO-Revision-Date: 2013-04-26 08: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"
@@ -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..88df9e82be20056d2797086d8272ff8968d00eb0 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-04-28 01:57+0200\n"
+"PO-Revision-Date: 2013-04-27 23:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
 "MIME-Version: 1.0\n"
@@ -41,19 +41,19 @@ msgstr ""
 msgid "Admin"
 msgstr ""
 
-#: files.php:202
+#: files.php:209
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:203
+#: files.php:210
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:204 files.php:231
+#: files.php:211 files.php:244
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:228
+#: files.php:241
 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,72 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:128 setup.php:320 setup.php:365
+#: setup.php:132 setup.php:325 setup.php:370
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:129 setup.php:152 setup.php:229
+#: setup.php:133 setup.php:156 setup.php:234
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:151 setup.php:453 setup.php:520
+#: setup.php:155 setup.php:458 setup.php:525
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:228
+#: setup.php:233
 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: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:583 setup.php:592 setup.php:600 setup.php:609
+#: setup.php:615
 #, 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:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
+#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
+#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:299
+#: setup.php:304
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:300
+#: setup.php:305
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:305
+#: setup.php:310
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:306
+#: setup.php:311
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:579 setup.php:611
+#: setup.php:584 setup.php:616
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:631
+#: setup.php:636
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:849
+#: setup.php:858
 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:859
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
@@ -239,19 +235,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 53be4d2d72fb9bc40c6fb34f8f3acb16b3237dbe..e93dc470574e4bb5bf82f64723930362b8ab0c86 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-02-27 14:35+0100\n"
-"PO-Revision-Date: 2013-02-27 13:35+0000\n"
+"POT-Creation-Date: 2013-04-26 10:00+0200\n"
+"PO-Revision-Date: 2013-04-26 08:00+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
 "MIME-Version: 1.0\n"
@@ -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 ""
 
@@ -92,7 +96,7 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: js/apps.js:36 js/apps.js:64
+#: js/apps.js:36 js/apps.js:64 js/apps.js:83
 msgid "Enable"
 msgstr ""
 
@@ -100,64 +104,64 @@ msgstr ""
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:84
-msgid "Updating...."
+#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+msgid "Error"
 msgstr ""
 
-#: js/apps.js:87
-msgid "Error while updating app"
+#: js/apps.js:90
+msgid "Updating...."
 msgstr ""
 
-#: js/apps.js:87
-msgid "Error"
+#: js/apps.js:93
+msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:90
+#: js/apps.js:96
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:99
+#: js/personal.js:115
 msgid "Saving..."
 msgstr ""
 
-#: js/users.js:30
+#: js/users.js:43
 msgid "deleted"
 msgstr ""
 
-#: js/users.js:30
+#: js/users.js:43
 msgid "undo"
 msgstr ""
 
-#: js/users.js:62
+#: js/users.js:75
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:75 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: templates/users.php:103
 msgid "Groups"
 msgstr ""
 
-#: js/users.js:78 templates/users.php:82 templates/users.php:119
+#: js/users.js:91 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:111 templates/users.php:155
 msgid "Delete"
 msgstr ""
 
-#: js/users.js:191
+#: js/users.js:262
 msgid "add group"
 msgstr ""
 
-#: js/users.js:352
+#: js/users.js:414
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:353 js/users.js:359 js/users.js:374
+#: js/users.js:415 js/users.js:421 js/users.js:436
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:358
+#: js/users.js:420
 msgid "A valid password must be provided"
 msgstr ""
 
@@ -312,15 +316,19 @@ msgstr ""
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:230 templates/personal.php:102
+#: templates/admin.php:228
+msgid "Less"
+msgstr ""
+
+#: templates/admin.php:235 templates/personal.php:100
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:233 templates/personal.php:105
+#: templates/admin.php:238 templates/personal.php:103
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -391,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:77
 msgid "Password"
 msgstr ""
 
@@ -415,82 +423,70 @@ msgstr ""
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:76
 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:84
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:91
+#: templates/personal.php:89
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:93
+#: templates/personal.php:91
 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:75
 msgid "Login Name"
 msgstr ""
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr ""
 
-#: templates/users.php:35
+#: templates/users.php:33
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:39 templates/users.php:133
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:57 templates/users.php:148
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:84
+#: templates/users.php:82
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:95
+#: templates/users.php:93
 msgid "change display name"
 msgstr ""
 
-#: templates/users.php:99
+#: templates/users.php:97
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:134
+#: templates/users.php:128
 msgid "Default"
 msgstr ""
diff --git a/l10n/sw_KE/user_ldap.po b/l10n/sw_KE/user_ldap.po
index 4715c3b41d2d7bd65ba767488d155f233dc07e0c..61cca7831d4c9a70f5af2aeb232f95dd1deb6f4c 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-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-17 00:04+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..426f5e30721bce1699149d8e299f50ff17be506e 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-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+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 853bf9f186a2ea5e43984744e7a5ddded21867b3..07325fade991184976db85ef88e21e1569b83eda 100644
--- a/l10n/ta_LK/core.po
+++ b/l10n/ta_LK/core.po
@@ -3,15 +3,13 @@
 # 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-02-28 00:04+0100\n"
-"PO-Revision-Date: 2013-02-27 22:20+0000\n"
-"Last-Translator: Rupan <sgrupan@gmail.com>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10: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"
@@ -162,86 +160,88 @@ msgstr "à®®à®¾à®°à¯à®•à®´à®¿"
 msgid "Settings"
 msgstr "à®…à®®à¯ˆà®ªà¯à®ªà¯à®•à®³à¯"
 
-#: js/js.js:768
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "à®šà¯†à®•à¯à®•à®©à¯à®•à®³à¯à®•à¯à®•à¯ à®®à¯à®©à¯"
 
-#: js/js.js:769
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "1 à®¨à®¿à®®à®¿à®Ÿà®¤à¯à®¤à®¿à®±à¯à®•à¯ à®®à¯à®©à¯ "
 
-#: js/js.js:770
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr "{à®¨à®¿à®®à®¿à®Ÿà®™à¯à®•à®³à¯} à®¨à®¿à®®à®¿à®Ÿà®™à¯à®•à®³à¯à®•à¯à®•à¯ à®®à¯à®©à¯ "
 
-#: js/js.js:771
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr "1 à®®à®£à®¿à®¤à¯à®¤à®¿à®¯à®¾à®²à®¤à¯à®¤à®¿à®±à¯à®•à¯ à®®à¯à®©à¯"
 
-#: js/js.js:772
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr "{à®®à®£à®¿à®¤à¯à®¤à®¿à®¯à®¾à®²à®™à¯à®•à®³à¯} à®®à®£à®¿à®¤à¯à®¤à®¿à®¯à®¾à®²à®™à¯à®•à®³à®¿à®±à¯à®•à¯ à®®à¯à®©à¯"
 
-#: js/js.js:773
+#: js/js.js:723
 msgid "today"
 msgstr "à®‡à®©à¯à®±à¯"
 
-#: js/js.js:774
+#: js/js.js:724
 msgid "yesterday"
 msgstr "à®¨à¯‡à®±à¯à®±à¯"
 
-#: js/js.js:775
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr "{à®¨à®¾à®Ÿà¯à®•à®³à¯} à®¨à®¾à®Ÿà¯à®•à®³à¯à®•à¯à®•à¯ à®®à¯à®©à¯"
 
-#: js/js.js:776
+#: js/js.js:726
 msgid "last month"
 msgstr "à®•à®Ÿà®¨à¯à®¤ à®®à®¾à®¤à®®à¯"
 
-#: js/js.js:777
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr "{à®®à®¾à®¤à®™à¯à®•à®³à¯} à®®à®¾à®¤à®™à¯à®•à®³à®¿à®±à¯à®•à¯ à®®à¯à®©à¯"
 
-#: js/js.js:778
+#: js/js.js:728
 msgid "months ago"
 msgstr "à®®à®¾à®¤à®™à¯à®•à®³à¯à®•à¯à®•à¯ à®®à¯à®©à¯"
 
-#: js/js.js:779
+#: js/js.js:729
 msgid "last year"
 msgstr "à®•à®Ÿà®¨à¯à®¤ à®µà®°à¯à®Ÿà®®à¯"
 
-#: js/js.js:780
+#: js/js.js:730
 msgid "years ago"
 msgstr "à®µà®°à¯à®Ÿà®™à¯à®•à®³à¯à®•à¯à®•à¯ à®®à¯à®©à¯"
 
-#: js/oc-dialogs.js:126
-msgid "Choose"
-msgstr "à®¤à¯†à®°à®¿à®µà¯à®šà¯†à®¯à¯à®• "
+#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
+msgid "Ok"
+msgstr "à®šà®°à®¿"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
 msgid "Cancel"
 msgstr "à®‡à®°à®¤à¯à®¤à¯ à®šà¯†à®¯à¯à®•"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "à®‡à®²à¯à®²à¯ˆ"
+#: js/oc-dialogs.js:185
+msgid "Choose"
+msgstr "à®¤à¯†à®°à®¿à®µà¯à®šà¯†à®¯à¯à®• "
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:215
 msgid "Yes"
 msgstr "à®†à®®à¯"
 
-#: js/oc-dialogs.js:180
-msgid "Ok"
-msgstr "à®šà®°à®¿"
+#: js/oc-dialogs.js:222
+msgid "No"
+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:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:582
-#: js/share.js:594
+#: 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 "à®µà®´à¯"
 
@@ -253,127 +253,127 @@ msgstr "à®šà¯†à®¯à®²à®¿ à®ªà¯†à®¯à®°à¯ à®•à¯à®±à®¿à®ªà¯à®ªà®¿à®Ÿà®ªà¯à®ªà®Ÿ
 msgid "The required file {file} is not installed!"
 msgstr "à®¤à¯‡à®µà¯ˆà®ªà¯à®ªà®Ÿà¯à®Ÿ à®•à¯‹à®ªà¯à®ªà¯ {à®•à¯‹à®ªà¯à®ªà¯} à®¨à®¿à®±à¯à®µà®ªà¯à®ªà®Ÿà®µà®¿à®²à¯à®²à¯ˆ!"
 
-#: js/share.js:29 js/share.js:43 js/share.js:90
+#: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr ""
 
-#: js/share.js:93
+#: js/share.js:90
 msgid "Share"
 msgstr "à®ªà®•à®¿à®°à¯à®µà¯"
 
-#: js/share.js:141 js/share.js:622
+#: js/share.js:125 js/share.js:617
 msgid "Error while sharing"
 msgstr "à®ªà®•à®¿à®°à¯à®®à¯ à®ªà¯‹à®¤à®¾à®© à®µà®´à¯"
 
-#: js/share.js:152
+#: js/share.js:136
 msgid "Error while unsharing"
 msgstr "à®ªà®•à®¿à®°à®¾à®®à®²à¯ à®‰à®³à¯à®³à®ªà¯à®ªà¯‹à®¤à®¾à®© à®µà®´à¯"
 
-#: js/share.js:159
+#: js/share.js:143
 msgid "Error while changing permissions"
 msgstr "à®…à®©à¯à®®à®¤à®¿à®•à®³à¯ à®®à®¾à®±à¯à®®à¯à®ªà¯‹à®¤à®¾à®© à®µà®´à¯"
 
-#: js/share.js:168
+#: js/share.js:152
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "à®‰à®™à¯à®•à®³à¯à®Ÿà®©à¯à®®à¯ à®•à¯à®´à¯à®µà¯à®•à¯à®•à®¿à®Ÿà¯ˆà®¯à®¿à®²à¯à®®à¯ {à®•à¯à®´à¯} à®ªà®•à®¿à®°à®ªà¯à®ªà®Ÿà¯à®Ÿà¯à®³à¯à®³à®¤à¯ {à®‰à®°à®¿à®®à¯ˆà®¯à®¾à®³à®°à¯}"
 
-#: js/share.js:170
+#: js/share.js:154
 msgid "Shared with you by {owner}"
 msgstr "à®‰à®™à¯à®•à®³à¯à®Ÿà®©à¯ à®ªà®•à®¿à®°à®ªà¯à®ªà®Ÿà¯à®Ÿà¯à®³à¯à®³à®¤à¯ {à®‰à®°à®¿à®®à¯ˆà®¯à®¾à®³à®°à¯}"
 
-#: js/share.js:175
+#: js/share.js:159
 msgid "Share with"
 msgstr "à®ªà®•à®¿à®°à¯à®¤à®²à¯"
 
-#: js/share.js:180
+#: js/share.js:164
 msgid "Share with link"
 msgstr "à®‡à®£à¯ˆà®ªà¯à®ªà¯à®Ÿà®©à¯ à®ªà®•à®¿à®°à¯à®¤à®²à¯"
 
-#: js/share.js:183
+#: js/share.js:167
 msgid "Password protect"
 msgstr "à®•à®Ÿà®µà¯à®šà¯à®šà¯Šà®²à¯à®²à¯ˆ à®ªà®¾à®¤à¯à®•à®¾à®¤à¯à®¤à®²à¯"
 
-#: js/share.js:185 templates/installation.php:47 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "à®•à®Ÿà®µà¯à®šà¯à®šà¯Šà®²à¯"
 
-#: js/share.js:189
+#: js/share.js:173
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:190
+#: js/share.js:174
 msgid "Send"
 msgstr ""
 
-#: js/share.js:194
+#: js/share.js:178
 msgid "Set expiration date"
 msgstr "à®•à®¾à®²à®¾à®µà®¤à®¿ à®¤à¯‡à®¤à®¿à®¯à¯ˆ à®•à¯à®±à®¿à®ªà¯à®ªà®¿à®Ÿà¯à®•"
 
-#: js/share.js:195
+#: js/share.js:179
 msgid "Expiration date"
 msgstr "à®•à®¾à®²à®µà®¤à®¿à®¯à®¾à®•à¯à®®à¯ à®¤à®¿à®•à®¤à®¿"
 
-#: js/share.js:227
+#: js/share.js:211
 msgid "Share via email:"
 msgstr "à®®à®¿à®©à¯à®©à®žà¯à®šà®²à®¿à®©à¯‚à®Ÿà®¾à®© à®ªà®•à®¿à®°à¯à®µà¯: "
 
-#: js/share.js:229
+#: js/share.js:213
 msgid "No people found"
 msgstr "à®¨à®ªà®°à¯à®•à®³à¯ à®¯à®¾à®°à¯à®®à¯ à®‡à®²à¯à®²à¯ˆ"
 
-#: js/share.js:256
+#: js/share.js:251
 msgid "Resharing is not allowed"
 msgstr "à®®à¯€à®³à¯à®ªà®•à®¿à®°à¯à®µà®¤à®±à¯à®•à¯ à®…à®©à¯à®®à®¤à®¿ à®‡à®²à¯à®²à¯ˆ "
 
-#: js/share.js:292
+#: js/share.js:287
 msgid "Shared in {item} with {user}"
 msgstr "{à®ªà®¯à®©à®¾à®³à®°à¯} à®‰à®Ÿà®©à¯ {à®‰à®°à¯à®ªà¯à®ªà®Ÿà®¿} à®ªà®•à®¿à®°à®ªà¯à®ªà®Ÿà¯à®Ÿà¯à®³à¯à®³à®¤à¯"
 
-#: js/share.js:313
+#: js/share.js:308
 msgid "Unshare"
-msgstr "à®ªà®•à®¿à®°à®®à¯à®Ÿà®¿à®¯à®¾à®¤à¯"
+msgstr "à®ªà®•à®¿à®°à®ªà¯à®ªà®Ÿà®¾à®¤à®¤à¯"
 
-#: js/share.js:325
+#: js/share.js:320
 msgid "can edit"
 msgstr "à®¤à¯Šà®•à¯à®•à¯à®• à®®à¯à®Ÿà®¿à®¯à¯à®®à¯"
 
-#: js/share.js:327
+#: js/share.js:322
 msgid "access control"
 msgstr "à®•à®Ÿà¯à®Ÿà¯à®ªà¯à®ªà®¾à®Ÿà®¾à®© à®…à®£à¯à®•à®²à¯"
 
-#: js/share.js:330
+#: js/share.js:325
 msgid "create"
-msgstr "à®ªà®Ÿà¯ˆà®¤à¯à®¤à®²à¯"
+msgstr "à®‰à®°à¯à®µà®µà®¾à®•à¯à®•à®²à¯"
 
-#: js/share.js:333
+#: js/share.js:328
 msgid "update"
 msgstr "à®‡à®±à¯à®±à¯ˆà®ªà¯à®ªà®Ÿà¯à®¤à¯à®¤à®²à¯"
 
-#: js/share.js:336
+#: js/share.js:331
 msgid "delete"
 msgstr "à®¨à¯€à®•à¯à®•à¯à®•"
 
-#: js/share.js:339
+#: js/share.js:334
 msgid "share"
 msgstr "à®ªà®•à®¿à®°à¯à®¤à®²à¯"
 
-#: js/share.js:373 js/share.js:569
+#: js/share.js:368 js/share.js:564
 msgid "Password protected"
 msgstr "à®•à®Ÿà®µà¯à®šà¯à®šà¯Šà®²à¯ à®ªà®¾à®¤à¯à®•à®¾à®•à¯à®•à®ªà¯à®ªà®Ÿà¯à®Ÿà®¤à¯"
 
-#: js/share.js:582
+#: js/share.js:577
 msgid "Error unsetting expiration date"
 msgstr "à®•à®¾à®²à®¾à®µà®¤à®¿à®¯à®¾à®•à¯à®®à¯ à®¤à®¿à®•à®¤à®¿à®¯à¯ˆ à®•à¯à®±à®¿à®ªà¯à®ªà®¿à®Ÿà®¾à®®à¯ˆà®•à¯à®•à®¾à®© à®µà®´à¯"
 
-#: js/share.js:594
+#: js/share.js:589
 msgid "Error setting expiration date"
 msgstr "à®•à®¾à®²à®¾à®µà®¤à®¿à®¯à®¾à®•à¯à®®à¯ à®¤à®¿à®•à®¤à®¿à®¯à¯ˆ à®•à¯à®±à®¿à®ªà¯à®ªà®¿à®Ÿà¯à®µà®¤à®¿à®²à¯ à®µà®´à¯"
 
-#: js/share.js:609
+#: js/share.js:604
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:620
+#: js/share.js:615
 msgid "Email sent"
 msgstr ""
 
@@ -396,24 +396,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:41
-#: 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 "à®•à¯‹à®°à®¿à®•à¯à®•à¯ˆ à®®à¯€à®³à®®à¯ˆà®ªà¯à®ªà¯"
 
@@ -439,15 +442,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"
@@ -470,115 +473,129 @@ 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 "à®•à¯à®±à®¿à®ªà¯à®ªà®¿à®Ÿà¯à®Ÿ à®Žà®£à¯à®£à®¿à®•à¯à®•à¯ˆ à®ªà®¾à®¤à¯à®•à®¾à®ªà¯à®ªà®¾à®© à®ªà¯à®±à®ªà¯à®ªà®¾à®•à¯à®•à®¿ / à®‰à®£à¯à®Ÿà®¾à®•à¯à®•à®¿à®•à®³à¯ à®‡à®²à¯à®²à¯ˆ, à®¤à®¯à®µà¯à®šà¯†à®¯à¯à®¤à¯ PHP OpenSSL à®¨à¯€à®Ÿà¯à®šà®¿à®¯à¯ˆ à®‡à®¯à®²à¯à®®à¯ˆà®ªà¯à®ªà®Ÿà¯à®¤à¯à®¤à¯à®•. "
 
-#: 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:33
+#: 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:37
+#: templates/installation.php:44
 msgid "Create an <strong>admin account</strong>"
 msgstr "<strong> à®¨à®¿à®°à¯à®µà®¾à®• à®•à®£à®•à¯à®•à¯Šà®©à¯à®±à¯ˆ </strong> à®‰à®°à¯à®µà®¾à®•à¯à®•à¯à®•"
 
-#: templates/installation.php:55
+#: templates/installation.php:62
 msgid "Advanced"
-msgstr "à®®à¯‡à®®à¯à®ªà®Ÿà¯à®Ÿ"
+msgstr "à®‰à®¯à®°à¯à®¨à¯à®¤"
 
-#: templates/installation.php:57
+#: templates/installation.php:64
 msgid "Data folder"
 msgstr "à®¤à®°à®µà¯ à®•à¯‹à®ªà¯à®ªà¯à®±à¯ˆ"
 
-#: templates/installation.php:66
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "à®¤à®°à®µà¯à®¤à¯à®¤à®³à®¤à¯à®¤à¯ˆ à®¤à®•à®µà®®à¯ˆà®•à¯à®•"
 
-#: templates/installation.php:71 templates/installation.php:83
-#: templates/installation.php:94 templates/installation.php:105
-#: templates/installation.php:117
+#: 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:129
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "à®¤à®°à®µà¯à®¤à¯à®¤à®³ à®ªà®¯à®©à®¾à®³à®°à¯"
 
-#: templates/installation.php:134
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "à®¤à®°à®µà¯à®¤à¯à®¤à®³ à®•à®Ÿà®µà¯à®šà¯à®šà¯Šà®²à¯"
 
-#: templates/installation.php:139
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "à®¤à®°à®µà¯à®¤à¯à®¤à®³ à®ªà¯†à®¯à®°à¯"
 
-#: templates/installation.php:149
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "à®¤à®°à®µà¯à®¤à¯à®¤à®³ à®…à®Ÿà¯à®Ÿà®µà®£à¯ˆ"
 
-#: templates/installation.php:156
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "à®¤à®°à®µà¯à®¤à¯à®¤à®³ à®“à®®à¯à®ªà¯à®©à®°à¯"
 
-#: templates/installation.php:162
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "à®…à®®à¯ˆà®ªà¯à®ªà¯ˆ à®®à¯à®Ÿà®¿à®•à¯à®•"
 
-#: templates/layout.guest.php:35
+#: templates/layout.guest.php:40
 msgid "web services under your control"
-msgstr "à®‰à®™à¯à®•à®³à¯ à®•à®Ÿà¯à®Ÿà¯à®ªà¯à®ªà®¾à®Ÿà¯à®Ÿà®¿à®©à¯ à®•à¯€à®´à¯ à®‡à®£à¯ˆà®¯ à®šà¯‡à®µà¯ˆà®•à®³à¯"
+msgstr "à®µà®²à¯ˆà®¯ à®šà¯‡à®µà¯ˆà®•à®³à¯ à®‰à®™à¯à®•à®³à¯à®Ÿà¯ˆà®¯ à®•à®Ÿà¯à®Ÿà¯à®ªà¯à®ªà®¾à®Ÿà¯à®Ÿà®¿à®©à¯ à®•à¯€à®´à¯ à®‰à®³à¯à®³à®¤à¯"
+
+#: templates/layout.user.php:36
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr ""
 
-#: templates/layout.user.php:53
+#: 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/ta_LK/files.po b/l10n/ta_LK/files.po
index 668ac3ce21eea805fa655fb461f6d9d5f18f31e3..9ad71c544c0e79c7447dbb7e30597ca7c29ea84a 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-03-04 00:06+0100\n"
-"PO-Revision-Date: 2013-03-03 23:06+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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 "à®’à®°à¯ à®•à¯‹à®ªà¯à®ªà¯à®®à¯ à®ªà®¤à®¿à®µà¯‡à®±à¯à®±à®ªà¯à®ªà®Ÿà®µà®¿à®²à¯à®²à¯ˆ. à®…à®±à®¿à®¯à®ªà¯à®ªà®Ÿà®¾à®¤ à®µà®´à¯"
@@ -71,59 +66,70 @@ msgstr "à®µà®Ÿà¯à®Ÿà®¿à®²à¯ à®Žà®´à¯à®¤ à®®à¯à®Ÿà®¿à®¯à®µà®¿à®²à¯à®²à¯ˆ"
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:10
+#: 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 ""
 
-#: js/fileactions.js:127 templates/index.php:92 templates/index.php:93
+#: 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/files.js:292 js/files.js:408
-#: js/files.js:439
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "à®¨à®¿à®²à¯à®µà¯ˆà®¯à®¿à®²à¯à®³à¯à®³"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} à®à®±à¯à®•à®©à®µà¯‡ à®‰à®³à¯à®³à®¤à¯"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "à®®à®¾à®±à¯à®±à®¿à®Ÿà¯à®•"
 
-#: js/filelist.js:251
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "à®ªà¯†à®¯à®°à¯ˆ à®ªà®°à®¿à®¨à¯à®¤à¯à®°à¯ˆà®•à¯à®•"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "à®‡à®°à®¤à¯à®¤à¯ à®šà¯†à®¯à¯à®•"
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "{new_name} à®†à®©à®¤à¯ {old_name} à®‡à®©à®¾à®²à¯ à®®à®¾à®±à¯à®±à®ªà¯à®ªà®Ÿà¯à®Ÿà®¤à¯"
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "undo"
 msgstr "à®®à¯à®©à¯ à®šà¯†à®¯à®²à¯ à®¨à¯€à®•à¯à®•à®®à¯ "
 
-#: js/filelist.js:323
+#: 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 ""
@@ -146,77 +152,77 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:225
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:262
+#: 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:262
-msgid "Upload Error"
-msgstr "à®ªà®¤à®¿à®µà¯‡à®±à¯à®±à®²à¯ à®µà®´à¯"
-
-#: js/files.js:273
-msgid "Close"
-msgstr "à®®à¯‚à®Ÿà¯à®•"
-
-#: js/files.js:312
-msgid "1 file uploading"
-msgstr "1 à®•à¯‹à®ªà¯à®ªà¯ à®ªà®¤à®¿à®µà¯‡à®±à¯à®±à®ªà¯à®ªà®Ÿà¯à®•à®¿à®±à®¤à¯"
-
-#: js/files.js:315 js/files.js:370 js/files.js:385
-msgid "{count} files uploading"
-msgstr "{à®Žà®£à¯à®£à®¿à®•à¯à®•à¯ˆ} à®•à¯‹à®ªà¯à®ªà¯à®•à®³à¯ à®ªà®¤à®¿à®µà¯‡à®±à¯à®±à®ªà¯à®ªà®Ÿà¯à®•à®¿à®©à¯à®±à®¤à¯"
+#: js/files.js:277
+msgid "Not enough space available"
+msgstr ""
 
-#: js/files.js:388 js/files.js:423
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "à®ªà®¤à®¿à®µà¯‡à®±à¯à®±à®²à¯ à®‡à®°à®¤à¯à®¤à¯ à®šà¯†à®¯à¯à®¯à®ªà¯à®ªà®Ÿà¯à®Ÿà¯à®³à¯à®³à®¤à¯"
 
-#: js/files.js:497
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "à®•à¯‹à®ªà¯à®ªà¯ à®ªà®¤à®¿à®µà¯‡à®±à¯à®±à®®à¯ à®šà¯†à®¯à®²à¯à®ªà®¾à®Ÿà¯à®Ÿà®¿à®²à¯ à®‰à®³à¯à®³à®¤à¯. à®‡à®¨à¯à®¤à®ªà¯ à®ªà®•à¯à®•à®¤à¯à®¤à®¿à®²à®¿à®°à¯à®¨à¯à®¤à¯ à®µà¯†à®±à®¿à®¯à¯‡à®±à¯à®µà®¤à®¾à®©à®¤à¯ à®ªà®¤à®¿à®µà¯‡à®±à¯à®±à®²à¯ˆ à®‡à®°à®¤à¯à®¤à¯ à®šà¯†à®¯à¯à®¯à¯à®®à¯."
 
-#: js/files.js:570
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "URL  à®µà¯†à®±à¯à®®à¯ˆà®¯à®¾à®• à®‡à®°à¯à®•à¯à®•à®®à¯à®Ÿà®¿à®¯à®¾à®¤à¯."
 
-#: js/files.js:575
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:953 templates/index.php:68
+#: 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:954 templates/index.php:79
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "à®…à®³à®µà¯"
 
-#: js/files.js:955 templates/index.php:81
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "à®®à®¾à®±à¯à®±à®ªà¯à®ªà®Ÿà¯à®Ÿà®¤à¯"
 
-#: js/files.js:974
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 à®•à¯‹à®ªà¯à®ªà¯à®±à¯ˆ"
 
-#: js/files.js:976
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{à®Žà®£à¯à®£à®¿à®•à¯à®•à¯ˆ} à®•à¯‹à®ªà¯à®ªà¯à®±à¯ˆà®•à®³à¯"
 
-#: js/files.js:984
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 à®•à¯‹à®ªà¯à®ªà¯"
 
-#: js/files.js:986
+#: 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 "à®ªà®¤à®¿à®µà¯‡à®±à¯à®±à¯à®•"
@@ -251,7 +257,7 @@ msgstr "ZIP à®•à¯‹à®ªà¯à®ªà¯à®•à®³à¯à®•à¯à®•à®¾à®© à®†à®•à®•à¯à®•à¯‚à®Ÿà®¿
 
 #: templates/admin.php:26
 msgid "Save"
-msgstr "à®šà¯‡à®®à®¿à®•à¯à®•"
+msgstr "à®šà¯‡à®®à®¿à®•à¯à®• "
 
 #: templates/index.php:7
 msgid "New"
@@ -269,45 +275,45 @@ msgstr "à®•à¯‹à®ªà¯à®ªà¯à®±à¯ˆ"
 msgid "From link"
 msgstr "à®‡à®£à¯ˆà®ªà¯à®ªà®¿à®²à®¿à®°à¯à®¨à¯à®¤à¯"
 
-#: templates/index.php:40
+#: templates/index.php:42
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:48
 msgid "Cancel upload"
 msgstr "à®ªà®¤à®¿à®µà¯‡à®±à¯à®±à®²à¯ˆ à®‡à®°à®¤à¯à®¤à¯ à®šà¯†à®¯à¯à®•"
 
-#: templates/index.php:53
+#: templates/index.php:54
 msgid "You donâ€™t have write permissions here."
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "à®‡à®™à¯à®•à¯ à®’à®©à¯à®±à¯à®®à¯ à®‡à®²à¯à®²à¯ˆ. à®à®¤à®¾à®µà®¤à¯ à®ªà®¤à®¿à®µà¯‡à®±à¯à®±à¯à®•!"
 
-#: templates/index.php:74
+#: templates/index.php:75
 msgid "Download"
 msgstr "à®ªà®¤à®¿à®µà®¿à®±à®•à¯à®•à¯à®•"
 
-#: templates/index.php:86 templates/index.php:87
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "à®ªà®•à®¿à®°à®ªà¯à®ªà®Ÿà®¾à®¤à®¤à¯"
 
-#: templates/index.php:106
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "à®ªà®¤à®¿à®µà¯‡à®±à¯à®±à®²à¯ à®®à®¿à®•à®ªà¯à®ªà¯†à®°à®¿à®¯à®¤à¯"
 
-#: templates/index.php:108
+#: 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:113
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "à®•à¯‹à®ªà¯à®ªà¯à®•à®³à¯ à®µà®°à¯à®Ÿà®ªà¯à®ªà®Ÿà¯à®•à®¿à®©à¯à®±à®©, à®¤à®¯à®µà¯à®šà¯†à®¯à¯à®¤à¯ à®•à®¾à®¤à¯à®¤à®¿à®°à¯à®™à¯à®•à®³à¯."
 
-#: templates/index.php:116
+#: 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..f8019b0d4aefc71984bcc990807586d5f1d5995e 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ta_LK/files_external.po b/l10n/ta_LK/files_external.po
index 7ade0af6ff2426f0959f2a40da9716e564dcc975..2d1e185537519564e81f59531d73d8e3e128c0bd 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-01 00:05+0100\n"
-"PO-Revision-Date: 2013-02-27 23:20+0000\n"
+"POT-Creation-Date: 2013-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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: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/ta_LK/files_sharing.po b/l10n/ta_LK/files_sharing.po
index cdb761631d352eedcdc7a1fbde831a995e69693e..2522409a0d4ca5103cd745eb0fe8bd1ceaa0e0a1 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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 ee8095bcdc257b3e187b1a8f39402ecf6ba92f86..79d45d3828c263a197b9fe26d55af823a796cb5b 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-03-08 00:25+0100\n"
-"PO-Revision-Date: 2013-03-07 23:25+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -17,12 +17,12 @@ msgstr ""
 "Language: ta_LK\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:40
+#: ajax/delete.php:42
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
 
-#: ajax/undelete.php:41
+#: ajax/undelete.php:42
 #, php-format
 msgid "Couldn't restore %s"
 msgstr ""
@@ -31,6 +31,10 @@ msgstr ""
 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 ""
diff --git a/l10n/ta_LK/files_versions.po b/l10n/ta_LK/files_versions.po
index abba80ba96bab168fa667c4ba2ff1dad52541fd8..6125b2b2da81ef261a3237275912c81586ed799e 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:30+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 1ee1cfff40640e32e70c181e59638b5ca935f5a2..5ab85c3d26add3ee8c9de019b6442aadc6471bc1 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-02-27 14:35+0100\n"
-"PO-Revision-Date: 2013-02-27 13:36+0000\n"
+"POT-Creation-Date: 2013-04-28 01:57+0200\n"
+"PO-Revision-Date: 2013-04-27 23:57+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"
@@ -32,7 +31,7 @@ msgstr "à®…à®®à¯ˆà®ªà¯à®ªà¯à®•à®³à¯"
 
 #: app.php:385
 msgid "Users"
-msgstr "à®ªà®¯à®©à®¾à®³à®°à¯à®•à®³à¯"
+msgstr "à®ªà®¯à®©à®¾à®³à®°à¯"
 
 #: app.php:398
 msgid "Apps"
@@ -42,19 +41,19 @@ msgstr "à®šà¯†à®¯à®²à®¿à®•à®³à¯"
 msgid "Admin"
 msgstr "à®¨à®¿à®°à¯à®µà®¾à®•à®®à¯"
 
-#: files.php:202
+#: files.php:209
 msgid "ZIP download is turned off."
 msgstr "à®µà¯€à®šà¯Šà®²à®¿à®ªà¯ à®ªà¯‚à®Ÿà¯à®Ÿà¯ à®ªà®¤à®¿à®µà®¿à®±à®•à¯à®•à®®à¯ à®¨à®¿à®±à¯à®¤à¯à®¤à®ªà¯à®ªà®Ÿà¯à®Ÿà¯à®³à¯à®³à®¤à¯."
 
-#: files.php:203
+#: files.php:210
 msgid "Files need to be downloaded one by one."
 msgstr "à®•à¯‹à®ªà¯à®ªà¯à®•à®³à¯à®’à®©à¯à®±à®©à¯ à®ªà®¿à®©à¯ à®’à®©à¯à®±à®¾à®• à®ªà®¤à®¿à®µà®¿à®±à®•à¯à®•à®ªà¯à®ªà®Ÿà®µà¯‡à®£à¯à®Ÿà¯à®®à¯."
 
-#: files.php:204 files.php:231
+#: files.php:211 files.php:244
 msgid "Back to Files"
 msgstr "à®•à¯‹à®ªà¯à®ªà¯à®•à®³à¯à®•à¯à®•à¯ à®šà¯†à®²à¯à®•"
 
-#: files.php:228
+#: files.php:241
 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,72 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:128 setup.php:320 setup.php:365
+#: setup.php:132 setup.php:325 setup.php:370
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:129 setup.php:152 setup.php:229
+#: setup.php:133 setup.php:156 setup.php:234
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:151 setup.php:453 setup.php:520
+#: setup.php:155 setup.php:458 setup.php:525
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:228
+#: setup.php:233
 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: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:583 setup.php:592 setup.php:600 setup.php:609
+#: setup.php:615
 #, 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:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
+#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
+#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:299
+#: setup.php:304
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:300
+#: setup.php:305
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:305
+#: setup.php:310
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:306
+#: setup.php:311
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:579 setup.php:611
+#: setup.php:584 setup.php:616
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:631
+#: setup.php:636
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:849
+#: setup.php:858
 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:859
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
@@ -240,19 +235,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 a6351ece395cf669d5db7a746f6bbe9ef39b3b20..96dcf4f4658bda93b77750918fc5a0293f1aa887 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-02-27 14:35+0100\n"
-"PO-Revision-Date: 2013-02-27 13:35+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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 ""
 
@@ -93,76 +96,76 @@ msgstr ""
 msgid "Disable"
 msgstr "à®‡à®¯à®²à¯à®®à¯ˆà®ªà¯à®ª"
 
-#: js/apps.js:36 js/apps.js:64
+#: js/apps.js:36 js/apps.js:64 js/apps.js:83
 msgid "Enable"
-msgstr "à®šà¯†à®¯à®²à®±à¯à®±à®¤à®¾à®•à¯à®•à¯à®•"
+msgstr "à®‡à®¯à®²à¯à®®à¯ˆà®ªà¯à®ªà®Ÿà¯à®¤à¯à®¤à¯à®•"
 
 #: js/apps.js:55
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:84
+#: 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:87
+#: js/apps.js:93
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:87
-msgid "Error"
-msgstr "à®µà®´à¯"
-
-#: js/apps.js:90
+#: js/apps.js:96
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
-msgstr "à®‡à®¯à®²à¯à®®à¯ˆà®ªà¯à®ªà®Ÿà¯à®¤à¯à®¤à¯à®•"
+msgstr "à®šà¯‡à®®à®¿à®•à¯à®•à®ªà¯à®ªà®Ÿà¯à®•à®¿à®±à®¤à¯..."
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "deleted"
 msgstr ""
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "undo"
 msgstr "à®®à¯à®©à¯ à®šà¯†à®¯à®²à¯ à®¨à¯€à®•à¯à®•à®®à¯ "
 
-#: js/users.js:62
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:75 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
+#: templates/users.php:103
 msgid "Groups"
 msgstr "à®•à¯à®´à¯à®•à¯à®•à®³à¯"
 
-#: js/users.js:78 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr "à®•à¯à®´à¯ à®¨à®¿à®°à¯à®µà®¾à®•à®¿"
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
-msgstr "à®…à®´à®¿à®•à¯à®•"
+msgstr "à®¨à¯€à®•à¯à®•à¯à®•"
 
-#: js/users.js:191
+#: js/users.js:269
 msgid "add group"
 msgstr ""
 
-#: js/users.js:352
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:353 js/users.js:359 js/users.js:374
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:358
+#: js/users.js:426
 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,15 +316,19 @@ msgstr ""
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
 msgstr "à®®à¯‡à®²à®¤à®¿à®•"
 
-#: templates/admin.php:230 templates/personal.php:102
+#: templates/admin.php:228
+msgid "Less"
+msgstr "à®•à¯à®±à¯ˆà®µà®¾à®©"
+
+#: templates/admin.php:235 templates/personal.php:105
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:233 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 "
@@ -392,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:77
 msgid "Password"
 msgstr "à®•à®Ÿà®µà¯à®šà¯à®šà¯Šà®²à¯"
 
@@ -416,82 +423,70 @@ msgstr "à®ªà¯à®¤à®¿à®¯ à®•à®Ÿà®µà¯à®šà¯à®šà¯Šà®²à¯"
 msgid "Change password"
 msgstr "à®•à®Ÿà®µà¯à®šà¯à®šà¯Šà®²à¯à®²à¯ˆ à®®à®¾à®±à¯à®±à¯à®•"
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:76
 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:75
 msgid "Login Name"
 msgstr ""
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr "à®‰à®°à¯à®µà®¾à®•à¯à®•à¯à®•"
 
-#: templates/users.php:35
+#: templates/users.php:33
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:39 templates/users.php:133
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:57 templates/users.php:148
 msgid "Other"
 msgstr "à®®à®±à¯à®±à®µà¯ˆ"
 
-#: templates/users.php:84
+#: templates/users.php:82
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:95
+#: templates/users.php:93
 msgid "change display name"
 msgstr ""
 
-#: templates/users.php:99
+#: templates/users.php:97
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:134
+#: templates/users.php:128
 msgid "Default"
 msgstr ""
diff --git a/l10n/ta_LK/user_ldap.po b/l10n/ta_LK/user_ldap.po
index 82151c607fb8bf3952c4b0c59047c2085201fdac..2a5d7bf5409f7c2fe06ea29435f7b58e9cad7ab1 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-02 00:03+0100\n"
-"PO-Revision-Date: 2013-03-01 23:04+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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: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 "à®¨à¯€à®™à¯à®•à®³à¯ SSL à®šà¯‡à®µà¯ˆà®¯à¯ˆ à®¤à®µà®¿à®° à®‰à®Ÿà®©à¯à®ªà®Ÿà¯ à®µà®°à¯ˆà®®à¯à®±à¯ˆà®¯à¯ˆ à®¤à®µà®¿à®°à¯à®•à¯à®• à®®à¯à®Ÿà®¿à®¯à¯à®®à¯. à®ªà®¿à®±à®•à¯ ldaps:.// à®‰à®Ÿà®©à¯ à®†à®°à®®à¯à®ªà®¿à®•à¯à®•à®µà¯à®®à¯"
 
-#: templates/settings.php:26
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "à®¤à®³ DN"
 
-#: 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 "à®¨à¯€à®™à¯à®•à®³à¯ à®ªà®¯à®©à®¾à®³à®°à¯à®•à®³à¯à®•à¯à®•à¯à®®à¯ à®®à¯‡à®©à¯à®®à¯ˆ à®¤à®¤à¯à®¤à®²à®¿à®²à¯ à®‰à®³à¯à®³ à®•à¯à®´à¯à®µà®¿à®±à¯à®•à¯à®®à¯ à®¤à®³ DN à® à®•à¯à®±à®¿à®ªà¯à®ªà®¿à®Ÿà®²à®¾à®®à¯ "
 
-#: templates/settings.php:30
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "à®ªà®¯à®©à®¾à®³à®°à¯  DN"
 
-#: 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 "à®Žà®¨à¯à®¤ à®’à®¤à¯à®•à¯à®•à¯€à®Ÿà¯à®®à¯ à®‡à®²à¯à®²à®¾à®®à®²à¯, à®‰à®¤à®¾à®°à®£à®®à¯. \"objectClass=posixGroup\"."
 
-#: 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 "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 "à®‰à®£à®°à¯à®šà¯à®šà®¿à®¯à®¾à®© LDAP à®šà¯‡à®µà¯ˆà®¯à®•à®®à¯ (à®šà®¾à®³à®°à®™à¯à®•à®³à¯)"
 
-#: templates/settings.php:64
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "SSL à®šà®¾à®©à¯à®±à®¿à®¤à®´à®¿à®©à¯ à®šà¯†à®²à¯à®²à¯à®ªà®Ÿà®¿à®¯à¯ˆ à®¨à®¿à®±à¯à®¤à¯à®¤à®¿à®µà®¿à®Ÿà®µà¯à®®à¯"
 
-#: 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 "à®‡à®¨à¯à®¤ à®¤à¯†à®°à®¿à®µà¯à®•à®³à®¿à®²à¯ à®®à®Ÿà¯à®Ÿà¯à®®à¯ à®‡à®£à¯ˆà®ªà¯à®ªà¯ à®µà¯‡à®²à¯ˆà®šà¯†à®¯à¯à®¤à®¾à®²à¯, à®‰à®™à¯à®•à®³à¯à®Ÿà¯ˆà®¯ owncloud à®šà¯‡à®µà¯ˆà®¯à®•à®¤à¯à®¤à®¿à®²à®¿à®°à¯à®¨à¯à®¤à¯ LDAP à®šà¯‡à®µà¯ˆà®¯à®•à®¤à¯à®¤à®¿à®©à¯ SSL à®šà®¾à®©à¯à®±à®¿à®¤à®´à¯ˆ à®‡à®±à®•à¯à®•à¯à®®à®¤à®¿ à®šà¯†à®¯à¯à®¯à®µà¯à®®à¯"
 
-#: 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 "à®ªà®¯à®©à®¾à®³à®°à®¿à®©à¯ ownCloud à®ªà¯†à®¯à®°à¯ˆ à®‰à®°à¯à®µà®¾à®•à¯à®• LDAP à®ªà®£à¯à®ªà¯à®•à¯à®•à¯‚à®±à¯ˆ à®ªà®¯à®©à¯à®ªà®Ÿà¯à®¤à¯à®¤à®µà¯à®®à¯."
 
-#: 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 "ownCloud à®•à¯à®´à¯à®•à¯à®•à®³à®¿à®©à¯ à®ªà¯†à®¯à®°à¯à®•à®³à¯ˆ à®‰à®°à¯à®µà®¾à®•à¯à®• LDAP à®ªà®£à¯à®ªà¯à®•à¯à®•à¯‚à®±à¯ˆ à®ªà®¯à®©à¯à®ªà®Ÿà¯à®¤à¯à®¤à®µà¯à®®à¯."
 
-#: 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 "bytes à®•à®³à®¿à®²à¯ "
 
-#: 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 "à®ªà®¯à®©à®¾à®³à®°à¯ à®ªà¯†à®¯à®°à®¿à®±à¯à®•à¯ à®µà¯†à®±à¯à®±à®¿à®Ÿà®®à®¾à®• à®µà®¿à®Ÿà®µà¯à®®à¯ (à®ªà¯Šà®¤à¯ à®‡à®°à¯à®ªà¯à®ªà¯). à®‡à®²à¯à®²à®¾à®µà®¿à®Ÿà®¿à®©à¯ LDAP/AD à®ªà®£à¯à®ªà¯à®•à¯à®•à¯‚à®±à¯ˆ à®•à¯à®±à®¿à®ªà¯à®ªà®¿à®Ÿà®µà¯à®®à¯."
 
-#: 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/ta_LK/user_webdavauth.po b/l10n/ta_LK/user_webdavauth.po
index 59edf0b378ace0457003d6a5442462b87a1702cf..e75db9cc3f918754065e41886ead8bba674a22a0 100644
--- a/l10n/ta_LK/user_webdavauth.po
+++ b/l10n/ta_LK/user_webdavauth.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -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
new file mode 100644
index 0000000000000000000000000000000000000000..a4aaf33a494a89682cb0bbc5d45640c22a579d14
--- /dev/null
+++ b/l10n/te/core.po
@@ -0,0 +1,613 @@
+# 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-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10: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"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: te\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\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 "à°ˆ à°µà°°à±à°—à°‚ à°‡à°ªà±à°ªà°Ÿà°¿à°•à±‡ à°‰à°‚à°¦à°¿: %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 ""
+
+#: 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 "{minutes} à°¨à°¿à°®à°¿à°·à°¾à°² à°•à±à°°à°¿à°¤à°‚"
+
+#: js/js.js:721
+msgid "1 hour ago"
+msgstr "1 à°—à°‚à°Ÿ à°•à±à°°à°¿à°¤à°‚"
+
+#: js/js.js:722
+msgid "{hours} hours ago"
+msgstr "{hours} à°—à°‚à°Ÿà°² à°•à±à°°à°¿à°¤à°‚"
+
+#: js/js.js:723
+msgid "today"
+msgstr "à°ˆà°°à±‹à°œà±"
+
+#: js/js.js:724
+msgid "yesterday"
+msgstr "à°¨à°¿à°¨à±à°¨"
+
+#: js/js.js:725
+msgid "{days} days ago"
+msgstr "{days} à°°à±‹à°œà±à°² à°•à±à°°à°¿à°¤à°‚"
+
+#: js/js.js:726
+msgid "last month"
+msgstr "à°ªà±‹à°¯à°¿à°¨ à°¨à±†à°²"
+
+#: js/js.js:727
+msgid "{months} months ago"
+msgstr "{months} à°¨à±†à°²à°² à°•à±à°°à°¿à°¤à°‚"
+
+#: 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 js/oc-dialogs.js:247
+msgid "Ok"
+msgstr "à°¸à°°à±‡"
+
+#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+msgid "Cancel"
+msgstr "à°°à°¦à±à°¦à±à°šà±‡à°¯à°¿"
+
+#: js/oc-dialogs.js:185
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:215
+msgid "Yes"
+msgstr "à°…à°µà±à°¨à±"
+
+#: js/oc-dialogs.js:222
+msgid "No"
+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: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/te/files.po b/l10n/te/files.po
new file mode 100644
index 0000000000000000000000000000000000000000..2dbe5ff11e63a76d0bcc8d6332b8e9387566ccb1
--- /dev/null
+++ b/l10n/te/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-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: te\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 ""
+
+#: 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/te/files_encryption.po b/l10n/te/files_encryption.po
new file mode 100644
index 0000000000000000000000000000000000000000..d80b40f45259bb129305897a0b3b9a75176e00b0
--- /dev/null
+++ b/l10n/te/files_encryption.po
@@ -0,0 +1,38 @@
+# 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-04-26 10:00+0200\n"
+"PO-Revision-Date: 2013-04-26 08:01+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"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: te\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: templates/settings-personal.php:4 templates/settings.php:5
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings-personal.php:7
+msgid "File encryption is enabled."
+msgstr ""
+
+#: templates/settings-personal.php:11
+msgid "The following file types will not be encrypted:"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Exclude the following file types from encryption:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "None"
+msgstr ""
diff --git a/l10n/te/files_external.po b/l10n/te/files_external.po
new file mode 100644
index 0000000000000000000000000000000000000000..7f8b65ba9857b0cf7cd363bcd1673fc23d1f643e
--- /dev/null
+++ b/l10n/te/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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: te\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/te/files_sharing.po b/l10n/te/files_sharing.po
new file mode 100644
index 0000000000000000000000000000000000000000..84ca97cc6a4908d36001dc0f68c847bdda31cde0
--- /dev/null
+++ b/l10n/te/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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: te\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\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/te/files_trashbin.po b/l10n/te/files_trashbin.po
new file mode 100644
index 0000000000000000000000000000000000000000..90a947f784843b7b2e85a5d22832a7736b2bd81f
--- /dev/null
+++ b/l10n/te/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-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: te\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/te/files_versions.po b/l10n/te/files_versions.po
new file mode 100644
index 0000000000000000000000000000000000000000..2a514b335cfd784d61714be156431b6776d54bf8
--- /dev/null
+++ b/l10n/te/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-04-26 10:00+0200\n"
+"PO-Revision-Date: 2013-04-26 08:02+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"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: te\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/te/lib.po b/l10n/te/lib.po
new file mode 100644
index 0000000000000000000000000000000000000000..a51822fe452f8c8be2e62ddee506208ab19b763b
--- /dev/null
+++ b/l10n/te/lib.po
@@ -0,0 +1,241 @@
+# 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-04-28 01:57+0200\n"
+"PO-Revision-Date: 2013-04-27 23:57+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"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: te\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: app.php:349
+msgid "Help"
+msgstr "à°¸à°¹à°¾à°¯à°‚"
+
+#: app.php:362
+msgid "Personal"
+msgstr ""
+
+#: app.php:373
+msgid "Settings"
+msgstr "à°…à°®à°°à°¿à°•à°²à±"
+
+#: app.php:385
+msgid "Users"
+msgstr "à°µà°¾à°¡à±à°•à°°à±à°²à±"
+
+#: app.php:398
+msgid "Apps"
+msgstr ""
+
+#: app.php:406
+msgid "Admin"
+msgstr ""
+
+#: files.php:209
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: files.php:210
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: files.php:211 files.php:244
+msgid "Back to Files"
+msgstr ""
+
+#: files.php:241
+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:325 setup.php:370
+msgid "PostgreSQL username and/or password not valid"
+msgstr ""
+
+#: setup.php:133 setup.php:156 setup.php:234
+msgid "You need to enter either an existing account or the administrator."
+msgstr ""
+
+#: setup.php:155 setup.php:458 setup.php:525
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:233
+msgid "MySQL username and/or password not valid"
+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:583 setup.php:592 setup.php:600 setup.php:609
+#: setup.php:615
+#, php-format
+msgid "DB Error: \"%s\""
+msgstr ""
+
+#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
+#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
+#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#, php-format
+msgid "Offending command was: \"%s\""
+msgstr ""
+
+#: setup.php:304
+#, php-format
+msgid "MySQL user '%s'@'localhost' exists already."
+msgstr ""
+
+#: setup.php:305
+msgid "Drop this user from MySQL"
+msgstr ""
+
+#: setup.php:310
+#, php-format
+msgid "MySQL user '%s'@'%%' already exists"
+msgstr ""
+
+#: setup.php:311
+msgid "Drop this user from MySQL."
+msgstr ""
+
+#: setup.php:584 setup.php:616
+#, php-format
+msgid "Offending command was: \"%s\", name: %s, password: %s"
+msgstr ""
+
+#: setup.php:636
+#, php-format
+msgid "MS SQL username and/or password not valid: %s"
+msgstr ""
+
+#: setup.php:858
+msgid ""
+"Your web server is not yet properly setup to allow files synchronization "
+"because the WebDAV interface seems to be broken."
+msgstr ""
+
+#: setup.php:859
+#, 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 ""
+
+#: template.php:116
+msgid "1 hour ago"
+msgstr "1 à°—à°‚à°Ÿ à°•à±à°°à°¿à°¤à°‚"
+
+#: 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/te/settings.po b/l10n/te/settings.po
new file mode 100644
index 0000000000000000000000000000000000000000..fb91ffa67f39f9c04ef8b9f5c9c4aa6487bf601e
--- /dev/null
+++ b/l10n/te/settings.po
@@ -0,0 +1,492 @@
+# 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-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: te\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:78
+#: templates/users.php:103
+msgid "Groups"
+msgstr ""
+
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
+msgid "Group Admin"
+msgstr ""
+
+#: js/users.js:115 templates/users.php:155
+msgid "Delete"
+msgstr "à°¤à±Šà°²à°—à°¿à°‚à°šà±"
+
+#: js/users.js:269
+msgid "add group"
+msgstr ""
+
+#: js/users.js:420
+msgid "A valid username must be provided"
+msgstr ""
+
+#: js/users.js:421 js/users.js:427 js/users.js:442
+msgid "Error creating user"
+msgstr ""
+
+#: js/users.js:426
+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:77
+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:76
+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:75
+msgid "Login Name"
+msgstr ""
+
+#: templates/users.php:30
+msgid "Create"
+msgstr ""
+
+#: templates/users.php:33
+msgid "Default Storage"
+msgstr ""
+
+#: templates/users.php:39 templates/users.php:133
+msgid "Unlimited"
+msgstr ""
+
+#: templates/users.php:57 templates/users.php:148
+msgid "Other"
+msgstr ""
+
+#: templates/users.php:82
+msgid "Storage"
+msgstr ""
+
+#: templates/users.php:93
+msgid "change display name"
+msgstr ""
+
+#: templates/users.php:97
+msgid "set new password"
+msgstr ""
+
+#: templates/users.php:128
+msgid "Default"
+msgstr ""
diff --git a/l10n/te/user_ldap.po b/l10n/te/user_ldap.po
new file mode 100644
index 0000000000000000000000000000000000000000..eebc4da9ed9d1e8a11dae50e71e45f0835dec926
--- /dev/null
+++ b/l10n/te/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-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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"
+"Content-Transfer-Encoding: 8bit\n"
+"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 ""
+
+#: ajax/testConfiguration.php:36
+msgid "The configuration is valid and the connection could be established!"
+msgstr ""
+
+#: ajax/testConfiguration.php:39
+msgid ""
+"The configuration is valid, but the Bind failed. Please check the server "
+"settings and credentials."
+msgstr ""
+
+#: ajax/testConfiguration.php:43
+msgid ""
+"The configuration is invalid. Please look in the ownCloud log for further "
+"details."
+msgstr ""
+
+#: js/settings.js:66
+msgid "Deletion failed"
+msgstr ""
+
+#: js/settings.js:82
+msgid "Take over settings from recent server configuration?"
+msgstr ""
+
+#: js/settings.js:83
+msgid "Keep settings?"
+msgstr ""
+
+#: js/settings.js:97
+msgid "Cannot add server configuration"
+msgstr ""
+
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "à°ªà±Šà°°à°ªà°¾à°Ÿà±"
+
+#: js/settings.js:141
+msgid "Connection test succeeded"
+msgstr ""
+
+#: js/settings.js:146
+msgid "Connection test failed"
+msgstr ""
+
+#: js/settings.js:156
+msgid "Do you really want to delete the current Server Configuration?"
+msgstr ""
+
+#: js/settings.js:157
+msgid "Confirm Deletion"
+msgstr ""
+
+#: templates/settings.php:9
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:12
+msgid ""
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:16
+msgid "Server configuration"
+msgstr ""
+
+#: templates/settings.php:32
+msgid "Add Server Configuration"
+msgstr ""
+
+#: templates/settings.php:37
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:40
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:41
+msgid "One Base DN per line"
+msgstr ""
+
+#: templates/settings.php:42
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:44
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:46
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:47
+msgid "Password"
+msgstr "à°¸à°‚à°•à±‡à°¤à°ªà°¦à°‚"
+
+#: templates/settings.php:50
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:51
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:54
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:55
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:56
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:59
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:60
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:61
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:65
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Connection Settings"
+msgstr ""
+
+#: templates/settings.php:71
+msgid "Configuration Active"
+msgstr ""
+
+#: templates/settings.php:71
+msgid "When unchecked, this configuration will be skipped."
+msgstr ""
+
+#: templates/settings.php:72
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:73
+msgid "Backup (Replica) Host"
+msgstr ""
+
+#: templates/settings.php:73
+msgid ""
+"Give an optional backup host. It must be a replica of the main LDAP/AD "
+"server."
+msgstr ""
+
+#: templates/settings.php:74
+msgid "Backup (Replica) Port"
+msgstr ""
+
+#: templates/settings.php:75
+msgid "Disable Main Server"
+msgstr ""
+
+#: templates/settings.php:75
+msgid "When switched on, ownCloud will only connect to the replica server."
+msgstr ""
+
+#: templates/settings.php:76
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:76
+msgid "Do not use it additionally for LDAPS connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:77
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:78
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:78
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:78
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:79
+msgid "Cache Time-To-Live"
+msgstr ""
+
+#: templates/settings.php:79
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:81
+msgid "Directory Settings"
+msgstr ""
+
+#: templates/settings.php:83
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:83
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:84
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:84
+msgid "One User Base DN per line"
+msgstr ""
+
+#: templates/settings.php:85
+msgid "User Search Attributes"
+msgstr ""
+
+#: templates/settings.php:85 templates/settings.php:88
+msgid "Optional; one attribute per line"
+msgstr ""
+
+#: templates/settings.php:86
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:86
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:87
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "One Group Base DN per line"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "Group Search Attributes"
+msgstr ""
+
+#: templates/settings.php:89
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "Special Attributes"
+msgstr ""
+
+#: templates/settings.php:93
+msgid "Quota Field"
+msgstr ""
+
+#: templates/settings.php:94
+msgid "Quota Default"
+msgstr ""
+
+#: templates/settings.php:94
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:95
+msgid "Email Field"
+msgstr ""
+
+#: templates/settings.php:96
+msgid "User Home Folder Naming Rule"
+msgstr ""
+
+#: templates/settings.php:96
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
+msgid "Test Configuration"
+msgstr ""
+
+#: templates/settings.php:111
+msgid "Help"
+msgstr "à°¸à°¹à°¾à°¯à°‚"
diff --git a/l10n/te/user_webdavauth.po b/l10n/te/user_webdavauth.po
new file mode 100644
index 0000000000000000000000000000000000000000..bfa7e06be6f86a43deb4a8da80bfc46f236b88fa
--- /dev/null
+++ b/l10n/te/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-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: te\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/templates/core.pot b/l10n/templates/core.pot
index 160af149eda0830e6d8960f2b7fecae64c0d7831..78d60372e1874298abd5022a8bab99f14cbe0829 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-03-08 00:25+0100\n"
+"POT-Creation-Date: 2013-05-21 02:00+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -160,76 +160,76 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:777
+#: js/js.js:718
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:778
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:779
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:780
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:781
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:782
+#: js/js.js:723
 msgid "today"
 msgstr ""
 
-#: js/js.js:783
+#: js/js.js:724
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:784
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:785
+#: js/js.js:726
 msgid "last month"
 msgstr ""
 
-#: js/js.js:786
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:787
+#: js/js.js:728
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:788
+#: js/js.js:729
 msgid "last year"
 msgstr ""
 
-#: js/js.js:789
+#: js/js.js:730
 msgid "years ago"
 msgstr ""
 
-#: js/oc-dialogs.js:126
-msgid "Choose"
+#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
+msgid "Ok"
 msgstr ""
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
 msgid "Cancel"
 msgstr ""
 
-#: js/oc-dialogs.js:162
-msgid "No"
+#: js/oc-dialogs.js:185
+msgid "Choose"
 msgstr ""
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:215
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:180
-msgid "Ok"
+#: js/oc-dialogs.js:222
+msgid "No"
 msgstr ""
 
 #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
@@ -237,9 +237,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:152 js/share.js:159 js/share.js:582
-#: js/share.js:594
+#: 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 ""
 
@@ -251,127 +253,127 @@ msgstr ""
 msgid "The required file {file} is not installed!"
 msgstr ""
 
-#: js/share.js:29 js/share.js:43 js/share.js:90
+#: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr ""
 
-#: js/share.js:93
+#: js/share.js:90
 msgid "Share"
 msgstr ""
 
-#: js/share.js:141 js/share.js:622
+#: js/share.js:125 js/share.js:617
 msgid "Error while sharing"
 msgstr ""
 
-#: js/share.js:152
+#: js/share.js:136
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:159
+#: js/share.js:143
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:168
+#: js/share.js:152
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:170
+#: js/share.js:154
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:175
+#: js/share.js:159
 msgid "Share with"
 msgstr ""
 
-#: js/share.js:180
+#: js/share.js:164
 msgid "Share with link"
 msgstr ""
 
-#: js/share.js:183
+#: js/share.js:167
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:185 templates/installation.php:47 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr ""
 
-#: js/share.js:189
+#: js/share.js:173
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:190
+#: js/share.js:174
 msgid "Send"
 msgstr ""
 
-#: js/share.js:194
+#: js/share.js:178
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:195
+#: js/share.js:179
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:227
+#: js/share.js:211
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:229
+#: js/share.js:213
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:256
+#: js/share.js:251
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:292
+#: js/share.js:287
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:313
+#: js/share.js:308
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:325
+#: js/share.js:320
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:327
+#: js/share.js:322
 msgid "access control"
 msgstr ""
 
-#: js/share.js:330
+#: js/share.js:325
 msgid "create"
 msgstr ""
 
-#: js/share.js:333
+#: js/share.js:328
 msgid "update"
 msgstr ""
 
-#: js/share.js:336
+#: js/share.js:331
 msgid "delete"
 msgstr ""
 
-#: js/share.js:339
+#: js/share.js:334
 msgid "share"
 msgstr ""
 
-#: js/share.js:373 js/share.js:569
+#: js/share.js:368 js/share.js:564
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:582
+#: js/share.js:577
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:594
+#: js/share.js:589
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:609
+#: js/share.js:604
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:620
+#: js/share.js:615
 msgid "Email sent"
 msgstr ""
 
@@ -394,24 +396,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:41
-#: 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,77 +473,86 @@ 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: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:33
+#: 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:37
+#: templates/installation.php:44
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
-#: templates/installation.php:55
+#: templates/installation.php:62
 msgid "Advanced"
 msgstr ""
 
-#: templates/installation.php:57
+#: templates/installation.php:64
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:66
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:71 templates/installation.php:83
-#: templates/installation.php:94 templates/installation.php:105
-#: templates/installation.php:117
+#: 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:129
+#: templates/installation.php:137
 msgid "Database user"
 msgstr ""
 
-#: templates/installation.php:134
+#: templates/installation.php:144
 msgid "Database password"
 msgstr ""
 
-#: templates/installation.php:139
+#: templates/installation.php:149
 msgid "Database name"
 msgstr ""
 
-#: templates/installation.php:149
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:156
+#: templates/installation.php:166
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:162
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr ""
 
@@ -546,37 +560,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/templates/files.pot b/l10n/templates/files.pot
index 111131195de71bc6ddf3a3fdf009bfdb35944efa..0ab57eb950c513d55d35e0821706bc9653d1d083 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-03-08 00:25+0100\n"
+"POT-Creation-Date: 2013-05-21 02:00+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -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 ""
@@ -70,59 +66,70 @@ msgstr ""
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:10
+#: 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 ""
 
-#: js/fileactions.js:127 templates/index.php:92 templates/index.php:93
+#: 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/files.js:293 js/files.js:409
-#: js/files.js:440
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:251
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:323
+#: 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 ""
@@ -145,77 +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:263
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:263
-msgid "Upload Error"
-msgstr ""
-
-#: js/files.js:274
-msgid "Close"
+#: js/files.js:277
+msgid "Not enough space available"
 msgstr ""
 
-#: js/files.js:313
-msgid "1 file uploading"
-msgstr ""
-
-#: js/files.js:316 js/files.js:371 js/files.js:386
-msgid "{count} files uploading"
-msgstr ""
-
-#: js/files.js:389 js/files.js:424
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:498
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:571
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:576
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:954 templates/index.php:68
+#: 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:955 templates/index.php:79
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr ""
 
-#: js/files.js:956 templates/index.php:81
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:975
+#: js/files.js:898
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:977
+#: js/files.js:900
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:985
+#: js/files.js:908
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:987
+#: 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 ""
@@ -268,45 +275,45 @@ msgstr ""
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:42
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:48
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:53
+#: templates/index.php:54
 msgid "You donâ€™t have write permissions here."
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:74
+#: templates/index.php:75
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:86 templates/index.php:87
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr ""
 
-#: templates/index.php:106
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:108
+#: 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:113
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:116
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr ""
 
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index 346bfbdf1840f08e9863c8a4db9b172743b1d543..76b4b7293ab7f74917c6e1cc5d026456bbd62538 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-03-08 00:25+0100\n"
+"POT-Creation-Date: 2013-05-21 02:00+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index 2d2aed314af0bb86c58c991ef9f0b6a3182a79b1..7bfc3647ddd06f98902d80f2c4903b85cc00cdce 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-03-08 00:25+0100\n"
+"POT-Creation-Date: 2013-05-21 02:00+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -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/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index 43243d0e614cef8af96b3ebe9883801c3e7a72f0..48923f8af3ad58f71e387aadc1f6333844705070 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-03-08 00:25+0100\n"
+"POT-Creation-Date: 2013-05-21 02:00+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -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/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot
index 497a5c3ab6e14a81686c1a6d445241978834dbe6..3e9ecd756f1e449bd44289a2102e1b42dc73bc81 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-03-08 00:25+0100\n"
+"POT-Creation-Date: 2013-05-21 02:00+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,12 +17,12 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ajax/delete.php:40
+#: ajax/delete.php:42
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
 
-#: ajax/undelete.php:41
+#: ajax/undelete.php:42
 #, php-format
 msgid "Couldn't restore %s"
 msgstr ""
@@ -31,6 +31,10 @@ msgstr ""
 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 ""
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index 51022726f2bc5cc36c25b4d8b2f15e19165a7941..91f8d60881e785ab44a96e2b9e6983b961d2bd85 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-03-08 00:25+0100\n"
+"POT-Creation-Date: 2013-05-21 02:00+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index 7cee4b36ccc5f7eb3c1f64d3386c731f9635adf9..55b22c52c62aa615c4c0a2d5c7e4bf081875331a 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-03-08 00:25+0100\n"
+"POT-Creation-Date: 2013-05-21 02:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -41,19 +41,19 @@ msgstr ""
 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:238
+#: files.php:209 files.php:242
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:235
+#: 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,72 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:128 setup.php:320 setup.php:365
+#: setup.php:132 setup.php:325 setup.php:370
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:129 setup.php:152 setup.php:229
+#: setup.php:133 setup.php:156 setup.php:234
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:151 setup.php:453 setup.php:520
+#: setup.php:155 setup.php:458 setup.php:525
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:228
+#: setup.php:233
 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: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:583 setup.php:592 setup.php:600 setup.php:609
+#: setup.php:615
 #, 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:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
+#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
+#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:299
+#: setup.php:304
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:300
+#: setup.php:305
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:305
+#: setup.php:310
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:306
+#: setup.php:311
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:579 setup.php:611
+#: setup.php:584 setup.php:616
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:631
+#: setup.php:636
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:849
+#: setup.php:859
 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:860
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
@@ -239,19 +235,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 31cd164617479941d878d8923d5ed01dbdba5adc..fe59c434e975b774f14f9da7d363b2ffdcc6f5c8 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-03-08 00:25+0100\n"
+"POT-Creation-Date: 2013-05-21 02:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -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 ""
 
@@ -92,7 +96,7 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: js/apps.js:36 js/apps.js:64
+#: js/apps.js:36 js/apps.js:64 js/apps.js:83
 msgid "Enable"
 msgstr ""
 
@@ -100,68 +104,68 @@ msgstr ""
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:84
-msgid "Updating...."
+#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+msgid "Error"
 msgstr ""
 
-#: js/apps.js:87
-msgid "Error while updating app"
+#: js/apps.js:90
+msgid "Updating...."
 msgstr ""
 
-#: js/apps.js:87
-msgid "Error"
+#: js/apps.js:93
+msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:90
+#: js/apps.js:96
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr ""
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "deleted"
 msgstr ""
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "undo"
 msgstr ""
 
-#: js/users.js:62
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:75 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
+#: templates/users.php:103
 msgid "Groups"
 msgstr ""
 
-#: js/users.js:78 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr ""
 
-#: js/users.js:191
+#: js/users.js:269
 msgid "add group"
 msgstr ""
 
-#: js/users.js:352
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:353 js/users.js:359 js/users.js:374
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:358
+#: js/users.js:426
 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,15 +316,19 @@ msgstr ""
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:230 templates/personal.php:102
+#: templates/admin.php:228
+msgid "Less"
+msgstr ""
+
+#: templates/admin.php:235 templates/personal.php:105
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:233 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 href=\"https://github.com/owncloud\" "
@@ -391,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:77
 msgid "Password"
 msgstr ""
 
@@ -415,82 +423,70 @@ msgstr ""
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:76
 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:75
 msgid "Login Name"
 msgstr ""
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr ""
 
-#: templates/users.php:35
+#: templates/users.php:33
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:39 templates/users.php:133
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:57 templates/users.php:148
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:84
+#: templates/users.php:82
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:95
+#: templates/users.php:93
 msgid "change display name"
 msgstr ""
 
-#: templates/users.php:99
+#: templates/users.php:97
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:134
+#: templates/users.php:128
 msgid "Default"
 msgstr ""
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index ba91ba629c39f543612e83993d57858c0e6f3e1a..e14b4cb292a2cc9c39a5f40ab561394dfe1f47ff 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-03-08 00:25+0100\n"
+"POT-Creation-Date: 2013-05-21 02:00+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,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 8f6a357f841b48a5ee6268d1d10138f520c7c73a..018936d3d9d5916f455074f90d37ae29b0ecb6e0 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-03-08 00:25+0100\n"
+"POT-Creation-Date: 2013-05-21 02:00+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/th_TH/core.po b/l10n/th_TH/core.po
index 6349d38593a3ec858e9e8859249aed075e7a3638..568570f897f8aeb6a39f52abb31fbc1f56213b6a 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-02-22 00:06+0100\n"
-"PO-Revision-Date: 2013-02-20 23:20+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10: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"
@@ -19,24 +17,24 @@ msgstr ""
 "Language: th_TH\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/share.php:85
+#: ajax/share.php:97
 #, php-format
 msgid "User %s shared a file with you"
 msgstr "à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™ %s à¹„à¸”à¹‰à¹à¸Šà¸£à¹Œà¹„à¸Ÿà¸¥à¹Œà¹ƒà¸«à¹‰à¸à¸±à¸šà¸„à¸¸à¸“"
 
-#: ajax/share.php:87
+#: ajax/share.php:99
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr "à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™ %s à¹„à¸”à¹‰à¹à¸Šà¸£à¹Œà¹‚à¸Ÿà¸¥à¹€à¸”à¸à¸£à¹Œà¹ƒà¸«à¹‰à¸à¸±à¸šà¸„à¸¸à¸“"
 
-#: ajax/share.php:89
+#: ajax/share.php:101
 #, php-format
 msgid ""
 "User %s shared the file \"%s\" with you. It is available for download here: "
 "%s"
 msgstr "à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™ %s à¹„à¸”à¹‰à¹à¸Šà¸£à¹Œà¹„à¸Ÿà¸¥à¹Œ \"%s\" à¹ƒà¸«à¹‰à¸à¸±à¸šà¸„à¸¸à¸“ à¹à¸¥à¸°à¸„à¸¸à¸“à¸ªà¸²à¸¡à¸²à¸£à¸–à¸ªà¸²à¸¡à¸²à¸£à¸–à¸”à¸²à¸§à¸™à¹Œà¹‚à¸«à¸¥à¸”à¹„à¸Ÿà¸¥à¹Œà¸”à¸±à¸‡à¸à¸¥à¹ˆà¸²à¸§à¹„à¸”à¹‰à¸ˆà¸²à¸à¸—à¸µà¹ˆà¸™à¸µà¹ˆ: %s"
 
-#: ajax/share.php:91
+#: ajax/share.php:104
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -82,79 +80,79 @@ msgstr "à¸¢à¸±à¸‡à¹„à¸¡à¹ˆà¹„à¸”à¹‰à¹€à¸¥à¸·à¸à¸à¸«à¸¡à¸§à¸”à¸«à¸¡à¸¹à¹ˆà¸—à¸µ
 msgid "Error removing %s from favorites."
 msgstr "à¹€à¸à¸´à¸”à¸‚à¹‰à¸à¸œà¸´à¸”à¸žà¸¥à¸²à¸”à¹ƒà¸™à¸à¸²à¸£à¸¥à¸š %s à¸à¸à¸à¸ˆà¸²à¸à¸£à¸²à¸¢à¸à¸²à¸£à¹‚à¸›à¸£à¸”"
 
-#: js/config.php:32
+#: js/config.php:34
 msgid "Sunday"
 msgstr "à¸§à¸±à¸™à¸à¸²à¸—à¸´à¸•à¸¢à¹Œ"
 
-#: js/config.php:32
+#: js/config.php:35
 msgid "Monday"
 msgstr "à¸§à¸±à¸™à¸ˆà¸±à¸™à¸—à¸£à¹Œ"
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Tuesday"
 msgstr "à¸§à¸±à¸™à¸à¸±à¸‡à¸„à¸²à¸£"
 
-#: js/config.php:32
+#: js/config.php:37
 msgid "Wednesday"
 msgstr "à¸§à¸±à¸™à¸žà¸¸à¸˜"
 
-#: js/config.php:32
+#: js/config.php:38
 msgid "Thursday"
 msgstr "à¸§à¸±à¸™à¸žà¸¤à¸«à¸±à¸ªà¸šà¸”à¸µ"
 
-#: js/config.php:32
+#: js/config.php:39
 msgid "Friday"
 msgstr "à¸§à¸±à¸™à¸¨à¸¸à¸à¸£à¹Œ"
 
-#: js/config.php:32
+#: js/config.php:40
 msgid "Saturday"
 msgstr "à¸§à¸±à¸™à¹€à¸ªà¸²à¸£à¹Œ"
 
-#: js/config.php:33
+#: js/config.php:45
 msgid "January"
 msgstr "à¸¡à¸à¸£à¸²à¸„à¸¡"
 
-#: js/config.php:33
+#: js/config.php:46
 msgid "February"
 msgstr "à¸à¸¸à¸¡à¸ à¸²à¸žà¸±à¸™à¸˜à¹Œ"
 
-#: js/config.php:33
+#: js/config.php:47
 msgid "March"
 msgstr "à¸¡à¸µà¸™à¸²à¸„à¸¡"
 
-#: js/config.php:33
+#: js/config.php:48
 msgid "April"
 msgstr "à¹€à¸¡à¸©à¸²à¸¢à¸™"
 
-#: js/config.php:33
+#: js/config.php:49
 msgid "May"
 msgstr "à¸žà¸¤à¸©à¸ à¸²à¸„à¸¡"
 
-#: js/config.php:33
+#: js/config.php:50
 msgid "June"
 msgstr "à¸¡à¸´à¸–à¸¸à¸™à¸²à¸¢à¸™"
 
-#: js/config.php:33
+#: js/config.php:51
 msgid "July"
 msgstr "à¸à¸£à¸à¸à¸²à¸„à¸¡"
 
-#: js/config.php:33
+#: js/config.php:52
 msgid "August"
 msgstr "à¸ªà¸´à¸‡à¸«à¸²à¸„à¸¡"
 
-#: js/config.php:33
+#: js/config.php:53
 msgid "September"
 msgstr "à¸à¸±à¸™à¸¢à¸²à¸¢à¸™"
 
-#: js/config.php:33
+#: js/config.php:54
 msgid "October"
 msgstr "à¸•à¸¸à¸¥à¸²à¸„à¸¡"
 
-#: js/config.php:33
+#: js/config.php:55
 msgid "November"
 msgstr "à¸žà¸¤à¸¨à¸ˆà¸´à¸à¸²à¸¢à¸™"
 
-#: js/config.php:33
+#: js/config.php:56
 msgid "December"
 msgstr "à¸˜à¸±à¸™à¸§à¸²à¸„à¸¡"
 
@@ -162,88 +160,90 @@ msgstr "à¸˜à¸±à¸™à¸§à¸²à¸„à¸¡"
 msgid "Settings"
 msgstr "à¸•à¸±à¹‰à¸‡à¸„à¹ˆà¸²"
 
-#: js/js.js:767
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "à¸§à¸´à¸™à¸²à¸—à¸µ à¸à¹ˆà¸à¸™à¸«à¸™à¹‰à¸²à¸™à¸µà¹‰"
 
-#: js/js.js:768
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "1 à¸™à¸²à¸—à¸µà¸à¹ˆà¸à¸™à¸«à¸™à¹‰à¸²à¸™à¸µà¹‰"
 
-#: js/js.js:769
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr "{minutes} à¸™à¸²à¸—à¸µà¸à¹ˆà¸à¸™à¸«à¸™à¹‰à¸²à¸™à¸µà¹‰"
 
-#: js/js.js:770
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr "1 à¸Šà¸±à¹ˆà¸§à¹‚à¸¡à¸‡à¸à¹ˆà¸à¸™à¸«à¸™à¹‰à¸²à¸™à¸µà¹‰"
 
-#: js/js.js:771
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr "{hours} à¸Šà¸±à¹ˆà¸§à¹‚à¸¡à¸‡à¸à¹ˆà¸à¸™à¸«à¸™à¹‰à¸²à¸™à¸µà¹‰"
 
-#: js/js.js:772
+#: js/js.js:723
 msgid "today"
 msgstr "à¸§à¸±à¸™à¸™à¸µà¹‰"
 
-#: js/js.js:773
+#: js/js.js:724
 msgid "yesterday"
 msgstr "à¹€à¸¡à¸·à¹ˆà¸à¸§à¸²à¸™à¸™à¸µà¹‰"
 
-#: js/js.js:774
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr "{day} à¸§à¸±à¸™à¸à¹ˆà¸à¸™à¸«à¸™à¹‰à¸²à¸™à¸µà¹‰"
 
-#: js/js.js:775
+#: js/js.js:726
 msgid "last month"
 msgstr "à¹€à¸”à¸·à¸à¸™à¸—à¸µà¹ˆà¹à¸¥à¹‰à¸§"
 
-#: js/js.js:776
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr "{months} à¹€à¸”à¸·à¸à¸™à¸à¹ˆà¸à¸™à¸«à¸™à¹‰à¸²à¸™à¸µà¹‰"
 
-#: js/js.js:777
+#: js/js.js:728
 msgid "months ago"
 msgstr "à¹€à¸”à¸·à¸à¸™ à¸—à¸µà¹ˆà¸œà¹ˆà¸²à¸™à¸¡à¸²"
 
-#: js/js.js:778
+#: js/js.js:729
 msgid "last year"
 msgstr "à¸›à¸µà¸—à¸µà¹ˆà¹à¸¥à¹‰à¸§"
 
-#: js/js.js:779
+#: js/js.js:730
 msgid "years ago"
 msgstr "à¸›à¸µ à¸—à¸µà¹ˆà¸œà¹ˆà¸²à¸™à¸¡à¸²"
 
-#: js/oc-dialogs.js:126
-msgid "Choose"
-msgstr "à¹€à¸¥à¸·à¸à¸"
+#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
+msgid "Ok"
+msgstr "à¸•à¸à¸¥à¸‡"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
 msgid "Cancel"
 msgstr "à¸¢à¸à¹€à¸¥à¸´à¸"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "à¹„à¸¡à¹ˆà¸•à¸à¸¥à¸‡"
+#: js/oc-dialogs.js:185
+msgid "Choose"
+msgstr "à¹€à¸¥à¸·à¸à¸"
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:215
 msgid "Yes"
 msgstr "à¸•à¸à¸¥à¸‡"
 
-#: js/oc-dialogs.js:180
-msgid "Ok"
-msgstr "à¸•à¸à¸¥à¸‡"
+#: js/oc-dialogs.js:222
+msgid "No"
+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:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:582
-#: js/share.js:594
+#: 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 "à¸‚à¹‰à¸à¸œà¸´à¸”à¸žà¸¥à¸²à¸”"
 
 #: js/oc-vcategories.js:179
 msgid "The app name is not specified."
@@ -253,127 +253,127 @@ msgstr "à¸Šà¸·à¹ˆà¸à¸‚à¸à¸‡à¹à¸à¸›à¸¢à¸±à¸‡à¹„à¸¡à¹ˆà¹„à¸”à¹‰à¸£à¸±à¸šà¸à¸²
 msgid "The required file {file} is not installed!"
 msgstr "à¹„à¸Ÿà¸¥à¹Œ {file} à¸‹à¸¶à¹ˆà¸‡à¹€à¸›à¹‡à¸™à¹„à¸Ÿà¸¥à¹Œà¸—à¸µà¹ˆà¸ˆà¸³à¹€à¸›à¹‡à¸™à¸•à¹‰à¸à¸‡à¹„à¸”à¹‰à¸£à¸±à¸šà¸à¸²à¸£à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡à¹„à¸§à¹‰à¸à¹ˆà¸à¸™ à¸¢à¸±à¸‡à¹„à¸¡à¹ˆà¹„à¸”à¹‰à¸–à¸¹à¸à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡"
 
-#: js/share.js:29 js/share.js:43 js/share.js:90
+#: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr "à¹à¸Šà¸£à¹Œà¹à¸¥à¹‰à¸§"
 
-#: js/share.js:93
+#: js/share.js:90
 msgid "Share"
 msgstr "à¹à¸Šà¸£à¹Œ"
 
-#: js/share.js:141 js/share.js:622
+#: js/share.js:125 js/share.js:617
 msgid "Error while sharing"
 msgstr "à¹€à¸à¸´à¸”à¸‚à¹‰à¸à¸œà¸´à¸”à¸žà¸¥à¸²à¸”à¹ƒà¸™à¸£à¸°à¸«à¸§à¹ˆà¸²à¸‡à¸à¸²à¸£à¹à¸Šà¸£à¹Œà¸‚à¹‰à¸à¸¡à¸¹à¸¥"
 
-#: js/share.js:152
+#: js/share.js:136
 msgid "Error while unsharing"
 msgstr "à¹€à¸à¸´à¸”à¸‚à¹‰à¸à¸œà¸´à¸”à¸žà¸¥à¸²à¸”à¹ƒà¸™à¸à¸²à¸£à¸¢à¸à¹€à¸¥à¸´à¸à¸à¸²à¸£à¹à¸Šà¸£à¹Œà¸‚à¹‰à¸à¸¡à¸¹à¸¥"
 
-#: js/share.js:159
+#: js/share.js:143
 msgid "Error while changing permissions"
 msgstr "à¹€à¸à¸´à¸”à¸‚à¹‰à¸à¸œà¸´à¸”à¸žà¸¥à¸²à¸”à¹ƒà¸™à¸à¸²à¸£à¹€à¸›à¸¥à¸µà¹ˆà¸¢à¸™à¸ªà¸´à¸—à¸˜à¸´à¹Œà¸à¸²à¸£à¹€à¸‚à¹‰à¸²à¹ƒà¸Šà¹‰à¸‡à¸²à¸™"
 
-#: js/share.js:168
+#: js/share.js:152
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "à¹„à¸”à¹‰à¹à¸Šà¸£à¹Œà¹ƒà¸«à¹‰à¸à¸±à¸šà¸„à¸¸à¸“ à¹à¸¥à¸°à¸à¸¥à¸¸à¹ˆà¸¡ {group} à¹‚à¸”à¸¢ {owner}"
 
-#: js/share.js:170
+#: js/share.js:154
 msgid "Shared with you by {owner}"
 msgstr "à¸–à¸¹à¸à¹à¸Šà¸£à¹Œà¹ƒà¸«à¹‰à¸à¸±à¸šà¸„à¸¸à¸“à¹‚à¸”à¸¢ {owner}"
 
-#: js/share.js:175
+#: js/share.js:159
 msgid "Share with"
 msgstr "à¹à¸Šà¸£à¹Œà¹ƒà¸«à¹‰à¸à¸±à¸š"
 
-#: js/share.js:180
+#: js/share.js:164
 msgid "Share with link"
 msgstr "à¹à¸Šà¸£à¹Œà¸”à¹‰à¸§à¸¢à¸¥à¸´à¸‡à¸à¹Œ"
 
-#: js/share.js:183
+#: js/share.js:167
 msgid "Password protect"
 msgstr "à¹ƒà¸ªà¹ˆà¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™à¹„à¸§à¹‰"
 
-#: js/share.js:185 templates/installation.php:44 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "à¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™"
 
-#: js/share.js:189
+#: js/share.js:173
 msgid "Email link to person"
 msgstr "à¸ªà¹ˆà¸‡à¸¥à¸´à¸‡à¸à¹Œà¹ƒà¸«à¹‰à¸—à¸²à¸‡à¸à¸µà¹€à¸¡à¸¥"
 
-#: js/share.js:190
+#: js/share.js:174
 msgid "Send"
 msgstr "à¸ªà¹ˆà¸‡"
 
-#: js/share.js:194
+#: js/share.js:178
 msgid "Set expiration date"
 msgstr "à¸à¸³à¸«à¸™à¸”à¸§à¸±à¸™à¸—à¸µà¹ˆà¸«à¸¡à¸”à¸à¸²à¸¢à¸¸"
 
-#: js/share.js:195
+#: js/share.js:179
 msgid "Expiration date"
 msgstr "à¸§à¸±à¸™à¸—à¸µà¹ˆà¸«à¸¡à¸”à¸à¸²à¸¢à¸¸"
 
-#: js/share.js:227
+#: js/share.js:211
 msgid "Share via email:"
 msgstr "à¹à¸Šà¸£à¹Œà¸œà¹ˆà¸²à¸™à¸—à¸²à¸‡à¸à¸µà¹€à¸¡à¸¥"
 
-#: js/share.js:229
+#: js/share.js:213
 msgid "No people found"
 msgstr "à¹„à¸¡à¹ˆà¸žà¸šà¸šà¸¸à¸„à¸„à¸¥à¸—à¸µà¹ˆà¸•à¹‰à¸à¸‡à¸à¸²à¸£"
 
-#: js/share.js:256
+#: js/share.js:251
 msgid "Resharing is not allowed"
 msgstr "à¹„à¸¡à¹ˆà¸à¸™à¸¸à¸à¸²à¸•à¹ƒà¸«à¹‰à¹à¸Šà¸£à¹Œà¸‚à¹‰à¸à¸¡à¸¹à¸¥à¸‹à¹‰à¸³à¹„à¸”à¹‰"
 
-#: js/share.js:292
+#: js/share.js:287
 msgid "Shared in {item} with {user}"
 msgstr "à¹„à¸”à¹‰à¹à¸Šà¸£à¹Œ {item} à¹ƒà¸«à¹‰à¸à¸±à¸š {user}"
 
-#: js/share.js:313
+#: js/share.js:308
 msgid "Unshare"
 msgstr "à¸¢à¸à¹€à¸¥à¸´à¸à¸à¸²à¸£à¹à¸Šà¸£à¹Œ"
 
-#: js/share.js:325
+#: js/share.js:320
 msgid "can edit"
 msgstr "à¸ªà¸²à¸¡à¸²à¸£à¸–à¹à¸à¹‰à¹„à¸‚"
 
-#: js/share.js:327
+#: js/share.js:322
 msgid "access control"
 msgstr "à¸£à¸°à¸”à¸±à¸šà¸„à¸§à¸šà¸„à¸¸à¸¡à¸à¸²à¸£à¹€à¸‚à¹‰à¸²à¹ƒà¸Šà¹‰à¸‡à¸²à¸™"
 
-#: js/share.js:330
+#: js/share.js:325
 msgid "create"
 msgstr "à¸ªà¸£à¹‰à¸²à¸‡"
 
-#: js/share.js:333
+#: js/share.js:328
 msgid "update"
 msgstr "à¸à¸±à¸žà¹€à¸”à¸—"
 
-#: js/share.js:336
+#: js/share.js:331
 msgid "delete"
 msgstr "à¸¥à¸š"
 
-#: js/share.js:339
+#: js/share.js:334
 msgid "share"
 msgstr "à¹à¸Šà¸£à¹Œ"
 
-#: js/share.js:373 js/share.js:569
+#: js/share.js:368 js/share.js:564
 msgid "Password protected"
 msgstr "à¹ƒà¸ªà¹ˆà¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™à¹„à¸§à¹‰"
 
-#: js/share.js:582
+#: js/share.js:577
 msgid "Error unsetting expiration date"
 msgstr "à¹€à¸à¸´à¸”à¸‚à¹‰à¸à¸œà¸´à¸”à¸žà¸¥à¸²à¸”à¹ƒà¸™à¸à¸²à¸£à¸¢à¸à¹€à¸¥à¸´à¸à¸à¸²à¸£à¸•à¸±à¹‰à¸‡à¸„à¹ˆà¸²à¸§à¸±à¸™à¸—à¸µà¹ˆà¸«à¸¡à¸”à¸à¸²à¸¢à¸¸"
 
-#: js/share.js:594
+#: js/share.js:589
 msgid "Error setting expiration date"
 msgstr "à¹€à¸à¸´à¸”à¸‚à¹‰à¸à¸œà¸´à¸”à¸žà¸¥à¸²à¸”à¹ƒà¸™à¸à¸²à¸£à¸•à¸±à¹‰à¸‡à¸„à¹ˆà¸²à¸§à¸±à¸™à¸—à¸µà¹ˆà¸«à¸¡à¸”à¸à¸²à¸¢à¸¸"
 
-#: js/share.js:609
+#: js/share.js:604
 msgid "Sending ..."
 msgstr "à¸à¸³à¸¥à¸±à¸‡à¸ªà¹ˆà¸‡..."
 
-#: js/share.js:620
+#: js/share.js:615
 msgid "Email sent"
 msgstr "à¸ªà¹ˆà¸‡à¸à¸µà¹€à¸¡à¸¥à¹Œà¹à¸¥à¹‰à¸§"
 
@@ -396,24 +396,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:39
-#: 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 "à¸‚à¸à¹€à¸›à¸¥à¸µà¹ˆà¸¢à¸™à¸£à¸«à¸±à¸ªà¹ƒà¸«à¸¡à¹ˆ"
 
@@ -443,11 +446,11 @@ msgstr "à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™"
 
 #: strings.php:7
 msgid "Apps"
-msgstr "Apps"
+msgstr "à¹à¸à¸›à¸¯"
 
 #: strings.php:8
 msgid "Admin"
-msgstr "à¸œà¸¹à¹‰à¸”à¸¹à¹à¸¥à¸£à¸°à¸šà¸š"
+msgstr "à¸œà¸¹à¹‰à¸”à¸¹à¹à¸¥"
 
 #: strings.php:9
 msgid "Help"
@@ -469,115 +472,130 @@ msgstr "à¹à¸à¹‰à¹„à¸‚à¸«à¸¡à¸§à¸”à¸«à¸¡à¸¹à¹ˆ"
 msgid "Add"
 msgstr "à¹€à¸žà¸´à¹ˆà¸¡"
 
-#: templates/installation.php:23 templates/installation.php:30
+#: 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 "à¸¢à¸±à¸‡à¹„à¸¡à¹ˆà¸¡à¸µà¸•à¸±à¸§à¸ªà¸£à¹‰à¸²à¸‡à¸«à¸¡à¸²à¸¢à¹€à¸¥à¸‚à¹à¸šà¸šà¸ªà¸¸à¹ˆà¸¡à¹ƒà¸«à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™, à¸à¸£à¸¸à¸“à¸²à¹€à¸›à¸´à¸”à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸ªà¹ˆà¸§à¸™à¹€à¸ªà¸£à¸´à¸¡ PHP OpenSSL"
 
-#: templates/installation.php:25
+#: 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:31
+#: 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:32
+#: 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:36
+#: templates/installation.php:44
 msgid "Create an <strong>admin account</strong>"
 msgstr "à¸ªà¸£à¹‰à¸²à¸‡ <strong>à¸šà¸±à¸à¸Šà¸µà¸œà¸¹à¹‰à¸”à¸¹à¹à¸¥à¸£à¸°à¸šà¸š</strong>"
 
-#: templates/installation.php:52
+#: templates/installation.php:62
 msgid "Advanced"
 msgstr "à¸‚à¸±à¹‰à¸™à¸ªà¸¹à¸‡"
 
-#: templates/installation.php:54
+#: templates/installation.php:64
 msgid "Data folder"
 msgstr "à¹‚à¸Ÿà¸¥à¹€à¸”à¸à¸£à¹Œà¹€à¸à¹‡à¸šà¸‚à¹‰à¸à¸¡à¸¹à¸¥"
 
-#: templates/installation.php:61
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "à¸à¸³à¸«à¸™à¸”à¸„à¹ˆà¸²à¸à¸²à¸™à¸‚à¹‰à¸à¸¡à¸¹à¸¥"
 
-#: templates/installation.php:66 templates/installation.php:77
-#: templates/installation.php:87 templates/installation.php:97
+#: 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:109
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "à¸Šà¸·à¹ˆà¸à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸à¸²à¸™à¸‚à¹‰à¸à¸¡à¸¹à¸¥"
 
-#: templates/installation.php:113
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "à¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™à¸à¸²à¸™à¸‚à¹‰à¸à¸¡à¸¹à¸¥"
 
-#: templates/installation.php:117
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "à¸Šà¸·à¹ˆà¸à¸à¸²à¸™à¸‚à¹‰à¸à¸¡à¸¹à¸¥"
 
-#: templates/installation.php:125
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "à¸žà¸·à¹‰à¸™à¸—à¸µà¹ˆà¸•à¸²à¸£à¸²à¸‡à¹ƒà¸™à¸à¸²à¸™à¸‚à¹‰à¸à¸¡à¸¹à¸¥"
 
-#: templates/installation.php:131
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "Database host"
 
-#: templates/installation.php:136
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡à¹€à¸£à¸µà¸¢à¸šà¸£à¹‰à¸à¸¢à¹à¸¥à¹‰à¸§"
 
-#: templates/layout.guest.php:33
+#: templates/layout.guest.php:40
 msgid "web services under your control"
-msgstr "web services under your control"
+msgstr "à¹€à¸§à¹‡à¸šà¹€à¸‹à¸à¸£à¹Œà¸§à¸´à¸ªà¸—à¸µà¹ˆà¸„à¸¸à¸“à¸„à¸§à¸šà¸„à¸¸à¸¡à¸à¸²à¸£à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¹„à¸”à¹‰"
+
+#: templates/layout.user.php:36
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr ""
 
-#: templates/layout.user.php:48
+#: 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/th_TH/files.po b/l10n/th_TH/files.po
index 71a7680255fd7967ef069773db43508afbf44448..52962e21fbbe24005f4486ba4274797409e8ec65 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-03-04 00:06+0100\n"
-"PO-Revision-Date: 2013-03-03 23:06+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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"
@@ -72,59 +66,70 @@ msgstr "à¹€à¸‚à¸µà¸¢à¸™à¸‚à¹‰à¸à¸¡à¸¹à¸¥à¸¥à¸‡à¹à¸œà¹ˆà¸™à¸”à¸´à¸ªà¸à¹Œà¸¥à¹‰
 msgid "Not enough storage available"
 msgstr "à¹€à¸«à¸¥à¸·à¸à¸žà¸·à¹‰à¸™à¸—à¸µà¹ˆà¹„à¸¡à¹ˆà¹€à¸žà¸µà¸¢à¸‡à¸ªà¸³à¸«à¸£à¸±à¸šà¹ƒà¸Šà¹‰à¸‡à¸²à¸™"
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr "à¹„à¸”à¹€à¸£à¹‡à¸à¸—à¸à¸£à¸µà¹ˆà¹„à¸¡à¹ˆà¸–à¸¹à¸à¸•à¹‰à¸à¸‡"
 
-#: appinfo/app.php:10
+#: 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 ""
 
-#: js/fileactions.js:127 templates/index.php:92 templates/index.php:93
+#: 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/files.js:292 js/files.js:408
-#: js/files.js:439
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "à¸à¸¢à¸¹à¹ˆà¸£à¸°à¸«à¸§à¹ˆà¸²à¸‡à¸”à¸³à¹€à¸™à¸´à¸™à¸à¸²à¸£"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} à¸¡à¸µà¸à¸¢à¸¹à¹ˆà¹à¸¥à¹‰à¸§à¹ƒà¸™à¸£à¸°à¸šà¸š"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "à¹à¸—à¸™à¸—à¸µà¹ˆ"
 
-#: js/filelist.js:251
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "à¹à¸™à¸°à¸™à¸³à¸Šà¸·à¹ˆà¸"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "à¸¢à¸à¹€à¸¥à¸´à¸"
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "à¹à¸—à¸™à¸—à¸µà¹ˆ {new_name} à¸”à¹‰à¸§à¸¢ {old_name} à¹à¸¥à¹‰à¸§"
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "undo"
 msgstr "à¹€à¸¥à¸´à¸à¸—à¸³"
 
-#: js/filelist.js:323
+#: 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 "'.' à¹€à¸›à¹‡à¸™à¸Šà¸·à¹ˆà¸à¹„à¸Ÿà¸¥à¹Œà¸—à¸µà¹ˆà¹„à¸¡à¹ˆà¸–à¸¹à¸à¸•à¹‰à¸à¸‡"
@@ -147,77 +152,77 @@ msgstr "à¸žà¸·à¹‰à¸™à¸—à¸µà¹ˆà¸ˆà¸±à¸”à¹€à¸à¹‡à¸šà¸‚à¹‰à¸à¸¡à¸¹à¸¥à¸‚à¸à¸‡à¸„
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "à¸žà¸·à¹‰à¸™à¸—à¸µà¹ˆà¸ˆà¸±à¸”à¹€à¸à¹‡à¸šà¸‚à¹‰à¸à¸¡à¸¹à¸¥à¸‚à¸à¸‡à¸„à¸¸à¸“à¹ƒà¸à¸¥à¹‰à¹€à¸•à¹‡à¸¡à¹à¸¥à¹‰à¸§ ({usedSpacePercent}%)"
 
-#: js/files.js:225
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "à¸à¸³à¸¥à¸±à¸‡à¹€à¸•à¸£à¸µà¸¢à¸¡à¸”à¸²à¸§à¸™à¹Œà¹‚à¸«à¸¥à¸”à¸‚à¹‰à¸à¸¡à¸¹à¸¥ à¸«à¸²à¸à¹„à¸Ÿà¸¥à¹Œà¸¡à¸µà¸‚à¸™à¸²à¸”à¹ƒà¸«à¸à¹ˆ à¸à¸²à¸ˆà¹ƒà¸Šà¹‰à¹€à¸§à¸¥à¸²à¸ªà¸±à¸à¸„à¸£à¸¹à¹ˆ"
 
-#: js/files.js:262
+#: 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:262
-msgid "Upload Error"
-msgstr "à¹€à¸à¸´à¸”à¸‚à¹‰à¸à¸œà¸´à¸”à¸žà¸¥à¸²à¸”à¹ƒà¸™à¸à¸²à¸£à¸à¸±à¸žà¹‚à¸«à¸¥à¸”"
+#: js/files.js:277
+msgid "Not enough space available"
+msgstr "à¸¡à¸µà¸žà¸·à¹‰à¸™à¸—à¸µà¹ˆà¹€à¸«à¸¥à¸·à¸à¹„à¸¡à¹ˆà¹€à¸žà¸µà¸¢à¸‡à¸žà¸"
 
-#: js/files.js:273
-msgid "Close"
-msgstr "à¸›à¸´à¸”"
-
-#: js/files.js:312
-msgid "1 file uploading"
-msgstr "à¸à¸³à¸¥à¸±à¸‡à¸à¸±à¸žà¹‚à¸«à¸¥à¸”à¹„à¸Ÿà¸¥à¹Œ 1 à¹„à¸Ÿà¸¥à¹Œ"
-
-#: js/files.js:315 js/files.js:370 js/files.js:385
-msgid "{count} files uploading"
-msgstr "à¸à¸³à¸¥à¸±à¸‡à¸à¸±à¸žà¹‚à¸«à¸¥à¸” {count} à¹„à¸Ÿà¸¥à¹Œ"
-
-#: js/files.js:388 js/files.js:423
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "à¸à¸²à¸£à¸à¸±à¸žà¹‚à¸«à¸¥à¸”à¸–à¸¹à¸à¸¢à¸à¹€à¸¥à¸´à¸"
 
-#: js/files.js:497
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "à¸à¸²à¸£à¸à¸±à¸žà¹‚à¸«à¸¥à¸”à¹„à¸Ÿà¸¥à¹Œà¸à¸³à¸¥à¸±à¸‡à¸à¸¢à¸¹à¹ˆà¹ƒà¸™à¸£à¸°à¸«à¸§à¹ˆà¸²à¸‡à¸”à¸³à¹€à¸™à¸´à¸™à¸à¸²à¸£ à¸à¸²à¸£à¸à¸à¸à¸ˆà¸²à¸à¸«à¸™à¹‰à¸²à¹€à¸§à¹‡à¸šà¸™à¸µà¹‰à¸ˆà¸°à¸—à¸³à¹ƒà¸«à¹‰à¸à¸²à¸£à¸à¸±à¸žà¹‚à¸«à¸¥à¸”à¸–à¸¹à¸à¸¢à¸à¹€à¸¥à¸´à¸"
 
-#: js/files.js:570
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "URL à¹„à¸¡à¹ˆà¸ªà¸²à¸¡à¸²à¸£à¸–à¹€à¸§à¹‰à¸™à¸§à¹ˆà¸²à¸‡à¹„à¸”à¹‰"
 
-#: js/files.js:575
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "à¸Šà¸·à¹ˆà¸à¹‚à¸Ÿà¸¥à¹€à¸”à¸à¸£à¹Œà¹„à¸¡à¹ˆà¸–à¸¹à¸à¸•à¹‰à¸à¸‡ à¸à¸²à¸£à¹ƒà¸Šà¹‰à¸‡à¸²à¸™ 'à¹à¸Šà¸£à¹Œ' à¸ªà¸‡à¸§à¸™à¹„à¸§à¹‰à¸ªà¸³à¸«à¸£à¸±à¸š Owncloud à¹€à¸—à¹ˆà¸²à¸™à¸±à¹‰à¸™"
 
-#: js/files.js:953 templates/index.php:68
+#: 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:954 templates/index.php:79
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "à¸‚à¸™à¸²à¸”"
 
-#: js/files.js:955 templates/index.php:81
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
-msgstr "à¸›à¸£à¸±à¸šà¸›à¸£à¸¸à¸‡à¸¥à¹ˆà¸²à¸ªà¸¸à¸”"
+msgstr "à¹à¸à¹‰à¹„à¸‚à¹à¸¥à¹‰à¸§"
 
-#: js/files.js:974
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 à¹‚à¸Ÿà¸¥à¹€à¸”à¸à¸£à¹Œ"
 
-#: js/files.js:976
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} à¹‚à¸Ÿà¸¥à¹€à¸”à¸à¸£à¹Œ"
 
-#: js/files.js:984
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 à¹„à¸Ÿà¸¥à¹Œ"
 
-#: js/files.js:986
+#: 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 "à¸à¸±à¸žà¹‚à¸«à¸¥à¸”"
@@ -270,45 +275,45 @@ msgstr "à¹à¸Ÿà¹‰à¸¡à¹€à¸à¸à¸ªà¸²à¸£"
 msgid "From link"
 msgstr "à¸ˆà¸²à¸à¸¥à¸´à¸‡à¸à¹Œ"
 
-#: templates/index.php:40
+#: templates/index.php:42
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:48
 msgid "Cancel upload"
 msgstr "à¸¢à¸à¹€à¸¥à¸´à¸à¸à¸²à¸£à¸à¸±à¸žà¹‚à¸«à¸¥à¸”"
 
-#: templates/index.php:53
+#: templates/index.php:54
 msgid "You donâ€™t have write permissions here."
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "à¸¢à¸±à¸‡à¹„à¸¡à¹ˆà¸¡à¸µà¹„à¸Ÿà¸¥à¹Œà¹ƒà¸”à¹†à¸à¸¢à¸¹à¹ˆà¸—à¸µà¹ˆà¸™à¸µà¹ˆ à¸à¸£à¸¸à¸“à¸²à¸à¸±à¸žà¹‚à¸«à¸¥à¸”à¹„à¸Ÿà¸¥à¹Œ!"
 
-#: templates/index.php:74
+#: templates/index.php:75
 msgid "Download"
 msgstr "à¸”à¸²à¸§à¸™à¹Œà¹‚à¸«à¸¥à¸”"
 
-#: templates/index.php:86 templates/index.php:87
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
-msgstr "à¸¢à¸à¹€à¸¥à¸´à¸à¸à¸²à¸£à¹à¸Šà¸£à¹Œà¸‚à¹‰à¸à¸¡à¸¹à¸¥"
+msgstr "à¸¢à¸à¹€à¸¥à¸´à¸à¸à¸²à¸£à¹à¸Šà¸£à¹Œ"
 
-#: templates/index.php:106
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "à¹„à¸Ÿà¸¥à¹Œà¸—à¸µà¹ˆà¸à¸±à¸žà¹‚à¸«à¸¥à¸”à¸¡à¸µà¸‚à¸™à¸²à¸”à¹ƒà¸«à¸à¹ˆà¹€à¸à¸´à¸™à¹„à¸›"
 
-#: templates/index.php:108
+#: 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:113
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "à¹„à¸Ÿà¸¥à¹Œà¸à¸³à¸¥à¸±à¸‡à¸à¸¢à¸¹à¹ˆà¸£à¸°à¸«à¸§à¹ˆà¸²à¸‡à¸à¸²à¸£à¸ªà¹à¸à¸™, à¸à¸£à¸¸à¸“à¸²à¸£à¸à¸ªà¸±à¸à¸„à¸£à¸¹à¹ˆ."
 
-#: templates/index.php:116
+#: 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..f6529f0dc5569abecedecda68d7f66422da9c1a3 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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"
@@ -36,4 +35,4 @@ msgstr ""
 
 #: templates/settings.php:12
 msgid "None"
-msgstr "à¹„à¸¡à¹ˆà¸•à¹‰à¸à¸‡"
+msgstr "à¹„à¸¡à¹ˆà¸¡à¸µ"
diff --git a/l10n/th_TH/files_external.po b/l10n/th_TH/files_external.po
index 2406b5d449eacb14a0f8fca10ab794f70a780acd..4aea7d49168fbc7425498d89545d6f96123a5fa5 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-01 00:05+0100\n"
-"PO-Revision-Date: 2013-02-27 23:20+0000\n"
+"POT-Creation-Date: 2013-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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: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 "<b>à¸„à¸³à¹€à¸•à¸·à¸à¸™:</b> \"smbclient\" à¸¢à¸±à¸‡à¹„à¸¡à¹ˆà¹„à¸”à¹‰à¸–à¸¹à¸à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡. à¸à¸²à¸£à¸Šà¸µà¹‰ CIFS/SMB à¹€à¸žà¸·à¹ˆà¸à¹à¸Šà¸£à¹Œà¸‚à¹‰à¸à¸¡à¸¹à¸¥à¹„à¸¡à¹ˆà¸ªà¸²à¸¡à¸²à¸£à¸–à¸à¸£à¸°à¸—à¸³à¹„à¸”à¹‰ à¸à¸£à¸¸à¸“à¸²à¸ªà¸à¸šà¸–à¸²à¸¡à¸‚à¹‰à¸à¸¡à¸¹à¸¥à¹€à¸žà¸´à¹ˆà¸¡à¹€à¸•à¸´à¸¡à¸ˆà¸²à¸à¸œà¸¹à¹‰à¸”à¸¹à¹à¸¥à¸£à¸°à¸šà¸šà¹€à¸žà¸·à¹ˆà¸à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡."
 
-#: 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 "<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..eab4fbbbd7e7230319c86b3eeaeba7c1b33602fd 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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 29f0f76aecaf434a2c52e59ca1f686d5def39783..0481d13799a336482036ec26b3c0f5ce1611b834 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-03-08 00:25+0100\n"
-"PO-Revision-Date: 2013-03-07 23:25+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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,12 +17,12 @@ msgstr ""
 "Language: th_TH\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/delete.php:40
+#: ajax/delete.php:42
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
 
-#: ajax/undelete.php:41
+#: ajax/undelete.php:42
 #, php-format
 msgid "Couldn't restore %s"
 msgstr ""
@@ -32,6 +31,10 @@ msgstr ""
 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 ""
@@ -78,4 +81,4 @@ msgstr "à¸¥à¸š"
 
 #: templates/part.breadcrumb.php:9
 msgid "Deleted Files"
-msgstr ""
+msgstr "à¹„à¸Ÿà¸¥à¹Œà¸—à¸µà¹ˆà¸¥à¸šà¸—à¸´à¹‰à¸‡"
diff --git a/l10n/th_TH/files_versions.po b/l10n/th_TH/files_versions.po
index 1abe7bfdb5e7bbec2b871677c1ca8a4d121434a0..2ed8da96a56c760968781e3fb3532b628bc1b752 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:30+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 dbe07fd74279ad8a83065641c1fbb16cb4fd0d15..cbe237999976dc8e34e0a05e2c0a2c4979dd7ca3 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-02-27 14:35+0100\n"
-"PO-Revision-Date: 2013-02-27 13:35+0000\n"
+"POT-Creation-Date: 2013-04-28 01:57+0200\n"
+"PO-Revision-Date: 2013-04-27 23:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
@@ -42,19 +41,19 @@ msgstr "à¹à¸à¸›à¸¯"
 msgid "Admin"
 msgstr "à¸œà¸¹à¹‰à¸”à¸¹à¹à¸¥"
 
-#: files.php:202
+#: files.php:209
 msgid "ZIP download is turned off."
 msgstr "à¸„à¸¸à¸“à¸ªà¸¡à¸šà¸±à¸•à¸´à¸à¸²à¸£à¸”à¸²à¸§à¸™à¹Œà¹‚à¸«à¸¥à¸” zip à¸–à¸¹à¸à¸›à¸´à¸”à¸à¸²à¸£à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¹„à¸§à¹‰"
 
-#: files.php:203
+#: files.php:210
 msgid "Files need to be downloaded one by one."
 msgstr "à¹„à¸Ÿà¸¥à¹Œà¸ªà¸²à¸¡à¸²à¸£à¸–à¸”à¸²à¸§à¸™à¹Œà¹‚à¸«à¸¥à¸”à¹„à¸”à¹‰à¸—à¸µà¸¥à¸°à¸„à¸£à¸±à¹‰à¸‡à¹€à¸—à¹ˆà¸²à¸™à¸±à¹‰à¸™"
 
-#: files.php:204 files.php:231
+#: files.php:211 files.php:244
 msgid "Back to Files"
 msgstr "à¸à¸¥à¸±à¸šà¹„à¸›à¸—à¸µà¹ˆà¹„à¸Ÿà¸¥à¹Œ"
 
-#: files.php:228
+#: files.php:241
 msgid "Selected files too large to generate zip file."
 msgstr "à¹„à¸Ÿà¸¥à¹Œà¸—à¸µà¹ˆà¹€à¸¥à¸·à¸à¸à¸¡à¸µà¸‚à¸™à¸²à¸”à¹ƒà¸«à¸à¹ˆà¹€à¸à¸´à¸™à¸à¸§à¹ˆà¸²à¸—à¸µà¹ˆà¸ˆà¸°à¸ªà¸£à¹‰à¸²à¸‡à¹€à¸›à¹‡à¸™à¹„à¸Ÿà¸¥à¹Œ zip"
 
@@ -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,83 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:128 setup.php:320 setup.php:365
+#: setup.php:132 setup.php:325 setup.php:370
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:129 setup.php:152 setup.php:229
+#: setup.php:133 setup.php:156 setup.php:234
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:151 setup.php:453 setup.php:520
+#: setup.php:155 setup.php:458 setup.php:525
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:228
+#: setup.php:233
 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: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:583 setup.php:592 setup.php:600 setup.php:609
+#: setup.php:615
 #, 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:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
+#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
+#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:299
+#: setup.php:304
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:300
+#: setup.php:305
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:305
+#: setup.php:310
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:306
+#: setup.php:311
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:579 setup.php:611
+#: setup.php:584 setup.php:616
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:631
+#: setup.php:636
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:849
+#: setup.php:858
 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:859
 #, 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 +233,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 01fe7419eb2da602ce94f89fc27dcde51d5c78a7..0c88025491978e8cd51bd82918e0227753cfd625 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-02-27 14:35+0100\n"
-"PO-Revision-Date: 2013-02-27 13:35+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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 ""
 
@@ -95,7 +96,7 @@ msgstr "à¸à¸±à¸žà¹€à¸”à¸—à¹„à¸›à¹€à¸›à¹‡à¸™à¸£à¸¸à¹ˆà¸™ {appversion}"
 msgid "Disable"
 msgstr "à¸›à¸´à¸”à¹ƒà¸Šà¹‰à¸‡à¸²à¸™"
 
-#: js/apps.js:36 js/apps.js:64
+#: js/apps.js:36 js/apps.js:64 js/apps.js:83
 msgid "Enable"
 msgstr "à¹€à¸›à¸´à¸”à¹ƒà¸Šà¹‰à¸‡à¸²à¸™"
 
@@ -103,68 +104,68 @@ msgstr "à¹€à¸›à¸´à¸”à¹ƒà¸Šà¹‰à¸‡à¸²à¸™"
 msgid "Please wait...."
 msgstr "à¸à¸£à¸¸à¸“à¸²à¸£à¸à¸ªà¸±à¸à¸„à¸£à¸¹à¹ˆ..."
 
-#: js/apps.js:84
+#: 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:87
+#: js/apps.js:93
 msgid "Error while updating app"
 msgstr "à¹€à¸à¸´à¸”à¸‚à¹‰à¸à¸œà¸´à¸”à¸žà¸¥à¸²à¸”à¹ƒà¸™à¸£à¸°à¸«à¸§à¹ˆà¸²à¸‡à¸à¸²à¸£à¸à¸±à¸žà¹€à¸”à¸—à¹à¸à¸›à¸¯"
 
-#: js/apps.js:87
-msgid "Error"
-msgstr "à¸‚à¹‰à¸à¸œà¸´à¸”à¸žà¸¥à¸²à¸”"
-
-#: js/apps.js:90
+#: js/apps.js:96
 msgid "Updated"
 msgstr "à¸à¸±à¸žà¹€à¸”à¸—à¹à¸¥à¹‰à¸§"
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
-msgstr "à¸à¸³à¸¥à¸±à¸‡à¸šà¸±à¸™à¸—à¸¶à¸¸à¸à¸‚à¹‰à¸à¸¡à¸¹à¸¥..."
+msgstr "à¸à¸³à¸¥à¸±à¸‡à¸šà¸±à¸™à¸—à¸¶à¸à¸‚à¹‰à¸à¸¡à¸¹à¸¥..."
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "deleted"
 msgstr "à¸¥à¸šà¹à¸¥à¹‰à¸§"
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "undo"
 msgstr "à¹€à¸¥à¸´à¸à¸—à¸³"
 
-#: js/users.js:62
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:75 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
+#: templates/users.php:103
 msgid "Groups"
 msgstr "à¸à¸¥à¸¸à¹ˆà¸¡"
 
-#: js/users.js:78 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr "à¸œà¸¹à¹‰à¸”à¸¹à¹à¸¥à¸à¸¥à¸¸à¹ˆà¸¡"
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "à¸¥à¸š"
 
-#: js/users.js:191
+#: js/users.js:269
 msgid "add group"
 msgstr ""
 
-#: js/users.js:352
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:353 js/users.js:359 js/users.js:374
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:358
+#: js/users.js:426
 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,21 +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:230 templates/personal.php:102
+#: templates/admin.php:228
+msgid "Less"
+msgstr "à¸™à¹‰à¸à¸¢"
+
+#: templates/admin.php:235 templates/personal.php:105
 msgid "Version"
 msgstr "à¸£à¸¸à¹ˆà¸™"
 
-#: templates/admin.php:233 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 "
@@ -394,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:77
 msgid "Password"
 msgstr "à¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™"
 
@@ -418,82 +423,70 @@ msgstr "à¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™à¹ƒà¸«à¸¡à¹ˆ"
 msgid "Change password"
 msgstr "à¹€à¸›à¸¥à¸µà¹ˆà¸¢à¸™à¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™"
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:76
 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 "à¸à¸µà¹€à¸¡à¸¥à¹Œ"
+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 "WebDAV"
 
-#: templates/personal.php:93
+#: templates/personal.php:96
 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:75
 msgid "Login Name"
 msgstr "à¸Šà¸·à¹ˆà¸à¸—à¸µà¹ˆà¹ƒà¸Šà¹‰à¸ªà¸³à¸«à¸£à¸±à¸šà¹€à¸‚à¹‰à¸²à¸ªà¸¹à¹ˆà¸£à¸°à¸šà¸š"
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr "à¸ªà¸£à¹‰à¸²à¸‡"
 
-#: templates/users.php:35
+#: templates/users.php:33
 msgid "Default Storage"
 msgstr "à¸žà¸·à¹‰à¸™à¸—à¸µà¹ˆà¸ˆà¸³à¸à¸±à¸”à¸‚à¹‰à¸à¸¡à¸¹à¸¥à¹€à¸£à¸´à¹ˆà¸¡à¸•à¹‰à¸™"
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:39 templates/users.php:133
 msgid "Unlimited"
 msgstr "à¹„à¸¡à¹ˆà¸ˆà¸³à¸à¸±à¸”à¸ˆà¸³à¸™à¸§à¸™"
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:57 templates/users.php:148
 msgid "Other"
 msgstr "à¸à¸·à¹ˆà¸™à¹†"
 
-#: templates/users.php:84
+#: templates/users.php:82
 msgid "Storage"
 msgstr "à¸žà¸·à¹‰à¸™à¸—à¸µà¹ˆà¸ˆà¸±à¸”à¹€à¸à¹‡à¸šà¸‚à¹‰à¸à¸¡à¸¹à¸¥"
 
-#: templates/users.php:95
+#: templates/users.php:93
 msgid "change display name"
 msgstr "à¹€à¸›à¸¥à¸µà¹ˆà¸¢à¸™à¸Šà¸·à¹ˆà¸à¸—à¸µà¹ˆà¸•à¹‰à¸à¸‡à¸à¸²à¸£à¹ƒà¸«à¹‰à¹à¸ªà¸”à¸‡"
 
-#: templates/users.php:99
+#: templates/users.php:97
 msgid "set new password"
 msgstr "à¸•à¸±à¹‰à¸‡à¸„à¹ˆà¸²à¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™à¹ƒà¸«à¸¡à¹ˆ"
 
-#: templates/users.php:134
+#: templates/users.php:128
 msgid "Default"
 msgstr "à¸„à¹ˆà¸²à¹€à¸£à¸´à¹ˆà¸¡à¸•à¹‰à¸™"
diff --git a/l10n/th_TH/user_ldap.po b/l10n/th_TH/user_ldap.po
index 7a53d8f816ab91c21ea2e62a4318689c1f364cab..ebb8a40aefcceffb792139ba234d8d25eea046ff 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-02 00:03+0100\n"
-"PO-Revision-Date: 2013-03-01 23:04+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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: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 "à¸„à¸¸à¸“à¸ªà¸²à¸¡à¸²à¸£à¸–à¸›à¸¥à¹ˆà¸à¸¢à¸Šà¹ˆà¸à¸‡à¹‚à¸›à¸£à¹‚à¸•à¸„à¸à¸¥à¹€à¸§à¹‰à¸™à¹„à¸§à¹‰à¹„à¸”à¹‰, à¸¢à¸à¹€à¸§à¹‰à¸™à¸à¸£à¸“à¸µà¸—à¸µà¹ˆà¸„à¸¸à¸“à¸•à¹‰à¸à¸‡à¸à¸²à¸£à¹ƒà¸Šà¹‰ SSL à¸ˆà¸²à¸à¸™à¸±à¹‰à¸™à¹€à¸£à¸´à¹ˆà¸¡à¸•à¹‰à¸™à¸”à¹‰à¸§à¸¢ ldaps://"
 
-#: templates/settings.php:26
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "DN à¸à¸²à¸™"
 
-#: templates/settings.php:27
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr "à¸«à¸™à¸¶à¹ˆà¸‡ Base DN à¸•à¹ˆà¸à¸šà¸£à¸£à¸—à¸±à¸”"
 
-#: templates/settings.php:28
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "à¸„à¸¸à¸“à¸ªà¸²à¸¡à¸²à¸£à¸–à¸£à¸°à¸šà¸¸ DN à¸«à¸¥à¸±à¸à¸ªà¸³à¸«à¸£à¸±à¸šà¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¹à¸¥à¸°à¸à¸¥à¸¸à¹ˆà¸¡à¸•à¹ˆà¸²à¸‡à¹†à¹ƒà¸™à¹à¸—à¹‡à¸šà¸‚à¸±à¹‰à¸™à¸ªà¸¹à¸‡à¹„à¸”à¹‰"
 
-#: templates/settings.php:30
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "DN à¸‚à¸à¸‡à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™"
 
-#: 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 "DN à¸‚à¸à¸‡à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸—à¸µà¹ˆà¹€à¸›à¹‡à¸™à¸¥à¸¹à¸à¸„à¹‰à¸²à¸à¸°à¹„à¸£à¸à¹‡à¸•à¸²à¸¡à¸—à¸µà¹ˆà¸œà¸¹à¸à¸à¸¢à¸¹à¹ˆà¸”à¹‰à¸§à¸¢ à¹€à¸Šà¹ˆà¸™ uid=agent, dc=example, dc=com, à¸ªà¸³à¸«à¸£à¸±à¸šà¸à¸²à¸£à¹€à¸‚à¹‰à¸²à¸–à¸¶à¸‡à¹‚à¸”à¸¢à¸šà¸¸à¸„à¸„à¸¥à¸™à¸´à¸£à¸™à¸²à¸¡, à¹ƒà¸«à¹‰à¹€à¸§à¹‰à¸™à¸§à¹ˆà¸²à¸‡ DN à¹à¸¥à¸° à¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™à¹€à¸à¸²à¹„à¸§à¹‰"
 
-#: 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 "à¸ªà¸³à¸«à¸£à¸±à¸šà¸à¸²à¸£à¹€à¸‚à¹‰à¸²à¸–à¸¶à¸‡à¹‚à¸”à¸¢à¸šà¸¸à¸„à¸„à¸¥à¸™à¸´à¸£à¸™à¸²à¸¡ à¹ƒà¸«à¹‰à¹€à¸§à¹‰à¸™à¸§à¹ˆà¸²à¸‡ DN à¹à¸¥à¸°à¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™à¹„à¸§à¹‰"
 
-#: 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 "à¸à¸³à¸«à¸™à¸”à¸•à¸±à¸§à¸à¸£à¸à¸‡à¸‚à¹‰à¸à¸¡à¸¹à¸¥à¸—à¸µà¹ˆà¸•à¹‰à¸à¸‡à¸à¸²à¸£à¸™à¸³à¹„à¸›à¹ƒà¸Šà¹‰à¸‡à¸²à¸™, à¹€à¸¡à¸·à¹ˆà¸à¸¡à¸µà¸„à¸§à¸²à¸¡à¸žà¸¢à¸²à¸¢à¸²à¸¡à¹ƒà¸™à¸à¸²à¸£à¹€à¸‚à¹‰à¸²à¸ªà¸¹à¹ˆà¸£à¸°à¸šà¸š %%uid à¸ˆà¸°à¸–à¸¹à¸à¸™à¸³à¹„à¸›à¹à¸—à¸™à¸—à¸µà¹ˆà¸Šà¸·à¹ˆà¸à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¹ƒà¸™à¸à¸²à¸£à¸à¸£à¸°à¸—à¸³à¸‚à¸à¸‡à¸à¸²à¸£à¹€à¸‚à¹‰à¸²à¸ªà¸¹à¹ˆà¸£à¸°à¸šà¸š"
 
-#: templates/settings.php:41
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "à¹ƒà¸Šà¹‰à¸•à¸±à¸§à¸¢à¸¶à¸” %%uid, à¹€à¸Šà¹ˆà¸™ \"uid=%%uid\""
 
-#: 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 "à¹‚à¸”à¸¢à¹„à¸¡à¹ˆà¸•à¹‰à¸à¸‡à¸¡à¸µà¸•à¸±à¸§à¸¢à¸¶à¸”à¹ƒà¸”à¹†, à¹€à¸Šà¹ˆà¸™ \"objectClass=person\","
 
-#: 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 "à¹‚à¸”à¸¢à¹„à¸¡à¹ˆà¸•à¹‰à¸à¸‡à¸¡à¸µà¸•à¸±à¸§à¸¢à¸¶à¸”à¹ƒà¸”à¹†, à¹€à¸Šà¹ˆà¸™ \"objectClass=posixGroup\","
 
-#: 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 "à¹ƒà¸Šà¹‰ 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 "à¹€à¸‹à¸´à¸£à¹Œà¸Ÿà¹€à¸§à¸à¸£à¹Œ LDAP à¸›à¸£à¸°à¹€à¸ à¸— Case insensitive (à¸§à¸´à¸™à¹‚à¸”à¸§à¸ªà¹Œ)"
 
-#: templates/settings.php:64
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "à¸›à¸´à¸”à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸à¸²à¸£à¸•à¸£à¸§à¸ˆà¸ªà¸à¸šà¸„à¸§à¸²à¸¡à¸–à¸¹à¸à¸•à¹‰à¸à¸‡à¸‚à¸à¸‡à¹ƒà¸šà¸£à¸±à¸šà¸£à¸à¸‡à¸„à¸§à¸²à¸¡à¸›à¸¥à¸à¸”à¸ à¸±à¸¢ SSL"
 
-#: 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 "à¸«à¸²à¸à¸à¸²à¸£à¹€à¸Šà¸·à¹ˆà¸à¸¡à¸•à¹ˆà¸à¸ªà¸²à¸¡à¸²à¸£à¸–à¸—à¸³à¸‡à¸²à¸™à¹„à¸”à¹‰à¹€à¸‰à¸žà¸²à¸°à¸à¸±à¸šà¸•à¸±à¸§à¹€à¸¥à¸·à¸à¸à¸™à¸µà¹‰à¹€à¸—à¹ˆà¸²à¸™à¸±à¹‰à¸™, à¹ƒà¸«à¹‰à¸™à¸³à¹€à¸‚à¹‰à¸²à¸‚à¹‰à¸à¸¡à¸¹à¸¥à¹ƒà¸šà¸£à¸±à¸šà¸£à¸à¸‡à¸„à¸§à¸²à¸¡à¸›à¸¥à¸à¸”à¸ à¸±à¸¢à¹à¸šà¸š SSL à¸‚à¸à¸‡à¹€à¸‹à¸´à¸£à¹Œà¸Ÿà¹€à¸§à¸à¸£à¹Œ LDAP à¸”à¸±à¸‡à¸à¸¥à¹ˆà¸²à¸§à¹€à¸‚à¹‰à¸²à¹„à¸›à¹„à¸§à¹‰à¹ƒà¸™à¹€à¸‹à¸´à¸£à¹Œà¸Ÿà¹€à¸§à¸à¸£à¹Œ ownCloud"
 
-#: 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 "à¸„à¸¸à¸“à¸¥à¸±à¸à¸©à¸“à¸° LDAP à¸—à¸µà¹ˆà¸•à¹‰à¸à¸‡à¸à¸²à¸£à¹ƒà¸Šà¹‰à¸ªà¸³à¸«à¸£à¸±à¸šà¸ªà¸£à¹‰à¸²à¸‡à¸Šà¸·à¹ˆà¸à¸‚à¸à¸‡à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™ ownCloud"
 
-#: templates/settings.php:70
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "à¸£à¸²à¸¢à¸à¸²à¸£à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸«à¸¥à¸±à¸à¹à¸šà¸š Tree"
 
-#: templates/settings.php:70
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr "à¸«à¸™à¸¶à¹ˆà¸‡ User Base DN à¸•à¹ˆà¸à¸šà¸£à¸£à¸—à¸±à¸”"
 
-#: 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 "à¸„à¸¸à¸“à¸¥à¸±à¸à¸©à¸“à¸° LDAP à¸—à¸µà¹ˆà¸•à¹‰à¸à¸‡à¸à¸²à¸£à¹ƒà¸Šà¹‰à¸ªà¸£à¹‰à¸²à¸‡à¸Šà¸·à¹ˆà¸à¸à¸¥à¸¸à¹ˆà¸¡à¸‚à¸à¸‡ ownCloud"
 
-#: templates/settings.php:73
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "à¸£à¸²à¸¢à¸à¸²à¸£à¸à¸¥à¸¸à¹ˆà¸¡à¸«à¸¥à¸±à¸à¹à¸šà¸š Tree"
 
-#: templates/settings.php:73
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr "à¸«à¸™à¸¶à¹ˆà¸‡ Group Base DN à¸•à¹ˆà¸à¸šà¸£à¸£à¸—à¸±à¸”"
 
-#: 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 "à¹€à¸§à¹‰à¸™à¸§à¹ˆà¸²à¸‡à¹„à¸§à¹‰à¸ªà¸³à¸«à¸£à¸±à¸š à¸Šà¸·à¹ˆà¸à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰ (à¸„à¹ˆà¸²à¹€à¸£à¸´à¹ˆà¸¡à¸•à¹‰à¸™) à¸«à¸£à¸·à¸à¹„à¸¡à¹ˆà¸à¸£à¸¸à¸“à¸²à¸£à¸°à¸šà¸¸à¸„à¸¸à¸“à¸¥à¸±à¸à¸©à¸“à¸°à¸‚à¸à¸‡ LDAP/AD"
 
-#: 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/th_TH/user_webdavauth.po b/l10n/th_TH/user_webdavauth.po
index 3493831b2c1f7084a9e3ea50b006b5c15877bea4..5c6623a310acf91a0c74962cea1032e16a6ee543 100644
--- a/l10n/th_TH/user_webdavauth.po
+++ b/l10n/th_TH/user_webdavauth.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-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-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
 "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 eff8470675f6dfab128846e501e69a4b643239fc..6049fb79a27d2a9e177227af0dca9afc2f4ddd06 100644
--- a/l10n/tr/core.po
+++ b/l10n/tr/core.po
@@ -3,44 +3,39 @@
 # 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.
-#   <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-02-22 00:06+0100\n"
-"PO-Revision-Date: 2013-02-20 23:20+0000\n"
-"Last-Translator: atakan96 <tayancatakan@gmail.com>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10: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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: tr\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ajax/share.php:85
+#: ajax/share.php:97
 #, php-format
 msgid "User %s shared a file with you"
 msgstr "%s kullanÄ±cÄ±sÄ± sizinle bir dosyayÄ± paylaÅŸtÄ±"
 
-#: ajax/share.php:87
+#: ajax/share.php:99
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr "%s kullanÄ±cÄ±sÄ± sizinle bir dizini paylaÅŸtÄ±"
 
-#: ajax/share.php:89
+#: ajax/share.php:101
 #, php-format
 msgid ""
 "User %s shared the file \"%s\" with you. It is available for download here: "
 "%s"
 msgstr "%s kullanÄ±cÄ±sÄ± \"%s\" dosyasÄ±nÄ± sizinle paylaÅŸtÄ±. %s adresinden indirilebilir"
 
-#: ajax/share.php:91
+#: ajax/share.php:104
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -86,79 +81,79 @@ msgstr "Silmek iÃ§in bir kategori seÃ§ilmedi"
 msgid "Error removing %s from favorites."
 msgstr "%s favorilere Ã§Ä±karÄ±lÄ±rken hata oluÅŸtu"
 
-#: js/config.php:32
+#: js/config.php:34
 msgid "Sunday"
 msgstr "Pazar"
 
-#: js/config.php:32
+#: js/config.php:35
 msgid "Monday"
 msgstr "Pazartesi"
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Tuesday"
 msgstr "SalÄ±"
 
-#: js/config.php:32
+#: js/config.php:37
 msgid "Wednesday"
 msgstr "Ã‡arÅŸamba"
 
-#: js/config.php:32
+#: js/config.php:38
 msgid "Thursday"
 msgstr "PerÅŸembe"
 
-#: js/config.php:32
+#: js/config.php:39
 msgid "Friday"
 msgstr "Cuma"
 
-#: js/config.php:32
+#: js/config.php:40
 msgid "Saturday"
 msgstr "Cumartesi"
 
-#: js/config.php:33
+#: js/config.php:45
 msgid "January"
 msgstr "Ocak"
 
-#: js/config.php:33
+#: js/config.php:46
 msgid "February"
 msgstr "Åžubat"
 
-#: js/config.php:33
+#: js/config.php:47
 msgid "March"
 msgstr "Mart"
 
-#: js/config.php:33
+#: js/config.php:48
 msgid "April"
 msgstr "Nisan"
 
-#: js/config.php:33
+#: js/config.php:49
 msgid "May"
 msgstr "MayÄ±s"
 
-#: js/config.php:33
+#: js/config.php:50
 msgid "June"
 msgstr "Haziran"
 
-#: js/config.php:33
+#: js/config.php:51
 msgid "July"
 msgstr "Temmuz"
 
-#: js/config.php:33
+#: js/config.php:52
 msgid "August"
 msgstr "AÄŸustos"
 
-#: js/config.php:33
+#: js/config.php:53
 msgid "September"
 msgstr "EylÃ¼l"
 
-#: js/config.php:33
+#: js/config.php:54
 msgid "October"
 msgstr "Ekim"
 
-#: js/config.php:33
+#: js/config.php:55
 msgid "November"
 msgstr "KasÄ±m"
 
-#: js/config.php:33
+#: js/config.php:56
 msgid "December"
 msgstr "AralÄ±k"
 
@@ -166,86 +161,88 @@ msgstr "AralÄ±k"
 msgid "Settings"
 msgstr "Ayarlar"
 
-#: js/js.js:767
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "saniye Ã¶nce"
 
-#: js/js.js:768
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "1 dakika Ã¶nce"
 
-#: js/js.js:769
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr "{minutes} dakika Ã¶nce"
 
-#: js/js.js:770
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr "1 saat Ã¶nce"
 
-#: js/js.js:771
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr "{hours} saat Ã¶nce"
 
-#: js/js.js:772
+#: js/js.js:723
 msgid "today"
 msgstr "bugÃ¼n"
 
-#: js/js.js:773
+#: js/js.js:724
 msgid "yesterday"
 msgstr "dÃ¼n"
 
-#: js/js.js:774
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr "{days} gÃ¼n Ã¶nce"
 
-#: js/js.js:775
+#: js/js.js:726
 msgid "last month"
 msgstr "geÃ§en ay"
 
-#: js/js.js:776
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr "{months} ay Ã¶nce"
 
-#: js/js.js:777
+#: js/js.js:728
 msgid "months ago"
 msgstr "ay Ã¶nce"
 
-#: js/js.js:778
+#: js/js.js:729
 msgid "last year"
 msgstr "geÃ§en yÄ±l"
 
-#: js/js.js:779
+#: js/js.js:730
 msgid "years ago"
 msgstr "yÄ±l Ã¶nce"
 
-#: js/oc-dialogs.js:126
-msgid "Choose"
-msgstr "seÃ§"
+#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
+msgid "Ok"
+msgstr "Tamam"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
 msgid "Cancel"
 msgstr "Ä°ptal"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "HayÄ±r"
+#: js/oc-dialogs.js:185
+msgid "Choose"
+msgstr "seÃ§"
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:215
 msgid "Yes"
 msgstr "Evet"
 
-#: js/oc-dialogs.js:180
-msgid "Ok"
-msgstr "Tamam"
+#: js/oc-dialogs.js:222
+msgid "No"
+msgstr "HayÄ±r"
 
 #: 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 "Nesne tÃ¼rÃ¼ belirtilmemiÅŸ."
 
-#: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:582
-#: js/share.js:594
+#: 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 "Hata"
 
@@ -257,127 +254,127 @@ msgstr "uygulama adÄ± belirtilmedi."
 msgid "The required file {file} is not installed!"
 msgstr "Ä°htiyaÃ§ duyulan {file} dosyasÄ± kurulu deÄŸil."
 
-#: js/share.js:29 js/share.js:43 js/share.js:90
+#: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr "PaylaÅŸÄ±lan"
 
-#: js/share.js:93
+#: js/share.js:90
 msgid "Share"
 msgstr "PaylaÅŸ"
 
-#: js/share.js:141 js/share.js:622
+#: js/share.js:125 js/share.js:617
 msgid "Error while sharing"
 msgstr "PaylaÅŸÄ±m sÄ±rasÄ±nda hata  "
 
-#: js/share.js:152
+#: js/share.js:136
 msgid "Error while unsharing"
 msgstr "PaylaÅŸÄ±m iptal ediliyorken hata"
 
-#: js/share.js:159
+#: js/share.js:143
 msgid "Error while changing permissions"
 msgstr "Ä°zinleri deÄŸiÅŸtirirken hata oluÅŸtu"
 
-#: js/share.js:168
+#: js/share.js:152
 msgid "Shared with you and the group {group} by {owner}"
 msgstr " {owner} tarafÄ±ndan sizinle ve {group} ile paylaÅŸtÄ±rÄ±lmÄ±ÅŸ"
 
-#: js/share.js:170
+#: js/share.js:154
 msgid "Shared with you by {owner}"
 msgstr "{owner} trafÄ±ndan sizinle paylaÅŸtÄ±rÄ±ldÄ±"
 
-#: js/share.js:175
+#: js/share.js:159
 msgid "Share with"
 msgstr "ile PaylaÅŸ"
 
-#: js/share.js:180
+#: js/share.js:164
 msgid "Share with link"
 msgstr "BaÄŸlantÄ± ile paylaÅŸ"
 
-#: js/share.js:183
+#: js/share.js:167
 msgid "Password protect"
 msgstr "Åžifre korunmasÄ±"
 
-#: js/share.js:185 templates/installation.php:44 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Parola"
 
-#: js/share.js:189
+#: js/share.js:173
 msgid "Email link to person"
 msgstr "KiÅŸiye e-posta linki"
 
-#: js/share.js:190
+#: js/share.js:174
 msgid "Send"
 msgstr "GÃ¶nder"
 
-#: js/share.js:194
+#: js/share.js:178
 msgid "Set expiration date"
 msgstr "Son kullanma tarihini ayarla"
 
-#: js/share.js:195
+#: js/share.js:179
 msgid "Expiration date"
 msgstr "Son kullanÄ±m tarihi"
 
-#: js/share.js:227
+#: js/share.js:211
 msgid "Share via email:"
 msgstr "Eposta ile paylaÅŸ"
 
-#: js/share.js:229
+#: js/share.js:213
 msgid "No people found"
 msgstr "KiÅŸi bulunamadÄ±"
 
-#: js/share.js:256
+#: js/share.js:251
 msgid "Resharing is not allowed"
 msgstr "Tekrar paylaÅŸmaya izin verilmiyor"
 
-#: js/share.js:292
+#: js/share.js:287
 msgid "Shared in {item} with {user}"
 msgstr " {item} iÃ§inde  {user} ile paylaÅŸÄ±lanlarlar"
 
-#: js/share.js:313
+#: js/share.js:308
 msgid "Unshare"
 msgstr "PaylaÅŸÄ±lmayan"
 
-#: js/share.js:325
+#: js/share.js:320
 msgid "can edit"
 msgstr "dÃ¼zenleyebilir"
 
-#: js/share.js:327
+#: js/share.js:322
 msgid "access control"
 msgstr "eriÅŸim kontrolÃ¼"
 
-#: js/share.js:330
+#: js/share.js:325
 msgid "create"
 msgstr "oluÅŸtur"
 
-#: js/share.js:333
+#: js/share.js:328
 msgid "update"
 msgstr "gÃ¼ncelle"
 
-#: js/share.js:336
+#: js/share.js:331
 msgid "delete"
 msgstr "sil"
 
-#: js/share.js:339
+#: js/share.js:334
 msgid "share"
 msgstr "paylaÅŸ"
 
-#: js/share.js:373 js/share.js:569
+#: js/share.js:368 js/share.js:564
 msgid "Password protected"
 msgstr "Paralo korumalÄ±"
 
-#: js/share.js:582
+#: js/share.js:577
 msgid "Error unsetting expiration date"
 msgstr "GeÃ§erlilik tarihi tanÄ±mlama kaldÄ±rma hatasÄ±"
 
-#: js/share.js:594
+#: js/share.js:589
 msgid "Error setting expiration date"
 msgstr "GeÃ§erlilik tarihi tanÄ±mlama hatasÄ±"
 
-#: js/share.js:609
+#: js/share.js:604
 msgid "Sending ..."
 msgstr "GÃ¶nderiliyor..."
 
-#: js/share.js:620
+#: js/share.js:615
 msgid "Email sent"
 msgstr "Eposta gÃ¶nderildi"
 
@@ -400,24 +397,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:39
-#: 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"
 
@@ -455,7 +455,7 @@ msgstr "YÃ¶netici"
 
 #: strings.php:9
 msgid "Help"
-msgstr "YardÄ±"
+msgstr "YardÄ±m"
 
 #: templates/403.php:12
 msgid "Access forbidden"
@@ -473,115 +473,130 @@ msgstr "Kategorileri dÃ¼zenle"
 msgid "Add"
 msgstr "Ekle"
 
-#: templates/installation.php:23 templates/installation.php:30
+#: templates/installation.php:24 templates/installation.php:31
+#: templates/installation.php:38
 msgid "Security Warning"
 msgstr "GÃ¼venlik Uyarisi"
 
-#: templates/installation.php:24
+#: templates/installation.php:25
+msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
+msgstr "PHP sÃ¼rÃ¼mÃ¼nÃ¼z NULL Byte saldÄ±rÄ±sÄ±na aÃ§Ä±k (CVE-2006-7243)"
+
+#: templates/installation.php:26
+msgid "Please update your PHP installation to use ownCloud securely."
+msgstr "ownCloud'u gÃ¼venli olarak kullanmak iÃ§in, lÃ¼tfen PHP kurulumunuzu gÃ¼ncelleyin."
+
+#: templates/installation.php:32
 msgid ""
 "No secure random number generator is available, please enable the PHP "
 "OpenSSL extension."
 msgstr "GÃ¼venli rasgele sayÄ± Ã¼reticisi bulunamadÄ±. LÃ¼tfen PHP OpenSSL eklentisini etkinleÅŸtirin."
 
-#: templates/installation.php:25
+#: 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 "GÃ¼venli rasgele sayÄ± Ã¼reticisi olmadan saldÄ±rganlar parola sÄ±fÄ±rlama simgelerini tahmin edip hesabÄ±nÄ±zÄ± ele geÃ§irebilir."
 
-#: templates/installation.php:31
+#: templates/installation.php:39
 msgid ""
 "Your data directory and files are probably accessible from the internet "
 "because the .htaccess file does not work."
 msgstr "Veri klasÃ¶rÃ¼nÃ¼z ve dosyalarÄ±nÄ±z .htaccess dosyasÄ± Ã§alÄ±ÅŸmadÄ±ÄŸÄ± iÃ§in internet'ten eriÅŸime aÃ§Ä±k."
 
-#: templates/installation.php:32
+#: 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 "Server'Ä±nÄ±zÄ± nasÄ±l ayarlayacaÄŸÄ±nÄ±za dair bilgi iÃ§in, lÃ¼tfen bu linki ziyaret edin <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>."
 
-#: templates/installation.php:36
+#: templates/installation.php:44
 msgid "Create an <strong>admin account</strong>"
 msgstr "Bir <strong>yÃ¶netici hesabÄ±</strong> oluÅŸturun"
 
-#: templates/installation.php:52
+#: templates/installation.php:62
 msgid "Advanced"
 msgstr "GeliÅŸmiÅŸ"
 
-#: templates/installation.php:54
+#: templates/installation.php:64
 msgid "Data folder"
 msgstr "Veri klasÃ¶rÃ¼"
 
-#: templates/installation.php:61
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "VeritabanÄ±nÄ± ayarla"
 
-#: templates/installation.php:66 templates/installation.php:77
-#: templates/installation.php:87 templates/installation.php:97
+#: 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:109
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "VeritabanÄ± kullanÄ±cÄ± adÄ±"
 
-#: templates/installation.php:113
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "VeritabanÄ± parolasÄ±"
 
-#: templates/installation.php:117
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "VeritabanÄ± adÄ±"
 
-#: templates/installation.php:125
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "VeritabanÄ± tablo alanÄ±"
 
-#: templates/installation.php:131
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "VeritabanÄ± sunucusu"
 
-#: templates/installation.php:136
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "Kurulumu tamamla"
 
-#: templates/layout.guest.php:33
+#: 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:48
+#: templates/layout.user.php:36
+#, 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:61
 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 e64be58b17acfd6fe0faf40a08a474ceaf915175..7a65c39831a5f03dc8d932e80c6e0324942491ae 100644
--- a/l10n/tr/files.po
+++ b/l10n/tr/files.po
@@ -3,26 +3,19 @@
 # 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.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-04 00:06+0100\n"
-"PO-Revision-Date: 2013-03-03 23:06+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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"
 
 #: ajax/move.php:17
 #, php-format
@@ -34,17 +27,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 +44,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"
@@ -77,59 +66,70 @@ msgstr "Diske yazÄ±lamadÄ±"
 msgid "Not enough storage available"
 msgstr "Yeterli disk alanÄ± yok"
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr "GeÃ§ersiz dizin."
 
-#: appinfo/app.php:10
+#: appinfo/app.php:12
 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:92 templates/index.php:93
+#: 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/files.js:292 js/files.js:408
-#: js/files.js:439
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "Bekliyor"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} zaten mevcut"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "deÄŸiÅŸtir"
 
-#: js/filelist.js:251
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "Ã–neri ad"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "iptal"
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "{new_name} ismi {old_name} ile deÄŸiÅŸtirildi"
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "undo"
 msgstr "geri al"
 
-#: js/filelist.js:323
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr "Silme iÅŸlemini gerÃ§ekleÅŸtir"
 
+#: js/filelist.js:413
+msgid "1 file uploading"
+msgstr "1 dosya yÃ¼klendi"
+
+#: js/filelist.js:416 js/filelist.js:470
+msgid "files uploading"
+msgstr "Dosyalar yÃ¼kleniyor"
+
 #: js/files.js:52
 msgid "'.' is an invalid file name."
 msgstr "'.' geÃ§ersiz dosya adÄ±."
@@ -152,77 +152,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:225
+#: 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:262
+#: 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:262
-msgid "Upload Error"
-msgstr "YÃ¼kleme hatasÄ±"
-
-#: js/files.js:273
-msgid "Close"
-msgstr "Kapat"
-
-#: js/files.js:312
-msgid "1 file uploading"
-msgstr "1 dosya yÃ¼klendi"
-
-#: js/files.js:315 js/files.js:370 js/files.js:385
-msgid "{count} files uploading"
-msgstr "{count} dosya yÃ¼kleniyor"
+#: js/files.js:277
+msgid "Not enough space available"
+msgstr "Yeterli disk alanÄ± yok"
 
-#: js/files.js:388 js/files.js:423
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "YÃ¼kleme iptal edildi."
 
-#: js/files.js:497
+#: 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:570
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "URL boÅŸ olamaz."
 
-#: js/files.js:575
+#: 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:953 templates/index.php:68
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+msgid "Error"
+msgstr "Hata"
+
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
-msgstr "Ad"
+msgstr "Ä°sim"
 
-#: js/files.js:954 templates/index.php:79
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Boyut"
 
-#: js/files.js:955 templates/index.php:81
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "DeÄŸiÅŸtirilme"
 
-#: js/files.js:974
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 dizin"
 
-#: js/files.js:976
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} dizin"
 
-#: js/files.js:984
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 dosya"
 
-#: js/files.js:986
+#: 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 ""
+
+#: 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"
@@ -275,45 +275,45 @@ msgstr "KlasÃ¶r"
 msgid "From link"
 msgstr "BaÄŸlantÄ±dan"
 
-#: templates/index.php:40
+#: templates/index.php:42
 msgid "Deleted files"
 msgstr "Dosyalar silindi"
 
-#: templates/index.php:46
+#: templates/index.php:48
 msgid "Cancel upload"
 msgstr "YÃ¼klemeyi iptal et"
 
-#: templates/index.php:53
+#: templates/index.php:54
 msgid "You donâ€™t have write permissions here."
-msgstr ""
+msgstr "Buraya eriÅŸim hakkÄ±nÄ±z yok."
 
-#: templates/index.php:60
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Burada hiÃ§bir ÅŸey yok. BirÅŸeyler yÃ¼kleyin!"
 
-#: templates/index.php:74
+#: templates/index.php:75
 msgid "Download"
 msgstr "Ä°ndir"
 
-#: templates/index.php:86 templates/index.php:87
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "PaylaÅŸÄ±lmayan"
 
-#: templates/index.php:106
+#: 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:108
+#: 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:113
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Dosyalar taranÄ±yor, lÃ¼tfen bekleyin."
 
-#: templates/index.php:116
+#: 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..e97475fd9716421a0ffcf4cc63f6ddfa2e0a0d79 100644
--- a/l10n/tr/files_encryption.po
+++ b/l10n/tr/files_encryption.po
@@ -3,21 +3,19 @@
 # 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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
 msgid "Encryption"
diff --git a/l10n/tr/files_external.po b/l10n/tr/files_external.po
index 79063bc1eda3c307039fd9e16d9ffca5466cc9a8..b3199728fd94696dc2f11776bf512d32db581a99 100644
--- a/l10n/tr/files_external.po
+++ b/l10n/tr/files_external.po
@@ -3,21 +3,19 @@
 # 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-03-01 00:05+0100\n"
-"PO-Revision-Date: 2013-02-27 23:20+0000\n"
+"POT-Creation-Date: 2013-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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"
 
 #: js/dropbox.js:7 js/dropbox.js:28 js/google.js:16 js/google.js:34
 msgid "Access granted"
@@ -25,7 +23,7 @@ msgstr "GiriÅŸ kabul edildi"
 
 #: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
 msgid "Error configuring Dropbox storage"
-msgstr ""
+msgstr "Dropbox depo yapÄ±landÄ±rma hatasÄ±"
 
 #: js/dropbox.js:65 js/google.js:66
 msgid "Grant access"
@@ -37,20 +35,27 @@ msgstr "LÃ¼tfen Dropbox app key ve secret temin ediniz"
 
 #: js/google.js:36 js/google.js:93
 msgid "Error configuring Google Drive storage"
-msgstr ""
+msgstr "Google Drive depo yapÄ±landÄ±rma hatasÄ±"
 
-#: 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 ""
+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: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 ""
+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"
@@ -62,7 +67,7 @@ msgstr "Dizin ismi"
 
 #: templates/settings.php:10
 msgid "External storage"
-msgstr ""
+msgstr "Harici Depolama"
 
 #: templates/settings.php:11
 msgid "Configuration"
@@ -78,7 +83,7 @@ msgstr "Uygulanabilir"
 
 #: templates/settings.php:33
 msgid "Add storage"
-msgstr ""
+msgstr "Depo ekle"
 
 #: templates/settings.php:90
 msgid "None set"
diff --git a/l10n/tr/files_sharing.po b/l10n/tr/files_sharing.po
index 5cef16c9263ce487a529447680b4dafc2c6e54cc..58a33bd65a14158e9182b4ecfb9e91336af1cd97 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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 02db6edc713e3b21e85f43b0dac809abb9198d9b..ff3ae0eaacea2a513bda0c160eec9c0f0285cf05 100644
--- a/l10n/tr/files_trashbin.po
+++ b/l10n/tr/files_trashbin.po
@@ -3,27 +3,26 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# 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-08 00:25+0100\n"
-"PO-Revision-Date: 2013-03-07 23:25+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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"
 
-#: ajax/delete.php:40
+#: ajax/delete.php:42
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "%s KalÄ±cÄ± olarak silinemedi"
 
-#: ajax/undelete.php:41
+#: ajax/undelete.php:42
 #, php-format
 msgid "Couldn't restore %s"
 msgstr "%s Geri yÃ¼klenemedi"
@@ -32,6 +31,10 @@ msgstr "%s Geri yÃ¼klenemedi"
 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
+msgid "Error"
+msgstr "Hata"
+
 #: js/trash.js:34
 msgid "delete file permanently"
 msgstr "DosyayÄ± kalÄ±cÄ± olarak sil"
@@ -78,4 +81,4 @@ msgstr "Sil"
 
 #: templates/part.breadcrumb.php:9
 msgid "Deleted Files"
-msgstr ""
+msgstr "Silinen Dosyalar"
diff --git a/l10n/tr/files_versions.po b/l10n/tr/files_versions.po
index 3dd6bcc23bf994eeb5867c944eb62d31586f43a3..191e24b1a3a883cee09eb74ebecc53d2f2431e84 100644
--- a/l10n/tr/files_versions.po
+++ b/l10n/tr/files_versions.po
@@ -3,21 +3,19 @@
 # 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-03-01 00:05+0100\n"
-"PO-Revision-Date: 2013-02-27 23:20+0000\n"
+"POT-Creation-Date: 2013-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:30+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"
 
 #: ajax/rollbackVersion.php:15
 #, php-format
@@ -42,11 +40,11 @@ msgstr "hata"
 msgid "File %s could not be reverted to version %s"
 msgstr "Dosya %s, %s versiyonuna dÃ¶ndÃ¼rÃ¼lemedi."
 
-#: history.php:68
+#: history.php:69
 msgid "No old versions available"
 msgstr "Eski versiyonlar mevcut deÄŸil."
 
-#: history.php:73
+#: history.php:74
 msgid "No path specified"
 msgstr "Yama belirtilmemiÅŸ"
 
@@ -56,4 +54,4 @@ msgstr "SÃ¼rÃ¼mler"
 
 #: templates/history.php:20
 msgid "Revert a file to a previous version by clicking on its revert button"
-msgstr ""
+msgstr "DosyanÄ±n Ã¶nceki sÃ¼rÃ¼mÃ¼ne geri dÃ¶nmek iÃ§in, deÄŸiÅŸiklikleri geri al butonuna tÄ±klayÄ±n"
diff --git a/l10n/tr/lib.po b/l10n/tr/lib.po
index d11aba5798cc1a48f0d3b325994289720a86fee4..851ae213cc827bb85a524f42deab0d69cd214f2d 100644
--- a/l10n/tr/lib.po
+++ b/l10n/tr/lib.po
@@ -3,25 +3,24 @@
 # 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-02-27 14:35+0100\n"
-"PO-Revision-Date: 2013-02-27 13:35+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-04 01:59+0200\n"
+"PO-Revision-Date: 2013-05-03 12:40+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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: tr\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: app.php:349
 msgid "Help"
-msgstr "YardÄ±"
+msgstr "YardÄ±m"
 
 #: app.php:362
 msgid "Personal"
@@ -43,19 +42,19 @@ msgstr "Uygulamalar"
 msgid "Admin"
 msgstr "YÃ¶netici"
 
-#: files.php:202
+#: files.php:207
 msgid "ZIP download is turned off."
 msgstr "ZIP indirmeleri kapatÄ±lmÄ±ÅŸtÄ±r."
 
-#: files.php:203
+#: files.php:208
 msgid "Files need to be downloaded one by one."
 msgstr "DosyalarÄ±n birer birer indirilmesi gerekmektedir."
 
-#: files.php:204 files.php:231
+#: files.php:209 files.php:242
 msgid "Back to Files"
 msgstr "Dosyalara dÃ¶n"
 
-#: files.php:228
+#: files.php:239
 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."
 
@@ -89,105 +88,101 @@ 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:128 setup.php:320 setup.php:365
+#: setup.php:132 setup.php:325 setup.php:370
 msgid "PostgreSQL username and/or password not valid"
-msgstr ""
+msgstr "PostgreSQL adi kullanici ve/veya parola yasal degildir. "
 
-#: setup.php:129 setup.php:152 setup.php:229
+#: setup.php:133 setup.php:156 setup.php:234
 msgid "You need to enter either an existing account or the administrator."
-msgstr ""
+msgstr "Bir konto veya kullanici birlemek ihtiyacin. "
 
-#: setup.php:151 setup.php:453 setup.php:520
+#: setup.php:155 setup.php:458 setup.php:525
 msgid "Oracle username and/or password not valid"
-msgstr ""
+msgstr "Adi klullanici ve/veya parola Oracle mantikli deÄŸildir. "
 
-#: setup.php:228
+#: setup.php:233
 msgid "MySQL username and/or password not valid"
-msgstr ""
+msgstr "MySQL kullanÄ±cÄ± adÄ± ve/veya parolasÄ± geÃ§erli deÄŸil"
 
-#: 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: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:583 setup.php:592 setup.php:600 setup.php:609
+#: setup.php:615
 #, php-format
 msgid "DB Error: \"%s\""
-msgstr ""
+msgstr "DB Hata: ''%s''"
 
-#: 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:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
+#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
+#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
 #, php-format
 msgid "Offending command was: \"%s\""
-msgstr ""
+msgstr "Komut rahasiz ''%s''. "
 
-#: setup.php:299
+#: setup.php:304
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
-msgstr ""
+msgstr "MySQL kullanici '%s @local host zatan var. "
 
-#: setup.php:300
+#: setup.php:305
 msgid "Drop this user from MySQL"
-msgstr ""
+msgstr "Bu kullanici MySQLden list disari koymak. "
 
-#: setup.php:305
+#: setup.php:310
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
-msgstr ""
+msgstr "MySQL kullanici '%s @ % % zaten var (zaten yazili)"
 
-#: setup.php:306
+#: setup.php:311
 msgid "Drop this user from MySQL."
-msgstr ""
+msgstr "Bu kulanÄ±cÄ±yÄ± MySQL veritabanÄ±ndan kaldÄ±r"
 
-#: setup.php:579 setup.php:611
+#: setup.php:584 setup.php:616
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
-msgstr ""
+msgstr "HatalÄ± komut: \"%s\", ad: %s, parola: %s"
 
-#: setup.php:631
+#: setup.php:636
 #, 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:849
+#: setup.php:858
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
-msgstr ""
+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:850
+#: setup.php:859
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr ""
+msgstr "LÃ¼tfen <a href='%s'>kurulum kÄ±lavuzlarÄ±nÄ±</a> iki kez kontrol edin."
 
 #: template.php:113
 msgid "seconds ago"
@@ -241,19 +236,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 43a285d6b95bb68bdddbbccb948ad3df1ef89fa4..2734559427e14cb8c3802bf1d893976f9330fe3c 100644
--- a/l10n/tr/settings.po
+++ b/l10n/tr/settings.po
@@ -3,35 +3,35 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Aranel Surion <aranel@aranelsurion.org>, 2011-2013.
-# Emre  <emresaracoglu@live.com>, 2012.
-#   <info@beyboo.de>, 2012.
-# 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-02-27 14:35+0100\n"
-"PO-Revision-Date: 2013-02-27 13:35+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: tr\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: ajax/apps/ocs.php:20
 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"
 
@@ -97,78 +97,78 @@ msgstr "{appversion} GÃ¼ncelle"
 msgid "Disable"
 msgstr "Etkin deÄŸil"
 
-#: js/apps.js:36 js/apps.js:64
+#: 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...."
 msgstr "LÃ¼tfen bekleyin...."
 
-#: js/apps.js:84
+#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+msgid "Error"
+msgstr "Hata"
+
+#: js/apps.js:90
 msgid "Updating...."
 msgstr "GÃ¼ncelleniyor...."
 
-#: js/apps.js:87
+#: js/apps.js:93
 msgid "Error while updating app"
 msgstr "Uygulama gÃ¼ncellenirken hata"
 
-#: js/apps.js:87
-msgid "Error"
-msgstr "Hata"
-
-#: js/apps.js:90
+#: js/apps.js:96
 msgid "Updated"
 msgstr "GÃ¼ncellendi"
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr "Kaydediliyor..."
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "deleted"
 msgstr "silindi"
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "undo"
 msgstr "geri al"
 
-#: js/users.js:62
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr "KullanÄ±cÄ± kaldÄ±rÄ±lamÄ±yor"
 
-#: js/users.js:75 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
+#: templates/users.php:103
 msgid "Groups"
 msgstr "Gruplar"
 
-#: js/users.js:78 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr "YÃ¶netici Grubu "
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "Sil"
 
-#: js/users.js:191
+#: js/users.js:269
 msgid "add group"
 msgstr "grup ekle"
 
-#: js/users.js:352
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr "GeÃ§erli bir kullanÄ±cÄ± adÄ± mutlaka saÄŸlanmalÄ±"
 
-#: js/users.js:353 js/users.js:359 js/users.js:374
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr "KullanÄ±cÄ± oluÅŸturulurken hata"
 
-#: js/users.js:358
+#: js/users.js:426
 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 "__dil_adÄ±__"
+msgstr "TÃ¼rkÃ§e"
 
 #: templates/admin.php:15
 msgid "Security Warning"
@@ -191,12 +191,12 @@ msgstr "Kurulum UyarÄ±sÄ±"
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
-msgstr ""
+msgstr "Web sunucunuz dosya transferi iÃ§in dÃ¼zgÃ¼n bir ÅŸekilde yapÄ±landÄ±rÄ±lmamÄ±ÅŸ. WevDAV arabirimini sorunlu gÃ¶zÃ¼kÃ¼yor."
 
 #: templates/admin.php:33
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr ""
+msgstr "LÃ¼tfen <a href='%s'>kurulum kÄ±lavuzlarÄ±nÄ±</a> iki kez kontrol edin."
 
 #: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
@@ -206,11 +206,11 @@ msgstr "ModÃ¼l 'fileinfo' kayÄ±p"
 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 modÃ¼lÃ¼ 'fileinfo' kayÄ±p. MIME-tip tanÄ±ma ile en iyi sonuÃ§larÄ± elde etmek iÃ§in bu modÃ¼lÃ¼ etkinleÅŸtirmenizi Ã¶neririz."
 
 #: templates/admin.php:58
 msgid "Locale not working"
-msgstr ""
+msgstr "Locale Ã§alÄ±ÅŸmÄ±yor."
 
 #: templates/admin.php:63
 #, php-format
@@ -218,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 "Bu ownCloud sunucusu sistem yerelini %s olarak deÄŸiÅŸtiremedi. Bu, dosya adlarÄ±ndaki bazÄ± karakterler ile sorun yaÅŸanabileceÄŸi anlamÄ±na gelir. %s yerelini desteklemek iÃ§in gerekli paketleri kurmanÄ±zÄ± ÅŸiddetle Ã¶neririz."
 
 #: templates/admin.php:75
 msgid "Internet connection not working"
-msgstr ""
+msgstr "Ä°nternet baÄŸlantÄ±sÄ± Ã§alÄ±ÅŸmÄ±yor"
 
 #: templates/admin.php:78
 msgid ""
@@ -232,47 +232,47 @@ 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 sunucusunun internet baÄŸlantÄ±sÄ± yok. Bu nedenle harici depolama baÄŸlantÄ±sÄ±, gÃ¼ncelleÅŸtirme bildirimleri veya 3. parti uygulama kurma gibi bazÄ± Ã¶zellikler Ã§alÄ±ÅŸmayacaktÄ±r. Uzak dosyalara eriÅŸim ve e-posta ile bildirim gÃ¶nderme Ã§alÄ±ÅŸmayacak. EÄŸer ownCloud tÃ¼m Ã¶zelliklerini kullanmak istiyorsanÄ±z, internet baÄŸlantÄ±sÄ± gerekmektedir."
 
 #: templates/admin.php:92
 msgid "Cron"
-msgstr ""
+msgstr "Cron"
 
 #: templates/admin.php:101
 msgid "Execute one task with each page loaded"
-msgstr ""
+msgstr "YÃ¼klenen her sayfa ile bir gÃ¶rev Ã§alÄ±ÅŸtÄ±r"
 
 #: 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 bir webcron hizmetinde kaydedilir. Owncloud kÃ¶kÃ¼ndeki cron.php sayfasÄ±nÄ± http Ã¼zerinden dakikada bir Ã§aÄŸÄ±r."
 
 #: 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 "Sistemin cron hizmetini kullan. Bir sistem cronjob'Ä± ile owncloud klasÃ¶rÃ¼ndeki cron.php dosyasÄ±nÄ± dakikada bir Ã§aÄŸÄ±r."
 
 #: templates/admin.php:128
 msgid "Sharing"
-msgstr ""
+msgstr "PaylaÅŸÄ±m"
 
 #: templates/admin.php:134
 msgid "Enable Share API"
-msgstr ""
+msgstr "PaylaÅŸÄ±m API'sini etkinleÅŸtir."
 
 #: templates/admin.php:135
 msgid "Allow apps to use the Share API"
-msgstr ""
+msgstr "UygulamalarÄ±n paylaÅŸÄ±m API'sini kullanmasÄ±na izin ver"
 
 #: templates/admin.php:142
 msgid "Allow links"
-msgstr ""
+msgstr "BaÄŸlantÄ±larÄ± izin ver."
 
 #: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
-msgstr ""
+msgstr "KullanÄ±cÄ±larÄ±n nesneleri paylaÅŸÄ±mÄ± iÃ§in herkese aÃ§Ä±k baÄŸlantÄ±lara izin ver"
 
 #: templates/admin.php:150
 msgid "Allow resharing"
@@ -280,15 +280,15 @@ msgstr "PaylaÅŸÄ±ma izin ver"
 
 #: templates/admin.php:151
 msgid "Allow users to share items shared with them again"
-msgstr ""
+msgstr "KullanÄ±cÄ±larÄ±n kendileri ile paylaÅŸÄ±lan Ã¶ÄŸeleri yeniden paylaÅŸmasÄ±na izin ver"
 
 #: templates/admin.php:158
 msgid "Allow users to share with anyone"
-msgstr ""
+msgstr "KullanÄ±cÄ±larÄ±n herÅŸeyi paylaÅŸmalarÄ±na izin ver"
 
 #: templates/admin.php:161
 msgid "Allow users to only share with users in their groups"
-msgstr ""
+msgstr "KullanÄ±cÄ±larÄ±n sadece kendi gruplarÄ±ndaki kullanÄ±cÄ±larla paylaÅŸmasÄ±na izin ver"
 
 #: templates/admin.php:168
 msgid "Security"
@@ -296,18 +296,18 @@ msgstr "GÃ¼venlik"
 
 #: templates/admin.php:181
 msgid "Enforce HTTPS"
-msgstr ""
+msgstr "HTTPS baÄŸlantÄ±sÄ±na zorla"
 
 #: templates/admin.php:182
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
-msgstr ""
+msgstr "Ä°stemcileri ownCloud'a ÅŸifreli bir baÄŸlantÄ± ile baÄŸlanmaya zorlar."
 
 #: templates/admin.php:185
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
-msgstr ""
+msgstr "SSL zorlamasÄ±nÄ± etkinleÅŸtirmek ya da devre dÄ±ÅŸÄ± bÄ±rakmak iÃ§in lÃ¼tfen bu ownCloud Ã¶rneÄŸine HTTPS ile baÄŸlanÄ±n."
 
 #: templates/admin.php:195
 msgid "Log"
@@ -315,17 +315,21 @@ msgstr "KayÄ±tlar"
 
 #: templates/admin.php:196
 msgid "Log level"
-msgstr ""
+msgstr "GÃ¼nlÃ¼k seviyesi"
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
 msgstr "Daha fazla"
 
-#: templates/admin.php:230 templates/personal.php:102
+#: templates/admin.php:228
+msgid "Less"
+msgstr "Az"
+
+#: templates/admin.php:235 templates/personal.php:105
 msgid "Version"
 msgstr "SÃ¼rÃ¼m"
 
-#: templates/admin.php:233 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 "
@@ -386,7 +390,7 @@ msgstr "Ticari Destek"
 #: templates/personal.php:8
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr ""
+msgstr "KullandÄ±ÄŸÄ±nÄ±z:<strong>%s</strong> seÃ§ilebilecekler: <strong>%s</strong>"
 
 #: templates/personal.php:15
 msgid "Get the apps to sync your files"
@@ -396,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:77
 msgid "Password"
 msgstr "Parola"
 
@@ -420,82 +424,70 @@ 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:76
 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:68
 msgid "Email"
 msgstr "Eposta"
 
-#: templates/personal.php:72
+#: templates/personal.php:70
 msgid "Your email address"
 msgstr "Eposta adresiniz"
 
-#: templates/personal.php:73
+#: templates/personal.php:71
 msgid "Fill in an email address to enable password recovery"
-msgstr "Parola sÄ±fÄ±rlamayÄ± aktifleÅŸtirmek iÃ§in eposta adresi girin"
+msgstr "Parola kurtarmayÄ± etkinleÅŸtirmek iÃ§in bir eposta adresi girin"
 
-#: templates/personal.php:79 templates/personal.php:80
+#: templates/personal.php:77 templates/personal.php:78
 msgid "Language"
 msgstr "Dil"
 
-#: templates/personal.php:86
+#: templates/personal.php:89
 msgid "Help translate"
 msgstr "Ã‡evirilere yardÄ±m edin"
 
-#: templates/personal.php:91
+#: templates/personal.php:94
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:93
+#: templates/personal.php:96
 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:75
 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:33
 msgid "Default Storage"
 msgstr "VarsayÄ±lan Depolama"
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:39 templates/users.php:133
 msgid "Unlimited"
 msgstr "Limitsiz"
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:57 templates/users.php:148
 msgid "Other"
 msgstr "DiÄŸer"
 
-#: templates/users.php:84
+#: templates/users.php:82
 msgid "Storage"
 msgstr "Depolama"
 
-#: templates/users.php:95
+#: templates/users.php:93
 msgid "change display name"
 msgstr "ekran adÄ±nÄ± deÄŸiÅŸtir"
 
-#: templates/users.php:99
+#: templates/users.php:97
 msgid "set new password"
 msgstr "yeni parola belirle"
 
-#: templates/users.php:134
+#: templates/users.php:128
 msgid "Default"
 msgstr "VarsayÄ±lan"
diff --git a/l10n/tr/user_ldap.po b/l10n/tr/user_ldap.po
index 3fd47b502e2a451c506e21c4c3bfd7ec4bd2a44b..576140cd3189355e5c8ff57a8c8e65f6ec3698c8 100644
--- a/l10n/tr/user_ldap.po
+++ b/l10n/tr/user_ldap.po
@@ -3,41 +3,44 @@
 # 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.
+# 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-02 00:03+0100\n"
-"PO-Revision-Date: 2013-03-01 23:04+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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"
+
+#: 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 uyunlama basarmadi "
 
 #: ajax/testConfiguration.php:36
 msgid "The configuration is valid and the connection could be established!"
-msgstr ""
+msgstr "Uyunlama mantikli ve baglama yerlestirmek edebilmi."
 
 #: ajax/testConfiguration.php:39
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
-msgstr ""
+msgstr "Uyunlama gecerli, fakat Baglama yapamadi. Lutfen kontrol yapmak, eger bu iyi yerlertirdi. "
 
 #: ajax/testConfiguration.php:43
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
-msgstr ""
+msgstr "Uyunma mantikli degil. Lutfen log daha kontrol yapmak. "
 
 #: js/settings.js:66
 msgid "Deletion failed"
@@ -45,7 +48,7 @@ msgstr "Silme baÅŸarÄ±sÄ±z oldu"
 
 #: js/settings.js:82
 msgid "Take over settings from recent server configuration?"
-msgstr ""
+msgstr "Parametri sonadan uyunlama cikarmak mi?"
 
 #: js/settings.js:83
 msgid "Keep settings?"
@@ -53,283 +56,365 @@ msgstr "AyarlarÄ± kalsÄ±nmÄ±?"
 
 #: js/settings.js:97
 msgid "Cannot add server configuration"
+msgstr "Sunucu uyunlama birlemek edemen. "
+
+#: 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 "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 "Hakikatten, Sonuncu Funksyon durmak istiyor mi?"
 
-#: 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:18
+#: templates/settings.php:32
 msgid "Add Server Configuration"
-msgstr ""
+msgstr "Sunucu Uyunlama birlemek "
 
-#: templates/settings.php:23
+#: templates/settings.php:37
 msgid "Host"
 msgstr "Sunucu"
 
-#: templates/settings.php:25
+#: 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:26
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "Ana DN"
 
-#: templates/settings.php:27
+#: templates/settings.php:41
 msgid "One Base DN per line"
-msgstr ""
+msgstr "Bir Tabani DN herbir dizi. "
 
-#: templates/settings.php:28
+#: 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:30
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "KullanÄ±cÄ± DN"
 
-#: 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 ""
+msgstr "DN musterinin, kimle baglamaya yapacagiz,meselÃ¢ uid=agent.dc mesela, dc=com Gecinme adisiz ici, DN  ve Parola bos birakmak. "
 
-#: templates/settings.php:33
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Parola"
 
-#: templates/settings.php:36
+#: 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:37
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "KullanÄ±cÄ± Oturum Filtresi"
 
-#: 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 ""
+msgstr "Filter uyunlamak icin tayin ediyor, ne zaman giriÅŸmek isteminiz. % % uid adi kullanici girismeye karsi koymacak. "
 
-#: templates/settings.php:41
+#: 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:42
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "KullanÄ±cÄ± Liste Filtresi"
 
-#: templates/settings.php:45
+#: 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:46
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "bir yer tutucusu olmadan, Ã¶rneÄŸin \"objectClass=person\""
 
-#: templates/settings.php:47
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "Grup SÃ¼zgeci"
 
-#: templates/settings.php:50
+#: 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:51
+#: 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:55
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr "BaÄŸlantÄ± ayarlarÄ±"
 
-#: 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 ""
+msgstr "Ne zaman iptal, bu uynnlama isletici "
 
-#: templates/settings.php:58
+#: templates/settings.php:72
 msgid "Port"
 msgstr "Port"
 
-#: templates/settings.php:59
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
-msgstr ""
+msgstr "Sigorta Kopya Cephe "
 
-#: 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 ""
+msgstr "Bir kopya cevre vermek, kopya sunucu onemli olmali. "
 
-#: templates/settings.php:60
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
-msgstr ""
+msgstr "Kopya Port "
 
-#: templates/settings.php:61
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr "Ana sunucuyu devredÄ±ÅŸÄ± birak"
 
-#: templates/settings.php:61
+#: 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:62
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "TLS kullan"
 
-#: templates/settings.php:62
+#: 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:63
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
-msgstr ""
+msgstr "Dusme sunucu LDAP zor degil. (Windows)"
 
-#: templates/settings.php:64
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "SSL sertifika doÄŸrulamasÄ±nÄ± kapat."
 
-#: 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 ""
+msgstr "Bagladiginda, bunla secene sadece calisiyor, sunucu LDAP SSL sunucun ithal etemek, dneyme sizine sunucu ownClouden. "
 
-#: templates/settings.php:64
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "Ã–nerilmez, sadece test iÃ§in kullanÄ±n."
 
-#: templates/settings.php:65
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
-msgstr ""
+msgstr "Cache Time-To-Live "
 
-#: templates/settings.php:65
+#: 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:67
+#: templates/settings.php:81
 msgid "Directory Settings"
-msgstr ""
+msgstr "Parametrar Listesin Adresinin "
 
-#: templates/settings.php:69
+#: templates/settings.php:83
 msgid "User Display Name Field"
-msgstr ""
+msgstr "Ekran Adi Kullanici, (Alan Adi Kullanici Ekrane)"
 
-#: templates/settings.php:69
+#: 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:70
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "Temel KullanÄ±cÄ± AÄŸacÄ±"
 
-#: templates/settings.php:70
+#: templates/settings.php:84
 msgid "One User Base DN per line"
-msgstr ""
+msgstr "Bir Temel Kullanici DN her dizgi "
 
-#: templates/settings.php:71
+#: templates/settings.php:85
 msgid "User Search Attributes"
-msgstr ""
+msgstr "Kategorii Arama Kullanici "
 
-#: 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 ""
+msgstr "Grub Ekrane Alani Adi"
 
-#: templates/settings.php:72
+#: 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:73
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "Temel Grup AÄŸacÄ±"
 
-#: templates/settings.php:73
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
-msgstr ""
+msgstr "Bir Grubu Tabani DN her dizgi. "
 
-#: templates/settings.php:74
+#: templates/settings.php:88
 msgid "Group Search Attributes"
-msgstr ""
+msgstr "Kategorii Arama Grubu"
 
-#: templates/settings.php:75
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr "Grup-Ãœye iÅŸbirliÄŸi"
 
-#: 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 "byte cinsinden"
 
-#: 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 "KullanÄ±cÄ± adÄ± bÃ¶lÃ¼mÃ¼nÃ¼ boÅŸ bÄ±rakÄ±n (varsayÄ±lan). "
 
-#: 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 "YardÄ±m"
diff --git a/l10n/tr/user_webdavauth.po b/l10n/tr/user_webdavauth.po
index f5f060e198ce141eeb8eb7f42abaf3f0d89718e5..a5b58c7648ffdb4430fc17e9c4266938c6ee5337 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-04-23 01:58+0200\n"
+"PO-Revision-Date: 2013-04-22 20:10+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..4642a6e1a20ec1fe3a01c0c296bb3aa0a5069ac4
--- /dev/null
+++ b/l10n/ug/core.po
@@ -0,0 +1,613 @@
+# 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-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10: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/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 js/oc-dialogs.js:247
+msgid "Ok"
+msgstr "Ø¬Û•Ø²Ù…Ù„Û•"
+
+#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+msgid "Cancel"
+msgstr "Û‹Ø§Ø² ÙƒÛ•Ú†"
+
+#: js/oc-dialogs.js:185
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:215
+msgid "Yes"
+msgstr "Ú¾Û•Ø¦Û•"
+
+#: js/oc-dialogs.js:222
+msgid "No"
+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: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/ug/files.po b/l10n/ug/files.po
new file mode 100644
index 0000000000000000000000000000000000000000..f69fcf0815452ef69e306ef1192b8373ae7b56c1
--- /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-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10: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/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..ce1f593333f4b9fc39e65dea1a37b2a9acba24ae
--- /dev/null
+++ b/l10n/ug/files_encryption.po
@@ -0,0 +1,38 @@
+# 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-12 02:01+0200\n"
+"PO-Revision-Date: 2013-05-04 12:10+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-personal.php:4 templates/settings.php:5
+msgid "Encryption"
+msgstr "Ø´Ù‰ÙÙ‰Ø±Ù„Ø§Ø´"
+
+#: templates/settings-personal.php:7
+msgid "File encryption is enabled."
+msgstr "Ú¾Û†Ø¬Ø¬Û•Øª Ø´Ù‰ÙÙ‰Ø±Ù„Ø§Ø´ Ù‚ÙˆØ²ØºÙ‰ØªÙ‰Ù„Ø¯Ù‰."
+
+#: templates/settings-personal.php:11
+msgid "The following file types will not be encrypted:"
+msgstr "ØªÛ†Û‹Û•Ù†Ø¯Ù‰ÙƒÙ‰ Ú¾Û†Ø¬Ø¬Û•Øª ØªÙ‰Ù¾Ù„Ù‰Ø±Ù‰ Ø´Ù‰ÙÙ‰Ø±Ù„Ø§Ù†Ù…Ø§ÙŠØ¯Û‡:"
+
+#: templates/settings.php:7
+msgid "Exclude the following file types from encryption:"
+msgstr "ØªÛ†Û‹Û•Ù†Ø¯Ù‰ÙƒÙ‰ Ú¾Û†Ø¬Ø¬Û•Øª ØªÙ‰Ù¾Ù„Ù‰Ø±Ù‰ Ø´Ù‰ÙÙ‰Ø±Ù„Ø§Ø´Ù†Ù‰Ú Ø³Ù‰Ø±ØªÙ‰Ø¯Ø§:"
+
+#: templates/settings.php:12
+msgid "None"
+msgstr "ÙŠÙˆÙ‚"
diff --git a/l10n/ug/files_external.po b/l10n/ug/files_external.po
new file mode 100644
index 0000000000000000000000000000000000000000..1da94038c56cf265b4e163cd8124ea66050cb738
--- /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-05-12 02:01+0200\n"
+"PO-Revision-Date: 2013-05-04 11:50+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..85d88c618198534de485d7f25bdbe15ca6bba813
--- /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-05-12 02:01+0200\n"
+"PO-Revision-Date: 2013-05-08 15:21+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..d9d8571860c424345f646dea8af737ab5cdcb40a
--- /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-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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: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 "1 Ù‚Ù‰Ø³Ù‚Û‡Ú†"
+
+#: js/trash.js:186
+msgid "{count} folders"
+msgstr ""
+
+#: js/trash.js:194
+msgid "1 file"
+msgstr "1 Ú¾Û†Ø¬Ø¬Û•Øª"
+
+#: js/trash.js:196
+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..bc0751f8d0a6d3b9859f695ad239ee7d4cef1009
--- /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-12 02:01+0200\n"
+"PO-Revision-Date: 2013-05-04 11:40+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..a14470fe87248743c7c8d8ccbaf258cc933ce42a
--- /dev/null
+++ b/l10n/ug/lib.po
@@ -0,0 +1,241 @@
+# 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-12 02:02+0200\n"
+"PO-Revision-Date: 2013-05-04 12:00+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:349
+msgid "Help"
+msgstr "ÙŠØ§Ø±Ø¯Û•Ù…"
+
+#: app.php:362
+msgid "Personal"
+msgstr "Ø´Û•Ø®Ø³Ù‰ÙŠ"
+
+#: app.php:373
+msgid "Settings"
+msgstr "ØªÛ•ÚØ´Û•ÙƒÙ„Û•Ø±"
+
+#: app.php:385
+msgid "Users"
+msgstr "Ø¦Ù‰Ø´Ù„Û•ØªÙƒÛˆÚ†Ù‰Ù„Û•Ø±"
+
+#: app.php:398
+msgid "Apps"
+msgstr "Ø¦Û•Ù¾Ù„Û•Ø±"
+
+#: app.php:406
+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:325 setup.php:370
+msgid "PostgreSQL username and/or password not valid"
+msgstr ""
+
+#: setup.php:133 setup.php:156 setup.php:234
+msgid "You need to enter either an existing account or the administrator."
+msgstr ""
+
+#: setup.php:155 setup.php:458 setup.php:525
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:233
+msgid "MySQL username and/or password not valid"
+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:583 setup.php:592 setup.php:600 setup.php:609
+#: setup.php:615
+#, php-format
+msgid "DB Error: \"%s\""
+msgstr ""
+
+#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
+#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
+#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#, php-format
+msgid "Offending command was: \"%s\""
+msgstr ""
+
+#: setup.php:304
+#, php-format
+msgid "MySQL user '%s'@'localhost' exists already."
+msgstr ""
+
+#: setup.php:305
+msgid "Drop this user from MySQL"
+msgstr ""
+
+#: setup.php:310
+#, php-format
+msgid "MySQL user '%s'@'%%' already exists"
+msgstr ""
+
+#: setup.php:311
+msgid "Drop this user from MySQL."
+msgstr ""
+
+#: setup.php:584 setup.php:616
+#, php-format
+msgid "Offending command was: \"%s\", name: %s, password: %s"
+msgstr ""
+
+#: setup.php:636
+#, php-format
+msgid "MS SQL username and/or password not valid: %s"
+msgstr ""
+
+#: setup.php:858
+msgid ""
+"Your web server is not yet properly setup to allow files synchronization "
+"because the WebDAV interface seems to be broken."
+msgstr ""
+
+#: setup.php:859
+#, 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..d7d4d921f92443afee5fe7641049d388a489978a
--- /dev/null
+++ b/l10n/ug/settings.po
@@ -0,0 +1,492 @@
+# 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-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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/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:78
+#: templates/users.php:103
+msgid "Groups"
+msgstr "Ú¯Û‡Ø±Û‡Ù¾Ù¾Ø§"
+
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
+msgid "Group Admin"
+msgstr "Ú¯Û‡Ø±Û‡Ù¾Ù¾Ø§ Ø¨Ø§Ø´Ù‚Û‡Ø±ØºÛ‡Ú†Ù‰"
+
+#: js/users.js:115 templates/users.php:155
+msgid "Delete"
+msgstr "Ø¦Û†Ú†ÛˆØ±"
+
+#: js/users.js:269
+msgid "add group"
+msgstr "Ú¯Û‡Ø±Û‡Ù¾Ù¾Ø§ Ù‚ÙˆØ´"
+
+#: js/users.js:420
+msgid "A valid username must be provided"
+msgstr ""
+
+#: js/users.js:421 js/users.js:427 js/users.js:442
+msgid "Error creating user"
+msgstr ""
+
+#: js/users.js:426
+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:77
+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:76
+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 "WebDAV"
+
+#: 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:75
+msgid "Login Name"
+msgstr "ØªÙ‰Ø²Ù‰Ù…ØºØ§ ÙƒÙ‰Ø±Ù‰Ø´ Ø¦Ø§ØªÙ‰"
+
+#: templates/users.php:30
+msgid "Create"
+msgstr "Ù‚Û‡Ø±"
+
+#: templates/users.php:33
+msgid "Default Storage"
+msgstr "ÙƒÛ†ÚÛˆÙ„Ø¯Ù‰ÙƒÙ‰ Ø³Ø§Ù‚Ù„Ù‰ØºÛ‡Ú†"
+
+#: templates/users.php:39 templates/users.php:133
+msgid "Unlimited"
+msgstr "Ú†Û•ÙƒØ³Ù‰Ø²"
+
+#: templates/users.php:57 templates/users.php:148
+msgid "Other"
+msgstr "Ø¨Ø§Ø´Ù‚Ø§"
+
+#: templates/users.php:82
+msgid "Storage"
+msgstr "Ø³Ø§Ù‚Ù„Ù‰ØºÛ‡Ú†"
+
+#: templates/users.php:93
+msgid "change display name"
+msgstr "ÙƒÛ†Ø±Ø³Ù‰ØªÙ‰Ø¯Ù‰ØºØ§Ù† Ø¦Ù‰Ø³Ù‰Ù…Ù†Ù‰ Ø¦Û†Ø²Ú¯Û•Ø±Øª"
+
+#: templates/users.php:97
+msgid "set new password"
+msgstr "ÙŠÛÚÙ‰ Ø¦Ù‰Ù… ØªÛ•ÚØ´Û•"
+
+#: templates/users.php:128
+msgid "Default"
+msgstr "ÙƒÛ†ÚÛˆÙ„Ø¯Ù‰ÙƒÙ‰"
diff --git a/l10n/ug/user_ldap.po b/l10n/ug/user_ldap.po
new file mode 100644
index 0000000000000000000000000000000000000000..96f22a9e8b7f3c0d2f4daed94da90480c7e3c6f1
--- /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-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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..30ac4d4ad7ece75d83d68b403a986ad8c86f738c
--- /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-12 02:01+0200\n"
+"PO-Revision-Date: 2013-05-04 11:40+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 54ed07e8816070811d7597f554970a12d219f9e6..0d847d93921f9f35f7ee0660d832f7ec639a9948 100644
--- a/l10n/uk/core.po
+++ b/l10n/uk/core.po
@@ -3,19 +3,13 @@
 # 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-02-22 00:06+0100\n"
-"PO-Revision-Date: 2013-02-20 23:20+0000\n"
-"Last-Translator: volodya327 <volodya327@gmail.com>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10: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"
@@ -23,24 +17,24 @@ 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/share.php:85
+#: ajax/share.php:97
 #, php-format
 msgid "User %s shared a file with you"
 msgstr "ÐšÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡ %s Ð¿Ð¾Ð´Ñ–Ð»Ð¸Ð²ÑÑ Ñ„Ð°Ð¹Ð»Ð¾Ð¼ Ð· Ð²Ð°Ð¼Ð¸"
 
-#: ajax/share.php:87
+#: ajax/share.php:99
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr "ÐšÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡ %s Ð¿Ð¾Ð´Ñ–Ð»Ð¸Ð²ÑÑ Ñ‚ÐµÐºÐ¾ÑŽ Ð· Ð²Ð°Ð¼Ð¸"
 
-#: ajax/share.php:89
+#: ajax/share.php:101
 #, php-format
 msgid ""
 "User %s shared the file \"%s\" with you. It is available for download here: "
 "%s"
 msgstr "ÐšÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡ %s Ð¿Ð¾Ð´Ñ–Ð»Ð¸Ð²ÑÑ Ñ„Ð°Ð¹Ð»Ð¾Ð¼ \"%s\" Ð· Ð²Ð°Ð¼Ð¸. Ð’Ñ–Ð½ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ð¸Ð¹ Ð´Ð»Ñ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ð·Ð²Ñ–Ð´ÑÐ¸: %s"
 
-#: ajax/share.php:91
+#: ajax/share.php:104
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -86,79 +80,79 @@ msgstr "Ð–Ð¾Ð´Ð½Ð¾Ñ— ÐºÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ñ–Ñ— Ð½Ðµ Ð¾Ð±Ñ€Ð°Ð½Ð¾ Ð´Ð»Ñ Ð²Ð¸Ð´Ð°Ð»ÐµÐ½
 msgid "Error removing %s from favorites."
 msgstr "ÐŸÐ¾Ð¼Ð¸Ð»ÐºÐ° Ð¿Ñ€Ð¸ Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ñ– %s Ñ–Ð· Ð¾Ð±Ñ€Ð°Ð½Ð¾Ð³Ð¾."
 
-#: js/config.php:32
+#: js/config.php:34
 msgid "Sunday"
 msgstr "ÐÐµÐ´Ñ–Ð»Ñ"
 
-#: js/config.php:32
+#: js/config.php:35
 msgid "Monday"
 msgstr "ÐŸÐ¾Ð½ÐµÐ´Ñ–Ð»Ð¾Ðº"
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Tuesday"
 msgstr "Ð’Ñ–Ð²Ñ‚Ð¾Ñ€Ð¾Ðº"
 
-#: js/config.php:32
+#: js/config.php:37
 msgid "Wednesday"
 msgstr "Ð¡ÐµÑ€ÐµÐ´Ð°"
 
-#: js/config.php:32
+#: js/config.php:38
 msgid "Thursday"
 msgstr "Ð§ÐµÑ‚Ð²ÐµÑ€"
 
-#: js/config.php:32
+#: js/config.php:39
 msgid "Friday"
 msgstr "ÐŸ'ÑÑ‚Ð½Ð¸Ñ†Ñ"
 
-#: js/config.php:32
+#: js/config.php:40
 msgid "Saturday"
 msgstr "Ð¡ÑƒÐ±Ð¾Ñ‚Ð°"
 
-#: js/config.php:33
+#: js/config.php:45
 msgid "January"
 msgstr "Ð¡Ñ–Ñ‡ÐµÐ½ÑŒ"
 
-#: js/config.php:33
+#: js/config.php:46
 msgid "February"
 msgstr "Ð›ÑŽÑ‚Ð¸Ð¹"
 
-#: js/config.php:33
+#: js/config.php:47
 msgid "March"
 msgstr "Ð‘ÐµÑ€ÐµÐ·ÐµÐ½ÑŒ"
 
-#: js/config.php:33
+#: js/config.php:48
 msgid "April"
 msgstr "ÐšÐ²Ñ–Ñ‚ÐµÐ½ÑŒ"
 
-#: js/config.php:33
+#: js/config.php:49
 msgid "May"
 msgstr "Ð¢Ñ€Ð°Ð²ÐµÐ½ÑŒ"
 
-#: js/config.php:33
+#: js/config.php:50
 msgid "June"
 msgstr "Ð§ÐµÑ€Ð²ÐµÐ½ÑŒ"
 
-#: js/config.php:33
+#: js/config.php:51
 msgid "July"
 msgstr "Ð›Ð¸Ð¿ÐµÐ½ÑŒ"
 
-#: js/config.php:33
+#: js/config.php:52
 msgid "August"
 msgstr "Ð¡ÐµÑ€Ð¿ÐµÐ½ÑŒ"
 
-#: js/config.php:33
+#: js/config.php:53
 msgid "September"
 msgstr "Ð’ÐµÑ€ÐµÑÐµÐ½ÑŒ"
 
-#: js/config.php:33
+#: js/config.php:54
 msgid "October"
 msgstr "Ð–Ð¾Ð²Ñ‚ÐµÐ½ÑŒ"
 
-#: js/config.php:33
+#: js/config.php:55
 msgid "November"
 msgstr "Ð›Ð¸ÑÑ‚Ð¾Ð¿Ð°Ð´"
 
-#: js/config.php:33
+#: js/config.php:56
 msgid "December"
 msgstr "Ð“Ñ€ÑƒÐ´ÐµÐ½ÑŒ"
 
@@ -166,86 +160,88 @@ msgstr "Ð“Ñ€ÑƒÐ´ÐµÐ½ÑŒ"
 msgid "Settings"
 msgstr "ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ"
 
-#: js/js.js:767
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "ÑÐµÐºÑƒÐ½Ð´Ð¸ Ñ‚Ð¾Ð¼Ñƒ"
 
-#: js/js.js:768
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "1 Ñ…Ð²Ð¸Ð»Ð¸Ð½Ñƒ Ñ‚Ð¾Ð¼Ñƒ"
 
-#: js/js.js:769
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr "{minutes} Ñ…Ð²Ð¸Ð»Ð¸Ð½ Ñ‚Ð¾Ð¼Ñƒ"
 
-#: js/js.js:770
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr "1 Ð³Ð¾Ð´Ð¸Ð½Ñƒ Ñ‚Ð¾Ð¼Ñƒ"
 
-#: js/js.js:771
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr "{hours} Ð³Ð¾Ð´Ð¸Ð½Ð¸ Ñ‚Ð¾Ð¼Ñƒ"
 
-#: js/js.js:772
+#: js/js.js:723
 msgid "today"
 msgstr "ÑÑŒÐ¾Ð³Ð¾Ð´Ð½Ñ–"
 
-#: js/js.js:773
+#: js/js.js:724
 msgid "yesterday"
 msgstr "Ð²Ñ‡Ð¾Ñ€Ð°"
 
-#: js/js.js:774
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr "{days} Ð´Ð½Ñ–Ð² Ñ‚Ð¾Ð¼Ñƒ"
 
-#: js/js.js:775
+#: js/js.js:726
 msgid "last month"
 msgstr "Ð¼Ð¸Ð½ÑƒÐ»Ð¾Ð³Ð¾ Ð¼Ñ–ÑÑÑ†Ñ"
 
-#: js/js.js:776
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr "{months} Ð¼Ñ–ÑÑÑ†Ñ–Ð² Ñ‚Ð¾Ð¼Ñƒ"
 
-#: js/js.js:777
+#: js/js.js:728
 msgid "months ago"
 msgstr "Ð¼Ñ–ÑÑÑ†Ñ– Ñ‚Ð¾Ð¼Ñƒ"
 
-#: js/js.js:778
+#: js/js.js:729
 msgid "last year"
 msgstr "Ð¼Ð¸Ð½ÑƒÐ»Ð¾Ð³Ð¾ Ñ€Ð¾ÐºÑƒ"
 
-#: js/js.js:779
+#: js/js.js:730
 msgid "years ago"
 msgstr "Ñ€Ð¾ÐºÐ¸ Ñ‚Ð¾Ð¼Ñƒ"
 
-#: js/oc-dialogs.js:126
-msgid "Choose"
-msgstr "ÐžÐ±Ñ€Ð°Ñ‚Ð¸"
+#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
+msgid "Ok"
+msgstr "Ok"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
 msgid "Cancel"
 msgstr "Ð’Ñ–Ð´Ð¼Ñ–Ð½Ð¸Ñ‚Ð¸"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "ÐÑ–"
+#: js/oc-dialogs.js:185
+msgid "Choose"
+msgstr "ÐžÐ±Ñ€Ð°Ñ‚Ð¸"
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:215
 msgid "Yes"
 msgstr "Ð¢Ð°Ðº"
 
-#: js/oc-dialogs.js:180
-msgid "Ok"
-msgstr "Ok"
+#: js/oc-dialogs.js:222
+msgid "No"
+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:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:582
-#: js/share.js:594
+#: 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 "ÐŸÐ¾Ð¼Ð¸Ð»ÐºÐ°"
 
@@ -257,127 +253,127 @@ msgstr "ÐÐµ Ð²Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¾ Ñ–Ð¼'Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¸."
 msgid "The required file {file} is not installed!"
 msgstr "ÐÐµÐ¾Ð±Ñ…Ñ–Ð´Ð½Ð¸Ð¹ Ñ„Ð°Ð¹Ð» {file} Ð½Ðµ Ð²ÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¾!"
 
-#: js/share.js:29 js/share.js:43 js/share.js:90
+#: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr "ÐžÐ¿ÑƒÐ±Ð»Ñ–ÐºÐ¾Ð²Ð°Ð½Ð¾"
 
-#: js/share.js:93
+#: js/share.js:90
 msgid "Share"
 msgstr "ÐŸÐ¾Ð´Ñ–Ð»Ð¸Ñ‚Ð¸ÑÑ"
 
-#: js/share.js:141 js/share.js:622
+#: js/share.js:125 js/share.js:617
 msgid "Error while sharing"
 msgstr "ÐŸÐ¾Ð¼Ð¸Ð»ÐºÐ° Ð¿Ñ–Ð´ Ñ‡Ð°Ñ Ð¿ÑƒÐ±Ð»Ñ–ÐºÐ°Ñ†Ñ–Ñ—"
 
-#: js/share.js:152
+#: js/share.js:136
 msgid "Error while unsharing"
 msgstr "ÐŸÐ¾Ð¼Ð¸Ð»ÐºÐ° Ð¿Ñ–Ð´ Ñ‡Ð°Ñ Ð²Ñ–Ð´Ð¼Ñ–Ð½Ð¸ Ð¿ÑƒÐ±Ð»Ñ–ÐºÐ°Ñ†Ñ–Ñ—"
 
-#: js/share.js:159
+#: js/share.js:143
 msgid "Error while changing permissions"
 msgstr "ÐŸÐ¾Ð¼Ð¸Ð»ÐºÐ° Ð¿Ñ€Ð¸ Ð·Ð¼Ñ–Ð½Ñ– Ð¿Ð¾Ð²Ð½Ð¾Ð²Ð°Ð¶ÐµÐ½ÑŒ"
 
-#: js/share.js:168
+#: js/share.js:152
 msgid "Shared with you and the group {group} by {owner}"
 msgstr " {owner} Ð¾Ð¿ÑƒÐ±Ð»Ñ–ÐºÑƒÐ²Ð°Ð² Ð´Ð»Ñ Ð’Ð°Ñ Ñ‚Ð° Ð´Ð»Ñ Ð³Ñ€ÑƒÐ¿Ð¸ {group}"
 
-#: js/share.js:170
+#: js/share.js:154
 msgid "Shared with you by {owner}"
 msgstr "{owner} Ð¾Ð¿ÑƒÐ±Ð»Ñ–ÐºÑƒÐ²Ð°Ð² Ð´Ð»Ñ Ð’Ð°Ñ"
 
-#: js/share.js:175
+#: js/share.js:159
 msgid "Share with"
 msgstr "ÐžÐ¿ÑƒÐ±Ð»Ñ–ÐºÑƒÐ²Ð°Ñ‚Ð¸ Ð´Ð»Ñ"
 
-#: js/share.js:180
+#: js/share.js:164
 msgid "Share with link"
 msgstr "ÐžÐ¿ÑƒÐ±Ð»Ñ–ÐºÑƒÐ²Ð°Ñ‚Ð¸ Ñ‡ÐµÑ€ÐµÐ· Ð¿Ð¾ÑÐ¸Ð»Ð°Ð½Ð½Ñ"
 
-#: js/share.js:183
+#: js/share.js:167
 msgid "Password protect"
 msgstr "Ð—Ð°Ñ…Ð¸ÑÑ‚Ð¸Ñ‚Ð¸ Ð¿Ð°Ñ€Ð¾Ð»ÐµÐ¼"
 
-#: js/share.js:185 templates/installation.php:44 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "ÐŸÐ°Ñ€Ð¾Ð»ÑŒ"
 
-#: js/share.js:189
+#: js/share.js:173
 msgid "Email link to person"
 msgstr "Ð•Ð». Ð¿Ð¾ÑˆÑ‚Ð° Ð½Ð°Ð»ÐµÐ¶Ð¸Ñ‚ÑŒ ÐŸÐ°Ð½Ñƒ"
 
-#: js/share.js:190
+#: js/share.js:174
 msgid "Send"
 msgstr "ÐÐ°Ð´Ñ–ÑÐ»Ð°Ñ‚Ð¸"
 
-#: js/share.js:194
+#: js/share.js:178
 msgid "Set expiration date"
 msgstr "Ð’ÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚Ð¸ Ñ‚ÐµÑ€Ð¼Ñ–Ð½ Ð´Ñ–Ñ—"
 
-#: js/share.js:195
+#: js/share.js:179
 msgid "Expiration date"
 msgstr "Ð¢ÐµÑ€Ð¼Ñ–Ð½ Ð´Ñ–Ñ—"
 
-#: js/share.js:227
+#: js/share.js:211
 msgid "Share via email:"
 msgstr "ÐžÐ¿ÑƒÐ±Ð»Ñ–ÐºÑƒÐ²Ð°Ñ‚Ð¸ Ñ‡ÐµÑ€ÐµÐ· Ð•Ð». Ð¿Ð¾ÑˆÑ‚Ñƒ:"
 
-#: js/share.js:229
+#: js/share.js:213
 msgid "No people found"
 msgstr "Ð–Ð¾Ð´Ð½Ð¾Ñ— Ð»ÑŽÐ´Ð¸Ð½Ð¸ Ð½Ðµ Ð·Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾"
 
-#: js/share.js:256
+#: js/share.js:251
 msgid "Resharing is not allowed"
 msgstr "ÐŸÐµÑ€Ðµ-Ð¿ÑƒÐ±Ð»Ñ–ÐºÐ°Ñ†Ñ–Ñ Ð½Ðµ Ð´Ð¾Ð·Ð²Ð¾Ð»ÑÑ”Ñ‚ÑŒÑÑ"
 
-#: js/share.js:292
+#: js/share.js:287
 msgid "Shared in {item} with {user}"
 msgstr "ÐžÐ¿ÑƒÐ±Ð»Ñ–ÐºÐ¾Ð²Ð°Ð½Ð¾ {item} Ð´Ð»Ñ {user}"
 
-#: js/share.js:313
+#: js/share.js:308
 msgid "Unshare"
-msgstr "Ð—Ð°Ð±Ð¾Ñ€Ð¾Ð½Ð¸Ñ‚Ð¸ Ð´Ð¾ÑÑ‚ÑƒÐ¿"
+msgstr "Ð—Ð°ÐºÑ€Ð¸Ñ‚Ð¸ Ð´Ð¾ÑÑ‚ÑƒÐ¿"
 
-#: js/share.js:325
+#: js/share.js:320
 msgid "can edit"
 msgstr "Ð¼Ð¾Ð¶Ðµ Ñ€ÐµÐ´Ð°Ð³ÑƒÐ²Ð°Ñ‚Ð¸"
 
-#: js/share.js:327
+#: js/share.js:322
 msgid "access control"
 msgstr "ÐºÐ¾Ð½Ñ‚Ñ€Ð¾Ð»ÑŒ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ñƒ"
 
-#: js/share.js:330
+#: js/share.js:325
 msgid "create"
 msgstr "ÑÑ‚Ð²Ð¾Ñ€Ð¸Ñ‚Ð¸"
 
-#: js/share.js:333
+#: js/share.js:328
 msgid "update"
 msgstr "Ð¾Ð½Ð¾Ð²Ð¸Ñ‚Ð¸"
 
-#: js/share.js:336
+#: js/share.js:331
 msgid "delete"
 msgstr "Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸"
 
-#: js/share.js:339
+#: js/share.js:334
 msgid "share"
 msgstr "Ð¾Ð¿ÑƒÐ±Ð»Ñ–ÐºÑƒÐ²Ð°Ñ‚Ð¸"
 
-#: js/share.js:373 js/share.js:569
+#: js/share.js:368 js/share.js:564
 msgid "Password protected"
 msgstr "Ð—Ð°Ñ…Ð¸Ñ‰ÐµÐ½Ð¾ Ð¿Ð°Ñ€Ð¾Ð»ÐµÐ¼"
 
-#: js/share.js:582
+#: js/share.js:577
 msgid "Error unsetting expiration date"
 msgstr "ÐŸÐ¾Ð¼Ð¸Ð»ÐºÐ° Ð¿Ñ€Ð¸ Ð²Ñ–Ð´Ð¼Ñ–Ð½Ñ– Ñ‚ÐµÑ€Ð¼Ñ–Ð½Ð° Ð´Ñ–Ñ—"
 
-#: js/share.js:594
+#: js/share.js:589
 msgid "Error setting expiration date"
 msgstr "ÐŸÐ¾Ð¼Ð¸Ð»ÐºÐ° Ð¿Ñ€Ð¸ Ð²ÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ– Ñ‚ÐµÑ€Ð¼Ñ–Ð½Ð° Ð´Ñ–Ñ—"
 
-#: js/share.js:609
+#: js/share.js:604
 msgid "Sending ..."
 msgstr "ÐÐ°Ð´ÑÐ¸Ð»Ð°Ð½Ð½Ñ..."
 
-#: js/share.js:620
+#: js/share.js:615
 msgid "Email sent"
 msgstr "Ð•Ð». Ð¿Ð¾ÑˆÑ‚Ð° Ð½Ð°Ð´Ñ–ÑÐ»Ð°Ð½Ð°"
 
@@ -400,24 +396,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:39
-#: 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 "Ð—Ð°Ð¿Ð¸Ñ‚ ÑÐºÐ¸Ð´Ð°Ð½Ð½Ñ"
 
@@ -451,7 +450,7 @@ msgstr "Ð”Ð¾Ð´Ð°Ñ‚ÐºÐ¸"
 
 #: strings.php:8
 msgid "Admin"
-msgstr "ÐÐ´Ð¼Ñ–Ð½Ñ–ÑÑ‚Ñ€Ð°Ñ‚Ð¾Ñ€"
+msgstr "ÐÐ´Ð¼Ñ–Ð½"
 
 #: strings.php:9
 msgid "Help"
@@ -473,115 +472,130 @@ msgstr "Ð ÐµÐ´Ð°Ð³ÑƒÐ²Ð°Ñ‚Ð¸ ÐºÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ñ–Ñ—"
 msgid "Add"
 msgstr "Ð”Ð¾Ð´Ð°Ñ‚Ð¸"
 
-#: templates/installation.php:23 templates/installation.php:30
+#: 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 "Ð’Ð°ÑˆÐ° Ð²ÐµÑ€ÑÑ–Ñ PHP Ð²Ñ€Ð°Ð·Ð»Ð¸Ð²Ð° Ð´Ð»Ñ Ð°Ñ‚Ð°Ðº NULL Byte (CVE-2006-7243)"
+
+#: templates/installation.php:26
+msgid "Please update your PHP installation to use ownCloud securely."
+msgstr "Ð‘ÑƒÐ´ÑŒ Ð»Ð°ÑÐºÐ°, Ð¾Ð½Ð¾Ð²Ñ–Ñ‚ÑŒ Ñ–Ð½ÑÑ‚Ð°Ð»ÑÑ†Ñ–ÑŽ PHP Ð´Ð»Ñ Ð±ÐµÐ·Ð¿ÐµÑ‡Ð½Ð¾Ð³Ð¾ Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð°Ð½Ð½Ñ ownCloud."
+
+#: templates/installation.php:32
 msgid ""
 "No secure random number generator is available, please enable the PHP "
 "OpenSSL extension."
 msgstr "ÐÐµ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ð¸Ð¹ Ð±ÐµÐ·Ð¿ÐµÑ‡Ð½Ð¸Ð¹ Ð³ÐµÐ½ÐµÑ€Ð°Ñ‚Ð¾Ñ€ Ð²Ð¸Ð¿Ð°Ð´ÐºÐ¾Ð²Ð¸Ñ… Ñ‡Ð¸ÑÐµÐ», Ð±ÑƒÐ´ÑŒ Ð»Ð°ÑÐºÐ°, Ð°ÐºÑ‚Ð¸Ð²ÑƒÐ¹Ñ‚Ðµ PHP OpenSSL Ð´Ð¾Ð´Ð°Ñ‚Ð¾Ðº."
 
-#: templates/installation.php:25
+#: 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:31
+#: 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 Ñ„Ð°Ð¹Ð» Ð½Ðµ Ð¿Ñ€Ð°Ñ†ÑŽÑ”."
 
-#: templates/installation.php:32
+#: 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>."
 
-#: templates/installation.php:36
+#: templates/installation.php:44
 msgid "Create an <strong>admin account</strong>"
 msgstr "Ð¡Ñ‚Ð²Ð¾Ñ€Ð¸Ñ‚Ð¸ <strong>Ð¾Ð±Ð»Ñ–ÐºÐ¾Ð²Ð¸Ð¹ Ð·Ð°Ð¿Ð¸Ñ Ð°Ð´Ð¼Ñ–Ð½Ñ–ÑÑ‚Ñ€Ð°Ñ‚Ð¾Ñ€Ð°</strong>"
 
-#: templates/installation.php:52
+#: templates/installation.php:62
 msgid "Advanced"
 msgstr "Ð”Ð¾Ð´Ð°Ñ‚ÐºÐ¾Ð²Ð¾"
 
-#: templates/installation.php:54
+#: templates/installation.php:64
 msgid "Data folder"
 msgstr "ÐšÐ°Ñ‚Ð°Ð»Ð¾Ð³ Ð´Ð°Ð½Ð¸Ñ…"
 
-#: templates/installation.php:61
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð±Ð°Ð·Ð¸ Ð´Ð°Ð½Ð¸Ñ…"
 
-#: templates/installation.php:66 templates/installation.php:77
-#: templates/installation.php:87 templates/installation.php:97
+#: 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:109
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "ÐšÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡ Ð±Ð°Ð·Ð¸ Ð´Ð°Ð½Ð¸Ñ…"
 
-#: templates/installation.php:113
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "ÐŸÐ°Ñ€Ð¾Ð»ÑŒ Ð´Ð»Ñ Ð±Ð°Ð·Ð¸ Ð´Ð°Ð½Ð¸Ñ…"
 
-#: templates/installation.php:117
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "ÐÐ°Ð·Ð²Ð° Ð±Ð°Ð·Ð¸ Ð´Ð°Ð½Ð¸Ñ…"
 
-#: templates/installation.php:125
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "Ð¢Ð°Ð±Ð»Ð¸Ñ†Ñ Ð±Ð°Ð·Ð¸ Ð´Ð°Ð½Ð¸Ñ…"
 
-#: templates/installation.php:131
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "Ð¥Ð¾ÑÑ‚ Ð±Ð°Ð·Ð¸ Ð´Ð°Ð½Ð¸Ñ…"
 
-#: templates/installation.php:136
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "Ð—Ð°Ð²ÐµÑ€ÑˆÐ¸Ñ‚Ð¸ Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ"
 
-#: templates/layout.guest.php:33
+#: templates/layout.guest.php:40
 msgid "web services under your control"
-msgstr "Ð²ÐµÐ±-ÑÐµÑ€Ð²Ñ–Ñ Ð¿Ñ–Ð´ Ð²Ð°ÑˆÐ¸Ð¼ ÐºÐ¾Ð½Ñ‚Ñ€Ð¾Ð»ÐµÐ¼"
+msgstr "Ð¿Ñ–Ð´ÐºÐ¾Ð½Ñ‚Ñ€Ð¾Ð»ÑŒÐ½Ñ– Ð’Ð°Ð¼ Ð²ÐµÐ±-ÑÐµÑ€Ð²Ñ–ÑÐ¸"
+
+#: templates/layout.user.php:36
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr ""
 
-#: templates/layout.user.php:48
+#: 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/uk/files.po b/l10n/uk/files.po
index 58aae0590c5f06920f533d03dfb9db76dbe4ad1e..617b66ad3ec0d738e7a551e8877775dc5fda872c 100644
--- a/l10n/uk/files.po
+++ b/l10n/uk/files.po
@@ -3,17 +3,13 @@
 # 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-03-06 00:07+0100\n"
-"PO-Revision-Date: 2013-03-05 12:31+0000\n"
-"Last-Translator: volodya327 <volodya327@gmail.com>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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"
@@ -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 "ÐÐµ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð¾ Ð¶Ð¾Ð´Ð½Ð¾Ð³Ð¾ Ñ„Ð°Ð¹Ð»Ñƒ. ÐÐµÐ²Ñ–Ð´Ð¾Ð¼Ð° Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ°"
@@ -74,59 +66,70 @@ msgstr "ÐÐµÐ²Ð´Ð°Ð»Ð¾ÑÑ Ð·Ð°Ð¿Ð¸ÑÐ°Ñ‚Ð¸ Ð½Ð° Ð´Ð¸ÑÐº"
 msgid "Not enough storage available"
 msgstr "ÐœÑ–ÑÑ†Ñ Ð±Ñ–Ð»ÑŒÑˆÐµ Ð½ÐµÐ¼Ð°Ñ”"
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr "ÐÐµÐ²Ñ–Ñ€Ð½Ð¸Ð¹ ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³."
 
-#: appinfo/app.php:10
+#: 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 "Ð’Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ Ð½Ð°Ð·Ð°Ð²Ð¶Ð´Ð¸"
 
-#: js/fileactions.js:127 templates/index.php:92 templates/index.php:93
+#: 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/files.js:292 js/files.js:408
-#: js/files.js:439
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "ÐžÑ‡Ñ–ÐºÑƒÐ²Ð°Ð½Ð½Ñ"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} Ð²Ð¶Ðµ Ñ–ÑÐ½ÑƒÑ”"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "Ð·Ð°Ð¼Ñ–Ð½Ð°"
 
-#: js/filelist.js:251
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "Ð·Ð°Ð¿Ñ€Ð¾Ð¿Ð¾Ð½ÑƒÐ¹Ñ‚Ðµ Ð½Ð°Ð·Ð²Ñƒ"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "Ð²Ñ–Ð´Ð¼Ñ–Ð½Ð°"
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "Ð·Ð°Ð¼Ñ–Ð½ÐµÐ½Ð¾ {new_name} Ð½Ð° {old_name}"
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "undo"
 msgstr "Ð²Ñ–Ð´Ð¼Ñ–Ð½Ð¸Ñ‚Ð¸"
 
-#: js/filelist.js:323
+#: 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 "'.' Ñ†Ðµ Ð½ÐµÐ²Ñ–Ñ€Ð½Ðµ Ñ–Ð¼'Ñ Ñ„Ð°Ð¹Ð»Ñƒ."
@@ -149,80 +152,80 @@ msgstr "Ð’Ð°ÑˆÐµ ÑÑ…Ð¾Ð²Ð¸Ñ‰Ðµ Ð¿ÐµÑ€ÐµÐ¿Ð¾Ð²Ð½ÐµÐ½Ðµ, Ñ„Ð°Ð¹Ð»Ð¸ Ð±Ñ–Ð»ÑŒÑˆÐµ
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Ð’Ð°ÑˆÐµ ÑÑ…Ð¾Ð²Ð¸Ñ‰Ðµ Ð¼Ð°Ð¹Ð¶Ðµ Ð¿Ð¾Ð²Ð½Ðµ ({usedSpacePercent}%)"
 
-#: js/files.js:225
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Ð’Ð°ÑˆÐµ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ð³Ð¾Ñ‚ÑƒÑ”Ñ‚ÑŒÑÑ. Ð¦Ðµ Ð¼Ð¾Ð¶Ðµ Ð·Ð°Ð¹Ð½ÑÑ‚Ð¸ Ð´ÐµÑÐºÐ¸Ð¹ Ñ‡Ð°Ñ, ÑÐºÑ‰Ð¾ Ñ„Ð°Ð¹Ð»Ð¸ Ð·Ð°Ð²ÐµÐ»Ð¸ÐºÑ–."
 
-#: js/files.js:262
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "ÐÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶Ð¸Ñ‚Ð¸ Ð²Ð°Ñˆ Ñ„Ð°Ð¹Ð» Ñ‚Ð¾Ð¼Ñƒ, Ñ‰Ð¾ Ð²Ñ–Ð½ Ñ‚ÐµÐºÐ° Ð°Ð±Ð¾ Ñ„Ð°Ð¹Ð» Ñ€Ð¾Ð·Ð¼Ñ–Ñ€Ð¾Ð¼ 0 Ð±Ð°Ð¹Ñ‚"
 
-#: js/files.js:262
-msgid "Upload Error"
-msgstr "ÐŸÐ¾Ð¼Ð¸Ð»ÐºÐ° Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ"
-
-#: js/files.js:273
-msgid "Close"
-msgstr "Ð—Ð°ÐºÑ€Ð¸Ñ‚Ð¸"
-
-#: js/files.js:312
-msgid "1 file uploading"
-msgstr "1 Ñ„Ð°Ð¹Ð» Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÑƒÑ”Ñ‚ÑŒÑÑ"
-
-#: js/files.js:315 js/files.js:370 js/files.js:385
-msgid "{count} files uploading"
-msgstr "{count} Ñ„Ð°Ð¹Ð»Ñ–Ð² Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÑƒÑ”Ñ‚ÑŒÑÑ"
+#: js/files.js:277
+msgid "Not enough space available"
+msgstr "ÐœÑ–ÑÑ†Ñ Ð±Ñ–Ð»ÑŒÑˆÐµ Ð½ÐµÐ¼Ð°Ñ”"
 
-#: js/files.js:388 js/files.js:423
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "Ð—Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ð¿ÐµÑ€ÐµÑ€Ð²Ð°Ð½Ð¾."
 
-#: js/files.js:497
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Ð’Ð¸ÐºÐ¾Ð½ÑƒÑ”Ñ‚ÑŒÑÑ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñƒ. Ð—Ð°ÐºÑ€Ð¸Ñ‚Ñ‚Ñ Ñ†Ñ–Ñ”Ñ— ÑÑ‚Ð¾Ñ€Ñ–Ð½ÐºÐ¸ Ð¿Ñ€Ð¸Ð²ÐµÐ´Ðµ Ð´Ð¾ Ð²Ñ–Ð´Ð¼Ñ–Ð½Ð¸ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ."
 
-#: js/files.js:570
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "URL Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð±ÑƒÑ‚Ð¸ Ð¿ÑƒÑÑ‚Ð¸Ð¼."
 
-#: js/files.js:575
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "ÐÐµÐ²Ñ–Ñ€Ð½Ðµ Ñ–Ð¼'Ñ Ñ‚ÐµÐºÐ¸. Ð’Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð°Ð½Ð½Ñ \"Shared\" Ð·Ð°Ñ€ÐµÐ·ÐµÑ€Ð²Ð¾Ð²Ð°Ð½Ð¾ Owncloud"
 
-#: js/files.js:953 templates/index.php:68
+#: 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:954 templates/index.php:79
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Ð Ð¾Ð·Ð¼Ñ–Ñ€"
 
-#: js/files.js:955 templates/index.php:81
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Ð—Ð¼Ñ–Ð½ÐµÐ½Ð¾"
 
-#: js/files.js:974
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 Ð¿Ð°Ð¿ÐºÐ°"
 
-#: js/files.js:976
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} Ð¿Ð°Ð¿Ð¾Ðº"
 
-#: js/files.js:984
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 Ñ„Ð°Ð¹Ð»"
 
-#: js/files.js:986
+#: 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"
@@ -272,45 +275,45 @@ msgstr "ÐŸÐ°Ð¿ÐºÐ°"
 msgid "From link"
 msgstr "Ð— Ð¿Ð¾ÑÐ¸Ð»Ð°Ð½Ð½Ñ"
 
-#: templates/index.php:40
+#: templates/index.php:42
 msgid "Deleted files"
 msgstr "Ð’Ð¸Ð´Ð°Ð»ÐµÐ½Ð¾ Ñ„Ð°Ð¹Ð»Ñ–Ð²"
 
-#: templates/index.php:46
+#: templates/index.php:48
 msgid "Cancel upload"
 msgstr "ÐŸÐµÑ€ÐµÑ€Ð²Ð°Ñ‚Ð¸ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ"
 
-#: templates/index.php:53
+#: templates/index.php:54
 msgid "You donâ€™t have write permissions here."
 msgstr "Ð£ Ð²Ð°Ñ Ñ‚ÑƒÑ‚ Ð½ÐµÐ¼Ð°Ñ” Ð¿Ñ€Ð°Ð² Ð½Ð° Ð·Ð°Ð¿Ð¸Ñ."
 
-#: templates/index.php:60
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Ð¢ÑƒÑ‚ Ð½Ñ–Ñ‡Ð¾Ð³Ð¾ Ð½ÐµÐ¼Ð°Ñ”. Ð’Ñ–Ð´Ð²Ð°Ð½Ñ‚Ð°Ð¶Ñ‚Ðµ Ñ‰Ð¾-Ð½ÐµÐ±ÑƒÐ´ÑŒ!"
 
-#: templates/index.php:74
+#: templates/index.php:75
 msgid "Download"
 msgstr "Ð—Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶Ð¸Ñ‚Ð¸"
 
-#: templates/index.php:86 templates/index.php:87
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
-msgstr "Ð—Ð°Ð±Ð¾Ñ€Ð¾Ð½Ð¸Ñ‚Ð¸ Ð´Ð¾ÑÑ‚ÑƒÐ¿"
+msgstr "Ð—Ð°ÐºÑ€Ð¸Ñ‚Ð¸ Ð´Ð¾ÑÑ‚ÑƒÐ¿"
 
-#: templates/index.php:106
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "Ð¤Ð°Ð¹Ð» Ð·Ð°Ð½Ð°Ð´Ñ‚Ð¾ Ð²ÐµÐ»Ð¸ÐºÐ¸Ð¹"
 
-#: templates/index.php:108
+#: 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:113
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Ð¤Ð°Ð¹Ð»Ð¸ ÑÐºÐ°Ð½ÑƒÑŽÑ‚ÑŒÑÑ, Ð·Ð°Ñ‡ÐµÐºÐ°Ð¹Ñ‚Ðµ, Ð±ÑƒÐ´ÑŒ-Ð»Ð°ÑÐºÐ°."
 
-#: templates/index.php:116
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "ÐŸÐ¾Ñ‚Ð¾Ñ‡Ð½Ðµ ÑÐºÐ°Ð½ÑƒÐ²Ð°Ð½Ð½Ñ"
 
diff --git a/l10n/uk/files_encryption.po b/l10n/uk/files_encryption.po
index f0341a7e32ca2e9f8297a8213713ec4b2f620706..2d3d805e584299aa12cff7d15229c31b9ddf383f 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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/files_external.po b/l10n/uk/files_external.po
index 1936a470772cf0c8c4cc4eacdfc0b087e3efc86c..ef3ddfd152d1b1d7bef613282c5ab8e4304881a8 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-06 00:07+0100\n"
-"PO-Revision-Date: 2013-03-05 12:31+0000\n"
-"Last-Translator: volodya327 <volodya327@gmail.com>\n"
+"POT-Creation-Date: 2013-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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: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 "<b>ÐŸÐ¾Ð¿ÐµÑ€ÐµÐ´Ð¶ÐµÐ½Ð½Ñ:</b> ÐšÐ»Ñ–Ñ”Ð½Ñ‚ \"smbclient\" Ð½Ðµ Ð²ÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¾. ÐŸÑ–Ð´'Ñ”Ð´Ð½Ð°Ð½Ð°Ñ‚Ð¸ÑÑ Ð´Ð¾ CIFS/SMB Ñ‚ÐµÐº Ð½ÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾. ÐŸÐ¾Ð¿Ñ€Ð¾Ñ…Ð°Ð¹Ñ‚Ðµ ÑÐ¸ÑÑ‚ÐµÐ¼Ð½Ð¾Ð³Ð¾ Ð°Ð´Ð¼Ñ–Ð½Ñ–ÑÑ‚Ñ€Ð°Ñ‚Ð¾Ñ€Ð° Ð²ÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚Ð¸ Ð¹Ð¾Ð³Ð¾."
 
-#: 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 "<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..a78808b327a4149bb9d6b8eb19aa36a5349206fe 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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 c722965153b80291a37ad705d89a4cc260e35e40..7c13dac4da6f9a6c7a168d807cdd6e9b7920efe6 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-03-08 00:25+0100\n"
-"PO-Revision-Date: 2013-03-07 23:25+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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"
@@ -18,12 +17,12 @@ 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/delete.php:40
+#: ajax/delete.php:42
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "ÐÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ %s Ð½Ð°Ð·Ð°Ð²Ð¶Ð´Ð¸"
 
-#: ajax/undelete.php:41
+#: ajax/undelete.php:42
 #, php-format
 msgid "Couldn't restore %s"
 msgstr "ÐÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ Ð²Ñ–Ð´Ð½Ð¾Ð²Ð¸Ñ‚Ð¸ %s"
@@ -32,6 +31,10 @@ msgstr "ÐÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ Ð²Ñ–Ð´Ð½Ð¾Ð²Ð¸Ñ‚Ð¸ %s"
 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 "Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ Ñ„Ð°Ð¹Ð» Ð½Ð°Ð·Ð°Ð²Ð¶Ð´Ð¸"
@@ -78,4 +81,4 @@ msgstr "Ð’Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸"
 
 #: templates/part.breadcrumb.php:9
 msgid "Deleted Files"
-msgstr ""
+msgstr "Ð’Ð¸Ð´Ð°Ð»ÐµÐ½Ð¾ Ð¤Ð°Ð¹Ð»Ñ–Ð²"
diff --git a/l10n/uk/files_versions.po b/l10n/uk/files_versions.po
index 57d0fd1f10c97020c8b1d9f546844e76b7a676da..9cdb2fdef6c6a2434b6163b9793c979a0e70776b 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:30+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 3c4943397c87baa0087da141a09285922dd81d15..af5a7ee2d8945cec5f040f5619ec373b9a3bfdd3 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-03-06 00:07+0100\n"
-"PO-Revision-Date: 2013-03-05 12:21+0000\n"
-"Last-Translator: volodya327 <volodya327@gmail.com>\n"
+"POT-Creation-Date: 2013-04-28 01:57+0200\n"
+"PO-Revision-Date: 2013-04-27 23:57+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"
@@ -46,19 +41,19 @@ msgstr "Ð”Ð¾Ð´Ð°Ñ‚ÐºÐ¸"
 msgid "Admin"
 msgstr "ÐÐ´Ð¼Ñ–Ð½"
 
-#: files.php:202
+#: files.php:209
 msgid "ZIP download is turned off."
 msgstr "ZIP Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ð²Ð¸Ð¼ÐºÐ½ÐµÐ½Ð¾."
 
-#: files.php:203
+#: files.php:210
 msgid "Files need to be downloaded one by one."
 msgstr "Ð¤Ð°Ð¹Ð»Ð¸ Ð¿Ð¾Ð²Ð¸Ð½Ð½Ñ– Ð±ÑƒÑ‚Ð¸ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ– Ð¿Ð¾ÑÐ»Ñ–Ð´Ð¾Ð²Ð½Ð¾."
 
-#: files.php:204 files.php:231
+#: files.php:211 files.php:244
 msgid "Back to Files"
 msgstr "ÐŸÐ¾Ð²ÐµÑ€Ð½ÑƒÑ‚Ð¸ÑÑ Ð´Ð¾ Ñ„Ð°Ð¹Ð»Ñ–Ð²"
 
-#: files.php:228
+#: files.php:241
 msgid "Selected files too large to generate zip file."
 msgstr "Ð’Ð¸Ð±Ñ€Ð°Ð½Ñ– Ñ„Ð°Ð»Ð¸ Ð·Ð°Ð²ÐµÐ»Ð¸ÐºÑ– Ð´Ð»Ñ Ð³ÐµÐ½ÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ zip Ñ„Ð°Ð¹Ð»Ñƒ."
 
@@ -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,72 @@ msgstr "%s Ð½Ðµ Ð¼Ð¾Ð¶Ð½Ð° Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð¾Ð²ÑƒÐ²Ð°Ñ‚Ð¸ ÐºÑ€Ð°Ð¿ÐºÐ¸ Ð² Ð½Ð°Ð·
 msgid "%s set the database host."
 msgstr "%s Ð²ÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚Ð¸ Ñ…Ð¾ÑÑ‚ Ð±Ð°Ð·Ð¸ Ð´Ð°Ð½Ð¸Ñ…."
 
-#: setup.php:128 setup.php:320 setup.php:365
+#: setup.php:132 setup.php:325 setup.php:370
 msgid "PostgreSQL username and/or password not valid"
 msgstr "PostgreSQL Ñ–Ð¼'Ñ ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ð° Ñ‚Ð°/Ð°Ð±Ð¾ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ Ð½Ðµ Ð´Ñ–Ð¹ÑÐ½Ñ–"
 
-#: setup.php:129 setup.php:152 setup.php:229
+#: setup.php:133 setup.php:156 setup.php:234
 msgid "You need to enter either an existing account or the administrator."
 msgstr "Ð’Ð°Ð¼ Ð¿Ð¾Ñ‚Ñ€Ñ–Ð±Ð½Ð¾ Ð²Ð²ÐµÑÑ‚Ð¸ Ð°Ð±Ð¾ Ñ–ÑÐ½ÑƒÑŽÑ‡Ð¸Ð¹ Ð¾Ð±Ð»Ñ–ÐºÐ¾Ð²Ð¸Ð¹ Ð·Ð°Ð¿Ð¸Ñ Ð°Ð±Ð¾ administrator."
 
-#: setup.php:151 setup.php:453 setup.php:520
+#: setup.php:155 setup.php:458 setup.php:525
 msgid "Oracle username and/or password not valid"
 msgstr "Oracle Ñ–Ð¼'Ñ ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ð° Ñ‚Ð°/Ð°Ð±Ð¾ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ Ð½Ðµ Ð´Ñ–Ð¹ÑÐ½Ñ–"
 
-#: setup.php:228
+#: setup.php:233
 msgid "MySQL username and/or password not valid"
 msgstr "MySQL Ñ–Ð¼'Ñ ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ð° Ñ‚Ð°/Ð°Ð±Ð¾ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ Ð½Ðµ Ð´Ñ–Ð¹ÑÐ½Ñ–"
 
-#: 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: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:583 setup.php:592 setup.php:600 setup.php:609
+#: setup.php:615
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "ÐŸÐ¾Ð¼Ð¸Ð»ÐºÐ° Ð‘Ð”: \"%s\""
 
-#: 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:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
+#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
+#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "ÐšÐ¾Ð¼Ð°Ð½Ð´Ð°, Ñ‰Ð¾ Ð²Ð¸ÐºÐ»Ð¸ÐºÐ°Ð»Ð° Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼Ñƒ: \"%s\""
 
-#: setup.php:299
+#: setup.php:304
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "ÐšÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡ MySQL '%s'@'localhost' Ð²Ð¶Ðµ Ñ–ÑÐ½ÑƒÑ”."
 
-#: setup.php:300
+#: setup.php:305
 msgid "Drop this user from MySQL"
 msgstr "Ð’Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ Ñ†ÑŒÐ¾Ð³Ð¾ ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ð° Ð· MySQL"
 
-#: setup.php:305
+#: setup.php:310
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "ÐšÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡ MySQL '%s'@'%%' Ð²Ð¶Ðµ Ñ–ÑÐ½ÑƒÑ”"
 
-#: setup.php:306
+#: setup.php:311
 msgid "Drop this user from MySQL."
 msgstr "Ð’Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ Ñ†ÑŒÐ¾Ð³Ð¾ ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ð° Ð· MySQL."
 
-#: setup.php:579 setup.php:611
+#: setup.php:584 setup.php:616
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "ÐšÐ¾Ð¼Ð°Ð½Ð´Ð°, Ñ‰Ð¾ Ð²Ð¸ÐºÐ»Ð¸ÐºÐ°Ð»Ð° Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼Ñƒ: \"%s\", Ñ–Ð¼'Ñ: %s, Ð¿Ð°Ñ€Ð¾Ð»ÑŒ: %s"
 
-#: setup.php:631
+#: setup.php:636
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr "MS SQL Ñ–Ð¼'Ñ ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ð° Ñ‚Ð°/Ð°Ð±Ð¾ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ Ð½Ðµ Ð´Ñ–Ð¹ÑÐ½Ñ–: %s"
 
-#: setup.php:849
+#: setup.php:858
 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:850
+#: setup.php:859
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Ð‘ÑƒÐ´ÑŒ Ð»Ð°ÑÐºÐ°, Ð¿ÐµÑ€ÐµÐ²Ñ–Ñ€Ñ‚Ðµ <a href='%s'>Ñ–Ð½ÑÑ‚Ñ€ÑƒÐºÑ†Ñ–Ñ— Ð¿Ð¾ Ð²ÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½ÑŽ</a>."
@@ -244,19 +235,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 dd232bdd1ec726562f16e59c0830106cb3908adf..dcbbcd305534bae5df689aeda8502d7f2c0ce462 100644
--- a/l10n/uk/settings.po
+++ b/l10n/uk/settings.po
@@ -3,17 +3,13 @@
 # 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-03-06 00:07+0100\n"
-"PO-Revision-Date: 2013-03-05 12:20+0000\n"
-"Last-Translator: volodya327 <volodya327@gmail.com>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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,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"
@@ -96,7 +96,7 @@ msgstr "ÐžÐ½Ð¾Ð²Ð¸Ñ‚Ð¸ Ð´Ð¾ {appversion}"
 msgid "Disable"
 msgstr "Ð’Ð¸Ð¼ÐºÐ½ÑƒÑ‚Ð¸"
 
-#: js/apps.js:36 js/apps.js:64
+#: js/apps.js:36 js/apps.js:64 js/apps.js:83
 msgid "Enable"
 msgstr "Ð’ÐºÐ»ÑŽÑ‡Ð¸Ñ‚Ð¸"
 
@@ -104,68 +104,68 @@ msgstr "Ð’ÐºÐ»ÑŽÑ‡Ð¸Ñ‚Ð¸"
 msgid "Please wait...."
 msgstr "Ð—Ð°Ñ‡ÐµÐºÐ°Ð¹Ñ‚Ðµ, Ð±ÑƒÐ´ÑŒ Ð»Ð°ÑÐºÐ°..."
 
-#: js/apps.js:84
+#: 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:87
+#: js/apps.js:93
 msgid "Error while updating app"
 msgstr "ÐŸÐ¾Ð¼Ð¸Ð»ÐºÐ° Ð¿Ñ€Ð¸ Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ– Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¸"
 
-#: js/apps.js:87
-msgid "Error"
-msgstr "ÐŸÐ¾Ð¼Ð¸Ð»ÐºÐ°"
-
-#: js/apps.js:90
+#: js/apps.js:96
 msgid "Updated"
 msgstr "ÐžÐ½Ð¾Ð²Ð»ÐµÐ½Ð¾"
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr "Ð—Ð±ÐµÑ€Ñ–Ð³Ð°ÑŽ..."
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "deleted"
 msgstr "Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ñ–"
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "undo"
 msgstr "Ð²Ñ–Ð´Ð¼Ñ–Ð½Ð¸Ñ‚Ð¸"
 
-#: js/users.js:62
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr "ÐÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ð°"
 
-#: js/users.js:75 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
+#: templates/users.php:103
 msgid "Groups"
 msgstr "Ð“Ñ€ÑƒÐ¿Ð¸"
 
-#: js/users.js:78 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr "ÐÐ´Ð¼Ñ–Ð½Ñ–ÑÑ‚Ñ€Ð°Ñ‚Ð¾Ñ€ Ð³Ñ€ÑƒÐ¿Ð¸"
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "Ð’Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸"
 
-#: js/users.js:191
+#: js/users.js:269
 msgid "add group"
 msgstr "Ð´Ð¾Ð´Ð°Ñ‚Ð¸ Ð³Ñ€ÑƒÐ¿Ñƒ"
 
-#: js/users.js:352
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr "ÐŸÐ¾Ñ‚Ñ€Ñ–Ð±Ð½Ð¾ Ð·Ð°Ð´Ð°Ñ‚Ð¸ Ð²Ñ–Ñ€Ð½Ðµ Ñ–Ð¼'Ñ ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ð°"
 
-#: js/users.js:353 js/users.js:359 js/users.js:374
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr "ÐŸÐ¾Ð¼Ð¸Ð»ÐºÐ° Ð¿Ñ€Ð¸ ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ– ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ð°"
 
-#: js/users.js:358
+#: js/users.js:426
 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,15 +316,19 @@ msgstr "ÐŸÑ€Ð¾Ñ‚Ð¾ÐºÐ¾Ð»"
 msgid "Log level"
 msgstr "Ð Ñ–Ð²ÐµÐ½ÑŒ Ð¿Ñ€Ð¾Ñ‚Ð¾ÐºÐ¾Ð»ÑŽÐ²Ð°Ð½Ð½Ñ"
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
 msgstr "Ð‘Ñ–Ð»ÑŒÑˆÐµ"
 
-#: templates/admin.php:230 templates/personal.php:102
+#: templates/admin.php:228
+msgid "Less"
+msgstr "ÐœÐµÐ½ÑˆÐµ"
+
+#: templates/admin.php:235 templates/personal.php:105
 msgid "Version"
 msgstr "Ð’ÐµÑ€ÑÑ–Ñ"
 
-#: templates/admin.php:233 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:77
 msgid "Password"
 msgstr "ÐŸÐ°Ñ€Ð¾Ð»ÑŒ"
 
@@ -419,82 +423,70 @@ msgstr "ÐÐ¾Ð²Ð¸Ð¹ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ"
 msgid "Change password"
 msgstr "Ð—Ð¼Ñ–Ð½Ð¸Ñ‚Ð¸ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ"
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:76
 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 "WebDAV"
 
-#: templates/personal.php:93
+#: templates/personal.php:96
 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:75
 msgid "Login Name"
 msgstr "Ð†Ð¼'Ñ Ð›Ð¾Ð³Ñ–Ð½Ñƒ"
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr "Ð¡Ñ‚Ð²Ð¾Ñ€Ð¸Ñ‚Ð¸"
 
-#: templates/users.php:35
+#: templates/users.php:33
 msgid "Default Storage"
 msgstr "ÑÑ…Ð¾Ð²Ð¸Ñ‰Ðµ Ð·Ð° Ð·Ð°Ð¼Ð¾Ð²Ñ‡ÑƒÐ²Ð°Ð½Ð½ÑÐ¼"
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:39 templates/users.php:133
 msgid "Unlimited"
 msgstr "ÐÐµÐ¾Ð±Ð¼ÐµÐ¶ÐµÐ½Ð¾"
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:57 templates/users.php:148
 msgid "Other"
 msgstr "Ð†Ð½ÑˆÐµ"
 
-#: templates/users.php:84
+#: templates/users.php:82
 msgid "Storage"
 msgstr "Ð¡Ñ…Ð¾Ð²Ð¸Ñ‰Ðµ"
 
-#: templates/users.php:95
+#: templates/users.php:93
 msgid "change display name"
 msgstr "Ð·Ð¼Ñ–Ð½Ð¸Ñ‚Ð¸ Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ðµ Ñ–Ð¼'Ñ"
 
-#: templates/users.php:99
+#: templates/users.php:97
 msgid "set new password"
 msgstr "Ð²ÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚Ð¸ Ð½Ð¾Ð²Ð¸Ð¹ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ"
 
-#: templates/users.php:134
+#: templates/users.php:128
 msgid "Default"
 msgstr "Ð—Ð° Ð·Ð°Ð¼Ð¾Ð²Ñ‡ÑƒÐ²Ð°Ð½Ð½ÑÐ¼"
diff --git a/l10n/uk/user_ldap.po b/l10n/uk/user_ldap.po
index c520e5395365f0aac21f4911400a12fc333bf21a..e57d6368ab327870dde10f50df18e5facd5059bd 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-06 00:07+0100\n"
-"PO-Revision-Date: 2013-03-05 12:31+0000\n"
-"Last-Translator: volodya327 <volodya327@gmail.com>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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: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 "ÐœÐ¾Ð¶Ð½Ð° Ð½Ðµ Ð²ÐºÐ°Ð·ÑƒÐ²Ð°Ñ‚Ð¸ Ð¿Ñ€Ð¾Ñ‚Ð¾ÐºÐ¾Ð», ÑÐºÑ‰Ð¾ Ð²Ð°Ð¼ Ð½Ðµ Ð¿Ð¾Ñ‚Ñ€Ñ–Ð±ÐµÐ½ SSL. Ð¢Ð¾Ð´Ñ– Ð¿Ð¾Ñ‡Ð½Ñ–Ñ‚ÑŒ Ð· ldaps://"
 
-#: templates/settings.php:26
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "Ð‘Ð°Ð·Ð¾Ð²Ð¸Ð¹ DN"
 
-#: templates/settings.php:27
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr "ÐžÐ´Ð¸Ð½ Base DN Ð½Ð° Ð¾Ð´Ð½Ñ–Ð¹ ÑÑ‚Ñ€Ð¾Ñ‡Ñ†Ñ–"
 
-#: templates/settings.php:28
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "Ð’Ð¸ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð·Ð°Ð´Ð°Ñ‚Ð¸ Ð‘Ð°Ð·Ð¾Ð²Ð¸Ð¹ DN Ð´Ð»Ñ ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ñ–Ð² Ñ– Ð³Ñ€ÑƒÐ¿ Ð½Ð° Ð²ÐºÐ»Ð°Ð´Ð¸Ð½Ñ†Ñ– Ð”Ð¾Ð´Ð°Ñ‚ÐºÐ¾Ð²Ð¾"
 
-#: templates/settings.php:30
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "DN ÐšÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ð°"
 
-#: 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 "DN ÐºÐ»Ñ–Ñ”Ð½Ñ‚ÑÑŒÐºÐ¾Ð³Ð¾ ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ð° Ð´Ð»Ñ Ð¿Ñ€Ð¸Ð²'ÑÐ·ÐºÐ¸, Ð½Ð°Ð¿Ñ€Ð¸ÐºÐ»Ð°Ð´: uid=agent,dc=example,dc=com. Ð”Ð»Ñ Ð°Ð½Ð¾Ð½Ñ–Ð¼Ð½Ð¾Ð³Ð¾ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ñƒ, Ð·Ð°Ð»Ð¸ÑˆÑ‚Ðµ DN Ñ– ÐŸÐ°Ñ€Ð¾Ð»ÑŒ Ð¿Ð¾Ñ€Ð¾Ð¶Ð½Ñ–Ð¼Ð¸."
 
-#: 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 "Ð”Ð»Ñ Ð°Ð½Ð¾Ð½Ñ–Ð¼Ð½Ð¾Ð³Ð¾ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ñƒ, Ð·Ð°Ð»Ð¸ÑˆÑ‚Ðµ DN Ñ– ÐŸÐ°Ñ€Ð¾Ð»ÑŒ Ð¿Ð¾Ñ€Ð¾Ð¶Ð½Ñ–Ð¼Ð¸."
 
-#: 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 "Ð’Ð¸Ð·Ð½Ð°Ñ‡Ð°Ñ” Ñ„Ñ–Ð»ÑŒÑ‚Ñ€, ÑÐºÐ¸Ð¹ Ð·Ð°ÑÑ‚Ð¾ÑÐ¾Ð²ÑƒÑ”Ñ‚ÑŒÑÑ Ð¿Ñ€Ð¸ ÑÐ¿Ñ€Ð¾Ð±Ñ– Ð²Ñ…Ð¾Ð´Ñƒ. %%uid Ð·Ð°Ð¼Ñ–Ð½ÑŽÑ” Ñ–Ð¼'Ñ ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ð° Ð¿Ñ€Ð¸ Ð²Ñ…Ð¾Ð´Ñ–."
 
-#: templates/settings.php:41
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð¾Ð²ÑƒÐ¹Ñ‚Ðµ %%uid Ð·Ð°Ð¿Ð¾Ð²Ð½ÑŽÐ²Ð°Ñ‡, Ð½Ð°Ð¿Ñ€Ð¸ÐºÐ»Ð°Ð´: \"uid=%%uid\""
 
-#: 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 "Ð±ÐµÐ· Ð±ÑƒÐ´ÑŒ-ÑÐºÐ¾Ð³Ð¾ Ð·Ð°Ð¿Ð¾Ð²Ð½ÑŽÐ²Ð°Ñ‡Ð°, Ð½Ð°Ð¿Ñ€Ð¸ÐºÐ»Ð°Ð´: \"objectClass=person\"."
 
-#: 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 "Ð±ÐµÐ· Ð±ÑƒÐ´ÑŒ-ÑÐºÐ¾Ð³Ð¾ Ð·Ð°Ð¿Ð¾Ð²Ð½ÑŽÐ²Ð°Ñ‡Ð°, Ð½Ð°Ð¿Ñ€Ð¸ÐºÐ»Ð°Ð´: \"objectClass=posixGroup\"."
 
-#: 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 "Ð’ÐºÐ°Ð¶Ñ–Ñ‚ÑŒ Ð´Ð¾Ð´Ð°Ñ‚ÐºÐ¾Ð²Ð¸Ð¹ Ñ€ÐµÐ·ÐµÑ€Ð²Ð½Ð¸Ð¹ ÑÐµÑ€Ð²ÐµÑ€. Ð’Ñ–Ð½ Ð¿Ð¾Ð²Ð¸Ð½ÐµÐ½ Ð±ÑƒÑ‚Ð¸ ÐºÐ¾Ð¿Ñ–Ñ”ÑŽ Ð³Ð¾Ð»Ð¾Ð²Ð½Ð¾Ð³Ð¾ LDAP/AD ÑÐµÑ€Ð²ÐµÑ€Ð°."
 
-#: 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 "ÐšÐ¾Ð»Ð¸ ÑƒÐ²Ñ–Ð¼ÐºÐ½ÑƒÑ‚Ð¾, ownCloud  Ð±ÑƒÐ´Ðµ Ð¿Ñ€Ð¸Ñ”Ð´Ð½ÑƒÐ²Ð°Ñ‚Ð¸ÑÑŒ Ð»Ð¸ÑˆÐµ Ð´Ð¾ ÑÐµÑ€Ð²ÐµÑ€Ð° Ð· Ñ€ÐµÐ·ÐµÑ€Ð²Ð½Ð¸Ð¼Ð¸ ÐºÐ¾Ð¿Ñ–ÑÐ¼Ð¸."
 
-#: templates/settings.php:62
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "Ð’Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð¾Ð²ÑƒÐ¹Ñ‚Ðµ TLS"
 
-#: templates/settings.php:62
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr "ÐÐµ Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð¾Ð²ÑƒÐ¹Ñ‚Ðµ Ñ†Ðµ Ð´Ð¾Ð´Ð°Ñ‚ÐºÐ¾Ð²Ð¾ Ð´Ð»Ñ Ð¿Ñ–Ð´'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð´Ð¾ LDAP, Ð±Ð¾ Ð²Ð¸ÐºÐ¾Ð½Ð°Ð½Ð¾ Ð½Ðµ Ð±ÑƒÐ´Ðµ."
 
-#: templates/settings.php:63
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "ÐÐµÑ‡ÑƒÑ‚Ð»Ð¸Ð²Ð¸Ð¹ Ð´Ð¾ Ñ€ÐµÐ³Ñ–ÑÑ‚Ñ€Ñƒ LDAP ÑÐµÑ€Ð²ÐµÑ€ (Windows)"
 
-#: templates/settings.php:64
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "Ð’Ð¸Ð¼ÐºÐ½ÑƒÑ‚Ð¸ Ð¿ÐµÑ€ÐµÐ²Ñ–Ñ€ÐºÑƒ SSL ÑÐµÑ€Ñ‚Ð¸Ñ„Ñ–ÐºÐ°Ñ‚Ð°."
 
-#: 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 "Ð¯ÐºÑ‰Ð¾ Ð·'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð¿Ñ€Ð°Ñ†ÑŽÑ” Ð»Ð¸ÑˆÐµ Ð· Ñ†Ñ–Ñ”ÑŽ Ð¾Ð¿Ñ†Ñ–Ñ”ÑŽ, Ñ–Ð¼Ð¿Ð¾Ñ€Ñ‚ÑƒÐ¹Ñ‚Ðµ SSL ÑÐµÑ€Ñ‚Ð¸Ñ„Ñ–ÐºÐ°Ñ‚ LDAP ÑÐµÑ€Ð²ÐµÑ€Ð° Ñƒ Ð²Ð°ÑˆÐ¸Ð¹ ownCloud ÑÐµÑ€Ð²ÐµÑ€."
 
-#: 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 "ÐÑ‚Ñ€Ð¸Ð±ÑƒÑ‚ LDAP, ÑÐºÐ¸Ð¹ Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð¾Ð²ÑƒÑ”Ñ‚ÑŒÑÑ Ð´Ð»Ñ Ð³ÐµÐ½ÐµÑ€Ð°Ñ†Ñ–Ñ— Ñ–Ð¼ÐµÐ½ ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ñ–Ð² ownCloud."
 
-#: 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 "ÐžÐ´Ð¸Ð½ ÐšÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡ Base DN Ð½Ð° Ð¾Ð´Ð½Ñ–Ð¹ ÑÑ‚Ñ€Ð¾Ñ‡Ñ†Ñ–"
 
-#: 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 "ÐÑ‚Ñ€Ð¸Ð±ÑƒÑ‚ LDAP, ÑÐºÐ¸Ð¹ Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð¾Ð²ÑƒÑ”Ñ‚ÑŒÑÑ Ð´Ð»Ñ Ð³ÐµÐ½ÐµÑ€Ð°Ñ†Ñ–Ñ— Ñ–Ð¼ÐµÐ½ Ð³Ñ€ÑƒÐ¿ ownCloud."
 
-#: 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 "ÐžÐ´Ð½Ð° Ð“Ñ€ÑƒÐ¿Ð° Base DN Ð½Ð° Ð¾Ð´Ð½Ñ–Ð¹ ÑÑ‚Ñ€Ð¾Ñ‡Ñ†Ñ–"
 
-#: 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 "Ð—Ð°Ð»Ð¸ÑˆÑ‚Ðµ Ð¿Ð¾Ñ€Ð¾Ð¶Ð½Ñ–Ð¼ Ð´Ð»Ñ Ñ–Ð¼ÐµÐ½Ñ– ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ð° (Ð·Ð° Ð·Ð°Ð¼Ð¾Ð²Ñ‡Ð°Ð½Ð½ÑÐ¼). Ð†Ð½Ð°ÐºÑˆÐµ, Ð²ÐºÐ°Ð¶Ñ–Ñ‚ÑŒ Ð°Ñ‚Ñ€Ð¸Ð±ÑƒÑ‚ LDAP/AD."
 
-#: 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/uk/user_webdavauth.po b/l10n/uk/user_webdavauth.po
index 59983e502099f5974ec80f20c12ccb5d97e385bc..0b39465a48a85df89836640b40a1186ade0b6ee3 100644
--- a/l10n/uk/user_webdavauth.po
+++ b/l10n/uk/user_webdavauth.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-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-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/ur_PK/core.po b/l10n/ur_PK/core.po
index e0d59c7ccd0225f2b4b279fa8a42dd885e8d1e3a..b16f5c533b744d9c69d77527ca5aa9452444e641 100644
--- a/l10n/ur_PK/core.po
+++ b/l10n/ur_PK/core.po
@@ -3,14 +3,13 @@
 # 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-02-27 00:08+0100\n"
-"PO-Revision-Date: 2013-02-26 10:41+0000\n"
-"Last-Translator: adilch <adilone@gmail.com>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10: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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -161,86 +160,88 @@ msgstr "Ø¯Ø³Ù…Ø¨Ø±"
 msgid "Settings"
 msgstr "Ø³ÛŒÙ¹ÛŒÙ†Ú¯Ø²"
 
-#: js/js.js:768
+#: js/js.js:718
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:769
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:770
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:771
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:772
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:773
+#: js/js.js:723
 msgid "today"
 msgstr ""
 
-#: js/js.js:774
+#: js/js.js:724
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:775
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:776
+#: js/js.js:726
 msgid "last month"
 msgstr ""
 
-#: js/js.js:777
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:778
+#: js/js.js:728
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:779
+#: js/js.js:729
 msgid "last year"
 msgstr ""
 
-#: js/js.js:780
+#: js/js.js:730
 msgid "years ago"
 msgstr ""
 
-#: js/oc-dialogs.js:126
-msgid "Choose"
-msgstr "Ù…Ù†ØªØ®Ø¨ Ú©Ø±ÛŒÚº"
+#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
+msgid "Ok"
+msgstr "Ø§ÙˆÚ©Û’"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
 msgid "Cancel"
 msgstr "Ù…Ù†Ø³ÙˆØ® Ú©Ø±ÛŒÚº"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "Ù†ÛÛŒÚº"
+#: js/oc-dialogs.js:185
+msgid "Choose"
+msgstr "Ù…Ù†ØªØ®Ø¨ Ú©Ø±ÛŒÚº"
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:215
 msgid "Yes"
 msgstr "ÛØ§Úº"
 
-#: js/oc-dialogs.js:180
-msgid "Ok"
-msgstr "Ø§ÙˆÚ©Û’"
+#: js/oc-dialogs.js:222
+msgid "No"
+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:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:582
-#: js/share.js:594
+#: 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 "Ø§ÛŒØ±Ø±"
 
@@ -252,127 +253,127 @@ msgstr ""
 msgid "The required file {file} is not installed!"
 msgstr ""
 
-#: js/share.js:29 js/share.js:43 js/share.js:90
+#: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr ""
 
-#: js/share.js:93
+#: js/share.js:90
 msgid "Share"
 msgstr ""
 
-#: js/share.js:141 js/share.js:622
+#: js/share.js:125 js/share.js:617
 msgid "Error while sharing"
 msgstr "Ø´Ø¦ÛŒØ±Ù†Ú¯ Ú©Û’ Ø¯ÙˆØ±Ø§Ù† Ø§ÛŒØ±Ø±"
 
-#: js/share.js:152
+#: js/share.js:136
 msgid "Error while unsharing"
 msgstr "Ø´Ø¦ÛŒØ±Ù†Ú¯ Ø®ØªÙ… Ú©Ø±Ù†Û’  Ú©Û’ Ø¯ÙˆØ±Ø§Ù† Ø§ÛŒØ±Ø±"
 
-#: js/share.js:159
+#: js/share.js:143
 msgid "Error while changing permissions"
 msgstr "Ø§Ø®ØªÛŒØ§Ø±Ø§Øª Ú©Ùˆ ØªØ¨Ø¯ÛŒÙ„ Ú©Ø±Ù†Û’ Ú©Û’ Ø¯ÙˆØ±Ø§Ù† Ø§ÛŒØ±Ø±"
 
-#: js/share.js:168
+#: js/share.js:152
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:170
+#: js/share.js:154
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:175
+#: js/share.js:159
 msgid "Share with"
 msgstr "Ø§Ø³ Ú©Û’ Ø³Ø§ØªÚ¾ Ø´Ø¦ÛŒØ± Ú©Ø±ÛŒÚº"
 
-#: js/share.js:180
+#: js/share.js:164
 msgid "Share with link"
 msgstr "Ù„Ù†Ú© Ú©Û’ Ø³Ø§ØªÚ¾ Ø´Ø¦ÛŒØ± Ú©Ø±ÛŒÚº"
 
-#: js/share.js:183
+#: js/share.js:167
 msgid "Password protect"
 msgstr "Ù¾Ø§Ø³ÙˆØ±Úˆ Ø³Û’ Ù…ØÙÙˆØ¸ Ú©Ø±ÛŒÚº"
 
-#: js/share.js:185 templates/installation.php:47 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Ù¾Ø§Ø³ÙˆØ±Úˆ"
 
-#: js/share.js:189
+#: js/share.js:173
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:190
+#: js/share.js:174
 msgid "Send"
 msgstr ""
 
-#: js/share.js:194
+#: js/share.js:178
 msgid "Set expiration date"
 msgstr "ØªØ§Ø±ÛŒØ® Ù…Ø¹ÛŒØ§Ø¯ Ø³ÛŒÙ¹ Ú©Ø±ÛŒÚº"
 
-#: js/share.js:195
+#: js/share.js:179
 msgid "Expiration date"
 msgstr "ØªØ§Ø±ÛŒØ® Ù…Ø¹ÛŒØ§Ø¯"
 
-#: js/share.js:227
+#: js/share.js:211
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:229
+#: js/share.js:213
 msgid "No people found"
 msgstr "Ú©ÙˆØ¦ÛŒ Ù„ÙˆÚ¯ Ù†ÛÛŒÚº Ù…Ù„Û’Û”"
 
-#: js/share.js:256
+#: js/share.js:251
 msgid "Resharing is not allowed"
 msgstr "Ø¯ÙˆØ¨Ø§Ø±Û Ø´Ø¦ÛŒØ± Ú©Ø±Ù†Û’ Ú©ÛŒ Ø§Ø¬Ø§Ø²Øª Ù†ÛÛŒÚº"
 
-#: js/share.js:292
+#: js/share.js:287
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:313
+#: js/share.js:308
 msgid "Unshare"
 msgstr "Ø´Ø¦ÛŒØ±Ù†Ú¯ Ø®ØªÙ… Ú©Ø±ÛŒÚº"
 
-#: js/share.js:325
+#: js/share.js:320
 msgid "can edit"
 msgstr "Ø§ÛŒÚˆÙ¹ Ú©Ø± Ø³Ú©Û’"
 
-#: js/share.js:327
+#: js/share.js:322
 msgid "access control"
 msgstr "Ø§Ø³ÛŒØ³ Ú©Ù†Ù¹Ø±ÙˆÙ„"
 
-#: js/share.js:330
+#: js/share.js:325
 msgid "create"
 msgstr "Ù†ÛŒØ§ Ø¨Ù†Ø§Ø¦ÛŒÚº"
 
-#: js/share.js:333
+#: js/share.js:328
 msgid "update"
 msgstr "Ø§Ù¾ ÚˆÛŒÙ¹"
 
-#: js/share.js:336
+#: js/share.js:331
 msgid "delete"
 msgstr "Ø®ØªÙ… Ú©Ø±ÛŒÚº"
 
-#: js/share.js:339
+#: js/share.js:334
 msgid "share"
 msgstr "Ø´Ø¦ÛŒØ± Ú©Ø±ÛŒÚº"
 
-#: js/share.js:373 js/share.js:569
+#: js/share.js:368 js/share.js:564
 msgid "Password protected"
 msgstr "Ù¾Ø§Ø³ÙˆØ±Úˆ Ø³Û’ Ù…ØÙÙˆØ¸ Ú©ÛŒØ§ Ú¯ÛŒØ§ ÛÛ’"
 
-#: js/share.js:582
+#: js/share.js:577
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:594
+#: js/share.js:589
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:609
+#: js/share.js:604
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:620
+#: js/share.js:615
 msgid "Email sent"
 msgstr ""
 
@@ -395,24 +396,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:41
-#: 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 "Ø±ÛŒ Ø³ÛŒÙ¹ Ú©ÛŒ Ø¯Ø±Ø®ÙˆØ§Ø³Øª Ú©Ø±ÛŒÚº"
 
@@ -469,115 +473,129 @@ 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: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:33
+#: 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:37
+#: templates/installation.php:44
 msgid "Create an <strong>admin account</strong>"
 msgstr "Ø§ÛŒÚ©<strong> Ø§ÛŒÚˆÙ…Ù† Ø§Ú©Ø§Ø¤Ù†Ù¹</strong> Ø¨Ù†Ø§Ø¦ÛŒÚº"
 
-#: templates/installation.php:55
+#: templates/installation.php:62
 msgid "Advanced"
 msgstr "Ø§ÛŒÚˆÙˆØ§Ù†Ø³Úˆ"
 
-#: templates/installation.php:57
+#: templates/installation.php:64
 msgid "Data folder"
 msgstr "ÚˆÛŒÙ¹Ø§ ÙÙˆÙ„ÚˆØ±"
 
-#: templates/installation.php:66
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "ÚˆÛŒÙ¹Ø§ Ø¨ÛŒØ³ Ú©ÙˆÙ†ÙÚ¯Ø± Ú©Ø±ÛŒÚº"
 
-#: templates/installation.php:71 templates/installation.php:83
-#: templates/installation.php:94 templates/installation.php:105
-#: templates/installation.php:117
+#: 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:129
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "ÚˆÛŒÙ¹Ø§Ø¨ÛŒØ³ ÛŒÙˆØ²Ø±"
 
-#: templates/installation.php:134
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "ÚˆÛŒÙ¹Ø§Ø¨ÛŒØ³ Ù¾Ø§Ø³ÙˆØ±Úˆ"
 
-#: templates/installation.php:139
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "ÚˆÛŒÙ¹Ø§Ø¨ÛŒØ³ Ú©Ø§ Ù†Ø§Ù…"
 
-#: templates/installation.php:149
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "ÚˆÛŒÙ¹Ø§Ø¨ÛŒØ³ Ù¹ÛŒØ¨Ù„ Ø³Ù¾ÛŒØ³"
 
-#: templates/installation.php:156
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "ÚˆÛŒÙ¹Ø§Ø¨ÛŒØ³ ÛÙˆØ³Ù¹"
 
-#: templates/installation.php:162
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "Ø³ÛŒÙ¹ Ø§Ù¾ Ø®ØªÙ… Ú©Ø±ÛŒÚº"
 
-#: templates/layout.guest.php:35
+#: templates/layout.guest.php:40
 msgid "web services under your control"
 msgstr "Ø¢Ù¾ Ú©Û’ Ø§Ø®ØªÛŒØ§Ø± Ù…ÛŒÚº ÙˆÛŒØ¨ Ø³Ø±ÙˆØ³ÛŒØ²"
 
-#: templates/layout.user.php:53
+#: 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/ur_PK/files.po b/l10n/ur_PK/files.po
index f331a7fa8a8aa249a0f1da81a71a6bbd866a192b..e34cfafff4b43726dfcb9cb346d5c65a6ed4a335 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-03-04 00:06+0100\n"
-"PO-Revision-Date: 2013-03-03 23:06+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10: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,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 ""
@@ -70,59 +66,70 @@ msgstr ""
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:10
+#: 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 ""
 
-#: js/fileactions.js:127 templates/index.php:92 templates/index.php:93
+#: 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/files.js:292 js/files.js:408
-#: js/files.js:439
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:251
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:323
+#: 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 ""
@@ -145,77 +152,77 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:225
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:262
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:262
-msgid "Upload Error"
-msgstr ""
-
-#: js/files.js:273
-msgid "Close"
+#: js/files.js:277
+msgid "Not enough space available"
 msgstr ""
 
-#: js/files.js:312
-msgid "1 file uploading"
-msgstr ""
-
-#: js/files.js:315 js/files.js:370 js/files.js:385
-msgid "{count} files uploading"
-msgstr ""
-
-#: js/files.js:388 js/files.js:423
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:497
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:570
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:575
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:953 templates/index.php:68
+#: 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:954 templates/index.php:79
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr ""
 
-#: js/files.js:955 templates/index.php:81
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:974
+#: js/files.js:898
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:976
+#: js/files.js:900
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:984
+#: js/files.js:908
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:986
+#: 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 ""
@@ -268,45 +275,45 @@ msgstr ""
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:42
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:48
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:53
+#: templates/index.php:54
 msgid "You donâ€™t have write permissions here."
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:74
+#: templates/index.php:75
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:86 templates/index.php:87
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
-msgstr ""
+msgstr "Ø´Ø¦ÛŒØ±Ù†Ú¯ Ø®ØªÙ… Ú©Ø±ÛŒÚº"
 
-#: templates/index.php:106
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:108
+#: 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:113
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:116
+#: 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..155fc654d03b0bd0be0566cfb6e9ecf8d2abdfe4 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-04-26 10:00+0200\n"
+"PO-Revision-Date: 2013-04-26 08:01+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/ur_PK/files_external.po b/l10n/ur_PK/files_external.po
index e9bdbedc1196fedbcb0bfee847746cbe6bd7029f..c1a5f1dda05039bc08b6ca65dfd03a9bd3b087a5 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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..3310ed74536c59715ce6a86173b83da0c108581e 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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 89afda771afe20f8c9a9af8703a9d9f1d6c1a341..8844c8c59e1e2e53041dbd90f3b6138aefdd33aa 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-03-08 00:25+0100\n"
-"PO-Revision-Date: 2013-03-07 23:25+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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,12 +17,12 @@ msgstr ""
 "Language: ur_PK\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:40
+#: ajax/delete.php:42
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
 
-#: ajax/undelete.php:41
+#: ajax/undelete.php:42
 #, php-format
 msgid "Couldn't restore %s"
 msgstr ""
@@ -31,6 +31,10 @@ msgstr ""
 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 ""
diff --git a/l10n/ur_PK/files_versions.po b/l10n/ur_PK/files_versions.po
index f2a9b38da54dc38e2301def533d722b59ef80b91..3cd19f481faeb2c21f7f4fa4511c33265b702277 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-04-26 10:00+0200\n"
+"PO-Revision-Date: 2013-04-26 08:02+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
 "MIME-Version: 1.0\n"
@@ -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 88660467ae64a001e51abbdf7714ea18c551da94..f12d98a35a0616c4fcecd8771a3e807df9e7aac6 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-02-27 14:35+0100\n"
-"PO-Revision-Date: 2013-02-27 13:36+0000\n"
+"POT-Creation-Date: 2013-04-28 01:57+0200\n"
+"PO-Revision-Date: 2013-04-27 23:57+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"
@@ -41,19 +41,19 @@ msgstr "Ø§ÛŒÙ¾Ø²"
 msgid "Admin"
 msgstr "Ø§ÛŒÚˆÙ…Ù†"
 
-#: files.php:202
+#: files.php:209
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:203
+#: files.php:210
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:204 files.php:231
+#: files.php:211 files.php:244
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:228
+#: files.php:241
 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,72 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:128 setup.php:320 setup.php:365
+#: setup.php:132 setup.php:325 setup.php:370
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:129 setup.php:152 setup.php:229
+#: setup.php:133 setup.php:156 setup.php:234
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:151 setup.php:453 setup.php:520
+#: setup.php:155 setup.php:458 setup.php:525
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:228
+#: setup.php:233
 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: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:583 setup.php:592 setup.php:600 setup.php:609
+#: setup.php:615
 #, 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:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
+#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
+#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:299
+#: setup.php:304
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:300
+#: setup.php:305
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:305
+#: setup.php:310
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:306
+#: setup.php:311
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:579 setup.php:611
+#: setup.php:584 setup.php:616
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:631
+#: setup.php:636
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:849
+#: setup.php:858
 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:859
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
@@ -239,19 +235,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 69006ade4028e22dfbdbb31d2fb5c4a6a7d9b7a3..f659385b36ff5df006682c2fae12e78b8198a87e 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-02-27 14:35+0100\n"
-"PO-Revision-Date: 2013-02-27 13:35+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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 ""
 
@@ -92,7 +96,7 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: js/apps.js:36 js/apps.js:64
+#: js/apps.js:36 js/apps.js:64 js/apps.js:83
 msgid "Enable"
 msgstr ""
 
@@ -100,68 +104,68 @@ msgstr ""
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:84
+#: 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:87
+#: js/apps.js:93
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:87
-msgid "Error"
-msgstr ""
-
-#: js/apps.js:90
+#: js/apps.js:96
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr ""
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "deleted"
 msgstr ""
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "undo"
 msgstr ""
 
-#: js/users.js:62
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:75 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
+#: templates/users.php:103
 msgid "Groups"
 msgstr ""
 
-#: js/users.js:78 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr ""
 
-#: js/users.js:191
+#: js/users.js:269
 msgid "add group"
 msgstr ""
 
-#: js/users.js:352
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:353 js/users.js:359 js/users.js:374
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:358
+#: js/users.js:426
 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,15 +316,19 @@ msgstr ""
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:230 templates/personal.php:102
+#: templates/admin.php:228
+msgid "Less"
+msgstr ""
+
+#: templates/admin.php:235 templates/personal.php:105
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:233 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 "
@@ -391,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:77
 msgid "Password"
 msgstr "Ù¾Ø§Ø³ÙˆØ±Úˆ"
 
@@ -415,82 +423,70 @@ msgstr "Ù†ÛŒØ§ Ù¾Ø§Ø³ÙˆØ±Úˆ"
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:76
 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:75
 msgid "Login Name"
 msgstr ""
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr ""
 
-#: templates/users.php:35
+#: templates/users.php:33
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:39 templates/users.php:133
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:57 templates/users.php:148
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:84
+#: templates/users.php:82
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:95
+#: templates/users.php:93
 msgid "change display name"
 msgstr ""
 
-#: templates/users.php:99
+#: templates/users.php:97
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:134
+#: templates/users.php:128
 msgid "Default"
 msgstr ""
diff --git a/l10n/ur_PK/user_ldap.po b/l10n/ur_PK/user_ldap.po
index 67a700b6057386b37f75e97af17d4b93e65513dc..61c99c1fcb8e83ac6a7e400349268b2f25062c7b 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-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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..874b058a6447778f4ae6d0fd6d9dcdcf79374efa 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-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/vi/core.po b/l10n/vi/core.po
index f8755bc4aed531d256462cb026e336a850ea5750..d5016bce855a19c5a43d6a9f26c6f2ad41d512df 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-02-22 00:06+0100\n"
-"PO-Revision-Date: 2013-02-20 23:20+0000\n"
-"Last-Translator: saosangm <saosangmo@yahoo.com>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+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"
@@ -23,24 +18,24 @@ msgstr ""
 "Language: vi\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/share.php:85
+#: ajax/share.php:97
 #, php-format
 msgid "User %s shared a file with you"
 msgstr "%s chia sáº» táºp tin nÃ y cho báº¡n"
 
-#: ajax/share.php:87
+#: ajax/share.php:99
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr "%s chia sáº» thÆ° má»¥c nÃ y cho báº¡n"
 
-#: ajax/share.php:89
+#: ajax/share.php:101
 #, php-format
 msgid ""
 "User %s shared the file \"%s\" with you. It is available for download here: "
 "%s"
 msgstr "NgÆ°á»i dÃ¹ng %s chia sáº» táºp tin \"%s\" cho báº¡n .Báº¡n cÃ³ thá»ƒ táº£i táº¡i Ä‘Ã¢y : %s"
 
-#: ajax/share.php:91
+#: ajax/share.php:104
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -79,86 +74,86 @@ 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
 msgid "Error removing %s from favorites."
 msgstr "Lá»—i xÃ³a %s tá»« má»¥c yÃªu thÃch."
 
-#: js/config.php:32
+#: js/config.php:34
 msgid "Sunday"
 msgstr "Chá»§ nháºt"
 
-#: js/config.php:32
+#: js/config.php:35
 msgid "Monday"
 msgstr "Thá»© 2"
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Tuesday"
 msgstr "Thá»© 3"
 
-#: js/config.php:32
+#: js/config.php:37
 msgid "Wednesday"
 msgstr "Thá»© 4"
 
-#: js/config.php:32
+#: js/config.php:38
 msgid "Thursday"
 msgstr "Thá»© 5"
 
-#: js/config.php:32
+#: js/config.php:39
 msgid "Friday"
 msgstr "Thá»© "
 
-#: js/config.php:32
+#: js/config.php:40
 msgid "Saturday"
 msgstr "Thá»© 7"
 
-#: js/config.php:33
+#: js/config.php:45
 msgid "January"
 msgstr "ThÃ¡ng 1"
 
-#: js/config.php:33
+#: js/config.php:46
 msgid "February"
 msgstr "ThÃ¡ng 2"
 
-#: js/config.php:33
+#: js/config.php:47
 msgid "March"
 msgstr "ThÃ¡ng 3"
 
-#: js/config.php:33
+#: js/config.php:48
 msgid "April"
 msgstr "ThÃ¡ng 4"
 
-#: js/config.php:33
+#: js/config.php:49
 msgid "May"
 msgstr "ThÃ¡ng 5"
 
-#: js/config.php:33
+#: js/config.php:50
 msgid "June"
 msgstr "ThÃ¡ng 6"
 
-#: js/config.php:33
+#: js/config.php:51
 msgid "July"
 msgstr "ThÃ¡ng 7"
 
-#: js/config.php:33
+#: js/config.php:52
 msgid "August"
 msgstr "ThÃ¡ng 8"
 
-#: js/config.php:33
+#: js/config.php:53
 msgid "September"
 msgstr "ThÃ¡ng 9"
 
-#: js/config.php:33
+#: js/config.php:54
 msgid "October"
 msgstr "ThÃ¡ng 10"
 
-#: js/config.php:33
+#: js/config.php:55
 msgid "November"
 msgstr "ThÃ¡ng 11"
 
-#: js/config.php:33
+#: js/config.php:56
 msgid "December"
 msgstr "ThÃ¡ng 12"
 
@@ -166,86 +161,88 @@ msgstr "ThÃ¡ng 12"
 msgid "Settings"
 msgstr "CÃ i Ä‘áº·t"
 
-#: js/js.js:767
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "vÃ i giÃ¢y trÆ°á»›c"
 
-#: js/js.js:768
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "1 phÃºt trÆ°á»›c"
 
-#: js/js.js:769
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr "{minutes} phÃºt trÆ°á»›c"
 
-#: js/js.js:770
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr "1 giá» trÆ°á»›c"
 
-#: js/js.js:771
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr "{hours} giá» trÆ°á»›c"
 
-#: js/js.js:772
+#: js/js.js:723
 msgid "today"
 msgstr "hÃ´m nay"
 
-#: js/js.js:773
+#: js/js.js:724
 msgid "yesterday"
 msgstr "hÃ´m qua"
 
-#: js/js.js:774
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr "{days} ngÃ y trÆ°á»›c"
 
-#: js/js.js:775
+#: js/js.js:726
 msgid "last month"
 msgstr "thÃ¡ng trÆ°á»›c"
 
-#: js/js.js:776
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr "{months} thÃ¡ng trÆ°á»›c"
 
-#: js/js.js:777
+#: js/js.js:728
 msgid "months ago"
 msgstr "thÃ¡ng trÆ°á»›c"
 
-#: js/js.js:778
+#: js/js.js:729
 msgid "last year"
 msgstr "nÄƒm trÆ°á»›c"
 
-#: js/js.js:779
+#: js/js.js:730
 msgid "years ago"
 msgstr "nÄƒm trÆ°á»›c"
 
-#: js/oc-dialogs.js:126
-msgid "Choose"
-msgstr "Chá»n"
+#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
+msgid "Ok"
+msgstr "Äá»“ng Ã½"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
 msgid "Cancel"
 msgstr "Há»§y"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "KhÃ´ng"
+#: js/oc-dialogs.js:185
+msgid "Choose"
+msgstr "Chá»n"
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:215
 msgid "Yes"
 msgstr "CÃ³"
 
-#: js/oc-dialogs.js:180
-msgid "Ok"
-msgstr "Äá»“ng Ã½"
+#: js/oc-dialogs.js:222
+msgid "No"
+msgstr "KhÃ´ng"
 
 #: 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 "Loáº¡i Ä‘á»‘i tÆ°á»£ng khÃ´ng Ä‘Æ°á»£c chá»‰ Ä‘á»‹nh."
 
-#: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:582
-#: js/share.js:594
+#: 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 "Lá»—i"
 
@@ -257,127 +254,127 @@ msgstr "TÃªn á»©ng dá»¥ng khÃ´ng Ä‘Æ°á»£c chá»‰ Ä‘á»‹nh."
 msgid "The required file {file} is not installed!"
 msgstr "Táºp tin cáº§n thiáº¿t {file} khÃ´ng Ä‘Æ°á»£c cÃ i Ä‘áº·t!"
 
-#: js/share.js:29 js/share.js:43 js/share.js:90
+#: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr "ÄÆ°á»£c chia sáº»"
 
-#: js/share.js:93
+#: js/share.js:90
 msgid "Share"
 msgstr "Chia sáº»"
 
-#: js/share.js:141 js/share.js:622
+#: js/share.js:125 js/share.js:617
 msgid "Error while sharing"
 msgstr "Lá»—i trong quÃ¡ trÃ¬nh chia sáº»"
 
-#: js/share.js:152
+#: js/share.js:136
 msgid "Error while unsharing"
 msgstr "Lá»—i trong quÃ¡ trÃ¬nh gá»¡ chia sáº»"
 
-#: js/share.js:159
+#: js/share.js:143
 msgid "Error while changing permissions"
 msgstr "Lá»—i trong quÃ¡ trÃ¬nh phÃ¢n quyá»n"
 
-#: js/share.js:168
+#: js/share.js:152
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "ÄÃ£ Ä‘Æ°á»£c chia sáº½ vá»›i báº¡n vÃ  nhÃ³m {group} bá»Ÿi {owner}"
 
-#: js/share.js:170
+#: js/share.js:154
 msgid "Shared with you by {owner}"
 msgstr "ÄÃ£ Ä‘Æ°á»£c chia sáº½ bá»Ÿi {owner}"
 
-#: js/share.js:175
+#: js/share.js:159
 msgid "Share with"
 msgstr "Chia sáº» vá»›i"
 
-#: js/share.js:180
+#: js/share.js:164
 msgid "Share with link"
 msgstr "Chia sáº» vá»›i liÃªn káº¿t"
 
-#: js/share.js:183
+#: js/share.js:167
 msgid "Password protect"
 msgstr "Máºt kháº©u báº£o vá»‡"
 
-#: js/share.js:185 templates/installation.php:44 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Máºt kháº©u"
 
-#: js/share.js:189
+#: js/share.js:173
 msgid "Email link to person"
 msgstr "LiÃªn káº¿t email tá»›i cÃ¡ nhÃ¢n"
 
-#: js/share.js:190
+#: js/share.js:174
 msgid "Send"
 msgstr "Gá»Ÿi"
 
-#: js/share.js:194
+#: js/share.js:178
 msgid "Set expiration date"
 msgstr "Äáº·t ngÃ y káº¿t thÃºc"
 
-#: js/share.js:195
+#: js/share.js:179
 msgid "Expiration date"
 msgstr "NgÃ y káº¿t thÃºc"
 
-#: js/share.js:227
+#: js/share.js:211
 msgid "Share via email:"
 msgstr "Chia sáº» thÃ´ng qua email"
 
-#: js/share.js:229
+#: js/share.js:213
 msgid "No people found"
 msgstr "KhÃ´ng tÃ¬m tháº¥y ngÆ°á»i nÃ o"
 
-#: js/share.js:256
+#: js/share.js:251
 msgid "Resharing is not allowed"
 msgstr "Chia sáº» láº¡i khÃ´ng Ä‘Æ°á»£c cho phÃ©p"
 
-#: js/share.js:292
+#: js/share.js:287
 msgid "Shared in {item} with {user}"
 msgstr "ÄÃ£ Ä‘Æ°á»£c chia sáº½ trong {item} vá»›i {user}"
 
-#: js/share.js:313
+#: js/share.js:308
 msgid "Unshare"
-msgstr "Gá»¡ bá» chia sáº»"
+msgstr "Bá» chia sáº»"
 
-#: js/share.js:325
+#: js/share.js:320
 msgid "can edit"
 msgstr "cÃ³ thá»ƒ chá»‰nh sá»a"
 
-#: js/share.js:327
+#: js/share.js:322
 msgid "access control"
 msgstr "quáº£n lÃ½ truy cáºp"
 
-#: js/share.js:330
+#: js/share.js:325
 msgid "create"
 msgstr "táº¡o"
 
-#: js/share.js:333
+#: js/share.js:328
 msgid "update"
 msgstr "cáºp nháºt"
 
-#: js/share.js:336
+#: js/share.js:331
 msgid "delete"
 msgstr "xÃ³a"
 
-#: js/share.js:339
+#: js/share.js:334
 msgid "share"
 msgstr "chia sáº»"
 
-#: js/share.js:373 js/share.js:569
+#: js/share.js:368 js/share.js:564
 msgid "Password protected"
 msgstr "Máºt kháº©u báº£o vá»‡"
 
-#: js/share.js:582
+#: js/share.js:577
 msgid "Error unsetting expiration date"
 msgstr "Lá»—i khÃ´ng thiáº¿t láºp ngÃ y káº¿t thÃºc"
 
-#: js/share.js:594
+#: js/share.js:589
 msgid "Error setting expiration date"
 msgstr "Lá»—i cáº¥u hÃ¬nh ngÃ y káº¿t thÃºc"
 
-#: js/share.js:609
+#: js/share.js:604
 msgid "Sending ..."
 msgstr "Äang gá»Ÿi ..."
 
-#: js/share.js:620
+#: js/share.js:615
 msgid "Email sent"
 msgstr "Email Ä‘Ã£ Ä‘Æ°á»£c gá»i"
 
@@ -400,24 +397,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:39
-#: 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 "
 
@@ -443,7 +443,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"
@@ -467,121 +467,136 @@ 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"
 msgstr "ThÃªm"
 
-#: templates/installation.php:23 templates/installation.php:30
+#: templates/installation.php:24 templates/installation.php:31
+#: templates/installation.php:38
 msgid "Security Warning"
 msgstr "Cáº£nh báº£o báº£o máºt"
 
-#: templates/installation.php:24
+#: templates/installation.php:25
+msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
+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 "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 ""
 "No secure random number generator is available, please enable the PHP "
 "OpenSSL extension."
 msgstr "KhÃ´ng an toÃ n ! chá»©c nÄƒng random number generator Ä‘Ã£ cÃ³ sáºµn ,vui lÃ²ng báºt  PHP OpenSSL extension."
 
-#: templates/installation.php:25
+#: 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 "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."
 
-#: templates/installation.php:31
+#: templates/installation.php:39
 msgid ""
 "Your data directory and files are probably accessible from the internet "
 "because the .htaccess file does not work."
 msgstr "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"
 
-#: templates/installation.php:32
+#: 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 "Äá»ƒ biáº¿t thÃªm cÃ¡ch cáº¥u hÃ¬nh mÃ¡y chá»§ cá»§a báº¡n, xin xem <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">tÃ i liá»‡u</a>."
 
-#: templates/installation.php:36
+#: templates/installation.php:44
 msgid "Create an <strong>admin account</strong>"
 msgstr "Táº¡o má»™t <strong>tÃ i khoáº£n quáº£n trá»‹</strong>"
 
-#: templates/installation.php:52
+#: templates/installation.php:62
 msgid "Advanced"
 msgstr "NÃ¢ng cao"
 
-#: templates/installation.php:54
+#: templates/installation.php:64
 msgid "Data folder"
 msgstr "ThÆ° má»¥c dá»¯ liá»‡u"
 
-#: templates/installation.php:61
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "Cáº¥u hÃ¬nh cÆ¡ sá»Ÿ dá»¯ liá»‡u"
 
-#: templates/installation.php:66 templates/installation.php:77
-#: templates/installation.php:87 templates/installation.php:97
+#: 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:109
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "NgÆ°á»i dÃ¹ng cÆ¡ sá»Ÿ dá»¯ liá»‡u"
 
-#: templates/installation.php:113
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "Máºt kháº©u cÆ¡ sá»Ÿ dá»¯ liá»‡u"
 
-#: templates/installation.php:117
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "TÃªn cÆ¡ sá»Ÿ dá»¯ liá»‡u"
 
-#: templates/installation.php:125
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "CÆ¡ sá»Ÿ dá»¯ liá»‡u tablespace"
 
-#: templates/installation.php:131
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "Database host"
 
-#: templates/installation.php:136
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "CÃ i Ä‘áº·t hoÃ n táº¥t"
 
-#: templates/layout.guest.php:33
+#: 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:48
+#: templates/layout.user.php:36
+#, 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:61
 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 960372e9db792431dd9e5ff073aa2dd22840ab45..67d6e94d7f4903e570c8898bbcfb882a471ee4d3 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-03-04 00:06+0100\n"
-"PO-Revision-Date: 2013-03-03 23:06+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10: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"
@@ -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"
@@ -75,59 +67,70 @@ msgstr "KhÃ´ng thá»ƒ ghi "
 msgid "Not enough storage available"
 msgstr "KhÃ´ng Ä‘á»§ khÃ´ng gian lÆ°u trá»¯"
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr "ThÆ° má»¥c khÃ´ng há»£p lá»‡"
 
-#: appinfo/app.php:10
+#: appinfo/app.php:12
 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:92 templates/index.php:93
+#: 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/files.js:292 js/files.js:408
-#: js/files.js:439
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
-msgstr "Chá»"
+msgstr "Äang chá»"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} Ä‘Ã£ tá»“n táº¡i"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "thay tháº¿"
 
-#: js/filelist.js:251
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "tÃªn gá»£i Ã½"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "há»§y"
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "Ä‘Ã£ thay tháº¿ {new_name} báº±ng {old_name}"
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "undo"
 msgstr "lÃ¹i láº¡i"
 
-#: js/filelist.js:323
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr "thá»±c hiá»‡n viá»‡c xÃ³a"
 
+#: js/filelist.js:413
+msgid "1 file uploading"
+msgstr "1 tá»‡p tin Ä‘ang Ä‘Æ°á»£c táº£i lÃªn"
+
+#: js/filelist.js:416 js/filelist.js:470
+msgid "files uploading"
+msgstr "tá»‡p tin Ä‘ang Ä‘Æ°á»£c táº£i lÃªn"
+
 #: js/files.js:52
 msgid "'.' is an invalid file name."
 msgstr "'.' lÃ  má»™t tÃªn file khÃ´ng há»£p lá»‡"
@@ -150,77 +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:225
+#: 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:262
+#: 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"
-
-#: js/files.js:262
-msgid "Upload Error"
-msgstr "Táº£i lÃªn lá»—i"
-
-#: js/files.js:273
-msgid "Close"
-msgstr "ÄÃ³ng"
+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:312
-msgid "1 file uploading"
-msgstr "1 tá»‡p tin Ä‘ang Ä‘Æ°á»£c táº£i lÃªn"
-
-#: js/files.js:315 js/files.js:370 js/files.js:385
-msgid "{count} files uploading"
-msgstr "{count} táºp tin Ä‘ang táº£i lÃªn"
+#: js/files.js:277
+msgid "Not enough space available"
+msgstr "KhÃ´ng Ä‘á»§ chá»— trá»‘ng cáº§n thiáº¿t"
 
-#: js/files.js:388 js/files.js:423
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "Há»§y táº£i lÃªn"
 
-#: js/files.js:497
+#: 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:570
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "URL khÃ´ng Ä‘Æ°á»£c Ä‘á»ƒ trá»‘ng."
 
-#: js/files.js:575
+#: 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:953 templates/index.php:68
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+msgid "Error"
+msgstr "Lá»—i"
+
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "TÃªn"
 
-#: js/files.js:954 templates/index.php:79
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "KÃch cá»¡"
 
-#: js/files.js:955 templates/index.php:81
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Thay Ä‘á»•i"
 
-#: js/files.js:974
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 thÆ° má»¥c"
 
-#: js/files.js:976
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} thÆ° má»¥c"
 
-#: js/files.js:984
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 táºp tin"
 
-#: js/files.js:986
+#: 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"
@@ -273,48 +276,48 @@ msgstr "ThÆ° má»¥c"
 msgid "From link"
 msgstr "Tá»« liÃªn káº¿t"
 
-#: templates/index.php:40
+#: templates/index.php:42
 msgid "Deleted files"
 msgstr "File Ä‘Ã£ bá»‹ xÃ³a"
 
-#: templates/index.php:46
+#: templates/index.php:48
 msgid "Cancel upload"
 msgstr "Há»§y upload"
 
-#: templates/index.php:53
+#: 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:60
+#: 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:74
+#: templates/index.php:75
 msgid "Download"
-msgstr "Táº£i xuá»‘ng"
+msgstr "Táº£i vá»"
 
-#: templates/index.php:86 templates/index.php:87
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
-msgstr "KhÃ´ng chia sáº½"
+msgstr "Bá» chia sáº»"
 
-#: templates/index.php:106
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "Táºp tin táº£i lÃªn quÃ¡ lá»›n"
 
-#: templates/index.php:108
+#: 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:113
+#: 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:116
+#: 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..378186a7fc7ee383d7a8430f59a06b0acdecf562 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
@@ -37,4 +35,4 @@ msgstr "Viá»‡c mÃ£ hÃ³a khÃ´ng bao gá»“m loáº¡i file sau"
 
 #: templates/settings.php:12
 msgid "None"
-msgstr "KhÃ´ng cÃ³ gÃ¬ háº¿t"
+msgstr "KhÃ´ng gÃ¬ cáº£"
diff --git a/l10n/vi/files_external.po b/l10n/vi/files_external.po
index b2b69ff3b3c9e7218cf31956041a1d7b066dba02..fd539c747a26b038694dfdb48ca758a3f0ed8174 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-01 00:05+0100\n"
-"PO-Revision-Date: 2013-02-27 23:20+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-12 02:01+0200\n"
+"PO-Revision-Date: 2013-05-05 06:20+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: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 "<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: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 "<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..97af1379ae094959a477041827d3f6ae99f47dc8 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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 5087b9c429781374baedded5117dd7630876f4c1..6e5de8cd4c2cc9ab3bf84fdf7bf6a29c3fab7296 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-03-08 00:25+0100\n"
-"PO-Revision-Date: 2013-03-07 23:25+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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"
@@ -18,12 +17,12 @@ msgstr ""
 "Language: vi\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/delete.php:40
+#: ajax/delete.php:42
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "KhÃ´ng thá»ƒ Ã³a %s vÄ©nh viá»…n"
 
-#: ajax/undelete.php:41
+#: ajax/undelete.php:42
 #, php-format
 msgid "Couldn't restore %s"
 msgstr "KhÃ´ng thá»ƒ khÃ´i phá»¥c %s"
@@ -32,6 +31,10 @@ msgstr "KhÃ´ng thá»ƒ khÃ´i phá»¥c %s"
 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
+msgid "Error"
+msgstr "Lá»—i"
+
 #: js/trash.js:34
 msgid "delete file permanently"
 msgstr "xÃ³a file vÄ©nh viá»…n"
@@ -78,4 +81,4 @@ msgstr "XÃ³a"
 
 #: templates/part.breadcrumb.php:9
 msgid "Deleted Files"
-msgstr ""
+msgstr "File Ä‘Ã£ xÃ³a"
diff --git a/l10n/vi/files_versions.po b/l10n/vi/files_versions.po
index df14039e1148212bab582cd8b68a65a2ac0f59fe..f65e940269f1321578498eea6c0169d8eb14cee4 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:30+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 c09c4caadc13287816cb2d10e8132addd98551ed..186aeccd9448a1a53faab1b2e13041a081593ef1 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-02-27 14:35+0100\n"
-"PO-Revision-Date: 2013-02-27 13:35+0000\n"
+"POT-Creation-Date: 2013-04-28 01:57+0200\n"
+"PO-Revision-Date: 2013-04-27 23:57+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"
@@ -45,19 +41,19 @@ msgstr "á»¨ng dá»¥ng"
 msgid "Admin"
 msgstr "Quáº£n trá»‹"
 
-#: files.php:202
+#: files.php:209
 msgid "ZIP download is turned off."
 msgstr "Táº£i vá» ZIP Ä‘Ã£ bá»‹ táº¯t."
 
-#: files.php:203
+#: files.php:210
 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:204 files.php:231
+#: files.php:211 files.php:244
 msgid "Back to Files"
 msgstr "Trá»Ÿ láº¡i táºp tin"
 
-#: files.php:228
+#: files.php:241
 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."
 
@@ -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,79 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:128 setup.php:320 setup.php:365
+#: setup.php:132 setup.php:325 setup.php:370
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:129 setup.php:152 setup.php:229
+#: setup.php:133 setup.php:156 setup.php:234
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:151 setup.php:453 setup.php:520
+#: setup.php:155 setup.php:458 setup.php:525
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:228
+#: setup.php:233
 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: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:583 setup.php:592 setup.php:600 setup.php:609
+#: setup.php:615
 #, 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:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
+#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
+#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:299
+#: setup.php:304
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:300
+#: setup.php:305
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:305
+#: setup.php:310
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:306
+#: setup.php:311
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:579 setup.php:611
+#: setup.php:584 setup.php:616
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:631
+#: setup.php:636
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:849
+#: setup.php:858
 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:859
 #, 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 +235,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 c0451608cf16628df89a5831569874c85849a8e5..22139400b8037a9c885ee8a76af8be42ed94f96d 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-02-27 14:35+0100\n"
-"PO-Revision-Date: 2013-02-27 13:35+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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á»‹"
 
@@ -99,7 +96,7 @@ msgstr "Cáºp nháºt lÃªn {appversion}"
 msgid "Disable"
 msgstr "Táº¯t"
 
-#: js/apps.js:36 js/apps.js:64
+#: js/apps.js:36 js/apps.js:64 js/apps.js:83
 msgid "Enable"
 msgstr "Báºt"
 
@@ -107,68 +104,68 @@ msgstr "Báºt"
 msgid "Please wait...."
 msgstr "Xin hÃ£y Ä‘á»£i..."
 
-#: js/apps.js:84
+#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+msgid "Error"
+msgstr "Lá»—i"
+
+#: js/apps.js:90
 msgid "Updating...."
 msgstr "Äang cáºp nháºt..."
 
-#: js/apps.js:87
+#: js/apps.js:93
 msgid "Error while updating app"
 msgstr "Lá»—i khi cáºp nháºt á»©ng dá»¥ng"
 
-#: js/apps.js:87
-msgid "Error"
-msgstr "Lá»—i"
-
-#: js/apps.js:90
+#: js/apps.js:96
 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:30
+#: js/users.js:47
 msgid "deleted"
 msgstr "Ä‘Ã£ xÃ³a"
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "undo"
 msgstr "lÃ¹i láº¡i"
 
-#: js/users.js:62
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:75 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
+#: templates/users.php:103
 msgid "Groups"
 msgstr "NhÃ³m"
 
-#: js/users.js:78 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr "NhÃ³m quáº£n trá»‹"
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "XÃ³a"
 
-#: js/users.js:191
+#: js/users.js:269
 msgid "add group"
 msgstr ""
 
-#: js/users.js:352
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:353 js/users.js:359 js/users.js:374
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:358
+#: js/users.js:426
 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,21 +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:230 templates/personal.php:102
+#: templates/admin.php:228
+msgid "Less"
+msgstr "Ãt"
+
+#: templates/admin.php:235 templates/personal.php:105
 msgid "Version"
 msgstr "PhiÃªn báº£n"
 
-#: templates/admin.php:233 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 "
@@ -398,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:77
 msgid "Password"
 msgstr "Máºt kháº©u"
 
@@ -416,88 +417,76 @@ 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:76
 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:68
 msgid "Email"
 msgstr "Email"
 
-#: templates/personal.php:72
+#: templates/personal.php:70
 msgid "Your email address"
 msgstr "Email cá»§a báº¡n"
 
-#: templates/personal.php:73
+#: templates/personal.php:71
 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:77 templates/personal.php:78
 msgid "Language"
 msgstr "NgÃ´n ngá»¯"
 
-#: templates/personal.php:86
+#: templates/personal.php:89
 msgid "Help translate"
 msgstr "Há»— trá»£ dá»‹ch thuáºt"
 
-#: templates/personal.php:91
+#: templates/personal.php:94
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:93
+#: templates/personal.php:96
 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:75
 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:33
 msgid "Default Storage"
 msgstr "Bá»™ nhá»› máº·c Ä‘á»‹nh"
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:39 templates/users.php:133
 msgid "Unlimited"
 msgstr "KhÃ´ng giá»›i háº¡n"
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:57 templates/users.php:148
 msgid "Other"
 msgstr "KhÃ¡c"
 
-#: templates/users.php:84
+#: templates/users.php:82
 msgid "Storage"
 msgstr "Bá»™ nhá»›"
 
-#: templates/users.php:95
+#: templates/users.php:93
 msgid "change display name"
 msgstr "Thay Ä‘á»•i tÃªn hiá»ƒn thá»‹"
 
-#: templates/users.php:99
+#: templates/users.php:97
 msgid "set new password"
 msgstr "Ä‘áº·t máºt kháº©u má»›i"
 
-#: templates/users.php:134
+#: templates/users.php:128
 msgid "Default"
 msgstr "Máº·c Ä‘á»‹nh"
diff --git a/l10n/vi/user_ldap.po b/l10n/vi/user_ldap.po
index a1f05a928288d8a3ffc3b16069139624ca675cb8..c94715753c3fbc0528b1c0df290e8062d0365abc 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-02 00:03+0100\n"
-"PO-Revision-Date: 2013-03-01 23:04+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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:18
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:37
 msgid "Host"
 msgstr "MÃ¡y chá»§"
 
-#: templates/settings.php:25
+#: 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:26
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "DN cÆ¡ báº£n"
 
-#: 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 "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:30
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "NgÆ°á»i dÃ¹ng DN"
 
-#: 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 "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:33
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Máºt kháº©u"
 
-#: templates/settings.php:36
+#: 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:37
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "Lá»c ngÆ°á»i dÃ¹ng Ä‘Äƒng nháºp"
 
-#: 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 "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:41
+#: 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:42
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Lá»c danh sÃ¡ch thÃ nh viÃªn"
 
-#: templates/settings.php:45
+#: 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:46
+#: 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:47
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "Bá»™ lá»c nhÃ³m"
 
-#: templates/settings.php:50
+#: 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:51
+#: 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:55
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr "Connection Settings"
 
-#: 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 "Cá»•ng"
 
-#: 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 "Cá»•ng sao lÆ°u (Replica)"
 
-#: templates/settings.php:61
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr "Táº¯t mÃ¡y chá»§ chÃnh"
 
-#: templates/settings.php:61
+#: 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:62
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "Sá» dá»¥ng TLS"
 
-#: templates/settings.php:62
+#: 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:63
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "TrÆ°á»ng há»£p insensitve LDAP mÃ¡y chá»§ (Windows)"
 
-#: templates/settings.php:64
+#: 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: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 "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:64
+#: 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: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 "trong vÃ i giÃ¢y. Má»™t sá»± thay Ä‘á»•i bá»™ nhá»› cache."
 
-#: templates/settings.php:67
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr "Directory Settings"
 
-#: templates/settings.php:69
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr "Hiá»ƒn thá»‹ tÃªn ngÆ°á»i sá» dá»¥ng"
 
-#: templates/settings.php:69
+#: 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:70
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "CÃ¢y ngÆ°á»i dÃ¹ng cÆ¡ báº£n"
 
-#: 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 "User Search Attributes"
 
-#: templates/settings.php:71 templates/settings.php:74
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr "Optional; one attribute per line"
 
-#: templates/settings.php:72
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr "Hiá»ƒn thá»‹ tÃªn nhÃ³m"
 
-#: templates/settings.php:72
+#: 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:73
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "CÃ¢y nhÃ³m cÆ¡ báº£n"
 
-#: 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 "Group Search Attributes"
 
-#: templates/settings.php:75
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr "NhÃ³m thÃ nh viÃªn Cá»™ng Ä‘á»“ng"
 
-#: templates/settings.php:77
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr "Special Attributes"
 
-#: 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 "Theo Byte"
 
-#: 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 "Äá»ƒ 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: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 "GiÃºp Ä‘á»¡"
diff --git a/l10n/vi/user_webdavauth.po b/l10n/vi/user_webdavauth.po
index 57c796e00db20b026f43e25794eaf661b5c80f1c..9f0e00a50a2f519fcee2746d56f6a8e4d7c0667b 100644
--- a/l10n/vi/user_webdavauth.po
+++ b/l10n/vi/user_webdavauth.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-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-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
 "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 971edd7b11dfeaf8d1e0b0cdb9bc4c579c4c24b6..0915509f39cacbe0b3f0f974f38bf737cdd683de 100644
--- a/l10n/zh_CN.GB2312/core.po
+++ b/l10n/zh_CN.GB2312/core.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-02-22 00:06+0100\n"
-"PO-Revision-Date: 2013-02-20 23:20+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10: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"
@@ -19,33 +17,33 @@ msgstr ""
 "Language: zh_CN.GB2312\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/share.php:85
+#: ajax/share.php:97
 #, php-format
 msgid "User %s shared a file with you"
-msgstr ""
+msgstr "ç”¨æˆ· %s ä¸Žæ‚¨åˆ†äº«äº†ä¸€ä¸ªæ–‡ä»¶"
 
-#: ajax/share.php:87
+#: ajax/share.php:99
 #, php-format
 msgid "User %s shared a folder with you"
-msgstr ""
+msgstr "ç”¨æˆ· %s ä¸Žæ‚¨åˆ†äº«äº†ä¸€ä¸ªæ–‡ä»¶å¤¹"
 
-#: ajax/share.php:89
+#: ajax/share.php:101
 #, php-format
 msgid ""
 "User %s shared the file \"%s\" with you. It is available for download here: "
 "%s"
-msgstr ""
+msgstr "ç”¨æˆ· %s ä¸Žæ‚¨åˆ†äº«äº†æ–‡ä»¶â€œ%sâ€ã€‚ç‚¹å‡»ä¸‹è½½ï¼š%s"
 
-#: ajax/share.php:91
+#: ajax/share.php:104
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
 "here: %s"
-msgstr ""
+msgstr "ç”¨æˆ· %s ä¸Žæ‚¨åˆ†äº«äº†æ–‡ä»¶å¤¹â€œ%sâ€ã€‚ç‚¹å‡»ä¸‹è½½ï¼š%s"
 
 #: 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?"
@@ -54,13 +52,13 @@ 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
 #: ajax/vcategories/removeFromFavorites.php:26
 msgid "Object type not provided."
-msgstr ""
+msgstr "æœªé€‰æ‹©å¯¹è±¡ç±»åž‹ã€‚"
 
 #: ajax/vcategories/addToFavorites.php:30
 #: ajax/vcategories/removeFromFavorites.php:30
@@ -75,86 +73,86 @@ 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 ""
 
-#: js/config.php:32
+#: js/config.php:34
 msgid "Sunday"
 msgstr "æ˜ŸæœŸå¤©"
 
-#: js/config.php:32
+#: js/config.php:35
 msgid "Monday"
 msgstr "æ˜ŸæœŸä¸€"
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Tuesday"
 msgstr "æ˜ŸæœŸäºŒ"
 
-#: js/config.php:32
+#: js/config.php:37
 msgid "Wednesday"
 msgstr "æ˜ŸæœŸä¸‰"
 
-#: js/config.php:32
+#: js/config.php:38
 msgid "Thursday"
 msgstr "æ˜ŸæœŸå››"
 
-#: js/config.php:32
+#: js/config.php:39
 msgid "Friday"
 msgstr "æ˜ŸæœŸäº”"
 
-#: js/config.php:32
+#: js/config.php:40
 msgid "Saturday"
 msgstr "æ˜ŸæœŸå…"
 
-#: js/config.php:33
+#: js/config.php:45
 msgid "January"
 msgstr "ä¸€æœˆ"
 
-#: js/config.php:33
+#: js/config.php:46
 msgid "February"
 msgstr "äºŒæœˆ"
 
-#: js/config.php:33
+#: js/config.php:47
 msgid "March"
 msgstr "ä¸‰æœˆ"
 
-#: js/config.php:33
+#: js/config.php:48
 msgid "April"
 msgstr "å››æœˆ"
 
-#: js/config.php:33
+#: js/config.php:49
 msgid "May"
 msgstr "äº”æœˆ"
 
-#: js/config.php:33
+#: js/config.php:50
 msgid "June"
 msgstr "å…æœˆ"
 
-#: js/config.php:33
+#: js/config.php:51
 msgid "July"
 msgstr "ä¸ƒæœˆ"
 
-#: js/config.php:33
+#: js/config.php:52
 msgid "August"
 msgstr "å…«æœˆ"
 
-#: js/config.php:33
+#: js/config.php:53
 msgid "September"
 msgstr "ä¹æœˆ"
 
-#: js/config.php:33
+#: js/config.php:54
 msgid "October"
 msgstr "åæœˆ"
 
-#: js/config.php:33
+#: js/config.php:55
 msgid "November"
 msgstr "åä¸€æœˆ"
 
-#: js/config.php:33
+#: js/config.php:56
 msgid "December"
 msgstr "åäºŒæœˆ"
 
@@ -162,231 +160,233 @@ msgstr "åäºŒæœˆ"
 msgid "Settings"
 msgstr "è®¾ç½®"
 
-#: js/js.js:767
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "ç§’å‰"
 
-#: js/js.js:768
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "1 åˆ†é’Ÿå‰"
 
-#: js/js.js:769
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr "{minutes} åˆ†é’Ÿå‰"
 
-#: js/js.js:770
+#: js/js.js:721
 msgid "1 hour ago"
-msgstr ""
+msgstr "1å°æ—¶å‰"
 
-#: js/js.js:771
+#: js/js.js:722
 msgid "{hours} hours ago"
-msgstr ""
+msgstr "{hours}å°æ—¶å‰"
 
-#: js/js.js:772
+#: js/js.js:723
 msgid "today"
 msgstr "ä»Šå¤©"
 
-#: js/js.js:773
+#: js/js.js:724
 msgid "yesterday"
 msgstr "æ˜¨å¤©"
 
-#: js/js.js:774
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr "{days} å¤©å‰"
 
-#: js/js.js:775
+#: js/js.js:726
 msgid "last month"
 msgstr "ä¸Šä¸ªæœˆ"
 
-#: js/js.js:776
+#: js/js.js:727
 msgid "{months} months ago"
-msgstr ""
+msgstr "{months}æœˆå‰"
 
-#: js/js.js:777
+#: js/js.js:728
 msgid "months ago"
 msgstr "æœˆå‰"
 
-#: js/js.js:778
+#: js/js.js:729
 msgid "last year"
 msgstr "åŽ»å¹´"
 
-#: js/js.js:779
+#: js/js.js:730
 msgid "years ago"
 msgstr "å¹´å‰"
 
-#: js/oc-dialogs.js:126
-msgid "Choose"
-msgstr "é€‰æ‹©"
+#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
+msgid "Ok"
+msgstr "å¥½çš„"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
 msgid "Cancel"
 msgstr "å–æ¶ˆ"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "å¦"
+#: js/oc-dialogs.js:185
+msgid "Choose"
+msgstr "é€‰æ‹©"
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:215
 msgid "Yes"
 msgstr "æ˜¯"
 
-#: js/oc-dialogs.js:180
-msgid "Ok"
-msgstr "å¥½çš„"
+#: js/oc-dialogs.js:222
+msgid "No"
+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:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:582
-#: js/share.js:594
+#: 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 "å‡ºé”™"
 
 #: 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 "æœªå®‰è£…æ‰€éœ€è¦çš„æ–‡ä»¶ {file} ï¼"
 
-#: js/share.js:29 js/share.js:43 js/share.js:90
+#: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
-msgstr ""
+msgstr "å·²åˆ†äº«"
 
-#: js/share.js:93
+#: js/share.js:90
 msgid "Share"
 msgstr "åˆ†äº«"
 
-#: js/share.js:141 js/share.js:622
+#: js/share.js:125 js/share.js:617
 msgid "Error while sharing"
 msgstr "åˆ†äº«å‡ºé”™"
 
-#: js/share.js:152
+#: js/share.js:136
 msgid "Error while unsharing"
 msgstr "å–æ¶ˆåˆ†äº«å‡ºé”™"
 
-#: js/share.js:159
+#: js/share.js:143
 msgid "Error while changing permissions"
 msgstr "å˜æ›´æƒé™å‡ºé”™"
 
-#: js/share.js:168
+#: js/share.js:152
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "ç”± {owner} ä¸Žæ‚¨å’Œ {group} ç¾¤ç»„åˆ†äº«"
 
-#: js/share.js:170
+#: js/share.js:154
 msgid "Shared with you by {owner}"
 msgstr "ç”± {owner} ä¸Žæ‚¨åˆ†äº«"
 
-#: js/share.js:175
+#: js/share.js:159
 msgid "Share with"
 msgstr "åˆ†äº«"
 
-#: js/share.js:180
+#: js/share.js:164
 msgid "Share with link"
 msgstr "åˆ†äº«é“¾æŽ¥"
 
-#: js/share.js:183
+#: js/share.js:167
 msgid "Password protect"
 msgstr "å¯†ç ä¿æŠ¤"
 
-#: js/share.js:185 templates/installation.php:44 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "å¯†ç "
 
-#: js/share.js:189
+#: js/share.js:173
 msgid "Email link to person"
-msgstr ""
+msgstr "é¢å‘ä¸ªäººçš„ç”µåé‚®ä»¶é“¾æŽ¥"
 
-#: js/share.js:190
+#: js/share.js:174
 msgid "Send"
-msgstr ""
+msgstr "å‘é€"
 
-#: js/share.js:194
+#: js/share.js:178
 msgid "Set expiration date"
 msgstr "è®¾ç½®å¤±æ•ˆæ—¥æœŸ"
 
-#: js/share.js:195
+#: js/share.js:179
 msgid "Expiration date"
 msgstr "å¤±æ•ˆæ—¥æœŸ"
 
-#: js/share.js:227
+#: js/share.js:211
 msgid "Share via email:"
 msgstr "é€šè¿‡ç”µåé‚®ä»¶åˆ†äº«ï¼š"
 
-#: js/share.js:229
+#: js/share.js:213
 msgid "No people found"
 msgstr "æŸ¥æ— æ¤äºº"
 
-#: js/share.js:256
+#: js/share.js:251
 msgid "Resharing is not allowed"
 msgstr "ä¸å…è®¸é‡å¤åˆ†äº«"
 
-#: js/share.js:292
+#: js/share.js:287
 msgid "Shared in {item} with {user}"
 msgstr "å·²ç»ä¸Ž {user} åœ¨ {item} ä¸åˆ†äº«"
 
-#: js/share.js:313
+#: js/share.js:308
 msgid "Unshare"
 msgstr "å–æ¶ˆåˆ†äº«"
 
-#: js/share.js:325
+#: js/share.js:320
 msgid "can edit"
 msgstr "å¯ç¼–è¾‘"
 
-#: js/share.js:327
+#: js/share.js:322
 msgid "access control"
 msgstr "è®¿é—®æŽ§åˆ¶"
 
-#: js/share.js:330
+#: js/share.js:325
 msgid "create"
 msgstr "åˆ›å»º"
 
-#: js/share.js:333
+#: js/share.js:328
 msgid "update"
 msgstr "æ›´æ–°"
 
-#: js/share.js:336
+#: js/share.js:331
 msgid "delete"
 msgstr "åˆ é™¤"
 
-#: js/share.js:339
+#: js/share.js:334
 msgid "share"
 msgstr "åˆ†äº«"
 
-#: js/share.js:373 js/share.js:569
+#: js/share.js:368 js/share.js:564
 msgid "Password protected"
 msgstr "å¯†ç ä¿æŠ¤"
 
-#: js/share.js:582
+#: js/share.js:577
 msgid "Error unsetting expiration date"
 msgstr "å–æ¶ˆè®¾ç½®å¤±æ•ˆæ—¥æœŸå‡ºé”™"
 
-#: js/share.js:594
+#: js/share.js:589
 msgid "Error setting expiration date"
 msgstr "è®¾ç½®å¤±æ•ˆæ—¥æœŸå‡ºé”™"
 
-#: js/share.js:609
+#: js/share.js:604
 msgid "Sending ..."
-msgstr ""
+msgstr "å‘é€ä¸â€¦â€¦"
 
-#: js/share.js:620
+#: 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 ""
+msgstr "å‡çº§å¤±è´¥ã€‚è¯·å‘<a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloudç¤¾åŒº</a>æŠ¥å‘Šæ¤é—®é¢˜ã€‚"
 
 #: js/update.js:18
 msgid "The update was successful. Redirecting you to ownCloud now."
-msgstr ""
+msgstr "å‡çº§æˆåŠŸã€‚çŽ°åœ¨ä¸ºæ‚¨è·³è½¬åˆ°ownCloudã€‚"
 
 #: lostpassword/controller.php:48
 msgid "ownCloud password reset"
@@ -396,24 +396,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:39
-#: 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 "è¦æ±‚é‡ç½®"
 
@@ -435,7 +438,7 @@ msgstr "é‡ç½®å¯†ç "
 
 #: strings.php:5
 msgid "Personal"
-msgstr "ä¸ªäººçš„"
+msgstr "ç§äºº"
 
 #: strings.php:6
 msgid "Users"
@@ -443,11 +446,11 @@ msgstr "ç”¨æˆ·"
 
 #: strings.php:7
 msgid "Apps"
-msgstr "åº”ç”¨ç¨‹åº"
+msgstr "ç¨‹åº"
 
 #: strings.php:8
 msgid "Admin"
-msgstr "ç®¡ç†"
+msgstr "ç®¡ç†å‘˜"
 
 #: strings.php:9
 msgid "Help"
@@ -469,117 +472,132 @@ msgstr "ç¼–è¾‘åˆ†ç±»"
 msgid "Add"
 msgstr "æ·»åŠ "
 
-#: templates/installation.php:23 templates/installation.php:30
+#: 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 "è¯·å‡çº§æ‚¨çš„PHPç‰ˆæœ¬ä»¥ç¨³å®šè¿è¡ŒownCloudã€‚"
+
+#: templates/installation.php:32
 msgid ""
 "No secure random number generator is available, please enable the PHP "
 "OpenSSL extension."
 msgstr "æ²¡æœ‰å®‰å…¨éšæœºç ç”Ÿæˆå™¨ï¼Œè¯·å¯ç”¨ PHP OpenSSL æ‰©å±•ã€‚"
 
-#: templates/installation.php:25
+#: 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:31
+#: 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 "å› ä¸º.htaccessæ–‡ä»¶æ— æ•ˆï¼Œæ‚¨çš„æ•°æ®æ–‡ä»¶å¤¹åŠæ–‡ä»¶å¯èƒ½å¯ä»¥åœ¨äº’è”ç½‘ä¸Šè®¿é—®ã€‚"
 
-#: templates/installation.php:32
+#: 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:36
+#: templates/installation.php:44
 msgid "Create an <strong>admin account</strong>"
 msgstr "å»ºç«‹ä¸€ä¸ª <strong>ç®¡ç†å¸æˆ·</strong>"
 
-#: templates/installation.php:52
+#: templates/installation.php:62
 msgid "Advanced"
 msgstr "è¿›é˜¶"
 
-#: templates/installation.php:54
+#: templates/installation.php:64
 msgid "Data folder"
 msgstr "æ•°æ®å˜æ”¾æ–‡ä»¶å¤¹"
 
-#: templates/installation.php:61
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "é…ç½®æ•°æ®åº“"
 
-#: templates/installation.php:66 templates/installation.php:77
-#: templates/installation.php:87 templates/installation.php:97
+#: 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:109
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "æ•°æ®åº“ç”¨æˆ·"
 
-#: templates/installation.php:113
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "æ•°æ®åº“å¯†ç "
 
-#: templates/installation.php:117
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "æ•°æ®åº“ç”¨æˆ·å"
 
-#: templates/installation.php:125
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "æ•°æ®åº“è¡¨æ ¼ç©ºé—´"
 
-#: templates/installation.php:131
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "æ•°æ®åº“ä¸»æœº"
 
-#: templates/installation.php:136
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "å®Œæˆå®‰è£…"
 
-#: templates/layout.guest.php:33
+#: templates/layout.guest.php:40
 msgid "web services under your control"
-msgstr "ä½ æŽ§åˆ¶ä¸‹çš„ç½‘ç»œæœåŠ¡"
+msgstr "æ‚¨æŽ§åˆ¶çš„ç½‘ç»œæœåŠ¡"
+
+#: templates/layout.user.php:36
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr ""
 
-#: templates/layout.user.php:48
+#: 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 ""
+msgstr "å¤‡é€‰ç™»å½•"
 
 #: templates/part.pagenavi.php:3
 msgid "prev"
@@ -592,4 +610,4 @@ msgstr "å‰è¿›"
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
-msgstr ""
+msgstr "ownCloudæ£åœ¨å‡çº§è‡³ %s ç‰ˆï¼Œè¿™å¯èƒ½éœ€è¦ä¸€ç‚¹æ—¶é—´ã€‚"
diff --git a/l10n/zh_CN.GB2312/files.po b/l10n/zh_CN.GB2312/files.po
index af5d6f75221bd8c11c3c2058d09ebd0bc85849e1..c6e9e821ef1a925c6a4348edb58c50129744420a 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-03-04 00:06+0100\n"
-"PO-Revision-Date: 2013-03-03 23:06+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10: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"
@@ -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"
@@ -72,59 +66,70 @@ msgstr "å†™ç£ç›˜å¤±è´¥"
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:10
+#: 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 ""
 
-#: js/fileactions.js:127 templates/index.php:92 templates/index.php:93
+#: 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/files.js:292 js/files.js:408
-#: js/files.js:439
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
-msgstr "Pending"
+msgstr "ç‰å¾…ä¸"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} å·²å˜åœ¨"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "æ›¿æ¢"
 
-#: js/filelist.js:251
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "æŽ¨èåç§°"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "å–æ¶ˆ"
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "å·²ç”¨ {old_name} æ›¿æ¢ {new_name}"
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "undo"
 msgstr "æ’¤é”€"
 
-#: js/filelist.js:323
+#: 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 ""
@@ -147,77 +152,77 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:225
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:262
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "ä¸èƒ½ä¸Šä¼ ä½ æŒ‡å®šçš„æ–‡ä»¶,å¯èƒ½å› ä¸ºå®ƒæ˜¯ä¸ªæ–‡ä»¶å¤¹æˆ–è€…å¤§å°ä¸º0"
-
-#: js/files.js:262
-msgid "Upload Error"
-msgstr "ä¸Šä¼ é”™è¯¯"
-
-#: js/files.js:273
-msgid "Close"
-msgstr "å…³é—"
+msgstr "ä¸èƒ½ä¸Šä¼ æ‚¨çš„æ–‡ä»¶ï¼Œç”±äºŽå®ƒæ˜¯æ–‡ä»¶å¤¹æˆ–è€…ä¸ºç©ºæ–‡ä»¶"
 
-#: js/files.js:312
-msgid "1 file uploading"
-msgstr "1 ä¸ªæ–‡ä»¶æ£åœ¨ä¸Šä¼ "
-
-#: js/files.js:315 js/files.js:370 js/files.js:385
-msgid "{count} files uploading"
-msgstr "{count} ä¸ªæ–‡ä»¶æ£åœ¨ä¸Šä¼ "
+#: js/files.js:277
+msgid "Not enough space available"
+msgstr ""
 
-#: js/files.js:388 js/files.js:423
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "ä¸Šä¼ å–æ¶ˆäº†"
 
-#: js/files.js:497
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "æ–‡ä»¶æ£åœ¨ä¸Šä¼ ã€‚å…³é—é¡µé¢ä¼šå–æ¶ˆä¸Šä¼ ã€‚"
 
-#: js/files.js:570
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "ç½‘å€ä¸èƒ½ä¸ºç©ºã€‚"
 
-#: js/files.js:575
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:953 templates/index.php:68
+#: 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 "åå—"
+msgstr "åç§°"
 
-#: js/files.js:954 templates/index.php:79
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "å¤§å°"
 
-#: js/files.js:955 templates/index.php:81
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "ä¿®æ”¹æ—¥æœŸ"
 
-#: js/files.js:974
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 ä¸ªæ–‡ä»¶å¤¹"
 
-#: js/files.js:976
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} ä¸ªæ–‡ä»¶å¤¹"
 
-#: js/files.js:984
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 ä¸ªæ–‡ä»¶"
 
-#: js/files.js:986
+#: 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 "ä¸Šä¼ "
@@ -270,45 +275,45 @@ msgstr "æ–‡ä»¶å¤¹"
 msgid "From link"
 msgstr "æ¥è‡ªé“¾æŽ¥"
 
-#: templates/index.php:40
+#: templates/index.php:42
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:48
 msgid "Cancel upload"
 msgstr "å–æ¶ˆä¸Šä¼ "
 
-#: templates/index.php:53
+#: templates/index.php:54
 msgid "You donâ€™t have write permissions here."
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "è¿™é‡Œæ²¡æœ‰ä¸œè¥¿.ä¸Šä¼ ç‚¹ä»€ä¹ˆ!"
 
-#: templates/index.php:74
+#: templates/index.php:75
 msgid "Download"
 msgstr "ä¸‹è½½"
 
-#: templates/index.php:86 templates/index.php:87
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
-msgstr "å–æ¶ˆå…±äº«"
+msgstr "å–æ¶ˆåˆ†äº«"
 
-#: templates/index.php:106
+#: templates/index.php:107
 msgid "Upload too large"
-msgstr "ä¸Šä¼ çš„æ–‡ä»¶å¤ªå¤§äº†"
+msgstr "ä¸Šä¼ è¿‡å¤§"
 
-#: templates/index.php:108
+#: 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:113
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "æ£åœ¨æ‰«ææ–‡ä»¶,è¯·ç¨å€™."
 
-#: templates/index.php:116
+#: 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..172dbb740f3948fc08374bb6ad68ad0828aa1984 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/zh_CN.GB2312/files_external.po b/l10n/zh_CN.GB2312/files_external.po
index 50616ee00fa2fff7c2f31f92c81ab239619e0fc8..3ab0f8b0023cec85cb2619a2e4eafaf2baf1807e 100644
--- a/l10n/zh_CN.GB2312/files_external.po
+++ b/l10n/zh_CN.GB2312/files_external.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-01 00:05+0100\n"
-"PO-Revision-Date: 2013-02-27 23:20+0000\n"
+"POT-Creation-Date: 2013-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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"
@@ -38,17 +37,24 @@ msgstr "è¯·æä¾›ä¸€ä¸ªæœ‰æ•ˆçš„ Dropbox app key å’Œ secretã€‚"
 msgid "Error configuring Google Drive storage"
 msgstr "é…ç½® Google Drive å˜å‚¨å¤±è´¥"
 
-#: 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 ""
+msgstr "<b>æ³¨æ„ï¼š</b>â€œSMBå®¢æˆ·ç«¯â€æœªå®‰è£…ã€‚CIFS/SMBåˆ†äº«ä¸å¯ç”¨ã€‚è¯·å‘æ‚¨çš„ç³»ç»Ÿç®¡ç†å‘˜è¯·æ±‚å®‰è£…è¯¥å®¢æˆ·ç«¯ã€‚"
 
-#: 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 "<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
@@ -61,7 +67,7 @@ msgstr "æ–‡ä»¶å¤¹å"
 
 #: templates/settings.php:10
 msgid "External storage"
-msgstr ""
+msgstr "å¤–éƒ¨å˜å‚¨"
 
 #: templates/settings.php:11
 msgid "Configuration"
@@ -77,7 +83,7 @@ msgstr "å¯åº”ç”¨"
 
 #: templates/settings.php:33
 msgid "Add storage"
-msgstr ""
+msgstr "æ‰©å®¹"
 
 #: templates/settings.php:90
 msgid "None set"
diff --git a/l10n/zh_CN.GB2312/files_sharing.po b/l10n/zh_CN.GB2312/files_sharing.po
index a25727470d6e4b3cd042abdd622ff9ee9de36af8..61e2a5168a233b70a278e0731b52e6a967d81ad9 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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 c433a8e19b7cce7f69924a8bf0b3acf9d99a7ead..a6c759cdf0ae7822b098be109625cbb18d02b7cf 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-03-08 00:25+0100\n"
-"PO-Revision-Date: 2013-03-07 23:25+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
@@ -17,12 +17,12 @@ msgstr ""
 "Language: zh_CN.GB2312\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/delete.php:40
+#: ajax/delete.php:42
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
 
-#: ajax/undelete.php:41
+#: ajax/undelete.php:42
 #, php-format
 msgid "Couldn't restore %s"
 msgstr ""
@@ -31,6 +31,10 @@ msgstr ""
 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 ""
diff --git a/l10n/zh_CN.GB2312/files_versions.po b/l10n/zh_CN.GB2312/files_versions.po
index 01b05ceb323146f356bd44e701798f747cb120ea..036989e088e7b1bd2a7fb0be43da0e2e02f38c6a 100644
--- a/l10n/zh_CN.GB2312/files_versions.po
+++ b/l10n/zh_CN.GB2312/files_versions.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-28 00:04+0100\n"
-"PO-Revision-Date: 2013-02-27 23:04+0000\n"
+"POT-Creation-Date: 2013-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:30+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"
@@ -21,38 +20,38 @@ msgstr ""
 #: ajax/rollbackVersion.php:15
 #, php-format
 msgid "Could not revert: %s"
-msgstr ""
+msgstr "æ— æ³•æ¢å¤ï¼š%s"
 
 #: history.php:40
 msgid "success"
-msgstr ""
+msgstr "æˆåŠŸ"
 
 #: history.php:42
 #, php-format
 msgid "File %s was reverted to version %s"
-msgstr ""
+msgstr "æ–‡ä»¶ %s å·²è¢«æ¢å¤ä¸º %s çš„ç‰ˆæœ¬"
 
 #: history.php:49
 msgid "failure"
-msgstr ""
+msgstr "å¤±è´¥"
 
 #: history.php:51
 #, php-format
 msgid "File %s could not be reverted to version %s"
-msgstr ""
+msgstr "æ–‡ä»¶ %s æ— æ³•æ¢å¤ä¸º %s çš„ç‰ˆæœ¬"
 
-#: history.php:68
+#: history.php:69
 msgid "No old versions available"
-msgstr ""
+msgstr "æ²¡æœ‰å¯ç”¨çš„æ—§ç‰ˆæœ¬"
 
-#: history.php:73
+#: history.php:74
 msgid "No path specified"
-msgstr ""
+msgstr "æœªæŒ‡å®šè·¯å¾„"
 
 #: js/versions.js:6
 msgid "Versions"
-msgstr ""
+msgstr "ç‰ˆæœ¬"
 
 #: templates/history.php:20
 msgid "Revert a file to a previous version by clicking on its revert button"
-msgstr ""
+msgstr "è¯·ç‚¹å‡»â€œæ¢å¤â€æŒ‰é’®æŠŠæ–‡ä»¶æ¢å¤åˆ°æ—©å‰çš„ç‰ˆæœ¬"
diff --git a/l10n/zh_CN.GB2312/lib.po b/l10n/zh_CN.GB2312/lib.po
index 3ab8eb8f8cf8f51b79a70f34ff4b31debca2ce9c..526d5f2461349376861e98a6c10638486906e292 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-02-27 14:35+0100\n"
-"PO-Revision-Date: 2013-02-27 13:35+0000\n"
+"POT-Creation-Date: 2013-04-28 01:57+0200\n"
+"PO-Revision-Date: 2013-04-27 23:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
@@ -42,19 +41,19 @@ msgstr "ç¨‹åº"
 msgid "Admin"
 msgstr "ç®¡ç†å‘˜"
 
-#: files.php:202
+#: files.php:209
 msgid "ZIP download is turned off."
 msgstr "ZIP ä¸‹è½½å·²å…³é—"
 
-#: files.php:203
+#: files.php:210
 msgid "Files need to be downloaded one by one."
 msgstr "éœ€è¦é€ä¸ªä¸‹è½½æ–‡ä»¶ã€‚"
 
-#: files.php:204 files.php:231
+#: files.php:211 files.php:244
 msgid "Back to Files"
 msgstr "è¿”å›žåˆ°æ–‡ä»¶"
 
-#: files.php:228
+#: files.php:241
 msgid "Selected files too large to generate zip file."
 msgstr "é€‰æ‹©çš„æ–‡ä»¶å¤ªå¤§è€Œä¸èƒ½ç”Ÿæˆ zip æ–‡ä»¶ã€‚"
 
@@ -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,75 +113,75 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:128 setup.php:320 setup.php:365
+#: setup.php:132 setup.php:325 setup.php:370
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:129 setup.php:152 setup.php:229
+#: setup.php:133 setup.php:156 setup.php:234
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:151 setup.php:453 setup.php:520
+#: setup.php:155 setup.php:458 setup.php:525
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:228
+#: setup.php:233
 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: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:583 setup.php:592 setup.php:600 setup.php:609
+#: setup.php:615
 #, 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:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
+#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
+#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:299
+#: setup.php:304
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:300
+#: setup.php:305
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:305
+#: setup.php:310
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:306
+#: setup.php:311
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:579 setup.php:611
+#: setup.php:584 setup.php:616
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:631
+#: setup.php:636
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:849
+#: setup.php:858
 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:850
+#: setup.php:859
 #, 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"
@@ -203,7 +198,7 @@ msgstr "%d åˆ†é’Ÿå‰"
 
 #: template.php:116
 msgid "1 hour ago"
-msgstr ""
+msgstr "1å°æ—¶å‰"
 
 #: template.php:117
 #, php-format
@@ -240,19 +235,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 01b153143fd6e23790f9c21c234ac67020d644cf..bd917dd80d40ca95908b634f7a4229f7b328ad7c 100644
--- a/l10n/zh_CN.GB2312/settings.po
+++ b/l10n/zh_CN.GB2312/settings.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-02-27 14:35+0100\n"
-"PO-Revision-Date: 2013-02-27 13:35+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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"
@@ -23,15 +21,19 @@ 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
-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 "ç¾¤ç»„å·²å˜åœ¨"
@@ -70,7 +72,7 @@ msgstr "éžæ³•è¯·æ±‚"
 
 #: ajax/togglegroups.php:12
 msgid "Admins can't remove themself from the admin group"
-msgstr ""
+msgstr "ç®¡ç†å‘˜æ— æ³•å°†è‡ªå·±ä»Žç®¡ç†ç»„ä¸ç§»é™¤"
 
 #: ajax/togglegroups.php:30
 #, php-format
@@ -84,86 +86,86 @@ 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"
 msgstr "ç¦ç”¨"
 
-#: js/apps.js:36 js/apps.js:64
+#: 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:84
-msgid "Updating...."
-msgstr ""
+msgstr "è¯·ç¨å€™â€¦â€¦"
 
-#: js/apps.js:87
-msgid "Error while updating app"
-msgstr ""
-
-#: js/apps.js:87
+#: 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 ""
+msgstr "å·²å‡çº§"
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr "ä¿å˜ä¸..."
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "deleted"
 msgstr "åˆ é™¤"
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "undo"
 msgstr "æ’¤é”€"
 
-#: js/users.js:62
+#: js/users.js:79
 msgid "Unable to remove user"
-msgstr ""
+msgstr "æ— æ³•ç§»é™¤ç”¨æˆ·"
 
-#: js/users.js:75 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
+#: templates/users.php:103
 msgid "Groups"
-msgstr "ç»„"
+msgstr "ç¾¤ç»„"
 
-#: js/users.js:78 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr "ç¾¤ç»„ç®¡ç†å‘˜"
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "åˆ é™¤"
 
-#: js/users.js:191
+#: js/users.js:269
 msgid "add group"
-msgstr ""
+msgstr "æ·»åŠ ç¾¤ç»„"
 
-#: js/users.js:352
+#: js/users.js:420
 msgid "A valid username must be provided"
-msgstr ""
+msgstr "è¯·å¡«å†™æœ‰æ•ˆç”¨æˆ·å"
 
-#: js/users.js:353 js/users.js:359 js/users.js:374
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
-msgstr ""
+msgstr "æ–°å¢žç”¨æˆ·æ—¶å‡ºçŽ°é”™è¯¯"
 
-#: js/users.js:358
+#: js/users.js:426
 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 "Chinese"
 
@@ -182,18 +184,18 @@ msgstr "æ‚¨çš„æ•°æ®æ–‡ä»¶å¤¹å’Œæ‚¨çš„æ–‡ä»¶æˆ–è®¸èƒ½å¤Ÿä»Žäº’è”ç½‘è®¿é—®ã€‚own
 
 #: 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"
@@ -207,7 +209,7 @@ msgstr ""
 
 #: 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 ""
@@ -233,72 +235,72 @@ 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 æœåŠ¡æ³¨å†Œã€‚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"
-msgstr ""
+msgstr "å¼€å¯åˆ†äº«API"
 
 #: templates/admin.php:135
 msgid "Allow apps to use the Share API"
-msgstr ""
+msgstr "å…è®¸åº”ç”¨ä½¿ç”¨åˆ†äº«API"
 
 #: templates/admin.php:142
 msgid "Allow links"
-msgstr ""
+msgstr "å…è®¸é“¾æŽ¥"
 
 #: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
-msgstr ""
+msgstr "å…è®¸ç”¨æˆ·é€šè¿‡é“¾æŽ¥å…±äº«å†…å®¹"
 
 #: templates/admin.php:150
 msgid "Allow resharing"
-msgstr ""
+msgstr "å…è®¸è½¬å¸–"
 
 #: templates/admin.php:151
 msgid "Allow users to share items shared with them again"
-msgstr ""
+msgstr "å…è®¸ç”¨æˆ·å†æ¬¡å…±äº«å·²å…±äº«çš„å†…å®¹"
 
 #: templates/admin.php:158
 msgid "Allow users to share with anyone"
-msgstr ""
+msgstr "å…è®¸ç”¨æˆ·å‘ä»»ä½•äººåˆ†äº«"
 
 #: templates/admin.php:161
 msgid "Allow users to only share with users in their groups"
-msgstr ""
+msgstr "åªå…è®¸ç”¨æˆ·å‘æ‰€åœ¨ç¾¤ç»„ä¸çš„å…¶ä»–ç”¨æˆ·åˆ†äº«"
 
 #: templates/admin.php:168
 msgid "Security"
-msgstr ""
+msgstr "å®‰å…¨"
 
 #: templates/admin.php:181
 msgid "Enforce HTTPS"
-msgstr ""
+msgstr "å¼ºåˆ¶HTTPS"
 
 #: templates/admin.php:182
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
-msgstr ""
+msgstr "å¼ºåˆ¶å®¢æˆ·ç«¯é€šè¿‡åŠ å¯†è¿žæŽ¥ä¸ŽownCloudè¿žæŽ¥"
 
 #: templates/admin.php:185
 msgid ""
@@ -308,21 +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:230 templates/personal.php:102
+#: templates/admin.php:228
+msgid "Less"
+msgstr "æ›´å°‘"
+
+#: templates/admin.php:235 templates/personal.php:105
 msgid "Version"
-msgstr ""
+msgstr "ç‰ˆæœ¬"
 
-#: templates/admin.php:233 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 "
@@ -358,42 +364,42 @@ 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 "Bugè¿½è¸ªè€…"
 
 #: 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 ""
+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:77
 msgid "Password"
 msgstr "å¯†ç "
 
@@ -417,82 +423,70 @@ msgstr "æ–°å¯†ç "
 msgid "Change password"
 msgstr "æ”¹å˜å¯†ç "
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:76
 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 ""
+msgstr "æ˜¾ç¤ºåç§°"
 
-#: templates/personal.php:61
-msgid "Change display name"
-msgstr ""
-
-#: templates/personal.php:70
+#: templates/personal.php:68
 msgid "Email"
-msgstr "Email"
+msgstr "ç”µåé‚®ä»¶"
 
-#: templates/personal.php:72
+#: templates/personal.php:70
 msgid "Your email address"
 msgstr "ä½ çš„emailåœ°å€"
 
-#: 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 ""
+msgstr "WebDAV"
 
-#: templates/personal.php:93
+#: templates/personal.php:96
 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:75
 msgid "Login Name"
-msgstr ""
+msgstr "ç™»å½•å"
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr "æ–°å»º"
 
-#: templates/users.php:35
+#: templates/users.php:33
 msgid "Default Storage"
-msgstr ""
+msgstr "é»˜è®¤å®¹é‡"
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:39 templates/users.php:133
 msgid "Unlimited"
-msgstr ""
+msgstr "æ— é™åˆ¶"
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:57 templates/users.php:148
 msgid "Other"
-msgstr "å…¶ä»–çš„"
+msgstr "å…¶ä»–"
 
-#: templates/users.php:84
+#: templates/users.php:82
 msgid "Storage"
-msgstr ""
+msgstr "å®¹é‡"
 
-#: templates/users.php:95
+#: templates/users.php:93
 msgid "change display name"
-msgstr ""
+msgstr "æ›´æ”¹æ˜¾ç¤ºåç§°"
 
-#: templates/users.php:99
+#: templates/users.php:97
 msgid "set new password"
-msgstr ""
+msgstr "è®¾ç½®æ–°çš„å¯†ç "
 
-#: templates/users.php:134
+#: templates/users.php:128
 msgid "Default"
-msgstr ""
+msgstr "é»˜è®¤"
diff --git a/l10n/zh_CN.GB2312/user_ldap.po b/l10n/zh_CN.GB2312/user_ldap.po
index 355999c92681932dc1679ed3c34e88027e885cfe..8eb298ee7eb731ce3a236dde95456ad90b6a2822 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-02 00:03+0100\n"
-"PO-Revision-Date: 2013-03-01 23:04+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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: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 "æ‚¨å¯ä»¥å¿½ç•¥åè®®ï¼Œé™¤éžæ‚¨éœ€è¦ SSLã€‚ç„¶åŽç”¨ ldaps:// å¼€å¤´"
 
-#: 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 "å®¢æˆ·æœºç”¨æˆ·çš„åˆ¤åˆ«åï¼Œå°†ç”¨äºŽç»‘å®šï¼Œä¾‹å¦‚ uid=agent, dc=example, dc=comã€‚åŒ¿åè®¿é—®è¯·ç•™ç©ºåˆ¤åˆ«åå’Œå¯†ç ã€‚"
 
-#: 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 "å®šä¹‰å°è¯•ç™»å½•æ—¶è¦åº”ç”¨çš„è¿‡æ»¤å™¨ã€‚ç”¨ %%uid æ›¿æ¢ç™»å½•æ“ä½œä¸ä½¿ç”¨çš„ç”¨æˆ·åã€‚"
 
-#: templates/settings.php:41
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "ä½¿ç”¨ %%uid å ä½ç¬¦ï¼Œä¾‹å¦‚ \"uid=%%uid\""
 
-#: 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 "ä¸èƒ½ä½¿ç”¨å ä½ç¬¦ï¼Œä¾‹å¦‚ \"objectClass=person\"ã€‚"
 
-#: 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 "ä¸èƒ½ä½¿ç”¨å ä½ç¬¦ï¼Œä¾‹å¦‚ \"objectClass=posixGroup\"ã€‚"
 
-#: 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 "ä½¿ç”¨ 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 "å¤§å°å†™ä¸æ•æ„Ÿçš„ LDAP æœåŠ¡å™¨ (Windows)"
 
-#: templates/settings.php:64
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "å…³é— SSL è¯ä¹¦æ ¡éªŒã€‚"
 
-#: 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 "å¦‚æžœåªæœ‰ä½¿ç”¨æ¤é€‰é¡¹æ‰èƒ½è¿žæŽ¥ï¼Œè¯·å¯¼å…¥ LDAP æœåŠ¡å™¨çš„ SSL è¯ä¹¦åˆ°æ‚¨çš„ ownCloud æœåŠ¡å™¨ã€‚"
 
-#: 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 "ç”¨äºŽç”Ÿæˆç”¨æˆ·çš„ ownCloud åç§°çš„ LDAP å±žæ€§ã€‚"
 
-#: 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 "ç”¨äºŽç”Ÿæˆç¾¤ç»„çš„ ownCloud åç§°çš„ LDAP å±žæ€§ã€‚"
 
-#: 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 "ç”¨æˆ·åè¯·ç•™ç©º (é»˜è®¤)ã€‚å¦åˆ™ï¼Œè¯·æŒ‡å®šä¸€ä¸ª LDAP/AD å±žæ€§ã€‚"
 
-#: 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/zh_CN.GB2312/user_webdavauth.po b/l10n/zh_CN.GB2312/user_webdavauth.po
index e9984fbe007c063b9d72d5bb88d563326fe24caa..672fbad82e5b23ccc17396300209cced93b46172 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-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
@@ -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 b1f593bcc25ad11981d9ceb3ab64628cfd20ed03..59cf8218e131e637afa740af9bc530f970624f42 100644
--- a/l10n/zh_CN/core.po
+++ b/l10n/zh_CN/core.po
@@ -3,19 +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>, 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-02-22 00:06+0100\n"
-"PO-Revision-Date: 2013-02-20 23:20+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+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"
@@ -23,24 +18,24 @@ msgstr ""
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/share.php:85
+#: ajax/share.php:97
 #, php-format
 msgid "User %s shared a file with you"
 msgstr "ç”¨æˆ· %s ä¸Žæ‚¨å…±äº«äº†ä¸€ä¸ªæ–‡ä»¶"
 
-#: ajax/share.php:87
+#: ajax/share.php:99
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr "ç”¨æˆ· %s ä¸Žæ‚¨å…±äº«äº†ä¸€ä¸ªæ–‡ä»¶å¤¹"
 
-#: ajax/share.php:89
+#: ajax/share.php:101
 #, php-format
 msgid ""
 "User %s shared the file \"%s\" with you. It is available for download here: "
 "%s"
 msgstr "ç”¨æˆ· %s ä¸Žæ‚¨å…±äº«äº†æ–‡ä»¶\"%s\"ã€‚æ–‡ä»¶ä¸‹è½½åœ°å€ï¼š%s"
 
-#: ajax/share.php:91
+#: ajax/share.php:104
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -58,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
@@ -86,79 +81,79 @@ msgstr "æ²¡æœ‰é€‰æ‹©è¦åˆ é™¤çš„ç±»åˆ«"
 msgid "Error removing %s from favorites."
 msgstr "ä»Žæ”¶è—å¤¹ä¸ç§»é™¤%sæ—¶å‡ºé”™ã€‚"
 
-#: js/config.php:32
+#: js/config.php:34
 msgid "Sunday"
 msgstr "æ˜ŸæœŸæ—¥"
 
-#: js/config.php:32
+#: js/config.php:35
 msgid "Monday"
 msgstr "æ˜ŸæœŸä¸€"
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Tuesday"
 msgstr "æ˜ŸæœŸäºŒ"
 
-#: js/config.php:32
+#: js/config.php:37
 msgid "Wednesday"
 msgstr "æ˜ŸæœŸä¸‰"
 
-#: js/config.php:32
+#: js/config.php:38
 msgid "Thursday"
 msgstr "æ˜ŸæœŸå››"
 
-#: js/config.php:32
+#: js/config.php:39
 msgid "Friday"
 msgstr "æ˜ŸæœŸäº”"
 
-#: js/config.php:32
+#: js/config.php:40
 msgid "Saturday"
 msgstr "æ˜ŸæœŸå…"
 
-#: js/config.php:33
+#: js/config.php:45
 msgid "January"
 msgstr "ä¸€æœˆ"
 
-#: js/config.php:33
+#: js/config.php:46
 msgid "February"
 msgstr "äºŒæœˆ"
 
-#: js/config.php:33
+#: js/config.php:47
 msgid "March"
 msgstr "ä¸‰æœˆ"
 
-#: js/config.php:33
+#: js/config.php:48
 msgid "April"
 msgstr "å››æœˆ"
 
-#: js/config.php:33
+#: js/config.php:49
 msgid "May"
 msgstr "äº”æœˆ"
 
-#: js/config.php:33
+#: js/config.php:50
 msgid "June"
 msgstr "å…æœˆ"
 
-#: js/config.php:33
+#: js/config.php:51
 msgid "July"
 msgstr "ä¸ƒæœˆ"
 
-#: js/config.php:33
+#: js/config.php:52
 msgid "August"
 msgstr "å…«æœˆ"
 
-#: js/config.php:33
+#: js/config.php:53
 msgid "September"
 msgstr "ä¹æœˆ"
 
-#: js/config.php:33
+#: js/config.php:54
 msgid "October"
 msgstr "åæœˆ"
 
-#: js/config.php:33
+#: js/config.php:55
 msgid "November"
 msgstr "åä¸€æœˆ"
 
-#: js/config.php:33
+#: js/config.php:56
 msgid "December"
 msgstr "åäºŒæœˆ"
 
@@ -166,86 +161,88 @@ msgstr "åäºŒæœˆ"
 msgid "Settings"
 msgstr "è®¾ç½®"
 
-#: js/js.js:767
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "ç§’å‰"
 
-#: js/js.js:768
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "ä¸€åˆ†é’Ÿå‰"
 
-#: js/js.js:769
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr "{minutes} åˆ†é’Ÿå‰"
 
-#: js/js.js:770
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr "1å°æ—¶å‰"
 
-#: js/js.js:771
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr "{hours} å°æ—¶å‰"
 
-#: js/js.js:772
+#: js/js.js:723
 msgid "today"
 msgstr "ä»Šå¤©"
 
-#: js/js.js:773
+#: js/js.js:724
 msgid "yesterday"
 msgstr "æ˜¨å¤©"
 
-#: js/js.js:774
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr "{days} å¤©å‰"
 
-#: js/js.js:775
+#: js/js.js:726
 msgid "last month"
 msgstr "ä¸Šæœˆ"
 
-#: js/js.js:776
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr "{months} æœˆå‰"
 
-#: js/js.js:777
+#: js/js.js:728
 msgid "months ago"
 msgstr "æœˆå‰"
 
-#: js/js.js:778
+#: js/js.js:729
 msgid "last year"
 msgstr "åŽ»å¹´"
 
-#: js/js.js:779
+#: js/js.js:730
 msgid "years ago"
 msgstr "å¹´å‰"
 
-#: js/oc-dialogs.js:126
-msgid "Choose"
-msgstr "é€‰æ‹©(&C)..."
+#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
+msgid "Ok"
+msgstr "å¥½"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
 msgid "Cancel"
 msgstr "å–æ¶ˆ"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "å¦"
+#: js/oc-dialogs.js:185
+msgid "Choose"
+msgstr "é€‰æ‹©(&C)..."
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:215
 msgid "Yes"
 msgstr "æ˜¯"
 
-#: js/oc-dialogs.js:180
-msgid "Ok"
-msgstr "å¥½"
+#: js/oc-dialogs.js:222
+msgid "No"
+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:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:582
-#: js/share.js:594
+#: 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 "é”™è¯¯"
 
@@ -257,127 +254,127 @@ msgstr "æœªæŒ‡å®šAppåç§°ã€‚"
 msgid "The required file {file} is not installed!"
 msgstr "æ‰€éœ€æ–‡ä»¶{file}æœªå®‰è£…ï¼"
 
-#: js/share.js:29 js/share.js:43 js/share.js:90
+#: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr "å·²å…±äº«"
 
-#: js/share.js:93
+#: js/share.js:90
 msgid "Share"
-msgstr "å…±äº«"
+msgstr "åˆ†äº«"
 
-#: js/share.js:141 js/share.js:622
+#: js/share.js:125 js/share.js:617
 msgid "Error while sharing"
 msgstr "å…±äº«æ—¶å‡ºé”™"
 
-#: js/share.js:152
+#: js/share.js:136
 msgid "Error while unsharing"
 msgstr "å–æ¶ˆå…±äº«æ—¶å‡ºé”™"
 
-#: js/share.js:159
+#: js/share.js:143
 msgid "Error while changing permissions"
 msgstr "ä¿®æ”¹æƒé™æ—¶å‡ºé”™"
 
-#: js/share.js:168
+#: js/share.js:152
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "{owner}å…±äº«ç»™æ‚¨åŠ{group}ç»„"
 
-#: js/share.js:170
+#: js/share.js:154
 msgid "Shared with you by {owner}"
 msgstr " {owner}ä¸Žæ‚¨å…±äº«"
 
-#: js/share.js:175
+#: js/share.js:159
 msgid "Share with"
-msgstr "å…±äº«"
+msgstr "åˆ†äº«ä¹‹"
 
-#: js/share.js:180
+#: js/share.js:164
 msgid "Share with link"
 msgstr "å…±äº«é“¾æŽ¥"
 
-#: js/share.js:183
+#: js/share.js:167
 msgid "Password protect"
 msgstr "å¯†ç ä¿æŠ¤"
 
-#: js/share.js:185 templates/installation.php:44 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "å¯†ç "
 
-#: js/share.js:189
+#: js/share.js:173
 msgid "Email link to person"
 msgstr "å‘é€é“¾æŽ¥åˆ°ä¸ªäºº"
 
-#: js/share.js:190
+#: js/share.js:174
 msgid "Send"
 msgstr "å‘é€"
 
-#: js/share.js:194
+#: js/share.js:178
 msgid "Set expiration date"
 msgstr "è®¾ç½®è¿‡æœŸæ—¥æœŸ"
 
-#: js/share.js:195
+#: js/share.js:179
 msgid "Expiration date"
 msgstr "è¿‡æœŸæ—¥æœŸ"
 
-#: js/share.js:227
+#: js/share.js:211
 msgid "Share via email:"
 msgstr "é€šè¿‡Emailå…±äº«"
 
-#: js/share.js:229
+#: js/share.js:213
 msgid "No people found"
 msgstr "æœªæ‰¾åˆ°æ¤äºº"
 
-#: js/share.js:256
+#: js/share.js:251
 msgid "Resharing is not allowed"
 msgstr "ä¸å…è®¸äºŒæ¬¡å…±äº«"
 
-#: js/share.js:292
+#: js/share.js:287
 msgid "Shared in {item} with {user}"
 msgstr "åœ¨{item} ä¸Ž {user}å…±äº«ã€‚"
 
-#: js/share.js:313
+#: js/share.js:308
 msgid "Unshare"
 msgstr "å–æ¶ˆå…±äº«"
 
-#: js/share.js:325
+#: js/share.js:320
 msgid "can edit"
 msgstr "å¯ä»¥ä¿®æ”¹"
 
-#: js/share.js:327
+#: js/share.js:322
 msgid "access control"
 msgstr "è®¿é—®æŽ§åˆ¶"
 
-#: js/share.js:330
+#: js/share.js:325
 msgid "create"
 msgstr "åˆ›å»º"
 
-#: js/share.js:333
+#: js/share.js:328
 msgid "update"
 msgstr "æ›´æ–°"
 
-#: js/share.js:336
+#: js/share.js:331
 msgid "delete"
 msgstr "åˆ é™¤"
 
-#: js/share.js:339
+#: js/share.js:334
 msgid "share"
 msgstr "å…±äº«"
 
-#: js/share.js:373 js/share.js:569
+#: js/share.js:368 js/share.js:564
 msgid "Password protected"
 msgstr "å¯†ç å·²å—ä¿æŠ¤"
 
-#: js/share.js:582
+#: js/share.js:577
 msgid "Error unsetting expiration date"
 msgstr "å–æ¶ˆè®¾ç½®è¿‡æœŸæ—¥æœŸæ—¶å‡ºé”™"
 
-#: js/share.js:594
+#: js/share.js:589
 msgid "Error setting expiration date"
 msgstr "è®¾ç½®è¿‡æœŸæ—¥æœŸæ—¶å‡ºé”™"
 
-#: js/share.js:609
+#: js/share.js:604
 msgid "Sending ..."
 msgstr "æ£åœ¨å‘é€..."
 
-#: js/share.js:620
+#: js/share.js:615
 msgid "Email sent"
 msgstr "é‚®ä»¶å·²å‘é€"
 
@@ -386,11 +383,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 "æ›´æ–°ä¸æˆåŠŸã€‚è¯·æ±‡æŠ¥å°†æ¤é—®é¢˜æ±‡æŠ¥ç»™  <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud ç¤¾åŒº</a>ã€‚"
 
 #: js/update.js:18
 msgid "The update was successful. Redirecting you to ownCloud now."
-msgstr ""
+msgstr "æ›´æ–°æˆåŠŸã€‚æ£åœ¨é‡å®šå‘è‡³ ownCloudã€‚"
 
 #: lostpassword/controller.php:48
 msgid "ownCloud password reset"
@@ -400,24 +397,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:39
-#: 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 "è¯·æ±‚é‡ç½®"
 
@@ -451,7 +451,7 @@ msgstr "åº”ç”¨"
 
 #: strings.php:8
 msgid "Admin"
-msgstr "ç®¡ç†å‘˜"
+msgstr "ç®¡ç†"
 
 #: strings.php:9
 msgid "Help"
@@ -471,119 +471,134 @@ msgstr "ç¼–è¾‘åˆ†ç±»"
 
 #: templates/edit_categories_dialog.php:16
 msgid "Add"
-msgstr "æ·»åŠ "
+msgstr "å¢žåŠ "
 
-#: templates/installation.php:23 templates/installation.php:30
+#: 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 "ä½ çš„PHPç‰ˆæœ¬å®¹æ˜“å—åˆ°ç©ºå—èŠ‚æ”»å‡» (CVE-2006-7243)"
+
+#: templates/installation.php:26
+msgid "Please update your PHP installation to use ownCloud securely."
+msgstr "ä¸ºä¿è¯å®‰å…¨ä½¿ç”¨ ownCloud è¯·æ›´æ–°æ‚¨çš„PHPã€‚"
+
+#: templates/installation.php:32
 msgid ""
 "No secure random number generator is available, please enable the PHP "
 "OpenSSL extension."
 msgstr "éšæœºæ•°ç”Ÿæˆå™¨æ— æ•ˆï¼Œè¯·å¯ç”¨PHPçš„OpenSSLæ‰©å±•"
 
-#: templates/installation.php:25
+#: 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:31
+#: 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 "æ‚¨çš„æ•°æ®ç›®å½•å’Œæ–‡ä»¶å¯èƒ½å¯ä»¥ç›´æŽ¥è¢«äº’è”ç½‘è®¿é—®ï¼Œå› ä¸º .htaccess å¹¶æœªæ£å¸¸å·¥ä½œã€‚"
 
-#: templates/installation.php:32
+#: 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:36
+#: templates/installation.php:44
 msgid "Create an <strong>admin account</strong>"
 msgstr "åˆ›å»º<strong>ç®¡ç†å‘˜è´¦å·</strong>"
 
-#: templates/installation.php:52
+#: templates/installation.php:62
 msgid "Advanced"
 msgstr "é«˜çº§"
 
-#: templates/installation.php:54
+#: templates/installation.php:64
 msgid "Data folder"
 msgstr "æ•°æ®ç›®å½•"
 
-#: templates/installation.php:61
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "é…ç½®æ•°æ®åº“"
 
-#: templates/installation.php:66 templates/installation.php:77
-#: templates/installation.php:87 templates/installation.php:97
+#: 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:109
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "æ•°æ®åº“ç”¨æˆ·"
 
-#: templates/installation.php:113
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "æ•°æ®åº“å¯†ç "
 
-#: templates/installation.php:117
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "æ•°æ®åº“å"
 
-#: templates/installation.php:125
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "æ•°æ®åº“è¡¨ç©ºé—´"
 
-#: templates/installation.php:131
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "æ•°æ®åº“ä¸»æœº"
 
-#: templates/installation.php:136
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "å®‰è£…å®Œæˆ"
 
-#: templates/layout.guest.php:33
+#: templates/layout.guest.php:40
 msgid "web services under your control"
-msgstr "ç”±æ‚¨æŽŒæŽ§çš„ç½‘ç»œæœåŠ¡"
+msgstr "æ‚¨æŽ§åˆ¶çš„webæœåŠ¡"
 
-#: templates/layout.user.php:48
+#: templates/layout.user.php:36
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr "%s å¯ç”¨ã€‚èŽ·å–æ›´å¤šå…³äºŽå¦‚ä½•å‡çº§çš„ä¿¡æ¯ã€‚"
+
+#: 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 ""
+msgstr "å…¶ä»–ç™»å½•æ–¹å¼"
 
 #: templates/part.pagenavi.php:3
 msgid "prev"
diff --git a/l10n/zh_CN/files.po b/l10n/zh_CN/files.po
index c62eacf1cb11566071b7a5c1a5b82a14f6310987..7bd8ad81e9bd633fead67953f840671f170023d4 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-03-04 00:06+0100\n"
-"PO-Revision-Date: 2013-03-03 23:06+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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"
@@ -75,60 +65,71 @@ msgstr "å†™å…¥ç£ç›˜å¤±è´¥"
 
 #: ajax/upload.php:51
 msgid "Not enough storage available"
-msgstr ""
+msgstr "æ²¡æœ‰è¶³å¤Ÿçš„å˜å‚¨ç©ºé—´"
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr "æ— æ•ˆæ–‡ä»¶å¤¹ã€‚"
 
-#: appinfo/app.php:10
+#: 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:92 templates/index.php:93
+#: 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/files.js:292 js/files.js:408
-#: js/files.js:439
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
-msgstr "æ“ä½œç‰å¾…ä¸"
+msgstr "ç‰å¾…"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} å·²å˜åœ¨"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "æ›¿æ¢"
 
-#: js/filelist.js:251
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "å»ºè®®åç§°"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "å–æ¶ˆ"
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "å·²å°† {old_name}æ›¿æ¢æˆ {new_name}"
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "undo"
 msgstr "æ’¤é”€"
 
-#: js/filelist.js:323
+#: js/filelist.js:331
 msgid "perform delete operation"
-msgstr ""
+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."
@@ -146,83 +147,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:225
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "ä¸‹è½½æ£åœ¨å‡†å¤‡ä¸ã€‚å¦‚æžœæ–‡ä»¶è¾ƒå¤§å¯èƒ½ä¼šèŠ±è´¹ä¸€äº›æ—¶é—´ã€‚"
 
-#: js/files.js:262
+#: 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:262
-msgid "Upload Error"
-msgstr "ä¸Šä¼ é”™è¯¯"
+#: js/files.js:277
+msgid "Not enough space available"
+msgstr "æ²¡æœ‰è¶³å¤Ÿå¯ç”¨ç©ºé—´"
 
-#: js/files.js:273
-msgid "Close"
-msgstr "å…³é—"
-
-#: js/files.js:312
-msgid "1 file uploading"
-msgstr "1ä¸ªæ–‡ä»¶ä¸Šä¼ ä¸"
-
-#: js/files.js:315 js/files.js:370 js/files.js:385
-msgid "{count} files uploading"
-msgstr "{count} ä¸ªæ–‡ä»¶ä¸Šä¼ ä¸"
-
-#: js/files.js:388 js/files.js:423
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "ä¸Šä¼ å·²å–æ¶ˆ"
 
-#: js/files.js:497
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "æ–‡ä»¶æ£åœ¨ä¸Šä¼ ä¸ã€‚çŽ°åœ¨ç¦»å¼€æ¤é¡µä¼šå¯¼è‡´ä¸Šä¼ åŠ¨ä½œè¢«å–æ¶ˆã€‚"
 
-#: js/files.js:570
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "URLä¸èƒ½ä¸ºç©º"
 
-#: js/files.js:575
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "æ— æ•ˆæ–‡ä»¶å¤¹åã€‚'å…±äº«' æ˜¯ Owncloud é¢„ç•™çš„æ–‡ä»¶å¤¹åã€‚"
 
-#: js/files.js:953 templates/index.php:68
+#: 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:954 templates/index.php:79
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "å¤§å°"
 
-#: js/files.js:955 templates/index.php:81
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "ä¿®æ”¹æ—¥æœŸ"
 
-#: js/files.js:974
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1ä¸ªæ–‡ä»¶å¤¹"
 
-#: js/files.js:976
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} ä¸ªæ–‡ä»¶å¤¹"
 
-#: js/files.js:984
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 ä¸ªæ–‡ä»¶"
 
-#: js/files.js:986
+#: 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 "ä¸Šä¼ "
@@ -275,48 +276,48 @@ msgstr "æ–‡ä»¶å¤¹"
 msgid "From link"
 msgstr "æ¥è‡ªé“¾æŽ¥"
 
-#: templates/index.php:40
+#: templates/index.php:42
 msgid "Deleted files"
-msgstr ""
+msgstr "åˆ é™¤æ–‡ä»¶"
 
-#: templates/index.php:46
+#: templates/index.php:48
 msgid "Cancel upload"
 msgstr "å–æ¶ˆä¸Šä¼ "
 
-#: templates/index.php:53
+#: templates/index.php:54
 msgid "You donâ€™t have write permissions here."
-msgstr ""
+msgstr "æ‚¨æ²¡æœ‰å†™æƒé™"
 
-#: templates/index.php:60
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "è¿™é‡Œè¿˜ä»€ä¹ˆéƒ½æ²¡æœ‰ã€‚ä¸Šä¼ äº›ä¸œè¥¿å§ï¼"
 
-#: templates/index.php:74
+#: templates/index.php:75
 msgid "Download"
 msgstr "ä¸‹è½½"
 
-#: templates/index.php:86 templates/index.php:87
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
-msgstr "å–æ¶ˆåˆ†äº«"
+msgstr "å–æ¶ˆå…±äº«"
 
-#: templates/index.php:106
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "ä¸Šä¼ æ–‡ä»¶è¿‡å¤§"
 
-#: templates/index.php:108
+#: 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:113
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "æ–‡ä»¶æ£åœ¨è¢«æ‰«æï¼Œè¯·ç¨å€™ã€‚"
 
-#: templates/index.php:116
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "å½“å‰æ‰«æ"
 
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
-msgstr ""
+msgstr "æ£åœ¨æ›´æ–°æ–‡ä»¶ç³»ç»Ÿç¼“å˜..."
diff --git a/l10n/zh_CN/files_encryption.po b/l10n/zh_CN/files_encryption.po
index b9d48e1dcecefccc77e9b7c7921167b32816683f..9ececa51497f0203b51c176812e5f37b27c0e529 100644
--- a/l10n/zh_CN/files_encryption.po
+++ b/l10n/zh_CN/files_encryption.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <appweb.cn@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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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"
@@ -24,16 +23,16 @@ msgstr "åŠ å¯†"
 
 #: templates/settings-personal.php:7
 msgid "File encryption is enabled."
-msgstr ""
+msgstr "æ–‡ä»¶åŠ å¯†å·²å¯ç”¨."
 
 #: templates/settings-personal.php:11
 msgid "The following file types will not be encrypted:"
-msgstr ""
+msgstr "å¦‚ä¸‹çš„æ–‡ä»¶ç±»åž‹å°†ä¸ä¼šè¢«åŠ å¯†:"
 
 #: templates/settings.php:7
 msgid "Exclude the following file types from encryption:"
-msgstr ""
+msgstr "ä»ŽåŠ å¯†ä¸æŽ’é™¤å¦‚ä¸‹çš„æ–‡ä»¶ç±»åž‹:"
 
 #: templates/settings.php:12
 msgid "None"
-msgstr "None"
+msgstr "æ— "
diff --git a/l10n/zh_CN/files_external.po b/l10n/zh_CN/files_external.po
index f4a457ca68cb40a530222170df5e08294c364e17..4c1d4d64de0d395c65875420da211d4420c312bf 100644
--- a/l10n/zh_CN/files_external.po
+++ b/l10n/zh_CN/files_external.po
@@ -3,14 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <appweb.cn@gmail.com>, 2012.
-# Dianjin Wang <1132321739qq@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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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"
@@ -39,19 +37,26 @@ msgstr "è¯·æä¾›æœ‰æ•ˆçš„Dropboxåº”ç”¨keyå’Œsecret"
 msgid "Error configuring Google Drive storage"
 msgstr "é…ç½®Google Driveå˜å‚¨æ—¶å‡ºé”™"
 
-#: 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 "<b>è¦å‘Šï¼š</b>â€œsmbclientâ€ å°šæœªå®‰è£…ã€‚CIFS/SMB åˆ†äº«æŒ‚è½½æ— æ³•å®žçŽ°ã€‚è¯·å’¨è¯¢ç³»ç»Ÿç®¡ç†å‘˜è¿›è¡Œå®‰è£…ã€‚"
 
-#: 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 "<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 "å¤–éƒ¨å˜å‚¨"
@@ -62,7 +67,7 @@ msgstr "ç›®å½•åç§°"
 
 #: templates/settings.php:10
 msgid "External storage"
-msgstr ""
+msgstr "å¤–éƒ¨å˜å‚¨"
 
 #: templates/settings.php:11
 msgid "Configuration"
@@ -78,7 +83,7 @@ msgstr "é€‚ç”¨çš„"
 
 #: templates/settings.php:33
 msgid "Add storage"
-msgstr ""
+msgstr "æ·»åŠ å˜å‚¨"
 
 #: templates/settings.php:90
 msgid "None set"
diff --git a/l10n/zh_CN/files_sharing.po b/l10n/zh_CN/files_sharing.po
index 149353d11006059e2ec890adff4b9608b6ca1fff..32f54358999f6697f4f24749af760add9f1a33ec 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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 91cae3fa60fff3f9a7c4651d38367c262ee54354..75da62afbf698d45bc6d082220433e19e35e1bf7 100644
--- a/l10n/zh_CN/files_trashbin.po
+++ b/l10n/zh_CN/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-08 00:25+0100\n"
-"PO-Revision-Date: 2013-03-07 23:25+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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"
@@ -17,27 +17,31 @@ msgstr ""
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/delete.php:40
+#: ajax/delete.php:42
 #, php-format
 msgid "Couldn't delete %s permanently"
-msgstr ""
+msgstr "æ— æ³•å½»åº•åˆ é™¤æ–‡ä»¶%s"
 
-#: ajax/undelete.php:41
+#: ajax/undelete.php:42
 #, php-format
 msgid "Couldn't restore %s"
-msgstr ""
+msgstr "æ— æ³•æ¢å¤%s"
 
 #: js/trash.js:7 js/trash.js:96
 msgid "perform restore operation"
-msgstr ""
+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 ""
+msgstr "å½»åº•åˆ é™¤æ–‡ä»¶"
 
 #: js/trash.js:121
 msgid "Delete permanently"
-msgstr ""
+msgstr "æ°¸ä¹…åˆ é™¤"
 
 #: js/trash.js:174 templates/index.php:17
 msgid "Name"
@@ -45,7 +49,7 @@ msgstr "åç§°"
 
 #: js/trash.js:175 templates/index.php:27
 msgid "Deleted"
-msgstr ""
+msgstr "å·²åˆ é™¤"
 
 #: js/trash.js:184
 msgid "1 folder"
@@ -65,11 +69,11 @@ msgstr "{count} ä¸ªæ–‡ä»¶"
 
 #: templates/index.php:9
 msgid "Nothing in here. Your trash bin is empty!"
-msgstr ""
+msgstr "è¿™é‡Œæ²¡æœ‰ä¸œè¥¿. ä½ çš„å›žæ”¶ç«™æ˜¯ç©ºçš„!"
 
 #: templates/index.php:20 templates/index.php:22
 msgid "Restore"
-msgstr ""
+msgstr "æ¢å¤"
 
 #: templates/index.php:30 templates/index.php:31
 msgid "Delete"
@@ -77,4 +81,4 @@ msgstr "åˆ é™¤"
 
 #: templates/part.breadcrumb.php:9
 msgid "Deleted Files"
-msgstr ""
+msgstr "å·²åˆ é™¤æ–‡ä»¶"
diff --git a/l10n/zh_CN/files_versions.po b/l10n/zh_CN/files_versions.po
index ada0de78abe97259dca52d068e8f097c0f43975e..a01c8b41aa6f6596aa8896c95e0b5aa8b14b8e4c 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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:30+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 55b00867f9fa24730de49e5f2acfcebeb0d30eaa..27fe05a7deeb6427ead216bb9c4d2a8b77dbaacc 100644
--- a/l10n/zh_CN/lib.po
+++ b/l10n/zh_CN/lib.po
@@ -3,14 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <appweb.cn@gmail.com>, 2012.
-#   <rainofchaos@gmail.com>, 2012.
 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:35+0000\n"
+"POT-Creation-Date: 2013-04-28 01:57+0200\n"
+"PO-Revision-Date: 2013-04-27 23:57+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"
@@ -43,33 +41,33 @@ msgstr "åº”ç”¨"
 msgid "Admin"
 msgstr "ç®¡ç†"
 
-#: files.php:202
+#: files.php:209
 msgid "ZIP download is turned off."
 msgstr "ZIP ä¸‹è½½å·²ç»å…³é—"
 
-#: files.php:203
+#: files.php:210
 msgid "Files need to be downloaded one by one."
 msgstr "éœ€è¦é€ä¸€ä¸‹è½½æ–‡ä»¶"
 
-#: files.php:204 files.php:231
+#: files.php:211 files.php:244
 msgid "Back to Files"
 msgstr "å›žåˆ°æ–‡ä»¶"
 
-#: files.php:228
+#: files.php:241
 msgid "Selected files too large to generate zip file."
 msgstr "é€‰æ‹©çš„æ–‡ä»¶å¤ªå¤§ï¼Œæ— æ³•ç”Ÿæˆ zip æ–‡ä»¶ã€‚"
 
 #: helper.php:228
 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."
@@ -85,117 +83,113 @@ msgstr "æ–‡æœ¬"
 
 #: search/provider/file.php:29
 msgid "Images"
-msgstr "å›¾åƒ"
+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:128 setup.php:320 setup.php:365
+#: setup.php:132 setup.php:325 setup.php:370
 msgid "PostgreSQL username and/or password not valid"
-msgstr ""
+msgstr "PostgreSQL æ•°æ®åº“ç”¨æˆ·åå’Œ/æˆ–å¯†ç æ— æ•ˆ"
 
-#: setup.php:129 setup.php:152 setup.php:229
+#: setup.php:133 setup.php:156 setup.php:234
 msgid "You need to enter either an existing account or the administrator."
-msgstr ""
+msgstr "ä½ éœ€è¦è¾“å…¥ä¸€ä¸ªæ•°æ®åº“ä¸å·²æœ‰çš„è´¦æˆ·æˆ–ç®¡ç†å‘˜è´¦æˆ·ã€‚"
 
-#: setup.php:151 setup.php:453 setup.php:520
+#: setup.php:155 setup.php:458 setup.php:525
 msgid "Oracle username and/or password not valid"
-msgstr ""
+msgstr "Oracle æ•°æ®åº“ç”¨æˆ·åå’Œ/æˆ–å¯†ç æ— æ•ˆ"
 
-#: setup.php:228
+#: setup.php:233
 msgid "MySQL username and/or password not valid"
-msgstr ""
+msgstr "MySQL æ•°æ®åº“ç”¨æˆ·åå’Œ/æˆ–å¯†ç æ— æ•ˆ"
 
-#: 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: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:583 setup.php:592 setup.php:600 setup.php:609
+#: setup.php:615
 #, php-format
 msgid "DB Error: \"%s\""
-msgstr ""
+msgstr "æ•°æ®åº“é”™è¯¯ï¼š\"%s\""
 
-#: 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:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
+#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
+#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
 #, php-format
 msgid "Offending command was: \"%s\""
-msgstr ""
+msgstr "å†²çªå‘½ä»¤ä¸ºï¼š\"%s\""
 
-#: setup.php:299
+#: setup.php:304
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
-msgstr ""
+msgstr "MySQL ç”¨æˆ· '%s'@'localhost' å·²å˜åœ¨ã€‚"
 
-#: setup.php:300
+#: setup.php:305
 msgid "Drop this user from MySQL"
-msgstr ""
+msgstr "å»ºè®®ä»Ž MySQL æ•°æ®åº“ä¸ä¸¢å¼ƒ Drop æ¤ç”¨æˆ·"
 
-#: setup.php:305
+#: setup.php:310
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
-msgstr ""
+msgstr "MySQL ç”¨æˆ· '%s'@'%%' å·²å˜åœ¨"
 
-#: setup.php:306
+#: setup.php:311
 msgid "Drop this user from MySQL."
-msgstr ""
+msgstr "å»ºè®®ä»Ž MySQL æ•°æ®åº“ä¸ä¸¢å¼ƒ Drop æ¤ç”¨æˆ·ã€‚"
 
-#: setup.php:579 setup.php:611
+#: setup.php:584 setup.php:616
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
-msgstr ""
+msgstr "å†²çªå‘½ä»¤ä¸ºï¼š\"%s\"ï¼Œåç§°ï¼š%sï¼Œå¯†ç ï¼š%s"
 
-#: setup.php:631
+#: setup.php:636
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
-msgstr ""
+msgstr "MS SQL ç”¨æˆ·åå’Œ/æˆ–å¯†ç æ— æ•ˆï¼š%s"
 
-#: setup.php:849
+#: setup.php:858
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
-msgstr ""
+msgstr "æ‚¨çš„WebæœåŠ¡å™¨å°šæœªæ£ç¡®è®¾ç½®ä»¥å…è®¸æ–‡ä»¶åŒæ¥, å› ä¸ºWebDAVçš„æŽ¥å£ä¼¼ä¹Žå·²æŸå."
 
-#: setup.php:850
+#: setup.php:859
 #, 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"
-msgstr "å‡ ç§’å‰"
+msgstr "ç§’å‰"
 
 #: template.php:114
 msgid "1 minute ago"
-msgstr "1åˆ†é’Ÿå‰"
+msgstr "ä¸€åˆ†é’Ÿå‰"
 
 #: template.php:115
 #, php-format
@@ -235,24 +229,11 @@ 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 "æ£€æŸ¥æ›´æ–°åŠŸèƒ½è¢«å…³é—ã€‚"
+msgstr "å¹´å‰"
 
 #: vcategories.php:188 vcategories.php:249
 #, php-format
diff --git a/l10n/zh_CN/settings.po b/l10n/zh_CN/settings.po
index 2262b78d9519bc98142ce8fd5edc033ba137c841..fef0cdd11bd810b55ad5f300db031c772c9b30c8 100644
--- a/l10n/zh_CN/settings.po
+++ b/l10n/zh_CN/settings.po
@@ -3,19 +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-2013.
-# Phoenix Nemo <>, 2012.
-#   <rainofchaos@gmail.com>, 2012.
-#   <suiy02@gmail.com>, 2012.
-#   <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-03-02 00:03+0100\n"
-"PO-Revision-Date: 2013-03-01 09:21+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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"
@@ -27,14 +22,18 @@ 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 ""
+msgstr "æ— æ³•ä¿®æ”¹æ˜¾ç¤ºåç§°"
 
 #: ajax/creategroup.php:10
 msgid "Group already exists"
@@ -70,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"
@@ -88,86 +87,86 @@ msgstr "æ— æ³•ä»Žç»„%sä¸ç§»é™¤ç”¨æˆ·"
 
 #: ajax/updateapp.php:14
 msgid "Couldn't update app."
-msgstr ""
+msgstr "æ— æ³•æ›´æ–° appã€‚"
 
 #: js/apps.js:30
 msgid "Update to {appversion}"
-msgstr ""
+msgstr "æ›´æ–°è‡³ {appversion}"
 
 #: js/apps.js:36 js/apps.js:76
 msgid "Disable"
 msgstr "ç¦ç”¨"
 
-#: js/apps.js:36 js/apps.js:64
+#: js/apps.js:36 js/apps.js:64 js/apps.js:83
 msgid "Enable"
-msgstr "å¯ç”¨"
+msgstr "å¼€å¯"
 
 #: js/apps.js:55
 msgid "Please wait...."
-msgstr ""
-
-#: js/apps.js:84
-msgid "Updating...."
-msgstr ""
+msgstr "è¯·ç¨ç‰...."
 
-#: js/apps.js:87
-msgid "Error while updating app"
-msgstr ""
-
-#: js/apps.js:87
+#: 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 "æ›´æ–° app æ—¶å‡ºé”™"
+
+#: js/apps.js:96
 msgid "Updated"
-msgstr ""
+msgstr "å·²æ›´æ–°"
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
-msgstr "æ£åœ¨ä¿å˜"
+msgstr "ä¿å˜ä¸"
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "deleted"
 msgstr "å·²ç»åˆ é™¤"
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "undo"
 msgstr "æ’¤é”€"
 
-#: js/users.js:62
+#: js/users.js:79
 msgid "Unable to remove user"
-msgstr ""
+msgstr "æ— æ³•ç§»é™¤ç”¨æˆ·"
 
-#: js/users.js:75 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
+#: templates/users.php:103
 msgid "Groups"
 msgstr "ç»„"
 
-#: js/users.js:78 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr "ç»„ç®¡ç†å‘˜"
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "åˆ é™¤"
 
-#: js/users.js:191
+#: js/users.js:269
 msgid "add group"
-msgstr ""
+msgstr "æ·»åŠ ç»„"
 
-#: js/users.js:352
+#: js/users.js:420
 msgid "A valid username must be provided"
-msgstr ""
+msgstr "å¿…é¡»æä¾›åˆæ³•çš„ç”¨æˆ·å"
 
-#: js/users.js:353 js/users.js:359 js/users.js:374
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
-msgstr ""
+msgstr "åˆ›å»ºç”¨æˆ·å‡ºé”™"
 
-#: js/users.js:358
+#: js/users.js:426
 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 "ç®€ä½“ä¸æ–‡"
 
@@ -186,32 +185,32 @@ msgstr "æ‚¨çš„æ•°æ®æ–‡ä»¶å¤¹å’Œæ–‡ä»¶å¯ç”±äº’è”ç½‘è®¿é—®ã€‚OwnCloudæä¾›çš„.
 
 #: 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 "æ‚¨çš„WebæœåŠ¡å™¨å°šæœªæ£ç¡®è®¾ç½®ä»¥å…è®¸æ–‡ä»¶åŒæ¥, å› ä¸º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 "æ¨¡å—'æ–‡ä»¶ä¿¡æ¯'ä¸¢å¤±"
 
 #: 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æ¨¡å—'æ–‡ä»¶ä¿¡æ¯'ä¸¢å¤±. æˆ‘ä»¬å¼ºçƒˆå»ºè®®å¯ç”¨æ¤æ¨¡å—ä»¥ä¾¿mimeç±»åž‹æ£€æµ‹å–å¾—æœ€ä½³ç»“æžœ."
 
 #: templates/admin.php:58
 msgid "Locale not working"
-msgstr ""
+msgstr "æœ¬åœ°åŒ–æ— æ³•å·¥ä½œ"
 
 #: templates/admin.php:63
 #, php-format
@@ -219,11 +218,11 @@ msgid ""
 "This ownCloud server can't set system locale to %s. This means that there "
 "might be problems with certain characters in file names. We strongly suggest"
 " to install the required packages on your system to support %s."
-msgstr ""
+msgstr "æ¤ownCloudæœåŠ¡å™¨æ— æ³•è®¾ç½®ç³»ç»Ÿæœ¬åœ°åŒ–åˆ°%s. è¿™æ„å‘³ç€å¯èƒ½æ–‡ä»¶åä¸æœ‰ä¸€äº›å—ç¬¦å¼•èµ·é—®é¢˜. æˆ‘ä»¬å¼ºçƒˆå»ºè®®åœ¨ä½ ç³»ç»Ÿä¸Šå®‰è£…æ‰€éœ€çš„è½¯ä»¶åŒ…æ¥æ”¯æŒ%s"
 
 #: templates/admin.php:75
 msgid "Internet connection not working"
-msgstr ""
+msgstr "å› ç‰¹ç½‘è¿žæŽ¥æ— æ³•å·¥ä½œ"
 
 #: templates/admin.php:78
 msgid ""
@@ -233,100 +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 "æ¤ownCloudæœåŠ¡å™¨ä¸Šæ²¡æœ‰å¯ç”¨çš„å› ç‰¹ç½‘è¿žæŽ¥. è¿™æ„å‘³ç€æŸäº›ç‰¹æ€§ä¾‹å¦‚æŒ‚è½½å¤–éƒ¨å˜å‚¨å™¨, æé†’æ›´æ–°æˆ–å®‰è£…ç¬¬ä¸‰æ–¹åº”ç”¨æ— æ³•å·¥ä½œ. ä»Žè¿œç¨‹è®¿é—®æ–‡ä»¶å’Œå‘é€æé†’ç”µåé‚®ä»¶å¯èƒ½ä¹Ÿæ— æ³•å·¥ä½œ. å¦‚æžœä½ æƒ³è¦ownCloudçš„æ‰€æœ‰ç‰¹æ€§, æˆ‘ä»¬å»ºè®®å¯ç”¨æ¤æœåŠ¡å™¨çš„å› ç‰¹ç½‘è¿žæŽ¥."
 
 #: templates/admin.php:92
 msgid "Cron"
-msgstr ""
+msgstr "è®¡åˆ’ä»»åŠ¡"
 
 #: templates/admin.php:101
 msgid "Execute one task with each page loaded"
-msgstr ""
+msgstr "æ¯ä¸ªé¡µé¢åŠ è½½åŽæ‰§è¡Œä¸€ä¸ªä»»åŠ¡"
 
 #: templates/admin.php:111
 msgid ""
 "cron.php is registered at a webcron service. Call the cron.php page in the "
 "owncloud root once a minute over http."
-msgstr ""
+msgstr "cron.phpå·²è¢«æ³¨å†Œåˆ°ç½‘ç»œå®šæ—¶ä»»åŠ¡æœåŠ¡ã€‚é€šè¿‡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 "ä½¿ç”¨ç³»ç»Ÿå®šæ—¶ä»»åŠ¡æœåŠ¡ã€‚æ¯åˆ†é’Ÿé€šè¿‡ç³»ç»Ÿå®šæ—¶ä»»åŠ¡è°ƒç”¨owncloudæ–‡ä»¶å¤¹ä¸çš„cron.phpæ–‡ä»¶"
 
 #: templates/admin.php:128
 msgid "Sharing"
-msgstr ""
+msgstr "å…±äº«"
 
 #: templates/admin.php:134
 msgid "Enable Share API"
-msgstr ""
+msgstr "å¯ç”¨å…±äº«API"
 
 #: templates/admin.php:135
 msgid "Allow apps to use the Share API"
-msgstr ""
+msgstr "å…è®¸åº”ç”¨è½¯ä»¶ä½¿ç”¨å…±äº«API"
 
 #: templates/admin.php:142
 msgid "Allow links"
-msgstr ""
+msgstr "å…è®¸é“¾æŽ¥"
 
 #: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
-msgstr ""
+msgstr "å…è®¸ç”¨æˆ·ä½¿ç”¨è¿žæŽ¥å…¬å¼€å…±äº«é¡¹ç›®"
 
 #: templates/admin.php:150
 msgid "Allow resharing"
-msgstr ""
+msgstr "å…è®¸å†æ¬¡å…±äº«"
 
 #: templates/admin.php:151
 msgid "Allow users to share items shared with them again"
-msgstr ""
+msgstr "å…è®¸ç”¨æˆ·å°†å…±äº«ç»™ä»–ä»¬çš„é¡¹ç›®å†æ¬¡å…±äº«"
 
 #: templates/admin.php:158
 msgid "Allow users to share with anyone"
-msgstr ""
+msgstr "å…è®¸ç”¨æˆ·å‘ä»»ä½•äººå…±äº«"
 
 #: templates/admin.php:161
 msgid "Allow users to only share with users in their groups"
-msgstr ""
+msgstr "å…è®¸ç”¨æˆ·åªå‘åŒç»„ç”¨æˆ·å…±äº«"
 
 #: templates/admin.php:168
 msgid "Security"
-msgstr ""
+msgstr "å®‰å…¨"
 
 #: templates/admin.php:181
 msgid "Enforce HTTPS"
-msgstr ""
+msgstr "å¼ºåˆ¶ä½¿ç”¨ HTTPS"
 
 #: templates/admin.php:182
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
-msgstr ""
+msgstr "å¼ºåˆ¶å®¢æˆ·ç«¯é€šè¿‡åŠ å¯†è¿žæŽ¥è¿žæŽ¥åˆ° ownCloudã€‚"
 
 #: templates/admin.php:185
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
-msgstr ""
+msgstr "è¯·ç»ç”±HTTPSè¿žæŽ¥åˆ°è¿™ä¸ªownCloudå®žä¾‹æ¥å¯ç”¨æˆ–ç¦ç”¨å¼ºåˆ¶SSL."
 
 #: 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:230 templates/personal.php:102
+#: templates/admin.php:228
+msgid "Less"
+msgstr "æ›´å°‘"
+
+#: templates/admin.php:235 templates/personal.php:105
 msgid "Version"
 msgstr "ç‰ˆæœ¬"
 
-#: templates/admin.php:233 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,9 +398,9 @@ 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:77
 msgid "Password"
 msgstr "å¯†ç "
 
@@ -421,82 +424,70 @@ msgstr "æ–°å¯†ç "
 msgid "Change password"
 msgstr "ä¿®æ”¹å¯†ç "
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:76
 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 ""
+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 "WebDAV"
 
-#: templates/personal.php:93
+#: templates/personal.php:96
 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:75
 msgid "Login Name"
-msgstr ""
+msgstr "ç™»å½•åç§°"
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr "åˆ›å»º"
 
-#: templates/users.php:35
+#: templates/users.php:33
 msgid "Default Storage"
 msgstr "é»˜è®¤å˜å‚¨"
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:39 templates/users.php:133
 msgid "Unlimited"
 msgstr "æ— é™"
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:57 templates/users.php:148
 msgid "Other"
 msgstr "å…¶å®ƒ"
 
-#: templates/users.php:84
+#: templates/users.php:82
 msgid "Storage"
 msgstr "å˜å‚¨"
 
-#: templates/users.php:95
+#: templates/users.php:93
 msgid "change display name"
-msgstr ""
+msgstr "ä¿®æ”¹æ˜¾ç¤ºåç§°"
 
-#: templates/users.php:99
+#: templates/users.php:97
 msgid "set new password"
-msgstr ""
+msgstr "è®¾ç½®æ–°å¯†ç "
 
-#: templates/users.php:134
+#: templates/users.php:128
 msgid "Default"
 msgstr "é»˜è®¤"
diff --git a/l10n/zh_CN/user_ldap.po b/l10n/zh_CN/user_ldap.po
index 4d9a5122f2cc7f1baea938efd7664caaae5a541d..47d10ead3671122cb119726b54da650d37973648 100644
--- a/l10n/zh_CN/user_ldap.po
+++ b/l10n/zh_CN/user_ldap.po
@@ -3,14 +3,12 @@
 # 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-02 00:03+0100\n"
-"PO-Revision-Date: 2013-03-01 23:04+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -19,25 +17,29 @@ 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 ""
+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"
@@ -45,291 +47,373 @@ 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 "<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:18
+#: templates/settings.php:32
 msgid "Add Server Configuration"
-msgstr ""
+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 "å¯ä»¥å¿½ç•¥åè®®ï¼Œä½†å¦‚è¦ä½¿ç”¨SSLï¼Œåˆ™éœ€ä»¥ldaps://å¼€å¤´"
 
-#: templates/settings.php:26
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "Base DN"
 
-#: templates/settings.php:27
+#: templates/settings.php:41
 msgid "One Base DN per line"
-msgstr ""
+msgstr "æ¯è¡Œä¸€ä¸ªåŸºæœ¬åˆ¤åˆ«å"
 
-#: templates/settings.php:28
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "æ‚¨å¯ä»¥åœ¨é«˜çº§é€‰é¡¹å¡é‡Œä¸ºç”¨æˆ·å’Œç»„æŒ‡å®šBase DN"
 
-#: templates/settings.php:30
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "User DN"
 
-#: 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 "å®¢æˆ·ç«¯ä½¿ç”¨çš„DNå¿…é¡»ä¸Žç»‘å®šçš„ç›¸åŒï¼Œæ¯”å¦‚uid=agent,dc=example,dc=com\nå¦‚éœ€åŒ¿åè®¿é—®ï¼Œå°†DNå’Œå¯†ç ä¿ç•™ä¸ºç©º"
 
-#: 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 "å¯ç”¨åŒ¿åè®¿é—®ï¼Œå°†DNå’Œå¯†ç ä¿ç•™ä¸ºç©º"
 
-#: 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 "å®šä¹‰å½“å°è¯•ç™»å½•æ—¶çš„è¿‡æ»¤å™¨ã€‚ åœ¨ç™»å½•è¿‡ç¨‹ä¸ï¼Œ%%uidå°†ä¼šè¢«ç”¨æˆ·åæ›¿æ¢"
 
-#: templates/settings.php:41
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "ä½¿ç”¨ %%uidä½œä¸ºå ä½ç¬¦ï¼Œä¾‹å¦‚â€œuid=%%uidâ€"
 
-#: 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 "æ²¡æœ‰ä»»ä½•å ä½ç¬¦,å¦‚ \"objectClass=person\"."
 
-#: 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 "æ— éœ€å ä½ç¬¦ï¼Œä¾‹å¦‚\"objectClass=posixGroup\""
 
-#: templates/settings.php:55
+#: templates/settings.php:69
 msgid "Connection Settings"
-msgstr ""
+msgstr "è¿žæŽ¥è®¾ç½®"
 
-#: templates/settings.php:57
+#: templates/settings.php:71
 msgid "Configuration Active"
-msgstr ""
+msgstr "çŽ°è¡Œé…ç½®"
 
-#: templates/settings.php:57
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
-msgstr ""
+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 ""
+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 ""
+msgstr "ç»™å‡ºä¸€ä¸ªå¯é€‰çš„å¤‡ä»½ä¸»æœºã€‚å®ƒå¿…é¡»ä¸ºä¸» LDAP/AD æœåŠ¡å™¨çš„ä¸€ä¸ªé•œåƒã€‚"
 
-#: templates/settings.php:60
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
-msgstr ""
+msgstr "å¤‡ä»½ (é•œåƒ) ç«¯å£"
 
-#: templates/settings.php:61
+#: templates/settings.php:75
 msgid "Disable Main Server"
-msgstr ""
+msgstr "ç¦ç”¨ä¸»æœåŠ¡å™¨"
 
-#: templates/settings.php:61
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
-msgstr ""
+msgstr "å½“å¼€å¯åŽï¼ŒownCloud å°†ä»…è¿žæŽ¥åˆ°é•œåƒæœåŠ¡å™¨ã€‚"
 
-#: templates/settings.php:62
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "ä½¿ç”¨TLS"
 
-#: templates/settings.php:62
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
-msgstr ""
+msgstr "å¯¹äºŽ LDAPS è¿žæŽ¥ä¸è¦é¢å¤–å¯ç”¨å®ƒï¼Œè¿žæŽ¥å¿…ç„¶å¤±è´¥ã€‚"
 
-#: templates/settings.php:63
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "å¤§å°å†™æ•æ„ŸLDAPæœåŠ¡å™¨(Windows)"
 
-#: templates/settings.php:64
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "å…³é—SSLè¯ä¹¦éªŒè¯"
 
-#: 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 "å¦‚æžœé“¾æŽ¥ä»…åœ¨æ¤é€‰é¡¹æ—¶å¯ç”¨ï¼Œåœ¨æ‚¨çš„ownCloudæœåŠ¡å™¨ä¸å¯¼å…¥LDAPæœåŠ¡å™¨çš„SSLè¯ä¹¦ã€‚"
 
-#: 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 ""
+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 ""
+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 "ç”¨æ¥ç”Ÿæˆç”¨æˆ·çš„ownCloudåç§°çš„ LDAPå±žæ€§"
 
-#: 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 ""
+msgstr "æ¯è¡Œä¸€ä¸ªç”¨æˆ·åŸºå‡†åˆ¤åˆ«å"
 
-#: templates/settings.php:71
+#: templates/settings.php:85
 msgid "User Search Attributes"
-msgstr ""
+msgstr "ç”¨æˆ·æœç´¢å±žæ€§"
 
-#: templates/settings.php:71 templates/settings.php:74
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
-msgstr ""
+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 "ç”¨æ¥ç”Ÿæˆç»„çš„ownCloudåç§°çš„LDAPå±žæ€§"
 
-#: 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 ""
+msgstr "æ¯è¡Œä¸€ä¸ªç¾¤ç»„åŸºå‡†åˆ¤åˆ«å"
 
-#: templates/settings.php:74
+#: templates/settings.php:88
 msgid "Group Search Attributes"
-msgstr ""
+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 ""
+msgstr "ç‰¹æ®Šå±žæ€§"
 
-#: templates/settings.php:79
+#: templates/settings.php:93
 msgid "Quota Field"
-msgstr ""
+msgstr "é…é¢å—æ®µ"
 
-#: templates/settings.php:80
+#: templates/settings.php:94
 msgid "Quota Default"
-msgstr ""
+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 ""
+msgstr "ç”µé‚®å—æ®µ"
 
-#: templates/settings.php:82
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
-msgstr ""
+msgstr "ç”¨æˆ·ä¸»ç›®å½•å‘½åè§„åˆ™"
 
-#: templates/settings.php:82
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "å°†ç”¨æˆ·åç§°ç•™ç©º(é»˜è®¤)ã€‚å¦åˆ™æŒ‡å®šä¸€ä¸ªLDAP/ADå±žæ€§"
 
-#: templates/settings.php:86
-msgid "Test Configuration"
+#: templates/settings.php:101
+msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:86
+#: 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/zh_CN/user_webdavauth.po b/l10n/zh_CN/user_webdavauth.po
index a642c9b21d8e34fd1c856497463abaee7651d780..7c8b3ea542db15d34f4433bcb1571a5c0a3a7b7a 100644
--- a/l10n/zh_CN/user_webdavauth.po
+++ b/l10n/zh_CN/user_webdavauth.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-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-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -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 65b41b0aeeef3a171bc59af21a6a0e367d49a90d..000af61d0fc83dc944d65db69e3996f409fcb9c2 100644
--- a/l10n/zh_HK/core.po
+++ b/l10n/zh_HK/core.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <amanda.shuuemura@gmail.com>, 2012.
 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: 2013-02-08 23:12+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10: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"
@@ -18,24 +17,24 @@ msgstr ""
 "Language: zh_HK\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/share.php:85
+#: ajax/share.php:97
 #, php-format
 msgid "User %s shared a file with you"
 msgstr ""
 
-#: ajax/share.php:87
+#: ajax/share.php:99
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr ""
 
-#: ajax/share.php:89
+#: 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:91
+#: ajax/share.php:104
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -81,168 +80,170 @@ msgstr ""
 msgid "Error removing %s from favorites."
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:34
 msgid "Sunday"
-msgstr ""
+msgstr "æ˜ŸæœŸæ—¥"
 
-#: js/config.php:32
+#: js/config.php:35
 msgid "Monday"
-msgstr ""
+msgstr "æ˜ŸæœŸä¸€"
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Tuesday"
-msgstr ""
+msgstr "æ˜ŸæœŸäºŒ"
 
-#: js/config.php:32
+#: js/config.php:37
 msgid "Wednesday"
-msgstr ""
+msgstr "æ˜ŸæœŸä¸‰"
 
-#: js/config.php:32
+#: js/config.php:38
 msgid "Thursday"
-msgstr ""
+msgstr "æ˜ŸæœŸå››"
 
-#: js/config.php:32
+#: js/config.php:39
 msgid "Friday"
-msgstr ""
+msgstr "æ˜ŸæœŸäº”"
 
-#: js/config.php:32
+#: js/config.php:40
 msgid "Saturday"
-msgstr ""
+msgstr "æ˜ŸæœŸå…"
 
-#: js/config.php:33
+#: js/config.php:45
 msgid "January"
-msgstr ""
+msgstr "ä¸€æœˆ"
 
-#: js/config.php:33
+#: js/config.php:46
 msgid "February"
-msgstr ""
+msgstr "äºŒæœˆ"
 
-#: js/config.php:33
+#: js/config.php:47
 msgid "March"
-msgstr ""
+msgstr "ä¸‰æœˆ"
 
-#: js/config.php:33
+#: js/config.php:48
 msgid "April"
-msgstr ""
+msgstr "å››æœˆ"
 
-#: js/config.php:33
+#: js/config.php:49
 msgid "May"
-msgstr ""
+msgstr "äº”æœˆ"
 
-#: js/config.php:33
+#: js/config.php:50
 msgid "June"
-msgstr ""
+msgstr "å…æœˆ"
 
-#: js/config.php:33
+#: js/config.php:51
 msgid "July"
-msgstr ""
+msgstr "ä¸ƒæœˆ"
 
-#: js/config.php:33
+#: js/config.php:52
 msgid "August"
-msgstr ""
+msgstr "å…«æœˆ"
 
-#: js/config.php:33
+#: js/config.php:53
 msgid "September"
-msgstr ""
+msgstr "ä¹æœˆ"
 
-#: js/config.php:33
+#: js/config.php:54
 msgid "October"
-msgstr ""
+msgstr "åæœˆ"
 
-#: js/config.php:33
+#: js/config.php:55
 msgid "November"
-msgstr ""
+msgstr "åä¸€æœˆ"
 
-#: js/config.php:33
+#: js/config.php:56
 msgid "December"
-msgstr ""
+msgstr "åäºŒæœˆ"
 
-#: js/js.js:284
+#: js/js.js:286
 msgid "Settings"
-msgstr ""
+msgstr "è¨å®š"
 
-#: js/js.js:764
+#: js/js.js:718
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:765
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:766
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:767
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:768
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:769
+#: js/js.js:723
 msgid "today"
-msgstr ""
+msgstr "ä»Šæ—¥"
 
-#: js/js.js:770
+#: js/js.js:724
 msgid "yesterday"
-msgstr ""
+msgstr "æ˜¨æ—¥"
 
-#: js/js.js:771
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:772
+#: js/js.js:726
 msgid "last month"
-msgstr ""
+msgstr "å‰ä¸€æœˆ"
 
-#: js/js.js:773
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:774
+#: js/js.js:728
 msgid "months ago"
-msgstr ""
+msgstr "å€‹æœˆä¹‹å‰"
 
-#: js/js.js:775
+#: js/js.js:729
 msgid "last year"
 msgstr ""
 
-#: js/js.js:776
+#: js/js.js:730
 msgid "years ago"
 msgstr ""
 
-#: js/oc-dialogs.js:126
-msgid "Choose"
-msgstr ""
+#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
+msgid "Ok"
+msgstr "OK"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
 msgid "Cancel"
-msgstr ""
+msgstr "å–æ¶ˆ"
 
-#: js/oc-dialogs.js:162
-msgid "No"
+#: js/oc-dialogs.js:185
+msgid "Choose"
 msgstr ""
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:215
 msgid "Yes"
-msgstr ""
+msgstr "Yes"
 
-#: js/oc-dialogs.js:180
-msgid "Ok"
-msgstr ""
+#: js/oc-dialogs.js:222
+msgid "No"
+msgstr "No"
 
 #: 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:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:571
-#: js/share.js:583
+#: 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 "éŒ¯èª¤"
 
 #: js/oc-vcategories.js:179
 msgid "The app name is not specified."
@@ -252,129 +253,129 @@ msgstr ""
 msgid "The required file {file} is not installed!"
 msgstr ""
 
-#: js/share.js:29 js/share.js:43 js/share.js:90 js/share.js:93
-msgid "Share"
-msgstr ""
-
-#: js/share.js:29 js/share.js:43 js/share.js:90 js/share.js:93
+#: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
-msgstr ""
+msgstr "å·²åˆ†äº«"
 
-#: js/share.js:141 js/share.js:611
+#: js/share.js:90
+msgid "Share"
+msgstr "åˆ†äº«"
+
+#: js/share.js:125 js/share.js:617
 msgid "Error while sharing"
-msgstr ""
+msgstr "åˆ†äº«æ™‚ç™¼ç”ŸéŒ¯èª¤"
 
-#: js/share.js:152
+#: js/share.js:136
 msgid "Error while unsharing"
-msgstr ""
+msgstr "å–æ¶ˆåˆ†äº«æ™‚ç™¼ç”ŸéŒ¯èª¤"
 
-#: js/share.js:159
+#: js/share.js:143
 msgid "Error while changing permissions"
-msgstr ""
+msgstr "æ›´æ”¹æ¬Šé™æ™‚ç™¼ç”ŸéŒ¯èª¤"
 
-#: js/share.js:168
+#: js/share.js:152
 msgid "Shared with you and the group {group} by {owner}"
-msgstr ""
+msgstr "{owner}èˆ‡ä½ åŠç¾¤çµ„çš„åˆ†äº«"
 
-#: js/share.js:170
+#: js/share.js:154
 msgid "Shared with you by {owner}"
-msgstr ""
+msgstr "{owner}èˆ‡ä½ çš„åˆ†äº«"
 
-#: js/share.js:175
+#: js/share.js:159
 msgid "Share with"
-msgstr ""
+msgstr "åˆ†äº«"
 
-#: js/share.js:180
+#: js/share.js:164
 msgid "Share with link"
-msgstr ""
+msgstr "ä»¥é€£çµåˆ†äº«"
 
-#: js/share.js:183
+#: js/share.js:167
 msgid "Password protect"
-msgstr ""
+msgstr "å¯†ç¢¼ä¿è·"
 
-#: js/share.js:185 templates/installation.php:44 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
-msgstr ""
+msgstr "å¯†ç¢¼"
 
-#: js/share.js:189
+#: js/share.js:173
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:190
+#: js/share.js:174
 msgid "Send"
-msgstr ""
+msgstr "å‚³é€"
 
-#: js/share.js:194
+#: js/share.js:178
 msgid "Set expiration date"
-msgstr ""
+msgstr "è¨å®šåˆ†äº«æœŸé™"
 
-#: js/share.js:195
+#: js/share.js:179
 msgid "Expiration date"
-msgstr ""
+msgstr "åˆ†äº«æœŸé™"
 
-#: js/share.js:227
+#: js/share.js:211
 msgid "Share via email:"
-msgstr ""
+msgstr "ä»¥é›»éƒµåˆ†äº«"
 
-#: js/share.js:229
+#: js/share.js:213
 msgid "No people found"
-msgstr ""
+msgstr "æ‰¾ä¸åˆ°"
 
-#: js/share.js:256
+#: js/share.js:251
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:292
+#: js/share.js:287
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:313
+#: js/share.js:308
 msgid "Unshare"
-msgstr ""
+msgstr "å–æ¶ˆåˆ†äº«"
 
-#: js/share.js:325
+#: js/share.js:320
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:327
+#: js/share.js:322
 msgid "access control"
 msgstr ""
 
-#: js/share.js:330
+#: js/share.js:325
 msgid "create"
-msgstr ""
+msgstr "æ–°å¢ž"
 
-#: js/share.js:333
+#: js/share.js:328
 msgid "update"
-msgstr ""
+msgstr "æ›´æ–°"
 
-#: js/share.js:336
+#: js/share.js:331
 msgid "delete"
-msgstr ""
+msgstr "åˆªé™¤"
 
-#: js/share.js:339
+#: js/share.js:334
 msgid "share"
-msgstr ""
+msgstr "åˆ†äº«"
 
-#: js/share.js:373 js/share.js:558
+#: js/share.js:368 js/share.js:564
 msgid "Password protected"
-msgstr ""
+msgstr "å¯†ç¢¼ä¿è·"
 
-#: js/share.js:571
+#: js/share.js:577
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:583
+#: js/share.js:589
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:598
+#: js/share.js:604
 msgid "Sending ..."
-msgstr ""
+msgstr "å‚³é€ä¸"
 
-#: js/share.js:609
+#: js/share.js:615
 msgid "Email sent"
-msgstr ""
+msgstr "éƒµä»¶å·²å‚³"
 
 #: js/update.js:14
 msgid ""
@@ -385,72 +386,75 @@ msgstr ""
 
 #: js/update.js:18
 msgid "The update was successful. Redirecting you to ownCloud now."
-msgstr ""
+msgstr "æ›´æ–°æˆåŠŸ, æ£"
 
-#: lostpassword/controller.php:47
+#: 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 ""
+msgstr "è«‹ç”¨ä»¥ä¸‹é€£çµé‡è¨ä½ çš„å¯†ç¢¼: {link}"
 
-#: 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:39
-#: 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"
@@ -458,7 +462,7 @@ msgstr ""
 
 #: templates/404.php:12
 msgid "Cloud not found"
-msgstr ""
+msgstr "æœªæ‰¾åˆ°Cloud"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
@@ -466,129 +470,144 @@ msgstr ""
 
 #: templates/edit_categories_dialog.php:16
 msgid "Add"
-msgstr ""
+msgstr "åŠ å…¥"
 
-#: templates/installation.php:23 templates/installation.php:30
+#: 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:25
+#: 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:31
+#: 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:32
+#: 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:36
+#: templates/installation.php:44
 msgid "Create an <strong>admin account</strong>"
-msgstr ""
+msgstr "å»ºç«‹ç®¡ç†å“¡å¸³æˆ¶"
 
-#: templates/installation.php:52
+#: templates/installation.php:62
 msgid "Advanced"
-msgstr ""
+msgstr "é€²éšŽ"
 
-#: templates/installation.php:54
+#: templates/installation.php:64
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:61
+#: templates/installation.php:74
 msgid "Configure the database"
-msgstr ""
+msgstr "è¨å®šè³‡æ–™åº«"
 
-#: templates/installation.php:66 templates/installation.php:77
-#: templates/installation.php:87 templates/installation.php:97
+#: 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:109
+#: templates/installation.php:137
 msgid "Database user"
-msgstr ""
+msgstr "è³‡æ–™åº«å¸³æˆ¶"
 
-#: templates/installation.php:113
+#: templates/installation.php:144
 msgid "Database password"
-msgstr ""
+msgstr "è³‡æ–™åº«å¯†ç¢¼"
 
-#: templates/installation.php:117
+#: templates/installation.php:149
 msgid "Database name"
-msgstr ""
+msgstr "è³‡æ–™åº«åç¨±"
 
-#: templates/installation.php:125
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:131
+#: templates/installation.php:166
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:136
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr ""
 
-#: templates/layout.guest.php:33
+#: templates/layout.guest.php:40
 msgid "web services under your control"
 msgstr ""
 
-#: templates/layout.user.php:48
-msgid "Log out"
+#: templates/layout.user.php:36
+#, php-format
+msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/login.php:10
+#: templates/layout.user.php:61
+msgid "Log out"
+msgstr "ç™»å‡º"
+
+#: 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 ""
 
 #: 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 ""
+msgstr "ownCloud (ver. %s)æ›´æ–°ä¸, è«‹è€å¿ƒç‰ä¾¯"
diff --git a/l10n/zh_HK/files.po b/l10n/zh_HK/files.po
index 6fb648527a3480bc7450f87f850c0bda00291122..57d0ed08b7a677848195485482917fb4e1a3a24c 100644
--- a/l10n/zh_HK/files.po
+++ b/l10n/zh_HK/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-04 00:06+0100\n"
-"PO-Revision-Date: 2013-03-03 23:06+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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,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 ""
@@ -70,59 +66,70 @@ msgstr ""
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:10
+#: 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:92 templates/index.php:93
+#: 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/files.js:292 js/files.js:408
-#: js/files.js:439
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:251
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:323
+#: 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 ""
@@ -145,80 +152,80 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:225
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:262
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:262
-msgid "Upload Error"
-msgstr ""
-
-#: js/files.js:273
-msgid "Close"
-msgstr ""
-
-#: js/files.js:312
-msgid "1 file uploading"
-msgstr ""
-
-#: js/files.js:315 js/files.js:370 js/files.js:385
-msgid "{count} files uploading"
+#: js/files.js:277
+msgid "Not enough space available"
 msgstr ""
 
-#: js/files.js:388 js/files.js:423
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:497
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:570
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:575
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:953 templates/index.php:68
+#: 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 ""
+msgstr "åç¨±"
 
-#: js/files.js:954 templates/index.php:79
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr ""
 
-#: js/files.js:955 templates/index.php:81
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:974
+#: js/files.js:898
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:976
+#: js/files.js:900
 msgid "{count} folders"
-msgstr ""
+msgstr "{}æ–‡ä»¶å¤¾"
 
-#: js/files.js:984
+#: js/files.js:908
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:986
+#: 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"
@@ -250,7 +257,7 @@ msgstr ""
 
 #: templates/admin.php:26
 msgid "Save"
-msgstr ""
+msgstr "å„²å˜"
 
 #: templates/index.php:7
 msgid "New"
@@ -268,45 +275,45 @@ msgstr ""
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:42
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:48
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:53
+#: templates/index.php:54
 msgid "You donâ€™t have write permissions here."
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:74
+#: templates/index.php:75
 msgid "Download"
-msgstr ""
+msgstr "ä¸‹è¼‰"
 
-#: templates/index.php:86 templates/index.php:87
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
-msgstr ""
+msgstr "å–æ¶ˆåˆ†äº«"
 
-#: templates/index.php:106
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:108
+#: 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:113
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:116
+#: 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 b213e0bbd8d8ff36c1f80b4ae1a721cb119c3d3f..2cc250c3866f55a51b9dea5872ec858dcd4ff24e 100644
--- a/l10n/zh_HK/files_encryption.po
+++ b/l10n/zh_HK/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-10 00:08+0100\n"
-"PO-Revision-Date: 2013-02-09 23:09+0000\n"
+"POT-Creation-Date: 2013-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
@@ -19,15 +19,15 @@ msgstr ""
 
 #: templates/settings-personal.php:4 templates/settings.php:5
 msgid "Encryption"
-msgstr ""
+msgstr "åŠ å¯†"
 
 #: templates/settings-personal.php:7
 msgid "File encryption is enabled."
-msgstr ""
+msgstr "æª”æ¡ˆåŠ å¯†å·²é–‹å•Ÿ"
 
 #: templates/settings-personal.php:11
 msgid "The following file types will not be encrypted:"
-msgstr ""
+msgstr "ä»¥ä¸‹æ–‡ä»¶é¡žåˆ¥å°‡ä¸æœƒè¢«åŠ å¯†"
 
 #: templates/settings.php:7
 msgid "Exclude the following file types from encryption:"
@@ -35,4 +35,4 @@ msgstr ""
 
 #: templates/settings.php:12
 msgid "None"
-msgstr ""
+msgstr "ç©º"
diff --git a/l10n/zh_HK/files_external.po b/l10n/zh_HK/files_external.po
index 95bd8e76a913cd4a3169ad0569298c0178ba1f34..1b8a3b87058bbebd665112c1dd76108df935b7f5 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-02-28 00:04+0100\n"
-"PO-Revision-Date: 2013-02-27 23:04+0000\n"
+"POT-Creation-Date: 2013-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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: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 ""
@@ -88,16 +95,16 @@ msgstr ""
 
 #: templates/settings.php:92
 msgid "Groups"
-msgstr ""
+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
 msgid "Delete"
-msgstr ""
+msgstr "åˆªé™¤"
 
 #: templates/settings.php:129
 msgid "Enable User External Storage"
diff --git a/l10n/zh_HK/files_sharing.po b/l10n/zh_HK/files_sharing.po
index 4721ae096c27f0187cf2d16937191a1da57eb978..3f73a185ada11b0287c92e23cefbfb00a2f3b76b 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: 2012-11-19 00:01+0100\n"
-"PO-Revision-Date: 2012-08-12 22:35+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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"
@@ -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 ""
+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_HK/files_trashbin.po b/l10n/zh_HK/files_trashbin.po
index efeae3b8e6c9f6c80934f00528dbe7c182c55b59..50a8313ffdc22604d0ed047c94b979560cb09a49 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-03-08 00:25+0100\n"
-"PO-Revision-Date: 2013-03-07 23:25+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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,12 +17,12 @@ msgstr ""
 "Language: zh_HK\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/delete.php:40
+#: ajax/delete.php:42
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
 
-#: ajax/undelete.php:41
+#: ajax/undelete.php:42
 #, php-format
 msgid "Couldn't restore %s"
 msgstr ""
@@ -31,6 +31,10 @@ msgstr ""
 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 ""
@@ -41,7 +45,7 @@ msgstr ""
 
 #: js/trash.js:174 templates/index.php:17
 msgid "Name"
-msgstr ""
+msgstr "åç¨±"
 
 #: js/trash.js:175 templates/index.php:27
 msgid "Deleted"
@@ -53,7 +57,7 @@ msgstr ""
 
 #: js/trash.js:186
 msgid "{count} folders"
-msgstr ""
+msgstr "{}æ–‡ä»¶å¤¾"
 
 #: js/trash.js:194
 msgid "1 file"
@@ -73,7 +77,7 @@ msgstr ""
 
 #: templates/index.php:30 templates/index.php:31
 msgid "Delete"
-msgstr ""
+msgstr "åˆªé™¤"
 
 #: templates/part.breadcrumb.php:9
 msgid "Deleted Files"
diff --git a/l10n/zh_HK/files_versions.po b/l10n/zh_HK/files_versions.po
index 893fb184e9b688b73829f037d64a01e12956a3ed..a26316004acd9af4c9ba3a2dfadd52a55f372627 100644
--- a/l10n/zh_HK/files_versions.po
+++ b/l10n/zh_HK/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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:30+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"
@@ -24,7 +24,7 @@ msgstr ""
 
 #: history.php:40
 msgid "success"
-msgstr ""
+msgstr "æˆåŠŸ"
 
 #: history.php:42
 #, php-format
@@ -33,24 +33,24 @@ msgstr ""
 
 #: history.php:49
 msgid "failure"
-msgstr ""
+msgstr "å¤±æ•—"
 
 #: history.php:51
 #, php-format
 msgid "File %s could not be reverted to version %s"
 msgstr ""
 
-#: history.php:68
+#: history.php:69
 msgid "No old versions available"
-msgstr ""
+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/zh_HK/lib.po b/l10n/zh_HK/lib.po
index 17cc01004159d99ad864d78b231ce06b6afff87c..c47e2fd170704997dfc34c88b41f9c955cee0caa 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-02-27 14:35+0100\n"
-"PO-Revision-Date: 2013-02-27 13:35+0000\n"
+"POT-Creation-Date: 2013-04-28 01:57+0200\n"
+"PO-Revision-Date: 2013-04-27 23:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
@@ -19,41 +19,41 @@ msgstr ""
 
 #: app.php:349
 msgid "Help"
-msgstr ""
+msgstr "å¹«åŠ©"
 
 #: app.php:362
 msgid "Personal"
-msgstr ""
+msgstr "å€‹äºº"
 
 #: app.php:373
 msgid "Settings"
-msgstr ""
+msgstr "è¨å®š"
 
 #: app.php:385
 msgid "Users"
-msgstr ""
+msgstr "ç”¨æˆ¶"
 
 #: app.php:398
 msgid "Apps"
-msgstr ""
+msgstr "è»Ÿä»¶"
 
 #: app.php:406
 msgid "Admin"
-msgstr ""
+msgstr "ç®¡ç†"
 
-#: files.php:202
+#: files.php:209
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:203
+#: files.php:210
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:204 files.php:231
+#: files.php:211 files.php:244
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:228
+#: files.php:241
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
@@ -75,11 +75,11 @@ 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"
-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,72 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:128 setup.php:320 setup.php:365
+#: setup.php:132 setup.php:325 setup.php:370
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:129 setup.php:152 setup.php:229
+#: setup.php:133 setup.php:156 setup.php:234
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:151 setup.php:453 setup.php:520
+#: setup.php:155 setup.php:458 setup.php:525
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:228
+#: setup.php:233
 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: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:583 setup.php:592 setup.php:600 setup.php:609
+#: setup.php:615
 #, 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:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
+#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
+#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:299
+#: setup.php:304
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:300
+#: setup.php:305
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:305
+#: setup.php:310
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:306
+#: setup.php:311
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:579 setup.php:611
+#: setup.php:584 setup.php:616
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:631
+#: setup.php:636
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:849
+#: setup.php:858
 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:859
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
@@ -211,11 +207,11 @@ msgstr ""
 
 #: template.php:118
 msgid "today"
-msgstr ""
+msgstr "ä»Šæ—¥"
 
 #: template.php:119
 msgid "yesterday"
-msgstr ""
+msgstr "æ˜¨æ—¥"
 
 #: template.php:120
 #, php-format
@@ -224,7 +220,7 @@ msgstr ""
 
 #: template.php:121
 msgid "last month"
-msgstr ""
+msgstr "å‰ä¸€æœˆ"
 
 #: template.php:122
 #, php-format
@@ -239,19 +235,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 5650c789106bddbe5c2b1be4bd7089a00fea21c8..b9e2346a6f9363508e51d0a71b19042325b7ae59 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-02-27 14:35+0100\n"
-"PO-Revision-Date: 2013-02-27 13:35+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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 ""
 
@@ -92,7 +96,7 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: js/apps.js:36 js/apps.js:64
+#: js/apps.js:36 js/apps.js:64 js/apps.js:83
 msgid "Enable"
 msgstr ""
 
@@ -100,68 +104,68 @@ msgstr ""
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:84
+#: 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:87
+#: js/apps.js:93
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:87
-msgid "Error"
-msgstr ""
-
-#: js/apps.js:90
+#: js/apps.js:96
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr ""
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "deleted"
 msgstr ""
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "undo"
 msgstr ""
 
-#: js/users.js:62
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:75 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
+#: templates/users.php:103
 msgid "Groups"
-msgstr ""
+msgstr "ç¾¤çµ„"
 
-#: js/users.js:78 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
-msgstr ""
+msgstr "åˆªé™¤"
 
-#: js/users.js:191
+#: js/users.js:269
 msgid "add group"
 msgstr ""
 
-#: js/users.js:352
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:353 js/users.js:359 js/users.js:374
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:358
+#: js/users.js:426
 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,15 +316,19 @@ msgstr ""
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:230 templates/personal.php:102
+#: templates/admin.php:228
+msgid "Less"
+msgstr ""
+
+#: templates/admin.php:235 templates/personal.php:105
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:233 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 "
@@ -391,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:77
 msgid "Password"
-msgstr ""
+msgstr "å¯†ç¢¼"
 
 #: templates/personal.php:38
 msgid "Your password was changed"
@@ -409,88 +417,76 @@ 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
+#: templates/personal.php:56 templates/users.php:76
 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 ""
+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:75
 msgid "Login Name"
 msgstr ""
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr ""
 
-#: templates/users.php:35
+#: templates/users.php:33
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:39 templates/users.php:133
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:57 templates/users.php:148
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:84
+#: templates/users.php:82
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:95
+#: templates/users.php:93
 msgid "change display name"
 msgstr ""
 
-#: templates/users.php:99
+#: templates/users.php:97
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:134
+#: templates/users.php:128
 msgid "Default"
 msgstr ""
diff --git a/l10n/zh_HK/user_ldap.po b/l10n/zh_HK/user_ldap.po
index 55843162a9486763353966ca8e3ac6439940103e..f619852c77af19eaf5cb1f5a076dde63b5ad8fd3 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-02 00:03+0100\n"
-"PO-Revision-Date: 2013-03-01 23:04+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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: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 ""
+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 ""
+msgstr "å¹«åŠ©"
diff --git a/l10n/zh_HK/user_webdavauth.po b/l10n/zh_HK/user_webdavauth.po
index 5a2c43c09ce8b3fa473f00fcfaa506d3dec9dd0c..861fd6ab9874a1bed8e0d019e78b52729ac3ef5e 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-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
@@ -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 ac0cd1754c9c46579ddab98ce8ebb13e94bb1330..e3de472e4ea8597c2a81647e705e35171ac442fe 100644
--- a/l10n/zh_TW/core.po
+++ b/l10n/zh_TW/core.po
@@ -3,17 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# 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-02-22 00:06+0100\n"
-"PO-Revision-Date: 2013-02-20 23:20+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10: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"
@@ -22,24 +18,24 @@ msgstr ""
 "Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/share.php:85
+#: ajax/share.php:97
 #, php-format
 msgid "User %s shared a file with you"
 msgstr "ç”¨æˆ¶ %s èˆ‡æ‚¨åˆ†äº«äº†ä¸€å€‹æª”æ¡ˆ"
 
-#: ajax/share.php:87
+#: ajax/share.php:99
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr "ç”¨æˆ¶ %s èˆ‡æ‚¨åˆ†äº«äº†ä¸€å€‹è³‡æ–™å¤¾"
 
-#: ajax/share.php:89
+#: ajax/share.php:101
 #, php-format
 msgid ""
 "User %s shared the file \"%s\" with you. It is available for download here: "
 "%s"
 msgstr "ç”¨æˆ¶ %s èˆ‡æ‚¨åˆ†äº«äº†æª”æ¡ˆ \"%s\" ï¼Œæ‚¨å¯ä»¥å¾žé€™è£¡ä¸‹è¼‰å®ƒï¼š %s"
 
-#: ajax/share.php:91
+#: ajax/share.php:104
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -85,79 +81,79 @@ msgstr "æ²’æœ‰é¸æ“‡è¦åˆªé™¤çš„åˆ†é¡žã€‚"
 msgid "Error removing %s from favorites."
 msgstr "å¾žæœ€æ„›ç§»é™¤ %s æ™‚ç™¼ç”ŸéŒ¯èª¤ã€‚"
 
-#: js/config.php:32
+#: js/config.php:34
 msgid "Sunday"
 msgstr "é€±æ—¥"
 
-#: js/config.php:32
+#: js/config.php:35
 msgid "Monday"
 msgstr "é€±ä¸€"
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Tuesday"
 msgstr "é€±äºŒ"
 
-#: js/config.php:32
+#: js/config.php:37
 msgid "Wednesday"
 msgstr "é€±ä¸‰"
 
-#: js/config.php:32
+#: js/config.php:38
 msgid "Thursday"
 msgstr "é€±å››"
 
-#: js/config.php:32
+#: js/config.php:39
 msgid "Friday"
 msgstr "é€±äº”"
 
-#: js/config.php:32
+#: js/config.php:40
 msgid "Saturday"
 msgstr "é€±å…"
 
-#: js/config.php:33
+#: js/config.php:45
 msgid "January"
 msgstr "ä¸€æœˆ"
 
-#: js/config.php:33
+#: js/config.php:46
 msgid "February"
 msgstr "äºŒæœˆ"
 
-#: js/config.php:33
+#: js/config.php:47
 msgid "March"
 msgstr "ä¸‰æœˆ"
 
-#: js/config.php:33
+#: js/config.php:48
 msgid "April"
 msgstr "å››æœˆ"
 
-#: js/config.php:33
+#: js/config.php:49
 msgid "May"
 msgstr "äº”æœˆ"
 
-#: js/config.php:33
+#: js/config.php:50
 msgid "June"
 msgstr "å…æœˆ"
 
-#: js/config.php:33
+#: js/config.php:51
 msgid "July"
 msgstr "ä¸ƒæœˆ"
 
-#: js/config.php:33
+#: js/config.php:52
 msgid "August"
 msgstr "å…«æœˆ"
 
-#: js/config.php:33
+#: js/config.php:53
 msgid "September"
 msgstr "ä¹æœˆ"
 
-#: js/config.php:33
+#: js/config.php:54
 msgid "October"
 msgstr "åæœˆ"
 
-#: js/config.php:33
+#: js/config.php:55
 msgid "November"
 msgstr "åä¸€æœˆ"
 
-#: js/config.php:33
+#: js/config.php:56
 msgid "December"
 msgstr "åäºŒæœˆ"
 
@@ -165,86 +161,88 @@ msgstr "åäºŒæœˆ"
 msgid "Settings"
 msgstr "è¨å®š"
 
-#: js/js.js:767
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "å¹¾ç§’å‰"
 
-#: js/js.js:768
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "1 åˆ†é˜å‰"
 
-#: js/js.js:769
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr "{minutes} åˆ†é˜å‰"
 
-#: js/js.js:770
+#: js/js.js:721
 msgid "1 hour ago"
-msgstr "1 å€‹å°æ™‚å‰"
+msgstr "1 å°æ™‚ä¹‹å‰"
 
-#: js/js.js:771
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr "{hours} å°æ™‚å‰"
 
-#: js/js.js:772
+#: js/js.js:723
 msgid "today"
 msgstr "ä»Šå¤©"
 
-#: js/js.js:773
+#: js/js.js:724
 msgid "yesterday"
 msgstr "æ˜¨å¤©"
 
-#: js/js.js:774
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr "{days} å¤©å‰"
 
-#: js/js.js:775
+#: js/js.js:726
 msgid "last month"
 msgstr "ä¸Šå€‹æœˆ"
 
-#: js/js.js:776
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr "{months} å€‹æœˆå‰"
 
-#: js/js.js:777
+#: js/js.js:728
 msgid "months ago"
 msgstr "å¹¾å€‹æœˆå‰"
 
-#: js/js.js:778
+#: js/js.js:729
 msgid "last year"
 msgstr "åŽ»å¹´"
 
-#: js/js.js:779
+#: js/js.js:730
 msgid "years ago"
 msgstr "å¹¾å¹´å‰"
 
-#: js/oc-dialogs.js:126
-msgid "Choose"
-msgstr "é¸æ“‡"
+#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
+msgid "Ok"
+msgstr "å¥½"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
 msgid "Cancel"
 msgstr "å–æ¶ˆ"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "No"
+#: js/oc-dialogs.js:185
+msgid "Choose"
+msgstr "é¸æ“‡"
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:215
 msgid "Yes"
-msgstr "Yes"
+msgstr "æ˜¯"
 
-#: js/oc-dialogs.js:180
-msgid "Ok"
-msgstr "Ok"
+#: js/oc-dialogs.js:222
+msgid "No"
+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:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:582
-#: js/share.js:594
+#: 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 "éŒ¯èª¤"
 
@@ -256,127 +254,127 @@ msgstr "æ²’æœ‰æŒ‡å®š app åç¨±ã€‚"
 msgid "The required file {file} is not installed!"
 msgstr "æ²’æœ‰å®‰è£æ‰€éœ€çš„æª”æ¡ˆ {file} ï¼"
 
-#: js/share.js:29 js/share.js:43 js/share.js:90
+#: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr "å·²åˆ†äº«"
 
-#: js/share.js:93
+#: js/share.js:90
 msgid "Share"
 msgstr "åˆ†äº«"
 
-#: js/share.js:141 js/share.js:622
+#: js/share.js:125 js/share.js:617
 msgid "Error while sharing"
 msgstr "åˆ†äº«æ™‚ç™¼ç”ŸéŒ¯èª¤"
 
-#: js/share.js:152
+#: js/share.js:136
 msgid "Error while unsharing"
 msgstr "å–æ¶ˆåˆ†äº«æ™‚ç™¼ç”ŸéŒ¯èª¤"
 
-#: js/share.js:159
+#: js/share.js:143
 msgid "Error while changing permissions"
 msgstr "ä¿®æ”¹æ¬Šé™æ™‚ç™¼ç”ŸéŒ¯èª¤"
 
-#: js/share.js:168
+#: js/share.js:152
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "ç”± {owner} åˆ†äº«çµ¦æ‚¨å’Œ {group}"
 
-#: js/share.js:170
+#: js/share.js:154
 msgid "Shared with you by {owner}"
 msgstr "{owner} å·²ç¶“å’Œæ‚¨åˆ†äº«"
 
-#: js/share.js:175
+#: js/share.js:159
 msgid "Share with"
 msgstr "èˆ‡...åˆ†äº«"
 
-#: js/share.js:180
+#: js/share.js:164
 msgid "Share with link"
 msgstr "ä½¿ç”¨é€£çµåˆ†äº«"
 
-#: js/share.js:183
+#: js/share.js:167
 msgid "Password protect"
 msgstr "å¯†ç¢¼ä¿è·"
 
-#: js/share.js:185 templates/installation.php:44 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "å¯†ç¢¼"
 
-#: js/share.js:189
+#: js/share.js:173
 msgid "Email link to person"
 msgstr "å°‡é€£çµ email çµ¦åˆ¥äºº"
 
-#: js/share.js:190
+#: js/share.js:174
 msgid "Send"
 msgstr "å¯„å‡º"
 
-#: js/share.js:194
+#: js/share.js:178
 msgid "Set expiration date"
 msgstr "è¨ç½®åˆ°æœŸæ—¥"
 
-#: js/share.js:195
+#: js/share.js:179
 msgid "Expiration date"
 msgstr "åˆ°æœŸæ—¥"
 
-#: js/share.js:227
+#: js/share.js:211
 msgid "Share via email:"
-msgstr "é€éŽ email åˆ†äº«ï¼š"
+msgstr "é€éŽé›»åéƒµä»¶åˆ†äº«ï¼š"
 
-#: js/share.js:229
+#: js/share.js:213
 msgid "No people found"
 msgstr "æ²’æœ‰æ‰¾åˆ°ä»»ä½•äºº"
 
-#: js/share.js:256
+#: js/share.js:251
 msgid "Resharing is not allowed"
 msgstr "ä¸å…è¨±é‡æ–°åˆ†äº«"
 
-#: js/share.js:292
+#: js/share.js:287
 msgid "Shared in {item} with {user}"
 msgstr "å·²å’Œ {user} åˆ†äº« {item}"
 
-#: js/share.js:313
+#: js/share.js:308
 msgid "Unshare"
 msgstr "å–æ¶ˆå…±äº«"
 
-#: js/share.js:325
+#: js/share.js:320
 msgid "can edit"
 msgstr "å¯ç·¨è¼¯"
 
-#: js/share.js:327
+#: js/share.js:322
 msgid "access control"
 msgstr "å˜å–æŽ§åˆ¶"
 
-#: js/share.js:330
+#: js/share.js:325
 msgid "create"
 msgstr "å»ºç«‹"
 
-#: js/share.js:333
+#: js/share.js:328
 msgid "update"
 msgstr "æ›´æ–°"
 
-#: js/share.js:336
+#: js/share.js:331
 msgid "delete"
 msgstr "åˆªé™¤"
 
-#: js/share.js:339
+#: js/share.js:334
 msgid "share"
 msgstr "åˆ†äº«"
 
-#: js/share.js:373 js/share.js:569
+#: js/share.js:368 js/share.js:564
 msgid "Password protected"
 msgstr "å—å¯†ç¢¼ä¿è·"
 
-#: js/share.js:582
+#: js/share.js:577
 msgid "Error unsetting expiration date"
 msgstr "è§£é™¤éŽæœŸæ—¥è¨å®šå¤±æ•—"
 
-#: js/share.js:594
+#: js/share.js:589
 msgid "Error setting expiration date"
 msgstr "éŒ¯èª¤çš„åˆ°æœŸæ—¥è¨å®š"
 
-#: js/share.js:609
+#: js/share.js:604
 msgid "Sending ..."
-msgstr "æ£åœ¨å¯„å‡º..."
+msgstr "æ£åœ¨å‚³é€..."
 
-#: js/share.js:620
+#: js/share.js:615
 msgid "Email sent"
 msgstr "Email å·²å¯„å‡º"
 
@@ -397,32 +395,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:39
-#: 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"
@@ -450,11 +451,11 @@ msgstr "æ‡‰ç”¨ç¨‹å¼"
 
 #: strings.php:8
 msgid "Admin"
-msgstr "ç®¡ç†è€…"
+msgstr "ç®¡ç†"
 
 #: strings.php:9
 msgid "Help"
-msgstr "å¹«åŠ©"
+msgstr "èªªæ˜Ž"
 
 #: templates/403.php:12
 msgid "Access forbidden"
@@ -462,7 +463,7 @@ msgstr "å˜å–è¢«æ‹’"
 
 #: templates/404.php:12
 msgid "Cloud not found"
-msgstr "æœªç™¼ç¾é›²"
+msgstr "æœªç™¼ç¾é›²ç«¯"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
@@ -472,115 +473,130 @@ msgstr "ç·¨è¼¯åˆ†é¡ž"
 msgid "Add"
 msgstr "å¢žåŠ "
 
-#: templates/installation.php:23 templates/installation.php:30
+#: 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 "æ‚¨çš„ PHP ç‰ˆæœ¬ç„¡æ³•æŠµæŠ— NULL Byte æ”»æ“Š (CVE-2006-7243)"
+
+#: templates/installation.php:26
+msgid "Please update your PHP installation to use ownCloud securely."
+msgstr "è«‹æ›´æ–°æ‚¨çš„ PHP å®‰è£ä»¥æ›´å®‰å…¨åœ°ä½¿ç”¨ ownCloud ã€‚"
+
+#: templates/installation.php:32
 msgid ""
 "No secure random number generator is available, please enable the PHP "
 "OpenSSL extension."
 msgstr "æ²’æœ‰å¯ç”¨çš„äº‚æ•¸ç”¢ç”Ÿå™¨ï¼Œè«‹å•Ÿç”¨ PHP ä¸çš„ OpenSSL æ“´å……åŠŸèƒ½ã€‚"
 
-#: templates/installation.php:25
+#: 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:31
+#: templates/installation.php:39
 msgid ""
 "Your data directory and files are probably accessible from the internet "
 "because the .htaccess file does not work."
 msgstr "æ‚¨çš„è³‡æ–™ç›®éŒ„çœ‹èµ·ä¾†å¯ä»¥è¢« Internet å…¬é–‹å˜å–ï¼Œå› ç‚º .htaccess è¨å®šä¸¦æœªç”Ÿæ•ˆã€‚"
 
-#: templates/installation.php:32
+#: 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>ä»¥çžè§£å¦‚ä½•æ£ç¢ºè¨å®šæ‚¨çš„ä¼ºæœå™¨ã€‚"
 
-#: templates/installation.php:36
+#: templates/installation.php:44
 msgid "Create an <strong>admin account</strong>"
 msgstr "å»ºç«‹ä¸€å€‹<strong>ç®¡ç†è€…å¸³è™Ÿ</strong>"
 
-#: templates/installation.php:52
+#: templates/installation.php:62
 msgid "Advanced"
 msgstr "é€²éšŽ"
 
-#: templates/installation.php:54
+#: templates/installation.php:64
 msgid "Data folder"
 msgstr "è³‡æ–™å¤¾"
 
-#: templates/installation.php:61
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "è¨å®šè³‡æ–™åº«"
 
-#: templates/installation.php:66 templates/installation.php:77
-#: templates/installation.php:87 templates/installation.php:97
+#: 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:109
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "è³‡æ–™åº«ä½¿ç”¨è€…"
 
-#: templates/installation.php:113
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "è³‡æ–™åº«å¯†ç¢¼"
 
-#: templates/installation.php:117
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "è³‡æ–™åº«åç¨±"
 
-#: templates/installation.php:125
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "è³‡æ–™åº« tablespace"
 
-#: templates/installation.php:131
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "è³‡æ–™åº«ä¸»æ©Ÿ"
 
-#: templates/installation.php:136
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "å®Œæˆè¨å®š"
 
-#: templates/layout.guest.php:33
+#: templates/layout.guest.php:40
 msgid "web services under your control"
-msgstr "ç¶²è·¯æœå‹™åœ¨æ‚¨æŽ§åˆ¶ä¹‹ä¸‹"
+msgstr "ç”±æ‚¨æŽ§åˆ¶çš„ç¶²è·¯æœå‹™"
+
+#: templates/layout.user.php:36
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr "%s å·²ç¶“é‡‹å‡ºï¼Œçžè§£æ›´å¤šè³‡è¨Šä»¥é€²è¡Œæ›´æ–°ã€‚"
 
-#: templates/layout.user.php:48
+#: 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 "è«‹æ›´æ”¹æ‚¨çš„å¯†ç¢¼ä»¥å†æ¬¡å–å¾—æ‚¨çš„å¸³æˆ¶çš„æŽ§åˆ¶æ¬Šã€‚"
+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 8a20a235c16e148ed1fd28ba3956f49ea425b858..81e77b9fbc4e2e29925a31f35b260938e87d78d4 100644
--- a/l10n/zh_TW/files.po
+++ b/l10n/zh_TW/files.po
@@ -3,18 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Donahue Chuang <soshinwu@gmail.com>, 2012.
-#   <dw4dev@gmail.com>, 2012.
-# Eddy Chang <taiwanmambo@gmail.com>, 2012.
-#   <nfsmwlin@gmail.com>, 2013.
-# Pellaeon Lin <nfsmwlin@gmail.com>, 2013.
-# ywang  <ywang1007@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-04 00:06+0100\n"
-"PO-Revision-Date: 2013-03-03 23:06+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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"
@@ -33,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 "æ²’æœ‰æª”æ¡ˆè¢«ä¸Šå‚³ã€‚æœªçŸ¥çš„éŒ¯èª¤ã€‚"
@@ -62,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"
@@ -76,59 +66,70 @@ msgstr "å¯«å…¥ç¡¬ç¢Ÿå¤±æ•—"
 msgid "Not enough storage available"
 msgstr "å„²å˜ç©ºé–“ä¸è¶³"
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr "ç„¡æ•ˆçš„è³‡æ–™å¤¾ã€‚"
 
-#: appinfo/app.php:10
+#: 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 "æ°¸ä¹…åˆªé™¤"
 
-#: js/fileactions.js:127 templates/index.php:92 templates/index.php:93
+#: 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/files.js:292 js/files.js:408
-#: js/files.js:439
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "ç‰å€™ä¸"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} å·²ç¶“å˜åœ¨"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "å–ä»£"
 
-#: js/filelist.js:251
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "å»ºè°æª”å"
 
-#: js/filelist.js:251 js/filelist.js:253
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "å–æ¶ˆ"
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "ä½¿ç”¨ {new_name} å–ä»£ {old_name}"
 
-#: js/filelist.js:298
+#: js/filelist.js:306
 msgid "undo"
 msgstr "å¾©åŽŸ"
 
-#: js/filelist.js:323
+#: 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 "'.' æ˜¯ä¸åˆæ³•çš„æª”åã€‚"
@@ -151,77 +152,77 @@ msgstr "æ‚¨çš„å„²å˜ç©ºé–“å·²æ»¿ï¼Œæ²’æœ‰è¾¦æ³•å†æ›´æ–°æˆ–æ˜¯åŒæ¥æª”æ¡ˆï¼"
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "æ‚¨çš„å„²å˜ç©ºé–“å¿«è¦æ»¿äº† ({usedSpacePercent}%)"
 
-#: js/files.js:225
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "æ£åœ¨æº–å‚™æ‚¨çš„ä¸‹è¼‰ï¼Œè‹¥æ‚¨çš„æª”æ¡ˆè¼ƒå¤§ï¼Œå°‡æœƒéœ€è¦æ›´å¤šæ™‚é–“ã€‚"
 
-#: js/files.js:262
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "ç„¡æ³•ä¸Šå‚³æ‚¨çš„æª”æ¡ˆå› ç‚ºå®ƒå¯èƒ½æ˜¯ä¸€å€‹ç›®éŒ„æˆ–æª”æ¡ˆå¤§å°ç‚º0"
 
-#: js/files.js:262
-msgid "Upload Error"
-msgstr "ä¸Šå‚³ç™¼ç”ŸéŒ¯èª¤"
-
-#: js/files.js:273
-msgid "Close"
-msgstr "é—œé–‰"
+#: js/files.js:277
+msgid "Not enough space available"
+msgstr "æ²’æœ‰è¶³å¤ çš„å¯ç”¨ç©ºé–“"
 
-#: js/files.js:312
-msgid "1 file uploading"
-msgstr "1 å€‹æª”æ¡ˆæ£åœ¨ä¸Šå‚³"
-
-#: js/files.js:315 js/files.js:370 js/files.js:385
-msgid "{count} files uploading"
-msgstr "{count} å€‹æª”æ¡ˆæ£åœ¨ä¸Šå‚³"
-
-#: js/files.js:388 js/files.js:423
+#: js/files.js:317
 msgid "Upload cancelled."
-msgstr "ä¸Šå‚³å–æ¶ˆ"
+msgstr "ä¸Šå‚³å·²å–æ¶ˆ"
 
-#: js/files.js:497
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "æª”æ¡ˆä¸Šå‚³ä¸ã€‚é›¢é–‹æ¤é é¢å°‡æœƒå–æ¶ˆä¸Šå‚³ã€‚"
 
-#: js/files.js:570
+#: js/files.js:486
 msgid "URL cannot be empty."
-msgstr "URL ä¸èƒ½ç‚ºç©ºç™½."
+msgstr "URL ä¸èƒ½ç‚ºç©ºç™½ã€‚"
 
-#: js/files.js:575
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr "ç„¡æ•ˆçš„è³‡æ–™å¤¾åç¨±ï¼Œ'Shared' çš„ä½¿ç”¨è¢« Owncloud ä¿ç•™"
+msgstr "ç„¡æ•ˆçš„è³‡æ–™å¤¾åç¨±ï¼Œ'Shared' çš„ä½¿ç”¨è¢« ownCloud ä¿ç•™"
+
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+msgid "Error"
+msgstr "éŒ¯èª¤"
 
-#: js/files.js:953 templates/index.php:68
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "åç¨±"
 
-#: js/files.js:954 templates/index.php:79
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "å¤§å°"
 
-#: js/files.js:955 templates/index.php:81
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "ä¿®æ”¹"
 
-#: js/files.js:974
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 å€‹è³‡æ–™å¤¾"
 
-#: js/files.js:976
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} å€‹è³‡æ–™å¤¾"
 
-#: js/files.js:984
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 å€‹æª”æ¡ˆ"
 
-#: js/files.js:986
+#: 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 "ä¸Šå‚³"
@@ -274,48 +275,48 @@ msgstr "è³‡æ–™å¤¾"
 msgid "From link"
 msgstr "å¾žé€£çµ"
 
-#: templates/index.php:40
+#: templates/index.php:42
 msgid "Deleted files"
-msgstr ""
+msgstr "å·²åˆªé™¤çš„æª”æ¡ˆ"
 
-#: templates/index.php:46
+#: templates/index.php:48
 msgid "Cancel upload"
 msgstr "å–æ¶ˆä¸Šå‚³"
 
-#: templates/index.php:53
+#: templates/index.php:54
 msgid "You donâ€™t have write permissions here."
-msgstr ""
+msgstr "æ‚¨åœ¨é€™è£¡æ²’æœ‰ç·¨è¼¯æ¬Šã€‚"
 
-#: templates/index.php:60
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
-msgstr "æ²’æœ‰ä»»ä½•æ±è¥¿ã€‚è«‹ä¸Šå‚³å…§å®¹ï¼"
+msgstr "é€™è£¡ä»€éº¼ä¹Ÿæ²’æœ‰ï¼Œä¸Šå‚³ä¸€äº›æ±è¥¿å§ï¼"
 
-#: templates/index.php:74
+#: templates/index.php:75
 msgid "Download"
 msgstr "ä¸‹è¼‰"
 
-#: templates/index.php:86 templates/index.php:87
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "å–æ¶ˆå…±äº«"
 
-#: templates/index.php:106
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "ä¸Šå‚³éŽå¤§"
 
-#: templates/index.php:108
+#: 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:113
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "æ£åœ¨æŽƒææª”æ¡ˆï¼Œè«‹ç¨ç‰ã€‚"
 
-#: templates/index.php:116
+#: 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 a07b9404ea3eb60d0af2b31b04e35f51b4218119..c9a6bba11aa339f455977a57c1ac80a9112b6664 100644
--- a/l10n/zh_TW/files_encryption.po
+++ b/l10n/zh_TW/files_encryption.po
@@ -3,14 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Pellaeon Lin <nfsmwlin@gmail.com>, 2013.
-# ywang  <ywang1007@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-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 08:29+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"
@@ -25,15 +23,15 @@ msgstr "åŠ å¯†"
 
 #: templates/settings-personal.php:7
 msgid "File encryption is enabled."
-msgstr ""
+msgstr "æª”æ¡ˆåŠ å¯†å·²è¢«å•Ÿç”¨"
 
 #: templates/settings-personal.php:11
 msgid "The following file types will not be encrypted:"
-msgstr ""
+msgstr "ä»¥ä¸‹çš„æ–‡ä»¶é¡žåž‹ä¸æœƒè¢«åŠ å¯†ï¼š"
 
 #: templates/settings.php:7
 msgid "Exclude the following file types from encryption:"
-msgstr ""
+msgstr "å¾žåŠ å¯†ä¸æŽ’é™¤çš„æª”æ¡ˆé¡žåž‹ï¼š"
 
 #: templates/settings.php:12
 msgid "None"
diff --git a/l10n/zh_TW/files_external.po b/l10n/zh_TW/files_external.po
index c8c303ef4ca072b4958d2f3785c2ac2e7f7f67fa..e8d127b21bb1c4214e8079b07670fa849f96d3eb 100644
--- a/l10n/zh_TW/files_external.po
+++ b/l10n/zh_TW/files_external.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <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-01 00:05+0100\n"
-"PO-Revision-Date: 2013-02-27 23:20+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-04-27 02:16+0200\n"
+"PO-Revision-Date: 2013-04-26 10:20+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"
@@ -20,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: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 ""
+msgstr "<b>è¦å‘Š</b>ï¼šæœªå®‰è£ \"smbclient\" ï¼Œå› æ¤ç„¡æ³•æŽ›è¼‰ CIFS/SMB åˆ†äº«ï¼Œè«‹æ´½æ‚¨çš„ç³»çµ±ç®¡ç†å“¡å°‡å…¶å®‰è£ã€‚"
 
-#: 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 ""
+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"
@@ -61,23 +68,23 @@ msgstr "è³‡æ–™å¤¾åç¨±"
 
 #: templates/settings.php:10
 msgid "External storage"
-msgstr ""
+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"
-msgstr ""
+msgstr "å¢žåŠ å„²å˜å€"
 
 #: templates/settings.php:90
 msgid "None set"
@@ -102,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..848296809134f9ea8ee28232c539ca4a31745d4e 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-05-01 01:59+0200\n"
+"PO-Revision-Date: 2013-04-30 02:40+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 286b95c98d16068f985f83904d1112953aa7fa11..1a247511511bb43f24cb8ef52549388156039c36 100644
--- a/l10n/zh_TW/files_trashbin.po
+++ b/l10n/zh_TW/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-08 00:25+0100\n"
-"PO-Revision-Date: 2013-03-07 23:25+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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"
@@ -17,23 +17,27 @@ msgstr ""
 "Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/delete.php:40
+#: ajax/delete.php:42
 #, php-format
 msgid "Couldn't delete %s permanently"
-msgstr ""
+msgstr "ç„¡æ³•æ°¸ä¹…åˆªé™¤ %s"
 
-#: ajax/undelete.php:41
+#: ajax/undelete.php:42
 #, php-format
 msgid "Couldn't restore %s"
-msgstr ""
+msgstr "ç„¡æ³•å¾©åŽŸ %s"
 
 #: js/trash.js:7 js/trash.js:96
 msgid "perform restore operation"
-msgstr ""
+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 ""
+msgstr "æ°¸ä¹…åˆªé™¤æª”æ¡ˆ"
 
 #: js/trash.js:121
 msgid "Delete permanently"
@@ -45,7 +49,7 @@ msgstr "åç¨±"
 
 #: js/trash.js:175 templates/index.php:27
 msgid "Deleted"
-msgstr ""
+msgstr "å·²åˆªé™¤"
 
 #: js/trash.js:184
 msgid "1 folder"
@@ -65,11 +69,11 @@ msgstr "{count} å€‹æª”æ¡ˆ"
 
 #: templates/index.php:9
 msgid "Nothing in here. Your trash bin is empty!"
-msgstr ""
+msgstr "æ‚¨çš„åžƒåœ¾æ¡¶æ˜¯ç©ºçš„ï¼"
 
 #: templates/index.php:20 templates/index.php:22
 msgid "Restore"
-msgstr ""
+msgstr "å¾©åŽŸ"
 
 #: templates/index.php:30 templates/index.php:31
 msgid "Delete"
@@ -77,4 +81,4 @@ msgstr "åˆªé™¤"
 
 #: templates/part.breadcrumb.php:9
 msgid "Deleted Files"
-msgstr ""
+msgstr "å·²åˆªé™¤çš„æª”æ¡ˆ"
diff --git a/l10n/zh_TW/files_versions.po b/l10n/zh_TW/files_versions.po
index f95ce4dc60e7a259995d6d15221291aea8207308..ceb0cbe05351883f36729ffaebe978766f214e72 100644
--- a/l10n/zh_TW/files_versions.po
+++ b/l10n/zh_TW/files_versions.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <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-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-12 02:01+0200\n"
+"PO-Revision-Date: 2013-05-06 07:10+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,38 +21,38 @@ msgstr ""
 #: ajax/rollbackVersion.php:15
 #, php-format
 msgid "Could not revert: %s"
-msgstr ""
+msgstr "ç„¡æ³•é‚„åŽŸï¼š%s"
 
 #: history.php:40
 msgid "success"
-msgstr ""
+msgstr "æˆåŠŸ"
 
 #: history.php:42
 #, php-format
 msgid "File %s was reverted to version %s"
-msgstr ""
+msgstr "æª”æ¡ˆ %s å·²è¢«å¾©åŽŸè‡³ç‰ˆæœ¬ %s"
 
 #: history.php:49
 msgid "failure"
-msgstr ""
+msgstr "å¤±æ•—"
 
 #: history.php:51
 #, php-format
 msgid "File %s could not be reverted to version %s"
-msgstr ""
+msgstr "æª”æ¡ˆ %s ç„¡æ³•å¾©åŽŸè‡³ç‰ˆæœ¬ %s"
 
-#: history.php:68
+#: history.php:69
 msgid "No old versions available"
-msgstr ""
+msgstr "æ²’æœ‰èˆŠçš„ç‰ˆæœ¬"
 
-#: history.php:73
+#: history.php:74
 msgid "No path specified"
-msgstr ""
+msgstr "æ²’æœ‰æŒ‡å®šè·¯å¾‘"
 
 #: js/versions.js:6
 msgid "Versions"
-msgstr ""
+msgstr "ç‰ˆæœ¬"
 
 #: templates/history.php:20
 msgid "Revert a file to a previous version by clicking on its revert button"
-msgstr ""
+msgstr "æŒ‰ä¸€ä¸‹å¾©åŽŸçš„æŒ‰éˆ•å³å¯æŠŠæª”æ¡ˆå¾©åŽŸè‡³ä»¥å‰çš„ç‰ˆæœ¬"
diff --git a/l10n/zh_TW/lib.po b/l10n/zh_TW/lib.po
index 16d21a7a5ada610f84d481bf54a77c87bac8774e..71930d80bc148ec8fd89df7934a8d51b165dbc55 100644
--- a/l10n/zh_TW/lib.po
+++ b/l10n/zh_TW/lib.po
@@ -3,16 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Pellaeon Lin <nfsmwlin@gmail.com>, 2013.
-#   <sofia168@livemail.tw>, 2012.
-#   <ywang1007+transifex@gmail.com>, 2012.
-# ywang  <ywang1007@gmail.com>, 2012.
 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:35+0000\n"
+"POT-Creation-Date: 2013-04-28 01:57+0200\n"
+"PO-Revision-Date: 2013-04-27 23:57+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"
@@ -45,21 +41,21 @@ msgstr "æ‡‰ç”¨ç¨‹å¼"
 msgid "Admin"
 msgstr "ç®¡ç†"
 
-#: files.php:202
+#: files.php:209
 msgid "ZIP download is turned off."
-msgstr "ZIP ä¸‹è¼‰å·²é—œé–‰"
+msgstr "ZIP ä¸‹è¼‰å·²é—œé–‰ã€‚"
 
-#: files.php:203
+#: files.php:210
 msgid "Files need to be downloaded one by one."
-msgstr "æª”æ¡ˆéœ€è¦é€ä¸€ä¸‹è¼‰"
+msgstr "æª”æ¡ˆéœ€è¦é€ä¸€ä¸‹è¼‰ã€‚"
 
-#: files.php:204 files.php:231
+#: files.php:211 files.php:244
 msgid "Back to Files"
 msgstr "å›žåˆ°æª”æ¡ˆåˆ—è¡¨"
 
-#: files.php:228
+#: files.php:241
 msgid "Selected files too large to generate zip file."
-msgstr "é¸æ“‡çš„æª”æ¡ˆå¤ªå¤§ä»¥è‡´æ–¼ç„¡æ³•ç”¢ç”Ÿå£“ç¸®æª”"
+msgstr "é¸æ“‡çš„æª”æ¡ˆå¤ªå¤§ä»¥è‡´æ–¼ç„¡æ³•ç”¢ç”Ÿå£“ç¸®æª”ã€‚"
 
 #: helper.php:228
 msgid "couldn't be determined"
@@ -91,102 +87,98 @@ 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:128 setup.php:320 setup.php:365
+#: setup.php:132 setup.php:325 setup.php:370
 msgid "PostgreSQL username and/or password not valid"
-msgstr ""
+msgstr "PostgreSQL ç”¨æˆ¶åå’Œ/æˆ–å¯†ç¢¼ç„¡æ•ˆ"
 
-#: setup.php:129 setup.php:152 setup.php:229
+#: setup.php:133 setup.php:156 setup.php:234
 msgid "You need to enter either an existing account or the administrator."
-msgstr ""
+msgstr "æ‚¨å¿…é ˆè¼¸å…¥ä¸€å€‹ç¾æœ‰çš„å¸³è™Ÿæˆ–ç®¡ç†å“¡å¸³è™Ÿã€‚"
 
-#: setup.php:151 setup.php:453 setup.php:520
+#: setup.php:155 setup.php:458 setup.php:525
 msgid "Oracle username and/or password not valid"
-msgstr ""
+msgstr "Oracle ç”¨æˆ¶åå’Œ/æˆ–å¯†ç¢¼ç„¡æ•ˆ"
 
-#: setup.php:228
+#: setup.php:233
 msgid "MySQL username and/or password not valid"
-msgstr ""
+msgstr "MySQL ç”¨æˆ¶åå’Œ/æˆ–å¯†ç¢¼ç„¡æ•ˆ"
 
-#: 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: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:583 setup.php:592 setup.php:600 setup.php:609
+#: setup.php:615
 #, php-format
 msgid "DB Error: \"%s\""
-msgstr ""
+msgstr "è³‡æ–™åº«éŒ¯èª¤ï¼š\"%s\""
 
-#: 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:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
+#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
+#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
 #, php-format
 msgid "Offending command was: \"%s\""
-msgstr ""
+msgstr "æœ‰å•é¡Œçš„æŒ‡ä»¤æ˜¯ï¼š\"%s\""
 
-#: setup.php:299
+#: setup.php:304
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
-msgstr ""
+msgstr "MySQL ä½¿ç”¨è€… '%s'@'localhost' å·²ç¶“å˜åœ¨ã€‚"
 
-#: setup.php:300
+#: setup.php:305
 msgid "Drop this user from MySQL"
-msgstr ""
+msgstr "åœ¨ MySQL ç§»é™¤é€™å€‹ä½¿ç”¨è€…"
 
-#: setup.php:305
+#: setup.php:310
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
-msgstr ""
+msgstr "MySQL ä½¿ç”¨è€… '%s'@'%%' å·²ç¶“å˜åœ¨"
 
-#: setup.php:306
+#: setup.php:311
 msgid "Drop this user from MySQL."
-msgstr ""
+msgstr "åœ¨ MySQL ç§»é™¤é€™å€‹ä½¿ç”¨è€…ã€‚"
 
-#: setup.php:579 setup.php:611
+#: setup.php:584 setup.php:616
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
-msgstr ""
+msgstr "æœ‰å•é¡Œçš„æŒ‡ä»¤æ˜¯ï¼š\"%s\" ï¼Œä½¿ç”¨è€…ï¼š\"%s\"ï¼Œå¯†ç¢¼ï¼š\"%s\""
 
-#: setup.php:631
+#: setup.php:636
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
-msgstr ""
+msgstr "MS SQL ä½¿ç”¨è€…å’Œ/æˆ–å¯†ç¢¼ç„¡æ•ˆï¼š%s"
 
-#: setup.php:849
+#: setup.php:858
 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:850
+#: setup.php:859
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "è«‹åƒè€ƒ<a href='%s'>å®‰è£æŒ‡å—</a>ã€‚"
@@ -243,19 +235,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 4136e0f0388b14fa0bb2064e566c8733601c8d47..dca33e8dbca5657dc235e55ce438b427658ae3a1 100644
--- a/l10n/zh_TW/settings.po
+++ b/l10n/zh_TW/settings.po
@@ -3,22 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Donahue Chuang <soshinwu@gmail.com>, 2012.
-#   <dw4dev@gmail.com>, 2012.
-#   <nfsmwlin@gmail.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-02-27 14:35+0100\n"
-"PO-Revision-Date: 2013-02-27 13:35+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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"
@@ -30,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 "ç„¡æ³•æ›´æ”¹é¡¯ç¤ºåç¨±"
 
@@ -101,7 +97,7 @@ msgstr "æ›´æ–°è‡³ {appversion}"
 msgid "Disable"
 msgstr "åœç”¨"
 
-#: js/apps.js:36 js/apps.js:64
+#: js/apps.js:36 js/apps.js:64 js/apps.js:83
 msgid "Enable"
 msgstr "å•Ÿç”¨"
 
@@ -109,68 +105,68 @@ msgstr "å•Ÿç”¨"
 msgid "Please wait...."
 msgstr "è«‹ç¨å€™..."
 
-#: js/apps.js:84
+#: 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:87
+#: js/apps.js:93
 msgid "Error while updating app"
 msgstr "æ›´æ–°æ‡‰ç”¨ç¨‹å¼éŒ¯èª¤"
 
-#: js/apps.js:87
-msgid "Error"
-msgstr "éŒ¯èª¤"
-
-#: js/apps.js:90
+#: js/apps.js:96
 msgid "Updated"
 msgstr "å·²æ›´æ–°"
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr "å„²å˜ä¸..."
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "deleted"
 msgstr "å·²åˆªé™¤"
 
-#: js/users.js:30
+#: js/users.js:47
 msgid "undo"
 msgstr "å¾©åŽŸ"
 
-#: js/users.js:62
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr "ç„¡æ³•åˆªé™¤ç”¨æˆ¶"
 
-#: js/users.js:75 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
+#: templates/users.php:103
 msgid "Groups"
 msgstr "ç¾¤çµ„"
 
-#: js/users.js:78 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr "ç¾¤çµ„ ç®¡ç†å“¡"
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "åˆªé™¤"
 
-#: js/users.js:191
+#: js/users.js:269
 msgid "add group"
 msgstr "æ–°å¢žç¾¤çµ„"
 
-#: js/users.js:352
+#: js/users.js:420
 msgid "A valid username must be provided"
-msgstr ""
+msgstr "ä¸€å®šè¦æä¾›ä¸€å€‹æœ‰æ•ˆçš„ç”¨æˆ¶å"
 
-#: js/users.js:353 js/users.js:359 js/users.js:374
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
-msgstr ""
+msgstr "å‰µå»ºç”¨æˆ¶æ™‚å‡ºç¾éŒ¯èª¤"
 
-#: js/users.js:358
+#: js/users.js:426
 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 "__èªžè¨€_åç¨±__"
 
@@ -189,7 +185,7 @@ msgstr "æ‚¨çš„è³‡æ–™ç›®éŒ„ (Data Directory) å’Œæª”æ¡ˆå¯èƒ½å¯ä»¥ç”±ç¶²éš›ç¶²è·¯
 
 #: templates/admin.php:29
 msgid "Setup Warning"
-msgstr ""
+msgstr "è¨å®šè¦å‘Š"
 
 #: templates/admin.php:32
 msgid ""
@@ -204,17 +200,17 @@ 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-type æ”¯æ´ã€‚"
 
 #: templates/admin.php:58
 msgid "Locale not working"
-msgstr ""
+msgstr "èªžç³»ç„¡æ³•é‹ä½œ"
 
 #: templates/admin.php:63
 #, php-format
@@ -222,11 +218,11 @@ msgid ""
 "This ownCloud server can't set system locale to %s. This means that there "
 "might be problems with certain characters in file names. We strongly suggest"
 " to install the required packages on your system to support %s."
-msgstr ""
+msgstr "ownCloud ä¼ºæœå™¨ç„¡æ³•å°‡ç³»çµ±èªžç³»è¨ç‚º %s ï¼Œå¯èƒ½æœ‰ä¸€äº›æª”åä¸çš„å—å…ƒæœ‰å•é¡Œï¼Œå»ºè°æ‚¨å®‰è£æ‰€æœ‰æ‰€éœ€çš„å¥—ä»¶ä»¥æ”¯æ´ %s ã€‚"
 
 #: templates/admin.php:75
 msgid "Internet connection not working"
-msgstr ""
+msgstr "åŽ»é€£ç·š"
 
 #: templates/admin.php:78
 msgid ""
@@ -236,100 +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 "é€™è‡º ownCloud ä¼ºæœå™¨æ²’æœ‰é€£æŽ¥åˆ°ç¶²éš›ç¶²è·¯ï¼Œå› æ¤æœ‰äº›åŠŸèƒ½åƒæ˜¯æŽ›è¼‰å¤–éƒ¨å„²å˜ç©ºé–“ã€æ›´æ–° ownCloud æˆ–æ‡‰ç”¨ç¨‹å¼çš„é€šçŸ¥æ²’æœ‰è¾¦æ³•é‹ä½œã€‚é€éŽç¶²éš›ç¶²è·¯å˜å–æª”æ¡ˆé‚„æœ‰é›»åéƒµä»¶é€šçŸ¥å¯èƒ½ä¹Ÿç„¡æ³•é‹ä½œã€‚å¦‚æžœæƒ³è¦ ownCloud å®Œæ•´çš„åŠŸèƒ½ï¼Œå»ºè°æ‚¨å°‡é€™è‡ºä¼ºæœå™¨é€£æŽ¥è‡³ç¶²éš›ç¶²è·¯ã€‚"
 
 #: templates/admin.php:92
 msgid "Cron"
-msgstr ""
+msgstr "å®šæœŸåŸ·è¡Œ"
 
 #: templates/admin.php:101
 msgid "Execute one task with each page loaded"
-msgstr ""
+msgstr "ç•¶é é¢è¼‰å…¥æ™‚ï¼ŒåŸ·è¡Œ"
 
 #: templates/admin.php:111
 msgid ""
 "cron.php is registered at a webcron service. Call the cron.php page in the "
 "owncloud root once a minute over http."
-msgstr ""
+msgstr "cron.php å·²ç¶“åœ¨ webcron æœå‹™ç•¶ä¸è¨»å†Šï¼Œè«‹æ¯åˆ†é˜é€éŽ HTTP å‘¼å« 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"
-msgstr ""
+msgstr "å•Ÿç”¨åˆ†äº« API"
 
 #: templates/admin.php:135
 msgid "Allow apps to use the Share API"
-msgstr ""
+msgstr "å…è¨± apps ä½¿ç”¨åˆ†äº« API"
 
 #: templates/admin.php:142
 msgid "Allow links"
-msgstr ""
+msgstr "å…è¨±é€£çµ"
 
 #: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
-msgstr ""
+msgstr "å…è¨±ä½¿ç”¨è€…é€éŽå…¬é–‹çš„é€£çµåˆ†äº«æª”æ¡ˆ"
 
 #: templates/admin.php:150
 msgid "Allow resharing"
-msgstr ""
+msgstr "å…è¨±è½‰è²¼åˆ†äº«"
 
 #: templates/admin.php:151
 msgid "Allow users to share items shared with them again"
-msgstr ""
+msgstr "å…è¨±ä½¿ç”¨è€…åˆ†äº«å…¶ä»–ä½¿ç”¨è€…åˆ†äº«çµ¦ä»–çš„æª”æ¡ˆ"
 
 #: templates/admin.php:158
 msgid "Allow users to share with anyone"
-msgstr ""
+msgstr "å…è¨±ä½¿ç”¨è€…èˆ‡ä»»ä½•äººåˆ†äº«æª”æ¡ˆ"
 
 #: templates/admin.php:161
 msgid "Allow users to only share with users in their groups"
-msgstr ""
+msgstr "åƒ…å…è¨±ä½¿ç”¨è€…åœ¨ç¾¤çµ„å…§åˆ†äº«"
 
 #: templates/admin.php:168
 msgid "Security"
-msgstr ""
+msgstr "å®‰å…¨æ€§"
 
 #: templates/admin.php:181
 msgid "Enforce HTTPS"
-msgstr ""
+msgstr "å¼·åˆ¶å•Ÿç”¨ HTTPS"
 
 #: templates/admin.php:182
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
-msgstr ""
+msgstr "å¼·åˆ¶æŒ‡å®šç”¨æˆ¶ç«¯ä½¿ç”¨åŠ å¯†çš„é€£ç·šé€£æŽ¥åˆ° ownCloud"
 
 #: templates/admin.php:185
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
-msgstr ""
+msgstr "è«‹ä½¿ç”¨ HTTPS é€£ç·šåˆ° ownCloudï¼Œæˆ–æ˜¯é—œé–‰å¼·åˆ¶ä½¿ç”¨ SSL çš„é¸é …ã€‚"
 
 #: 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:230 templates/personal.php:102
+#: templates/admin.php:228
+msgid "Less"
+msgstr "å°‘"
+
+#: templates/admin.php:235 templates/personal.php:105
 msgid "Version"
 msgstr "ç‰ˆæœ¬"
 
-#: templates/admin.php:233 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 "
@@ -394,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:77
 msgid "Password"
 msgstr "å¯†ç¢¼"
 
@@ -410,7 +410,7 @@ msgstr "ä½ çš„å¯†ç¢¼å·²æ›´æ”¹"
 
 #: templates/personal.php:39
 msgid "Unable to change your password"
-msgstr "ç„¡æ³•è®Šæ›´ä½ çš„å¯†ç¢¼"
+msgstr "ç„¡æ³•è®Šæ›´æ‚¨çš„å¯†ç¢¼"
 
 #: templates/personal.php:40
 msgid "Current password"
@@ -424,82 +424,70 @@ msgstr "æ–°å¯†ç¢¼"
 msgid "Change password"
 msgstr "è®Šæ›´å¯†ç¢¼"
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:76
 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 "é›»åéƒµä»¶"
+msgstr "ä¿¡ç®±"
 
-#: templates/personal.php:72
+#: templates/personal.php:70
 msgid "Your email address"
-msgstr "ä½ çš„é›»åéƒµä»¶ä¿¡ç®±"
+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 "WebDAV"
 
-#: templates/personal.php:93
+#: templates/personal.php:96
 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:75
 msgid "Login Name"
 msgstr "ç™»å…¥åç¨±"
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
-msgstr "å‰µé€ "
+msgstr "å»ºç«‹"
 
-#: templates/users.php:35
+#: templates/users.php:33
 msgid "Default Storage"
 msgstr "é è¨å„²å˜å€"
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:39 templates/users.php:133
 msgid "Unlimited"
 msgstr "ç„¡é™åˆ¶"
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:57 templates/users.php:148
 msgid "Other"
 msgstr "å…¶ä»–"
 
-#: templates/users.php:84
+#: templates/users.php:82
 msgid "Storage"
 msgstr "å„²å˜å€"
 
-#: templates/users.php:95
+#: templates/users.php:93
 msgid "change display name"
 msgstr "ä¿®æ”¹é¡¯ç¤ºåç¨±"
 
-#: templates/users.php:99
+#: templates/users.php:97
 msgid "set new password"
 msgstr "è¨å®šæ–°å¯†ç¢¼"
 
-#: templates/users.php:134
+#: templates/users.php:128
 msgid "Default"
 msgstr "é è¨"
diff --git a/l10n/zh_TW/user_ldap.po b/l10n/zh_TW/user_ldap.po
index 1e9eb6fb3352403e49d7fbcc8ed3bd971af33ab0..bfa71664a2f93a53ea87e2440767f1b6f2356106 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-02 00:03+0100\n"
-"PO-Revision-Date: 2013-03-01 23:04+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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: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 "ä½¿ç”¨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 "é—œé–‰ SSL æ†‘è‰é©—è‰"
 
-#: 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/zh_TW/user_webdavauth.po b/l10n/zh_TW/user_webdavauth.po
index d99e5ba2a7fcc2fb363b499fd94ef23f7f288eaf..4dd48e2ce3d2ab01c7efbef68984aed2ba59fb3b 100644
--- a/l10n/zh_TW/user_webdavauth.po
+++ b/l10n/zh_TW/user_webdavauth.po
@@ -3,14 +3,17 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <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-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-12 02:01+0200\n"
+"PO-Revision-Date: 2013-05-06 07:10+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"
@@ -20,15 +23,15 @@ msgstr ""
 
 #: templates/settings.php:3
 msgid "WebDAV Authentication"
-msgstr ""
+msgstr "WebDAV èªè‰"
 
 #: templates/settings.php:4
 msgid "URL: http://"
-msgstr ""
+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 "
 "credentials, and all other responses as valid credentials."
-msgstr ""
+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 70e3028b68a95cfef127b71a6d990ce5a774acec..fc76836995be415ae104b422b17606ced32c8133 100644
--- a/lib/api.php
+++ b/lib/api.php
@@ -33,21 +33,20 @@ class OC_API {
 	const USER_AUTH = 1;
 	const SUBADMIN_AUTH = 2;
 	const ADMIN_AUTH = 3;
-
-	private static $server;
-
+	
 	/**
-	 * initialises the OAuth store and server
+	 * API Response Codes
 	 */
-	private static function init() {
-		self::$server = new OC_OAuth_Server(new OC_OAuth_Store());
-	}
-
+	const RESPOND_UNAUTHORISED = 997;
+	const RESPOND_SERVER_ERROR = 996;
+	const RESPOND_NOT_FOUND = 998;
+	const RESPOND_UNKNOWN_ERROR = 999;
+	
 	/**
 	 * api actions
 	 */
 	protected static $actions = array();
-
+	
 	/**
 	 * registers an api call
 	 * @param string $method the http method
@@ -58,7 +57,7 @@ class OC_API {
 	 * @param array $defaults
 	 * @param array $requirements
 	 */
-	public static function register($method, $url, $action, $app,
+	public static function register($method, $url, $action, $app, 
 				$authLevel = OC_API::USER_AUTH,
 				$defaults = array(),
 				$requirements = array()) {
@@ -71,9 +70,9 @@ class OC_API {
 				->action('OC_API', 'call');
 			self::$actions[$name] = array();
 		}
-		self::$actions[$name] = array('app' => $app, 'action' => $action, 'authlevel' => $authLevel);
+		self::$actions[$name][] = array('app' => $app, 'action' => $action, 'authlevel' => $authLevel);
 	}
-
+	
 	/**
 	 * handles an api call
 	 * @param array $parameters
@@ -86,29 +85,103 @@ class OC_API {
 			parse_str(file_get_contents("php://input"), $parameters['_delete']);
 		}
 		$name = $parameters['_route'];
-		// Check authentication and availability
-		if(self::isAuthorised(self::$actions[$name])) {
-			if(is_callable(self::$actions[$name]['action'])) {
-				$response = call_user_func(self::$actions[$name]['action'], $parameters);
-				if(!($response instanceof OC_OCS_Result)) {
-					$response = new OC_OCS_Result(null, 996, 'Internal Server Error');
-				}
-			} else {
-				$response = new OC_OCS_Result(null, 998, 'Api method not found');
+		// Foreach registered action
+		$responses = array();
+		foreach(self::$actions[$name] as $action) {
+			// Check authentication and availability
+			if(!self::isAuthorised($action)) {
+				$responses[] = array(
+					'app' => $action['app'],
+					'response' => new OC_OCS_Result(null, OC_API::RESPOND_UNAUTHORISED, 'Unauthorised'),
+					);
+				continue;
 			}
-		} else {
-			header('WWW-Authenticate: Basic realm="Authorization Required"');
-			header('HTTP/1.0 401 Unauthorized');
-			$response = new OC_OCS_Result(null, 997, 'Unauthorised');
+			if(!is_callable($action['action'])) {
+				$responses[] = array(
+					'app' => $action['app'],
+					'response' => new OC_OCS_Result(null, OC_API::RESPOND_NOT_FOUND, 'Api method not found'),
+					);
+				continue;
+			}
+			// Run the action
+			$responses[] = array(
+				'app' => $action['app'],
+				'response' => call_user_func($action['action'], $parameters),
+				);
 		}
-		// Send the response
+		$response = self::mergeResponses($responses);
 		$formats = array('json', 'xml');
+
 		$format = !empty($_GET['format']) && in_array($_GET['format'], $formats) ? $_GET['format'] : 'xml';
-		self::respond($response, $format);
-		// logout the user to be stateless
 		OC_User::logout();
+
+		self::respond($response, $format);
 	}
+	
+	/**
+	 * merge the returned result objects into one response
+	 * @param array $responses
+	 */
+	private static function mergeResponses($responses) {
+		$response = array();
+		// Sort into shipped and thirdparty
+		$shipped = array(
+			'succeeded' => array(),
+			'failed' => array(),
+			);
+		$thirdparty = array(
+			'succeeded' => array(),
+			'failed' => array(),
+			);
+
+		foreach($responses as $response) {
+			if(OC_App::isShipped($response['app']) || ($response['app'] === 'core')) {
+				if($response['response']->succeeded()) {
+					$shipped['succeeded'][$response['app']] = $response['response'];
+				} else {
+					$shipped['failed'][$response['app']] = $response['response'];
+				}
+			} else {
+				if($response['response']->succeeded()) {
+					$thirdparty['succeeded'][$response['app']] = $response['response'];
+				} else {
+					$thirdparty['failed'][$response['app']] = $response['response'];
+				}
+			}
+		}
+
+		// Remove any error responses if there is one shipped response that succeeded
+		if(!empty($shipped['succeeded'])) {
+			$responses = array_merge($shipped['succeeded'], $thirdparty['succeeded']);
+		} else if(!empty($shipped['failed'])) {
+			// Which shipped response do we use if they all failed?
+			// 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 = reset($shipped['failed']);
+			return $response;
+		} elseif(!empty($thirdparty['failed'])) {
+			// Return the third party failure result
+			$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);
+			} else {
+				$data = array_merge_recursive($data, $response->getData());
+			}
+		}
+		$result = new OC_OCS_Result($data, 100);
+		return $result;
+	}
+	
 	/**
 	 * authenticate the api call
 	 * @param array $action the action details as supplied to OC_API::register()
@@ -132,7 +205,8 @@ class OC_API {
 					return false;
 				} else {
 					$subAdmin = OC_SubAdmin::isSubAdmin($user);
-					if($subAdmin) {
+					$admin = OC_User::isAdminUser($user);
+					if($subAdmin || $admin) {
 						return true;
 					} else {
 						return false;
@@ -153,25 +227,35 @@ class OC_API {
 				return false;
 				break;
 		}
-	}
-
+	} 
+	
 	/**
 	 * http basic auth
 	 * @return string|false (username, or false on failure)
 	 */
-	private static function loginUser(){
+	private static function loginUser(){ 
 		$authUser = isset($_SERVER['PHP_AUTH_USER']) ? $_SERVER['PHP_AUTH_USER'] : '';
 		$authPw = isset($_SERVER['PHP_AUTH_PW']) ? $_SERVER['PHP_AUTH_PW'] : '';
 		return OC_User::login($authUser, $authPw) ? $authUser : false;
 	}
-
+	
 	/**
 	 * respond to a call
-	 * @param int|array $result the result from the api method
+	 * @param OC_OCS_Result $result
 	 * @param string $format the format xml|json
 	 */
 	private static function respond($result, $format='xml') {
-		$response = array('ocs' => $result->getResult());
+		// Send 401 headers if unauthorised
+		if($result->getStatusCode() === self::RESPOND_UNAUTHORISED) {
+			header('WWW-Authenticate: Basic realm="Authorisation Required"');
+			header('HTTP/1.0 401 Unauthorized');
+		}
+		$response = array(
+			'ocs' => array(
+				'meta' => $result->getMeta(),
+				'data' => $result->getData(),
+				),
+			);
 		if ($format == 'json') {
 			OC_JSON::encodedPrint($response);
 		} else if ($format == 'xml') {
@@ -203,5 +287,5 @@ class OC_API {
 			}
 		}
 	}
-
+	
 }
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/base.php b/lib/base.php
index 59b861ffce110e727f66590e0b81a00778036c71..7d7e690aa6f47c412ff5f70f372748410de1f14f 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -75,52 +75,9 @@ class OC {
 	protected static $router = null;
 
 	/**
-	 * SPL autoload
+	 * @var \OC\Autoloader $loader
 	 */
-	public static function autoload($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;
-		}
-
-		if ($fullPath = stream_resolve_include_path($path)) {
-			require_once $fullPath;
-		}
-		return false;
-	}
+	public static $loader = null;
 
 	public static function initPaths() {
 		// calculate the root directories
@@ -276,7 +233,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();
@@ -321,6 +278,10 @@ class OC {
 		// prevents javascript from accessing php session cookies
 		ini_set('session.cookie_httponly', '1;');
 
+		// set the cookie path to the ownCloud directory
+		$cookie_path = OC::$WEBROOT ?: '/';
+		ini_set('session.cookie_path', $cookie_path);
+
 		// set the session name to the instance id - which is unique
 		session_name(OC_Util::getInstanceId());
 
@@ -352,7 +313,7 @@ class OC {
 		// session timeout
 		if (isset($_SESSION['LAST_ACTIVITY']) && (time() - $_SESSION['LAST_ACTIVITY'] > 60*60*24)) {
 			if (isset($_COOKIE[session_name()])) {
-				setcookie(session_name(), '', time() - 42000, '/');
+				setcookie(session_name(), '', time() - 42000, $cookie_path);
 			}
 			session_unset();
 			session_destroy();
@@ -383,8 +344,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();
@@ -398,8 +365,8 @@ class OC {
 		ini_set('arg_separator.output', '&amp;');
 
 		// try to switch magic quotes off.
-		if (get_magic_quotes_gpc()) {
-			@set_magic_quotes_runtime(false);
+		if (get_magic_quotes_gpc()==1) {
+			ini_set('magic_quotes_runtime', 0);
 		}
 
 		//try to configure php to enable big file uploads.
@@ -441,6 +408,7 @@ class OC {
 		}
 
 		self::initPaths();
+		OC_Util::issetlocaleworking();
 
 		// set debug mode if an xdebug session is active
 		if (!defined('DEBUG') || !DEBUG) {
@@ -461,11 +429,13 @@ class OC {
 		stream_wrapper_register('close', 'OC\Files\Stream\Close');
 		stream_wrapper_register('oc', 'OC\Files\Stream\OC');
 
+		self::initTemplateEngine();
 		self::checkConfig();
 		self::checkInstalled();
 		self::checkSSL();
-		self::initSession();
-		self::initTemplateEngine();
+		if ( !self::$CLI ) {
+			self::initSession();
+		}
 
 		$errors = OC_Util::checkServer();
 		if (count($errors) > 0) {
@@ -572,10 +542,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');
+		}
 	}
 
 	/**
@@ -625,8 +597,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') {
diff --git a/lib/config.php b/lib/config.php
index 0bd497b8e50a396758f987ca44ecef66052fd948..9b87d4ce4e52988eca8886d915e8856218f7e9f7 100644
--- a/lib/config.php
+++ b/lib/config.php
@@ -130,14 +130,24 @@ class OC_Config{
 			return true;
 		}
 
-		if( !file_exists( OC::$SERVERROOT."/config/config.php" )) {
-			return false;
-		}
+		// read all file in config dir ending by config.php
+		$config_files = glob( OC::$SERVERROOT."/config/*.config.php");
+
+		//Filter only regular files
+		$config_files = array_filter($config_files, 'is_file');
+
+		//Sort array naturally :
+		natsort($config_files);
 
-		// Include the file, save the data from $CONFIG
-		include OC::$SERVERROOT."/config/config.php";
-		if( isset( $CONFIG ) && is_array( $CONFIG )) {
-			self::$cache = $CONFIG;
+		// Add default config
+		array_unshift($config_files,OC::$SERVERROOT."/config/config.php");
+
+		//Include file and merge config
+		foreach($config_files as $file){
+			include $file;
+			if( isset( $CONFIG ) && is_array( $CONFIG )) {
+				self::$cache = array_merge(self::$cache, $CONFIG);
+			}
 		}
 
 		// We cached everything
@@ -155,7 +165,11 @@ class OC_Config{
 	 */
 	public static function writeData() {
 		// Create a php file ...
-		$content = "<?php\n\$CONFIG = ";
+		$content = "<?php\n ";
+		if (defined('DEBUG') && DEBUG) {
+			$content .= "define('DEBUG',true);\n";
+		}
+		$content .= "\$CONFIG = ";
 		$content .= var_export(self::$cache, true);
 		$content .= ";\n";
 
diff --git a/lib/db.php b/lib/db.php
index 347deac8519db437a91fa4c9b6aebcc7e0733f02..8f6f50bda6e3c51738586b55e4f6512d48a164c2 100644
--- a/lib/db.php
+++ b/lib/db.php
@@ -292,8 +292,10 @@ class OC_DB {
 						'username' => $user,
 						'password' => $pass,
 						'hostspec' => $host,
-						'database' => $name
-					);                    
+						'database' => $name,
+						'charset' => 'UTF-8'
+					);
+					$options['portability'] = $options['portability'] - MDB2_PORTABILITY_EMPTY_TO_NULL;
 					break;
 				default:
 					return false;
@@ -365,7 +367,9 @@ class OC_DB {
 
 		// Optimize the query
 		$query = self::processQuery( $query );
-
+		if(OC_Config::getValue( "log_query", false)) {
+			OC_Log::write('core', 'DB prepare : '.$query, OC_Log::DEBUG);
+		}
 		self::connect();
 		// return the result
 		if(self::$backend==self::BACKEND_MDB2) {
@@ -631,18 +635,20 @@ class OC_DB {
 		$type = self::$type;
 
 		$query = '';
+		$inserts = array_values($input);
 		// differences in escaping of table names ('`' for mysql) and getting the current timestamp
 		if( $type == 'sqlite' || $type == 'sqlite3' ) {
 			// NOTE: For SQLite we have to use this clumsy approach
 			// otherwise all fieldnames used must have a unique key.
-			$query = 'SELECT * FROM "' . $table . '" WHERE ';
+			$query = 'SELECT * FROM `' . $table . '` WHERE ';
 			foreach($input as $key => $value) {
-				$query .= $key . " = '" . $value . '\' AND ';
+				$query .= '`' . $key . '` = ? AND ';
 			}
 			$query = substr($query, 0, strlen($query) - 5);
 			try {
 				$stmt = self::prepare($query);
-				$result = $stmt->execute();
+				$result = $stmt->execute($inserts);
+
 			} catch(PDOException $e) {
 				$entry = 'DB Error: "'.$e->getMessage() . '"<br />';
 				$entry .= 'Offending command was: ' . $query . '<br />';
@@ -651,28 +657,27 @@ class OC_DB {
 				OC_Template::printErrorPage( $entry );
 			}
 
-			if($result->numRows() == 0) {
-				$query = 'INSERT INTO "' . $table . '" ("'
-					. implode('","', array_keys($input)) . '") VALUES("'
-					. implode('","', array_values($input)) . '")';
+			if((int)$result->numRows() === 0) {
+				$query = 'INSERT INTO `' . $table . '` (`'
+					. implode('`,`', array_keys($input)) . '`) VALUES('
+					. str_repeat('?,', count($input)-1).'? ' . ')';
 			} else {
 				return true;
 			}
 		} elseif( $type == 'pgsql' || $type == 'oci' || $type == 'mysql' || $type == 'mssql') {
-			$query = 'INSERT INTO `' .$table . '` ('
-				. implode(',', array_keys($input)) . ') SELECT \''
-				. implode('\',\'', array_values($input)) . '\' FROM ' . $table . ' WHERE ';
+			$query = 'INSERT INTO `' .$table . '` (`'
+				. implode('`,`', array_keys($input)) . '`) SELECT '
+				. str_repeat('?,', count($input)-1).'? ' // Is there a prettier alternative?
+				. 'FROM `' . $table . '` WHERE ';
 
 			foreach($input as $key => $value) {
-				$query .= $key . " = '" . $value . '\' AND ';
+				$query .= '`' . $key . '` = ? AND ';
 			}
 			$query = substr($query, 0, strlen($query) - 5);
 			$query .= ' HAVING COUNT(*) = 0';
+			$inserts = array_merge($inserts, $inserts);
 		}
 
-		// TODO: oci should be use " (quote) instead of ` (backtick).
-		//OC_Log::write('core', __METHOD__ . ', type: ' . $type . ', query: ' . $query, OC_Log::DEBUG);
-
 		try {
 			$result = self::prepare($query);
 		} catch(PDOException $e) {
@@ -683,7 +688,7 @@ class OC_DB {
 			OC_Template::printErrorPage( $entry );
 		}
 
-		return $result->execute();
+		return $result->execute($inserts);
 	}
 
 	/**
@@ -949,6 +954,10 @@ class PDOStatementWrapper{
 	 * make execute return the result instead of a bool
 	 */
 	public function execute($input=array()) {
+		if(OC_Config::getValue( "log_query", false)) {
+			$params_str = str_replace("\n"," ",var_export($input,true));
+			OC_Log::write('core', 'DB execute with arguments : '.$params_str, OC_Log::DEBUG);
+		}
 		$this->lastArguments = $input;
 		if (count($input) > 0) {
 
@@ -1068,7 +1077,7 @@ class PDOStatementWrapper{
 	public function numRows() {
 		$regex = '/^SELECT\s+(?:ALL\s+|DISTINCT\s+)?(?:.*?)\s+FROM\s+(.*)$/i';
 		if (preg_match($regex, $this->statement->queryString, $output) > 0) {
-			$query = OC_DB::prepare("SELECT COUNT(*) FROM {$output[1]}", PDO::FETCH_NUM);
+			$query = OC_DB::prepare("SELECT COUNT(*) FROM {$output[1]}");
 			return $query->execute($this->lastArguments)->fetchColumn();
 		}else{
 			return $this->statement->rowCount();
diff --git a/lib/files.php b/lib/files.php
index 71bb21851b6f57b89c586600eb83a002e16834f0..ab7fa1ed096ef21ec0d0b8413de8e16cd6920eae 100644
--- a/lib/files.php
+++ b/lib/files.php
@@ -50,7 +50,7 @@ class OC_Files {
 			$xsendfile = true;
 		}
 
-		if (count($files) == 1) {
+		if (is_array($files) && count($files) == 1) {
 			$files = $files[0];
 		}
 
@@ -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 {
@@ -128,7 +126,7 @@ class OC_Files {
 				header('Content-Type: '.\OC\Files\Filesystem::getMimeType($filename));
 				header("Content-Length: ".\OC\Files\Filesystem::filesize($filename));
 				list($storage) = \OC\Files\Filesystem::resolvePath($filename);
-				if ($storage instanceof \OC\File\Storage\Local) {
+				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 2413c05b8cd4e806b3b1b8d923a3ffba8a0dd9c0..0617471079b789fe53cfdfa380c70ac8b4a73ea8 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();
 	}
 
 	/**
@@ -111,7 +101,7 @@ class Cache {
 	public function get($file) {
 		if (is_string($file) or $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);
@@ -204,12 +194,15 @@ 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) . ')');
-			$query->execute($params);
+			$result = $query->execute($params);
+			if (\OC_DB::isError($result)) {
+				\OCP\Util::writeLog('cache', 'Insert to cache failed: ' . $result, \OCP\Util::ERROR);
+			}
 
 			return (int)\OC_DB::insertid('*PREFIX*filecache');
 		}
@@ -272,7 +265,7 @@ class Cache {
 		$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'];
@@ -336,24 +329,27 @@ class Cache {
 	 * @param string $target
 	 */
 	public function move($source, $target) {
-		$sourceId = $this->getId($source);
+		$sourceData = $this->get($source);
+		$sourceId = $sourceData['fileid'];
 		$newParentId = $this->getParentId($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` = ?');
-
-		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 `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` = ?');
+
+			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` = ?, `parent` =?'
+		$query = \OC_DB::prepare('UPDATE `*PREFIX*filecache` SET `path` = ?, `path_hash` = ?, `name` = ?, `parent` =?'
 			. ' WHERE `fileid` = ?');
-		$query->execute(array($target, md5($target), $newParentId, $sourceId));
+		$query->execute(array($target, md5($target), basename($target), $newParentId, $sourceId));
 	}
 
 	/**
@@ -361,7 +357,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));
@@ -375,7 +371,7 @@ class Cache {
 	public function getStatus($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 ($row = $result->fetchRow()) {
 			if ((int)$row['size'] === -1) {
 				return self::SHALLOW;
@@ -402,7 +398,7 @@ class Cache {
 			SELECT `fileid`, `storage`, `path`, `parent`, `name`, `mimetype`, `mimepart`, `size`, `mtime`, `encrypted`, `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']);
@@ -429,7 +425,7 @@ class Cache {
 			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']);
@@ -448,7 +444,7 @@ class Cache {
 		$this->calculateFolderSize($path);
 		if ($path !== '') {
 			$parent = dirname($path);
-			if ($parent === '.') {
+			if ($parent === '.' or $parent === '/') {
 				$parent = '';
 			}
 			$this->correctFolderSize($parent);
@@ -467,7 +463,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()) {
@@ -494,7 +490,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'];
@@ -514,7 +510,7 @@ 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));
+		$result = $query->execute(array($this->getNumericStorageId()));
 		if ($row = $result->fetchRow()) {
 			return $row['path'];
 		} else {
@@ -525,6 +521,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) {
@@ -537,10 +534,8 @@ 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;
 		}
diff --git a/lib/files/cache/legacy.php b/lib/files/cache/legacy.php
index 2b8689fcbda3671735d60243c5cb19f280989cbe..b8e2548639baf4171327009f26eaa8238f839f1e 100644
--- a/lib/files/cache/legacy.php
+++ b/lib/files/cache/legacy.php
@@ -20,6 +20,11 @@ class Legacy {
 		$this->user = $user;
 	}
 
+	/**
+	 * get the numbers of items in the legacy cache
+	 *
+	 * @return int
+	 */
 	function getCount() {
 		$query = \OC_DB::prepare('SELECT COUNT(`id`) AS `count` FROM `*PREFIX*fscache` WHERE `user` = ?');
 		$result = $query->execute(array($this->user));
@@ -62,6 +67,8 @@ class Legacy {
 	}
 
 	/**
+	 * get an item from the legacy cache
+	 *
 	 * @param string|int $path
 	 * @return array
 	 */
@@ -72,16 +79,59 @@ class Legacy {
 			$query = \OC_DB::prepare('SELECT * FROM `*PREFIX*fscache` WHERE `path` = ?');
 		}
 		$result = $query->execute(array($path));
-		return $result->fetchRow();
+		$data = $result->fetchRow();
+		$data['etag'] = $this->getEtag($data['path'], $data['user']);
+		return $data;
 	}
 
 	/**
+	 * Get the ETag for the given path
+	 *
+	 * @param type $path
+	 * @return string
+	 */
+	function getEtag($path, $user = null) {
+		static $query = null;
+
+		$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\'');
+		}
+		$result = $query->execute(array($user, '/' . $relativePath));
+		if ($row = $result->fetchRow()) {
+			return trim($row['propertyvalue'], '"');
+		} else {
+			return '';
+		}
+	}
+
+	/**
+	 * get all child items of an item from the legacy cache
+	 *
 	 * @param int $id
 	 * @return array
 	 */
 	function getChildren($id) {
 		$query = \OC_DB::prepare('SELECT * FROM `*PREFIX*fscache` WHERE `parent` = ?');
 		$result = $query->execute(array($id));
-		return $result->fetchAll();
+		$data = $result->fetchAll();
+		foreach ($data as $i => $item) {
+			$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..faa5ff5eacc4a5ee938a1d71b12d582c803c2f8a 100644
--- a/lib/files/cache/permissions.php
+++ b/lib/files/cache/permissions.php
@@ -107,4 +107,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 9c5ce9df7fc1ad2079aef0d962484e3c63b6a521..a98953b42aa695ed9b83af410ecf0835a160d4f1 100644
--- a/lib/files/cache/scanner.php
+++ b/lib/files/cache/scanner.php
@@ -63,36 +63,44 @@ class Scanner {
 	 * @return array with metadata of the scanned file
 	 */
 	public function scanFile($file, $checkExisting = false) {
-		\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 === '.') {
-					$parent = '';
-				}
-				if (!$this->cache->inCache($parent)) {
-					$this->scanFile($parent);
+		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 === '.' or $parent === '/') {
+						$parent = '';
+					}
+					if (!$this->cache->inCache($parent)) {
+						$this->scanFile($parent);
+					}
 				}
-			}
-			if ($checkExisting and $cacheData = $this->cache->get($file)) {
-				if ($data['size'] === -1) {
-					$data['size'] = $cacheData['size'];
+				if($cacheData = $this->cache->get($file)) {
+					if ($data['mtime'] === $cacheData['mtime'] &&
+						$data['size'] === $cacheData['size']) {
+						$data['etag'] = $cacheData['etag'];
+					}
 				}
-				if ($data['mtime'] === $cacheData['mtime']) {
-					$data['etag'] = $cacheData['etag'];
+				if ($checkExisting and $cacheData) {
+					if ($data['size'] === -1) {
+						$data['size'] = $cacheData['size'];
+					}
 				}
+				$this->cache->put($file, $data);
 			}
-			$this->cache->put($file, $data);
+			return $data;
 		}
-		return $data;
+		return null;
 	}
 
 	/**
 	 * scan all the files in a folder and store them in the cache
 	 *
 	 * @param string $path
-	 * @param SCAN_RECURSIVE/SCAN_SHALLOW $recursive
+	 * @param bool $recursive
 	 * @param bool $onlyChilds
 	 * @return int the size of the scanned folder or -1 if the size is unknown at this stage
 	 */
@@ -107,8 +115,8 @@ class Scanner {
 		if ($this->storage->is_dir($path) && ($dh = $this->storage->opendir($path))) {
 			\OC_DB::beginTransaction();
 			while ($file = readdir($dh)) {
-				if (!$this->isIgnoredFile($file)) {
-					$child = ($path) ? $path . '/' . $file : $file;
+				$child = ($path) ? $path . '/' . $file : $file;
+				if (!$this->isIgnoredDir($file)) {
 					$data = $this->scanFile($child, $recursive === self::SCAN_SHALLOW);
 					if ($data) {
 						if ($data['size'] === -1) {
@@ -142,6 +150,18 @@ 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!
@@ -149,10 +169,8 @@ class Scanner {
 	 * @param String $file
 	 * @return boolean
 	 */
-	private function isIgnoredFile($file) {
-		if ($file === '.' || $file === '..'
-			|| pathinfo($file, PATHINFO_EXTENSION) === 'part'
-		) {
+	public static function isPartialFile($file) {
+		if (pathinfo($file, PATHINFO_EXTENSION) === 'part') {
 			return true;
 		}
 		return false;
@@ -162,9 +180,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 d04541c219fd87157076e8bd4333b329e699b499..417a47f3830d8d9c5575e0630393c0ff1f2e3a1e 100644
--- a/lib/files/cache/updater.php
+++ b/lib/files/cache/updater.php
@@ -16,7 +16,7 @@ class Updater {
 	/**
 	 * resolve a path to a storage and internal path
 	 *
-	 * @param string $path
+	 * @param string $path the relative path
 	 * @return array consisting of the storage and the internal path
 	 */
 	static public function resolvePath($path) {
@@ -24,6 +24,11 @@ class Updater {
 		return $view->resolvePath($path);
 	}
 
+	/**
+	 * preform a write update
+	 *
+	 * @param string $path the relative path of the file
+	 */
 	static public function writeUpdate($path) {
 		/**
 		 * @var \OC\Files\Storage\Storage $storage
@@ -39,6 +44,11 @@ class Updater {
 		}
 	}
 
+	/**
+	 * preform a delete update
+	 *
+	 * @param string $path the relative path of the file
+	 */
 	static public function deleteUpdate($path) {
 		/**
 		 * @var \OC\Files\Storage\Storage $storage
@@ -54,11 +64,41 @@ class Updater {
 	}
 
 	/**
-	* Update the mtime and ETag of all parent folders
-	*
-	* @param string $path
-	* @param string $time
-	*/
+	 * preform a rename update
+	 *
+	 * @param string $from the relative path of the source file
+	 * @param string $to the relative path of the target file
+	 */
+	static public function renameUpdate($from, $to) {
+		/**
+		 * @var \OC\Files\Storage\Storage $storageFrom
+		 * @var \OC\Files\Storage\Storage $storageTo
+		 * @var string $internalFrom
+		 * @var string $internalTo
+		 */
+		list($storageFrom, $internalFrom) = self::resolvePath($from);
+		list($storageTo, $internalTo) = self::resolvePath($to);
+		if ($storageFrom && $storageTo) {
+			if ($storageFrom === $storageTo) {
+				$cache = $storageFrom->getCache($internalFrom);
+				$cache->move($internalFrom, $internalTo);
+				$cache->correctFolderSize($internalFrom);
+				$cache->correctFolderSize($internalTo);
+				self::correctFolder($from, time());
+				self::correctFolder($to, time());
+			} else {
+				self::deleteUpdate($from);
+				self::writeUpdate($to);
+			}
+		}
+	}
+
+	/**
+	 * Update the mtime and ETag of all parent folders
+	 *
+	 * @param string $path
+	 * @param string $time
+	 */
 	static public function correctFolder($path, $time) {
 		if ($path !== '' && $path !== '/') {
 			$parent = dirname($path);
@@ -66,9 +106,9 @@ class Updater {
 				$parent = '';
 			}
 			/**
-			* @var \OC\Files\Storage\Storage $storage
-			* @var string $internalPath
-			*/
+			 * @var \OC\Files\Storage\Storage $storage
+			 * @var string $internalPath
+			 */
 			list($storage, $internalPath) = self::resolvePath($parent);
 			if ($storage) {
 				$cache = $storage->getCache();
@@ -88,12 +128,25 @@ class Updater {
 		self::writeUpdate($params['path']);
 	}
 
+	/**
+	 * @param array $params
+	 */
+	static public function touchHook($params) {
+		$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);
+	}
+
 	/**
 	 * @param array $params
 	 */
 	static public function renameHook($params) {
-		self::deleteUpdate($params['oldpath']);
-		self::writeUpdate($params['newpath']);
+		self::renameUpdate($params['oldpath'], $params['newpath']);
 	}
 
 	/**
diff --git a/lib/files/cache/upgrade.php b/lib/files/cache/upgrade.php
index 811d82d7437e570883f20328e84c55264619d998..ca044ba81dedef005ac0392862e0e85617c9a04e 100644
--- a/lib/files/cache/upgrade.php
+++ b/lib/files/cache/upgrade.php
@@ -26,63 +26,77 @@ class Upgrade {
 	}
 
 	/**
-	 * Preform a shallow upgrade
+	 * Preform a upgrade a path and it's childs
 	 *
 	 * @param string $path
-	 * @param int $mode
+	 * @param bool $mode
 	 */
 	function upgradePath($path, $mode = Scanner::SCAN_RECURSIVE) {
 		if (!$this->legacy->hasItems()) {
 			return;
 		}
 		\OC_Hook::emit('\OC\Files\Cache\Upgrade', 'migrate_path', $path);
-
 		if ($row = $this->legacy->get($path)) {
 			$data = $this->getNewData($row);
-			$this->insert($data);
-
-			$this->upgradeChilds($data['id'], $mode);
+			if ($data) {
+				$this->insert($data);
+				$this->upgradeChilds($data['id'], $mode);
+			}
 		}
 	}
 
 	/**
+	 * upgrade all child elements of an item
+	 *
 	 * @param int $id
+	 * @param bool $mode
 	 */
 	function upgradeChilds($id, $mode = Scanner::SCAN_RECURSIVE) {
 		$children = $this->legacy->getChildren($id);
 		foreach ($children as $child) {
 			$childData = $this->getNewData($child);
 			\OC_Hook::emit('\OC\Files\Cache\Upgrade', 'migrate_path', $child['path']);
-			$this->insert($childData);
-			if ($mode == Scanner::SCAN_RECURSIVE) {
-				$this->upgradeChilds($child['id']);
+			if ($childData) {
+				$this->insert($childData);
+				if ($mode == Scanner::SCAN_RECURSIVE) {
+					$this->upgradeChilds($child['id']);
+				}
 			}
 		}
 	}
 
 	/**
+	 * insert data into the new cache
+	 *
 	 * @param array $data the data for the new cache
 	 */
 	function insert($data) {
-		if (!$this->inCache($data['storage'], $data['path_hash'], $data['id'])) {
+		static $insertQuery = null;
+		if(is_null($insertQuery)) {
 			$insertQuery = \OC_DB::prepare('INSERT INTO `*PREFIX*filecache`
-					( `fileid`, `storage`, `path`, `path_hash`, `parent`, `name`, `mimetype`, `mimepart`, `size`, `mtime`, `encrypted` )
-					VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)');
-
+				( `fileid`, `storage`, `path`, `path_hash`, `parent`, `name`, `mimetype`, `mimepart`, `size`, `mtime`, `encrypted`, `etag` )
+				VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)');
+		}
+		if (!$this->inCache($data['storage'], $data['path_hash'], $data['id'])) {
 			$insertQuery->execute(array($data['id'], $data['storage'],
 				$data['path'], $data['path_hash'], $data['parent'], $data['name'],
-				$data['mimetype'], $data['mimepart'], $data['size'], $data['mtime'], $data['encrypted']));
+				$data['mimetype'], $data['mimepart'], $data['size'], $data['mtime'], $data['encrypted'], $data['etag']));
 		}
 	}
 
 	/**
+	 * check if an item is already in the new cache
+	 *
 	 * @param string $storage
 	 * @param string $pathHash
 	 * @param string $id
 	 * @return bool
 	 */
 	function inCache($storage, $pathHash, $id) {
-		$query = \OC_DB::prepare('SELECT `fileid` FROM `*PREFIX*filecache` WHERE (`storage` = ? AND `path_hash` = ?) OR `fileid` = ?');
+		static $query = null;
+		if(is_null($query)) {
+			$query = \OC_DB::prepare('SELECT `fileid` FROM `*PREFIX*filecache` WHERE (`storage` = ? AND `path_hash` = ?) OR `fileid` = ?');
+		}
 		$result = $query->execute(array($storage, $pathHash, $id));
 		return (bool)$result->fetchRow();
 	}
@@ -91,24 +105,53 @@ class Upgrade {
 	 * get the new data array from the old one
 	 *
 	 * @param array $data the data from the old cache
+	 * Example data array
+	 * Array
+	 *	(
+	 *		[id] => 418
+	 *		[path] => /tina/files/picture.jpg		//relative to datadir
+	 *		[path_hash] => 66d4547e372888deed80b24fec9b192b
+	 *		[parent] => 234
+	 *		[name] => picture.jpg
+	 *		[user] => tina
+	 *		[size] => 1265283
+	 *		[ctime] => 1363909709
+	 *		[mtime] => 1363909709
+	 *		[mimetype] => image/jpeg
+	 *		[mimepart] => image
+	 *		[encrypted] => 0
+	 *		[versioned] => 0
+	 *		[writable] => 1
+	 *	)
+	 *
 	 * @return array
 	 */
 	function getNewData($data) {
+		//Make sure there is a path, otherwise we can do nothing.
+		if(!isset($data['path'])) {
+			return false;
+		}
 		$newData = $data;
-		list($storage, $internalPath) = \OC\Files\Filesystem::resolvePath($data['path']);
 		/**
 		 * @var \OC\Files\Storage\Storage $storage
 		 * @var string $internalPath;
 		 */
-		$newData['path_hash'] = md5($internalPath);
-		$newData['path'] = $internalPath;
-		$newData['storage'] = $this->getNumericId($storage);
-		$newData['parent'] = ($internalPath === '') ? -1 : $data['parent'];
-		$newData['permissions'] = ($data['writable']) ? \OCP\PERMISSION_ALL : \OCP\PERMISSION_READ;
-		$newData['storage_object'] = $storage;
-		$newData['mimetype'] = $this->getMimetypeId($newData['mimetype'], $storage);
-		$newData['mimepart'] = $this->getMimetypeId($newData['mimepart'], $storage);
-		return $newData;
+		list($storage, $internalPath) = \OC\Files\Filesystem::resolvePath($data['path']);
+		if ($storage) {
+			$newData['etag'] = $data['etag'];
+			$newData['path_hash'] = md5($internalPath);
+			$newData['path'] = $internalPath;
+			$newData['storage'] = $this->getNumericId($storage);
+			$newData['parent'] = ($internalPath === '') ? -1 : $data['parent'];
+			$newData['permissions'] = ($data['writable']) ? \OCP\PERMISSION_ALL : \OCP\PERMISSION_READ;
+			$newData['storage_object'] = $storage;
+			$newData['mimetype'] = $this->getMimetypeId($newData['mimetype'], $storage);
+			$newData['mimepart'] = $this->getMimetypeId($newData['mimepart'], $storage);
+			return $newData;
+		} else {
+			\OC_Log::write('core', 'Unable to migrate data from old cache for '.$data['path'].' because the storage was not found', \OC_Log::ERROR);
+			return false;
+		}
 	}
 
 	/**
@@ -127,6 +170,8 @@ class Upgrade {
 	}
 
 	/**
+	 * get the numeric id for a mimetype
+	 *
 	 * @param string $mimetype
 	 * @param \OC\Files\Storage\Storage $storage
 	 * @return int
@@ -158,4 +203,25 @@ class Upgrade {
 	static function upgradeDone($user) {
 		\OCP\Config::setUserValue($user, 'files', 'cache_version', 5);
 	}
+
+	/**
+	 * Does a "silent" upgrade, i.e. without an Event-Source as triggered
+	 * on User-Login via Ajax. This method is called within the regular
+	 * ownCloud upgrade.
+	 *
+	 * @param string $user a User ID
+	 */
+	public static function doSilentUpgrade($user) {
+		if(!self::needUpgrade($user)) {
+			return;
+		}
+		$legacy = new \OC\Files\Cache\Legacy($user);
+		if ($legacy->hasItems()) {
+			\OC_DB::beginTransaction();
+			$upgrade = new \OC\Files\Cache\Upgrade($legacy);
+			$upgrade->upgradePath('/' . $user . '/files');
+			\OC_DB::commit();
+		}
+		\OC\Files\Cache\Upgrade::upgradeDone($user);
+	}
 }
diff --git a/lib/files/filesystem.php b/lib/files/filesystem.php
index 0bbd7550d74dce4638cc3f5e74f559f59f680513..d60d430d77cb76da949ad7d8e712170d93d453f0 100644
--- a/lib/files/filesystem.php
+++ b/lib/files/filesystem.php
@@ -23,6 +23,7 @@
  *   post_rename(oldpath,newpath)
  *   copy(oldpath,newpath, &run) (if the newpath doesn't exists yes, copy, create and write will be emitted in that order)
  *   post_rename(oldpath,newpath)
+ *   post_initMountPoints(user, user_dir)
  *
  *   the &run parameter can be set to false to prevent the operation from occurring
  */
@@ -30,8 +31,14 @@
 namespace OC\Files;
 
 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
@@ -145,7 +152,7 @@ class Filesystem {
 	 * @return string
 	 */
 	static public function getMountPoint($path) {
-		$mount = Mount::find($path);
+		$mount = self::$mounts->find($path);
 		if ($mount) {
 			return $mount->getMountPoint();
 		} else {
@@ -161,7 +168,7 @@ class Filesystem {
 	 */
 	static public function getMountPoints($path) {
 		$result = array();
-		$mounts = Mount::findIn($path);
+		$mounts = self::$mounts->findIn($path);
 		foreach ($mounts as $mount) {
 			$result[] = $mount->getMountPoint();
 		}
@@ -175,10 +182,26 @@ class Filesystem {
 	 * @return \OC\Files\Storage\Storage
 	 */
 	public static function getStorage($mountPoint) {
-		$mount = Mount::find($mountPoint);
+		$mount = self::$mounts->find($mountPoint);
 		return $mount->getStorage();
 	}
 
+	/**
+	 * @param $id
+	 * @return Mount\Mount[]
+	 */
+	public static function getMountByStorageId($id) {
+		return self::$mounts->findByStorageId($id);
+	}
+
+	/**
+	 * @param $id
+	 * @return Mount\Mount[]
+	 */
+	public static function getMountByNumericId($id) {
+		return self::$mounts->findByNumericId($id);
+	}
+
 	/**
 	 * resolve a path to a storage and internal path
 	 *
@@ -186,7 +209,7 @@ class Filesystem {
 	 * @return array consisting of the storage and the internal path
 	 */
 	static public function resolvePath($path) {
-		$mount = Mount::find($path);
+		$mount = self::$mounts->find($path);
 		if ($mount) {
 			return array($mount->getStorage(), $mount->getInternalPath($path));
 		} else {
@@ -200,6 +223,10 @@ class Filesystem {
 		}
 		self::$defaultInstance = new View($root);
 
+		if(!self::$mounts) {
+			self::$mounts = new Mount\Manager();
+		}
+
 		//load custom mount config
 		self::initMountPoints($user);
 
@@ -208,6 +235,10 @@ class Filesystem {
 		return true;
 	}
 
+	static public function initMounts(){
+		self::$mounts = new Mount\Manager();
+	}
+
 	/**
 	 * Initialize system and personal mount points for a user
 	 *
@@ -221,11 +252,16 @@ class Filesystem {
 
 		$root = \OC_User::getHome($user);
 		self::mount('\OC\Files\Storage\Local', array('datadir' => $root), $user);
+		$datadir = \OC_Config::getValue("datadirectory", \OC::$SERVERROOT . "/data");
 
+		//move config file to it's new position
+		if (is_file(\OC::$SERVERROOT . '/config/mount.json')) {
+			rename(\OC::$SERVERROOT . '/config/mount.json', $datadir . '/mount.json');
+		}
 		// Load system mount points
-		if (is_file(\OC::$SERVERROOT . '/config/mount.php') or is_file(\OC::$SERVERROOT . '/config/mount.json')) {
-			if (is_file(\OC::$SERVERROOT . '/config/mount.json')) {
-				$mountConfig = json_decode(file_get_contents(\OC::$SERVERROOT . '/config/mount.json'), true);
+		if (is_file(\OC::$SERVERROOT . '/config/mount.php') or is_file($datadir . '/mount.json')) {
+			if (is_file($datadir . '/mount.json')) {
+				$mountConfig = json_decode(file_get_contents($datadir . '/mount.json'), true);
 			} elseif (is_file(\OC::$SERVERROOT . '/config/mount.php')) {
 				$mountConfig = $parser->parsePHP(file_get_contents(\OC::$SERVERROOT . '/config/mount.php'));
 			}
@@ -249,7 +285,7 @@ class Filesystem {
 			}
 			if (isset($mountConfig['user'])) {
 				foreach ($mountConfig['user'] as $mountUser => $mounts) {
-					if ($user === 'all' or strtolower($mountUser) === strtolower($user)) {
+					if ($mountUser === 'all' or strtolower($mountUser) === strtolower($user)) {
 						foreach ($mounts as $mountPoint => $options) {
 							$mountPoint = self::setUserVars($user, $mountPoint);
 							foreach ($options as &$option) {
@@ -274,12 +310,15 @@ class Filesystem {
 				}
 			}
 		}
+
+		// Chance to mount for other storages
+		\OC_Hook::emit('OC_Filesystem', 'post_initMountPoints', array('user' => $user, 'user_dir' => $root));
 	}
 
 	/**
-	 * 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
 	 */
@@ -301,6 +340,7 @@ class Filesystem {
 	 */
 	static public function tearDown() {
 		self::clearMounts();
+		self::$defaultInstance = null;
 	}
 
 	/**
@@ -317,7 +357,7 @@ class Filesystem {
 	 * clear all mounts and storage backends
 	 */
 	public static function clearMounts() {
-		Mount::clear();
+		self::$mounts->clear();
 	}
 
 	/**
@@ -328,7 +368,8 @@ class Filesystem {
 	 * @param string $mountpoint
 	 */
 	static public function mount($class, $arguments, $mountpoint) {
-		new Mount($class, $mountpoint, $arguments);
+		$mount = new Mount\Mount($class, $mountpoint, $arguments);
+		self::$mounts->addMount($mount);
 	}
 
 	/**
@@ -615,10 +656,11 @@ class Filesystem {
 	 * get the content of a directory
 	 *
 	 * @param string $directory path under datadirectory
+	 * @param string $mimetype_filter limit returned content to this mimetype or mimepart
 	 * @return array
 	 */
-	public static function getDirectoryContent($directory) {
-		return self::$defaultInstance->getDirectoryContent($directory);
+	public static function getDirectoryContent($directory, $mimetype_filter = '') {
+		return self::$defaultInstance->getDirectoryContent($directory, $mimetype_filter);
 	}
 
 	/**
@@ -654,8 +696,4 @@ class Filesystem {
 	}
 }
 
-\OC_Hook::connect('OC_Filesystem', 'post_write', '\OC\Files\Cache\Updater', 'writeHook');
-\OC_Hook::connect('OC_Filesystem', 'post_delete', '\OC\Files\Cache\Updater', 'deleteHook');
-\OC_Hook::connect('OC_Filesystem', 'post_rename', '\OC\Files\Cache\Updater', 'renameHook');
-
 \OC_Util::setupFS();
diff --git a/lib/files/mapper.php b/lib/files/mapper.php
index 520fadbd8c634389d45e122e6a1aeba1f18c787b..15f5f0628b5cd7ebee9072c1d234dfc2b9727c80 100644
--- a/lib/files/mapper.php
+++ b/lib/files/mapper.php
@@ -77,7 +77,9 @@ class Mapper
 		$result = $query->execute(array($path1.'%'));
 		$updateQuery = \OC_DB::prepare('UPDATE `*PREFIX*file_map`'
 			.' SET `logic_path` = ?'
-			.' AND `physic_path` = ?'
+			.' , `logic_path_hash` = ?'
+			.' , `physic_path` = ?'
+			.' , `physic_path_hash` = ?'
 			.' WHERE `logic_path` = ?');
 		while( $row = $result->fetchRow()) {
 			$currentLogic = $row['logic_path'];
@@ -86,7 +88,7 @@ class Mapper
 			$newPhysic = $physicPath2.$this->stripRootFolder($currentPhysic, $physicPath1);
 			if ($path1 !== $currentLogic) {
 				try {
-					$updateQuery->execute(array($newLogic, $newPhysic, $currentLogic));
+					$updateQuery->execute(array($newLogic, md5($newLogic), $newPhysic, md5($newPhysic), $currentLogic));
 				} catch (\Exception $e) {
 					error_log('Mapper::Copy failed '.$currentLogic.' -> '.$newLogic.'\n'.$e);
 					throw $e;
@@ -149,7 +151,7 @@ class Mapper
 
 		// detect duplicates
 		while ($this->resolvePhysicalPath($physicalPath) !== null) {
-			$physicalPath = $this->slugifyPath($physicalPath, $index++);
+			$physicalPath = $this->slugifyPath($logicPath, $index++);
 		}
 
 		// insert the new path mapping if requested
@@ -165,32 +167,41 @@ class Mapper
 		$query->execute(array($logicPath, $physicalPath, md5($logicPath), md5($physicalPath)));
 	}
 
-	private function slugifyPath($path, $index=null) {
+	public function slugifyPath($path, $index=null) {
 		$path = $this->stripRootFolder($path, $this->unchangedPhysicalRoot);
 
 		$pathElements = explode('/', $path);
 		$sluggedElements = array();
 
+		// rip off the extension ext from last element
+		$last= end($pathElements);
+		$parts = pathinfo($last);
+		$filename = $parts['filename'];
+		array_pop($pathElements);
+		array_push($pathElements, $filename);
+
 		foreach ($pathElements as $pathElement) {
 			// remove empty elements
 			if (empty($pathElement)) {
 				continue;
 			}
 
-			// TODO: remove file ext before slugify on last element
 			$sluggedElements[] = self::slugify($pathElement);
 		}
 
-		//
-		// TODO: add the index before the file extension
-		//
+		// apply index to file name
 		if ($index !== null) {
-			$last= end($sluggedElements);
-			array_pop($sluggedElements);
+			$last= array_pop($sluggedElements);
 			array_push($sluggedElements, $last.'-'.$index);
 		}
 
-		$sluggedPath = $this->unchangedPhysicalRoot.implode(DIRECTORY_SEPARATOR, $sluggedElements);
+		// add back the extension
+		if (isset($parts['extension'])) {
+			$last= array_pop($sluggedElements);
+			array_push($sluggedElements, $last.'.'.$parts['extension']);
+		}
+
+		$sluggedPath = $this->unchangedPhysicalRoot.implode('/', $sluggedElements);
 		return $this->stripLast($sluggedPath);
 	}
 
@@ -210,7 +221,7 @@ class Mapper
 
 		// transliterate
 		if (function_exists('iconv')) {
-			$text = iconv('utf-8', 'us-ascii//TRANSLIT', $text);
+			$text = iconv('utf-8', 'us-ascii//TRANSLIT//IGNORE', $text);
 		}
 
 		// lowercase
@@ -219,10 +230,8 @@ class Mapper
 		// remove unwanted characters
 		$text = preg_replace('~[^-\w]+~', '', $text);
 
-		if (empty($text))
-		{
-			// TODO: we better generate a guid in this case
-			return 'n-a';
+		if (empty($text)) {
+			return uniqid();
 		}
 
 		return $text;
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 53%
rename from lib/files/mount.php
rename to lib/files/mount/mount.php
index 1c9382d78e7d5347b04893217a24c1a4fc4f173b..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() {
@@ -90,7 +89,11 @@ class Mount {
 	public function getStorageId() {
 		if (!$this->storageId) {
 			if (is_null($this->storage)) {
-				$this->storage = $this->createStorage();
+				$storage = $this->createStorage(); //FIXME: start using exceptions
+				if (is_null($storage)) {
+					return null;
+				}
+				$this->storage = $storage;
 			}
 			$this->storageId = $this->storage->getId();
 			if (strlen($this->storageId) > 64) {
@@ -117,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 8aa227ec0b72deb06bdd553b04d46e1a0c6fc565..e87fe3b5239bde3c75e3e9b5c79fe1ac3c67e2d4 100644
--- a/lib/files/storage/common.php
+++ b/lib/files/storage/common.php
@@ -21,6 +21,11 @@ namespace OC\Files\Storage;
  */
 
 abstract class Common implements \OC\Files\Storage\Storage {
+	private $cache;
+	private $scanner;
+	private $permissioncache;
+	private $watcher;
+	private $storageCache;
 
 	public function __construct($parameters) {
 	}
@@ -269,19 +274,38 @@ abstract class Common implements \OC\Files\Storage\Storage {
 	}
 
 	public function getCache($path = '') {
-		return new \OC\Files\Cache\Cache($this);
+		if (!isset($this->cache)) {
+			$this->cache = new \OC\Files\Cache\Cache($this);
+		}
+		return $this->cache;
 	}
 
 	public function getScanner($path = '') {
-		return new \OC\Files\Cache\Scanner($this);
+		if (!isset($this->scanner)) {
+			$this->scanner = new \OC\Files\Cache\Scanner($this);
+		}
+		return $this->scanner;
 	}
 
 	public function getPermissionsCache($path = '') {
-		return new \OC\Files\Cache\Permissions($this);
+		if (!isset($this->permissioncache)) {
+			$this->permissioncache = new \OC\Files\Cache\Permissions($this);
+		}
+		return $this->permissioncache;
 	}
 
 	public function getWatcher($path = '') {
-		return new \OC\Files\Cache\Watcher($this);
+		if (!isset($this->watcher)) {
+			$this->watcher = new \OC\Files\Cache\Watcher($this);
+		}
+		return $this->watcher;
+	}
+
+	public function getStorageCache(){
+		if (!isset($this->storageCache)) {
+			$this->storageCache = new \OC\Files\Cache\Storage($this);
+		}
+		return $this->storageCache;
 	}
 
 	/**
@@ -345,7 +369,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 da6597c805772d8b5e6c26cc8976f7cd30aedb0a..d684905bf9a4e5856762f1ffe44076234dc55311 100644
--- a/lib/files/storage/local.php
+++ b/lib/files/storage/local.php
@@ -14,245 +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{
+
+		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);
+		}
+
+		public function is_file($path) {
+			return is_file($this->datadir . $path);
+		}
+
+		public function stat($path) {
 			$fullPath = $this->datadir . $path;
-			$fileSize = filesize($fullPath);
-			if ($fileSize < 0) {
-				return self::getFileSizeFromOS($fullPath);
+			$statResult = stat($fullPath);
+
+			if ($statResult['size'] < 0) {
+				$size = self::getFileSizeFromOS($fullPath);
+				$statResult['size'] = $size;
+				$statResult[7] = $size;
 			}
+			return $statResult;
+		}
 
-			return $fileSize;
+		public function filetype($path) {
+			$filetype = filetype($this->datadir . $path);
+			if ($filetype == 'link') {
+				$filetype = filetype(realpath($this->datadir . $path));
+			}
+			return $filetype;
 		}
-	}
-	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(!is_null($mtime)) {
-			$result=touch( $this->datadir.$path, $mtime );
-		}else{
-			$result=touch( $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;
+			}
 		}
-		if( $result ) {
-			clearstatcache( true, $this->datadir.$path );
+
+		public function isReadable($path) {
+			return is_readable($this->datadir . $path);
 		}
 
-		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 isUpdatable($path) {
+			return is_writable($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 file_exists($path) {
+			return file_exists($this->datadir . $path);
 		}
 
-		if($return=rename($this->datadir.$path1, $this->datadir.$path2)) {
+		public function filemtime($path) {
+			return filemtime($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 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;
+			}
+			if (!is_null($mtime)) {
+				$result = touch($this->datadir . $path, $mtime);
+			} else {
+				$result = touch($this->datadir . $path);
 			}
-			$source=substr($path1, strrpos($path1, '/')+1);
-			$path2.=$source;
+			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) {
-		return @disk_free_space($this->datadir.$path);
-	}
+		public function search($query) {
+			return $this->searchInDir($query);
+		}
 
-	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/mappedlocal.php b/lib/files/storage/mappedlocal.php
index 434c10bcbf7ae192cf8f631c100a9b74cf344aca..ba3fcdc5c9e5bee3368c0423a6b1cdd370e16429 100644
--- a/lib/files/storage/mappedlocal.php
+++ b/lib/files/storage/mappedlocal.php
@@ -50,7 +50,7 @@ class MappedLocal extends \OC\Files\Storage\Common{
 				continue;
 			}
 
-			$logicalFilePath = $this->mapper->physicalToLogic($physicalPath.DIRECTORY_SEPARATOR.$file);
+			$logicalFilePath = $this->mapper->physicalToLogic($physicalPath.'/'.$file);
 
 			$file= $this->mapper->stripRootFolder($logicalFilePath, $logicalPath);
 			$file = $this->stripLeading($file);
@@ -130,7 +130,7 @@ class MappedLocal extends \OC\Files\Storage\Common{
 	public function file_get_contents($path) {
 		return file_get_contents($this->buildPath($path));
 	}
-	public function file_put_contents($path, $data) {//trigger_error("$path = ".var_export($path, 1));
+	public function file_put_contents($path, $data) {
 		return file_put_contents($this->buildPath($path), $data);
 	}
 	public function unlink($path) {
@@ -280,7 +280,7 @@ class MappedLocal extends \OC\Files\Storage\Common{
 		foreach (scandir($physicalDir) as $item) {
 			if ($item == '.' || $item == '..')
 				continue;
-			$physicalItem = $this->mapper->physicalToLogic($physicalDir.DIRECTORY_SEPARATOR.$item);
+			$physicalItem = $this->mapper->physicalToLogic($physicalDir.'/'.$item);
 			$item = substr($physicalItem, strlen($physicalDir)+1);
 
 			if(strstr(strtolower($item), strtolower($query)) !== false) {
@@ -331,6 +331,9 @@ class MappedLocal extends \OC\Files\Storage\Common{
 		if(strpos($path, '/') === 0) {
 			$path = substr($path, 1);
 		}
+		if(strpos($path, '\\') === 0) {
+			$path = substr($path, 1);
+		}
 		if ($path === false) {
 			return '';
 		}
diff --git a/lib/files/storage/storage.php b/lib/files/storage/storage.php
index 2cc835236bafc7cad93c94de0f0157f63f68c368..c96caebf4af6307d22fc3ebb375f46e0792ae770 100644
--- a/lib/files/storage/storage.php
+++ b/lib/files/storage/storage.php
@@ -10,73 +10,328 @@ namespace OC\Files\Storage;
 
 /**
  * Provide a common interface to all different storage options
+ *
+ * All paths passed to the storage are relative to the storage and should NOT have a leading slash.
  */
-interface Storage{
+interface Storage {
+	/**
+	 * $parameters is a free form array with the configuration options needed to construct the storage
+	 *
+	 * @param array $parameters
+	 */
 	public function __construct($parameters);
+
+	/**
+	 * Get the identifier for the storage,
+	 * the returned id should be the same for every storage object that is created with the same parameters
+	 * and two storage objects with the same id should refer to two storages that display the same files.
+	 *
+	 * @return string
+	 */
 	public function getId();
+
+	/**
+	 * see http://php.net/manual/en/function.mkdir.php
+	 *
+	 * @param string $path
+	 * @return bool
+	 */
 	public function mkdir($path);
+
+	/**
+	 * see http://php.net/manual/en/function.rmdir.php
+	 *
+	 * @param string $path
+	 * @return bool
+	 */
 	public function rmdir($path);
+
+	/**
+	 * see http://php.net/manual/en/function.opendir.php
+	 *
+	 * @param string $path
+	 * @return resource
+	 */
 	public function opendir($path);
+
+	/**
+	 * see http://php.net/manual/en/function.is_dir.php
+	 *
+	 * @param string $path
+	 * @return bool
+	 */
 	public function is_dir($path);
+
+	/**
+	 * see http://php.net/manual/en/function.is_file.php
+	 *
+	 * @param string $path
+	 * @return bool
+	 */
 	public function is_file($path);
+
+	/**
+	 * see http://php.net/manual/en/function.stat.php
+	 * only the following keys are required in the result: size and mtime
+	 *
+	 * @param string $path
+	 * @return array
+	 */
 	public function stat($path);
+
+	/**
+	 * see http://php.net/manual/en/function.filetype.php
+	 *
+	 * @param string $path
+	 * @return bool
+	 */
 	public function filetype($path);
+
+	/**
+	 * see http://php.net/manual/en/function.filesize.php
+	 * The result for filesize when called on a folder is required to be 0
+	 *
+	 * @param string $path
+	 * @return int
+	 */
 	public function filesize($path);
+
+	/**
+	 * check if a file can be created in $path
+	 *
+	 * @param string $path
+	 * @return bool
+	 */
 	public function isCreatable($path);
+
+	/**
+	 * check if a file can be read
+	 *
+	 * @param string $path
+	 * @return bool
+	 */
 	public function isReadable($path);
+
+	/**
+	 * check if a file can be written to
+	 *
+	 * @param string $path
+	 * @return bool
+	 */
 	public function isUpdatable($path);
+
+	/**
+	 * check if a file can be deleted
+	 *
+	 * @param string $path
+	 * @return bool
+	 */
 	public function isDeletable($path);
+
+	/**
+	 * check if a file can be shared
+	 *
+	 * @param string $path
+	 * @return bool
+	 */
 	public function isSharable($path);
+
+	/**
+	 * get the full permissions of a path.
+	 * Should return a combination of the PERMISSION_ constants defined in lib/public/constants.php
+	 *
+	 * @param string $path
+	 * @return int
+	 */
 	public function getPermissions($path);
+
+	/**
+	 * see http://php.net/manual/en/function.file_exists.php
+	 *
+	 * @param string $path
+	 * @return bool
+	 */
 	public function file_exists($path);
+
+	/**
+	 * see http://php.net/manual/en/function.filemtime.php
+	 *
+	 * @param string $path
+	 * @return int
+	 */
 	public function filemtime($path);
+
+	/**
+	 * see http://php.net/manual/en/function.file_get_contents.php
+	 *
+	 * @param string $path
+	 * @return string
+	 */
 	public function file_get_contents($path);
-	public function file_put_contents($path,$data);
+
+	/**
+	 * see http://php.net/manual/en/function.file_put_contents.php
+	 *
+	 * @param string $path
+	 * @param string $data
+	 * @return bool
+	 */
+	public function file_put_contents($path, $data);
+
+	/**
+	 * see http://php.net/manual/en/function.unlink.php
+	 *
+	 * @param string $path
+	 * @return bool
+	 */
 	public function unlink($path);
-	public function rename($path1,$path2);
-	public function copy($path1,$path2);
-	public function fopen($path,$mode);
+
+	/**
+	 * see http://php.net/manual/en/function.rename.php
+	 *
+	 * @param string $path1
+	 * @param string $path2
+	 * @return bool
+	 */
+	public function rename($path1, $path2);
+
+	/**
+	 * see http://php.net/manual/en/function.copy.php
+	 *
+	 * @param string $path1
+	 * @param string $path2
+	 * @return bool
+	 */
+	public function copy($path1, $path2);
+
+	/**
+	 * see http://php.net/manual/en/function.fopen.php
+	 *
+	 * @param string $path
+	 * @param string $mode
+	 * @return resource
+	 */
+	public function fopen($path, $mode);
+
+	/**
+	 * get the mimetype for a file or folder
+	 * The mimetype for a folder is required to be "httpd/unix-directory"
+	 *
+	 * @param string $path
+	 * @return string
+	 */
 	public function getMimeType($path);
-	public function hash($type,$path,$raw = false);
+
+	/**
+	 * see http://php.net/manual/en/function.hash.php
+	 *
+	 * @param string $type
+	 * @param string $path
+	 * @param bool $raw
+	 * @return string
+	 */
+	public function hash($type, $path, $raw = false);
+
+	/**
+	 * see http://php.net/manual/en/function.free_space.php
+	 *
+	 * @param string $path
+	 * @return int
+	 */
 	public function free_space($path);
+
+	/**
+	 * search for occurrences of $query in file names
+	 *
+	 * @param string $query
+	 * @return array
+	 */
 	public function search($query);
-	public function touch($path, $mtime=null);
-	public function getLocalFile($path);// get a path to a local version of the file, whether the original file is local or remote
-	public function getLocalFolder($path);// get a path to a local version of the folder, whether the original file is local or remote
+
+	/**
+	 * see http://php.net/manual/en/function.touch.php
+	 * If the backend does not support the operation, false should be returned
+	 *
+	 * @param string $path
+	 * @param int $mtime
+	 * @return bool
+	 */
+	public function touch($path, $mtime = null);
+
+	/**
+	 * get the path to a local version of the file.
+	 * The local version of the file can be temporary and doesn't have to be persistent across requests
+	 *
+	 * @param string $path
+	 * @return string
+	 */
+	public function getLocalFile($path);
+
+	/**
+	 * get the path to a local version of the folder.
+	 * The local version of the folder can be temporary and doesn't have to be persistent across requests
+	 *
+	 * @param string $path
+	 * @return string
+	 */
+	public function getLocalFolder($path);
 	/**
 	 * check if a file or folder has been updated since $time
+	 *
+	 * @param string $path
 	 * @param int $time
 	 * @return bool
 	 *
 	 * hasUpdated for folders should return at least true if a file inside the folder is add, removed or renamed.
 	 * returning true for other changes in the folder is optional
 	 */
-	public function hasUpdated($path,$time);
+	public function hasUpdated($path, $time);
 
 	/**
+	 * get a cache instance for the storage
+	 *
 	 * @param string $path
 	 * @return \OC\Files\Cache\Cache
 	 */
-	public function getCache($path='');
+	public function getCache($path = '');
+
 	/**
+	 * get a scanner instance for the storage
+	 *
 	 * @param string $path
 	 * @return \OC\Files\Cache\Scanner
 	 */
-	public function getScanner($path='');
+	public function getScanner($path = '');
 
+
+	/**
+	 * get the user id of the owner of a file or folder
+	 *
+	 * @param string $path
+	 * @return string
+	 */
 	public function getOwner($path);
 
 	/**
+	 * get a permissions cache instance for the cache
+	 *
 	 * @param string $path
 	 * @return \OC\Files\Cache\Permissions
 	 */
-	public function getPermissionsCache($path='');
+	public function getPermissionsCache($path = '');
 
 	/**
+	 * get a watcher instance for the cache
+	 *
 	 * @param string $path
 	 * @return \OC\Files\Cache\Watcher
 	 */
-	public function getWatcher($path='');
+	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 3cea8b082dc996095a47667f074b9e7cc111a556..bc6b80c505a9c38b4f78c879e29380200f15f918 100644
--- a/lib/files/view.php
+++ b/lib/files/view.php
@@ -245,7 +245,9 @@ class View {
 		if (!is_null($mtime) and !is_numeric($mtime)) {
 			$mtime = strtotime($mtime);
 		}
+
 		$hooks = array('touch');
+
 		if (!$this->file_exists($path)) {
 			$hooks[] = 'write';
 		}
@@ -264,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()) {
+				if ($this->fakeRoot == Filesystem::getRoot() && !Cache\Scanner::isPartialFile($path)) {
 					if (!$exists) {
 						\OC_Hook::emit(
 							Filesystem::CLASSNAME,
@@ -296,7 +300,7 @@ class View {
 					list ($count, $result) = \OC_Helper::streamCopy($data, $target);
 					fclose($target);
 					fclose($data);
-					if ($this->fakeRoot == Filesystem::getRoot()) {
+					if ($this->fakeRoot == Filesystem::getRoot() && !Cache\Scanner::isPartialFile($path)) {
 						if (!$exists) {
 							\OC_Hook::emit(
 								Filesystem::CLASSNAME,
@@ -336,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);
 
@@ -345,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(
@@ -373,7 +381,7 @@ class View {
 					list($storage1, $internalPath1) = Filesystem::resolvePath($absolutePath1 . $postFix1);
 					$storage1->unlink($internalPath1);
 				}
-				if ($this->fakeRoot == Filesystem::getRoot()) {
+				if ($this->fakeRoot == Filesystem::getRoot() && !Cache\Scanner::isPartialFile($path1)) {
 					\OC_Hook::emit(
 						Filesystem::CLASSNAME,
 						Filesystem::signal_post_rename,
@@ -397,7 +405,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);
 
@@ -599,7 +612,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;
@@ -732,6 +748,7 @@ class View {
 	 * get the content of a directory
 	 *
 	 * @param string $directory path under datadirectory
+	 * @param string $mimetype_filter limit returned content to this mimetype or mimepart
 	 * @return array
 	 */
 	public function getDirectoryContent($directory, $mimetype_filter = '') {
@@ -969,7 +986,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 41985ca57a71478889bfaef774858578746b725d..c69445ed78823cc9dae27ebd439e93c23b24ddcb 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -159,7 +159,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" )) {
@@ -541,13 +541,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 +557,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 +601,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/';
@@ -764,9 +768,15 @@ class OC_Helper {
 	public static function maxUploadFilesize($dir) {
 		$upload_max_filesize = OCP\Util::computerFileSize(ini_get('upload_max_filesize'));
 		$post_max_size = OCP\Util::computerFileSize(ini_get('post_max_size'));
-		$maxUploadFilesize = min($upload_max_filesize, $post_max_size);
-
 		$freeSpace = \OC\Files\Filesystem::free_space($dir);
+		if ($upload_max_filesize == 0 and $post_max_size == 0) {
+			$maxUploadFilesize = \OC\Files\FREE_SPACE_UNLIMITED;
+		} elseif ($upload_max_filesize === 0 or $post_max_size === 0) {
+			$maxUploadFilesize = max($upload_max_filesize, $post_max_size); //only the non 0 value counts
+		} else {
+			$maxUploadFilesize = min($upload_max_filesize, $post_max_size);
+		}
+
 		if($freeSpace !== \OC\Files\FREE_SPACE_UNKNOWN){
 			$freeSpace = max($freeSpace, 0);
 
@@ -806,11 +816,19 @@ class OC_Helper {
 			$used = 0;
 		}
 		$free = \OC\Files\Filesystem::free_space();
-		$total = $free + $used;
+		if ($free >= 0){
+			$total = $free + $used;
+		} else {
+			$total = $free; //either unknown or unlimited
+		}
 		if ($total == 0) {
 			$total = 1; // prevent division by zero
 		}
-		$relative = round(($used / $total) * 10000) / 100;
+		if ($total >= 0){
+			$relative = round(($used / $total) * 10000) / 100;
+		} else {
+			$relative = 0;
+		}
 
 		return array('free' => $free, 'used' => $used, 'total' => $total, 'relative' => $relative);
 	}
diff --git a/lib/installer.php b/lib/installer.php
index 251d115b76c9ae297cf089cf832ef90f70c6e796..49ba44926323c8eb6054c8cdf58ceacd911db7d1 100644
--- a/lib/installer.php
+++ b/lib/installer.php
@@ -134,8 +134,10 @@ class OC_Installer{
 		}
 
 		// check if the app is compatible with this version of ownCloud
-		$version=OC_Util::getVersion();
-		if(!isset($info['require']) or ($version[0]>$info['require'])) {
+		if(
+            !isset($info['require'])
+            or !OC_App::isAppVersionCompatible(OC_Util::getVersion(), $info['require'])
+        ) {
 			OC_Log::write('core',
 				'App can\'t be installed because it is not compatible with this version of ownCloud',
 				OC_Log::ERROR);
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 77e02dd77b10dd0687349196f5a33d9bff4d8d96..98b9608ce02bf2ae5b6e9774fe58619362386a1f 100644
--- a/lib/l10n/ar.php
+++ b/lib/l10n/ar.php
@@ -1,12 +1,52 @@
 <?php $TRANSLATIONS = array(
 "Help" => "Ø§Ù„Ù…Ø³Ø§Ø¹Ø¯Ø©",
 "Personal" => "Ø´Ø®ØµÙŠ",
-"Settings" => "ØªØ¹Ø¯ÙŠÙ„Ø§Øª",
+"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" => "ØµÙˆØ±",
+"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 username and/or password not valid" => "Ø§Ø³Ù… Ø§Ù„Ù…Ø³ØªØ®Ø¯Ù…  Ùˆ/Ø£Ùˆ  ÙƒÙ„Ù…Ø© Ø§Ù„Ù…Ø±ÙˆØ± Ù„Ù†Ø¸Ø§Ù… Oracle ØºÙŠØ± ØµØÙŠØ",
+"MySQL username and/or password not valid" => "Ø§Ø³Ù… Ø§Ù„Ù…Ø³ØªØ®Ø¯Ù…  Ùˆ/Ø£Ùˆ  ÙƒÙ„Ù…Ø© Ø§Ù„Ù…Ø±ÙˆØ± Ù„Ù†Ø¸Ø§Ù… MySQL ØºÙŠØ± ØµØÙŠØ",
+"DB Error: \"%s\"" => "Ø®Ø·Ø£ ÙÙŠ Ù‚ÙˆØ§Ø¹Ø¯ Ø§Ù„Ø¨ÙŠØ§Ù†Ø§Øª : \"%s\"",
+"Offending command was: \"%s\"" => "Ø§Ù„Ø£Ù…Ø± Ø§Ù„Ù…Ø®Ø§Ù„Ù ÙƒØ§Ù† : \"%s\"",
+"MySQL user '%s'@'localhost' exists already." => "Ø£Ø³Ù… Ø§Ù„Ù…Ø³ØªØ®Ø¯Ù…  '%s'@'localhost' Ø§Ù„Ø®Ø§Øµ Ø¨Ù€ MySQL Ù…ÙˆØ¬ÙˆØ¯ Ù…Ø³Ø¨Ù‚Ø§",
+"Drop this user from MySQL" => "Ø§ØØ°Ù Ø§Ø³Ù… Ø§Ù„Ù…Ø³ØªØ®Ø¯Ù… Ù‡Ø°Ø§ Ù…Ù† Ø§Ù„Ù€ MySQL",
+"MySQL user '%s'@'%%' already exists" => "Ø£Ø³Ù… Ø§Ù„Ù…Ø³ØªØ®Ø¯Ù…  '%s'@'%%' Ø§Ù„Ø®Ø§Øµ Ø¨Ù€ MySQL Ù…ÙˆØ¬ÙˆØ¯ Ù…Ø³Ø¨Ù‚Ø§",
+"Drop this user from MySQL." => "Ø§ØØ°Ù Ø§Ø³Ù… Ø§Ù„Ù…Ø³ØªØ®Ø¯Ù… Ù‡Ø°Ø§ Ù…Ù† Ø§Ù„Ù€ MySQL.",
+"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" => "Ù…Ù†Ø° Ø«ÙˆØ§Ù†ÙŠ",
 "1 minute ago" => "Ù…Ù†Ø° Ø¯Ù‚ÙŠÙ‚Ø©",
-"today" => "Ø§Ù„ÙŠÙˆÙ…"
+"%d minutes ago" => "%d Ø¯Ù‚ÙŠÙ‚Ø© Ù…Ø¶Øª",
+"1 hour ago" => "Ù‚Ø¨Ù„ Ø³Ø§Ø¹Ø© Ù…Ø¶Øª",
+"%d hours ago" => "%d Ø³Ø§Ø¹Ø© Ù…Ø¶Øª",
+"today" => "Ø§Ù„ÙŠÙˆÙ…",
+"yesterday" => "ÙŠÙˆÙ… Ø£Ù…Ø³",
+"%d days ago" => "%d ÙŠÙˆÙ… Ù…Ø¶Ù‰",
+"last month" => "Ø§Ù„Ø´Ù‡Ø± Ø§Ù„Ù…Ø§Ø¶ÙŠ",
+"%d months ago" => "%d Ø´Ù‡Ø± Ù…Ø¶Øª",
+"last year" => "Ø§Ù„Ø³Ù†Ø©Ø§Ù„Ù…Ø§Ø¶ÙŠØ©",
+"years ago" => "Ø³Ù†Ø© Ù…Ø¶Øª",
+"Could not find category \"%s\"" => "ØªØ¹Ø°Ø± Ø§Ù„Ø¹Ø«ÙˆØ± Ø¹Ù„Ù‰ Ø§Ù„Ù…Ø¬Ù„Ø¯ \"%s\""
 );
diff --git a/lib/l10n/bg_BG.php b/lib/l10n/bg_BG.php
index d32e2aadfc5361de44cd1320856290b1cd243f28..73a7fdce481e3c2c2cdc4d8e18dfcc5947d90241 100644
--- a/lib/l10n/bg_BG.php
+++ b/lib/l10n/bg_BG.php
@@ -18,7 +18,6 @@
 "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, Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð´Ð° Ð¿Ð¾Ð»Ð·Ð²Ð°Ñ‚Ðµ Ñ‚Ð¾Ñ‡ÐºÐ¸ Ð² Ð¸Ð¼ÐµÑ‚Ð¾ Ð½Ð° Ð±Ð°Ð·Ð°Ñ‚Ð° Ð¾Ñ‚ Ð´Ð°Ð½Ð½Ð¸",
@@ -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..028bf2343a7e15ac2f509d22dcccecc05a6eabbe 100644
--- a/lib/l10n/ca.php
+++ b/lib/l10n/ca.php
@@ -18,7 +18,6 @@
 "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",
@@ -48,9 +47,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..e3007f687d998cd18dd04c061b4556f8bf1e5221 100644
--- a/lib/l10n/cs_CZ.php
+++ b/lib/l10n/cs_CZ.php
@@ -18,7 +18,6 @@
 "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.",
@@ -37,8 +36,8 @@
 "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..ab5623bbf446c2a059f01e83dbaa9cdc0fd566c2
--- /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.",
+"Oracle username and/or password not valid" => "Enw a/neu gyfrinair Oracle annilys",
+"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.",
+"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..dad64700e52e9f2f1b66154cd60dfc38ed6397d0 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,7 +18,6 @@
 "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.",
@@ -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..13acc1c55b50330d92fc16a7ff57eecd6c9bf782 100644
--- a/lib/l10n/de.php
+++ b/lib/l10n/de.php
@@ -4,21 +4,20 @@
 "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",
@@ -36,9 +35,9 @@
 "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..566e98b85ce42a4a69ed6f118fb978c660caee02 100644
--- a/lib/l10n/de_DE.php
+++ b/lib/l10n/de_DE.php
@@ -18,7 +18,6 @@
 "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",
@@ -35,10 +34,10 @@
 "Drop this user from MySQL." => "LÃ¶sche diesen Benutzer aus MySQL.",
 "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 +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/el.php b/lib/l10n/el.php
index c17a33dfee1439060ebab42ee5e05cf2641499f1..14b63a8184c42edc0a21aa990f105dfe42a22190 100644
--- a/lib/l10n/el.php
+++ b/lib/l10n/el.php
@@ -18,19 +18,22 @@
 "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\"",
 "MySQL user '%s'@'localhost' exists already." => "Î¥Ï€Î¬ÏÏ‡ÎµÎ¹ Î®Î´Î· Î¿ Ï‡ÏÎ®ÏƒÏ„Î·Ï‚ '%s'@'localhost' Ï„Î·Ï‚ MySQL.",
 "Drop this user from MySQL" => "Î‘Ï€ÏŒÏÏÎ¹ÏˆÎ· Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… Ï‡ÏÎ®ÏƒÏ„Î· Î±Ï€ÏŒ Ï„Î·Î½ MySQL",
 "MySQL user '%s'@'%%' already exists" => "ÎŸ Ï‡ÏÎ®ÏƒÏ„Î·Ï‚ '%s'@'%%' Ï„Î·Ï‚ MySQL Ï…Ï€Î¬ÏÏ‡ÎµÎ¹ Î®Î´Î·",
 "Drop this user from MySQL." => "Î‘Ï€ÏŒÏÏÎ¹ÏˆÎ· Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… Ï‡ÏÎ®ÏƒÏ„Î· Î±Ï€ÏŒ Ï„Î·Î½ MySQL",
+"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" => "Î´ÎµÏ…Ï„ÎµÏÏŒÎ»ÎµÏ€Ï„Î± Ï€ÏÎ¹Î½",
@@ -39,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..af96e693d1c39888795594138f2395d68dc3d37f 100644
--- a/lib/l10n/es.php
+++ b/lib/l10n/es.php
@@ -18,7 +18,6 @@
 "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",
@@ -45,12 +44,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..e9da37e0a3d272413cca12ab56b7d5c851b1d2e1 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,14 +11,13 @@
 "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",
@@ -37,7 +36,7 @@
 "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 cdcf762d9a66dd2bdc8421cac438fb487e129f82..a4423343ce0bace66d5ca904e07b22237a1c0ff3 100644
--- a/lib/l10n/et_EE.php
+++ b/lib/l10n/et_EE.php
@@ -9,6 +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 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.",
@@ -17,10 +18,24 @@
 "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 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",
+"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\"",
+"MySQL user '%s'@'localhost' exists already." => "MySQL kasutaja '%s'@'localhost' on juba olemas.",
 "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.",
+"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.",
+"Please double check the <a href='%s'>installation guides</a>." => "Palun tutvu veelkord <a href='%s'>paigalduse juhenditega</a>.",
 "seconds ago" => "sekundit tagasi",
 "1 minute ago" => "1 minut tagasi",
 "%d minutes ago" => "%d minutit tagasi",
@@ -29,11 +44,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..934a4d19ab5d3dcac077f89a55b97704261aea65 100644
--- a/lib/l10n/eu.php
+++ b/lib/l10n/eu.php
@@ -11,14 +11,13 @@
 "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.",
@@ -37,7 +36,7 @@
 "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 bbb04290a5cf8176fec6969c35a46399d9e39fb0..b0d423421df2ae20e890481f99e199a2ab80abf6 100644
--- a/lib/l10n/fa.php
+++ b/lib/l10n/fa.php
@@ -14,6 +14,8 @@
 "Files" => "Ù¾Ø±ÙˆÙ†Ø¯Ù‡â€ŒÙ‡Ø§",
 "Text" => "Ù…ØªÙ†",
 "Images" => "ØªØµØ§ÙˆÛŒØ±",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Ø§ØØªÙ…Ø§Ù„Ø§Ù‹ ÙˆØ¨ Ø³Ø±ÙˆØ± Ø´Ù…Ø§ Ø·ÙˆØ±ÛŒ ØªÙ†Ø¸ÛŒÙ… Ù†Ø´Ø¯Ù‡ Ø§Ø³Øª Ú©Ù‡ Ø§Ø¬Ø§Ø²Ù‡ ÛŒ Ù‡Ù…Ú¯Ø§Ù… Ø³Ø§Ø²ÛŒ ÙØ§ÛŒÙ„Ù‡Ø§ Ø±Ø§ Ø¨Ø¯Ù‡Ø¯ Ø²ÛŒØ±Ø§ Ø¨Ù‡ Ù†Ø¸Ø± Ù…ÛŒØ±Ø³Ø¯ Ø±Ø§Ø¨Ø· WebDAV Ø§Ø² Ú©Ø§Ø± Ø§ÙØªØ§Ø¯Ù‡ Ø§Ø³Øª.",
+"Please double check the <a href='%s'>installation guides</a>." => "Ù„Ø·ÙØ§Ù‹ Ø¯ÙˆØ¨Ø§Ø±Ù‡ <a href='%s'>Ø±Ø§Ù‡Ù†Ù…Ø§ÛŒ Ù†ØµØ¨</a>Ø±Ø§ Ø¨Ø±Ø±Ø³ÛŒ Ú©Ù†ÛŒØ¯.",
 "seconds ago" => "Ø«Ø§Ù†ÛŒÙ‡â€ŒÙ‡Ø§ Ù¾ÛŒØ´",
 "1 minute ago" => "1 Ø¯Ù‚ÛŒÙ‚Ù‡ Ù¾ÛŒØ´",
 "%d minutes ago" => "%d Ø¯Ù‚ÛŒÙ‚Ù‡ Ù¾ÛŒØ´",
diff --git a/lib/l10n/fi.php b/lib/l10n/fi.php
new file mode 100644
index 0000000000000000000000000000000000000000..daaddb25e48f83ccb62f74982992765348296cae
--- /dev/null
+++ b/lib/l10n/fi.php
@@ -0,0 +1,3 @@
+<?php $TRANSLATIONS = array(
+"Settings" => "asetukset"
+);
diff --git a/lib/l10n/fi_FI.php b/lib/l10n/fi_FI.php
index 89a584d389d137d4b96ba18992d28e0780661054..c2e83f6616663db033ffb69d38a408b01209776a 100644
--- a/lib/l10n/fi_FI.php
+++ b/lib/l10n/fi_FI.php
@@ -11,14 +11,13 @@
 "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Ã¤",
@@ -27,7 +26,9 @@
 "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Ã¤.",
 "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",
@@ -42,8 +43,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..c0920179dbb29e5ef137b319a24479f75a4b8ba7 100644
--- a/lib/l10n/fr.php
+++ b/lib/l10n/fr.php
@@ -18,7 +18,6 @@
 "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",
@@ -37,8 +36,8 @@
 "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 +48,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..783826508c9f378bff954612e444954bff9cf004 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,14 +11,13 @@
 "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",
@@ -49,8 +48,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 62305c15711d1778221faafcb16bec3aa74648c6..3ce75c99f0e016c3a7a2b7e09e35bfde93994bdb 100644
--- a/lib/l10n/hr.php
+++ b/lib/l10n/hr.php
@@ -3,6 +3,8 @@
 "Personal" => "Osobno",
 "Settings" => "Postavke",
 "Users" => "Korisnici",
+"Apps" => "Aplikacije",
+"Admin" => "Administrator",
 "Authentication error" => "GreÅ¡ka kod autorizacije",
 "Files" => "Datoteke",
 "Text" => "Tekst",
diff --git a/lib/l10n/hu_HU.php b/lib/l10n/hu_HU.php
index 537066c6feacab09a5954d33e68ce39f73f0f0ab..841020183b0f5c75d8d81f4c36b8a9624ebcae44 100644
--- a/lib/l10n/hu_HU.php
+++ b/lib/l10n/hu_HU.php
@@ -11,14 +11,13 @@
 "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",
@@ -37,7 +36,7 @@
 "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 +47,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 05b2c88e1ed82342cd2cb3f72c92fe9b4df1219b..573281553fcc031065264c1999a3213a713597e2 100644
--- a/lib/l10n/ia.php
+++ b/lib/l10n/ia.php
@@ -3,6 +3,8 @@
 "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 8f0e38123b6a38cc4f286add5caf56a51a10d4af..54b46cd8961d8a028ba532466008ecaec76c283f 100644
--- a/lib/l10n/id.php
+++ b/lib/l10n/id.php
@@ -1,34 +1,52 @@
 <?php $TRANSLATIONS = array(
-"Help" => "bantu",
-"Personal" => "perseorangan",
-"Settings" => "pengaturan",
-"Users" => "pengguna",
-"Apps" => "aplikasi",
-"Admin" => "admin",
-"ZIP download is turned off." => "download ZIP sedang dimatikan",
-"Files need to be downloaded one by one." => "file harus di unduh satu persatu",
-"Back to Files" => "kembali ke daftar file",
-"Selected files too large to generate zip file." => "file yang dipilih terlalu besar untuk membuat file zip",
-"Application is not enabled" => "aplikasi tidak diaktifkan",
-"Authentication error" => "autentikasi bermasalah",
-"Token expired. Please reload page." => "token kadaluarsa.mohon perbaharui laman.",
+"Help" => "Bantuan",
+"Personal" => "Pribadi",
+"Settings" => "Setelan",
+"Users" => "Pengguna",
+"Apps" => "Aplikasi",
+"Admin" => "Admin",
+"ZIP download is turned off." => "Pengunduhan ZIP dimatikan.",
+"Files need to be downloaded one by one." => "Berkas harus diunduh satu persatu.",
+"Back to Files" => "Kembali ke Daftar Berkas",
+"Selected files too large to generate zip file." => "Berkas yang dipilih terlalu besar untuk dibuat berkas zip-nya.",
+"couldn't be determined" => "tidak dapat ditentukan",
+"Application is not enabled" => "Aplikasi tidak diaktifkan",
+"Authentication error" => "Galat saat autentikasi",
+"Token expired. Please reload page." => "Token kedaluwarsa. Silakan muat ulang halaman.",
 "Files" => "Berkas",
-"Text" => "teks",
+"Text" => "Teks",
 "Images" => "Gambar",
+"Set an admin username." => "Setel nama pengguna admin.",
+"Set an admin password." => "Setel sandi admin.",
+"%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\"",
+"MySQL user '%s'@'localhost' exists already." => "Pengguna MySQL '%s'@'localhost' sudah ada.",
+"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.",
+"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.",
+"Please double check the <a href='%s'>installation guides</a>." => "Silakan periksa ulang <a href='%s'>panduan instalasi</a>.",
 "seconds ago" => "beberapa detik yang lalu",
-"1 minute ago" => "1 menit lalu",
-"%d minutes ago" => "%d menit lalu",
+"1 minute ago" => "1 menit yang lalu",
+"%d minutes ago" => "%d menit yang lalu",
 "1 hour ago" => "1 jam yang lalu",
 "%d hours ago" => "%d jam yang lalu",
 "today" => "hari ini",
 "yesterday" => "kemarin",
-"%d days ago" => "%d hari lalu",
+"%d days ago" => "%d hari yang lalu",
 "last month" => "bulan kemarin",
 "%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" => "pengecekan pembaharuan sedang non-aktifkan",
 "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..1db48dbc80d27db17936d2876fea8d9f76f7fc47 100644
--- a/lib/l10n/it.php
+++ b/lib/l10n/it.php
@@ -18,7 +18,6 @@
 "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",
@@ -38,19 +37,16 @@
 "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..3b97ffc431f7eec451fd0ee53dcf91d525c96dab 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,7 +18,6 @@
 "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 ã§ã¯ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹åã«ãƒ‰ãƒƒãƒˆã‚’åˆ©ç”¨ã§ããªã„ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“ã€‚",
@@ -37,20 +36,17 @@
 "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 ff623827216ecea2d328fe3917a0d1908ae23bf7..a55323832ecec6380a98a82bd1f75f1ed26ce1dd 100644
--- a/lib/l10n/ka_GE.php
+++ b/lib/l10n/ka_GE.php
@@ -5,16 +5,48 @@
 "Users" => "áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒ”áƒšáƒ˜",
 "Apps" => "áƒáƒžáƒšáƒ˜áƒ™áƒáƒªáƒ˜áƒ”áƒ‘áƒ˜",
 "Admin" => "áƒáƒ“áƒ›áƒ˜áƒœáƒ˜áƒ¡áƒ¢áƒ áƒáƒ¢áƒáƒ áƒ˜",
+"ZIP download is turned off." => "ZIP downloadâ€“áƒ˜ áƒ’áƒáƒ—áƒ˜áƒ¨áƒ£áƒšáƒ˜áƒ",
+"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." => "Tokenâ€“áƒ¡ áƒ•áƒáƒ“áƒ áƒ’áƒáƒ£áƒ•áƒ˜áƒ“áƒ. áƒ’áƒ—áƒ®áƒáƒ•áƒ— áƒ’áƒáƒœáƒáƒáƒ®áƒšáƒáƒ— áƒ’áƒ•áƒ”áƒ áƒ“áƒ˜.",
 "Files" => "áƒ¤áƒáƒ˜áƒšáƒ”áƒ‘áƒ˜",
 "Text" => "áƒ¢áƒ”áƒ¥áƒ¡áƒ¢áƒ˜",
+"Images" => "áƒ¡áƒ£áƒ áƒáƒ—áƒ”áƒ‘áƒ˜",
+"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 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\"",
+"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â€“áƒ˜áƒ“áƒáƒœ",
+"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 áƒ˜áƒœáƒ¢áƒ”áƒ áƒ¤áƒ”áƒ˜áƒ¡áƒ˜ áƒ¨áƒ”áƒ˜áƒ«áƒšáƒ”áƒ‘áƒ áƒ˜áƒ§áƒáƒ¡ áƒ’áƒáƒ¢áƒ”áƒ®áƒ˜áƒšáƒ˜.",
+"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" => "áƒ¬áƒšáƒ˜áƒ¡ áƒ¬áƒ˜áƒœ",
-"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 f89871f23c922104fc68624696c81c00e620d9c2..20d0249f5691341033c76a6627e7bcaff0a53a53 100644
--- a/lib/l10n/ku_IQ.php
+++ b/lib/l10n/ku_IQ.php
@@ -1,5 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Help" => "ÛŒØ§Ø±Ù…Û•ØªÛŒ",
 "Settings" => "Ø¯Ù‡â€ŒØ³ØªÙƒØ§Ø±ÛŒ",
-"Users" => "Ø¨Ù‡â€ŒÙƒØ§Ø±Ù‡ÛŽÙ†Ù‡â€ŒØ±"
+"Users" => "Ø¨Ù‡â€ŒÙƒØ§Ø±Ù‡ÛŽÙ†Ù‡â€ŒØ±",
+"Apps" => "Ø¨Ù‡â€ŒØ±Ù†Ø§Ù…Ù‡â€ŒÙƒØ§Ù†",
+"Admin" => "Ø¨Ù‡â€ŒÚ•ÛŽÙˆÙ‡â€ŒØ¨Ù‡â€ŒØ±ÛŒ Ø³Ù‡â€ŒØ±Ù‡â€ŒÙƒÛŒ"
 );
diff --git a/lib/l10n/lb.php b/lib/l10n/lb.php
index 06e8b2ca094d9a8391073c08e322e135f702b014..889fc3a377df48bd328e85f9c7022810315cdb78 100644
--- a/lib/l10n/lb.php
+++ b/lib/l10n/lb.php
@@ -2,6 +2,9 @@
 "Help" => "HÃ«llef",
 "Personal" => "PersÃ©inlech",
 "Settings" => "Astellungen",
+"Users" => "Benotzer",
+"Apps" => "Applicatiounen",
+"Admin" => "Admin",
 "Authentication error" => "Authentifikatioun's Fehler",
 "Files" => "Dateien",
 "Text" => "SMS",
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..28b96c56e105a2066f30a63258e8b409d324334a 100644
--- a/lib/l10n/lv.php
+++ b/lib/l10n/lv.php
@@ -18,7 +18,6 @@
 "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",
@@ -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 5afee1cb5a820ace492038c706e8ea4b7d01ee3e..6abbbe86e804794e2f77475790e3a4f8b72e9194 100644
--- a/lib/l10n/ms_MY.php
+++ b/lib/l10n/ms_MY.php
@@ -3,6 +3,8 @@
 "Personal" => "Peribadi",
 "Settings" => "Tetapan",
 "Users" => "Pengguna",
+"Apps" => "Aplikasi",
+"Admin" => "Admin",
 "Authentication error" => "Ralat pengesahan",
 "Files" => "Fail-fail",
 "Text" => "Teks"
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 e26a663e9ccf523b3e68da055b93900e29f6363f..0c3871426190e4b99d295229ad3b92c87555f785 100644
--- a/lib/l10n/nl.php
+++ b/lib/l10n/nl.php
@@ -18,7 +18,6 @@
 "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",
@@ -36,7 +35,7 @@
 "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.",
-"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.",
 "seconds ago" => "seconden geleden",
 "1 minute ago" => "1 minuut geleden",
 "%d minutes ago" => "%d minuten geleden",
@@ -49,8 +48,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 faf7440320a824a8baa11de80f21c02c180b06c5..8241573f9aeda9afeff0e54a914fa712045fdb70 100644
--- a/lib/l10n/nn_NO.php
+++ b/lib/l10n/nn_NO.php
@@ -3,7 +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..4ac1c14439fde70664af0ff3096d732b589f82e7 100644
--- a/lib/l10n/pl.php
+++ b/lib/l10n/pl.php
@@ -18,7 +18,6 @@
 "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",
@@ -35,22 +34,19 @@
 "Drop this user from MySQL." => "UsuÅ„ tego uÅ¼ytkownika z MySQL.",
 "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..4c50f8de9e677f83331fab0710c27a20fa984783 100644
--- a/lib/l10n/pt_BR.php
+++ b/lib/l10n/pt_BR.php
@@ -18,7 +18,6 @@
 "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",
@@ -49,8 +48,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..b3befe96e03ef572b27222ed21dbeced03d6dce9 100644
--- a/lib/l10n/pt_PT.php
+++ b/lib/l10n/pt_PT.php
@@ -18,7 +18,6 @@
 "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",
@@ -37,20 +36,17 @@
 "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..e716f6d1c1149b74670a37c8679bfc736e0b47c2 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,7 +18,6 @@
 "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 Ð’Ñ‹ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ Ñ‚Ð¾Ñ‡ÐºÐ¸ Ð² Ð¸Ð¼ÐµÐ½Ð¸ Ð±Ð°Ð·Ñ‹ Ð´Ð°Ð½Ð½Ñ‹Ñ…",
@@ -37,7 +36,7 @@
 "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..8fb568aee7e274e415926675ddc7b4acdde660b0 100644
--- a/lib/l10n/ru_RU.php
+++ b/lib/l10n/ru_RU.php
@@ -1,37 +1,3 @@
 <?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\""
+"Settings" => "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸"
 );
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..e074ed78c3c2272c34fd25da37b556c0b36063b6 100644
--- a/lib/l10n/sk_SK.php
+++ b/lib/l10n/sk_SK.php
@@ -18,7 +18,6 @@
 "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",
@@ -38,7 +37,7 @@
 "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 +48,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 391d932c4ee0c916866da3fc6afab4a1580eb036..0c42f44d2aa6960ccffad4fbb494e4a55d03e3c7 100644
--- a/lib/l10n/sl.php
+++ b/lib/l10n/sl.php
@@ -5,16 +5,37 @@
 "Users" => "Uporabniki",
 "Apps" => "Programi",
 "Admin" => "SkrbniÅ¡tvo",
-"ZIP download is turned off." => "Prejem datotek ZIP je onemogoÄen.",
-"Files need to be downloaded one by one." => "Datoteke je mogoÄe prejeti le posamiÄ.",
+"ZIP download is turned off." => "Prejemanje datotek v paketu ZIP je onemogoÄeno.",
+"Files need to be downloaded one by one." => "Datoteke je mogoÄe prejeti le posamiÄno.",
 "Back to Files" => "Nazaj na datoteke",
 "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",
-"Token expired. Please reload page." => "Å½eton je potekel. SpletiÅ¡Äe je traba znova naloÅ¾iti.",
+"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.",
+"%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\"",
+"MySQL user '%s'@'localhost' exists already." => "Uporabnik MySQL '%s'@'localhost' Å¾e obstaja.",
+"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",
+"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.",
+"Please double check the <a href='%s'>installation guides</a>." => "Preverite <a href='%s'>navodila namestitve</a>.",
 "seconds ago" => "pred nekaj sekundami",
 "1 minute ago" => "pred minuto",
 "%d minutes ago" => "pred %d minutami",
@@ -23,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" => "lani",
-"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",
-"Could not find category \"%s\"" => "Kategorije \"%s\" ni bilo mogoÄe najti."
+"last year" => "lansko leto",
+"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
new file mode 100644
index 0000000000000000000000000000000000000000..60d83ca48c3861c69b878fa3ec6dc20f56c6ee66
--- /dev/null
+++ b/lib/l10n/sq.php
@@ -0,0 +1,52 @@
+<?php $TRANSLATIONS = array(
+"Help" => "NdihmÃ«",
+"Personal" => "Personale",
+"Settings" => "Parametra",
+"Users" => "PÃ«rdoruesit",
+"Apps" => "App",
+"Admin" => "Admin",
+"ZIP download is turned off." => "Shkarimi i skedarÃ«ve ZIP Ã«shtÃ« i Ã§aktivizuar.",
+"Files need to be downloaded one by one." => "SkedarÃ«t duhet tÃ« shkarkohen njÃ« nga njÃ«.",
+"Back to Files" => "Kthehu tek skedarÃ«t",
+"Selected files too large to generate zip file." => "SkedarÃ«t e selektuar janÃ« shumÃ« tÃ« mÃ«dhenj pÃ«r tÃ« krijuar njÃ« skedar ZIP.",
+"couldn't be determined" => "nuk u vendos dot",
+"Application is not enabled" => "Programi nuk Ã«shtÃ« i aktivizuar.",
+"Authentication error" => "Veprim i gabuar gjatÃ« vÃ«rtetimit tÃ« identitetit",
+"Token expired. Please reload page." => "PÃ«rmbajtja ka skaduar. Ju lutemi ringarkoni faqen.",
+"Files" => "SkedarÃ«t",
+"Text" => "Tekst",
+"Images" => "Foto",
+"Set an admin username." => "Cakto emrin e administratorit.",
+"Set an admin password." => "Cakto kodin e administratorit.",
+"%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\"",
+"MySQL user '%s'@'localhost' exists already." => "PÃ«rdoruesi MySQL '%s'@'localhost' ekziston.",
+"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.",
+"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.",
+"Please double check the <a href='%s'>installation guides</a>." => "Ju lutemi kontrolloni mirÃ« <a href='%s'>shoqÃ«ruesin e instalimit</a>.",
+"seconds ago" => "sekonda mÃ« parÃ«",
+"1 minute ago" => "1 minutÃ« mÃ« parÃ«",
+"%d minutes ago" => "%d minuta mÃ« parÃ«",
+"1 hour ago" => "1 orÃ« mÃ« parÃ«",
+"%d hours ago" => "%d orÃ« mÃ« parÃ«",
+"today" => "sot",
+"yesterday" => "dje",
+"%d days ago" => "%d ditÃ« mÃ« parÃ«",
+"last month" => "muajin e shkuar",
+"%d months ago" => "%d muaj mÃ« parÃ«",
+"last year" => "vitin e shkuar",
+"years ago" => "vite mÃ« parÃ«",
+"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 3fc1f61eafa07903031456ad2d6c2fd1a131a63d..13cedc832791bab4f8bdb66b4f47fe16fe227a52 100644
--- a/lib/l10n/sr@latin.php
+++ b/lib/l10n/sr@latin.php
@@ -3,6 +3,8 @@
 "Personal" => "LiÄno",
 "Settings" => "PodeÅ¡avanja",
 "Users" => "Korisnici",
+"Apps" => "Programi",
+"Admin" => "Adninistracija",
 "Authentication error" => "GreÅ¡ka pri autentifikaciji",
 "Files" => "Fajlovi",
 "Text" => "Tekst"
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/te.php b/lib/l10n/te.php
new file mode 100644
index 0000000000000000000000000000000000000000..87c73d790e2c4dbe164e7e706ba9bc1b960daf1a
--- /dev/null
+++ b/lib/l10n/te.php
@@ -0,0 +1,13 @@
+<?php $TRANSLATIONS = array(
+"Help" => "à°¸à°¹à°¾à°¯à°‚",
+"Settings" => "à°…à°®à°°à°¿à°•à°²à±",
+"Users" => "à°µà°¾à°¡à±à°•à°°à±à°²à±",
+"seconds ago" => "à°•à±à°·à°£à°¾à°² à°•à±à°°à°¿à°¤à°‚",
+"1 minute ago" => "1 à°¨à°¿à°®à°¿à°·à°‚ à°•à±à°°à°¿à°¤à°‚",
+"1 hour ago" => "1 à°—à°‚à°Ÿ à°•à±à°°à°¿à°¤à°‚",
+"today" => "à°ˆà°°à±‹à°œà±",
+"yesterday" => "à°¨à°¿à°¨à±à°¨",
+"last month" => "à°ªà±‹à°¯à°¿à°¨ à°¨à±†à°²",
+"last year" => "à°ªà±‹à°¯à°¿à°¨ à°¸à°‚à°µà°¤à±à°¸à°°à°‚",
+"years ago" => "à°¸à°‚à°µà°¤à±à°¸à°°à°¾à°² à°•à±à°°à°¿à°¤à°‚"
+);
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 e55caa15972312d9e295361a04a01262b5f62203..641da2447ee6340367f9de12056c5ebc33355e3a 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,26 @@
 "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. ",
+"Oracle username and/or password not valid" => "Adi klullanici ve/veya parola Oracle mantikli deÄŸildir. ",
+"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",
+"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",
 "1 minute ago" => "1 dakika Ã¶nce",
 "%d minutes ago" => "%d dakika Ã¶nce",
@@ -28,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..a544890124756a1080718de168baf7b6451c5f8b 100644
--- a/lib/l10n/uk.php
+++ b/lib/l10n/uk.php
@@ -18,7 +18,6 @@
 "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 Ð½Ðµ Ð¼Ð¾Ð¶Ð½Ð° Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð¾Ð²ÑƒÐ²Ð°Ñ‚Ð¸ ÐºÑ€Ð°Ð¿ÐºÐ¸ Ð² Ð½Ð°Ð·Ð²Ñ– Ð±Ð°Ð·Ð¸ Ð´Ð°Ð½Ð¸Ñ…",
@@ -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 08975e44598b5e2a8884aa7e2dcd9fb3879b60a9..3ab35f2bafa2088a8bc215f1dd6df2993d709459 100644
--- a/lib/l10n/zh_CN.GB2312.php
+++ b/lib/l10n/zh_CN.GB2312.php
@@ -15,16 +15,16 @@
 "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å°æ—¶å‰",
 "today" => "ä»Šå¤©",
 "yesterday" => "æ˜¨å¤©",
 "%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 c3af288b7270559c5fe4ff2b752b15a28be6f03f..cab5142e5d5ea2de10a77a3aa89d1fb5fe3f61af 100644
--- a/lib/l10n/zh_CN.php
+++ b/lib/l10n/zh_CN.php
@@ -9,14 +9,35 @@
 "Files need to be downloaded one by one." => "éœ€è¦é€ä¸€ä¸‹è½½æ–‡ä»¶",
 "Back to Files" => "å›žåˆ°æ–‡ä»¶",
 "Selected files too large to generate zip file." => "é€‰æ‹©çš„æ–‡ä»¶å¤ªå¤§ï¼Œæ— æ³•ç”Ÿæˆ zip æ–‡ä»¶ã€‚",
-"Application is not enabled" => "ä¸éœ€è¦ç¨‹åº",
-"Authentication error" => "è®¤è¯é”™è¯¯",
+"couldn't be determined" => "æ— æ³•ç¡®å®š",
+"Application is not enabled" => "åº”ç”¨ç¨‹åºæœªå¯ç”¨",
+"Authentication error" => "è®¤è¯å‡ºé”™",
 "Token expired. Please reload page." => "Token è¿‡æœŸï¼Œè¯·åˆ·æ–°é¡µé¢ã€‚",
 "Files" => "æ–‡ä»¶",
 "Text" => "æ–‡æœ¬",
-"Images" => "å›¾åƒ",
-"seconds ago" => "å‡ ç§’å‰",
-"1 minute ago" => "1åˆ†é’Ÿå‰",
+"Images" => "å›¾ç‰‡",
+"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 username and/or password not valid" => "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 æ•°æ®åº“ä¸ä¸¢å¼ƒ Drop æ¤ç”¨æˆ·",
+"MySQL user '%s'@'%%' already exists" => "MySQL ç”¨æˆ· '%s'@'%%' å·²å˜åœ¨",
+"Drop this user from MySQL." => "å»ºè®®ä»Ž MySQL æ•°æ®åº“ä¸ä¸¢å¼ƒ Drop æ¤ç”¨æˆ·ã€‚",
+"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" => "ä¸€åˆ†é’Ÿå‰",
 "%d minutes ago" => "%d åˆ†é’Ÿå‰",
 "1 hour ago" => "1å°æ—¶å‰",
 "%d hours ago" => "%då°æ—¶å‰",
@@ -25,10 +46,7 @@
 "%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\">èŽ·å–æ›´å¤šä¿¡æ¯</a>",
-"up to date" => "å·²æ›´æ–°ã€‚",
-"updates check is disabled" => "æ£€æŸ¥æ›´æ–°åŠŸèƒ½è¢«å…³é—ã€‚",
+"last year" => "åŽ»å¹´",
+"years ago" => "å¹´å‰",
 "Could not find category \"%s\"" => "æ— æ³•æ‰¾åˆ°åˆ†ç±» \"%s\""
 );
diff --git a/lib/l10n/zh_HK.php b/lib/l10n/zh_HK.php
new file mode 100644
index 0000000000000000000000000000000000000000..cfa33ec36f5e5b30ee168e173a6c629be10a6360
--- /dev/null
+++ b/lib/l10n/zh_HK.php
@@ -0,0 +1,13 @@
+<?php $TRANSLATIONS = array(
+"Help" => "å¹«åŠ©",
+"Personal" => "å€‹äºº",
+"Settings" => "è¨å®š",
+"Users" => "ç”¨æˆ¶",
+"Apps" => "è»Ÿä»¶",
+"Admin" => "ç®¡ç†",
+"Files" => "æ–‡ä»¶",
+"Text" => "æ–‡å—",
+"today" => "ä»Šæ—¥",
+"yesterday" => "æ˜¨æ—¥",
+"last month" => "å‰ä¸€æœˆ"
+);
diff --git a/lib/l10n/zh_TW.php b/lib/l10n/zh_TW.php
index 91b0329e246be3ae94a149187bbbe8ba216f4f37..5affb1ccf352877fc6fc0e7bf0a8c33b8fd16cee 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,6 +16,24 @@
 "Files" => "æª”æ¡ˆ",
 "Text" => "æ–‡å—",
 "Images" => "åœ–ç‰‡",
+"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 username and/or password not valid" => "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 ç§»é™¤é€™å€‹ä½¿ç”¨è€…ã€‚",
+"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" => "å¹¾ç§’å‰",
@@ -30,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/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/migrate.php b/lib/migrate.php
index a0a329705a396a323973818d2c3bbba8e5465d95..0b319177400943bdc0b3808ac4e08fa7e7fc8036 100644
--- a/lib/migrate.php
+++ b/lib/migrate.php
@@ -246,11 +246,20 @@ class OC_Migrate{
 					OC_Log::write( 'migration', 'User doesn\'t exist', OC_Log::ERROR );
 					return json_encode( array( 'success' => false ) );
 				}
+
+				// Check if the username is valid
+				if( preg_match( '/[^a-zA-Z0-9 _\.@\-]/', $json->exporteduser )) {
+					OC_Log::write( 'migration', 'Username is not valid', OC_Log::ERROR );
+					return json_encode( array( 'success' => false ) );
+				}
+
 				// Copy data
 				$userfolder = $extractpath . $json->exporteduser;
 				$newuserfolder = $datadir . '/' . self::$uid;
 				foreach(scandir($userfolder) as $file){
 					if($file !== '.' && $file !== '..' && is_dir($file)) {
+						$file = str_replace(array('/', '\\'), '',  $file);
+
 						// Then copy the folder over
 						OC_Helper::copyr($userfolder.'/'.$file, $newuserfolder.'/'.$file);
 					}
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/cloud.php b/lib/ocs/cloud.php
index 5553ae382151d50b936a4b8ab32ca58323b21a2b..132d923d960ef42b5e3d52e6f77a0e05e7e19b26 100644
--- a/lib/ocs/cloud.php
+++ b/lib/ocs/cloud.php
@@ -24,49 +24,23 @@
 
 class OC_OCS_Cloud {
 
-	public static function getSystemWebApps() {
-		OC_Util::checkLoggedIn();
-		$apps = OC_App::getEnabledApps();
-		$values = array();
-		foreach($apps as $app) {
-			$info = OC_App::getAppInfo($app);
-			if(isset($info['standalone'])) {
-				$newValue = array('name'=>$info['name'], 'url'=>OC_Helper::linkToAbsolute($app, ''), 'icon'=>'');
-				$values[] = $newValue;
-			}
-		}
-		return new OC_OCS_Result($values);
-	}
-
-	public static function getUserQuota($parameters) {
-		$user = OC_User::getUser();
-		if(OC_User::isAdminUser($user) or ($user==$parameters['user'])) {
-
-			if(OC_User::userExists($parameters['user'])) {
-				// calculate the disc space
-				$userDir = '/'.$parameters['user'].'/files';
-				\OC\Files\Filesystem::init($parameters['user'], $userDir);
-				$rootInfo = \OC\Files\Filesystem::getFileInfo('');
-				$sharedInfo = \OC\Files\Filesystem::getFileInfo('/Shared');
-				$used = $rootInfo['size'] - $sharedInfo['size'];
-				$free = \OC\Files\Filesystem::free_space();
-				$total = $free + $used;
-				if($total===0) $total = 1;  // prevent division by zero
-				$relative = round(($used/$total)*10000)/100;
-
-				$xml = array();
-				$xml['quota'] = $total;
-				$xml['free'] = $free;
-				$xml['used'] = $used;
-				$xml['relative'] = $relative;
-
-				return new OC_OCS_Result($xml);
-			} else {
-				return new OC_OCS_Result(null, 300);
-			}
-		} else {
-			return new OC_OCS_Result(null, 300);
-		}
+	public static function getCapabilities($parameters) {
+		$result = array();
+		list($major, $minor, $micro) = OC_Util::getVersion();
+		$result['version'] = array(
+			'major' => $major,
+			'minor' => $minor,
+			'micro' => $micro,
+			'string' => OC_Util::getVersionString(),
+			'edition' => OC_Util::getEditionString(),
+			);
+			
+			$result['capabilities'] = array(
+				'core' => array(
+					'pollinterval' => OC_Config::getValue('pollinterval', 60),
+					),
+				);
+		return new OC_OCS_Result($result);
 	}
 
 	public static function getUserPublickey($parameters) {
diff --git a/lib/ocs/result.php b/lib/ocs/result.php
index 65b2067fc3f2ecfa6f5cb5d92b94706c9ff0dae5..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
@@ -49,26 +49,48 @@ class OC_OCS_Result{
 	public function setItemsPerPage(int $items) {
 		$this->perPage = $items;
 	}
-
+	
+	/**
+	 * get the status code
+	 * @return int
+	 */
+	public function getStatusCode() {
+		return $this->statusCode;
+	}
+	
 	/**
-	 * returns the data associated with the api result
+	 * get the meta data for the result
 	 * @return array
 	 */
-	public function getResult() {
-		$return = array();
-		$return['meta'] = array();
-		$return['meta']['status'] = ($this->statusCode === 100) ? 'ok' : 'failure';
-		$return['meta']['statuscode'] = $this->statusCode;
-		$return['meta']['message'] = $this->message;
+	public function getMeta() {
+		$meta = array();
+		$meta['status'] = ($this->statusCode === 100) ? 'ok' : 'failure';
+		$meta['statuscode'] = $this->statusCode;
+		$meta['message'] = $this->message;
 		if(isset($this->items)) {
-			$return['meta']['totalitems'] = $this->items;
+			$meta['totalitems'] = $this->items;
 		}
 		if(isset($this->perPage)) {
-			$return['meta']['itemsperpage'] = $this->perPage;
+			$meta['itemsperpage'] = $this->perPage;
 		}
-		$return['data'] = $this->data;
-		// Return the result data.
-		return $return;
+		return $meta;
+
+	}
+	
+	/**
+	 * get the result data
+	 * @return array|string|int 
+	 */
+	public function getData() {
+		return $this->data;
+	}
+	
+	/**
+	 * return bool if the method succedded
+	 * @return bool
+	 */
+	public function succeeded() {
+		return (substr($this->statusCode, 0, 1) === '1');
 	}
 
 
diff --git a/lib/public/files.php b/lib/public/files.php
index 700bf574537fb6046743b8680c9152a07f8b9c3c..4975bbb7dfa03456b252ece8d0c89017113f6452 100644
--- a/lib/public/files.php
+++ b/lib/public/files.php
@@ -55,6 +55,16 @@ class Files {
 		return(\OC_Helper::getMimeType( $path ));
 	}
 
+	/**
+	 * search for files by mimetype
+	 *
+	 * @param string $query
+	 * @return array
+	 */
+	public function searchByMime($mimetype) {
+		return(\OC\Files\Filesystem::searchByMime( $mimetype ));
+	}
+
 	/**
 	 * copy the contents of one stream to another
 	 * @param resource source
diff --git a/lib/public/share.php b/lib/public/share.php
index 59f41a9bfd6f59a0dbfacd9444b263a42c7d9ad0..a561319e9bdaa247b92a244a0f98754df63f7674 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -198,6 +198,29 @@ class Share {
 			$parameters, -1, $includeCollections);
 	}
 
+	/**
+	* Get all users an item is shared with
+	* @param string Item type
+	* @param string Item source
+	* @param string Owner
+	* @param bool Include collections
+	* @return Return array of users
+	*/
+	public static function getUsersItemShared($itemType, $itemSource, $uidOwner, $includeCollections = false) {
+		$users = array();
+		$items = self::getItems($itemType, $itemSource, null, null, $uidOwner, self::FORMAT_NONE, null, -1, $includeCollections);
+		if ($items) {
+			foreach ($items as $item) {
+				if ((int)$item['share_type'] === self::SHARE_TYPE_USER) {
+					$users[] = $item['share_with'];
+				} else if ((int)$item['share_type'] === self::SHARE_TYPE_GROUP) {
+					$users = array_merge($users, \OC_Group::usersInGroup($item['share_with']));
+				}
+			}
+		}
+		return $users;
+	}
+
 	/**
 	* @brief Share an item with a user, group, or via private link
 	* @param string Item type
@@ -383,6 +406,7 @@ class Share {
 			\OC_Hook::emit('OCP\Share', 'pre_unshare', array(
 				'itemType' => $itemType,
 				'itemSource' => $itemSource,
+				'fileSource' => $item['file_source'],
 				'shareType' => $shareType,
 				'shareWith' => $shareWith,
 			));
@@ -637,6 +661,7 @@ class Share {
 			}
 		}
 		$backend = self::getBackend($itemType);
+		$collectionTypes = false;
 		// Get filesystem root to add it to the file target and remove from the
 		// file source, match file_source with the file cache
 		if ($itemType == 'file' || $itemType == 'folder') {
@@ -759,7 +784,7 @@ class Share {
 		if ($format == self::FORMAT_STATUSES) {
 			if ($itemType == 'file' || $itemType == 'folder') {
 				$select = '`*PREFIX*share`.`id`, `item_type`, `*PREFIX*share`.`parent`,'
-					.' `share_type`, `file_source`, `path`, `expiration`';
+					.' `share_type`, `file_source`, `path`, `expiration`, `storage`';
 			} else {
 				$select = '`id`, `item_type`, `item_source`, `parent`, `share_type`, `expiration`';
 			}
@@ -768,7 +793,7 @@ class Share {
 				if ($itemType == 'file' || $itemType == 'folder') {
 					$select = '`*PREFIX*share`.`id`, `item_type`, `*PREFIX*share`.`parent`,'
 						.' `share_type`, `share_with`, `file_source`, `path`, `permissions`, `stime`,'
-						.' `expiration`, `token`';
+						.' `expiration`, `token`, `storage`';
 				} else {
 					$select = '`id`, `item_type`, `item_source`, `parent`, `share_type`, `share_with`, `permissions`,'
 						.' `stime`, `file_source`, `expiration`, `token`';
@@ -804,6 +829,7 @@ class Share {
 		$items = array();
 		$targets = array();
 		$switchedItems = array();
+		$mounts = array();
 		while ($row = $result->fetchRow()) {
 			// Filter out duplicate group shares for users with unique targets
 			if ($row['share_type'] == self::$shareTypeGroupUserUnique && isset($items[$row['parent']])) {
@@ -848,8 +874,16 @@ class Share {
 				if (isset($row['parent'])) {
 					$row['path'] = '/Shared/'.basename($row['path']);
 				} else {
-					// Strip 'files' from path
-					$row['path'] = substr($row['path'], 5);
+					if (!isset($mounts[$row['storage']])) {
+						$mountPoints = \OC\Files\Filesystem::getMountByNumericId($row['storage']);
+						if (is_array($mountPoints)) {
+							$mounts[$row['storage']] = $mountPoints[key($mountPoints)];
+						}
+					}
+					if ($mounts[$row['storage']]) {
+						$path = $mounts[$row['storage']]->getMountPoint().$row['path'];
+						$row['path'] = substr($path, $root);
+					}
 				}
 			}
 			if (isset($row['expiration'])) {
@@ -957,15 +991,14 @@ class Share {
 				return $items;
 			} else if ($format == self::FORMAT_STATUSES) {
 				$statuses = array();
-				// Switch column to path for files and folders, used for determining statuses inside of folders
-				if ($itemType == 'file' || $itemType == 'folder') {
-					$column = 'path';
-				}
 				foreach ($items as $item) {
 					if ($item['share_type'] == self::SHARE_TYPE_LINK) {
-						$statuses[$item[$column]] = true;
+						$statuses[$item[$column]]['link'] = true;
 					} else if (!isset($statuses[$item[$column]])) {
-						$statuses[$item[$column]] = false;
+						$statuses[$item[$column]]['link'] = false;
+					}
+					if ($itemType == 'file' || $itemType == 'folder') {
+						$statuses[$item[$column]]['path'] = $item['path'];
 					}
 				}
 				return $statuses;
@@ -1102,20 +1135,6 @@ class Share {
 				} else {
 					$fileTarget = null;
 				}
-				\OC_Hook::emit('OCP\Share', 'post_shared', array(
-					'itemType' => $itemType,
-					'itemSource' => $itemSource,
-					'itemTarget' => $itemTarget,
-					'parent' => $parent,
-					'shareType' => self::$shareTypeGroupUserUnique,
-					'shareWith' => $uid,
-					'uidOwner' => $uidOwner,
-					'permissions' => $permissions,
-					'fileSource' => $fileSource,
-					'fileTarget' => $fileTarget,
-					'id' => $parent,
-					'token' => $token
-				));
 				// Insert an extra row for the group share if the item or file target is unique for this user
 				if ($itemTarget != $groupItemTarget || (isset($fileSource) && $fileTarget != $groupFileTarget)) {
 					$query->execute(array($itemType, $itemSource, $itemTarget, $parent,
@@ -1124,6 +1143,20 @@ class Share {
 					$id = \OC_DB::insertid('*PREFIX*share');
 				}
 			}
+			\OC_Hook::emit('OCP\Share', 'post_shared', array(
+				'itemType' => $itemType,
+				'itemSource' => $itemSource,
+				'itemTarget' => $groupItemTarget,
+				'parent' => $parent,
+				'shareType' => $shareType,
+				'shareWith' => $shareWith['group'],
+				'uidOwner' => $uidOwner,
+				'permissions' => $permissions,
+				'fileSource' => $fileSource,
+				'fileTarget' => $groupFileTarget,
+				'id' => $parent,
+				'token' => $token
+			));
 			if ($parentFolder === true) {
 				// Return parent folders to preserve file target paths for potential children
 				return $parentFolders;
diff --git a/lib/public/util.php b/lib/public/util.php
index db07cbcfff3911a1e93852cfcaba484c6b455076..6744c2d37bdde2535f20a7646d8a307a2ccd1a17 100644
--- a/lib/public/util.php
+++ b/lib/public/util.php
@@ -217,6 +217,7 @@ class Util {
 	 */
 	public static function getDefaultEmailAddress($user_part) {
 		$host_name = self::getServerHostName();
+		$host_name = \OC_Config::getValue('mail_domain', $host_name);
 		$defaultEmailAddress = $user_part.'@'.$host_name;
 
 		if (\OC_Mail::ValidateAddress($defaultEmailAddress)) {
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/setup.php b/lib/setup.php
index 8814447f52feb4c78edc2804047af44f62990e7a..f1ac6b8b2b81c610d4135427d7cdccbfaec93d45 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
@@ -70,6 +70,10 @@ class OC_Setup {
 			$password = htmlspecialchars_decode($options['adminpass']);
 			$datadir = htmlspecialchars_decode($options['directory']);
 
+			if (OC_Util::runningOnWindows()) {
+				$datadir = rtrim(realpath($datadir), '\\');
+			}
+
 			//use sqlite3 when available, otherise sqlite2 will be used.
 			if($dbtype=='sqlite' and class_exists('SQLite3')) {
 				$dbtype='sqlite3';
@@ -183,6 +187,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');
 			}
 
@@ -191,7 +196,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) {
@@ -239,7 +244,7 @@ class OC_Setup {
 			$dbusername=substr('oc_'.$username, 0, 16);
 			if($dbusername!=$oldUser) {
 				//hash the password so we don't need to store the admin config in the config file
-				$dbpassword=md5(time().$dbpass);
+				$dbpassword=OC_Util::generate_random_bytes(30);
 
 				self::createDBUser($dbusername, $dbpassword, $connection);
 
@@ -329,7 +334,7 @@ class OC_Setup {
 			//add prefix to the postgresql user name to prevent collisions
 			$dbusername='oc_'.$username;
 			//create a new password so we don't need to store the admin config in the config file
-			$dbpassword=md5(time());
+			$dbpassword=OC_Util::generate_random_bytes(30);
 
 			self::pg_createDBUser($dbusername, $dbpassword, $connection);
 
@@ -472,7 +477,7 @@ class OC_Setup {
 			//add prefix to the oracle user name to prevent collisions
 			$dbusername='oc_'.$username;
 			//create a new password so we don't need to store the admin config in the config file
-			$dbpassword=md5(time().$dbpass);
+			$dbpassword=OC_Util::generate_random_bytes(30);
 
 			//oracle passwords are treated as identifiers:
 			//  must start with aphanumeric char
@@ -806,6 +811,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";
@@ -823,6 +829,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..2f53533564880ed73d342f04489a8d43cb89cbeb 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);
@@ -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 29f120a6041a532f09595b51b093c3dc53488b11..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();
@@ -37,51 +51,35 @@ class OC_TemplateLayout extends OC_Template {
 		} else {
 			parent::__construct('core', 'layout.base');
 		}
+		$versionParameter = '?v=' . md5(implode(OC_Util::getVersion()));
 		// Add the js files
 		$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));
+			$this->append( 'jsfiles', OC_Helper::linkToRemoteBase('core.js', false) . $versionParameter);
 		}
 		foreach($jsfiles as $info) {
 			$root = $info[0];
 			$web = $info[1];
 			$file = $info[2];
-			$this->append( 'jsfiles', $web.'/'.$file);
+			$this->append( 'jsfiles', $web.'/'.$file . $versionParameter);
 		}
 
 		// Add the css files
 		$cssfiles = self::findStylesheetFiles(OC_Util::$styles);
 		$this->assign('cssfiles', array());
 		if (!empty(OC_Util::$core_styles)) {
-			$this->append( 'cssfiles', OC_Helper::linkToRemoteBase('core.css', false));
+			$this->append( 'cssfiles', OC_Helper::linkToRemoteBase('core.css', false) . $versionParameter);
 		}
 		foreach($cssfiles as $info) {
 			$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));
-			}
-			else {
-				$this->append( 'cssfiles', $web.'/'.$file);
-			}
+			$this->append( 'cssfiles', $web.'/'.$file . $versionParameter);
 		}
 	}
 
@@ -102,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();
@@ -110,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" )) {
@@ -121,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();
@@ -160,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();
@@ -168,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" )) {
@@ -192,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 6144f0f6bf9851a0ae7daeb3576a77a0b90032c8..b607874afafc2b699effc31d545fca28a2822f98 100644
--- a/lib/user.php
+++ b/lib/user.php
@@ -32,7 +32,7 @@
  *   post_deleteUser(uid)
  *   pre_setPassword(&run, uid, password)
  *   post_setPassword(uid, password)
- *   pre_login(&run, uid)
+ *   pre_login(&run, uid, password)
  *   post_login(uid)
  *   logout()
  */
@@ -244,7 +244,7 @@ class OC_User {
 	 */
 	public static function login( $uid, $password ) {
 		$run = true;
-		OC_Hook::emit( "OC_User", "pre_login", array( "run" => &$run, "uid" => $uid ));
+		OC_Hook::emit( "OC_User", "pre_login", array( "run" => &$run, "uid" => $uid, "password" => $password));
 
 		if( $run ) {
 			$uid = self::checkPassword( $uid, $password );
@@ -386,7 +386,7 @@ class OC_User {
 	 * generates a password
 	 */
 	public static function generatePassword() {
-		return uniqId();
+		return OC_Util::generate_random_bytes(30);
 	}
 
 	/**
@@ -527,7 +527,7 @@ class OC_User {
 		foreach (self::$_usedBackends as $backend) {
 			$backendDisplayNames = $backend->getDisplayNames($search, $limit, $offset);
 			if (is_array($backendDisplayNames)) {
-				$displayNames = array_merge($displayNames, $backendDisplayNames);
+				$displayNames = $displayNames + $backendDisplayNames;
 			}
 		}
 		asort($displayNames);
@@ -633,9 +633,9 @@ class OC_User {
 	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, '', '', $secure_cookie);
-		setcookie("oc_token", $token, $expires, '', '', $secure_cookie, true);
-		setcookie("oc_remember_login", true, $expires, '', '', $secure_cookie);
+		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);
 	}
 
 	/**
diff --git a/lib/user/database.php b/lib/user/database.php
index 210c7f3e1eb28c38b0cd42164ae3c2371a0755ef..63c64ed43d393157ff2abb6635d3bdc5b2b26f03 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);
 		}
@@ -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/util.php b/lib/util.php
index 6ed3b8b942f5a5e7d42f1f558158e4c5edc00064..48c224a3034b27c4ec84c23d64df495850a8b2f5 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -38,6 +38,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 +67,7 @@ class OC_Util {
 	public static function tearDownFS() {
 		\OC\Files\Filesystem::tearDown();
 		self::$fsSetup=false;
+        self::$rootMounted=false;
 	}
 
 	/**
@@ -75,7 +77,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(4, 97, 11);
+		return array(5, 80, 03);
 	}
 
 	/**
@@ -83,7 +85,7 @@ class OC_Util {
 	 * @return string
 	 */
 	public static function getVersionString() {
-		return '5.0 RC 3';
+		return '6.0 pre alpha';
 	}
 
 	/**
@@ -211,7 +213,7 @@ class OC_Util {
 						."'chown -R www-data:www-data /path/to/your/owncloud/install/data' ");
 			}
 		} else if(!is_writable($CONFIG_DATADIRECTORY) or !is_readable($CONFIG_DATADIRECTORY)) {
-			$errors[]=array('error'=>'Data directory ('.$CONFIG_DATADIRECTORY.') not writable by ownCloud<br/>',
+			$errors[]=array('error'=>'Data directory ('.$CONFIG_DATADIRECTORY.') not writable by ownCloud',
 				'hint'=>$permissionsHint);
 		} else {
 			$errors = array_merge($errors, self::checkDataDirectoryPermissions($CONFIG_DATADIRECTORY));
@@ -220,68 +222,76 @@ 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(ini_get('safe_mode')) {
+		if (((strtolower(@ini_get('safe_mode')) == 'on')
+			|| (strtolower(@ini_get('safe_mode')) == 'yes')
+			|| (strtolower(@ini_get('safe_mode')) == 'true')
+			|| (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) {
@@ -309,7 +319,7 @@ class OC_Util {
 				clearstatcache();
 				$prems = substr(decoct(@fileperms($dataDirectory)), -3);
 				if (substr($prems, 2, 1) != '0') {
-					$errors[] = array('error' => 'Data directory ('.$dataDirectory.') is readable for other users<br/>',
+					$errors[] = array('error' => 'Data directory ('.$dataDirectory.') is readable for other users',
 						'hint' => $permissionsModHint);
 				}
 			}
@@ -408,18 +418,19 @@ class OC_Util {
 		exit();
 	}
 
-	/**
-	 * get an id unqiue for this instance
-	 * @return string
-	 */
-	public static function getInstanceId() {
-		$id=OC_Config::getValue('instanceid', null);
-		if(is_null($id)) {
-			$id=uniqid();
-			OC_Config::setValue('instanceid', $id);
-		}
-		return $id;
-	}
+    /**
+     * get an id unique for this instance
+     * @return string
+     */
+    public static function getInstanceId() {
+        $id = OC_Config::getValue('instanceid', null);
+        if(is_null($id)) {
+            // We need to guarantee at least one letter in instanceid so it can be used as the session_name
+            $id = 'oc' . OC_Util::generate_random_bytes(10);
+            OC_Config::setValue('instanceid', $id);
+        }
+        return $id;
+    }
 
 	/**
 	 * @brief Static lifespan (in seconds) when a request token expires.
@@ -591,7 +602,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;
 		}
 
@@ -614,8 +625,8 @@ class OC_Util {
 		$result = setlocale(LC_ALL, 'en_US.UTF-8', 'en_US.UTF8');
 		if($result == false) {
 			return false;
-        }
-        return true;
+		}
+		return true;
 	}
 
 	/**
@@ -631,6 +642,11 @@ class OC_Util {
 	 */
 	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;
+		}
+
 		// try to connect to owncloud.org to see if http connections to the internet are possible.
 		$connected = @fsockopen("www.owncloud.org", 80);
 		if ($connected) {
@@ -786,4 +802,25 @@ 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;
+	}
+
+
 }
diff --git a/lib/vcategories.php b/lib/vcategories.php
index 2f990c5d2d2047a687eae18b6ebabdd5b4d6b5d8..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
@@ -536,23 +567,31 @@ class OC_VCategories {
 
 	/**
 	* @brief Delete category/object relations from the db
-	* @param int $id The id of the object
+	* @param array $ids The ids of the objects
 	* @param string $type The type of object (event/contact/task/journal).
 	* 	Defaults to the type set in the instance
 	* @returns boolean Returns false on error.
 	*/
-	public function purgeObject($id, $type = null) {
+	public function purgeObjects(array $ids, $type = null) {
 		$type = is_null($type) ? $this->type : $type;
+		if(count($ids) === 0) {
+			// job done ;)
+			return true;
+		}
+		$updates = $ids;
 		try {
-			$stmt = OCP\DB::prepare('DELETE FROM `' . self::RELATION_TABLE . '` '
-					. 'WHERE `objid` = ? AND `type`= ?');
-			$result = $stmt->execute(array($id, $type));
+			$query = 'DELETE FROM `' . self::RELATION_TABLE . '` ';
+			$query .= 'WHERE `objid` IN (' . str_repeat('?,', count($ids)-1) . '?) ';
+			$query .= 'AND `type`= ?';
+			$updates[] = $type;
+			$stmt = OCP\DB::prepare($query);
+			$result = $stmt->execute($updates);
 			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::writeLog('core', __METHOD__.', exception: ' . $e->getMessage(),
 				OCP\Util::ERROR);
 			return false;
 		}
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/lib/vobject/stringproperty.php b/lib/vobject/stringproperty.php
new file mode 100644
index 0000000000000000000000000000000000000000..b98a8f26c2b55d6a3afc8e510129d9e7806611b4
--- /dev/null
+++ b/lib/vobject/stringproperty.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * ownCloud - VObject String Property
+ *
+ * This class adds escaping of simple string properties.
+ *
+ * @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() properly
+ * escape commas and semi-colons in string properties.
+*/
+class StringProperty extends \Sabre\VObject\Property {
+
+	/**
+	* 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',
+			'\;',
+			'\,',
+		);
+		$value = strtr($this->value, array('\,' => ',', '\;' => ';', '\\\\' => '\\'));
+		$str.=':' . str_replace($src, $out, $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 d6ee589df6ffe593f73dbd5b8c319d546334b14a..5fcf05e4f99b4f0204cf53b4cfee1c3877a2d6c9 100644
--- a/ocs/routes.php
+++ b/ocs/routes.php
@@ -6,15 +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
diff --git a/settings/admin.php b/settings/admin.php
index c7848803095e2e794a90a9e9c5822e9859996677..035cef5bf95f8f809d81563c6251ec7a1edcdaf3 100755
--- a/settings/admin.php
+++ b/settings/admin.php
@@ -20,11 +20,6 @@ $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);
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..4f16bff63d5283dd73858f2df1c83763f85321fa 100644
--- a/settings/ajax/changepassword.php
+++ b/settings/ajax/changepassword.php
@@ -8,7 +8,7 @@ OC_JSON::checkLoggedIn();
 OC_APP::loadApps();
 
 $username = isset($_POST["username"]) ? $_POST["username"] : OC_User::getUser();
-$password = isset($_POST["password"]) ? $_POST["password"] : null;
+$password = isset($_POST["newpassword"]) ? $_POST["newpassword"] : null;
 $oldPassword=isset($_POST["oldpassword"])?$_POST["oldpassword"]:'';
 
 $userstatus = null;
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 5282f4a7143e87f48b45c366134a206aaf55a71c..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,11 +45,11 @@ 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,
-			'displayname' => OC_User::determineDisplayName($user),
+			'displayname' => OC_User::getDisplayName($user),
 			'groups' => join(', ', OC_Group::getUserGroups($user)),
 			'quota' => OC_Preferences::getValue($user, 'files', 'quota', 'default'));
 	}
diff --git a/settings/css/settings.css b/settings/css/settings.css
index 265a29b8f7f5167ecab38e7b6a9fc818a005c25f..46a0bbe7c3219ca1cce12b0f9bcab5d2fa06728b 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -79,6 +79,7 @@ span.version { margin-left:1em; margin-right:1em; color:#555; }
 
 /* LOG */
 #log { white-space:normal; }
+#lessLog { display:none; }
 
 /* ADMIN */
 span.securitywarning {color:#C33; font-weight:bold; }
diff --git a/settings/js/apps.js b/settings/js/apps.js
index 43013a9e1ec8a547b77e51508e55a242c25f6e25..9c1604cfcd9ff42236569741cde127795d2c2596 100644
--- a/settings/js/apps.js
+++ b/settings/js/apps.js
@@ -56,7 +56,7 @@ OC.Settings.Apps = OC.Settings.Apps || {
 		if(active) {
 			$.post(OC.filePath('settings','ajax','disableapp.php'),{appid:appid},function(result) {
 				if(!result || result.status!='success') {
-					OC.dialogs.alert('Error while disabling app','Error');
+					OC.dialogs.alert('Error while disabling app', t('core', 'Error'));
 				}
 				else {
 					element.data('active',false);
@@ -68,14 +68,20 @@ OC.Settings.Apps = OC.Settings.Apps || {
 		} else {
 			$.post(OC.filePath('settings','ajax','enableapp.php'),{appid:appid},function(result) {
 				if(!result || result.status!='success') {
-					OC.dialogs.alert('Error while enabling app','Error');
+					OC.dialogs.alert('Error while enabling app', t('core', 'Error'));
 				}
 				else {
 					OC.Settings.Apps.addNavigation(appid);
 					element.data('active',true);
 					element.val(t('settings','Disable'));
 				}
-			},'json');
+			},'json')
+			.fail(function() { 
+				OC.dialogs.alert('Error while enabling app', t('core', 'Error'));
+				element.data('active',false);
+				OC.Settings.Apps.removeNavigation(appid);
+				element.val(t('settings','Enable'));
+			});
 			$('#leftcontent li[data-id="'+appid+'"]').addClass('active');
 		}
 	},
@@ -136,7 +142,9 @@ OC.Settings.Apps = OC.Settings.Apps || {
 						li.attr('data-id', entry.id);
 						var img= $('<img class="icon"/>').attr({ src: entry.icon});
 						var a=$('<a></a>').attr('href', entry.href);
-						a.text(entry.name);
+						var filename=$('<span></span>')
+						filename.text(entry.name);
+						a.prepend(filename);
 						a.prepend(img);
 						li.append(a);
 						container.append(li);
diff --git a/settings/js/log.js b/settings/js/log.js
index 09b8ec1ab4498a9f67e398929918803214a40ee5..84f6d1aa5f3f9f6cbc58d2f8ee8134b685756657 100644
--- a/settings/js/log.js
+++ b/settings/js/log.js
@@ -1,5 +1,6 @@
 /**
  * Copyright (c) 2012, Robin Appelman <icewind1991@gmail.com>
+ * Copyright (c) 2013, Morris Jobke <morris.jobke@gmail.com>
  * This file is licensed under the Affero General Public License version 3 or later.
  * See the COPYING-README file.
  */
@@ -16,19 +17,27 @@ OC.Log={
 	levels:['Debug','Info','Warning','Error','Fatal'],
 	loaded:3,//are initially loaded
 	getMore:function(count){
-		if(!count){
-			count=10;
-		}
+		count = count || 10;
 		$.get(OC.filePath('settings','ajax','getlog.php'),{offset:OC.Log.loaded,count:count},function(result){
 			if(result.status=='success'){
 				OC.Log.addEntries(result.data);
-				$('html, body').animate({scrollTop: $(document).height()}, 800);
 				if(!result.remain){
-					$('#moreLog').css('display', 'none');
+					$('#moreLog').hide();
 				}
+				$('#lessLog').show();
 			}
 		});
 	},
+	showLess:function(count){
+		count = count || 10;
+		//calculate remaining items - at least 3
+		OC.Log.loaded = Math.max(3,OC.Log.loaded-count);
+		$('#moreLog').show();
+		// remove all non-remaining items
+		$('#log tr').slice(OC.Log.loaded).remove();
+		if(OC.Log.loaded <= 3)
+			$('#lessLog').hide();
+	},
 	addEntries:function(entries){
 		for(var i=0;i<entries.length;i++){
 			var entry=entries[i];
@@ -36,17 +45,21 @@ OC.Log={
 			var levelTd=$('<td/>');
 			levelTd.text(OC.Log.levels[entry.level]);
 			row.append(levelTd);
-			
+
 			var appTd=$('<td/>');
 			appTd.text(entry.app);
 			row.append(appTd);
-			
+
 			var messageTd=$('<td/>');
 			messageTd.text(entry.message);
 			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);
 		}
@@ -58,4 +71,7 @@ $(document).ready(function(){
 	$('#moreLog').click(function(){
 		OC.Log.getMore();
 	})
+	$('#lessLog').click(function(){
+		OC.Log.showLess();
+	})
 });
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 9bc7455285a7d6ca2490465965cb5329d21299f1..690c9ad046440998c8b787ee0a96fdc57f23d7f8 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -4,8 +4,25 @@
  * See the COPYING-README file.
  */
 
+function setQuota (uid, quota, ready) {
+	$.post(
+		OC.filePath('settings', 'ajax', 'setquota.php'),
+		{username: uid, quota: quota},
+		function (result) {
+			if (ready) {
+				ready(result.data.quota);
+			}
+		}
+	);
+}
+
 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
@@ -71,15 +88,14 @@ var UserList = {
 		tr.attr('data-uid', username);
 		tr.attr('data-displayName', displayname);
 		tr.find('td.name').text(username);
-		tr.find('td.displayName').text(username);
+		tr.find('td.displayName').text(displayname);
 		var groupsSelect = $('<select multiple="multiple" class="groupsselect" data-placehoder="Groups" title="' + t('settings', 'Groups') + '"></select>').attr('data-username', username).attr('data-user-groups', groups);
 		tr.find('td.groups').empty();
 		if (tr.find('td.subadmins').length > 0) {
 			var subadminSelect = $('<select multiple="multiple" class="subadminsselect" data-placehoder="subadmins" title="' + t('settings', 'Group Admin') + '">').attr('data-username', username).attr('data-user-groups', groups).attr('data-subadmin', subadmin);
 			tr.find('td.subadmins').empty();
 		}
-		var allGroups = String($('#content table').attr('data-groups')).split(', ');
-		$.each(allGroups, function (i, group) {
+		$.each(this.availableGroups, function (i, group) {
 			groupsSelect.append($('<option value="' + escapeHTML(group) + '">' + escapeHTML(group) + '</option>'));
 			if (typeof subadminSelect !== 'undefined' && group != 'admin') {
 				subadminSelect.append($('<option value="' + escapeHTML(group) + '">' + escapeHTML(group) + '</option>'));
@@ -114,32 +130,83 @@ var UserList = {
 				quotaSelect.append('<option value="' + escapeHTML(quota) + '" selected="selected">' + escapeHTML(quota) + '</option>');
 			}
 		}
-		var added = false;
+		$(tr).appendTo('tbody');
 		if (sort) {
-			displayname = displayname.toLowerCase();
-			$('tbody tr').each(function () {
-				if (displayname < $(this).attr('data-uid').toLowerCase()) {
-					$(tr).insertBefore($(this));
-					added = true;
-					return false;
-				}
-			});
+			UserList.doSort();
 		}
-		if (!added) {
-			$(tr).appendTo('tbody');
+
+		quotaSelect.singleSelect();
+		quotaSelect.on('change', function () {
+			var uid = $(this).parent().parent().attr('data-uid');
+			var quota = $(this).val();
+			setQuota(uid, quota);
+		});
+	},
+	// From http://my.opera.com/GreyWyvern/blog/show.dml/1671288
+	alphanum: function(a, b) {
+		function chunkify(t) {
+			var tz = [], x = 0, y = -1, n = 0, i, j;
+
+			while (i = (j = t.charAt(x++)).charCodeAt(0)) {
+			var m = (i == 46 || (i >=48 && i <= 57));
+			if (m !== n) {
+				tz[++y] = "";
+				n = m;
+			}
+			tz[y] += j;
+			}
+			return tz;
+		}
+
+		var aa = chunkify(a.toLowerCase());
+		var bb = chunkify(b.toLowerCase());
+
+		for (x = 0; aa[x] && bb[x]; x++) {
+			if (aa[x] !== bb[x]) {
+			var c = Number(aa[x]), d = Number(bb[x]);
+			if (c == aa[x] && d == bb[x]) {
+				return c - d;
+			} else return (aa[x] > bb[x]) ? 1 : -1;
+			}
 		}
-		return tr;
+		return aa.length - bb.length;
 	},
+	doSort: function() {
+		var self = this;
+		var rows = $('tbody tr').get();
 
+		rows.sort(function(a, b) {
+			return UserList.alphanum($(a).find('td.name').text(), $(b).find('td.name').text());
+		});
+
+		var items = [];
+		$.each(rows, function(index, row) {
+			items.push(row);
+			if(items.length === 100) {
+				$('tbody').append(items);
+				items = [];
+			}
+		});
+		if(items.length > 0) {
+			$('tbody').append(items);
+		}
+	},
 	update: function () {
-		if (typeof UserList.offset === 'undefined') {
-			UserList.offset = $('tbody tr').length;
+		if (UserList.updating) {
+			return;
 		}
-		$.get(OC.Router.generate('settings_ajax_userlist', { offset: UserList.offset }), function (result) {
+		UserList.updating = true;
+		$.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);
@@ -147,7 +214,11 @@ var UserList = {
 						});
 					}
 				});
+				if (result.data.length > 0) {
+					UserList.doSort();
+				}
 			}
+			UserList.updating = false;
 		});
 	},
 
@@ -172,7 +243,14 @@ var UserList = {
 							username: user,
 							group: group
 						},
-						function () {
+						function (response) {
+							if(response.status === 'success') {
+								if(UserList.availableGroups.indexOf(response.data.groupname) === -1 && response.data.action === 'add') {
+									UserList.availableGroups.push(response.data.groupname);
+								}
+							} else {
+								OC.Notification.show(response.data.message);
+							}
 						}
 					);
 				};
@@ -242,24 +320,14 @@ var UserList = {
 
 $(document).ready(function () {
 
+	UserList.doSort();
+	UserList.availableGroups = $('#content table').attr('data-groups').split(', ');
 	$('tbody tr:last').bind('inview', function (event, isInView, visiblePartX, visiblePartY) {
 		OC.Router.registerLoadedCallback(function () {
 			UserList.update();
 		});
 	});
 
-	function setQuota (uid, quota, ready) {
-		$.post(
-			OC.filePath('settings', 'ajax', 'setquota.php'),
-			{username: uid, quota: quota},
-			function (result) {
-				if (ready) {
-					ready(result.data.quota);
-				}
-			}
-		);
-	}
-
 	$('select[multiple]').each(function (index, element) {
 		UserList.applyMultiplySelect($(element));
 	});
@@ -373,7 +441,11 @@ $(document).ready(function () {
 					OC.dialogs.alert(result.data.message,
 						t('settings', 'Error creating user'));
 				} else {
-					UserList.add(username, username, result.data.groups, null, 'default', true);
+					var addedGroups = result.data.groups.split(', ');
+					UserList.availableGroups = $.unique($.merge(UserList.availableGroups, addedGroups));
+					if($('tr[data-uid="' + username + '"]').length === 0) {
+						UserList.add(username, username, result.data.groups, null, 'default', true);
+					}
 				}
 			}
 		);
diff --git a/settings/l10n/ar.php b/settings/l10n/ar.php
index b2e805d522deef5afe516ceb0e1971e6420115ef..a69bc9bed5aade5b376e800772bfa00b3ac034dd 100644
--- a/settings/l10n/ar.php
+++ b/settings/l10n/ar.php
@@ -1,6 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "ÙØ´Ù„ ØªØÙ…ÙŠÙ„ Ø§Ù„Ù‚Ø§Ø¦Ù…Ø© Ù…Ù† Ø§Ù„Ø¢Ø¨ Ø³ØªÙˆØ±",
 "Authentication error" => "Ù„Ù… ÙŠØªÙ… Ø§Ù„ØªØ£ÙƒØ¯ Ù…Ù† Ø§Ù„Ø´Ø®ØµÙŠØ© Ø¨Ù†Ø¬Ø§Ø",
+"Unable to change display name" => "ØªØ¹Ø°Ø± ØªØºÙŠÙŠØ± Ø§Ø³Ù… Ø§Ù„ØØ³Ø§Ø¨",
 "Group already exists" => "Ø§Ù„Ù…Ø¬Ù…ÙˆØ¹Ø© Ù…ÙˆØ¬ÙˆØ¯Ø© Ù…Ø³Ø¨Ù‚Ø§Ù‹",
 "Unable to add group" => "ÙØ´Ù„ Ø¥Ø¶Ø§ÙØ© Ø§Ù„Ù…Ø¬Ù…ÙˆØ¹Ø©",
 "Could not enable app. " => "ÙØ´Ù„ Ø¹Ù…Ù„ÙŠØ© ØªÙØ¹ÙŠÙ„ Ø§Ù„ØªØ·Ø¨ÙŠÙ‚",
@@ -9,20 +10,63 @@
 "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}" => "ØªÙ… Ø§Ù„ØªØØ¯ÙŠØ« Ø§Ù„Ù‰ ",
 "Disable" => "Ø¥ÙŠÙ‚Ø§Ù",
 "Enable" => "ØªÙØ¹ÙŠÙ„",
+"Please wait...." => "Ø§Ù„Ø±Ø¬Ø§Ø¡ Ø§Ù„Ø§Ù†ØªØ¸Ø§Ø± ...",
 "Error" => "Ø®Ø·Ø£",
-"Saving..." => "ØÙØ¸",
+"Updating...." => "Ø¬Ø§Ø±ÙŠ Ø§Ù„ØªØØ¯ÙŠØ« ...",
+"Error while updating app" => "ØØµÙ„ Ø®Ø·Ø£ Ø£Ø«Ù†Ø§Ø¡ ØªØØ¯ÙŠØ« Ø§Ù„ØªØ·Ø¨ÙŠÙ‚",
+"Updated" => "ØªÙ… Ø§Ù„ØªØØ¯ÙŠØ« Ø¨Ù†Ø¬Ø§Ø",
+"Saving..." => "Ø¬Ø§Ø±ÙŠ Ø§Ù„ØÙØ¸...",
+"deleted" => "ØªÙ… Ø§Ù„ØØ°Ù",
+"undo" => "ØªØ±Ø§Ø¬Ø¹",
+"Unable to remove user" => "ØªØ¹Ø°Ø± ØØ°Ù Ø§Ù„Ù…Ø³ØªØ®Ø¯Ù…",
 "Groups" => "Ù…Ø¬Ù…ÙˆØ¹Ø§Øª",
 "Group Admin" => "Ù…Ø¯ÙŠØ± Ø§Ù„Ù…Ø¬Ù…ÙˆØ¹Ø©",
-"Delete" => "ØØ°Ù",
+"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." => "Ù…Ø¬Ù„Ø¯Ø§Øª data  ÙˆÙ…Ù„ÙØ§ØªÙƒ Ù‚Ø¯ ØªÙƒÙˆÙ† Ù‚Ø§Ø¨Ù„Ø© Ù„Ù„ÙˆØµÙˆÙ„ Ø§Ù„ÙŠÙ‡Ø§ Ø¹Ù† Ø·Ø±ÙŠÙ‚ Ø´Ø¨ÙƒØ© Ø§Ù„Ø§Ù†ØªØ±Ù†Øª. Ù…Ù„Ù .htaccess Ø§Ù„Ø°ÙŠ ÙˆÙØ±ØªÙ‡ Owncloud Ù„Ø§ ÙŠØ¹Ù…Ù„ . Ù†Ù‚ØªØ±Ø Ø£Ù† ØªÙ‚ÙˆÙ… Ø¨Ø§Ø¹Ø¯Ø§Ø¯ Ø®Ø§Ø¯Ù…Ùƒ Ø¨Ø·Ø±ÙŠÙ‚Ø© ØªØ¬Ø¹Ù„ Ù…Ø¬Ù„Ø¯ data ØºÙŠØ± Ù‚Ø§Ø¨Ù„ Ù„Ù„ÙˆØµÙˆÙ„ Ø§Ù„ÙŠÙ‡ Ø¹Ù† Ø·Ø±ÙŠÙ‚ Ø§Ù„Ø§Ù†ØªØ±Ù†Øª Ø£Ùˆ Ø£Ù† ØªÙ‚ÙˆÙ… Ø¨ØªØºÙŠÙŠØ± Ù…Ø³Ø§Ø±Ù‡ Ø§Ù„Ù‰ Ø®Ø§Ø±Ø¬ Ù…Ø³Ø§Ø± Ù…Ø¬Ù„Ø¯ Ø§Ù„ØµÙØØ§Øª Ø§Ù„Ø§ÙØªØ±Ø§Ø¶ÙŠ 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." => "Ù…ÙˆØ¯ÙŠÙ„  'fileinfo' Ø§Ù„Ø®Ø§Øµ Ø¨Ø§Ù„Ù€PHP  Ù…ÙÙ‚ÙˆØ¯ . Ù†ÙˆØµÙŠ Ø¨ØªÙØ¹ÙŠÙ„ Ù‡Ø°Ø§ Ø§Ù„Ù…ÙˆØ¯ÙŠÙ„ Ù„Ù„ØØµÙˆÙ„ Ø¹Ù„Ù‰ Ø£ÙØ¶Ù„ Ø§Ù„Ù†ØªØ§Ø¦Ø¬ Ù…Ø¹ Ø®Ø§ØµÙŠØ© Ø§Ù„ØªØÙ‚Ù‚ ",
+"Locale not working" => "Ø§Ù„Ù„ØºÙ‡ Ù„Ø§ ØªØ¹Ù…Ù„",
+"This ownCloud server can't set system locale to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "Ù„Ù… ÙŠØªÙ…ÙƒÙ† Ø®Ø§Ø¯Ù… ownCloud Ù‡Ø°Ø§ ÙƒÙ… Ø¶Ø¨Ø· Ù„ØºØ© Ø§Ù„Ù†Ø¸Ø§Ù… Ø§Ù„Ù‰ %s . Ù‡Ø°Ø§ ÙŠØ¹Ù†ÙŠ Ø§Ù†Ù‡ Ù‚Ø¯ ÙŠÙƒÙˆÙ† Ù‡Ù†Ø§Ùƒ Ø£Ø®Ø·Ø§Ø¡ ÙÙŠ Ø§Ø³Ù…Ø§Ø¡ Ø§Ù„Ù…Ù„ÙØ§Øª. Ù†ØÙ† Ù†ÙˆØµÙŠ Ø§Ù† ØªÙ‚ÙˆÙ… Ø¨ØªØ±ÙƒÙŠØ¨ Ø§Ù„ØØ²Ù… Ø§Ù„Ù„Ø§Ø²Ù…Ø© Ù„Ø¯Ø¹Ù… %s Ø¹Ù„Ù‰ Ù†Ø¸Ø§Ù…Ùƒ . ",
+"Internet connection not working" => "Ø§Ù„Ø§ØªØµØ§Ù„ Ø¨Ø§Ù„Ø§Ù†ØªØ±Ù†Øª Ù„Ø§ ÙŠØ¹Ù…Ù„",
+"This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps donÂ´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "Ø®Ø§Ø¯Ù… Ø§Ù„Ù€ Owncloud  Ù‡Ø°Ø§ ØºÙŠØ± Ù…ØªØµÙ„ Ø¨Ø§Ù„Ø§Ù†ØªØ±Ù†Øª. Ù‡Ø°Ø§ ÙŠØ¹Ù†ÙŠ Ø£Ù† Ø¨Ø¹Ø¶ Ø§Ù„Ù…ÙŠØ²Ø§Øª Ù…Ø«Ù„ Ø§Ù„Ø±Ø¨Ø· Ø¨ÙˆØØ¯Ø© ØªØ®Ø²ÙŠÙ†ÙŠØ© Ø®Ø§Ø±Ø¬ÙŠÙ‡, Ø§Ù„ØªÙ†Ø¨ÙŠÙ‡Ø§Øª Ø§Ù„Ø®Ø§ØµØ© Ø¨Ø§Ù„ØªØØ¯ÙŠØ«Ø§Øª Ø£Ùˆ ØªØ±ÙƒÙŠØ¨ ØªØ·Ø¨ÙŠÙ‚Ø§Øª Ù…Ù† Ù…ØµØ§Ø¯Ø± Ø®Ø§Ø±Ø¬ÙŠØ© Ù„Ù† ÙŠØ¹Ù…Ù„ . ÙƒÙ…Ø§ Ø§Ù† Ø§Ù„ÙˆØµÙˆÙ„ Ø§Ù„Ù‰ Ø§Ù„Ù…Ù„ÙØ§Øª Ù…Ù† Ø®Ø§Ø±Ø¬ Ø§Ù„Ø®Ø§Ø¯Ù… ÙˆØ§Ø±Ø³Ø§Ù„ Ø±Ø³Ø§Ø¦Ù„ Ø§Ù„Ø¨Ø±ÙŠØ¯ Ø§Ù„ØªÙ†Ø¨ÙŠÙ‡ÙŠØ© Ù„Ù† ØªØ¹Ù…Ù„ Ø£ÙŠØ¶Ø§ . Ù†Ù‚ØªØ±Ø Ø£Ù† ØªÙØ¹Ù„ Ø®Ø¯Ù…Ø© Ø§Ù„Ø§Ù†ØªØ±Ù†Øª ÙÙŠ Ù‡Ø°Ø§ Ø§Ù„Ø®Ø§Ø¯Ù… Ø§Ø°Ø§ Ø£Ø±Ø¯Øª Ø§Ù† ØªØ³ØªÙÙŠØ¯ Ù…Ù† ÙƒØ§ÙØ© Ù…ÙŠØ²Ø§Øª Owncloud",
+"Cron" => "Ù…Ø¬Ø¯ÙˆÙ„",
+"Execute one task with each page loaded" => "Ù‚Ù… Ø¨ØªÙ†ÙÙŠØ° Ù…Ù‡Ù…Ø© ÙˆØ§ØØ¯Ø© Ù…Ø¹ ÙƒÙ„ ØµÙØØ© ØªÙ… ØªØÙ…ÙŠÙ„Ù‡Ø§",
+"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php Ù…Ø³Ø¬Ù„Ø© ÙÙŠ Ø®Ø¯Ù…Ø© webcron . Ù‚Ù… Ø¨Ø§Ø³ØªØ¯Ø¹Ø§Ø¡ ØµÙØØ© cron.php Ø§Ù„Ù…ÙˆØ¬ÙˆØ¯Ø© ÙÙŠ owncloud root Ù…Ø±Ù‡ ÙƒÙ„ Ø¯Ù‚ÙŠÙ‚Ø© Ø¹Ù† Ø·Ø±ÙŠÙ‚ Ø¨Ø±ÙˆØªÙˆÙƒÙˆÙ„ 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  Ø¹Ù† Ø·Ø±ÙŠÙ‚ system 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" => "Ø§Ù„Ø³Ù…Ø§Ø Ù„Ù„Ù…Ø³ØªØ¹Ù…ÙŠÙ†Ù Ù„Ø¥Ø¹Ø§Ø¯Ø© Ø§Ù„Ù…Ø´Ø§Ø±ÙƒØ© ÙÙ‚Ø· Ù…Ø¹ Ø§Ù„Ù…Ø³ØªØ¹Ù…Ù„ÙŠÙ† ÙÙŠ Ù…Ø¬Ù…ÙˆØ¹Ø§ØªÙ‡Ù…",
+"Security" => "ØÙ…Ø§ÙŠØ©",
+"Enforce HTTPS" => "ÙØ±Ø¶ HTTPS",
+"Enforces the clients to connect to ownCloud via an encrypted connection." => "Ø§Ø¬Ø¨Ø§Ø± Ø§Ù„Ù…Ø³ØªØ®Ø¯Ù… Ø¨Ø§Ù„Ø§ØªØµØ§Ù„ Ù…Ø¹ Owncloud  Ø¹Ù† Ø·Ø±ÙŠÙ‚ Ø§ØªØµØ§Ù„ Ù…Ø´ÙØ±",
+"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "Ø§Ù„Ø±Ø¬Ø§Ø¡ Ø§Ù„Ø§ØªØµØ§Ù„ Ù…Ø¹ Ø®Ø§Ø¯Ù… Owncloud  Ù‡Ø°Ø§ Ø¹Ù† Ø·Ø±ÙŠÙ‚ HTTPS Ù„ØªÙØ¹ÙŠÙ„ Ø£Ùˆ ØªØ¹Ø·ÙŠÙ„ Ø§Ø¬Ø¨Ø§Ø± Ø§Ù„Ø¯Ø®ÙˆÙ„ Ø¨Ø§Ø³ØªØ®Ø¯Ø§Ù… ",
+"Log" => "Ø³Ø¬Ù„",
+"Log level" => "Ù…Ø³ØªÙˆÙ‰ Ø§Ù„Ø³Ø¬Ù„",
 "More" => "Ø§Ù„Ù…Ø²ÙŠØ¯",
+"Less" => "Ø£Ù‚Ù„",
 "Version" => "Ø¥ØµØ¯Ø§Ø±",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Ø·ÙˆÙ‘Ø± Ù…Ù† Ù‚Ø¨Ù„ <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud Ù…Ø¬ØªÙ…Ø¹</a>, Ø§Ù„Ù€ <a href=\"https://github.com/owncloud\" target=\"_blank\">Ø§Ù„Ù†Øµ Ø§Ù„Ù…ØµØ¯Ø±ÙŠ</a> Ù…Ø±Ø®Øµ Ø¨Ù…ÙˆØ¬Ø¨ <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">Ø±Ø®ØµØ© Ø£ÙÙŠØ±Ùˆ Ø§Ù„Ø¹Ù…ÙˆÙ…ÙŠØ©</abbr></a>.",
 "Add your App" => "Ø£Ø¶Ù ØªØ·Ø¨ÙŠÙ‚Ø§ØªÙƒ",
@@ -38,19 +82,29 @@
 "Bugtracker" => "ØªØ¹Ù‚Ø¨ Ø¹Ù„Ø©",
 "Commercial Support" => "Ø¯Ø¹Ù… ØªØ¬Ø§Ø±ÙŠ",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "ØªÙ… Ø¥Ø³ØªÙ‡Ù„Ø§Ùƒ <strong>%s</strong> Ù…Ù† Ø§Ù„Ù…ØªÙˆÙØ± <strong>%s</strong>",
-"Password" => "ÙƒÙ„Ù…Ø§Øª Ø§Ù„Ø³Ø±",
+"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" => "ÙƒÙ„Ù…Ø§Øª Ø³Ø± Ø¬Ø¯ÙŠØ¯Ø©",
 "Change password" => "Ø¹Ø¯Ù„ ÙƒÙ„Ù…Ø© Ø§Ù„Ø³Ø±",
-"Email" => "Ø§Ù„Ø¹Ù†ÙˆØ§Ù† Ø§Ù„Ø¨Ø±ÙŠØ¯ÙŠ",
+"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/bg_BG.php b/settings/l10n/bg_BG.php
index 24664c5309f7646c38332a5952ba50b176c9f421..e5cc8bde398efcf2a251a9ab7ab15cb8a45b45a0 100644
--- a/settings/l10n/bg_BG.php
+++ b/settings/l10n/bg_BG.php
@@ -2,24 +2,31 @@
 "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...." => "ÐœÐ¾Ð»Ñ Ð¿Ð¾Ñ‡Ð°ÐºÐ°Ð¹Ñ‚Ðµ....",
-"Updating...." => "ÐžÐ±Ð½Ð¾Ð²ÑÐ²Ð° ÑÐµ...",
 "Error" => "Ð“Ñ€ÐµÑˆÐºÐ°",
+"Updating...." => "ÐžÐ±Ð½Ð¾Ð²ÑÐ²Ð° ÑÐµ...",
 "Updated" => "ÐžÐ±Ð½Ð¾Ð²ÐµÐ½Ð¾",
 "Saving..." => "Ð—Ð°Ð¿Ð¸ÑÐ²Ð°Ð½Ðµ...",
 "deleted" => "Ð¸Ð·Ñ‚Ñ€Ð¸Ñ‚Ð¾",
 "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" => "Ð’ÐµÑ€ÑÐ¸Ñ",
 "Add your App" => "Ð”Ð¾Ð±Ð°Ð²ÐµÑ‚Ðµ Ð’Ð°ÑˆÐµ Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ",
 "More Apps" => "ÐžÑ‰Ðµ Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ",
@@ -40,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 bbaa5be0043196c281df6044cbd1a51347cf516d..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,10 +20,11 @@
 "undo" => "à¦•à§à¦°à¦¿à§Ÿà¦¾ à¦ªà§à¦°à¦¤à§à¦¯à¦¾à¦¹à¦¾à¦°",
 "Groups" => "à¦—à§‹à¦·à§à¦ à§€à¦¸à¦®à§‚à¦¹",
 "Group Admin" => "à¦—à§‹à¦·à§à¦ à§€ à¦ªà§à¦°à¦¶à¦¾à¦¸à¦•",
-"Delete" => "à¦®à§à¦›à§‡ à¦«à§‡à¦²",
+"Delete" => "à¦®à§à¦›à§‡",
 "__language_name__" => "__language_name__",
 "Security Warning" => "à¦¨à¦¿à¦°à¦¾à¦ªà¦¤à§à¦¤à¦¾à¦œà¦¨à¦¿à¦¤ à¦¸à¦¤à¦°à§à¦•à¦¤à¦¾",
 "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 href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> à¦à¦° à¦…à¦§à§€à¦¨à§‡ à¦²à¦¾à¦‡à¦¸à§‡à¦¨à§à¦¸à¦•à§ƒà¦¤à¥¤",
 "Add your App" => "à¦†à¦ªà¦¨à¦¾à¦° à¦…à§à¦¯à¦¾à¦ªà¦Ÿà¦¿ à¦¯à§‹à¦— à¦•à¦°à§à¦¨",
@@ -46,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 2c9699188773d55437583c816d3fb2f40696cd97..d134ecad01d2915ef1507d73f2a129be054725a6 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Ã³",
-"Error" => "Error",
 "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",
@@ -66,6 +67,7 @@
 "Log" => "Registre",
 "Log level" => "Nivell de registre",
 "More" => "MÃ©s",
+"Less" => "Menys",
 "Version" => "VersiÃ³",
 "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>." => "Desenvolupat per la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunitat ownCloud</a>, el <a href=\"https://github.com/owncloud\" target=\"_blank\">codi font</a> tÃ© llicÃ¨ncia <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Add your App" => "Afegiu la vostra aplicaciÃ³",
@@ -90,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",
diff --git a/settings/l10n/cs_CZ.php b/settings/l10n/cs_CZ.php
index 35b14f11de7d7619fa3ca53e2fd2bdf6a2fbe2e2..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",
@@ -19,9 +20,9 @@
 "Disable" => "ZakÃ¡zat",
 "Enable" => "Povolit",
 "Please wait...." => "ÄŒekejte prosÃm...",
+"Error" => "Chyba",
 "Updating...." => "Aktualizuji...",
 "Error while updating app" => "Chyba pÅ™i aktualizaci aplikace",
-"Error" => "Chyba",
 "Updated" => "AktualizovÃ¡no",
 "Saving..." => "UklÃ¡dÃ¡m...",
 "deleted" => "smazÃ¡no",
@@ -66,6 +67,7 @@
 "Log" => "ZÃ¡znam",
 "Log level" => "ÃšroveÅˆ zÃ¡znamu",
 "More" => "VÃce",
+"Less" => "MÃ©nÄ›",
 "Version" => "Verze",
 "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>." => "Vyvinuto <a href=\"http://ownCloud.org/contact\" target=\"_blank\">komunitou ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">zdrojovÃ½ kÃ³d</a> je licencovÃ¡n pod <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Add your App" => "PÅ™idat VaÅ¡Ã aplikaci",
@@ -90,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",
@@ -104,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 da17fc132d9c5c0bfdf1d90aee90f62958736605..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",
@@ -19,9 +20,9 @@
 "Disable" => "Deaktiver",
 "Enable" => "Aktiver",
 "Please wait...." => "Vent venligst...",
+"Error" => "Fejl",
 "Updating...." => "Opdaterer....",
 "Error while updating app" => "Der opstod en fejl under app opgraderingen",
-"Error" => "Fejl",
 "Updated" => "Opdateret",
 "Saving..." => "Gemmer...",
 "deleted" => "Slettet",
@@ -66,6 +67,7 @@
 "Log" => "Log",
 "Log level" => "Log niveau",
 "More" => "Mere",
+"Less" => "Mindre",
 "Version" => "Version",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Udviklet af <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownClouds community</a>, og <a href=\"https://github.com/owncloud\" target=\"_blank\">kildekoden</a> er underlagt licensen <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Add your App" => "TilfÃ¸j din App",
@@ -82,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 6307bdc61b5e1a1826dc89a448ef8552ec12a08a..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,19 +11,19 @@
 "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",
-"Couldn't update app." => "Die App konnte nicht geupdated werden.",
-"Update to {appversion}" => "Update zu {appversion}",
+"Couldn't update app." => "Die App konnte nicht aktualisiert werden.",
+"Update to {appversion}" => "Aktualisiere zu {appversion}",
 "Disable" => "Deaktivieren",
 "Enable" => "Aktivieren",
 "Please wait...." => "Bitte warten...",
-"Updating...." => "Update...",
-"Error while updating app" => "Fehler beim Aktualisieren der App",
 "Error" => "Fehler",
-"Updated" => "Geupdated",
+"Updating...." => "Aktualisierung...",
+"Error while updating app" => "Fehler beim Aktualisieren der App",
+"Updated" => "Aktualisiert",
 "Saving..." => "Speichern...",
 "deleted" => "gelÃ¶scht",
 "undo" => "rÃ¼ckgÃ¤ngig machen",
@@ -32,40 +33,41 @@
 "Delete" => "LÃ¶schen",
 "add group" => "Gruppe hinzufÃ¼gen",
 "A valid username must be provided" => "Es muss ein gÃ¼ltiger Benutzername angegeben werden",
-"Error creating user" => "Beim anlegen des Benutzers ist ein Fehler aufgetreten",
+"Error creating user" => "Beim Anlegen des Benutzers ist ein Fehler aufgetreten",
 "A valid password must be provided" => "Es muss ein gÃ¼ltiges Passwort angegeben werden",
 "__language_name__" => "Deutsch (PersÃ¶nlich)",
 "Security Warning" => "Sicherheitswarnung",
 "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 ihrem System zu installieren.",
+"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",
+"Less" => "Weniger",
 "Version" => "Version",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Entwickelt von der <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-Community</a>, der <a href=\"https://github.com/owncloud\" target=\"_blank\">Quellcode</a> ist unter der <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> lizenziert.",
 "Add your App" => "FÃ¼ge Deine Anwendung hinzu",
@@ -73,7 +75,7 @@
 "Select an App" => "WÃ¤hle eine Anwendung aus",
 "See application page at apps.owncloud.com" => "Weitere Anwendungen findest Du auf apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-lizenziert von <span class=\"author\"></span>",
-"Update" => "Update durchfÃ¼hren",
+"Update" => "Aktualisierung durchfÃ¼hren",
 "User Documentation" => "Dokumentation fÃ¼r Benutzer",
 "Administrator Documentation" => "Dokumentation fÃ¼r Administratoren",
 "Online Documentation" => "Online-Dokumentation",
@@ -90,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 3192a4a78683dbea1e8952950045f18e7a904b71..91a96ca9f0ef24251c62b13feda15753c84037c3 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,23 +11,23 @@
 "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",
-"Couldn't update app." => "Die App konnte nicht geupdated werden.",
+"Couldn't update app." => "Die App konnte nicht aktualisiert werden.",
 "Update to {appversion}" => "Update zu {appversion}",
 "Disable" => "Deaktivieren",
 "Enable" => "Aktivieren",
 "Please wait...." => "Bitte warten....",
+"Error" => "Fehler",
 "Updating...." => "Update...",
 "Error while updating app" => "Es ist ein Fehler wÃ¤hrend des Updates aufgetreten",
-"Error" => "Fehler",
 "Updated" => "Aktualisiert",
 "Saving..." => "Speichern...",
 "deleted" => "gelÃ¶scht",
 "undo" => "rÃ¼ckgÃ¤ngig machen",
-"Unable to remove user" => "Benutzer konnte nicht entfernt werden.",
+"Unable to remove user" => "Der Benutzer konnte nicht entfernt werden.",
 "Groups" => "Gruppen",
 "Group Admin" => "Gruppenadministrator",
 "Delete" => "LÃ¶schen",
@@ -38,34 +39,35 @@
 "Security Warning" => "Sicherheitshinweis",
 "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 konfiguriert 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>.",
 "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" => "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",
-"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 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 Internetverbindung fÃ¼r diesen Server zu aktivieren wenn Sie alle Funktionen von ownCloud nutzen wollen.",
+"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 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" => "FÃ¼hre eine Aufgabe bei jedem Laden der 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 bei einem Webcron-Service registriert. Die cron.php Seite im ownCloud Wurzelverzeichniss 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." => "Nutzen Sie den Cron Systemdienst. Rufen Sie die Datei cron.php im ownCloud Ordner einmal pro Minute Ã¼ber einen Cronjob auf.",
+"Execute one task with each page loaded" => "Eine Aufgabe bei jedem Laden der Seite ausfÃ¼hren",
+"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 bei einem Webcron-Service registriert. Die cron.php Seite im ownCloud-Wurzelverzeichniss 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." => "Nutzen Sie den Cron-Systemdienst. Rufen Sie die Datei cron.php im ownCloud-Ordner einmal pro Minute Ã¼ber einen Cronjob auf.",
 "Sharing" => "Teilen",
 "Enable Share API" => "Share-API aktivieren",
-"Allow apps to use the Share API" => "Erlaube es Anwendungen, die Share-API zu benutzen",
+"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" => "Erlaube es Benutzern, Items per Ã¶ffentlichem Link zu teilen",
-"Allow resharing" => "Erlaube weiterverteilen",
-"Allow users to share items shared with them again" => "Erlaubt Nutzern mit ihnen geteilte Inhalte erneut zu teilen",
-"Allow users to share with anyone" => "Erlaube Nutzern mit jedem zu teilen",
-"Allow users to only share with users in their groups" => "Erlaube Nutzern nur mit Nutzern in ihrer Gruppe zu teilen",
+"Allow users to share items to the public with links" => "Benutzern erlauben, Inhalte per Ã¶ffentlichem Link zu teilen",
+"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" => "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.",
-"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "Bitte verbinden Sie sich mit dieser ownCloud-Instanz per HTTPS um SSL-Erzwingung zu aktivieren oder deaktivieren.",
+"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "Bitte verbinden Sie sich mit dieser ownCloud-Instanz per HTTPS, um SSL-Erzwingung zu aktivieren oder deaktivieren.",
 "Log" => "Log",
 "Log level" => "Log-Level",
 "More" => "Mehr",
+"Less" => "Weniger",
 "Version" => "Version",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Entwickelt von der <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-Community</a>. Der <a href=\"https://github.com/owncloud\" target=\"_blank\">Quellcode</a> ist unter der <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> lizenziert.",
 "Add your App" => "FÃ¼gen Sie Ihre Anwendung hinzu",
@@ -81,8 +83,8 @@
 "Bugtracker" => "Bugtracker",
 "Commercial Support" => "Kommerzieller Support",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Sie verwenden <strong>%s</strong> der verfÃ¼gbaren <strong>%s</strong>",
-"Get the apps to sync your files" => "Installieren Sie die Anwendungen um Ihre Dateien zu synchronisieren",
-"Show First Run Wizard again" => "Zeige den Einrichtungsassistenten erneut",
+"Get the apps to sync your files" => "Installieren Sie die Anwendungen, um Ihre Dateien zu synchronisieren",
+"Show First Run Wizard again" => "Den Einrichtungsassistenten erneut anzeigen",
 "Password" => "Passwort",
 "Your password was changed" => "Ihr Passwort wurde geÃ¤ndert.",
 "Unable to change your password" => "Das Passwort konnte nicht geÃ¤ndert werden",
@@ -90,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.",
@@ -101,7 +100,7 @@
 "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",
 "Default Storage" => "Standard-Speicher",
 "Unlimited" => "Unbegrenzt",
 "Other" => "Andere",
diff --git a/settings/l10n/el.php b/settings/l10n/el.php
index fb1b95a72d3c50b941bc70c74d7c40019ba442e9..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" => "Î‘Î´Ï…Î½Î±Î¼Î¯Î± Ï€ÏÎ¿ÏƒÎ¸Î®ÎºÎ·Ï‚ Î¿Î¼Î¬Î´Î±Ï‚",
@@ -19,11 +20,11 @@
 "Disable" => "Î‘Ï€ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¯Î·ÏƒÎ·",
 "Enable" => "Î•Î½ÎµÏÎ³Î¿Ï€Î¿Î¯Î·ÏƒÎ·",
 "Please wait...." => "Î Î±ÏÎ±ÎºÎ±Î»ÏŽ Ï€ÎµÏÎ¹Î¼ÎÎ½ÎµÏ„Îµ...",
+"Error" => "Î£Ï†Î¬Î»Î¼Î±",
 "Updating...." => "Î•Î½Î·Î¼ÎÏÏ‰ÏƒÎ·...",
 "Error while updating app" => "Î£Ï†Î¬Î»Î¼Î± ÎºÎ±Ï„Î¬ Ï„Î·Î½ ÎµÎ½Î·Î¼ÎÏÏ‰ÏƒÎ· Ï„Î·Ï‚ ÎµÏ†Î±ÏÎ¼Î¿Î³Î®Ï‚",
-"Error" => "Î£Ï†Î¬Î»Î¼Î±",
 "Updated" => "Î•Î½Î·Î¼ÎµÏÏŽÎ¸Î·ÎºÎµ",
-"Saving..." => "Î‘Ï€Î¿Î¸Î®ÎºÎµÏ…ÏƒÎ·...",
+"Saving..." => "Î“Î¯Î½ÎµÏ„Î±Î¹ Î±Ï€Î¿Î¸Î®ÎºÎµÏ…ÏƒÎ·...",
 "deleted" => "Î´Î¹Î±Î³ÏÎ¬Ï†Î·ÎºÎµ",
 "undo" => "Î±Î½Î±Î¯ÏÎµÏƒÎ·",
 "Unable to remove user" => "Î‘Î´Ï…Î½Î±Î¼Î¯Î± Î±Ï†Î±Î¯ÏÎµÏƒÎ· Ï‡ÏÎ®ÏƒÏ„Î·",
@@ -40,8 +41,12 @@
 "Setup Warning" => "Î¡ÏÎ¸Î¼Î¹ÏƒÎ· Î ÏÎ¿ÎµÎ¹Î´Î¿Ï€Î¿Î¯Î·ÏƒÎ·Ï‚",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "ÎŸ Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„Î®Ï‚ ÏƒÎ±Ï‚ Î´ÎµÎ½ ÎÏ‡ÎµÎ¹ ÏÏ…Î¸Î¼Î¹ÏƒÏ„ÎµÎ¯ ÎºÎ±Ï„Î¬Î»Î»Î·Î»Î± ÏŽÏƒÏ„Îµ Î½Î± ÎµÏ€Î¹Ï„ÏÎÏ€ÎµÎ¹ Ï„Î¿Î½ ÏƒÏ…Î³Ï‡ÏÎ¿Î½Î¹ÏƒÎ¼ÏŒ Î±ÏÏ‡ÎµÎ¯Ï‰Î½ Î³Î¹Î±Ï„Î¯ Î· Î´Î¹ÎµÏ€Î±Ï†Î® WebDAV Ï€Î¹Î¸Î±Î½ÏŒÎ½ Î½Î± ÎµÎ¯Î½Î±Î¹ ÎºÎ±Ï„ÎµÏƒÏ„ÏÎ±Î¼Î¼ÎÎ½Î·.",
 "Please double check the <a href='%s'>installation guides</a>." => "Î•Î»ÎÎ³Î¾Ï„Îµ Î¾Î±Î½Î¬ Ï„Î¹Ï‚ <a href='%s'>Î¿Î´Î·Î³Î¯ÎµÏ‚ ÎµÎ³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ·Ï‚</a>.",
+"Module 'fileinfo' missing" => "Î— ÎµÎ½Î¿Ï„Î·Ï„Î± 'fileinfo' Î»ÎµÎ¹Ï€ÎµÎ¹",
+"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Î— PHP ÎµÎ½Î¿Ï„Î·Ï„Î± 'fileinfo' Î»ÎµÎ¹Ï€ÎµÎ¹. Î£Î±Ï‚ ÏƒÏ…Î½Î¹ÏƒÏ„Î¿ÏÎ¼Îµ Î½Î± ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¹Î®ÏƒÎµÏ„Îµ Î±Ï…Ï„Î® Ï„Î·Î½ ÎµÎ½ÏŒÏ„Î·Ï„Î± Î³Î¹Î± Î½Î± ÎÏ‡ÎµÏ„Îµ ÎºÎ±Î»ÏÏ„ÎµÏÎ± Î±Ï€Î¿Ï„ÎµÎ»ÎÏƒÎ¼Î±Ï„Î± Î¼Îµ Ï„Î¿Î½ ÎµÎ½Ï„Î¿Ï€Î¹ÏƒÎ¼ÏŒ Ï„ÏÏ€Î¿Ï… MIME. ",
 "Locale not working" => "Î— Î¼ÎµÏ„Î¬Ï†ÏÎ±ÏƒÎ· Î´ÎµÎ½ Î´Î¿Ï…Î»ÎµÏÎµÎ¹",
+"This ownCloud server can't set system locale to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "Î‘Ï…Ï„ÏŒÏ‚ Î¿ ownCloud Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„Î·Ï‚ Î´ÎµÎ½ Î¼Ï€Î¿ÏÎµÎ¯Ï„Îµ Î½Î± ÎµÏ†Î±ÏÎ¼Î¿ÏƒÎµÎ¹ Ï„Î¿ ÏƒÏÎ½Î¿Î»Î¿ Ï„Î¿Ï€Î¹ÎºÎ®Ï‚ Ï€ÏÎ¿ÏƒÎ±ÏÎ¼Î¿Î³Î®Ï‚ ÏƒÏ…ÏƒÏ„Î·Î¼Î¬Ï„Ï‰Î½ ÏƒÏ„Î¿ %s. Î‘Ï…Ï„ÏŒ ÏƒÎ·Î¼Î±Î¯Î½ÎµÎ¹ ÏŒÏ„Î¹ Î¼Ï€Î¿ÏÎµÎ¯ Î½Î± Ï…Ï€Î¬ÏÎ¾Î¿Ï…Î½ Ï€ÏÎ¿Î²Î»Î®Î¼Î±Ï„Î± Î¼Îµ Î¿ÏÎ¹ÏƒÎ¼ÎÎ½Î¿Ï…Ï‚ Ï‡Î±ÏÎ±ÎºÏ„Î®ÏÎµÏ‚ ÏƒÎµ Î¿Î½ÏŒÎ¼Î±Ï„Î± Î±ÏÏ‡ÎµÎ¯Ï‰Î½. Î£Î±Ï‚ ÏƒÏ…Î½Î¹ÏƒÏ„Î¿ÏÎ¼Îµ Î½Î± ÎµÎ³ÎºÎ±Ï„Î±ÏƒÏ„Î®ÏƒÎµÏ„Îµ Ï„Î¹Ï‚ Î±Ï€Î±ÏÎ±Î¯Ï„Î·Ï„ÎµÏ‚ ÏƒÏ…ÏƒÎºÎµÏ…Î±ÏƒÎ¯ÎµÏ‚ ÏƒÏ„Î¿ ÏƒÏÏƒÏ„Î·Î¼Î¬ ÏƒÎ±Ï‚ Î³Î¹Î± Î½Î± Ï…Ï€Î¿ÏƒÏ„Î·ÏÎ¯Ï‡Î¸ÎµÎ¹ Ï„Î¿ %s. ",
 "Internet connection not working" => "Î— ÏƒÏÎ½Î´ÎµÏƒÎ· ÏƒÏ„Î¿ Î´Î¹Î±Î´Î¯ÎºÏ„Ï…Î¿ Î´ÎµÎ½ Î´Î¿Ï…Î»ÎµÏÎµÎ¹",
+"This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps donÂ´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "Î‘Ï…Ï„ÏŒÏ‚ Î¿ Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„Î®Ï‚ ownCloud Î´ÎµÎ½ ÎÏ‡ÎµÎ¹ ÏƒÏÎ½Î´ÎµÏƒÎ· ÏƒÏ„Î¿ Î”Î¹Î±Î´Î¯ÎºÏ„Ï…Î¿. Î‘Ï…Ï„ÏŒ ÏƒÎ·Î¼Î±Î¯Î½ÎµÎ¹ ÏŒÏ„Î¹ Î¿ÏÎ¹ÏƒÎ¼ÎÎ½Î± Î±Ï€ÏŒ Ï„Î± Ï‡Î±ÏÎ±ÎºÏ„Î·ÏÎ¹ÏƒÏ„Î¹ÎºÎ¬ Î³Î½Ï‰ÏÎ¯ÏƒÎ¼Î±Ï„Î± ÏŒÏ€Ï‰Ï‚ Î· Ï„Î¿Ï€Î¿Î¸ÎÏ„Î·ÏƒÎ· ÎµÎ¾Ï‰Ï„ÎµÏÎ¹ÎºÎ®Ï‚ Î±Ï€Î¿Î¸Î®ÎºÎµÏ…ÏƒÎ·Ï‚, Î¿Î¹ ÎºÎ¿Î¹Î½Î¿Ï€Î¿Î¹Î®ÏƒÎµÎ¹Ï‚ ÏƒÏ‡ÎµÏ„Î¹ÎºÎ¬ Î¼Îµ Î±Î½Î±Î½ÎµÏ‰ÏƒÎµÎ¹Ï‚, Î® ÎµÎ³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ· 3Ï‰Î½ ÎµÏ†Î±ÏÎ¼Î¿Î³ÎÏ‚ Î´ÎµÎ½ Î»ÎµÎ¹Ï„Î¿Ï…ÏÎ³Î¿ÏÎ½.  Î— Ï€ÏÏŒÏƒÎ²Î±ÏƒÎ· ÏƒÎµ Î±ÏÏ‡ÎµÎ¯Î± ÎºÎ±Î¹ Î· Î±Ï€Î¿ÏƒÏ„Î¿Î»Î® Î¼Î·Î½Ï…Î¼Î¬Ï„Ï‰Î½ Î·Î»ÎµÎºÏ„ÏÎ¿Î½Î¹ÎºÎ¿Ï Ï„Î±Ï‡Ï…Î´ÏÎ¿Î¼ÎµÎ¯Î¿Ï… Î¼Ï€Î¿ÏÎµÎ¯ ÎµÏ€Î¯ÏƒÎ·Ï‚ Î½Î± Î¼Î·Î½ Î»ÎµÎ¹Ï„Î¿Ï…ÏÎ³ÎµÎ¯. Î£Î±Ï‚ Ï€ÏÎ¿Ï„ÎµÎ¯Î½Î¿Ï…Î¼Îµ Î½Î± ÏƒÏÎ½Î´ÎµÎ¸ÎµÎ¹Ï„Îµ ÏƒÏ„Î¿ Î´Î¹Î±Î´Î¹ÎºÏ„Ï…Î¿ Î±Ï…Ï„ÏŒ Ï„Î¿Î½ Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„Î®, ÎµÎ¬Î½ Î¸ÎÎ»ÎµÏ„Îµ Î½Î± ÎÏ‡ÎµÏ„Îµ ÏŒÎ»Î± Ï„Î± Ï‡Î±ÏÎ±ÎºÏ„Î·ÏÎ¹ÏƒÏ„Î¹ÎºÎ¬ Ï„Î¿Ï… ownCloud.",
 "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",
@@ -58,9 +63,11 @@
 "Security" => "Î‘ÏƒÏ†Î¬Î»ÎµÎ¹Î±",
 "Enforce HTTPS" => "Î•Ï€Î¹Î²Î¿Î»Î® Ï‡ÏÎ®ÏƒÎ·Ï‚ HTTPS",
 "Enforces the clients to connect to ownCloud via an encrypted connection." => "Î•Ï€Î¹Î²Î¿Î»Î® ÏƒÏ„Î¿Ï…Ï‚ Ï€ÎµÎ»Î¬Ï„ÎµÏ‚ Î½Î± ÏƒÏ…Î½Î´ÎµÎ¸Î¿ÏÎ½ ÏƒÏ„Î¿ ownCloud Î¼ÎÏƒÏ‰ Î¼Î¹Î±Ï‚ ÎºÏÏ…Ï€Ï„Î¿Î³ÏÎ±Ï†Î·Î¼ÎÎ½Î·Ï‚ ÏƒÏÎ½Î´ÎµÏƒÎ·Ï‚.",
+"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "Î Î±ÏÎ±ÎºÎ±Î»ÏŽ ÏƒÏ…Î½Î´ÎµÎ¸ÎµÎ¯Ï„Îµ Î¼Îµ Ï„Î¿ ownCloud Î¼ÎÏƒÏ‰ HTTPS Î³Î¹Î± Î½Î± ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¹Î®ÏƒÎµÏ„Îµ Î® Î½Î± Î±Ï€ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¹Î®ÏƒÎµÏ„Îµ Ï„Î·Î½ ÎµÏ€Î¹Î²Î¿Î»Î® SSL. ",
 "Log" => "ÎšÎ±Ï„Î±Î³ÏÎ±Ï†ÎÏ‚",
 "Log level" => "Î•Ï€Î¯Ï€ÎµÎ´Î¿ ÎºÎ±Ï„Î±Î³ÏÎ±Ï†Î®Ï‚",
 "More" => "Î ÎµÏÎ¹ÏƒÏƒÏŒÏ„ÎµÏÎ±",
+"Less" => "Î›Î¹Î³ÏŒÏ„ÎµÏÎ±",
 "Version" => "ÎˆÎºÎ´Î¿ÏƒÎ·",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Î‘Î½Î±Ï€Ï„ÏÏ‡Î¸Î·ÎºÎµ Î±Ï€ÏŒ Ï„Î·Î½ <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ÎºÎ¿Î¹Î½ÏŒÏ„Î·Ï„Î± ownCloud</a>, Î¿ <a href=\"https://github.com/owncloud\" target=\"_blank\">Ï€Î·Î³Î±Î¯Î¿Ï‚ ÎºÏŽÎ´Î¹ÎºÎ±Ï‚</a> ÎµÎ¯Î½Î±Î¹ Ï…Ï€ÏŒ Î¬Î´ÎµÎ¹Î± Ï‡ÏÎ®ÏƒÎ·Ï‚ <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Add your App" => "Î ÏÏŒÏƒÎ¸ÎµÏƒÏ„Îµ Ï„Î· Î”Î¹ÎºÎ¹Î¬ ÏƒÎ±Ï‚ Î•Ï†Î±ÏÎ¼Î¿Î³Î®",
@@ -85,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" => "Î“Î»ÏŽÏƒÏƒÎ±",
@@ -99,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 e381794f6f3a5c4dd7130bf1f64a8b6d5f44c251..9fd1d5b320600b282116c4e53963809073124299 100644
--- a/settings/l10n/eo.php
+++ b/settings/l10n/eo.php
@@ -24,7 +24,20 @@
 "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",
 "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>." => "Ellaborita de la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">komunumo de ownCloud</a>, la <a href=\"https://github.com/owncloud\" target=\"_blank\">fontokodo</a> publikas laÅ la permesilo <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Add your App" => "Aldonu vian aplikaÄµon",
diff --git a/settings/l10n/es.php b/settings/l10n/es.php
index c8467853c4f52e7c2f0fabfe22e02c6971ecab52..aaf858cf2cf57fc5e82b010eab1a76849c32e171 100644
--- a/settings/l10n/es.php
+++ b/settings/l10n/es.php
@@ -1,72 +1,74 @@
 <?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....",
-"Updating...." => "Actualizando....",
-"Error while updating app" => "Error mientras se actualizaba",
+"Please wait...." => "Espere, por favor....",
 "Error" => "Error",
+"Updating...." => "Actualizando....",
+"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 con del sistema. Llame al archivo cron.php en la carpeta de owncloud vÃa un sistema conjob 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 a que usen la API de ComparticiÃ³n",
+"Allow apps to use the Share API" => "Permitir a las aplicaciones utilizar la API de ComparticiÃ³n",
 "Allow links" => "Permitir enlaces",
 "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.",
-"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 SSL",
-"Log" => "Historial",
-"Log level" => "Nivel de Historial",
+"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" => "Registro",
+"Log level" => "Nivel de registro",
 "More" => "MÃ¡s",
-"Version" => "Version",
+"Less" => "Menos",
+"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",
@@ -74,38 +76,35 @@
 "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",
+"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 b3788d49baa82f40d07345acdece00e35e0cdd29..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",
@@ -19,9 +20,9 @@
 "Disable" => "Desactivar",
 "Enable" => "Activar",
 "Please wait...." => "Por favor, esperÃ¡....",
+"Error" => "Error",
 "Updating...." => "Actualizando....",
 "Error while updating app" => "Error al actualizar",
-"Error" => "Error",
 "Updated" => "Actualizado",
 "Saving..." => "Guardando...",
 "deleted" => "borrado",
@@ -66,6 +67,7 @@
 "Log" => "Log",
 "Log level" => "Nivel de Log",
 "More" => "MÃ¡s",
+"Less" => "Menos",
 "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Ã±adÃ tu aplicaciÃ³n",
@@ -90,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",
@@ -104,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 649e91c43a69d40b4d91c43d1c8f36ed8ea619ae..f4bf379b7ef2db7b86c9187feb2580a9332ecbe1 100644
--- a/settings/l10n/et_EE.php
+++ b/settings/l10n/et_EE.php
@@ -1,15 +1,18 @@
 <?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",
+"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",
 "Unable to add user to group %s" => "Kasutajat ei saa lisada gruppi %s",
 "Unable to remove user from group %s" => "Kasutajat ei saa eemaldada grupist %s",
 "Couldn't update app." => "Rakenduse uuendamine ebaÃµnnestus.",
@@ -17,27 +20,56 @@
 "Disable" => "LÃ¼lita vÃ¤lja",
 "Enable" => "LÃ¼lita sisse",
 "Please wait...." => "Palun oota...",
+"Error" => "Viga",
 "Updating...." => "Uuendamine...",
 "Error while updating app" => "Viga rakenduse uuendamisel",
-"Error" => "Viga",
 "Updated" => "Uuendatud",
 "Saving..." => "Salvestamine...",
 "deleted" => "kustutatud",
 "undo" => "tagasi",
+"Unable to remove user" => "Kasutaja eemaldamine ebaÃµnnestus",
 "Groups" => "Grupid",
 "Group Admin" => "Grupi admin",
 "Delete" => "Kustuta",
 "add group" => "lisa grupp",
+"A valid username must be provided" => "Sisesta nÃµuetele vastav kasutajatunnus",
 "Error creating user" => "Viga kasutaja loomisel",
+"A valid password must be provided" => "Sisesta nÃµuetele vastav parool",
 "__language_name__" => "Eesti",
 "Security Warning" => "Turvahoiatus",
+"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." => "Andmete kataloog ja failid on tÃµenÃ¤oliselt internetis avalikult saadaval. .htaccess fail, mida pakub ownCloud, ei toimi. Soovitame tungivalt veebiserveri seadistust selliselt, et andmete kataloog ei oleks enam vabalt saadaval vÃµi tÃµstaksid andmete kataloogi oma veebiserveri veebi-juurkataloogist mujale.",
+"Setup Warning" => "Paigalduse hoiatus",
+"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.",
+"Please double check the <a href='%s'>installation guides</a>." => "Palun tutvu veelkord <a href='%s'>paigalduse juhenditega</a>.",
+"Module 'fileinfo' missing" => "Moodul 'fileinfo' puudub",
+"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP moodul 'fileinfo' puudub. Soovitame tungivalt see lisada saavutamaks parimaid tulemusi failitÃ¼Ã¼pide tuvastamisel.",
+"Locale not working" => "Lokalisatsioon ei toimi",
+"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 server ei suuda seadistada sÃ¼steemi lokalisatsiooni %s. See tÃ¤hendab, et vÃµib esineda probleeme teatud tÃ¤hemÃ¤rkidega failide nimedes. Soovitame tungivalt paigaldada sÃ¼steemi vajalikud pakid toetamaks %s.",
+"Internet connection not working" => "InternetiÃ¼hendus ei toimi",
+"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 serveril puudub toimiv internetiÃ¼hendus. See tÃ¤hendab, et mÃµned funktsionaalsused, nagu nÃ¤iteks vÃ¤liste andmehoidlate Ã¼hendamine, teavitused uuendustest vÃµi kolmandate osapoolte rakenduste paigaldamine ei tÃ¶Ã¶ta. Eemalt failidele ligipÃ¤Ã¤s ning teadete saatmine emailiga ei pruugi samuti toimida. Kui soovid tÃ¤ielikku funktsionaalsust, siis soovitame serverile tagada ligipÃ¤Ã¤s internetti.",
+"Cron" => "Cron",
+"Execute one task with each page loaded" => "KÃ¤ivita toiming lehe laadimisel",
+"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php on registreeritud webcron teenusena. Lae cron.php lehte owncloud veebikataloogist iga minut Ã¼le http.",
+"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Kasuta sÃ¼steemi cron teenust. KÃ¤ivita cron.php fail owncloud veebikataloogist kasutades sÃ¼steemi crontab toimingut iga minut.",
 "Sharing" => "Jagamine",
+"Enable Share API" => "Luba Share API",
+"Allow apps to use the Share API" => "Luba rakendustel kasutada Share API-t",
+"Allow links" => "Luba lingid",
+"Allow users to share items to the public with links" => "Luba kasutajatel jagada kirjeid avalike linkidega",
+"Allow resharing" => "Luba edasijagamine",
+"Allow users to share items shared with them again" => "Luba kasutajatel jagada edasi kirjeid, mida on neile jagatud",
+"Allow users to share with anyone" => "Luba kasutajatel kÃµigiga jagada",
+"Allow users to only share with users in their groups" => "Luba kasutajatel jagada kirjeid ainult nende grupi liikmetele, millesse nad ise kuuluvad",
 "Security" => "Turvalisus",
 "Enforce HTTPS" => "Sunni peale HTTPS-i kasutamine",
+"Enforces the clients to connect to ownCloud via an encrypted connection." => "Sunnib kliente ownCloudiga Ã¼henduma krÃ¼pteeritult.",
+"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "Palun Ã¼hendu selle ownCloud instantsiga Ã¼le HTTPS vÃµi keela SSL kasutamine.",
 "Log" => "Logi",
 "Log level" => "Logi tase",
 "More" => "Rohkem",
+"Less" => "VÃ¤hem",
 "Version" => "Versioon",
+"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>." => "Arendatud <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud kogukonna</a> poolt. <a href=\"https://github.com/owncloud\" target=\"_blank\">LÃ¤htekood</a> on avaldatud ja kaetud <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> litsentsiga.",
 "Add your App" => "Lisa oma rakendus",
 "More Apps" => "Veel rakendusi",
 "Select an App" => "Vali programm",
@@ -49,7 +81,10 @@
 "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",
 "Password" => "Parool",
 "Your password was changed" => "Sinu parooli on muudetud",
 "Unable to change your password" => "Sa ei saa oma parooli muuta",
@@ -57,17 +92,19 @@
 "New password" => "Uus parool",
 "Change password" => "Muuda parooli",
 "Display Name" => "NÃ¤idatav nimi",
-"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",
 "Language" => "Keel",
 "Help translate" => "Aita tÃµlkida",
 "WebDAV" => "WebDAV",
+"Use this address to connect to your ownCloud in your file manager" => "Kasuta seda aadressi Ã¼hendamaks oma ownCloudi failihalduriga",
 "Login Name" => "Kasutajanimi",
 "Create" => "Lisa",
+"Default Storage" => "Vaikimisi maht",
 "Unlimited" => "Piiramatult",
 "Other" => "Muu",
+"Storage" => "Maht",
 "change display name" => "muuda nÃ¤idatavat nime",
 "set new password" => "mÃ¤Ã¤ra uus parool",
 "Default" => "VaikevÃ¤Ã¤rtus"
diff --git a/settings/l10n/eu.php b/settings/l10n/eu.php
index 410cb8336af502bd3675611fa523ed3c371ceb4e..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",
@@ -19,9 +19,9 @@
 "Disable" => "Ez-gaitu",
 "Enable" => "Gaitu",
 "Please wait...." => "Itxoin mesedez...",
+"Error" => "Errorea",
 "Updating...." => "Eguneratzen...",
 "Error while updating app" => "Errorea aplikazioa eguneratzen zen bitartean",
-"Error" => "Errorea",
 "Updated" => "Eguneratuta",
 "Saving..." => "Gordetzen...",
 "deleted" => "ezabatuta",
@@ -66,6 +66,7 @@
 "Log" => "Egunkaria",
 "Log level" => "Erregistro maila",
 "More" => "Gehiago",
+"Less" => "Gutxiago",
 "Version" => "Bertsioa",
 "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 komunitateak</a> garatuta, <a href=\"https://github.com/owncloud\" target=\"_blank\">itubruru kodea</a><a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr> lizentziarekin banatzen da</a>.",
 "Add your App" => "Gehitu zure aplikazioa",
@@ -90,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",
@@ -104,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 688374e8e3bb47fe5aeb09db8c81b1a99075b786..1abb70f27a639a6b7a965ff14a69b3ab5928a033 100644
--- a/settings/l10n/fa.php
+++ b/settings/l10n/fa.php
@@ -4,39 +4,70 @@
 "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" => "Ø¯Ø±Ø®ÙˆØ§Ø³Øª ØºÛŒØ± Ù‚Ø§Ø¨Ù„ Ù‚Ø¨ÙˆÙ„",
+"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" => "ÙØ¹Ø§Ù„",
 "Please wait...." => "Ù„Ø·ÙØ§ ØµØ¨Ø± Ú©Ù†ÛŒØ¯ ...",
-"Updating...." => "Ø¯Ø± ØØ§Ù„ Ø¨Ø±ÙˆØ² Ø±Ø³Ø§Ù†ÛŒ...",
 "Error" => "Ø®Ø·Ø§",
+"Updating...." => "Ø¯Ø± ØØ§Ù„ Ø¨Ø±ÙˆØ² Ø±Ø³Ø§Ù†ÛŒ...",
+"Error while updating app" => "Ø®Ø·Ø§ Ø¯Ø± Ù‡Ù†Ú¯Ø§Ù… Ø¨Ù‡Ù†Ú¯Ø§Ù… Ø³Ø§Ø²ÛŒ Ø¨Ø±Ù†Ø§Ù…Ù‡",
 "Updated" => "Ø¨Ø±ÙˆØ² Ø±Ø³Ø§Ù†ÛŒ Ø§Ù†Ø¬Ø§Ù… Ø´Ø¯",
-"Saving..." => "Ø¯Ø±ØØ§Ù„ Ø°Ø®ÛŒØ±Ù‡ ...",
+"Saving..." => "Ø¯Ø± ØØ§Ù„ Ø°Ø®ÛŒØ±Ù‡ Ø³Ø§Ø²ÛŒ...",
 "deleted" => "ØØ°Ù Ø´Ø¯Ù‡",
 "undo" => "Ø¨Ø§Ø²Ú¯Ø´Øª",
+"Unable to remove user" => "ØØ°Ù Ú©Ø§Ø±Ø¨Ø± Ø§Ù…Ú©Ø§Ù† Ù¾Ø°ÛŒØ± Ù†ÛŒØ³Øª",
 "Groups" => "Ú¯Ø±ÙˆÙ‡ Ù‡Ø§",
-"Delete" => "Ù¾Ø§Ú© Ú©Ø±Ø¯Ù†",
+"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." => "Ù…Ø§Ú˜ÙˆÙ„ 'fileinfo' PHP Ø§Ø² Ú©Ø§Ø± Ø§ÙØªØ§Ø¯Ù‡ Ø§Ø³Øª.Ù…Ø§ Ø§Ú©ÛŒØ¯Ø§ ØªÙˆØµÛŒÙ‡ Ù…ÛŒ Ú©Ù†ÛŒÙ… Ú©Ù‡ Ø§ÛŒÙ† Ù…Ø§Ú˜ÙˆÙ„ Ø±Ø§ ÙØ¹Ø§Ù„ Ú©Ù†ÛŒØ¯ ØªØ§ Ù†ØªØ§ÛŒØ¬ Ø¨Ù‡ØªØ±ÛŒ Ø¨Ù‡ ÙˆØ³ÛŒÙ„Ù‡ ÛŒ mime-type detection Ø¯Ø±ÛŒØ§ÙØª Ú©Ù†ÛŒØ¯.",
+"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 Ø§Ø±ØªØ¨Ø§Ø· Ø§ÛŒÙ†ØªØ±Ù†ØªÛŒ Ù†Ø¯Ø§Ø±Ø¯.Ø§ÛŒÙ† Ø¨Ø¯ÛŒÙ† Ù…Ø¹Ù†Ø§Ø³Øª Ú©Ù‡ Ø¨Ø¹Ø¶ÛŒ Ø§Ø² Ø®ØµÙˆØµÛŒØ§Øª Ù†Ø¸ÛŒØ± Ø®Ø§Ø±Ø¬ Ú©Ø±Ø¯Ù† Ù…Ù†Ø¨Ø¹ Ø°Ø®ÛŒØ±Ù‡ ÛŒ Ø®Ø§Ø±Ø¬ÛŒØŒ Ø§Ø·Ù„Ø§Ø¹Ø§Øª Ø¯Ø± Ù…ÙˆØ±Ø¯ Ø¨Ø±ÙˆØ²Ø±Ø³Ø§Ù†ÛŒ Ù‡Ø§ ÛŒØ§ Ù†ØµØ¨ Ø¨Ø±Ù†Ø§Ù…Ù‡ Ù‡Ø§ÛŒ Ù†ÙˆØ¹ 3Ø§Ù… Ú©Ø§Ø± Ù†Ù…ÛŒ Ú©Ù†Ù†Ø¯.Ø¯Ø³ØªØ±Ø³ÛŒ Ø¨Ù‡ ÙØ§ÛŒÙ„ Ù‡Ø§ Ø§Ø² Ø±Ø§Ù‡ Ø¯ÙˆØ± Ùˆ Ø§Ø±Ø³Ø§Ù„ Ø¢Ú¯Ø§Ù‡ Ø³Ø§Ø²ÛŒ Ø§ÛŒÙ…ÛŒÙ„ Ù‡Ø§ Ù…Ù…Ú©Ù† Ø§Ø³Øª Ù‡Ù…Ú†Ù†Ø§Ù† Ú©Ø§Ø± Ù†Ú©Ù†Ù†Ø¯.Ø§Ú¯Ø±Ø´Ù…Ø§ Ù‡Ù…Ù‡ ÛŒ Ø®ØµÙˆØµÛŒØ§Øª OwnCloud Ù…ÛŒ Ø®ÙˆØ§Ù‡ÛŒØ¯ Ù…Ø§ Ù¾ÛŒØ´Ù†Ù‡Ø§Ø¯ Ù…ÛŒ Ú©Ù†ÛŒÙ… ØªØ§ Ø§Ø±ØªØ¨Ø§Ø· Ø§ÛŒÙ†ØªØ±Ù†ØªÛŒ Ù…Ø±Ø¨ÙˆØ· Ø¨Ù‡ Ø§ÛŒÙ† Ø³Ø±ÙˆØ± Ø±Ø§ ÙØ¹Ø§Ù„ Ú©Ù†ÛŒØ¯.",
+"Execute one task with each page loaded" => "Ø§Ø¬Ø±Ø§ÛŒ ÛŒÚ© ÙˆØ¸ÛŒÙÙ‡ Ø¨Ø§ Ù‡Ø± Ø¨Ø§Ø± Ø¨Ø§Ø±Ú¯Ø°Ø§Ø±ÛŒ ØµÙØÙ‡",
 "Sharing" => "Ø§Ø´ØªØ±Ø§Ú© Ú¯Ø°Ø§Ø±ÛŒ",
+"Enable Share API" => "ÙØ¹Ø§Ù„ Ú©Ø±Ø¯Ù† API Ø§Ø´ØªØ±Ø§Ú© Ú¯Ø°Ø§Ø±ÛŒ",
+"Allow apps to use the Share API" => "Ø§Ø¬Ø§Ø²Ù‡ ÛŒ Ø¨Ø±Ù†Ø§Ù…Ù‡ Ù‡Ø§ Ø¨Ø±Ø§ÛŒ Ø§Ø³ØªÙØ§Ø¯Ù‡ Ø§Ø² API Ø§Ø´ØªØ±Ø§Ú© Ú¯Ø°Ø§Ø±ÛŒ",
+"Allow links" => "Ø§Ø¬Ø§Ø²Ù‡ ÛŒ Ù„ÛŒÙ†Ú© Ù‡Ø§",
 "Allow users to share items to the public with links" => "Ø§Ø¬Ø§Ø²Ù‡ Ø¯Ø§Ø¯Ù† Ø¨Ù‡ Ú©Ø§Ø±Ø¨Ø±Ø§Ù† Ø¨Ø±Ø§ÛŒ Ø§Ø´ØªØ±Ø§Ú© Ú¯Ø°Ø§Ø±ÛŒ Ø¢ÛŒØªÙ… Ù‡Ø§ Ø¨Ø§ Ø¹Ù…ÙˆÙ… Ø§Ø² Ø·Ø±ÛŒÙ‚ Ù¾ÛŒÙˆÙ†Ø¯ Ù‡Ø§",
+"Allow resharing" => "Ù…Ø¬ÙˆØ² Ø§Ø´ØªØ±Ø§Ú© Ú¯Ø°Ø§Ø±ÛŒ Ù…Ø¬Ø¯Ø¯",
+"Allow users to share items shared with them again" => "Ø§Ø¬Ø§Ø²Ù‡ Ø¨Ù‡ Ú©Ø§Ø±Ø¨Ø±Ø§Ù† Ø¨Ø±Ø§ÛŒ Ø§Ø´ØªØ±Ø§Ú© Ú¯Ø°Ø§Ø±ÛŒ Ø¯ÙˆØ¨Ø§Ø±Ù‡ Ø¨Ø§ Ø¢Ù†Ù‡Ø§",
+"Allow users to share with anyone" => "Ø§Ø¬Ø§Ø²Ù‡ Ø¨Ù‡ Ú©Ø§Ø¨Ø±Ø§Ù† Ø¨Ø±Ø§ÛŒ Ø§Ø´ØªØ±Ø§Ú© Ú¯Ø°Ø§Ø±ÛŒ Ø¨Ø§ Ù‡Ù…Ù‡",
+"Allow users to only share with users in their groups" => "Ø§Ø¬Ø§Ø²Ù‡ Ø¨Ù‡ Ú©Ø§Ø±Ø¨Ø±Ø§Ù† Ø¨Ø±Ø§ÛŒ Ø§Ø´ØªØ±Ø§Ú© Ú¯Ø°Ø§Ø±ÛŒ ØŒ ØªÙ†Ù‡Ø§ Ø¨Ø§ Ø¯ÛŒÚ¯Ø± Ú©Ø§Ø¨Ø±Ø§Ù† Ú¯Ø±ÙˆÙ‡ Ø®ÙˆØ¯Ø´Ø§Ù†",
 "Security" => "Ø§Ù…Ù†ÛŒØª",
+"Enforce HTTPS" => "ÙˆØ§Ø¯Ø§Ø± Ú©Ø±Ø¯Ù† HTTPS",
+"Enforces the clients to connect to ownCloud via an encrypted connection." => "ÙˆØ§Ø¯Ø§Ø± Ú©Ø±Ø¯Ù† Ù…Ø´ØªØ±ÛŒØ§Ù† Ø¨Ø±Ø§ÛŒ Ø§Ø±ØªØ¨Ø§Ø· Ø¨Ø§ ownCloud Ø§Ø² Ø·Ø±ÛŒÙ‚ Ø±Ù…Ø²Ú¯Ø°Ø§Ø±ÛŒ Ø§Ø±ØªØ¨Ø§Ø·",
+"Log" => "Ú©Ø§Ø±Ù†Ø§Ù…Ù‡",
 "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>, 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>.",
 "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>-Ù…Ø¬Ø§Ø² Ø§Ø² Ø·Ø±Ù <span class=\"author\"></span>",
 "Update" => "Ø¨Ù‡ Ø±ÙˆØ² Ø±Ø³Ø§Ù†ÛŒ",
 "User Documentation" => "Ù…Ø³ØªÙ†Ø¯Ø§Øª Ú©Ø§Ø±Ø¨Ø±",
 "Administrator Documentation" => "Ù…Ø³ØªÙ†Ø¯Ø§Øª Ù…Ø¯ÛŒØ±",
@@ -44,6 +75,8 @@
 "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" => "Ø±Ù…Ø² Ø¹Ø¨ÙˆØ± Ø´Ù…Ø§ ØªØºÛŒÛŒØ± ÛŒØ§ÙØª",
@@ -52,19 +85,17 @@
 "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" => "Ø²Ø¨Ø§Ù†",
 "Help translate" => "Ø¨Ù‡ ØªØ±Ø¬Ù…Ù‡ Ø¢Ù† Ú©Ù…Ú© Ú©Ù†ÛŒØ¯",
+"Use this address to connect to your ownCloud in your file manager" => "Ø§Ø² Ø§ÛŒÙ† Ù†Ø´Ø§Ù†ÛŒ Ø¨Ø±Ø§ÛŒ Ø§ØªØµØ§Ù„ Ø¨Ù‡ ownCloud Ø®ÙˆØ¯ØªØ§Ù† Ø¯Ø± Ø¨Ø®Ø´ Ù…Ø¯ÛŒØ±ÛŒØª ÙØ§ÛŒÙ„ Ø®ÙˆØ¯ØªØ§Ù† Ø§Ø³ØªÙØ§Ø¯Ù‡ Ú©Ù†ÛŒØ¯",
 "Login Name" => "Ù†Ø§Ù… Ú©Ø§Ø±Ø¨Ø±ÛŒ",
 "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 ab43f61eeedc8d7c79a455766514c0ad35f43a03..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",
@@ -19,9 +20,9 @@
 "Disable" => "Poista kÃ¤ytÃ¶stÃ¤",
 "Enable" => "KÃ¤ytÃ¤",
 "Please wait...." => "Odota hetki...",
+"Error" => "Virhe",
 "Updating...." => "PÃ¤ivitetÃ¤Ã¤n...",
 "Error while updating app" => "Virhe sovellusta pÃ¤ivittÃ¤essÃ¤",
-"Error" => "Virhe",
 "Updated" => "PÃ¤ivitetty",
 "Saving..." => "Tallennetaan...",
 "deleted" => "poistettu",
@@ -54,6 +55,7 @@
 "Log" => "Loki",
 "Log level" => "Lokitaso",
 "More" => "EnemmÃ¤n",
+"Less" => "VÃ¤hemmÃ¤n",
 "Version" => "Versio",
 "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>." => "KehityksestÃ¤ on vastannut <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-yhteisÃ¶</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">lÃ¤hdekoodi</a> on julkaistu lisenssin <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> alaisena.",
 "Add your App" => "LisÃ¤Ã¤ sovelluksesi",
@@ -77,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",
@@ -89,8 +88,10 @@
 "Use this address to connect to your ownCloud in your file manager" => "KÃ¤ytÃ¤ tÃ¤tÃ¤ osoitetta yhdistÃ¤essÃ¤si ownCloudiisi tiedostonhallintaa kÃ¤yttÃ¤en",
 "Login Name" => "Kirjautumisnimi",
 "Create" => "Luo",
+"Default Storage" => "Oletustallennustila",
 "Unlimited" => "Rajoittamaton",
 "Other" => "Muu",
+"Storage" => "Tallennustila",
 "change display name" => "vaihda nÃ¤yttÃ¶nimi",
 "set new password" => "aseta uusi salasana",
 "Default" => "Oletus"
diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php
index c5ad5642d11fd997d4f797a43b78100468f9464f..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",
@@ -19,11 +20,11 @@
 "Disable" => "DÃ©sactiver",
 "Enable" => "Activer",
 "Please wait...." => "Veuillez patienterâ€¦",
+"Error" => "Erreur",
 "Updating...." => "Mise Ã  jour...",
 "Error while updating app" => "Erreur lors de la mise Ã  jour de l'application",
-"Error" => "Erreur",
 "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",
@@ -66,6 +67,7 @@
 "Log" => "Log",
 "Log level" => "Niveau de log",
 "More" => "Plus",
+"Less" => "Moins",
 "Version" => "Version",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "DÃ©veloppÃ© par la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">communautÃ© ownCloud</a>, le <a href=\"https://github.com/owncloud\" target=\"_blank\">code source</a> est publiÃ© sous license <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Add your App" => "Ajoutez votre application",
@@ -90,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 4d629e06ccb5a674e224557070aa8c8fe59d3860..61e86a83f3355776a59a9066ead62fae043f1d01 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",
@@ -19,9 +20,9 @@
 "Disable" => "Desactivar",
 "Enable" => "Activar",
 "Please wait...." => "Agarde...",
+"Error" => "Erro",
 "Updating...." => "Actualizando...",
 "Error while updating app" => "Produciuse un erro mentres actualizaba o aplicativo",
-"Error" => "Erro",
 "Updated" => "Actualizado",
 "Saving..." => "Gardando...",
 "deleted" => "eliminado",
@@ -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",
@@ -66,6 +67,7 @@
 "Log" => "Rexistro",
 "Log level" => "Nivel de rexistro",
 "More" => "MÃ¡is",
+"Less" => "Menos",
 "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>." => "Desenvolvido pola <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidade ownCloud</a>, o <a href=\"https://github.com/owncloud\" target=\"_blank\">cÃ³digo fonte</a> estÃ¡ baixo a licenza <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Add your App" => "Engada o seu aplicativo",
@@ -90,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",
diff --git a/settings/l10n/he.php b/settings/l10n/he.php
index 196dc4d146f2cc1ac3d9b32bbbe4dc7dafa0f3a9..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,7 +24,9 @@
 "__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" => "×’×¨×¡×",
 "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" => "×”×•×¡×¤×ª ×”×™×™×©×•× ×©×œ×š",
@@ -40,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 4d5f9e0dbce118f5ad53c4cf91c157e23f809d67..178fd1d73e1dbae9cf7e1fc903c8fbedde616689 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,11 +18,11 @@
 "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...",
 "Error while updating app" => "Hiba tÃ¶rtÃ©nt a programfrissÃtÃ©s kÃ¶zben",
-"Error" => "Hiba",
 "Updated" => "FrissÃtve",
 "Saving..." => "MentÃ©s...",
 "deleted" => "tÃ¶rÃ¶lve",
@@ -66,6 +67,7 @@
 "Log" => "NaplÃ³zÃ¡s",
 "Log level" => "NaplÃ³zÃ¡si szint",
 "More" => "TÃ¶bb",
+"Less" => "Kevesebb",
 "Version" => "VerziÃ³",
 "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 programot az <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud kÃ¶zÃ¶ssÃ©g</a> fejleszti. A <a href=\"https://github.com/owncloud\" target=\"_blank\">forrÃ¡skÃ³d</a> az <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> feltÃ©telei mellett hasznÃ¡lhatÃ³ fÃ¶l.",
 "Add your App" => "Az alkalmazÃ¡s hozzÃ¡adÃ¡sa",
@@ -90,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!",
diff --git a/settings/l10n/ia.php b/settings/l10n/ia.php
index 6e7feaf378c84cedbdaed01419053c22aef30884..8d67b45347a72e1b0b6b78d867f00fe8c09a02bf 100644
--- a/settings/l10n/ia.php
+++ b/settings/l10n/ia.php
@@ -1,12 +1,16 @@
 <?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",
+"Get the apps to sync your files" => "Obtene le apps (applicationes) pro synchronizar tu files",
 "Password" => "Contrasigno",
 "Unable to change your password" => "Non pote cambiar tu contrasigno",
 "Current password" => "Contrasigno currente",
diff --git a/settings/l10n/id.php b/settings/l10n/id.php
index 7f53a50b248095b9c51186d7731e202e6d73b4c7..fb5ee229f155a49edbdaba65cfdaecf7b29190a6 100644
--- a/settings/l10n/id.php
+++ b/settings/l10n/id.php
@@ -1,36 +1,110 @@
 <?php $TRANSLATIONS = array(
-"Authentication error" => "autentikasi bermasalah",
-"Email saved" => "Email tersimpan",
-"Invalid email" => "Email tidak sah",
-"Language changed" => "Bahasa telah diganti",
+"Unable to load list from App Store" => "Tidak dapat memuat daftar dari App Store",
+"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",
+"Could not enable app. " => "Tidak dapat mengaktifkan aplikasi.",
+"Email saved" => "Email disimpan",
+"Invalid email" => "Email tidak valid",
+"Unable to delete group" => "Tidak dapat menghapus grup",
+"Unable to delete user" => "Tidak dapat menghapus pengguna",
+"Language changed" => "Bahasa telah diubah",
 "Invalid request" => "Permintaan tidak valid",
-"Disable" => "NonAktifkan",
-"Enable" => "Aktifkan",
-"Error" => "kesalahan",
+"Admins can't remove themself from the admin group" => "Admin tidak dapat menghapus dirinya sendiri dari grup admin",
+"Unable to add user to group %s" => "Tidak dapat menambahkan pengguna ke grup %s",
+"Unable to remove user from group %s" => "Tidak dapat menghapus pengguna dari grup %s",
+"Couldn't update app." => "Tidak dapat memperbarui aplikasi.",
+"Update to {appversion}" => "Perbarui ke {appversion}",
+"Disable" => "Nonaktifkan",
+"Enable" => "aktifkan",
+"Please wait...." => "Mohon tunggu....",
+"Error" => "Galat",
+"Updating...." => "Memperbarui....",
+"Error while updating app" => "Gagal ketika memperbarui aplikasi",
+"Updated" => "Diperbarui",
 "Saving..." => "Menyimpan...",
 "deleted" => "dihapus",
-"undo" => "batal dikerjakan",
-"Groups" => "Group",
+"undo" => "urungkan",
+"Unable to remove user" => "Tidak dapat menghapus pengguna",
+"Groups" => "Grup",
 "Group Admin" => "Admin Grup",
 "Delete" => "Hapus",
+"add group" => "tambah grup",
+"A valid username must be provided" => "Tuliskan nama pengguna yang valid",
+"Error creating user" => "Gagal membuat pengguna",
+"A valid password must be provided" => "Tuliskan sandi yang valid",
 "__language_name__" => "__language_name__",
-"Security Warning" => "peringatan keamanan",
-"More" => "lagi",
-"Add your App" => "Tambahkan App anda",
-"Select an App" => "Pilih satu aplikasi",
+"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 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.",
+"Locale not working" => "Kode pelokalan tidak berfungsi",
+"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." => "Server ownCloud ini tidak dapat menyetel kode pelokalan sistem ke nilai %s. Ini berarti mungkin akan terjadi masalah pada karakter tertentu pada nama berkas. Kami sarankan untuk menginstal paket yang dibutuhkan pada sistem Anda untuk mendukung %s.",
+"Internet connection not working" => "Koneksi internet tidak berfungsi",
+"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." => "Server ownCloud ini tidak memiliki koneksi internet yang berfungsi. Artinya, beberapa fitur misalnya mengaitkan penyimpanan eksternal, notifikasi tentang pembaruan, atau instalasi aplikasi dari pihak ketiga tidak akan dapat berfungsi. Pengaksesan berkas secara online dan pengiriman email notifikasi mungkin juga tidak dapat berfungsi. Kami sarankan untuk mengaktifkan koneksi internet server ini agar mendapatkan semua fitur ownCloud.",
+"Cron" => "Cron",
+"Execute one task with each page loaded" => "Jalankan tugas setiap kali halaman dimuat",
+"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php telah terdaftar sebagai layanan webcron. Panggil halaman cron.php pada akar direktori ownCloud tiap menit lewat http.",
+"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Gunakan layanan cron sistem. Panggil berkas cron.php pada folder ownCloud lewat cronjob sistem tiap menit.",
+"Sharing" => "Berbagi",
+"Enable Share API" => "Aktifkan API Pembagian",
+"Allow apps to use the Share API" => "Izinkan aplikasi untuk menggunakan API Pembagian",
+"Allow links" => "Izinkan tautan",
+"Allow users to share items to the public with links" => "Izinkan pengguna untuk berbagi item kepada publik lewat tautan",
+"Allow resharing" => "Izinkan pembagian ulang",
+"Allow users to share items shared with them again" => "Izinkan pengguna untuk berbagi kembali item yang dibagikan kepada mereka.",
+"Allow users to share with anyone" => "Izinkan pengguna untuk berbagi kepada siapa saja",
+"Allow users to only share with users in their groups" => "Hanya izinkan pengguna untuk berbagi dengan pengguna pada grup mereka sendiri",
+"Security" => "Keamanan",
+"Enforce HTTPS" => "Selalu Gunakan HTTPS",
+"Enforces the clients to connect to ownCloud via an encrypted connection." => "Paksa klien untuk tersambung ke ownCloud lewat koneksi yang dienkripsi.",
+"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "Silakan sambungkan ke instalasi ownCloud lewat HTTPS untuk mengaktifkan atau menonaktifkan fitur SSL.",
+"Log" => "Catat",
+"Log level" => "Level pencatatan",
+"More" => "Lainnya",
+"Less" => "Ciutkan",
+"Version" => "Versi",
+"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>." => "Dikembangkan oleh <a href=\"http://ownCloud.org/contact\" target=\"_blank\">komunitas ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">kode sumber</a> dilisensikan di bawah <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+"Add your App" => "Tambahkan Aplikasi Anda",
+"More Apps" => "Aplikasi Lainnya",
+"Select an App" => "Pilih Aplikasi",
 "See application page at apps.owncloud.com" => "Lihat halaman aplikasi di apps.owncloud.com",
-"Update" => "Pembaruan",
-"Get the apps to sync your files" => "Dapatkan aplikasi untuk sinkronisasi berkas anda",
-"Password" => "Password",
-"Unable to change your password" => "Tidak dapat merubah password anda",
-"Current password" => "Password saat ini",
-"New password" => "kata kunci baru",
-"Change password" => "Rubah password",
+"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-dilisensikan oleh <span class=\"author\"></span>",
+"Update" => "Perbarui",
+"User Documentation" => "Dokumentasi Pengguna",
+"Administrator Documentation" => "Dokumentasi Administrator",
+"Online Documentation" => "Dokumentasi Online",
+"Forum" => "Forum",
+"Bugtracker" => "Bugtracker",
+"Commercial Support" => "Dukungan Komersial",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Anda telah menggunakan <strong>%s</strong> dari total <strong>%s</strong>",
+"Get the apps to sync your files" => "Dapatkan aplikasi untuk sinkronisasi berkas Anda",
+"Show First Run Wizard again" => "Tampilkan Penuntun Konfigurasi Awal",
+"Password" => "Sandi",
+"Your password was changed" => "Sandi Anda telah diubah",
+"Unable to change your password" => "Gagal mengubah sandi Anda",
+"Current password" => "Sandi saat ini",
+"New password" => "Sandi baru",
+"Change password" => "Ubah sandi",
+"Display Name" => "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 password",
+"Your email address" => "Alamat email Anda",
+"Fill in an email address to enable password recovery" => "Masukkan alamat email untuk mengaktifkan pemulihan sandi",
 "Language" => "Bahasa",
 "Help translate" => "Bantu menerjemahkan",
+"WebDAV" => "WebDAV",
+"Use this address to connect to your ownCloud in your file manager" => "Gunakan alamat ini untuk terhubung ke ownCloud Anda pada manajer berkas ",
+"Login Name" => "Nama Masuk",
 "Create" => "Buat",
-"Other" => "Lain-lain"
+"Default Storage" => "Penyimpanan Baku",
+"Unlimited" => "Tak terbatas",
+"Other" => "Lainnya",
+"Storage" => "Penyimpanan",
+"change display name" => "ubah nama tampilan",
+"set new password" => "setel sandi baru",
+"Default" => "Baku"
 );
diff --git a/settings/l10n/is.php b/settings/l10n/is.php
index e5c6e9f63471a0a4ad685f01af878ae3c3ebd0f1..b3172855c149963112d41702037f261e0fe1d662 100644
--- a/settings/l10n/is.php
+++ b/settings/l10n/is.php
@@ -25,6 +25,7 @@
 "Security Warning" => "Ã–ryggis aÃ°vÃ¶run",
 "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." => "Gagnamappan Ã¾Ãn er aÃ° Ã¶llum lÃkindum aÃ°gengileg frÃ¡ internetinu. SkrÃ¡in .htaccess sem fylgir meÃ° ownCloud er ekki aÃ° virka. ViÃ° mÃ¦lum eindregiÃ° meÃ° Ã¾vÃ aÃ° Ã¾Ãº stillir vefÃ¾jÃ³ninn Ã¾annig aÃ° gagnamappan verÃ°i ekki aÃ°gengileg frÃ¡ internetinu eÃ°a fÃ¦rir hana Ãºt fyrir vefrÃ³tina.",
 "More" => "Meira",
+"Less" => "Minna",
 "Version" => "ÃštgÃ¡fa",
 "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>." => "ÃžrÃ³aÃ° af <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud samfÃ©laginu</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">forrita kÃ³Ã°inn</a> er skrÃ¡Ã°u meÃ° <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Add your App" => "BÃ¦ta viÃ° forriti",
diff --git a/settings/l10n/it.php b/settings/l10n/it.php
index 699ded137a60ba94560403f29fabea5e074d5543..4fc8dc5f64f3aaa17530816af5cc1b3c3ec9b0dd 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",
@@ -19,9 +20,9 @@
 "Disable" => "Disabilita",
 "Enable" => "Abilita",
 "Please wait...." => "Attendere...",
+"Error" => "Errore",
 "Updating...." => "Aggiornamento in corso...",
 "Error while updating app" => "Errore durante l'aggiornamento",
-"Error" => "Errore",
 "Updated" => "Aggiornato",
 "Saving..." => "Salvataggio in corso...",
 "deleted" => "eliminati",
@@ -65,7 +66,8 @@
 "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>.",
 "Add your App" => "Aggiungi la tua applicazione",
@@ -90,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",
diff --git a/settings/l10n/ja_JP.php b/settings/l10n/ja_JP.php
index 181656bd392e670e7356d3fa20431dcea7172519..defc96e81b6a5b27f7d0cf1e8a28cd9915b00d35 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,18 +11,18 @@
 "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...." => "æ›´æ–°ä¸....",
 "Error while updating app" => "ã‚¢ãƒ—ãƒªã®æ›´æ–°ä¸ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿ",
-"Error" => "ã‚¨ãƒ©ãƒ¼",
 "Updated" => "æ›´æ–°æ¸ˆã¿",
 "Saving..." => "ä¿å˜ä¸...",
 "deleted" => "å‰Šé™¤",
@@ -65,9 +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" => "ã‚¢ãƒ—ãƒªã‚’é¸æŠžã—ã¦ãã ã•ã„",
@@ -81,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" => "è¨€èªž",
diff --git a/settings/l10n/ka_GE.php b/settings/l10n/ka_GE.php
index 27699d3f980d7e6db9e17f9097842bb17cb6c8cd..f6f4249e68fcff8ef6d3c489fbe3890238780c52 100644
--- a/settings/l10n/ka_GE.php
+++ b/settings/l10n/ka_GE.php
@@ -1,6 +1,8 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "áƒáƒžáƒšáƒ˜áƒ™áƒáƒªáƒ˜áƒ”áƒ‘áƒ˜áƒ¡ áƒ¡áƒ˜áƒ áƒ•áƒ”áƒ  áƒ©áƒáƒ›áƒáƒ˜áƒ¢áƒ•áƒ˜áƒ áƒ—áƒ App Store",
 "Authentication error" => "áƒáƒ•áƒ—áƒ”áƒœáƒ¢áƒ˜áƒ¤áƒ˜áƒ™áƒáƒªáƒ˜áƒ˜áƒ¡ áƒ¨áƒ”áƒªáƒ“áƒáƒ›áƒ",
+"Your display name has been changed." => "áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ áƒ“áƒ˜áƒ¡áƒ¤áƒšáƒ”áƒ˜áƒ¡ áƒ¡áƒáƒ®áƒ”áƒšáƒ˜ áƒ£áƒ™áƒ•áƒ” áƒ¨áƒ”áƒ˜áƒªáƒ•áƒáƒšáƒ",
+"Unable to change display name" => "áƒ“áƒ˜áƒ¡áƒ¤áƒšáƒ”áƒ˜áƒ¡ áƒ¡áƒáƒ®áƒ”áƒšáƒ˜áƒ¡ áƒ¨áƒ”áƒªáƒ•áƒšáƒ áƒ•áƒ”áƒ  áƒ›áƒáƒ®áƒ”áƒ áƒ®áƒ“áƒ",
 "Group already exists" => "áƒ¯áƒ’áƒ£áƒ¤áƒ˜ áƒ£áƒ™áƒ•áƒ” áƒáƒ áƒ¡áƒ”áƒ‘áƒáƒ‘áƒ¡",
 "Unable to add group" => "áƒ¯áƒ’áƒ£áƒ¤áƒ˜áƒ¡ áƒ“áƒáƒ›áƒáƒ¢áƒ”áƒ‘áƒ áƒ•áƒ”áƒ  áƒ›áƒáƒ®áƒ”áƒ áƒ®áƒ“áƒ",
 "Could not enable app. " => "áƒ•áƒ”áƒ  áƒ›áƒáƒ®áƒ”áƒ áƒ®áƒ“áƒ áƒáƒžáƒšáƒ˜áƒ™áƒáƒªáƒ˜áƒ˜áƒ¡ áƒ©áƒáƒ áƒ—áƒ•áƒ.",
@@ -10,35 +12,100 @@
 "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",
+"Couldn't update app." => "áƒ•áƒ”áƒ  áƒ›áƒáƒ®áƒ”áƒ áƒ®áƒ“áƒ áƒáƒžáƒšáƒ˜áƒ™áƒáƒªáƒ˜áƒ˜áƒ¡ áƒ’áƒáƒœáƒáƒ®áƒšáƒ”áƒ‘áƒ.",
+"Update to {appversion}" => "áƒ’áƒáƒœáƒáƒáƒ®áƒšáƒ” {appversion}â€“áƒ›áƒ“áƒ”",
 "Disable" => "áƒ’áƒáƒ›áƒáƒ áƒ—áƒ•áƒ",
 "Enable" => "áƒ©áƒáƒ áƒ—áƒ•áƒ",
+"Please wait...." => "áƒ“áƒáƒ˜áƒªáƒáƒ“áƒ”áƒ—....",
 "Error" => "áƒ¨áƒ”áƒªáƒ“áƒáƒ›áƒ",
+"Updating...." => "áƒ›áƒ˜áƒ›áƒ“áƒ˜áƒœáƒáƒ áƒ”áƒáƒ‘áƒ¡ áƒ’áƒáƒœáƒáƒ®áƒšáƒ”áƒ‘áƒ....",
+"Error while updating app" => "áƒ¨áƒ”áƒªáƒ“áƒáƒ›áƒ áƒáƒžáƒšáƒ˜áƒ™áƒáƒªáƒ˜áƒ˜áƒ¡ áƒ’áƒáƒœáƒáƒ®áƒšáƒ”áƒ‘áƒ˜áƒ¡ áƒ“áƒ áƒáƒ¡",
+"Updated" => "áƒ’áƒáƒœáƒáƒ®áƒšáƒ”áƒ‘áƒ£áƒšáƒ˜áƒ",
 "Saving..." => "áƒ¨áƒ”áƒœáƒáƒ®áƒ•áƒ...",
+"deleted" => "áƒ¬áƒáƒ¨áƒšáƒ˜áƒšáƒ˜",
 "undo" => "áƒ“áƒáƒ‘áƒ áƒ£áƒœáƒ”áƒ‘áƒ",
-"Groups" => "áƒ¯áƒ’áƒ£áƒ¤áƒ˜",
+"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." => "áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ data áƒ“áƒ˜áƒ áƒ”áƒ¥áƒ¢áƒáƒ áƒ˜áƒ áƒ“áƒ áƒ¤áƒáƒ˜áƒšáƒ”áƒ‘áƒ˜ áƒáƒ áƒ˜áƒ¡ áƒ“áƒáƒ¨áƒ•áƒ”áƒ‘áƒáƒ“áƒ˜ áƒ˜áƒœáƒ¢áƒ”áƒ áƒœáƒ”áƒ¢áƒ˜áƒ“áƒáƒœ. .htaccess áƒ¤áƒáƒ˜áƒšáƒ˜ áƒ áƒáƒ›áƒ”áƒšáƒ¡áƒáƒª ownCloud áƒ’áƒ•áƒ—áƒáƒ•áƒáƒ–áƒáƒ‘áƒ¡ áƒáƒ  áƒ›áƒ£áƒ¨áƒáƒáƒ‘áƒ¡. áƒ©áƒ•áƒ”áƒœ áƒ’áƒ˜áƒ áƒ©áƒ”áƒ•áƒ— áƒ áƒáƒ› áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ áƒ•áƒ”áƒ‘áƒ¡áƒ”áƒ áƒ•áƒ”áƒ áƒ˜ áƒ“áƒáƒáƒ™áƒáƒœáƒ¤áƒ˜áƒ’áƒ£áƒ áƒ˜áƒ áƒáƒ— áƒ˜áƒ¡áƒ” áƒ áƒáƒ› data áƒ“áƒ˜áƒ áƒ”áƒ¥áƒ¢áƒáƒ áƒ˜áƒ áƒáƒ  áƒ˜áƒ§áƒáƒ¡ áƒ“áƒáƒ¨áƒ•áƒ”áƒ‘áƒáƒ“áƒ˜, áƒáƒœ áƒ’áƒáƒ˜áƒ¢áƒáƒœáƒáƒ— data áƒ“áƒ˜áƒ áƒ”áƒ¥áƒ¢áƒáƒ áƒ˜áƒ áƒ•áƒ”áƒ‘áƒ¡áƒ”áƒ áƒ•áƒ”áƒ áƒ˜áƒ¡ document root áƒ“áƒ˜áƒ áƒ”áƒ¥áƒ¢áƒáƒ áƒ˜áƒ˜áƒ¡ áƒ’áƒáƒ áƒ”áƒ—.",
+"Setup Warning" => "áƒ’áƒáƒ¤áƒ áƒ—áƒ®áƒ˜áƒšáƒ”áƒ‘áƒ áƒ“áƒáƒ§áƒ”áƒœáƒ”áƒ‘áƒ˜áƒ¡áƒáƒ¡",
+"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>.",
+"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 áƒ¡áƒ”áƒ áƒ•áƒ”áƒ áƒ¡ áƒáƒ  áƒ’áƒáƒáƒ©áƒœáƒ˜áƒ áƒ˜áƒœáƒ¢áƒ”áƒ áƒœáƒ”áƒ¢áƒ—áƒáƒœ áƒ™áƒáƒ•áƒ¨áƒ˜áƒ áƒ˜. áƒ”áƒ¡ áƒœáƒ˜áƒ¨áƒœáƒáƒ•áƒ¡ áƒ˜áƒ›áƒáƒ¡ áƒ áƒáƒ› áƒ’áƒáƒ áƒ™áƒ•áƒ”áƒ£áƒšáƒ˜ áƒ¤áƒ£áƒœáƒ¥áƒªáƒ˜áƒ”áƒ‘áƒ˜ áƒ áƒáƒ’áƒáƒ áƒ˜áƒªáƒáƒ áƒ”áƒ¥áƒ¡áƒ¢áƒ”áƒ áƒœáƒáƒš áƒ¡áƒáƒªáƒáƒ•áƒ”áƒ‘áƒ˜áƒ¡ áƒ›áƒáƒœáƒ¢áƒ˜áƒ áƒ”áƒ‘áƒ, áƒ¨áƒ”áƒ¢áƒ§áƒáƒ‘áƒ˜áƒœáƒ”áƒ‘áƒ”áƒ‘áƒ˜ áƒ’áƒáƒœáƒáƒ®áƒšáƒ”áƒ‘áƒ˜áƒ¡ áƒ¨áƒ”áƒ¡áƒáƒ®áƒ”áƒ‘ áƒáƒœ áƒ¡áƒ®áƒ•áƒáƒ“áƒáƒ¡áƒ®áƒ•áƒ 3rd áƒáƒžáƒšáƒ˜áƒ™áƒáƒªáƒ˜áƒ”áƒ‘áƒ˜áƒ¡ áƒ˜áƒœáƒ¡áƒ¢áƒáƒšáƒáƒªáƒ˜áƒ áƒáƒ  áƒ˜áƒ›áƒ£áƒ¨áƒáƒ•áƒ”áƒ‘áƒ¡. áƒ¤áƒáƒ˜áƒšáƒ”áƒ‘áƒ—áƒáƒœ áƒ¬áƒ•áƒ“áƒáƒ›áƒ áƒ’áƒáƒ áƒ” áƒ¡áƒáƒ›áƒ§áƒáƒ áƒáƒ“áƒáƒœ áƒ“áƒ áƒ¨áƒ”áƒ¢áƒ§áƒáƒ‘áƒ˜áƒœáƒ”áƒ‘áƒ˜áƒ¡ áƒ˜áƒ›áƒ”áƒ˜áƒšáƒ”áƒ‘áƒ˜áƒª áƒáƒ’áƒ áƒ”áƒ—áƒ•áƒ” áƒáƒ  áƒ˜áƒ›áƒ£áƒ¨áƒáƒ•áƒ”áƒ‘áƒ¡. áƒ©áƒ•áƒ”áƒœ áƒ’áƒ˜áƒ áƒ©áƒ”áƒ•áƒ— áƒ áƒáƒ› áƒ©áƒáƒ áƒ—áƒáƒ— áƒ˜áƒœáƒ¢áƒ”áƒ áƒœáƒ”áƒ¢ áƒ™áƒáƒ•áƒ¨áƒ˜áƒ áƒ˜ áƒáƒ› áƒ¡áƒ”áƒ áƒ•áƒ”áƒ áƒ˜áƒ¡áƒ—áƒ•áƒ˜áƒ¡ áƒ˜áƒ›áƒ˜áƒ¡áƒáƒ—áƒ•áƒ˜áƒ¡ áƒ áƒáƒ› áƒ’áƒ¥áƒáƒœáƒ“áƒ”áƒ— ownCloudâ€“áƒ˜áƒ¡ áƒ§áƒ•áƒ”áƒšáƒ áƒ¤áƒ£áƒœáƒ¥áƒªáƒ˜áƒ áƒ’áƒáƒáƒ¥áƒ¢áƒ˜áƒ£áƒ áƒ”áƒ‘áƒ£áƒšáƒ˜.",
+"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 áƒ’áƒ•áƒ”áƒ áƒ“áƒ˜ áƒ áƒáƒ›áƒ”áƒšáƒ˜áƒª áƒ›áƒáƒ—áƒáƒ•áƒ¡áƒ”áƒ‘áƒ£áƒšáƒ˜áƒ owncloud root áƒ“áƒ˜áƒ áƒ”áƒ¥áƒ¢áƒáƒ áƒ˜áƒáƒ¨áƒ˜, áƒ¬áƒ£áƒ—áƒ¨áƒ˜ áƒ”áƒ áƒ—áƒ®áƒ”áƒš  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" => "Share APIâ€“áƒ˜áƒ¡ áƒ©áƒáƒ áƒ—áƒ•áƒ",
+"Allow apps to use the Share API" => "áƒ“áƒáƒ£áƒ¨áƒ•áƒ˜ áƒáƒžáƒšáƒ˜áƒ™áƒáƒªáƒ˜áƒ”áƒ‘áƒ˜áƒ¡ áƒ£áƒ¤áƒšáƒ”áƒ‘áƒ  Share API â€“áƒ–áƒ”",
+"Allow links" => "áƒšáƒ˜áƒœáƒ™áƒ”áƒ‘áƒ˜áƒ¡ áƒ“áƒáƒ¨áƒ•áƒ”áƒ‘áƒ",
+"Allow users to share items to the public with links" => "áƒ›áƒ˜áƒ”áƒªáƒ˜ áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒšáƒ”áƒ‘áƒ¡ áƒ£áƒ¤áƒšáƒ”áƒ‘áƒ áƒ áƒáƒ› áƒ’áƒáƒáƒ–áƒ˜áƒáƒ áƒáƒ¡ áƒ”áƒšáƒ”áƒ›áƒ”áƒœáƒ¢áƒ”áƒ‘áƒ˜ áƒ¡áƒáƒ¯áƒáƒ áƒáƒ“ áƒšáƒ˜áƒœáƒ™áƒ”áƒ‘áƒ˜áƒ—",
+"Allow resharing" => "áƒ’áƒáƒ“áƒáƒ–áƒ˜áƒáƒ áƒ”áƒ‘áƒ˜áƒ¡ áƒ“áƒáƒ¨áƒ•áƒ”áƒ‘áƒ",
+"Allow users to share items shared with them again" => "áƒ›áƒ˜áƒ”áƒªáƒ˜áƒ— áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒšáƒ”áƒ‘áƒ¡ áƒ£áƒ¤áƒšáƒ”áƒ‘áƒ áƒ áƒáƒ› áƒ’áƒáƒáƒ–áƒ˜áƒáƒ áƒáƒ¡ áƒ›áƒ˜áƒ¡áƒ—áƒ•áƒ˜áƒ¡ áƒ’áƒáƒ–áƒ˜áƒáƒ áƒ”áƒ‘áƒ£áƒšáƒ˜",
+"Allow users to share with anyone" => "áƒ›áƒ˜áƒ”áƒªáƒ˜áƒ— áƒ£áƒ¤áƒšáƒ”áƒ‘áƒ áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒšáƒ”áƒ‘áƒ¡ áƒ’áƒáƒáƒ–áƒ˜áƒáƒ áƒáƒ¡ áƒ§áƒ•áƒ”áƒšáƒáƒ¡áƒ—áƒ•áƒ˜áƒ¡",
+"Allow users to only share with users in their groups" => "áƒ›áƒ˜áƒ”áƒªáƒ˜áƒ— áƒ£áƒ¤áƒšáƒ”áƒ‘áƒ áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒšáƒ”áƒ‘áƒ¡ áƒ áƒáƒ› áƒ’áƒáƒáƒ–áƒ˜áƒáƒ áƒáƒ¡ áƒ›áƒ®áƒáƒšáƒáƒ“ áƒ—áƒáƒ•áƒ˜áƒáƒœáƒ—áƒ˜ áƒ¯áƒ’áƒ£áƒ¤áƒ˜áƒ¡áƒ—áƒ•áƒ˜áƒ¡",
+"Security" => "áƒ£áƒ¡áƒáƒ¤áƒ áƒ—áƒ®áƒáƒ”áƒ‘áƒ",
+"Enforce HTTPS" => "HTTPSâ€“áƒ˜áƒ¡ áƒ©áƒáƒ áƒ—áƒ•áƒ",
+"Enforces the clients to connect to ownCloud via an encrypted connection." => "áƒ•áƒáƒ˜áƒ«áƒ£áƒšáƒáƒ— áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒšáƒ”áƒ‘áƒ˜ áƒ áƒáƒ› áƒ“áƒáƒ£áƒ™áƒáƒ•áƒ¨áƒ˜áƒ áƒ“áƒœáƒ”áƒœ ownCloud áƒ“áƒáƒªáƒ£áƒšáƒ˜ áƒ™áƒáƒ•áƒ¨áƒ˜áƒ áƒ˜áƒ— (https).",
+"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "áƒ’áƒ—áƒ®áƒáƒ•áƒ— áƒ“áƒáƒ£áƒ™áƒáƒ•áƒ¨áƒ˜áƒ áƒ“áƒ”áƒ— ownCloudâ€“áƒ¡  HTTPSâ€“áƒ˜áƒ— áƒ áƒáƒ› áƒ¨áƒ”áƒ«áƒšáƒáƒ— SSLâ€“áƒ˜áƒ¡ áƒ©áƒáƒ áƒ—áƒ•áƒ áƒ’áƒáƒ›áƒáƒ áƒ—áƒ•áƒ.",
+"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 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" => "áƒ“áƒáƒáƒ›áƒáƒ¢áƒ” áƒ¨áƒ”áƒœáƒ˜ áƒáƒžáƒšáƒ˜áƒ™áƒáƒªáƒ˜áƒ",
 "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>-áƒšáƒ˜áƒªáƒ”áƒœáƒ¡áƒ˜áƒ áƒ”áƒ‘áƒ£áƒšáƒ˜áƒ <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" => "áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ áƒžáƒáƒ áƒáƒšáƒ˜ áƒ¨áƒ”áƒ˜áƒªáƒ•áƒáƒšáƒ",
 "Unable to change your password" => "áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ áƒžáƒáƒ áƒáƒšáƒ˜ áƒáƒ  áƒ¨áƒ”áƒ˜áƒªáƒ•áƒáƒšáƒ",
 "Current password" => "áƒ›áƒ˜áƒ›áƒ“áƒ˜áƒœáƒáƒ áƒ” áƒžáƒáƒ áƒáƒšáƒ˜",
 "New password" => "áƒáƒ®áƒáƒšáƒ˜ áƒžáƒáƒ áƒáƒšáƒ˜",
 "Change password" => "áƒžáƒáƒ áƒáƒšáƒ˜áƒ¡ áƒ¨áƒ”áƒªáƒ•áƒšáƒ",
+"Display Name" => "áƒ“áƒ˜áƒ¡áƒžáƒšáƒ”áƒ˜áƒ¡ áƒ¡áƒáƒ®áƒ”áƒšáƒ˜",
 "Email" => "áƒ˜áƒ›áƒ”áƒ˜áƒšáƒ˜",
 "Your email address" => "áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ áƒ˜áƒ›áƒ”áƒ˜áƒš áƒ›áƒ˜áƒ¡áƒáƒ›áƒáƒ áƒ—áƒ˜",
 "Fill in an email address to enable password recovery" => "áƒ¨áƒ”áƒáƒ•áƒ¡áƒ”áƒ— áƒ˜áƒ›áƒ”áƒ˜áƒš áƒ›áƒ˜áƒ¡áƒáƒ›áƒáƒ áƒ—áƒ˜áƒ¡ áƒ•áƒ”áƒšáƒ˜ áƒžáƒáƒ áƒáƒšáƒ˜áƒ¡ áƒáƒ¦áƒ¡áƒáƒ“áƒ’áƒ”áƒœáƒáƒ“",
 "Language" => "áƒ”áƒœáƒ",
 "Help translate" => "áƒ—áƒáƒ áƒ’áƒ›áƒœáƒ˜áƒ¡ áƒ“áƒáƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒ",
+"WebDAV" => "WebDAV",
+"Use this address to connect to your ownCloud in your file manager" => "áƒ’áƒáƒ›áƒáƒ˜áƒ§áƒ”áƒœáƒ” áƒ¨áƒ”áƒ›áƒ“áƒ”áƒ’áƒ˜ áƒ›áƒ˜áƒ¡áƒáƒ›áƒáƒ áƒ—áƒ˜ ownCloudâ€“áƒ—áƒáƒœ áƒ“áƒáƒ¡áƒáƒ™áƒáƒ•áƒ¨áƒ˜áƒ áƒ”áƒ‘áƒšáƒáƒ“ áƒ¨áƒ”áƒœáƒ¡ áƒ¤áƒáƒ˜áƒšáƒ›áƒ”áƒœáƒ”áƒ¯áƒ”áƒ áƒ¨áƒ˜",
+"Login Name" => "áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒšáƒ˜áƒ¡ áƒ¡áƒáƒ®áƒ”áƒšáƒ˜",
 "Create" => "áƒ¨áƒ”áƒ¥áƒ›áƒœáƒ",
-"Other" => "áƒ¡áƒ®áƒ•áƒ"
+"Default Storage" => "áƒ¡áƒáƒ¬áƒ§áƒ˜áƒ¡áƒ˜ áƒ¡áƒáƒªáƒáƒ•áƒ˜",
+"Unlimited" => "áƒ£áƒšáƒ˜áƒ›áƒ˜áƒ¢áƒ",
+"Other" => "áƒ¡áƒ®áƒ•áƒ",
+"Storage" => "áƒ¡áƒáƒªáƒáƒ•áƒ˜",
+"change display name" => "áƒ¨áƒ”áƒªáƒ•áƒáƒšáƒ” áƒ“áƒ˜áƒ¡áƒ¤áƒšáƒ”áƒ˜áƒ¡ áƒ¡áƒáƒ®áƒ”áƒšáƒ˜",
+"set new password" => "áƒ“áƒáƒáƒ§áƒ”áƒœáƒ”áƒ— áƒáƒ®áƒáƒšáƒ˜ áƒžáƒáƒ áƒáƒšáƒ˜",
+"Default" => "áƒ¡áƒáƒ¬áƒ§áƒ˜áƒ¡áƒ˜ áƒžáƒáƒ áƒáƒ›áƒ”áƒ¢áƒ áƒ”áƒ‘áƒ˜"
 );
diff --git a/settings/l10n/ko.php b/settings/l10n/ko.php
index fb6f7e6228b9747fe8387d58b9eddeb60036ca0c..2a139a025627527c7c5039fbdaef5a4caf3d17cd 100644
--- a/settings/l10n/ko.php
+++ b/settings/l10n/ko.php
@@ -14,18 +14,23 @@
 "Unable to add user to group %s" => "ê·¸ë£¹ %sì— ì‚¬ìš©ìžë¥¼ ì¶”ê°€í•  ìˆ˜ ì—†ìŠµë‹ˆë‹¤.",
 "Unable to remove user from group %s" => "ê·¸ë£¹ %sì—ì„œ ì‚¬ìš©ìžë¥¼ ì‚ì œí•  ìˆ˜ ì—†ìŠµë‹ˆë‹¤.",
 "Disable" => "ë¹„í™œì„±í™”",
-"Enable" => "í™œì„±í™”",
+"Enable" => "ì‚¬ìš©í•¨",
 "Error" => "ì˜¤ë¥˜",
 "Saving..." => "ì €ìž¥ ì¤‘...",
 "deleted" => "ì‚ì œ",
-"undo" => "ì‹¤í–‰ ì·¨ì†Œ",
+"undo" => "ë˜ëŒë¦¬ê¸°",
 "Groups" => "ê·¸ë£¹",
 "Group 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." => "ë°ì´í„° ë””ë ‰í„°ë¦¬ì™€ íŒŒì¼ì„ ì¸í„°ë„·ì—ì„œ ì ‘ê·¼í•  ìˆ˜ ìžˆëŠ” ê²ƒ ê°™ìŠµë‹ˆë‹¤. ownCloudì—ì„œ ì œê³µí•œ .htaccess íŒŒì¼ì´ ìž‘ë™í•˜ì§€ ì•ŠìŠµë‹ˆë‹¤. ì›¹ ì„œë²„ë¥¼ ë‹¤ì‹œ ì„¤ì •í•˜ì—¬ ë°ì´í„° ë””ë ‰í„°ë¦¬ì— ì ‘ê·¼í•  ìˆ˜ ì—†ë„ë¡ í•˜ê±°ë‚˜ ë¬¸ì„œ ë£¨íŠ¸ ë°”ê¹¥ìª½ìœ¼ë¡œ ì˜®ê¸°ëŠ” ê²ƒì„ ì¶”ì²œí•©ë‹ˆë‹¤.",
+"Setup Warning" => "ì„¤ì • ê²½ê³ ",
+"Cron" => "í¬ë¡ ",
+"Log" => "ë¡œê·¸",
+"Log level" => "ë¡œê·¸ ë‹¨ê³„",
 "More" => "ë” ì¤‘ìš”í•¨",
+"Less" => "ëœ ì¤‘ìš”í•¨",
 "Version" => "ë²„ì „",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud ì»¤ë®¤ë‹ˆí‹°</a>ì— ì˜í•´ì„œ ê°œë°œë˜ì—ˆìŠµë‹ˆë‹¤. <a href=\"https://github.com/owncloud\" target=\"_blank\">ì›ë³¸ ì½”ë“œ</a>ëŠ” <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>ì— ë”°ë¼ ì‚¬ìš©ì´ í—ˆê°€ë©ë‹ˆë‹¤.",
 "Add your App" => "ì•± ì¶”ê°€",
@@ -41,6 +46,7 @@
 "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" => "ì•”í˜¸ê°€ ë³€ê²½ë˜ì—ˆìŠµë‹ˆë‹¤",
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 177ce10dddb7b89022835a290d4cde0022d2aad2..dba1f92017eef18786d64ad69587e2779b8cc81f 100644
--- a/settings/l10n/lt_LT.php
+++ b/settings/l10n/lt_LT.php
@@ -9,14 +9,19 @@
 "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Ä™",
 "More Apps" => "Daugiau aplikacijÅ³",
 "Select an App" => "Pasirinkite programÄ…",
@@ -28,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 d5a29d84cb9d55a6f8ae184def007dda96f93550..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",
@@ -19,9 +19,9 @@
 "Disable" => "DeaktivÄ“t",
 "Enable" => "AktivÄ“t",
 "Please wait...." => "LÅ«dzu, uzgaidiet....",
+"Error" => "KÄ¼Å«da",
 "Updating...." => "Atjaunina....",
 "Error while updating app" => "KÄ¼Å«da, atjauninot lietotni",
-"Error" => "KÄ¼Å«da",
 "Updated" => "AtjauninÄta",
 "Saving..." => "SaglabÄ...",
 "deleted" => "izdzests",
@@ -66,6 +66,7 @@
 "Log" => "Å½urnÄls",
 "Log level" => "Å½urnÄla lÄ«menis",
 "More" => "VairÄk",
+"Less" => "MazÄk",
 "Version" => "Versija",
 "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>." => "IzstrÄdÄjusi<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud kopiena</a>,<a href=\"https://github.com/owncloud\" target=\"_blank\">pirmkodu</a>kurÅ¡ ir licencÄ“ts zem <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Add your App" => "Pievieno savu lietotni",
@@ -90,12 +91,9 @@
 "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 epasta adresi, lai vÄ“lÄk varÄ“tu atgÅ«t paroli, ja bÅ«s nepiecieÅ¡amÄ«ba",
+"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",
 "Language" => "Valoda",
 "Help translate" => "PalÄ«dzi tulkot",
 "WebDAV" => "WebDAV",
diff --git a/settings/l10n/mk.php b/settings/l10n/mk.php
index 1994c2ab67e156312aa8b5865bd78723b619aa03..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,7 +24,10 @@
 "__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" => "Ð’ÐµÑ€Ð·Ð¸Ñ˜Ð°",
 "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" => "Ð”Ð¾Ð´Ð°Ð´ÐµÑ‚Ðµ Ñ˜Ð° Ð’Ð°ÑˆÐ°Ñ‚Ð° Ð°Ð¿Ð»Ð¸ÐºÐ°Ñ†Ð¸Ñ˜Ð°",
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 4b3ff85445ab3dafbd9713e92e9e3e82eae4d840..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,43 +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 1ce0ef88291c4d8dcd37c4e0ba4c546ef8cf5e93..d22b04ad571e970e27d4bb61649eed59d99fd45a 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",
-"Error" => "Fout",
 "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,11 +40,11 @@
 "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",
-"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." => "Deze ownCloud server kan de systeemtaal niet instellen op %s. Hierdoor kunnen er mogelijk problemen optreden met bepaalde karakters in bestandsnamen. Het wordt sterk aangeraden om de vereiste pakketen op uw systeem te installeren zodat %s ondersteund wordt.",
+"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." => "Deze ownCloud server kan de systeemtaal niet instellen op %s. Hierdoor kunnen er mogelijk problemen optreden met bepaalde tekens in bestandsnamen. Het wordt sterk aangeraden om de vereiste pakketen op uw systeem te installeren zodat %s ondersteund wordt.",
 "Internet connection not working" => "Internet verbinding werkt niet",
 "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." => "Deze ownCloud server heeft geen actieve internet verbinding. dat betekent dat sommige functies, zoals aankoppelen van externe opslag, notificaties over updates of installatie van apps van 3e partijen niet werken. Ook het benaderen van bestanden vanaf een remote locatie en het versturen van notificatie emails kan mislukken. We adviseren om de internet verbinding voor deze server in te schakelen als u alle functies van ownCloud wilt gebruiken.",
 "Cron" => "Cron",
@@ -66,6 +67,7 @@
 "Log" => "Log",
 "Log level" => "Log niveau",
 "More" => "Meer",
+"Less" => "Minder",
 "Version" => "Versie",
 "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>." => "Ontwikkeld door de <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud gemeenschap</a>, de <a href=\"https://github.com/owncloud\" target=\"_blank\">bron code</a> is gelicenseerd onder de <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Add your App" => "App toevoegen",
@@ -87,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",
@@ -104,7 +103,7 @@
 "Create" => "CreÃ«er",
 "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 012ee1d6a6f422926f16c5b676d9848f32fe9c1f..810f8bf15ae4870e25ec43ae3e97809bcf65ddd3 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",
@@ -19,9 +20,9 @@
 "Disable" => "WyÅ‚Ä…cz",
 "Enable" => "WÅ‚Ä…cz",
 "Please wait...." => "ProszÄ™ czekaÄ‡...",
+"Error" => "BÅ‚Ä…d",
 "Updating...." => "Aktualizacja w toku...",
 "Error while updating app" => "BÅ‚Ä…d podczas aktualizacji aplikacji",
-"Error" => "BÅ‚Ä…d",
 "Updated" => "Zaktualizowano",
 "Saving..." => "Zapisywanie...",
 "deleted" => "usuniÄ™to",
@@ -66,6 +67,7 @@
 "Log" => "Logi",
 "Log level" => "Poziom logÃ³w",
 "More" => "WiÄ™cej",
+"Less" => "Mniej",
 "Version" => "Wersja",
 "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>." => "Stworzone przez <a href=\"http://ownCloud.org/contact\" target=\"_blank\">spoÅ‚ecznoÅ›Ä‡ ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">kod ÅºrÃ³dÅ‚owy</a> na licencji <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Add your App" => "Dodaj swojÄ… aplikacjÄ™",
@@ -73,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",
@@ -90,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",
diff --git a/settings/l10n/pt_BR.php b/settings/l10n/pt_BR.php
index 98cac0fd612f86eed5a6d00e0b3fc8f47bfb2b47..f1e45aab150cf1a1424fb083885335cc42b5cd89 100644
--- a/settings/l10n/pt_BR.php
+++ b/settings/l10n/pt_BR.php
@@ -1,29 +1,30 @@
 <?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",
 "Please wait...." => "Por favor, aguarde...",
+"Error" => "Erro",
 "Updating...." => "Atualizando...",
 "Error while updating app" => "Erro ao atualizar aplicativo",
-"Error" => "Erro",
 "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",
@@ -66,6 +67,7 @@
 "Log" => "Registro",
 "Log level" => "NÃvel de registro",
 "More" => "Mais",
+"Less" => "Menos",
 "Version" => "VersÃ£o",
 "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>." => "Desenvolvido pela <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidade ownCloud</a>, o <a href=\"https://github.com/owncloud\" target=\"_blank\">cÃ³digo fonte</a> estÃ¡ licenciado sob <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Add your App" => "Adicione seu Aplicativo",
@@ -90,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",
diff --git a/settings/l10n/pt_PT.php b/settings/l10n/pt_PT.php
index 71ad6347e8e06e9c8065d22b4966a879a8bdabac..de32c3b1f025fd53bd6584f7c9bdc08acfa606ce 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",
@@ -19,9 +20,9 @@
 "Disable" => "Desactivar",
 "Enable" => "Activar",
 "Please wait...." => "Por favor aguarde...",
+"Error" => "Erro",
 "Updating...." => "A Actualizar...",
 "Error while updating app" => "Erro enquanto actualizava a aplicaÃ§Ã£o",
-"Error" => "Erro",
 "Updated" => "Actualizado",
 "Saving..." => "A guardar...",
 "deleted" => "apagado",
@@ -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",
@@ -66,6 +67,7 @@
 "Log" => "Registo",
 "Log level" => "NÃvel do registo",
 "More" => "Mais",
+"Less" => "Menos",
 "Version" => "VersÃ£o",
 "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>." => "Desenvolvido pela <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidade ownCloud</a>, o<a href=\"https://github.com/owncloud\" target=\"_blank\">cÃ³digo fonte</a> estÃ¡ licenciado sob a <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Add your App" => "Adicione a sua aplicaÃ§Ã£o",
@@ -83,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",
diff --git a/settings/l10n/ro.php b/settings/l10n/ro.php
index 99265e30574a4d8c1ad30025498c99a2ceccbe69..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,7 +25,23 @@
 "__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",
 "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>." => "Dezvoltat de the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunitatea ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">codul sursÄƒ</a> este licenÈ›iat sub <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Add your App" => "AdaugÄƒ aplicaÈ›ia ta",
@@ -41,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 56dd597966e938ceeab57a605b919fd9b7013561..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",
@@ -19,9 +20,9 @@
 "Disable" => "Ð’Ñ‹ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ",
 "Enable" => "Ð’ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ",
 "Please wait...." => "ÐŸÐ¾Ð²Ñ€ÐµÐ¼ÐµÐ½Ð¸...",
+"Error" => "ÐžÑˆÐ¸Ð±ÐºÐ°",
 "Updating...." => "ÐžÐ±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ðµ...",
 "Error while updating app" => "ÐžÑˆÐ¸Ð±ÐºÐ° Ð² Ð¿Ñ€Ð¾Ñ†ÐµÑÑÐµ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ",
-"Error" => "ÐžÑˆÐ¸Ð±ÐºÐ°",
 "Updated" => "ÐžÐ±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¾",
 "Saving..." => "Ð¡Ð¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ðµ...",
 "deleted" => "ÑƒÐ´Ð°Ð»ÐµÐ½",
@@ -66,6 +67,7 @@
 "Log" => "Ð›Ð¾Ð³",
 "Log level" => "Ð£Ñ€Ð¾Ð²ÐµÐ½ÑŒ Ð»Ð¾Ð³Ð°",
 "More" => "Ð‘Ð¾Ð»ÑŒÑˆÐµ",
+"Less" => "ÐœÐµÐ½ÑŒÑˆÐµ",
 "Version" => "Ð’ÐµÑ€ÑÐ¸Ñ",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Ð Ð°Ð·Ñ€Ð°Ð±Ð°Ñ‚Ñ‹Ð²Ð°ÐµÑ‚ÑÑ <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ÑÐ¾Ð¾Ð±Ñ‰ÐµÑÑ‚Ð²Ð¾Ð¼ ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">Ð¸ÑÑ…Ð¾Ð´Ð½Ñ‹Ð¹ ÐºÐ¾Ð´</a> Ð´Ð¾ÑÑ‚ÑƒÐ¿ÐµÐ½ Ð¿Ð¾Ð´ Ð»Ð¸Ñ†ÐµÐ½Ð·Ð¸ÐµÐ¹ <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Add your App" => "Ð”Ð¾Ð±Ð°Ð²Ð¸Ñ‚ÑŒ Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ",
@@ -90,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 46897eda84a81cf98d34b799a1831b7dbddfd21c..6f7db02781bc4619ac7e09a7445f2a188d0d4b1c 100644
--- a/settings/l10n/ru_RU.php
+++ b/settings/l10n/ru_RU.php
@@ -1,67 +1,4 @@
 <?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" => "ÐŸÐ¾Ð´Ñ€Ð¾Ð±Ð½ÐµÐµ",
-"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" => "ÐŸÐ¾ ÑƒÐ¼Ð¾Ð»Ñ‡Ð°Ð½Ð¸ÑŽ"
+"deleted" => "ÑƒÐ´Ð°Ð»ÐµÐ½Ð¾"
 );
diff --git a/settings/l10n/si_LK.php b/settings/l10n/si_LK.php
index 6946b41d40cdc94aa55301eb273d75f8cd1113a4..4303b14c37ec2e6e3167821aa25b088f6ca25041 100644
--- a/settings/l10n/si_LK.php
+++ b/settings/l10n/si_LK.php
@@ -8,26 +8,34 @@
 "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> à¶ºà¶§à¶à·š.",
 "Add your App" => "à¶ºà·™à¶¯à·”à¶¸à¶šà·Š à¶‘à¶šà·Š à¶šà·’à¶»à·“à¶¸",
 "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 609c949f8ec4bc653b838d7873be40a52d9509c7..377af0011d14be05001d1ac82fbbe316fbf8ed40 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,11 +18,11 @@
 "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...",
 "Error while updating app" => "chyba pri aktualizÃ¡cii aplikÃ¡cie",
-"Error" => "Chyba",
 "Updated" => "AktualizovanÃ©",
 "Saving..." => "UkladÃ¡m...",
 "deleted" => "zmazanÃ©",
@@ -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",
@@ -66,6 +67,7 @@
 "Log" => "ZÃ¡znam",
 "Log level" => "ÃšroveÅˆ zÃ¡znamu",
 "More" => "Viac",
+"Less" => "Menej",
 "Version" => "Verzia",
 "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>." => "VyvinutÃ© <a href=\"http://ownCloud.org/contact\" target=\"_blank\">komunitou ownCloud</a>,<a href=\"https://github.com/owncloud\" target=\"_blank\">zdrojovÃ½ kÃ³d</a> je licencovanÃ½ pod <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Add your App" => "PridaÅ¥ vaÅ¡u aplikÃ¡ciu",
@@ -90,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",
diff --git a/settings/l10n/sl.php b/settings/l10n/sl.php
index 249591ab471a1af1ede22442257f8377c4f61975..55d957cfa7d3e6e5f8cfc3b09e652078396c48ab 100644
--- a/settings/l10n/sl.php
+++ b/settings/l10n/sl.php
@@ -1,64 +1,111 @@
 <?php $TRANSLATIONS = array(
-"Unable to load list from App Store" => "Ni mogoÄe naloÅ¾iti seznama iz 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" => "Ni mogoÄe dodati skupine",
+"Unable to add group" => "Skupine ni mogoÄe dodati",
 "Could not enable app. " => "Programa ni mogoÄe omogoÄiti.",
 "Email saved" => "Elektronski naslov je shranjen",
 "Invalid email" => "Neveljaven elektronski naslov",
-"Unable to delete group" => "Ni mogoÄe izbrisati skupine",
-"Unable to delete user" => "Ni mogoÄe izbrisati uporabnika",
-"Language changed" => "Jezik je bil spremenjen",
+"Unable to delete group" => "Skupine ni mogoÄe izbrisati",
+"Unable to delete user" => "Uporabnika ni mogoÄe izbrisati",
+"Language changed" => "Jezik je spremenjen",
 "Invalid request" => "Neveljavna zahteva",
-"Admins can't remove themself from the admin group" => "Administratorji sebe ne morejo odstraniti iz skupine admin",
+"Admins can't remove themself from the admin group" => "Skrbnikov ni mogoÄe odstraniti iz skupine skrbnikov (admin)",
 "Unable to add user to group %s" => "Uporabnika ni mogoÄe dodati k skupini %s",
 "Unable to remove user from group %s" => "Uporabnika ni mogoÄe odstraniti iz skupine %s",
+"Couldn't update app." => "Programa ni mogoÄe posodobiti.",
+"Update to {appversion}" => "Posodobi na {appversion}",
 "Disable" => "OnemogoÄi",
 "Enable" => "OmogoÄi",
+"Please wait...." => "PoÄakajte ...",
 "Error" => "Napaka",
+"Updating...." => "Poteka posodabljanje ...",
+"Error while updating app" => "PriÅ¡lo je do napake med posodabljanjem programa.",
+"Updated" => "Posodobljeno",
 "Saving..." => "Poteka shranjevanje ...",
 "deleted" => "izbrisano",
 "undo" => "razveljavi",
+"Unable to remove user" => "Uporabnika ni mogoÄe odstraniti",
 "Groups" => "Skupine",
 "Group Admin" => "Skrbnik skupine",
 "Delete" => "IzbriÅ¡i",
-"__language_name__" => "__ime_jezika__",
+"add group" => "dodaj skupino",
+"A valid username must be provided" => "Navedeno mora biti veljavno uporabniÅ¡ko ime",
+"Error creating user" => "Napaka ustvarjanja uporabnika",
+"A valid password must be provided" => "Navedeno mora biti veljavno geslo",
+"__language_name__" => "SlovenÅ¡Äina",
 "Security Warning" => "Varnostno opozorilo",
-"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." => "Trenutno je dostop do podatkovne mape in datotek najverjetneje omogoÄen vsem uporabnikom na omreÅ¾ju. Datoteka .htaccess, vkljuÄena v ownCloud namreÄ ni omogoÄena. MoÄno priporoÄamo nastavitev spletnega streÅ¾nika tako, da mapa podatkov ne bo javno dostopna ali pa, da jo prestavite ven iz korenske mape spletnega streÅ¾nika.",
+"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." => "Trenutno je dostop do podatkovne mape in datotek najverjetneje omogoÄen vsem uporabnikom na omreÅ¾ju. Datoteka .htaccess, vkljuÄena v ownCloud, namreÄ ni ustrezno nastavljena. PriporoÄljivo je nastaviti spletni streÅ¾nik tako, da mapa podatkov ne bo javno dostopna, ali pa, da jo prestavite v podrejeno mapo korenske mape spletnega streÅ¾nika.",
+"Setup Warning" => "Opozorilo nastavitve",
+"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.",
+"Please double check the <a href='%s'>installation guides</a>." => "Preverite <a href='%s'>navodila namestitve</a>.",
+"Module 'fileinfo' missing" => "Manjka modul 'fileinfo'.",
+"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Manjka modul PHP 'fileinfo'. PriporoÄljivo je omogoÄiti ta modul za popolno zaznavanje vrst MIME.",
+"Locale not working" => "Jezikovne prilagoditve ne delujejo.",
+"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." => "Na streÅ¾niku ownCloud ni mogoÄe nastaviti jezikovnih doloÄil na jezik %s. Najverjetneje so teÅ¾ave s posebnimi znaki v imenih datotek. PriporoÄljivo je namestiti zahtevane pakete za podporo jeziku %s.",
+"Internet connection not working" => "Internetna povezava ne deluje.",
+"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." => "StreÅ¾nik ownCloud je brez delujoÄe internetne povezave. To pomeni, da bodo nekatere moÅ¾nosti onemogoÄene. Ne bo mogoÄe priklapljati zunanjih priklopnih toÄk, ne bo obvestil o posodobitvah ali namestitvah programske opreme, prav tako najverjetneje ne bo mogoÄe poÅ¡iljati obvestilnih sporoÄil preko elektronske poÅ¡te. Za uporabo vseh zmoÅ¾nosti oblaka ownCloud, mora biti internetna povezava vzpostavljena in delujoÄa.",
+"Cron" => "PeriodiÄno opravilo",
+"Execute one task with each page loaded" => "Izvedi eno nalogo z vsako naloÅ¾eno stranjo.",
+"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "Datoteka cron.php je vpisana pri storitvi webcron. Preko protokola HTTP je datoteka cron.php, ki se nahaja v korenski mapi ownCloud, klicana enkrat na minuto.",
+"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Uporaba sistemske storitve cron. Preko sistemskega posla cron je datoteka cron.php, ki se nahaja v mapi ownCloud, klicana enkrat na minuto.",
+"Sharing" => "Souporaba",
+"Enable Share API" => "OmogoÄi API souporabe",
+"Allow apps to use the Share API" => "Dovoli programom uporabo vmesnika API souporabe",
+"Allow links" => "Dovoli povezave",
+"Allow users to share items to the public with links" => "Uporabnikom dovoli souporabo predmetov z javnimi povezavami",
+"Allow resharing" => "Dovoli nadaljnjo souporabo",
+"Allow users to share items shared with them again" => "Uporabnikom dovoli nadaljnjo souporabo predmetov",
+"Allow users to share with anyone" => "Uporabnikom dovoli souporabo s komerkoli",
+"Allow users to only share with users in their groups" => "Uporabnikom dovoli souporabo z ostalimi uporabniki njihove skupine",
+"Security" => "Varnost",
+"Enforce HTTPS" => "Zahtevaj uporabo HTTPS",
+"Enforces the clients to connect to ownCloud via an encrypted connection." => "Zahtevaj Å¡ifrirano povezovanje odjemalcev v oblak ownCloud",
+"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "Prijava mora biti vzpostavljena z uporabo protokola HTTPS za omogoÄanje Å¡ifriranja SSL.",
+"Log" => "Dnevnik",
+"Log level" => "Raven beleÅ¾enja",
 "More" => "VeÄ",
+"Less" => "Manj",
 "Version" => "RazliÄica",
-"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>." => "Programski paket razvija <a href=\"http://ownCloud.org/contact\" target=\"_blank\">skupnost ownCloud</a>. <a href=\"https://github.com/owncloud\" target=\"_blank\">Izvorna koda</a> je objavljena pod pogoji dovoljenja <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"SploÅ¡no javno dovoljenje Affero\">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>." => "Programski paket razvija <a href=\"http://ownCloud.org/contact\" target=\"_blank\">skupnost ownCloud</a>. <a href=\"https://github.com/owncloud\" target=\"_blank\">Izvorna koda</a> je objavljena pod pogoji <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"SploÅ¡nega javnega dovoljenja Affero\">AGPL</abbr></a>.",
 "Add your App" => "Dodaj program",
 "More Apps" => "VeÄ programov",
-"Select an App" => "Izberite program",
+"Select an App" => "Izbor programa",
 "See application page at apps.owncloud.com" => "ObiÅ¡Äite spletno stran programa na apps.owncloud.com",
-"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-z dovoljenjem s strani <span class=\"author\"></span>",
+"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-z dovoljenjem <span class=\"author\"></span>",
 "Update" => "Posodobi",
 "User Documentation" => "UporabniÅ¡ka dokumentacija",
-"Administrator Documentation" => "Administratorjeva dokumentacija",
+"Administrator Documentation" => "SkrbniÅ¡ka dokumentacija",
 "Online Documentation" => "Spletna dokumentacija",
 "Forum" => "Forum",
-"Bugtracker" => "Sistem za sledenje napakam",
-"Commercial Support" => "Komercialna podpora",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Uporabljate <strong>%s</strong> od razpoloÅ¾ljivih <strong>%s</strong>",
+"Bugtracker" => "Sledilnik hroÅ¡Äev",
+"Commercial Support" => "Podpora strankam",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Uporabljenega je <strong>%s</strong> od razpoloÅ¾ljivih <strong>%s</strong> prostora.",
 "Get the apps to sync your files" => "Pridobi programe za usklajevanje datotek",
+"Show First Run Wizard again" => "ZaÅ¾eni Äarovnika prvega zagona",
 "Password" => "Geslo",
-"Your password was changed" => "VaÅ¡e geslo je spremenjeno",
+"Your password was changed" => "Geslo je spremenjeno",
 "Unable to change your password" => "Gesla ni mogoÄe spremeniti.",
 "Current password" => "Trenutno geslo",
 "New password" => "Novo geslo",
 "Change password" => "Spremeni geslo",
-"Email" => "Elektronska poÅ¡ta",
-"Your email address" => "VaÅ¡ elektronski poÅ¡tni naslov",
-"Fill in an email address to enable password recovery" => "VpiÅ¡ite vaÅ¡ elektronski naslov in s tem omogoÄite obnovitev gesla",
+"Display Name" => "Prikazano ime",
+"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",
-"Help translate" => "Pomagajte pri prevajanju",
+"Help translate" => "Sodelujte pri prevajanju",
 "WebDAV" => "WebDAV",
-"Use this address to connect to your ownCloud in your file manager" => "Uporabite ta naslov za povezavo do ownCloud v vaÅ¡em upravljalniku datotek.",
+"Use this address to connect to your ownCloud in your file manager" => "Ta naslov uporabite za povezavo upravljalnika datotek z oblakom ownCloud.",
+"Login Name" => "Prijavno ime",
 "Create" => "Ustvari",
 "Default Storage" => "Privzeta shramba",
 "Unlimited" => "Neomejeno",
 "Other" => "Drugo",
 "Storage" => "Shramba",
+"change display name" => "spremeni prikazano ime",
+"set new password" => "nastavi novo geslo",
 "Default" => "Privzeto"
 );
diff --git a/settings/l10n/sq.php b/settings/l10n/sq.php
new file mode 100644
index 0000000000000000000000000000000000000000..03db0cd8fcd4fba4f2c2514082be3366cfe9be0f
--- /dev/null
+++ b/settings/l10n/sq.php
@@ -0,0 +1,14 @@
+<?php $TRANSLATIONS = array(
+"Authentication error" => "Veprim i gabuar gjatÃ« vÃ«rtetimit tÃ« identitetit",
+"Error" => "Veprim i gabuar",
+"undo" => "anulo",
+"Delete" => "Elimino",
+"Security Warning" => "ParalajmÃ«rim sigurie",
+"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.",
+"Please double check the <a href='%s'>installation guides</a>." => "Ju lutemi kontrolloni mirÃ« <a href='%s'>shoqÃ«ruesin e instalimit</a>.",
+"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",
+"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 393ca8135c227531084ad3985a7a8fdca8496fa8..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",
@@ -19,13 +19,14 @@
 "Disable" => "Deaktivera",
 "Enable" => "Aktivera",
 "Please wait...." => "Var god vÃ¤nta...",
+"Error" => "Fel",
 "Updating...." => "Uppdaterar...",
 "Error while updating app" => "Fel uppstod vid uppdatering av appen",
-"Error" => "Fel",
 "Updated" => "Uppdaterad",
 "Saving..." => "Sparar...",
 "deleted" => "raderad",
 "undo" => "Ã¥ngra",
+"Unable to remove user" => "Kan inte ta bort anvÃ¤ndare",
 "Groups" => "Grupper",
 "Group Admin" => "GruppadministratÃ¶r",
 "Delete" => "Radera",
@@ -36,18 +37,29 @@
 "__language_name__" => "__language_name__",
 "Security Warning" => "SÃ¤kerhetsvarning",
 "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." => "Din datakatalog och dina filer Ã¤r fÃ¶rmodligen tillgÃ¤ngliga frÃ¥n Internet. Den .htaccess-fil som ownCloud tillhandahÃ¥ller fungerar inte. Vi rekommenderar starkt att du konfigurerar webbservern sÃ¥ att datakatalogen inte lÃ¤ngre Ã¤r tillgÃ¤nglig eller att du flyttar datakatalogen utanfÃ¶r webbserverns dokument-root.",
+"Setup Warning" => "Installationsvarning",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Din webbserver Ã¤r inte korrekt konfigurerad fÃ¶r att tillÃ¥ta filsynkronisering eftersom WebDAV inte verkar fungera.",
 "Please double check the <a href='%s'>installation guides</a>." => "Var god kontrollera <a href='%s'>installationsguiden</a>.",
 "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",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Utvecklad av <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud kommunity</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">kÃ¤llkoden</a> Ã¤r licenserad under <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Add your App" => "LÃ¤gg till din applikation",
@@ -63,6 +75,7 @@
 "Bugtracker" => "Bugtracker",
 "Commercial Support" => "Kommersiell support",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Du har anvÃ¤nt <strong>%s</strong> av tillgÃ¤ngliga <strong>%s</strong>",
+"Get the apps to sync your files" => "Skaffa appar fÃ¶r att synkronisera dina filer",
 "Show First Run Wizard again" => "Visa FÃ¶rsta uppstarts-guiden igen",
 "Password" => "LÃ¶senord",
 "Your password was changed" => "Ditt lÃ¶senord har Ã¤ndrats",
@@ -71,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 0bb29158fd25a4c7d82abd9324aecc39720baf9f..052bb823655caa4a2c1eb775c1a5eac9e913336c 100644
--- a/settings/l10n/ta_LK.php
+++ b/settings/l10n/ta_LK.php
@@ -13,17 +13,18 @@
 "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 à®•à¯‹à®ªà¯à®ªà¯ à®µà¯‡à®²à¯ˆ à®šà¯†à®¯à¯à®¯à®µà®¿à®²à¯à®²à¯ˆ. à®¤à®°à®µà¯ à®…à®Ÿà¯ˆà®µà¯ˆ à®¨à¯€à®£à¯à®Ÿ à®¨à¯‡à®°à®¤à¯à®¤à®¿à®±à¯à®•à¯ à®…à®£à¯à®•à®•à¯à®•à¯‚à®Ÿà®¿à®¯à®¤à®¾à®• à®‰à®™à¯à®•à®³à¯à®Ÿà¯ˆà®¯ à®µà®²à¯ˆà®¯ à®šà¯‡à®µà¯ˆà®¯à®•à®¤à¯à®¤à¯ˆ à®¤à®•à®µà®®à¯ˆà®•à¯à®•à¯à®®à®¾à®±à¯ à®¨à®¾à®™à¯à®•à®³à¯ à®‰à®±à¯à®¤à®¿à®¯à®¾à®• à®•à¯‚à®±à¯à®•à®¿à®±à¯‹à®®à¯ à®…à®²à¯à®²à®¤à¯ à®¤à®°à®µà¯ à®…à®Ÿà¯ˆà®µà¯ˆ à®µà®²à¯ˆà®¯ à®šà¯‡à®µà¯ˆà®¯à®• à®®à¯‚à®² à®†à®µà®£à®¤à¯à®¤à®¿à®²à®¿à®°à¯à®¨à¯à®¤à¯ à®µà¯†à®³à®¿à®¯à¯‡ à®…à®•à®±à¯à®±à¯à®•.  ",
 "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>." => "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>.",
 "Add your App" => "à®‰à®™à¯à®•à®³à¯à®Ÿà¯ˆà®¯ à®šà¯†à®¯à®²à®¿à®¯à¯ˆ à®šà¯‡à®°à¯à®•à¯à®•",
 "More Apps" => "à®®à¯‡à®²à®¤à®¿à®• à®šà¯†à®¯à®²à®¿à®•à®³à¯",
diff --git a/settings/l10n/te.php b/settings/l10n/te.php
new file mode 100644
index 0000000000000000000000000000000000000000..8bce394ddfac3f19aa6227af29c9f249ffd9238a
--- /dev/null
+++ b/settings/l10n/te.php
@@ -0,0 +1,9 @@
+<?php $TRANSLATIONS = array(
+"Error" => "à°ªà±Šà°°à°ªà°¾à°Ÿà±",
+"Delete" => "à°¤à±Šà°²à°—à°¿à°‚à°šà±",
+"More" => "à°®à°°à°¿à°¨à±à°¨à°¿",
+"Password" => "à°¸à°‚à°•à±‡à°¤à°ªà°¦à°‚",
+"New password" => "à°•à±Šà°¤à±à°¤ à°¸à°‚à°•à±‡à°¤à°ªà°¦à°‚",
+"Your email address" => "à°®à±€ à°ˆà°®à±†à°¯à°¿à°²à± à°šà°¿à°°à±à°¨à°¾à°®à°¾",
+"Language" => "à°à°¾à°·"
+);
diff --git a/settings/l10n/th_TH.php b/settings/l10n/th_TH.php
index fd623655f83c0557ec909c43d58e497a4d13bd8e..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. " => "à¹„à¸¡à¹ˆà¸ªà¸²à¸¡à¸²à¸£à¸–à¹€à¸›à¸´à¸”à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¹à¸à¸›à¹„à¸”à¹‰",
@@ -18,11 +18,11 @@
 "Disable" => "à¸›à¸´à¸”à¹ƒà¸Šà¹‰à¸‡à¸²à¸™",
 "Enable" => "à¹€à¸›à¸´à¸”à¹ƒà¸Šà¹‰à¸‡à¸²à¸™",
 "Please wait...." => "à¸à¸£à¸¸à¸“à¸²à¸£à¸à¸ªà¸±à¸à¸„à¸£à¸¹à¹ˆ...",
+"Error" => "à¸‚à¹‰à¸à¸œà¸´à¸”à¸žà¸¥à¸²à¸”",
 "Updating...." => "à¸à¸³à¸¥à¸±à¸‡à¸à¸±à¸žà¹€à¸”à¸—à¸‚à¹‰à¸à¸¡à¸¹à¸¥...",
 "Error while updating app" => "à¹€à¸à¸´à¸”à¸‚à¹‰à¸à¸œà¸´à¸”à¸žà¸¥à¸²à¸”à¹ƒà¸™à¸£à¸°à¸«à¸§à¹ˆà¸²à¸‡à¸à¸²à¸£à¸à¸±à¸žà¹€à¸”à¸—à¹à¸à¸›à¸¯",
-"Error" => "à¸‚à¹‰à¸à¸œà¸´à¸”à¸žà¸¥à¸²à¸”",
 "Updated" => "à¸à¸±à¸žà¹€à¸”à¸—à¹à¸¥à¹‰à¸§",
-"Saving..." => "à¸à¸³à¸¥à¸±à¸‡à¸šà¸±à¸™à¸—à¸¶à¸¸à¸à¸‚à¹‰à¸à¸¡à¸¹à¸¥...",
+"Saving..." => "à¸à¸³à¸¥à¸±à¸‡à¸šà¸±à¸™à¸—à¸¶à¸à¸‚à¹‰à¸à¸¡à¸¹à¸¥...",
 "deleted" => "à¸¥à¸šà¹à¸¥à¹‰à¸§",
 "undo" => "à¹€à¸¥à¸´à¸à¸—à¸³",
 "Groups" => "à¸à¸¥à¸¸à¹ˆà¸¡",
@@ -31,7 +31,23 @@
 "__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" => "à¸£à¸¸à¹ˆà¸™",
 "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>." => "à¸žà¸±à¸’à¸™à¸²à¹‚à¸”à¸¢ the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">à¸Šà¸¸à¸¡à¸Šà¸™à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™ ownCloud</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">à¸‹à¸à¸£à¹Œà¸ªà¹‚à¸„à¹‰à¸”</a>à¸à¸¢à¸¹à¹ˆà¸ à¸²à¸¢à¹ƒà¸•à¹‰à¸ªà¸±à¸à¸à¸²à¸à¸™à¸¸à¸à¸²à¸•à¸‚à¸à¸‡ <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Add your App" => "à¹€à¸žà¸´à¹ˆà¸¡à¹à¸à¸›à¸‚à¸à¸‡à¸„à¸¸à¸“",
@@ -55,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 dd70366557f499b9ad5a8fe2c42fcf722d0a836b..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,11 +18,11 @@
 "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....",
 "Error while updating app" => "Uygulama gÃ¼ncellenirken hata",
-"Error" => "Hata",
 "Updated" => "GÃ¼ncellendi",
 "Saving..." => "Kaydediliyor...",
 "deleted" => "silindi",
@@ -34,15 +35,39 @@
 "A valid username must be provided" => "GeÃ§erli bir kullanÄ±cÄ± adÄ± mutlaka saÄŸlanmalÄ±",
 "Error creating user" => "KullanÄ±cÄ± oluÅŸturulurken hata",
 "A valid password must be provided" => "GeÃ§erli bir parola mutlaka saÄŸlanmalÄ±",
-"__language_name__" => "__dil_adÄ±__",
+"__language_name__" => "TÃ¼rkÃ§e",
 "Security Warning" => "GÃ¼venlik Uyarisi",
 "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 dizininiz ve dosyalarÄ±nÄ±z bÃ¼yÃ¼k ihtimalle internet Ã¼zerinden eriÅŸilebilir. Owncloud tarafÄ±ndan saÄŸlanan .htaccess  dosyasÄ± Ã§alÄ±ÅŸmÄ±yor. Web sunucunuzu yapÄ±landÄ±rarak data dizinine eriÅŸimi kapatmanÄ±zÄ± veya data dizinini web sunucu dÃ¶kÃ¼man dizini dÄ±ÅŸÄ±na almanÄ±zÄ± ÅŸiddetle tavsiye ederiz.",
 "Setup Warning" => "Kurulum UyarÄ±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.",
 "Module 'fileinfo' missing" => "ModÃ¼l 'fileinfo' kayÄ±p",
+"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP modÃ¼lÃ¼ 'fileinfo' kayÄ±p. MIME-tip tanÄ±ma ile en iyi sonuÃ§larÄ± elde etmek iÃ§in bu modÃ¼lÃ¼ etkinleÅŸtirmenizi Ã¶neririz.",
+"Locale not working" => "Locale Ã§alÄ±ÅŸmÄ±yor.",
+"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." => "Bu ownCloud sunucusu sistem yerelini %s olarak deÄŸiÅŸtiremedi. Bu, dosya adlarÄ±ndaki bazÄ± karakterler ile sorun yaÅŸanabileceÄŸi anlamÄ±na gelir. %s yerelini desteklemek iÃ§in gerekli paketleri kurmanÄ±zÄ± ÅŸiddetle Ã¶neririz.",
+"Internet connection not working" => "Ä°nternet baÄŸlantÄ±sÄ± Ã§alÄ±ÅŸmÄ±yor",
+"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 sunucusunun internet baÄŸlantÄ±sÄ± yok. Bu nedenle harici depolama baÄŸlantÄ±sÄ±, gÃ¼ncelleÅŸtirme bildirimleri veya 3. parti uygulama kurma gibi bazÄ± Ã¶zellikler Ã§alÄ±ÅŸmayacaktÄ±r. Uzak dosyalara eriÅŸim ve e-posta ile bildirim gÃ¶nderme Ã§alÄ±ÅŸmayacak. EÄŸer ownCloud tÃ¼m Ã¶zelliklerini kullanmak istiyorsanÄ±z, internet baÄŸlantÄ±sÄ± gerekmektedir.",
+"Cron" => "Cron",
+"Execute one task with each page loaded" => "YÃ¼klenen her sayfa ile bir gÃ¶rev Ã§alÄ±ÅŸtÄ±r",
+"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php bir webcron hizmetinde kaydedilir. Owncloud kÃ¶kÃ¼ndeki cron.php sayfasÄ±nÄ± http Ã¼zerinden dakikada bir Ã§aÄŸÄ±r.",
+"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Sistemin cron hizmetini kullan. Bir sistem cronjob'Ä± ile owncloud klasÃ¶rÃ¼ndeki cron.php dosyasÄ±nÄ± dakikada bir Ã§aÄŸÄ±r.",
+"Sharing" => "PaylaÅŸÄ±m",
+"Enable Share API" => "PaylaÅŸÄ±m API'sini etkinleÅŸtir.",
+"Allow apps to use the Share API" => "UygulamalarÄ±n paylaÅŸÄ±m API'sini kullanmasÄ±na izin ver",
+"Allow links" => "BaÄŸlantÄ±larÄ± izin ver.",
+"Allow users to share items to the public with links" => "KullanÄ±cÄ±larÄ±n nesneleri paylaÅŸÄ±mÄ± iÃ§in herkese aÃ§Ä±k baÄŸlantÄ±lara izin ver",
 "Allow resharing" => "PaylaÅŸÄ±ma izin ver",
+"Allow users to share items shared with them again" => "KullanÄ±cÄ±larÄ±n kendileri ile paylaÅŸÄ±lan Ã¶ÄŸeleri yeniden paylaÅŸmasÄ±na izin ver",
+"Allow users to share with anyone" => "KullanÄ±cÄ±larÄ±n herÅŸeyi paylaÅŸmalarÄ±na izin ver",
+"Allow users to only share with users in their groups" => "KullanÄ±cÄ±larÄ±n sadece kendi gruplarÄ±ndaki kullanÄ±cÄ±larla paylaÅŸmasÄ±na izin ver",
 "Security" => "GÃ¼venlik",
+"Enforce HTTPS" => "HTTPS baÄŸlantÄ±sÄ±na zorla",
+"Enforces the clients to connect to ownCloud via an encrypted connection." => "Ä°stemcileri ownCloud'a ÅŸifreli bir baÄŸlantÄ± ile baÄŸlanmaya zorlar.",
+"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "SSL zorlamasÄ±nÄ± etkinleÅŸtirmek ya da devre dÄ±ÅŸÄ± bÄ±rakmak iÃ§in lÃ¼tfen bu ownCloud Ã¶rneÄŸine HTTPS ile baÄŸlanÄ±n.",
 "Log" => "KayÄ±tlar",
+"Log level" => "GÃ¼nlÃ¼k seviyesi",
 "More" => "Daha fazla",
+"Less" => "Az",
 "Version" => "SÃ¼rÃ¼m",
 "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>." => "GeliÅŸtirilen Taraf<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is altÄ±nda lisanslanmÄ±ÅŸtÄ±r <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Add your App" => "UygulamanÄ± Ekle",
@@ -57,6 +82,7 @@
 "Forum" => "Forum",
 "Bugtracker" => "Hata Takip Sistemi",
 "Commercial Support" => "Ticari Destek",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "KullandÄ±ÄŸÄ±nÄ±z:<strong>%s</strong> seÃ§ilebilecekler: <strong>%s</strong>",
 "Get the apps to sync your files" => "DosyalarÄ±nÄ±zÄ± senkronize etmek iÃ§in uygulamayÄ± indirin",
 "Show First Run Wizard again" => "Ä°lk Ã‡alÄ±ÅŸtÄ±rma SihirbazÄ±nÄ± yeniden gÃ¶ster",
 "Password" => "Parola",
@@ -66,12 +92,9 @@
 "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 sÄ±fÄ±rlamayÄ± aktifleÅŸtirmek iÃ§in eposta adresi girin",
+"Fill in an email address to enable password recovery" => "Parola kurtarmayÄ± etkinleÅŸtirmek iÃ§in bir eposta adresi girin",
 "Language" => "Dil",
 "Help translate" => "Ã‡evirilere yardÄ±m edin",
 "WebDAV" => "WebDAV",
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 2e182b66292c79753353e2492d723755330ab585..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",
@@ -19,9 +19,9 @@
 "Disable" => "Ð’Ð¸Ð¼ÐºÐ½ÑƒÑ‚Ð¸",
 "Enable" => "Ð’ÐºÐ»ÑŽÑ‡Ð¸Ñ‚Ð¸",
 "Please wait...." => "Ð—Ð°Ñ‡ÐµÐºÐ°Ð¹Ñ‚Ðµ, Ð±ÑƒÐ´ÑŒ Ð»Ð°ÑÐºÐ°...",
+"Error" => "ÐŸÐ¾Ð¼Ð¸Ð»ÐºÐ°",
 "Updating...." => "ÐžÐ½Ð¾Ð²Ð»ÑŽÑ”Ñ‚ÑŒÑÑ...",
 "Error while updating app" => "ÐŸÐ¾Ð¼Ð¸Ð»ÐºÐ° Ð¿Ñ€Ð¸ Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ– Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¸",
-"Error" => "ÐŸÐ¾Ð¼Ð¸Ð»ÐºÐ°",
 "Updated" => "ÐžÐ½Ð¾Ð²Ð»ÐµÐ½Ð¾",
 "Saving..." => "Ð—Ð±ÐµÑ€Ñ–Ð³Ð°ÑŽ...",
 "deleted" => "Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ñ–",
@@ -66,6 +66,7 @@
 "Log" => "ÐŸÑ€Ð¾Ñ‚Ð¾ÐºÐ¾Ð»",
 "Log level" => "Ð Ñ–Ð²ÐµÐ½ÑŒ Ð¿Ñ€Ð¾Ñ‚Ð¾ÐºÐ¾Ð»ÑŽÐ²Ð°Ð½Ð½Ñ",
 "More" => "Ð‘Ñ–Ð»ÑŒÑˆÐµ",
+"Less" => "ÐœÐµÐ½ÑˆÐµ",
 "Version" => "Ð’ÐµÑ€ÑÑ–Ñ",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Ð Ð¾Ð·Ñ€Ð¾Ð±Ð»ÐµÐ½Ð¾ <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud Ð³Ñ€Ð¾Ð¼Ð°Ð´Ð¾ÑŽ</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">Ð²Ð¸Ñ…Ñ–Ð´Ð½Ð¸Ð¹ ÐºÐ¾Ð´</a> Ð¼Ð°Ñ” Ð»Ñ–Ñ†ÐµÐ½Ð·Ñ–ÑŽ <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Add your App" => "Ð”Ð¾Ð´Ð°Ñ‚Ð¸ ÑÐ²Ð¾ÑŽ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ñƒ",
@@ -90,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/ur_PK.php b/settings/l10n/ur_PK.php
index 1adacafdff8d2cb78099f77b8e8ea73394d1cc95..02bcb0573271b25e3b1161049ad1defc7e90b922 100644
--- a/settings/l10n/ur_PK.php
+++ b/settings/l10n/ur_PK.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"Error" => "Ø§ÛŒØ±Ø±",
 "Password" => "Ù¾Ø§Ø³ÙˆØ±Úˆ",
 "New password" => "Ù†ÛŒØ§ Ù¾Ø§Ø³ÙˆØ±Úˆ"
 );
diff --git a/settings/l10n/vi.php b/settings/l10n/vi.php
index 8a843f58ed82fcf6c4b5f301e698dd0b487e39de..c9f7cd8633db30a4aa32a034f13ccce8ef1dd5ae 100644
--- a/settings/l10n/vi.php
+++ b/settings/l10n/vi.php
@@ -19,11 +19,11 @@
 "Disable" => "Táº¯t",
 "Enable" => "Báºt",
 "Please wait...." => "Xin hÃ£y Ä‘á»£i...",
+"Error" => "Lá»—i",
 "Updating...." => "Äang cáºp nháºt...",
 "Error while updating app" => "Lá»—i khi cáºp nháºt á»©ng dá»¥ng",
-"Error" => "Lá»—i",
 "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,7 +32,22 @@
 "__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",
 "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>." => "ÄÆ°á»£c phÃ¡t triá»ƒn bá»Ÿi <a href=\"http://ownCloud.org/contact\" target=\"_blank\">cá»™ng Ä‘á»“ng ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">mÃ£ nguá»“n </a> Ä‘Ã£ Ä‘Æ°á»£c cáº¥p phÃ©p theo chuáº©n <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Add your App" => "ThÃªm á»©ng dá»¥ng cá»§a báº¡n",
@@ -54,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 fcb479dd827aad3e7161e38ac9cdae2f4ae8d22e..e2f59e72d0fc6a7489a3c8353004a9528d2bc7c5 100644
--- a/settings/l10n/zh_CN.GB2312.php
+++ b/settings/l10n/zh_CN.GB2312.php
@@ -1,6 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "ä¸èƒ½ä»ŽApp Store ä¸åŠ è½½åˆ—è¡¨",
-"Authentication error" => "è®¤è¯é”™è¯¯",
+"Authentication error" => "éªŒè¯é”™è¯¯",
+"Unable to change display name" => "æ— æ³•æ›´æ”¹æ˜¾ç¤ºåç§°",
 "Group already exists" => "ç¾¤ç»„å·²å˜åœ¨",
 "Unable to add group" => "æœªèƒ½æ·»åŠ ç¾¤ç»„",
 "Could not enable app. " => "æœªèƒ½å¯ç”¨åº”ç”¨",
@@ -10,21 +11,57 @@
 "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 ç§»é™¤",
+"Couldn't update app." => "åº”ç”¨æ— æ³•å‡çº§ã€‚",
+"Update to {appversion}" => "å‡çº§è‡³{appversion}",
 "Disable" => "ç¦ç”¨",
 "Enable" => "å¯ç”¨",
+"Please wait...." => "è¯·ç¨å€™â€¦â€¦",
 "Error" => "å‡ºé”™",
+"Updating...." => "å‡çº§ä¸â€¦â€¦",
+"Error while updating app" => "åº”ç”¨å‡çº§æ—¶å‡ºçŽ°é”™è¯¯",
+"Updated" => "å·²å‡çº§",
 "Saving..." => "ä¿å˜ä¸...",
 "deleted" => "åˆ é™¤",
 "undo" => "æ’¤é”€",
-"Groups" => "ç»„",
+"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__" => "Chinese",
 "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 æä¾›çš„ .htaccesss æ–‡ä»¶æœªå…¶ä½œç”¨ã€‚æˆ‘ä»¬å¼ºçƒˆå»ºè®®æ‚¨é…ç½®ç½‘ç»œæœåŠ¡å™¨ä»¥ä½¿æ•°æ®æ–‡ä»¶å¤¹ä¸èƒ½ä»Žäº’è”ç½‘è®¿é—®ï¼Œæˆ–å°†ç§»åŠ¨æ•°æ®æ–‡ä»¶å¤¹ç§»å‡ºç½‘ç»œæœåŠ¡å™¨æ–‡æ¡£æ ¹ç›®å½•ã€‚",
+"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>ã€‚",
+"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" => "å…è®¸é“¾æŽ¥",
+"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" => "æ—¥å¿—",
 "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\">sæºä»£ç </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" => "æ›´å¤šåº”ç”¨",
@@ -32,17 +69,36 @@
 "See application page at apps.owncloud.com" => "åœ¨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" => "Bugè¿½è¸ªè€…",
+"Commercial Support" => "å•†ä¸šæ”¯æŒ",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "æ‚¨å·²ä½¿ç”¨<strong>%s</strong>/<strong>%s</strong>",
+"Get the apps to sync your files" => "èŽ·å–åº”ç”¨å¹¶åŒæ¥æ‚¨çš„æ–‡ä»¶",
+"Show First Run Wizard again" => "å†æ¬¡æ˜¾ç¤ºé¦–æ¬¡è¿è¡Œå‘å¯¼",
 "Password" => "å¯†ç ",
 "Your password was changed" => "æ‚¨çš„å¯†ç ä»¥å˜æ›´",
 "Unable to change your password" => "ä¸èƒ½æ”¹å˜ä½ çš„å¯†ç ",
 "Current password" => "çŽ°åœ¨çš„å¯†ç ",
 "New password" => "æ–°å¯†ç ",
 "Change password" => "æ”¹å˜å¯†ç ",
-"Email" => "Email",
+"Display Name" => "æ˜¾ç¤ºåç§°",
+"Email" => "ç”µåé‚®ä»¶",
 "Your email address" => "ä½ çš„emailåœ°å€",
 "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/zh_CN.php b/settings/l10n/zh_CN.php
index 226ffb58bc780a78084e3c3e2ad62b378ae3f209..1ec0b004c60d84ac985460979de533a1b8b21ed1 100644
--- a/settings/l10n/zh_CN.php
+++ b/settings/l10n/zh_CN.php
@@ -1,6 +1,8 @@
 <?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" => "æ— æ³•æ·»åŠ ç»„",
 "Could not enable app. " => "æ— æ³•å¼€å¯App",
@@ -9,23 +11,63 @@
 "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" => "é”™è¯¯",
-"Saving..." => "æ£åœ¨ä¿å˜",
+"Updating...." => "æ£åœ¨æ›´æ–°....",
+"Error while updating app" => "æ›´æ–° app æ—¶å‡ºé”™",
+"Updated" => "å·²æ›´æ–°",
+"Saving..." => "ä¿å˜ä¸",
 "deleted" => "å·²ç»åˆ é™¤",
 "undo" => "æ’¤é”€",
+"Unable to remove user" => "æ— æ³•ç§»é™¤ç”¨æˆ·",
 "Groups" => "ç»„",
 "Group Admin" => "ç»„ç®¡ç†å‘˜",
 "Delete" => "åˆ é™¤",
+"add group" => "æ·»åŠ ç»„",
+"A valid username must be provided" => "å¿…é¡»æä¾›åˆæ³•çš„ç”¨æˆ·å",
+"Error creating user" => "åˆ›å»ºç”¨æˆ·å‡ºé”™",
+"A valid password must be provided" => "å¿…é¡»æä¾›åˆæ³•çš„å¯†ç ",
 "__language_name__" => "ç®€ä½“ä¸æ–‡",
 "Security Warning" => "å®‰å…¨è¦å‘Š",
 "Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "æ‚¨çš„æ•°æ®æ–‡ä»¶å¤¹å’Œæ–‡ä»¶å¯ç”±äº’è”ç½‘è®¿é—®ã€‚OwnCloudæä¾›çš„.htaccessæ–‡ä»¶æœªç”Ÿæ•ˆã€‚æˆ‘ä»¬å¼ºçƒˆå»ºè®®æ‚¨é…ç½®æœåŠ¡å™¨ï¼Œä»¥ä½¿æ•°æ®æ–‡ä»¶å¤¹ä¸å¯è¢«è®¿é—®ï¼Œæˆ–è€…å°†æ•°æ®æ–‡ä»¶å¤¹ç§»åˆ°webæœåŠ¡å™¨æ ¹ç›®å½•ä»¥å¤–ã€‚",
+"Setup Warning" => "è®¾ç½®è¦å‘Š",
+"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>.",
+"Module 'fileinfo' missing" => "æ¨¡å—'æ–‡ä»¶ä¿¡æ¯'ä¸¢å¤±",
+"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHPæ¨¡å—'æ–‡ä»¶ä¿¡æ¯'ä¸¢å¤±. æˆ‘ä»¬å¼ºçƒˆå»ºè®®å¯ç”¨æ¤æ¨¡å—ä»¥ä¾¿mimeç±»åž‹æ£€æµ‹å–å¾—æœ€ä½³ç»“æžœ.",
+"Locale not working" => "æœ¬åœ°åŒ–æ— æ³•å·¥ä½œ",
+"This ownCloud server can't set system locale to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "æ¤ownCloudæœåŠ¡å™¨æ— æ³•è®¾ç½®ç³»ç»Ÿæœ¬åœ°åŒ–åˆ°%s. è¿™æ„å‘³ç€å¯èƒ½æ–‡ä»¶åä¸æœ‰ä¸€äº›å—ç¬¦å¼•èµ·é—®é¢˜. æˆ‘ä»¬å¼ºçƒˆå»ºè®®åœ¨ä½ ç³»ç»Ÿä¸Šå®‰è£…æ‰€éœ€çš„è½¯ä»¶åŒ…æ¥æ”¯æŒ%s",
+"Internet connection not working" => "å› ç‰¹ç½‘è¿žæŽ¥æ— æ³•å·¥ä½œ",
+"This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps donÂ´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "æ¤ownCloudæœåŠ¡å™¨ä¸Šæ²¡æœ‰å¯ç”¨çš„å› ç‰¹ç½‘è¿žæŽ¥. è¿™æ„å‘³ç€æŸäº›ç‰¹æ€§ä¾‹å¦‚æŒ‚è½½å¤–éƒ¨å˜å‚¨å™¨, æé†’æ›´æ–°æˆ–å®‰è£…ç¬¬ä¸‰æ–¹åº”ç”¨æ— æ³•å·¥ä½œ. ä»Žè¿œç¨‹è®¿é—®æ–‡ä»¶å’Œå‘é€æé†’ç”µåé‚®ä»¶å¯èƒ½ä¹Ÿæ— æ³•å·¥ä½œ. å¦‚æžœä½ æƒ³è¦ownCloudçš„æ‰€æœ‰ç‰¹æ€§, æˆ‘ä»¬å»ºè®®å¯ç”¨æ¤æœåŠ¡å™¨çš„å› ç‰¹ç½‘è¿žæŽ¥.",
+"Cron" => "è®¡åˆ’ä»»åŠ¡",
+"Execute one task with each page loaded" => "æ¯ä¸ªé¡µé¢åŠ è½½åŽæ‰§è¡Œä¸€ä¸ªä»»åŠ¡",
+"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.phpå·²è¢«æ³¨å†Œåˆ°ç½‘ç»œå®šæ—¶ä»»åŠ¡æœåŠ¡ã€‚é€šè¿‡httpæ¯åˆ†é’Ÿè°ƒç”¨owncloudæ ¹ç›®å½•çš„cron.phpç½‘é¡µã€‚",
+"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "ä½¿ç”¨ç³»ç»Ÿå®šæ—¶ä»»åŠ¡æœåŠ¡ã€‚æ¯åˆ†é’Ÿé€šè¿‡ç³»ç»Ÿå®šæ—¶ä»»åŠ¡è°ƒç”¨owncloudæ–‡ä»¶å¤¹ä¸çš„cron.phpæ–‡ä»¶",
+"Sharing" => "å…±äº«",
+"Enable Share API" => "å¯ç”¨å…±äº«API",
+"Allow apps to use the Share API" => "å…è®¸åº”ç”¨è½¯ä»¶ä½¿ç”¨å…±äº«API",
+"Allow links" => "å…è®¸é“¾æŽ¥",
+"Allow users to share items to the public with links" => "å…è®¸ç”¨æˆ·ä½¿ç”¨è¿žæŽ¥å…¬å¼€å…±äº«é¡¹ç›®",
+"Allow resharing" => "å…è®¸å†æ¬¡å…±äº«",
+"Allow users to share items shared with them again" => "å…è®¸ç”¨æˆ·å°†å…±äº«ç»™ä»–ä»¬çš„é¡¹ç›®å†æ¬¡å…±äº«",
+"Allow users to share with anyone" => "å…è®¸ç”¨æˆ·å‘ä»»ä½•äººå…±äº«",
+"Allow users to only share with users in their groups" => "å…è®¸ç”¨æˆ·åªå‘åŒç»„ç”¨æˆ·å…±äº«",
+"Security" => "å®‰å…¨",
+"Enforce HTTPS" => "å¼ºåˆ¶ä½¿ç”¨ HTTPS",
+"Enforces the clients to connect to ownCloud via an encrypted connection." => "å¼ºåˆ¶å®¢æˆ·ç«¯é€šè¿‡åŠ å¯†è¿žæŽ¥è¿žæŽ¥åˆ° ownCloudã€‚",
+"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "è¯·ç»ç”±HTTPSè¿žæŽ¥åˆ°è¿™ä¸ªownCloudå®žä¾‹æ¥å¯ç”¨æˆ–ç¦ç”¨å¼ºåˆ¶SSL.",
+"Log" => "æ—¥å¿—",
+"Log level" => "æ—¥å¿—çº§åˆ«",
 "More" => "æ›´å¤š",
+"Less" => "æ›´å°‘",
 "Version" => "ç‰ˆæœ¬",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "ç”±<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloudç¤¾åŒº</a>å¼€å‘ï¼Œ  <a href=\"https://github.com/owncloud\" target=\"_blank\">æºä»£ç </a>åœ¨<a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>è®¸å¯è¯ä¸‹å‘å¸ƒã€‚",
 "Add your App" => "æ·»åŠ åº”ç”¨",
@@ -42,12 +84,14 @@
 "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" => "å¯†ç å·²ä¿®æ”¹",
 "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" => "å¡«å†™ç”µåé‚®ä»¶åœ°å€ä»¥å¯ç”¨å¯†ç æ¢å¤åŠŸèƒ½",
@@ -55,10 +99,13 @@
 "Help translate" => "å¸®åŠ©ç¿»è¯‘",
 "WebDAV" => "WebDAV",
 "Use this address to connect to your ownCloud in your file manager" => "ç”¨è¯¥åœ°å€æ¥è¿žæŽ¥æ–‡ä»¶ç®¡ç†å™¨ä¸çš„ ownCloud",
+"Login Name" => "ç™»å½•åç§°",
 "Create" => "åˆ›å»º",
 "Default Storage" => "é»˜è®¤å˜å‚¨",
 "Unlimited" => "æ— é™",
 "Other" => "å…¶å®ƒ",
 "Storage" => "å˜å‚¨",
+"change display name" => "ä¿®æ”¹æ˜¾ç¤ºåç§°",
+"set new password" => "è®¾ç½®æ–°å¯†ç ",
 "Default" => "é»˜è®¤"
 );
diff --git a/settings/l10n/zh_HK.php b/settings/l10n/zh_HK.php
new file mode 100644
index 0000000000000000000000000000000000000000..843a41c9c103fb02f5848388334cc234ac4aca63
--- /dev/null
+++ b/settings/l10n/zh_HK.php
@@ -0,0 +1,8 @@
+<?php $TRANSLATIONS = array(
+"Error" => "éŒ¯èª¤",
+"Groups" => "ç¾¤çµ„",
+"Delete" => "åˆªé™¤",
+"Password" => "å¯†ç¢¼",
+"New password" => "æ–°å¯†ç¢¼",
+"Email" => "é›»éƒµ"
+);
diff --git a/settings/l10n/zh_TW.php b/settings/l10n/zh_TW.php
index 0b9d2d3d023bde651e6f3dc5f60ef108bdf8c873..06c1fe0e7c18254b75fe830c73dd674f69563740 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" => "ç¾¤çµ„å¢žåŠ å¤±æ•—",
@@ -19,9 +20,9 @@
 "Disable" => "åœç”¨",
 "Enable" => "å•Ÿç”¨",
 "Please wait...." => "è«‹ç¨å€™...",
+"Error" => "éŒ¯èª¤",
 "Updating...." => "æ›´æ–°ä¸...",
 "Error while updating app" => "æ›´æ–°æ‡‰ç”¨ç¨‹å¼éŒ¯èª¤",
-"Error" => "éŒ¯èª¤",
 "Updated" => "å·²æ›´æ–°",
 "Saving..." => "å„²å˜ä¸...",
 "deleted" => "å·²åˆªé™¤",
@@ -31,12 +32,42 @@
 "Group Admin" => "ç¾¤çµ„ ç®¡ç†å“¡",
 "Delete" => "åˆªé™¤",
 "add group" => "æ–°å¢žç¾¤çµ„",
+"A valid username must be provided" => "ä¸€å®šè¦æä¾›ä¸€å€‹æœ‰æ•ˆçš„ç”¨æˆ¶å",
+"Error creating user" => "å‰µå»ºç”¨æˆ¶æ™‚å‡ºç¾éŒ¯èª¤",
+"A valid password must be provided" => "ä¸€å®šè¦æä¾›ä¸€å€‹æœ‰æ•ˆçš„å¯†ç¢¼",
 "__language_name__" => "__èªžè¨€_åç¨±__",
 "Security Warning" => "å®‰å…¨æ€§è¦å‘Š",
 "Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "æ‚¨çš„è³‡æ–™ç›®éŒ„ (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" => "å…è¨±é€£çµ",
+"Allow users to share items to the public with links" => "å…è¨±ä½¿ç”¨è€…é€éŽå…¬é–‹çš„é€£çµåˆ†äº«æª”æ¡ˆ",
+"Allow resharing" => "å…è¨±è½‰è²¼åˆ†äº«",
+"Allow users to share items shared with them again" => "å…è¨±ä½¿ç”¨è€…åˆ†äº«å…¶ä»–ä½¿ç”¨è€…åˆ†äº«çµ¦ä»–çš„æª”æ¡ˆ",
+"Allow users to share with anyone" => "å…è¨±ä½¿ç”¨è€…èˆ‡ä»»ä½•äººåˆ†äº«æª”æ¡ˆ",
+"Allow users to only share with users in their groups" => "åƒ…å…è¨±ä½¿ç”¨è€…åœ¨ç¾¤çµ„å…§åˆ†äº«",
+"Security" => "å®‰å…¨æ€§",
+"Enforce HTTPS" => "å¼·åˆ¶å•Ÿç”¨ HTTPS",
+"Enforces the clients to connect to ownCloud via an encrypted connection." => "å¼·åˆ¶æŒ‡å®šç”¨æˆ¶ç«¯ä½¿ç”¨åŠ å¯†çš„é€£ç·šé€£æŽ¥åˆ° ownCloud",
+"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "è«‹ä½¿ç”¨ HTTPS é€£ç·šåˆ° ownCloudï¼Œæˆ–æ˜¯é—œé–‰å¼·åˆ¶ä½¿ç”¨ SSL çš„é¸é …ã€‚",
+"Log" => "ç´€éŒ„",
+"Log level" => "ç´€éŒ„å±¤ç´š",
 "More" => "æ›´å¤š",
+"Less" => "å°‘",
 "Version" => "ç‰ˆæœ¬",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "ç”±<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud ç¤¾å€</a>é–‹ç™¼ï¼Œ<a href=\"https://github.com/owncloud\" target=\"_blank\">æºä»£ç¢¼</a>åœ¨<a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>è¨±å¯è‰ä¸‹ç™¼å¸ƒã€‚",
 "Add your App" => "æ·»åŠ ä½ çš„ App",
@@ -52,26 +83,24 @@
 "Bugtracker" => "Bugtracker",
 "Commercial Support" => "å•†ç”¨æ”¯æ´",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "æ‚¨å·²ç¶“ä½¿ç”¨äº† <strong>%s</strong> ï¼Œç›®å‰å¯ç”¨ç©ºé–“ç‚º <strong>%s</strong>",
+"Get the apps to sync your files" => "ä¸‹è¼‰æ‡‰ç”¨ç¨‹å¼ä¾†åŒæ¥æ‚¨çš„æª”æ¡ˆ",
 "Show First Run Wizard again" => "å†æ¬¡é¡¯ç¤ºé¦–æ¬¡ä½¿ç”¨ç²¾éˆ",
 "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" => "å»ºç«‹",
 "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 dd5e89b8f8289338b4843c5990c479377afa11a4..28254b7aa1844a5c5d9ebbb8cb51f3ca9c6314a6 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -201,7 +201,7 @@ if (!$_['internetconnectionworking']) {
 		<?php endif;
 endfor;?>
 </select>
-	<table id='log'>
+	<table id="log">
 		<?php foreach ($_['entries'] as $entry): ?>
 		<tr>
 			<td>
@@ -214,13 +214,18 @@ 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;?>
 	</table>
 	<?php if ($_['entriesremain']): ?>
-	<input id='moreLog' type='button' value='<?php p($l->t('More'));?>...'>
+	<input id="moreLog" type="button" value="<?php p($l->t('More'));?>...">
+	<input id="lessLog" type="button" value="<?php p($l->t('Less'));?>...">
 	<?php endif; ?>
 
 </fieldset>
@@ -228,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 p(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 f3fd3f1010daf84b857afa3a44772b3c2621a83e..cfb45e99c4d4c8855cd5c3e89b076ec2683dc69b 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="password"
+		<input type="password" id="pass2" name="newpassword"
 			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,11 +54,9 @@ 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
@@ -78,11 +76,16 @@ if($_['displayNameChangeSupported']) {
 	<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 deffe1683233036ad6759fa79e3447cad6bb69c5..e86dd46efbe42f94cc18b5283bf3afecd27f8cd4 100644
--- a/settings/templates/users.php
+++ b/settings/templates/users.php
@@ -25,9 +25,7 @@ $_['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>
@@ -55,7 +53,7 @@ $_['subadmingroups'] = array_flip($items);
 					<?php p($_['default_quota']);?>
 				</option>
 				<?php endif;?>
-				<option value='other'>
+				<option data-new value='other'>
 					<?php p($l->t('Other'));?>
 					...
 				</option>
@@ -105,9 +103,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 +115,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/tests/lib/app.php b/tests/lib/app.php
index c452d752c9f43cc13cc8749fd7242d9619ebe96b..5396db8143e8cc5358d7edb5b7d487a4bf6aa83b 100644
--- a/tests/lib/app.php
+++ b/tests/lib/app.php
@@ -64,6 +64,14 @@ class Test_App extends PHPUnit_Framework_TestCase {
 	}
 
 
+	public function testIsAppVersionCompatibleShouldWorkForPreAlpha(){
+		$oc = array(5, 0, 3);
+		$app = '4.93';
+
+		$this->assertTrue(OC_App::isAppVersionCompatible($oc, $app));
+	}
+
+
 	public function testIsAppVersionCompatibleShouldFailOneVersionNumbers(){
 		$oc = array(4, 3, 1);
 		$app = '5';
diff --git a/tests/lib/archive/tar.php b/tests/lib/archive/tar.php
index 51de004813a5ae70b790da0bbd52d730577d1536..e66a87408790590fccaeff81f8b6d95efbf01e04 100644
--- a/tests/lib/archive/tar.php
+++ b/tests/lib/archive/tar.php
@@ -8,6 +8,7 @@
 
 require_once 'archive.php';
 
+if (!OC_Util::runningOnWindows()) {
 class Test_Archive_TAR extends Test_Archive {
 	protected function getExisting() {
 		$dir = OC::$SERVERROOT . '/tests/data';
@@ -18,3 +19,4 @@ class Test_Archive_TAR extends Test_Archive {
 		return new OC_Archive_TAR(OCP\Files::tmpFile('.tar.gz'));
 	}
 }
+}
diff --git a/tests/lib/archive/zip.php b/tests/lib/archive/zip.php
index adddf81ee1bd2bd09537afc67365bef68196e55e..e049a899d8846e901cd820c9589def868856d690 100644
--- a/tests/lib/archive/zip.php
+++ b/tests/lib/archive/zip.php
@@ -8,6 +8,7 @@
 
 require_once 'archive.php';
 
+if (!OC_Util::runningOnWindows()) {
 class Test_Archive_ZIP extends Test_Archive {
 	protected function getExisting() {
 		$dir = OC::$SERVERROOT . '/tests/data';
@@ -18,3 +19,4 @@ class Test_Archive_ZIP extends Test_Archive {
 		return new OC_Archive_ZIP(OCP\Files::tmpFile('.zip'));
 	}
 }
+}
\ No newline at end of file
diff --git a/tests/lib/autoloader.php b/tests/lib/autoloader.php
new file mode 100644
index 0000000000000000000000000000000000000000..0e7d606ccf678b9baf752ea3cd5d001e76ad54ea
--- /dev/null
+++ b/tests/lib/autoloader.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * Copyright (c) 2013 Thomas MÃ¼ller <thomas.mueller@tmit.eu>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace Test;
+
+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 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/files/cache/cache.php b/tests/lib/files/cache/cache.php
index edcd1c487d0b9e28e6751537b1168430ba5dcef7..1612a673838f55377dd4003d8d4baa624e35edc8 100644
--- a/tests/lib/files/cache/cache.php
+++ b/tests/lib/files/cache/cache.php
@@ -162,10 +162,11 @@ 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);
 
@@ -244,4 +245,4 @@ class Cache extends \PHPUnit_Framework_TestCase {
 		$this->storage = new \OC\Files\Storage\Temporary(array());
 		$this->cache = new \OC\Files\Cache\Cache($this->storage);
 	}
-}
\ No newline at end of file
+}
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 7a79f45a20344e2038120442a310e1e8299cb132..dad3cd7e6503cf671375fd1049bc8b7cc3e3f9fa 100644
--- a/tests/lib/files/cache/updater.php
+++ b/tests/lib/files/cache/updater.php
@@ -42,18 +42,17 @@ 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');
 
+		\OC_Hook::clear('OC_Filesystem');
+
 		\OC_Hook::connect('OC_Filesystem', 'post_write', '\OC\Files\Cache\Updater', 'writeHook');
 		\OC_Hook::connect('OC_Filesystem', 'post_delete', '\OC\Files\Cache\Updater', 'deleteHook');
 		\OC_Hook::connect('OC_Filesystem', 'post_rename', '\OC\Files\Cache\Updater', 'renameHook');
@@ -137,11 +136,10 @@ class Updater extends \PHPUnit_Framework_TestCase {
 		$this->assertFalse($this->cache->inCache('foo.txt'));
 		$this->assertTrue($this->cache->inCache('bar.txt'));
 		$cachedData = $this->cache->get('bar.txt');
-		$this->assertNotEquals($fooCachedData['etag'], $cachedData['etag']);
+		$this->assertEquals($fooCachedData['fileid'], $cachedData['fileid']);
 		$mtime = $cachedData['mtime'];
 		$cachedData = $this->cache->get('');
 		$this->assertEquals(3 * $textSize + $imageSize, $cachedData['size']);
 		$this->assertNotEquals($rootCachedData['etag'], $cachedData['etag']);
-		$this->assertEquals($mtime, $cachedData['mtime']);
 	}
 }
diff --git a/tests/lib/files/mapper.php b/tests/lib/files/mapper.php
new file mode 100644
index 0000000000000000000000000000000000000000..e3859bc0f2333213e041acd899ecd1069992dab2
--- /dev/null
+++ b/tests/lib/files/mapper.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * ownCloud
+ *
+ * @author Thomas MÃ¼ller
+ * @copyright 2013 Thomas MÃ¼ller thomas.mueller@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/>.
+ *
+ */
+
+namespace Test\Files;
+
+class Mapper extends \PHPUnit_Framework_TestCase {
+
+	/**
+	 * @var \OC\Files\Mapper
+	 */
+	private $mapper = null;
+
+	public function setUp() {
+		$this->mapper = new \OC\Files\Mapper('D:/');
+	}
+
+	public function testSlugifyPath() {
+		// with extension
+		$this->assertEquals('D:/text.txt', $this->mapper->slugifyPath('D:/text.txt'));
+		$this->assertEquals('D:/text-2.txt', $this->mapper->slugifyPath('D:/text.txt', 2));
+		$this->assertEquals('D:/a/b/text.txt', $this->mapper->slugifyPath('D:/a/b/text.txt'));
+
+		// without extension
+		$this->assertEquals('D:/text', $this->mapper->slugifyPath('D:/text'));
+		$this->assertEquals('D:/text-2', $this->mapper->slugifyPath('D:/text', 2));
+		$this->assertEquals('D:/a/b/text', $this->mapper->slugifyPath('D:/a/b/text'));
+
+		// with double dot
+		$this->assertEquals('D:/text-text.txt', $this->mapper->slugifyPath('D:/text.text.txt'));
+		$this->assertEquals('D:/text-text-2.txt', $this->mapper->slugifyPath('D:/text.text.txt', 2));
+		$this->assertEquals('D:/a/b/text-text.txt', $this->mapper->slugifyPath('D:/a/b/text.text.txt'));
+	}
+}
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/storage/storage.php b/tests/lib/files/storage/storage.php
index f78f66d8b8ad1345fa0a62141a8fadee0466bb16..0e22f26ae838f79c7fe76f8500d1dbf5670006a0 100644
--- a/tests/lib/files/storage/storage.php
+++ b/tests/lib/files/storage/storage.php
@@ -224,8 +224,7 @@ abstract class Storage extends \PHPUnit_Framework_TestCase {
 	}
 
 	public function testSearchInSubFolder() {
-		$this->instance->mkdir('sub')
-		;
+		$this->instance->mkdir('sub');
 		$textFile = \OC::$SERVERROOT . '/tests/data/lorem.txt';
 		$this->instance->file_put_contents('/sub/lorem.txt', file_get_contents($textFile, 'r'));
 		$pngFile = \OC::$SERVERROOT . '/tests/data/logo-wide.png';
@@ -258,4 +257,10 @@ abstract class Storage extends \PHPUnit_Framework_TestCase {
 		$content = stream_get_contents($fh);
 		$this->assertEquals(file_get_contents($textFile), $content);
 	}
+
+	public function testTouchCreateFile(){
+		$this->assertFalse($this->instance->file_exists('foo'));
+		$this->instance->touch('foo');
+		$this->assertTrue($this->instance->file_exists('foo'));
+	}
 }
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/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/util.php b/tests/lib/util.php
index b904c35980775f65822e676a761160cd81649737..1f253825920cb6860b4ab5c0c549640268dce3b6 100644
--- a/tests/lib/util.php
+++ b/tests/lib/util.php
@@ -47,4 +47,16 @@ class Test_Util extends PHPUnit_Framework_TestCase {
 		$email = \OCP\Util::getDefaultEmailAddress("no-reply");
 		$this->assertEquals('no-reply@localhost.localdomain', $email);
 	}
-}
\ No newline at end of file
+
+	function testGetDefaultEmailAddressFromConfig() {
+		OC_Config::setValue('mail_domain', 'example.com');
+		$email = \OCP\Util::getDefaultEmailAddress("no-reply");
+		$this->assertEquals('no-reply@example.com', $email);
+		OC_Config::deleteKey('mail_domain');
+	}
+
+  function testGetInstanceIdGeneratesValidId() {
+    OC_Config::deleteKey('instanceid');
+    $this->assertStringStartsWith('oc', OC_Util::getInstanceId());
+  }
+}
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
new file mode 100644
index 0000000000000000000000000000000000000000..f28d22a1fcdb3f0d4b4036348d23d339fc0742b6
--- /dev/null
+++ b/tests/lib/vobject.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Copyright (c) 2013 Thomas Tanghus (thomas@tanghus.net)
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+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