diff --git a/.htaccess b/.htaccess
index 048a56d6389dd0b05cc0b4bd36490f125631bdaa..616118b2ce8ae57bd914f595f1d6f069e52478c7 100755
--- a/.htaccess
+++ b/.htaccess
@@ -1,4 +1,5 @@
 <IfModule mod_fcgid.c>
+php_value cgi.fix_pathinfo 1
 <IfModule mod_setenvif.c>
 <IfModule mod_headers.c>
 SetEnvIfNoCase ^Authorization$ "(.+)" XAUTHORIZATION=$1
@@ -32,4 +33,5 @@ RewriteRule ^remote/(.*) remote.php [QSA,L]
 AddType image/svg+xml svg svgz
 AddEncoding gzip svgz
 </IfModule>
+AddDefaultCharset utf-8
 Options -Indexes
diff --git a/README b/README
index 9b113c4f6742e981d1310f0af731120323009295..5f5d190cb0152dc5d85541614b71de81468ea298 100644
--- a/README
+++ b/README
@@ -3,7 +3,7 @@ A personal cloud which runs on your own server.
 
 http://ownCloud.org
 
-Installation instructions: http://owncloud.org/support
+Installation instructions: http://doc.owncloud.org/server/5.0/developer_manual/app/gettingstarted.html
 Contribution Guidelines: http://owncloud.org/dev/contribute/
 
 Source code: https://github.com/owncloud
diff --git a/apps/files/ajax/download.php b/apps/files/ajax/download.php
index b9a4ddaf5e7df297d3ad4c5666e35eec4f344a2b..7c8dcb372e24c5d4517b1ac5459e1c03feb9744a 100644
--- a/apps/files/ajax/download.php
+++ b/apps/files/ajax/download.php
@@ -33,4 +33,10 @@ OCP\User::checkLoggedIn();
 $files = $_GET["files"];
 $dir = $_GET["dir"];
 
-OC_Files::get($dir, $files, $_SERVER['REQUEST_METHOD'] == 'HEAD' ? true : false);
+$files_list = json_decode($files);
+// in case we get only a single file
+if ($files_list === NULL ) {
+	$files_list = array($files);
+}
+
+OC_Files::get($dir, $files_list, $_SERVER['REQUEST_METHOD'] == 'HEAD' ? true : false);
diff --git a/apps/files/ajax/upload.php b/apps/files/ajax/upload.php
index 07977f5ddf1ddb04972bd027b903429889dc04db..5b697777e47cd701f09c4d61d1d7c95dfcb9c8d1 100644
--- a/apps/files/ajax/upload.php
+++ b/apps/files/ajax/upload.php
@@ -26,8 +26,7 @@ foreach ($_FILES['files']['error'] as $error) {
 			UPLOAD_ERR_OK => $l->t('There is no error, the file uploaded with success'),
 			UPLOAD_ERR_INI_SIZE => $l->t('The uploaded file exceeds the upload_max_filesize directive in php.ini: ')
 				. ini_get('upload_max_filesize'),
-			UPLOAD_ERR_FORM_SIZE => $l->t('The uploaded file exceeds the MAX_FILE_SIZE directive that was specified'
-				. ' in the HTML form'),
+			UPLOAD_ERR_FORM_SIZE => $l->t('The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form'),
 			UPLOAD_ERR_PARTIAL => $l->t('The uploaded file was only partially uploaded'),
 			UPLOAD_ERR_NO_FILE => $l->t('No file was uploaded'),
 			UPLOAD_ERR_NO_TMP_DIR => $l->t('Missing a temporary folder'),
@@ -48,7 +47,7 @@ $totalSize = 0;
 foreach ($files['size'] as $size) {
 	$totalSize += $size;
 }
-if ($totalSize > \OC\Files\Filesystem::free_space($dir)) {
+if ($totalSize > $maxUploadFilesize) {
 	OCP\JSON::error(array('data' => array('message' => $l->t('Not enough storage available'),
 		'uploadMaxFilesize' => $maxUploadFilesize,
 		'maxHumanFilesize' => $maxHumanFilesize)));
diff --git a/apps/files/appinfo/info.xml b/apps/files/appinfo/info.xml
index 7c82c839dabd9f609ace7b8527b883fb41001518..34800378537ead29daf6456563038a43dc3bbbe4 100644
--- a/apps/files/appinfo/info.xml
+++ b/apps/files/appinfo/info.xml
@@ -5,7 +5,7 @@
 	<description>File Management</description>
 	<licence>AGPL</licence>
 	<author>Robin Appelman</author>
-	<require>4.91</require>
+	<require>4.93</require>
 	<shipped>true</shipped>
 	<standalone/>
 	<default_enable/>
diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index dfc2e4c0e2f7255379fdc5c08e4fe55868e82af4..4d2b16e6f1c2f4cefbbf04410e8678f5f7adeb68 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -55,7 +55,7 @@
 	font-size:1.5em; font-weight:bold;
 	color:#888; text-shadow:#fff 0 1px 0;
 }
-table { position:relative; top:37px; width:100%; }
+#filestable { position: relative; top:37px; width:100%; }
 tbody tr { background-color:#fff; height:2.5em; }
 tbody tr:hover, tbody tr:active, tbody tr.selected { background-color:#f8f8f8; }
 tbody tr.selected { background-color:#eee; }
@@ -73,7 +73,7 @@ table th#headerSize, table td.filesize { min-width:3em; padding:0 1em; text-alig
 table th#headerDate, table td.date { min-width:11em; padding:0 .1em 0 1em; text-align:left; }
 
 /* Multiselect bar */
-table.multiselect { top:63px; }
+#filestable.multiselect { top:63px; }
 table.multiselect thead { position:fixed; top:82px; z-index:1; -moz-box-sizing: border-box; box-sizing: border-box; left: 0; padding-left: 64px; width:100%; }
 table.multiselect thead th { background:rgba(230,230,230,.8); color:#000; font-weight:bold; border-bottom:0; }
 table.multiselect #headerName { width: 100%; }
@@ -123,6 +123,24 @@ a.action>img { max-height:16px; max-width:16px; vertical-align:text-bottom; }
 .selectedActions a { display:inline; margin:-.5em 0; padding:.5em !important; }
 .selectedActions a img { position:relative; top:.3em; }
 
+#fileList a.action {
+	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
+	filter: alpha(opacity=0);
+	opacity: 0;
+	display:none;
+}
+#fileList tr:hover a.action, #fileList a.action.permanent {
+	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=.5)";
+	filter: alpha(opacity=.5);
+	opacity: .5;
+	display:inline;
+}
+#fileList tr:hover a.action:hover {
+	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=1)";
+	filter: alpha(opacity=1);
+	opacity: 1;
+	display:inline;
+}
 
 #scanning-message{ top:40%; left:40%; position:absolute; display:none; }
 
diff --git a/apps/files/index.php b/apps/files/index.php
index 434e98c6ea847a8b2f2316c570685be84b1446d4..20fbf7f93be9a1232f271188c10c5f28da047976 100644
--- a/apps/files/index.php
+++ b/apps/files/index.php
@@ -90,13 +90,13 @@ foreach (explode('/', $dir) as $i) {
 
 // make breadcrumb und filelist markup
 $list = new OCP\Template('files', 'part.list', '');
-$list->assign('files', $files, false);
-$list->assign('baseURL', OCP\Util::linkTo('files', 'index.php') . '?dir=', false);
-$list->assign('downloadURL', OCP\Util::linkToRoute('download', array('file' => '/')), false);
+$list->assign('files', $files);
+$list->assign('baseURL', OCP\Util::linkTo('files', 'index.php') . '?dir=');
+$list->assign('downloadURL', OCP\Util::linkToRoute('download', array('file' => '/')));
 $list->assign('disableSharing', false);
 $breadcrumbNav = new OCP\Template('files', 'part.breadcrumb', '');
-$breadcrumbNav->assign('breadcrumb', $breadcrumb, false);
-$breadcrumbNav->assign('baseURL', OCP\Util::linkTo('files', 'index.php') . '?dir=', false);
+$breadcrumbNav->assign('breadcrumb', $breadcrumb);
+$breadcrumbNav->assign('baseURL', OCP\Util::linkTo('files', 'index.php') . '?dir=');
 
 $permissions = OCP\PERMISSION_READ;
 if (\OC\Files\Filesystem::isCreatable($dir . '/')) {
@@ -125,8 +125,8 @@ if ($needUpgrade) {
 	OCP\Util::addscript('files', 'files');
 	OCP\Util::addscript('files', 'keyboardshortcuts');
 	$tmpl = new OCP\Template('files', 'index', 'user');
-	$tmpl->assign('fileList', $list->fetchPage(), false);
-	$tmpl->assign('breadcrumb', $breadcrumbNav->fetchPage(), false);
+	$tmpl->assign('fileList', $list->fetchPage());
+	$tmpl->assign('breadcrumb', $breadcrumbNav->fetchPage());
 	$tmpl->assign('dir', \OC\Files\Filesystem::normalizePath($dir));
 	$tmpl->assign('isCreatable', \OC\Files\Filesystem::isCreatable($dir . '/'));
 	$tmpl->assign('permissions', $permissions);
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index cc107656da8dc55055cf57b4cc910053a624958c..1db54f45bb82839d86cc41ec6f68a16178de636f 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -35,7 +35,7 @@ var FileList={
 		if(extension){
 			name_span.append($('<span></span>').addClass('extension').text(extension));
 		}
-		//dirs can show the number of uploaded files 
+		//dirs can show the number of uploaded files
 		if (type == 'dir') {
 			link_elem.append($('<span></span>').attr({
 				'class': 'uploadtext',
@@ -44,7 +44,7 @@ var FileList={
 		}
 		td.append(link_elem);
 		tr.append(td);
-		
+
 		//size column
 		if(size!=t('files', 'Pending')){
 			simpleSize=simpleFileSize(size);
@@ -59,7 +59,7 @@ var FileList={
 			"style": 'color:rgb('+sizeColor+','+sizeColor+','+sizeColor+')'
 		}).text(simpleSize);
 		tr.append(td);
-		
+
 		// date column
 		var modifiedColor = Math.round((Math.round((new Date()).getTime() / 1000)-lastModifiedTime)/60/60/24*5);
 		td = $('<td></td>').attr({ "class": "date" });
@@ -87,7 +87,7 @@ var FileList={
 			lastModified,
 			$('#permissions').val()
 		);
-			
+
 		FileList.insertElement(name, 'file', tr.attr('data-file',name));
 		var row = $('tr').filterAttr('data-file',name);
 		if(loading){
@@ -101,7 +101,7 @@ var FileList={
 		FileActions.display(row.find('td.filename'));
 	},
 	addDir:function(name,size,lastModified,hidden){
-		
+
 		var tr = this.createRow(
 			'dir',
 			name,
@@ -111,7 +111,7 @@ var FileList={
 			lastModified,
 			$('#permissions').val()
 		);
-			
+
 		FileList.insertElement(name,'dir',tr);
 		var row = $('tr').filterAttr('data-file',name);
 		row.find('td.filename').draggable(dragOptions);
@@ -246,14 +246,17 @@ var FileList={
 	},
 	checkName:function(oldName, newName, isNewFile) {
 		if (isNewFile || $('tr').filterAttr('data-file', newName).length > 0) {
-			$('#notification').data('oldName', oldName);
-			$('#notification').data('newName', newName);
-			$('#notification').data('isNewFile', isNewFile);
-            if (isNewFile) {
-                OC.Notification.showHtml(t('files', '{new_name} already exists', {new_name: escapeHTML(newName)})+'<span class="replace">'+t('files', 'replace')+'</span><span class="suggest">'+t('files', 'suggest name')+'</span><span class="cancel">'+t('files', 'cancel')+'</span>');
-            } else {
-                OC.Notification.showHtml(t('files', '{new_name} already exists', {new_name: escapeHTML(newName)})+'<span class="replace">'+t('files', 'replace')+'</span><span class="cancel">'+t('files', 'cancel')+'</span>');
-            }
+			var html;
+			if(isNewFile){
+				html = t('files', '{new_name} already exists', {new_name: escapeHTML(newName)})+'<span class="replace">'+t('files', 'replace')+'</span><span class="suggest">'+t('files', 'suggest name')+'</span>&nbsp;<span class="cancel">'+t('files', 'cancel')+'</span>';
+			}else{
+				html = t('files', '{new_name} already exists', {new_name: escapeHTML(newName)})+'<span class="replace">'+t('files', 'replace')+'</span><span class="cancel">'+t('files', 'cancel')+'</span>';
+			}
+			html = $('<span>' + html + '</span>');
+			html.attr('data-oldName', oldName);
+			html.attr('data-newName', newName);
+			html.attr('data-isNewFile', isNewFile);
+            OC.Notification.showHtml(html);
 			return true;
 		} else {
 			return false;
@@ -291,9 +294,7 @@ var FileList={
 		FileList.lastAction = function() {
 			FileList.finishReplace();
 		};
-		if (isNewFile) {
-			OC.Notification.showHtml(t('files', 'replaced {new_name}', {new_name: newName})+'<span class="undo">'+t('files', 'undo')+'</span>');
-		} else {
+		if (!isNewFile) {
             OC.Notification.showHtml(t('files', 'replaced {new_name} with {old_name}', {new_name: newName}, {old_name: oldName})+'<span class="undo">'+t('files', 'undo')+'</span>');
 		}
 	},
@@ -315,8 +316,8 @@ var FileList={
 	do_delete:function(files){
 		if(files.substr){
 			files=[files];
-		}	
-		for (var i in files) {
+		}
+		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 newHTML = '<img class="move2trash" data-action="Delete" title="'+t('files', 'perform delete operation')+'" src="'+ OC.imagePath('core', 'loading.gif') +'"></a>';
@@ -334,7 +335,7 @@ var FileList={
 					if (result.status == 'success') {
 						$.each(files,function(index,file){
 							var files = $('tr').filterAttr('data-file',file);
-							files.hide();
+							files.remove();
 							files.find('input[type="checkbox"]').removeAttr('checked');
 							files.removeClass('selected');
 						});
@@ -344,7 +345,7 @@ var FileList={
 							var deleteAction = $('tr').filterAttr('data-file',file).children("td.date").children(".move2trash");
 							deleteAction[0].outerHTML = oldHTML;
 						});
-					} 
+					}
 				});
 	}
 };
@@ -376,19 +377,19 @@ $(document).ready(function(){
 		FileList.lastAction = null;
         OC.Notification.hide();
 	});
-	$('#notification').on('click', '.replace', function() {
+	$('#notification:first-child').on('click', '.replace', function() {
         OC.Notification.hide(function() {
-            FileList.replace($('#notification').data('oldName'), $('#notification').data('newName'), $('#notification').data('isNewFile'));
+            FileList.replace($('#notification > span').attr('data-oldName'), $('#notification > span').attr('data-newName'), $('#notification > span').attr('data-isNewFile'));
         });
 	});
-	$('#notification').on('click', '.suggest', function() {
-		$('tr').filterAttr('data-file', $('#notification').data('oldName')).show();
+	$('#notification:first-child').on('click', '.suggest', function() {
+		$('tr').filterAttr('data-file', $('#notification > span').attr('data-oldName')).show();
         OC.Notification.hide();
 	});
-	$('#notification').on('click', '.cancel', function() {
-		if ($('#notification').data('isNewFile')) {
+	$('#notification:first-child').on('click', '.cancel', function() {
+		if ($('#notification > span').attr('data-isNewFile')) {
 			FileList.deleteCanceled = false;
-			FileList.deleteFiles = [$('#notification').data('oldName')];
+			FileList.deleteFiles = [$('#notification > span').attr('data-oldName')];
 		}
 	});
 	FileList.useUndo=(window.onbeforeunload)?true:false;
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index 918182162d4694598b35cf4f283a85d75aac2d39..a4ef41c280382cdf34925504d416ea0ea39777eb 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -114,7 +114,7 @@ $(document).ready(function() {
 		$(this).parent().children('#file_upload_start').trigger('click');
 		return false;
 	});
-	
+
 	// Show trash bin
 	$('#trash a').live('click', function() {
 		window.location=OC.filePath('files_trashbin', '', 'index.php');
@@ -162,9 +162,10 @@ $(document).ready(function() {
 			var tr=$('tr').filterAttr('data-file',filename);
 			var renaming=tr.data('renaming');
 			if(!renaming && !FileList.isLoading(filename)){
-				var mime=$(this).parent().parent().data('mime');
-				var type=$(this).parent().parent().data('type');
-				var permissions = $(this).parent().parent().data('permissions');
+				FileActions.currentFile = $(this).parent();
+				var mime=FileActions.getCurrentMimeType();
+				var type=FileActions.getCurrentType();
+				var permissions = FileActions.getCurrentPermissions();
 				var action=FileActions.getDefault(mime,type, permissions);
 				if(action){
 					event.preventDefault();
@@ -219,14 +220,15 @@ $(document).ready(function() {
 	});
 
 	$('.download').click('click',function(event) {
-		var files=getSelectedFiles('name').join(';');
+		var files=getSelectedFiles('name');
+		var fileslist = JSON.stringify(files);
 		var dir=$('#dir').val()||'/';
 		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;
 		} else {
-			window.location=OC.filePath('files', 'ajax', 'download.php') + '?'+ $.param({ dir: dir, files: files });
+			window.location=OC.filePath('files', 'ajax', 'download.php') + '?'+ $.param({ dir: dir, files: fileslist });
 		}
 		return false;
 	});
@@ -523,7 +525,7 @@ $(document).ready(function() {
 		crumb.text(text);
 	}
 
-	$(window).click(function(){
+	$(document).click(function(){
 		$('#new>ul').hide();
 		$('#new').removeClass('active');
 		$('#new li').each(function(i,element){
@@ -594,7 +596,7 @@ $(document).ready(function() {
 								var date=new Date();
 								FileList.addFile(name,0,date,false,hidden);
 								var tr=$('tr').filterAttr('data-file',name);
-								tr.data('mime','text/plain').data('id',result.data.id);
+								tr.attr('data-mime','text/plain');
 								tr.attr('data-id', result.data.id);
 								getMimeIcon('text/plain',function(path){
 									tr.find('td.filename').attr('style','background-image:url('+path+')');
@@ -816,26 +818,26 @@ var createDragShadow = function(event){
 		//select dragged file
 		$(event.target).parents('tr').find('td input:first').prop('checked',true);
 	}
-	
+
 	var selectedFiles = getSelectedFiles();
-	
+
 	if (!isDragSelected && selectedFiles.length == 1) {
 		//revert the selection
 		$(event.target).parents('tr').find('td input:first').prop('checked',false);
 	}
-	
+
 	//also update class when we dragged more than one file
 	if (selectedFiles.length > 1) {
 		$(event.target).parents('tr').addClass('selected');
 	}
-	
+
 	// build dragshadow
 	var dragshadow = $('<table class="dragshadow"></table>');
 	var tbody = $('<tbody></tbody>');
 	dragshadow.append(tbody);
-	
+
 	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>'
@@ -849,7 +851,7 @@ var createDragShadow = function(event){
 			});
 		}
 	});
-	
+
 	return dragshadow;
 }
 
@@ -862,6 +864,10 @@ var dragOptions={
 		$('#fileList tr td.filename').addClass('ui-draggable');
 	}
 }
+// sane browsers support using the distance option
+if ( ! $.browser.msie) {
+	dragOptions['distance'] = 20;
+} 
 
 var folderDropOptions={
 	drop: function( event, ui ) {
@@ -869,9 +875,9 @@ var folderDropOptions={
 		if ($(event.target).parents('tr').find('td input:first').prop('checked') === true) {
 			return false;
 		}
-		
+
 		var target=$.trim($(this).find('.nametext').text());
-		
+
 		var files = ui.helper.find('tr');
 		$(files).each(function(i,row){
 			var dir = $(row).data('dir');
diff --git a/apps/files/l10n/bg_BG.php b/apps/files/l10n/bg_BG.php
index f16a83bdfa370ee82b714a126c9db5951afd9c4d..a4d23e5afb54e317b8a7b15ddd8aea2f343de914 100644
--- a/apps/files/l10n/bg_BG.php
+++ b/apps/files/l10n/bg_BG.php
@@ -3,6 +3,7 @@
 "Failed to write to disk" => "Възникна проблем при запис в диска",
 "Invalid directory." => "Невалидна директория.",
 "Files" => "Файлове",
+"Delete permanently" => "Изтриване завинаги",
 "Delete" => "Изтриване",
 "Rename" => "Преименуване",
 "Pending" => "Чакащо",
diff --git a/apps/files/l10n/bn_BD.php b/apps/files/l10n/bn_BD.php
index 05cfb9f1381e9d95889789932b21318e19805f64..aec5d7f9d9215e934c10358d6e782ad844d5c4b4 100644
--- a/apps/files/l10n/bn_BD.php
+++ b/apps/files/l10n/bn_BD.php
@@ -19,9 +19,8 @@
 "replace" => "প্রতিস্থাপন",
 "suggest name" => "নাম সুপারিশ করুন",
 "cancel" => "বাতিল",
-"replaced {new_name}" => "{new_name}  প্রতিস্থাপন করা হয়েছে",
-"undo" => "ক্রিয়া প্রত্যাহার",
 "replaced {new_name} with {old_name}" => "{new_name} কে {old_name} নামে প্রতিস্থাপন করা হয়েছে",
+"undo" => "ক্রিয়া প্রত্যাহার",
 "'.' is an invalid file name." => "টি একটি অননুমোদিত নাম।",
 "File name cannot be empty." => "ফাইলের নামটি ফাঁকা রাখা যাবে না।",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "নামটি সঠিক নয়,  '\\', '/', '<', '>', ':', '\"', '|', '?' এবং  '*'  অনুমোদিত নয়।",
diff --git a/apps/files/l10n/ca.php b/apps/files/l10n/ca.php
index ecfc6abc8d506ae3032cf27dc0f37c1f6a958b2d..43aaea31e8a722e7268338990b0e9fe610752ef7 100644
--- a/apps/files/l10n/ca.php
+++ b/apps/files/l10n/ca.php
@@ -21,9 +21,8 @@
 "replace" => "substitueix",
 "suggest name" => "sugereix un nom",
 "cancel" => "cancel·la",
-"replaced {new_name}" => "s'ha substituït {new_name}",
-"undo" => "desfés",
 "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",
 "'.' 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.",
@@ -60,7 +59,9 @@
 "Text file" => "Fitxer de text",
 "Folder" => "Carpeta",
 "From link" => "Des d'enllaç",
+"Deleted files" => "Fitxers esborrats",
 "Cancel upload" => "Cancel·la la pujada",
+"You don’t have write permissions here." => "No teniu permisos d'escriptura aquí.",
 "Nothing in here. Upload something!" => "Res per aquí. Pugeu alguna cosa!",
 "Download" => "Baixa",
 "Unshare" => "Deixa de compartir",
diff --git a/apps/files/l10n/cs_CZ.php b/apps/files/l10n/cs_CZ.php
index 7376056e4c379a8659b9025d80896039f335beaa..48b60bfb7118c7f8e3cb82e1118369bdf8682930 100644
--- a/apps/files/l10n/cs_CZ.php
+++ b/apps/files/l10n/cs_CZ.php
@@ -21,9 +21,8 @@
 "replace" => "nahradit",
 "suggest name" => "navrhnout název",
 "cancel" => "zrušit",
-"replaced {new_name}" => "nahrazeno {new_name}",
-"undo" => "zpět",
 "replaced {new_name} with {old_name}" => "nahrazeno {new_name} s {old_name}",
+"undo" => "zpět",
 "perform delete operation" => "provést smazání",
 "'.' 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.",
@@ -60,7 +59,9 @@
 "Text file" => "Textový soubor",
 "Folder" => "Složka",
 "From link" => "Z odkazu",
+"Deleted files" => "Odstraněné soubory",
 "Cancel upload" => "Zrušit odesílání",
+"You don’t have write permissions here." => "Nemáte zde práva zápisu.",
 "Nothing in here. Upload something!" => "Žádný obsah. Nahrajte něco.",
 "Download" => "Stáhnout",
 "Unshare" => "Zrušit sdílení",
diff --git a/apps/files/l10n/da.php b/apps/files/l10n/da.php
index 8b4ad675e0f4adf583590857253268a071ea2b1e..c147c939f847bd96768e18ca3850777ab187d883 100644
--- a/apps/files/l10n/da.php
+++ b/apps/files/l10n/da.php
@@ -21,9 +21,8 @@
 "replace" => "erstat",
 "suggest name" => "foreslå navn",
 "cancel" => "fortryd",
-"replaced {new_name}" => "erstattede {new_name}",
-"undo" => "fortryd",
 "replaced {new_name} with {old_name}" => "erstattede {new_name} med {old_name}",
+"undo" => "fortryd",
 "perform delete operation" => "udfør slet operation",
 "'.' is an invalid file name." => "'.' er et ugyldigt filnavn.",
 "File name cannot be empty." => "Filnavnet kan ikke stå tomt.",
@@ -60,7 +59,9 @@
 "Text file" => "Tekstfil",
 "Folder" => "Mappe",
 "From link" => "Fra link",
+"Deleted files" => "Slettede filer",
 "Cancel upload" => "Fortryd upload",
+"You don’t have write permissions here." => "Du har ikke skriverettigheder her.",
 "Nothing in here. Upload something!" => "Her er tomt. Upload noget!",
 "Download" => "Download",
 "Unshare" => "Fjern deling",
diff --git a/apps/files/l10n/de.php b/apps/files/l10n/de.php
index d96e512ece25b33c5953d975e653b4ecabe385d3..53427503f4c0ac790c3a126e1705d99b7f2efded 100644
--- a/apps/files/l10n/de.php
+++ b/apps/files/l10n/de.php
@@ -1,7 +1,7 @@
 <?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" => "Konnte %s nicht verschieben",
-"Unable to rename file" => "Konnte Datei nicht umbenennen",
+"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",
 "No file was uploaded. Unknown error" => "Keine Datei hochgeladen. Unbekannter Fehler",
 "There is no error, the file uploaded with success" => "Datei fehlerfrei 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",
@@ -21,9 +21,8 @@
 "replace" => "ersetzen",
 "suggest name" => "Name vorschlagen",
 "cancel" => "abbrechen",
-"replaced {new_name}" => "{new_name} wurde ersetzt",
-"undo" => "rückgängig machen",
 "replaced {new_name} with {old_name}" => "{old_name} ersetzt durch {new_name}",
+"undo" => "rückgängig machen",
 "perform delete operation" => "Löschvorgang ausführen",
 "'.' is an invalid file name." => "'.' ist kein gültiger Dateiname.",
 "File name cannot be empty." => "Der Dateiname darf nicht leer sein.",
@@ -60,7 +59,9 @@
 "Text file" => "Textdatei",
 "Folder" => "Ordner",
 "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.",
 "Nothing in here. Upload something!" => "Alles leer. Lade etwas hoch!",
 "Download" => "Herunterladen",
 "Unshare" => "Nicht mehr freigeben",
diff --git a/apps/files/l10n/de_DE.php b/apps/files/l10n/de_DE.php
index 0dfc19ff01bd9570b1c464760a4ffd3d11de8f6a..538c1b63652f2c0ba16466473d39256215364976 100644
--- a/apps/files/l10n/de_DE.php
+++ b/apps/files/l10n/de_DE.php
@@ -21,10 +21,9 @@
 "replace" => "ersetzen",
 "suggest name" => "Name vorschlagen",
 "cancel" => "abbrechen",
-"replaced {new_name}" => "{new_name} wurde ersetzt",
-"undo" => "rückgängig machen",
 "replaced {new_name} with {old_name}" => "{old_name} wurde ersetzt durch {new_name}",
-"perform delete operation" => "Führe das Löschen aus",
+"undo" => "rückgängig machen",
+"perform delete operation" => "führe das Löschen aus",
 "'.' 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.",
@@ -60,7 +59,9 @@
 "Text file" => "Textdatei",
 "Folder" => "Ordner",
 "From link" => "Von einem Link",
+"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!",
 "Download" => "Herunterladen",
 "Unshare" => "Nicht mehr freigeben",
@@ -68,5 +69,5 @@
 "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..." => "Aktualisiere den Dateisystem-Cache..."
 );
diff --git a/apps/files/l10n/el.php b/apps/files/l10n/el.php
index 2a110afa9602e08d10ca4c1850ddb2479cf5a818..63759f1201eed295f2c01c994604f811d7d963cd 100644
--- a/apps/files/l10n/el.php
+++ b/apps/files/l10n/el.php
@@ -21,9 +21,8 @@
 "replace" => "αντικατέστησε",
 "suggest name" => "συνιστώμενο όνομα",
 "cancel" => "ακύρωση",
-"replaced {new_name}" => "{new_name} αντικαταστάθηκε",
-"undo" => "αναίρεση",
 "replaced {new_name} with {old_name}" => "αντικαταστάθηκε το {new_name} με {old_name}",
+"undo" => "αναίρεση",
 "perform delete operation" => "εκτέλεση διαδικασία διαγραφής",
 "'.' is an invalid file name." => "'.' είναι μη έγκυρο όνομα αρχείου.",
 "File name cannot be empty." => "Το όνομα αρχείου δεν πρέπει να είναι κενό.",
@@ -60,8 +59,9 @@
 "Text file" => "Αρχείο κειμένου",
 "Folder" => "Φάκελος",
 "From link" => "Από σύνδεσμο",
+"Deleted files" => "Διαγραμμένα αρχεία",
 "Cancel upload" => "Ακύρωση αποστολής",
-"Nothing in here. Upload something!" => "Δεν υπάρχει τίποτα εδώ. Ανέβασε κάτι!",
+"Nothing in here. Upload something!" => "Δεν υπάρχει τίποτα εδώ. Μεταφορτώστε κάτι!",
 "Download" => "Λήψη",
 "Unshare" => "Διακοπή κοινής χρήσης",
 "Upload too large" => "Πολύ μεγάλο αρχείο προς αποστολή",
diff --git a/apps/files/l10n/eo.php b/apps/files/l10n/eo.php
index b943244f1ae74a77bb2559e4e66f544a756f66dd..225408f9a76e8ef9b664bc1e25e18572016cb8f1 100644
--- a/apps/files/l10n/eo.php
+++ b/apps/files/l10n/eo.php
@@ -19,9 +19,8 @@
 "replace" => "anstataŭigi",
 "suggest name" => "sugesti nomon",
 "cancel" => "nuligi",
-"replaced {new_name}" => "anstataŭiĝis {new_name}",
-"undo" => "malfari",
 "replaced {new_name} with {old_name}" => "anstataŭiĝis {new_name} per {old_name}",
+"undo" => "malfari",
 "'.' 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.",
diff --git a/apps/files/l10n/es.php b/apps/files/l10n/es.php
index 12262b54818eee70d1b443555ff21e5f8acf9c8a..f702a5b513d4d89ea35f2771074255e14f61627d 100644
--- a/apps/files/l10n/es.php
+++ b/apps/files/l10n/es.php
@@ -21,9 +21,8 @@
 "replace" => "reemplazar",
 "suggest name" => "sugerir nombre",
 "cancel" => "cancelar",
-"replaced {new_name}" => "reemplazado {new_name}",
-"undo" => "deshacer",
 "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.",
 "File name cannot be empty." => "El nombre de archivo no puede estar vacío.",
@@ -60,7 +59,9 @@
 "Text file" => "Archivo de texto",
 "Folder" => "Carpeta",
 "From link" => "Desde el enlace",
+"Deleted files" => "Archivos eliminados",
 "Cancel upload" => "Cancelar subida",
+"You don’t have write permissions here." => "No tienes permisos para escribir aquí.",
 "Nothing in here. Upload something!" => "Aquí no hay nada. ¡Sube algo!",
 "Download" => "Descargar",
 "Unshare" => "Dejar de compartir",
diff --git a/apps/files/l10n/es_AR.php b/apps/files/l10n/es_AR.php
index 0dc423f96f5a88096f25b2c125be4d8f45fc5601..f16385a652d5b4318036a5e1f7b035cbb9cadbfc 100644
--- a/apps/files/l10n/es_AR.php
+++ b/apps/files/l10n/es_AR.php
@@ -21,9 +21,8 @@
 "replace" => "reemplazar",
 "suggest name" => "sugerir nombre",
 "cancel" => "cancelar",
-"replaced {new_name}" => "reemplazado {new_name}",
-"undo" => "deshacer",
 "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.",
 "File name cannot be empty." => "El nombre del archivo no puede quedar vacío.",
@@ -60,6 +59,7 @@
 "Text file" => "Archivo de texto",
 "Folder" => "Carpeta",
 "From link" => "Desde enlace",
+"Deleted files" => "Archivos Borrados",
 "Cancel upload" => "Cancelar subida",
 "Nothing in here. Upload something!" => "No hay nada. ¡Subí contenido!",
 "Download" => "Descargar",
diff --git a/apps/files/l10n/et_EE.php b/apps/files/l10n/et_EE.php
index 3ec7cbb1a64d4349cf2e254d10a7c6fef06fd64b..f1c94e93aab7a02334a4f41f10c0f0f1d38cff6c 100644
--- a/apps/files/l10n/et_EE.php
+++ b/apps/files/l10n/et_EE.php
@@ -19,9 +19,8 @@
 "replace" => "asenda",
 "suggest name" => "soovita nime",
 "cancel" => "loobu",
-"replaced {new_name}" => "asendatud nimega {new_name}",
-"undo" => "tagasi",
 "replaced {new_name} with {old_name}" => "asendas nime {old_name} nimega {new_name}",
+"undo" => "tagasi",
 "'.' 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.",
diff --git a/apps/files/l10n/eu.php b/apps/files/l10n/eu.php
index 10f19cf4cbb53763ad1d1540139dbd2dc6a2a437..63c62ce9a55d92e747edcdd88cde30a3ad92d0ff 100644
--- a/apps/files/l10n/eu.php
+++ b/apps/files/l10n/eu.php
@@ -21,9 +21,8 @@
 "replace" => "ordeztu",
 "suggest name" => "aholkatu izena",
 "cancel" => "ezeztatu",
-"replaced {new_name}" => "ordezkatua {new_name}",
-"undo" => "desegin",
 "replaced {new_name} with {old_name}" => " {new_name}-k {old_name} ordezkatu du",
+"undo" => "desegin",
 "perform delete operation" => "Ezabatu",
 "'.' is an invalid file name." => "'.' ez da fitxategi izen baliogarria.",
 "File name cannot be empty." => "Fitxategi izena ezin da hutsa izan.",
@@ -60,7 +59,9 @@
 "Text file" => "Testu fitxategia",
 "Folder" => "Karpeta",
 "From link" => "Estekatik",
+"Deleted files" => "Ezabatutako fitxategiak",
 "Cancel upload" => "Ezeztatu igoera",
+"You don’t have write permissions here." => "Ez duzu hemen idazteko baimenik.",
 "Nothing in here. Upload something!" => "Ez dago ezer. Igo zerbait!",
 "Download" => "Deskargatu",
 "Unshare" => "Ez elkarbanatu",
diff --git a/apps/files/l10n/fa.php b/apps/files/l10n/fa.php
index d4cbb99e10aa2edb6bae15b2cd5700f846b14643..f4e0af9576d269c298ee3ec0cbe3de814beb1871 100644
--- a/apps/files/l10n/fa.php
+++ b/apps/files/l10n/fa.php
@@ -19,9 +19,8 @@
 "replace" => "جایگزین",
 "suggest name" => "پیشنهاد نام",
 "cancel" => "لغو",
-"replaced {new_name}" => "{نام _جدید} جایگزین شد ",
-"undo" => "بازگشت",
 "replaced {new_name} with {old_name}" => "{نام_جدید} با { نام_قدیمی} جایگزین شد.",
+"undo" => "بازگشت",
 "'.' is an invalid file name." => "'.'   یک نام پرونده نامعتبر است.",
 "File name cannot be empty." => "نام پرونده نمی تواند خالی باشد.",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "نام نامعتبر ،  '\\', '/', '<', '>', ':', '\"', '|', '?'  و '*'  مجاز نمی باشند.",
diff --git a/apps/files/l10n/fi_FI.php b/apps/files/l10n/fi_FI.php
index 81ac32c09f3a08dd78d2c1d76668db8d57aeb37b..6eb891d29d3b5b902b9090b93c21130f4c0c605b 100644
--- a/apps/files/l10n/fi_FI.php
+++ b/apps/files/l10n/fi_FI.php
@@ -54,7 +54,9 @@
 "Text file" => "Tekstitiedosto",
 "Folder" => "Kansio",
 "From link" => "Linkistä",
+"Deleted files" => "Poistetut tiedostot",
 "Cancel upload" => "Peru lähetys",
+"You don’t have write permissions here." => "Tunnuksellasi ei ole kirjoitusoikeuksia tänne.",
 "Nothing in here. Upload something!" => "Täällä ei ole mitään. Lähetä tänne jotakin!",
 "Download" => "Lataa",
 "Unshare" => "Peru jakaminen",
diff --git a/apps/files/l10n/fr.php b/apps/files/l10n/fr.php
index e2af33da77f59e794fd3dfbcc8ebef68affeb011..9849184441d861a43f605a4d580129fc5e665fc7 100644
--- a/apps/files/l10n/fr.php
+++ b/apps/files/l10n/fr.php
@@ -21,9 +21,8 @@
 "replace" => "remplacer",
 "suggest name" => "Suggérer un nom",
 "cancel" => "annuler",
-"replaced {new_name}" => "{new_name} a été remplacé",
-"undo" => "annuler",
 "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",
 "'.' 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.",
@@ -60,6 +59,7 @@
 "Text file" => "Fichier texte",
 "Folder" => "Dossier",
 "From link" => "Depuis le lien",
+"Deleted files" => "Fichiers supprimés",
 "Cancel upload" => "Annuler l'envoi",
 "Nothing in here. Upload something!" => "Il n'y a rien ici ! Envoyez donc quelque chose :)",
 "Download" => "Télécharger",
diff --git a/apps/files/l10n/gl.php b/apps/files/l10n/gl.php
index 91896b8e39b660f89516aa971d13c937e063751d..d48839d0b6022788f0243af3f1054f1469ede71a 100644
--- a/apps/files/l10n/gl.php
+++ b/apps/files/l10n/gl.php
@@ -17,13 +17,12 @@
 "Delete" => "Eliminar",
 "Rename" => "Renomear",
 "Pending" => "Pendentes",
-"{new_name} already exists" => "xa existe un {new_name}",
+"{new_name} already exists" => "Xa existe un {new_name}",
 "replace" => "substituír",
 "suggest name" => "suxerir nome",
 "cancel" => "cancelar",
-"replaced {new_name}" => "substituír {new_name}",
-"undo" => "desfacer",
 "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",
 "'.' is an invalid file name." => "«.» é un nome de ficheiro incorrecto",
 "File name cannot be empty." => "O nome de ficheiro non pode estar baleiro",
@@ -60,8 +59,10 @@
 "Text file" => "Ficheiro de texto",
 "Folder" => "Cartafol",
 "From link" => "Desde a ligazón",
+"Deleted files" => "Ficheiros eliminados",
 "Cancel upload" => "Cancelar o envío",
-"Nothing in here. Upload something!" => "Aquí non hai nada por aquí. Envíe algo.",
+"You don’t have write permissions here." => "Non ten permisos para escribir aquí.",
+"Nothing in here. Upload something!" => "Aquí non hai nada. Envíe algo.",
 "Download" => "Descargar",
 "Unshare" => "Deixar de compartir",
 "Upload too large" => "Envío demasiado grande",
diff --git a/apps/files/l10n/he.php b/apps/files/l10n/he.php
index 442eafe1c04362590237f3a6ea121cdfe240b57b..9d6b411c415d826adc98c0f95df0b74cb83a1ab7 100644
--- a/apps/files/l10n/he.php
+++ b/apps/files/l10n/he.php
@@ -8,6 +8,7 @@
 "Missing a temporary folder" => "תיקייה זמנית חסרה",
 "Failed to write to disk" => "הכתיבה לכונן נכשלה",
 "Files" => "קבצים",
+"Delete permanently" => "מחק לצמיתות",
 "Delete" => "מחיקה",
 "Rename" => "שינוי שם",
 "Pending" => "ממתין",
@@ -15,9 +16,8 @@
 "replace" => "החלפה",
 "suggest name" => "הצעת שם",
 "cancel" => "ביטול",
-"replaced {new_name}" => "{new_name} הוחלף",
-"undo" => "ביטול",
 "replaced {new_name} with {old_name}" => "{new_name} הוחלף ב־{old_name}",
+"undo" => "ביטול",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "השם שגוי, אסור להשתמש בתווים '\\', '/', '<', '>', ':', '\"', '|', '?' ו־'*'.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "לא יכול להעלות את הקובץ מכיוון שזו תקיה או שמשקל הקובץ 0 בתים",
 "Upload Error" => "שגיאת העלאה",
diff --git a/apps/files/l10n/hu_HU.php b/apps/files/l10n/hu_HU.php
index 9eed324415abe7855be13b3aa3c30465ec943f93..54d5033f907d1cdce3825039c6a6877bce46befc 100644
--- a/apps/files/l10n/hu_HU.php
+++ b/apps/files/l10n/hu_HU.php
@@ -21,9 +21,8 @@
 "replace" => "írjuk fölül",
 "suggest name" => "legyen más neve",
 "cancel" => "mégse",
-"replaced {new_name}" => "a(z) {new_name} állományt kicseréltük",
-"undo" => "visszavonás",
 "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",
 "'.' is an invalid file name." => "'.' fájlnév érvénytelen.",
 "File name cannot be empty." => "A fájlnév nem lehet semmi.",
@@ -60,7 +59,9 @@
 "Text file" => "Szövegfájl",
 "Folder" => "Mappa",
 "From link" => "Feltöltés linkről",
+"Deleted files" => "Törölt fájlok",
 "Cancel upload" => "A feltöltés megszakítása",
+"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",
diff --git a/apps/files/l10n/hy.php b/apps/files/l10n/hy.php
new file mode 100644
index 0000000000000000000000000000000000000000..29c0cd8b8d0627dcd2b067b297f902c626f162ef
--- /dev/null
+++ b/apps/files/l10n/hy.php
@@ -0,0 +1,6 @@
+<?php $TRANSLATIONS = array(
+"Delete" => "Ջնջել",
+"Close" => "Փակել",
+"Save" => "Պահպանել",
+"Download" => "Բեռնել"
+);
diff --git a/apps/files/l10n/id.php b/apps/files/l10n/id.php
index 4c4e2e0f7144b1a40cfa34e3cb013b240a1e18e3..aff1933e569e9d3b801b5769dcf8d083dbfadf7c 100644
--- a/apps/files/l10n/id.php
+++ b/apps/files/l10n/id.php
@@ -19,6 +19,10 @@
 "Name" => "Nama",
 "Size" => "Ukuran",
 "Modified" => "Dimodifikasi",
+"1 folder" => "1 map",
+"{count} folders" => "{count} map",
+"1 file" => "1 berkas",
+"{count} files" => "{count} berkas",
 "Upload" => "Unggah",
 "File handling" => "Penanganan berkas",
 "Maximum upload size" => "Ukuran unggah maksimum",
diff --git a/apps/files/l10n/is.php b/apps/files/l10n/is.php
index c0898c555b9f63b158dc087471063d85e292960c..9d735c3c5411ab29e43c2d0cde6f7c5290b09612 100644
--- a/apps/files/l10n/is.php
+++ b/apps/files/l10n/is.php
@@ -19,9 +19,8 @@
 "replace" => "yfirskrifa",
 "suggest name" => "stinga upp á nafni",
 "cancel" => "hætta við",
-"replaced {new_name}" => "endurskýrði {new_name}",
-"undo" => "afturkalla",
 "replaced {new_name} with {old_name}" => "yfirskrifaði {new_name} með {old_name}",
+"undo" => "afturkalla",
 "'.' 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ð.",
diff --git a/apps/files/l10n/it.php b/apps/files/l10n/it.php
index 583a0ca7f7d5427ed64636bd7612632dbee7ab5e..2aac4ef20f532176aa0fccbf4433ff377866aead 100644
--- a/apps/files/l10n/it.php
+++ b/apps/files/l10n/it.php
@@ -21,9 +21,8 @@
 "replace" => "sostituisci",
 "suggest name" => "suggerisci nome",
 "cancel" => "annulla",
-"replaced {new_name}" => "sostituito {new_name}",
-"undo" => "annulla",
 "replaced {new_name} with {old_name}" => "sostituito {new_name} con {old_name}",
+"undo" => "annulla",
 "perform delete operation" => "esegui l'operazione di eliminazione",
 "'.' is an invalid file name." => "'.' non è un nome file valido.",
 "File name cannot be empty." => "Il nome del file non può essere vuoto.",
@@ -60,7 +59,9 @@
 "Text file" => "File di testo",
 "Folder" => "Cartella",
 "From link" => "Da collegamento",
+"Deleted files" => "File eliminati",
 "Cancel upload" => "Annulla invio",
+"You don’t have write permissions here." => "Qui non hai i permessi di scrittura.",
 "Nothing in here. Upload something!" => "Non c'è niente qui. Carica qualcosa!",
 "Download" => "Scarica",
 "Unshare" => "Rimuovi condivisione",
diff --git a/apps/files/l10n/ja_JP.php b/apps/files/l10n/ja_JP.php
index 85ec6b6e953fd979e8fe737ebc9780aa548eabb1..88349d1ba4022e84598b962386581d5188e5c24a 100644
--- a/apps/files/l10n/ja_JP.php
+++ b/apps/files/l10n/ja_JP.php
@@ -21,9 +21,8 @@
 "replace" => "置き換え",
 "suggest name" => "推奨名称",
 "cancel" => "キャンセル",
-"replaced {new_name}" => "{new_name} を置換",
-"undo" => "元に戻す",
 "replaced {new_name} with {old_name}" => "{old_name} を {new_name} に置換",
+"undo" => "元に戻す",
 "perform delete operation" => "削除を実行",
 "'.' is an invalid file name." => "'.' は無効なファイル名です。",
 "File name cannot be empty." => "ファイル名を空にすることはできません。",
@@ -60,7 +59,9 @@
 "Text file" => "テキストファイル",
 "Folder" => "フォルダ",
 "From link" => "リンク",
+"Deleted files" => "削除ファイル",
 "Cancel upload" => "アップロードをキャンセル",
+"You don’t have write permissions here." => "あなたには書き込み権限がありません。",
 "Nothing in here. Upload something!" => "ここには何もありません。何かアップロードしてください。",
 "Download" => "ダウンロード",
 "Unshare" => "共有しない",
diff --git a/apps/files/l10n/ka.php b/apps/files/l10n/ka.php
new file mode 100644
index 0000000000000000000000000000000000000000..148e688547a77524b2b5d762b2b1946469b54eac
--- /dev/null
+++ b/apps/files/l10n/ka.php
@@ -0,0 +1,4 @@
+<?php $TRANSLATIONS = array(
+"Files" => "ფაილები",
+"Download" => "გადმოწერა"
+);
diff --git a/apps/files/l10n/ka_GE.php b/apps/files/l10n/ka_GE.php
index a7b58f02d21e37d51ddda793f3cc3e6038dbc7ed..421c720a330024db5d36e0e4ac8eb5322695d234 100644
--- a/apps/files/l10n/ka_GE.php
+++ b/apps/files/l10n/ka_GE.php
@@ -13,9 +13,8 @@
 "replace" => "შეცვლა",
 "suggest name" => "სახელის შემოთავაზება",
 "cancel" => "უარყოფა",
-"replaced {new_name}" => "{new_name} შეცვლილია",
-"undo" => "დაბრუნება",
 "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" => "დახურვა",
diff --git a/apps/files/l10n/ko.php b/apps/files/l10n/ko.php
index d483f8061a1995810bd8b584b595c8524d80c6fb..ba45bdaa5d7f2b479f15f10354434d1b489560cf 100644
--- a/apps/files/l10n/ko.php
+++ b/apps/files/l10n/ko.php
@@ -19,9 +19,8 @@
 "replace" => "바꾸기",
 "suggest name" => "이름 제안",
 "cancel" => "취소",
-"replaced {new_name}" => "{new_name}을(를) 대체함",
-"undo" => "실행 취소",
 "replaced {new_name} with {old_name}" => "{old_name}이(가) {new_name}(으)로 대체됨",
+"undo" => "실행 취소",
 "'.' is an invalid file name." => "'.' 는 올바르지 않은 파일 이름 입니다.",
 "File name cannot be empty." => "파일 이름이 비어 있을 수 없습니다.",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "폴더 이름이 올바르지 않습니다. 이름에 문자 '\\', '/', '<', '>', ':', '\"', '|', '? ', '*'는 사용할 수 없습니다.",
diff --git a/apps/files/l10n/lt_LT.php b/apps/files/l10n/lt_LT.php
index 70296b5db9f99c9f9d19f5d75d25cf145743af7a..2f16fc224200fe36a54171ea990ab6a02c9220ce 100644
--- a/apps/files/l10n/lt_LT.php
+++ b/apps/files/l10n/lt_LT.php
@@ -13,9 +13,8 @@
 "replace" => "pakeisti",
 "suggest name" => "pasiūlyti pavadinimą",
 "cancel" => "atšaukti",
-"replaced {new_name}" => "pakeiskite {new_name}",
-"undo" => "anuliuoti",
 "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",
diff --git a/apps/files/l10n/lv.php b/apps/files/l10n/lv.php
index 9d4d2c9fb6caf70d8b062edda26316669382ffea..a7a9284c6512fa1661554d042198dcfa1d742f11 100644
--- a/apps/files/l10n/lv.php
+++ b/apps/files/l10n/lv.php
@@ -21,9 +21,8 @@
 "replace" => "aizvietot",
 "suggest name" => "ieteiktais nosaukums",
 "cancel" => "atcelt",
-"replaced {new_name}" => "aizvietots {new_name}",
-"undo" => "atsaukt",
 "replaced {new_name} with {old_name}" => "aizvietoja {new_name} ar {old_name}",
+"undo" => "atsaukt",
 "perform delete operation" => "veikt dzēšanas darbību",
 "'.' is an invalid file name." => "'.' ir nederīgs datnes nosaukums.",
 "File name cannot be empty." => "Datnes nosaukums nevar būt tukšs.",
@@ -60,7 +59,9 @@
 "Text file" => "Teksta datne",
 "Folder" => "Mape",
 "From link" => "No saites",
+"Deleted files" => "Dzēstās datnes",
 "Cancel upload" => "Atcelt augšupielādi",
+"You don’t have write permissions here." => "Jums nav tiesību šeit rakstīt.",
 "Nothing in here. Upload something!" => "Te vēl nekas nav. Rīkojies, sāc augšupielādēt!",
 "Download" => "Lejupielādēt",
 "Unshare" => "Pārtraukt dalīšanos",
diff --git a/apps/files/l10n/mk.php b/apps/files/l10n/mk.php
index 5cb7e7205845fe65188807dbdaf8b0a16e9a8b31..cf9ad8abafc75fdcf85a367e91786d0155dd62ca 100644
--- a/apps/files/l10n/mk.php
+++ b/apps/files/l10n/mk.php
@@ -15,9 +15,8 @@
 "replace" => "замени",
 "suggest name" => "предложи име",
 "cancel" => "откажи",
-"replaced {new_name}" => "земенета {new_name}",
-"undo" => "врати",
 "replaced {new_name} with {old_name}" => "заменета {new_name} со {old_name}",
+"undo" => "врати",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Неправилно име. , '\\', '/', '<', '>', ':', '\"', '|', '?' и '*' не се дозволени.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Не може да се преземе вашата датотека бидејќи фолдерот во кој се наоѓа фајлот има големина од 0 бајти",
 "Upload Error" => "Грешка при преземање",
diff --git a/apps/files/l10n/my_MM.php b/apps/files/l10n/my_MM.php
new file mode 100644
index 0000000000000000000000000000000000000000..b791a134ccce079a6f7c47dbc4b5bb61eb1586fc
--- /dev/null
+++ b/apps/files/l10n/my_MM.php
@@ -0,0 +1,4 @@
+<?php $TRANSLATIONS = array(
+"Files" => "ဖိုင်များ",
+"Download" => "ဒေါင်းလုတ်"
+);
diff --git a/apps/files/l10n/nb_NO.php b/apps/files/l10n/nb_NO.php
index 2609923cbf49a93250b51940b22bdba814e57cf3..d9972feb6a585c8bde21be9082311499f3db0126 100644
--- a/apps/files/l10n/nb_NO.php
+++ b/apps/files/l10n/nb_NO.php
@@ -7,6 +7,7 @@
 "Missing a temporary folder" => "Mangler en midlertidig mappe",
 "Failed to write to disk" => "Klarte ikke å skrive til disk",
 "Files" => "Filer",
+"Delete permanently" => "Slett permanent",
 "Delete" => "Slett",
 "Rename" => "Omdøp",
 "Pending" => "Ventende",
@@ -14,9 +15,8 @@
 "replace" => "erstatt",
 "suggest name" => "foreslå navn",
 "cancel" => "avbryt",
-"replaced {new_name}" => "erstatt {new_name}",
-"undo" => "angre",
 "replaced {new_name} with {old_name}" => "erstatt {new_name} med {old_name}",
+"undo" => "angre",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ugyldig navn, '\\', '/', '<', '>', ':', '\"', '|', '?' og '*' er ikke tillatt.",
 "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",
diff --git a/apps/files/l10n/nl.php b/apps/files/l10n/nl.php
index 381325d113ce94c8332c7fbcdf037ac17e4ea3f2..6af7edf2501836bf3ba9dc6d8f7dc497af5464d0 100644
--- a/apps/files/l10n/nl.php
+++ b/apps/files/l10n/nl.php
@@ -21,9 +21,8 @@
 "replace" => "vervang",
 "suggest name" => "Stel een naam voor",
 "cancel" => "annuleren",
-"replaced {new_name}" => "verving {new_name}",
-"undo" => "ongedaan maken",
 "replaced {new_name} with {old_name}" => "verving {new_name} met {old_name}",
+"undo" => "ongedaan maken",
 "perform delete operation" => "uitvoeren verwijderactie",
 "'.' is an invalid file name." => "'.' is een ongeldige bestandsnaam.",
 "File name cannot be empty." => "Bestandsnaam kan niet leeg zijn.",
@@ -60,7 +59,9 @@
 "Text file" => "Tekstbestand",
 "Folder" => "Map",
 "From link" => "Vanaf link",
+"Deleted files" => "Verwijderde bestanden",
 "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",
diff --git a/apps/files/l10n/pl.php b/apps/files/l10n/pl.php
index 83091bad18cf94b9e3e07617d2d6d6f28cd59250..89eb3421291944cdec37b27f1d8506c94c08d258 100644
--- a/apps/files/l10n/pl.php
+++ b/apps/files/l10n/pl.php
@@ -2,64 +2,72 @@
 "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" => "Plik nie został załadowany. Nieznany błąd",
+"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",
 "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" => "Rozmiar przesłanego pliku przekracza maksymalną wartość dyrektywy upload_max_filesize, zawartą formularzu HTML",
-"The uploaded file was only partially uploaded" => "Plik przesłano tylko częściowo",
+"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",
 "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",
-"Delete" => "Usuwa element",
+"Delete permanently" => "Trwale usuń",
+"Delete" => "Usuń",
 "Rename" => "Zmień nazwę",
 "Pending" => "Oczekujące",
 "{new_name} already exists" => "{new_name} już istnieje",
-"replace" => "zastap",
+"replace" => "zastąp",
 "suggest name" => "zasugeruj nazwę",
 "cancel" => "anuluj",
-"replaced {new_name}" => "zastąpiony {new_name}",
-"undo" => "wróć",
-"replaced {new_name} with {old_name}" => "zastąpiony {new_name} z {old_name}",
-"'.' is an invalid file name." => "'.'  jest nieprawidłową nazwą pliku.",
+"replaced {new_name} with {old_name}" => "zastąpiono {new_name} przez {old_name}",
+"undo" => "cofnij",
+"perform delete operation" => "wykonaj operację usunięcia",
+"'.' 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." => "Niepoprawna nazwa, Znaki '\\', '/', '<', '>', ':', '\"', '|', '?' oraz '*'są niedozwolone.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Nie można wczytać pliku jeśli jest katalogiem lub ma 0 bajtów",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nieprawidłowa nazwa. Znaki '\\', '/', '<', '>', ':', '\"', '|', '?' oraz '*' są niedozwolone.",
+"Your storage is full, files can not be updated or synced anymore!" => "Magazyn jest pełny. Pliki nie mogą zostać zaktualizowane lub zsynchronizowane!",
+"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 wczytany",
-"{count} files uploading" => "{count} przesyłanie plików",
+"1 file uploading" => "1 plik wczytywany",
+"{count} files uploading" => "Ilość przesyłanych plików: {count}",
 "Upload cancelled." => "Wczytywanie anulowane.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "Wysyłanie pliku jest w toku. Teraz opuszczając stronę wysyłanie zostanie 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" => "Nazwa folderu nieprawidłowa. Wykorzystanie \"Shared\" jest zarezerwowane przez Owncloud",
+"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Nieprawidłowa nazwa folderu. Korzystanie z nazwy „Shared” jest zarezerwowane dla ownCloud",
 "Name" => "Nazwa",
 "Size" => "Rozmiar",
-"Modified" => "Czas modyfikacji",
+"Modified" => "Modyfikacja",
 "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}",
 "Upload" => "Prześlij",
 "File handling" => "Zarządzanie plikami",
 "Maximum upload size" => "Maksymalny rozmiar wysyłanego pliku",
-"max. possible: " => "max. możliwych",
+"max. possible: " => "maks. możliwy:",
 "Needed for multi-file and folder downloads." => "Wymagany do pobierania wielu plików i folderów",
 "Enable ZIP-download" => "Włącz pobieranie ZIP-paczki",
-"0 is unlimited" => "0 jest nielimitowane",
+"0 is unlimited" => "0 - bez limitów",
 "Maximum input size for ZIP files" => "Maksymalna wielkość pliku wejściowego ZIP ",
 "Save" => "Zapisz",
 "New" => "Nowy",
 "Text file" => "Plik tekstowy",
 "Folder" => "Katalog",
-"From link" => "Z linku",
-"Cancel upload" => "Przestań wysyłać",
-"Nothing in here. Upload something!" => "Brak zawartości. Proszę wysłać pliki!",
-"Download" => "Pobiera element",
+"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",
-"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ść.",
+"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"
+"Current scanning" => "Aktualnie skanowane",
+"Upgrading filesystem cache..." => "Uaktualnianie plików pamięci podręcznej..."
 );
diff --git a/apps/files/l10n/pt_BR.php b/apps/files/l10n/pt_BR.php
index 3a9dafcabf97d7099e067349f2d0240750e35961..3bebb68227113e7e01b39f667e072fd70608fdac 100644
--- a/apps/files/l10n/pt_BR.php
+++ b/apps/files/l10n/pt_BR.php
@@ -1,8 +1,8 @@
 <?php $TRANSLATIONS = array(
-"Could not move %s - File with this name already exists" => "Não possível mover %s - Um arquivo com este nome já existe",
-"Could not move %s" => "Não possível mover %s",
+"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 transferido. Erro desconhecido",
+"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",
 "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",
@@ -21,17 +21,16 @@
 "replace" => "substituir",
 "suggest name" => "sugerir nome",
 "cancel" => "cancelar",
-"replaced {new_name}" => "substituído {new_name}",
-"undo" => "desfazer",
 "replaced {new_name} with {old_name}" => "Substituído {old_name} por {new_name} ",
+"undo" => "desfazer",
 "perform delete operation" => "realizar operação de exclusão",
 "'.' 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.",
-"Your storage is full, files can not be updated or synced anymore!" => "Seu armazenamento está cheio, arquivos não serão mais atualizados nem sincronizados!",
+"Your storage is full, files can not be updated or synced anymore!" => "Seu armazenamento está cheio, arquivos não podem mais ser atualizados ou sincronizados!",
 "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 como diretório ou ele tem 0 bytes.",
+"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",
@@ -51,7 +50,7 @@
 "File handling" => "Tratamento de Arquivo",
 "Maximum upload size" => "Tamanho máximo para carregar",
 "max. possible: " => "max. possível:",
-"Needed for multi-file and folder downloads." => "Necessário para multiplos arquivos e diretório de downloads.",
+"Needed for multi-file and folder downloads." => "Necessário para download de múltiplos arquivos e diretórios.",
 "Enable ZIP-download" => "Habilitar ZIP-download",
 "0 is unlimited" => "0 para ilimitado",
 "Maximum input size for ZIP files" => "Tamanho máximo para arquivo ZIP",
@@ -60,7 +59,9 @@
 "Text file" => "Arquivo texto",
 "Folder" => "Pasta",
 "From link" => "Do link",
+"Deleted files" => "Arquivos apagados",
 "Cancel upload" => "Cancelar upload",
+"You don’t have write permissions here." => "Você não possui permissão de escrita aqui.",
 "Nothing in here. Upload something!" => "Nada aqui.Carrege alguma coisa!",
 "Download" => "Baixar",
 "Unshare" => "Descompartilhar",
@@ -68,5 +69,5 @@
 "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",
-"Upgrading filesystem cache..." => "Aprimorando cache do sistema de arquivos..."
+"Upgrading filesystem cache..." => "Atualizando cache do sistema de arquivos..."
 );
diff --git a/apps/files/l10n/pt_PT.php b/apps/files/l10n/pt_PT.php
index e036b3dacbb5895e63a938703810a33a736b48a7..7162517e8162dcff122399c849521733ad5a79b1 100644
--- a/apps/files/l10n/pt_PT.php
+++ b/apps/files/l10n/pt_PT.php
@@ -21,9 +21,8 @@
 "replace" => "substituir",
 "suggest name" => "sugira um nome",
 "cancel" => "cancelar",
-"replaced {new_name}" => "{new_name} substituido",
-"undo" => "desfazer",
 "replaced {new_name} with {old_name}" => "substituido {new_name} por {old_name}",
+"undo" => "desfazer",
 "perform delete operation" => "Executar a tarefa de apagar",
 "'.' 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.",
@@ -60,7 +59,9 @@
 "Text file" => "Ficheiro de texto",
 "Folder" => "Pasta",
 "From link" => "Da ligação",
+"Deleted files" => "Ficheiros eliminados",
 "Cancel upload" => "Cancelar envio",
+"You don’t have write permissions here." => "Não tem permissões de escrita aqui.",
 "Nothing in here. Upload something!" => "Vazio. Envie alguma coisa!",
 "Download" => "Transferir",
 "Unshare" => "Deixar de partilhar",
diff --git a/apps/files/l10n/ro.php b/apps/files/l10n/ro.php
index 79604f56ad2fb95536022e1065eff76e6571ab00..153caba2291e8938db91e0e8d0f3316f993df763 100644
--- a/apps/files/l10n/ro.php
+++ b/apps/files/l10n/ro.php
@@ -19,9 +19,8 @@
 "replace" => "înlocuire",
 "suggest name" => "sugerează nume",
 "cancel" => "anulare",
-"replaced {new_name}" => "inlocuit {new_name}",
-"undo" => "Anulează ultima acțiune",
 "replaced {new_name} with {old_name}" => "{new_name} inlocuit cu {old_name}",
+"undo" => "Anulează ultima acțiune",
 "'.' 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.",
diff --git a/apps/files/l10n/ru.php b/apps/files/l10n/ru.php
index 803b34e99c8efbb3c0a76f33f313a1005ff51257..cf8ee7c6c75693c0bda14776b6f5372b6af9533c 100644
--- a/apps/files/l10n/ru.php
+++ b/apps/files/l10n/ru.php
@@ -21,9 +21,8 @@
 "replace" => "заменить",
 "suggest name" => "предложить название",
 "cancel" => "отмена",
-"replaced {new_name}" => "заменено {new_name}",
-"undo" => "отмена",
 "replaced {new_name} with {old_name}" => "заменено {new_name} на {old_name}",
+"undo" => "отмена",
 "perform delete operation" => "выполняется операция удаления",
 "'.' is an invalid file name." => "'.' - неправильное имя файла.",
 "File name cannot be empty." => "Имя файла не может быть пустым.",
@@ -60,7 +59,9 @@
 "Text file" => "Текстовый файл",
 "Folder" => "Папка",
 "From link" => "Из ссылки",
+"Deleted files" => "Удалённые файлы",
 "Cancel upload" => "Отмена загрузки",
+"You don’t have write permissions here." => "У вас нет разрешений на запись здесь.",
 "Nothing in here. Upload something!" => "Здесь ничего нет. Загрузите что-нибудь!",
 "Download" => "Скачать",
 "Unshare" => "Отменить публикацию",
diff --git a/apps/files/l10n/ru_RU.php b/apps/files/l10n/ru_RU.php
index dbeab6b351e87ed09a4cada8c012eab7cc0fa805..054ed8094db1b6d74d861565689a47aa736dc615 100644
--- a/apps/files/l10n/ru_RU.php
+++ b/apps/files/l10n/ru_RU.php
@@ -21,9 +21,8 @@
 "replace" => "отмена",
 "suggest name" => "подобрать название",
 "cancel" => "отменить",
-"replaced {new_name}" => "заменено {новое_имя}",
-"undo" => "отменить действие",
 "replaced {new_name} with {old_name}" => "заменено {новое_имя} с {старое_имя}",
+"undo" => "отменить действие",
 "perform delete operation" => "выполняется процесс удаления",
 "'.' is an invalid file name." => "'.' является неверным именем файла.",
 "File name cannot be empty." => "Имя файла не может быть пустым.",
diff --git a/apps/files/l10n/sk_SK.php b/apps/files/l10n/sk_SK.php
index 8ece8140d8a15d273915a9c86a32aa5111d47902..a6cb2909111d3e9183acae000e50453492db5e89 100644
--- a/apps/files/l10n/sk_SK.php
+++ b/apps/files/l10n/sk_SK.php
@@ -21,9 +21,8 @@
 "replace" => "nahradiť",
 "suggest name" => "pomôcť s menom",
 "cancel" => "zrušiť",
-"replaced {new_name}" => "prepísaný {new_name}",
-"undo" => "vrátiť",
 "replaced {new_name} with {old_name}" => "prepísaný {new_name} súborom {old_name}",
+"undo" => "vrátiť",
 "perform delete operation" => "vykonať zmazanie",
 "'.' is an invalid file name." => "'.' je neplatné meno súboru.",
 "File name cannot be empty." => "Meno súboru nemôže byť prázdne",
@@ -60,7 +59,9 @@
 "Text file" => "Textový súbor",
 "Folder" => "Priečinok",
 "From link" => "Z odkazu",
+"Deleted files" => "Zmazané súbory",
 "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ť",
diff --git a/apps/files/l10n/sl.php b/apps/files/l10n/sl.php
index 6a379459f0e4d105b7ef1219e15a679cb2d4bf17..6458a588aedfe2165b0836f1d837209c375fac64 100644
--- a/apps/files/l10n/sl.php
+++ b/apps/files/l10n/sl.php
@@ -15,9 +15,8 @@
 "replace" => "zamenjaj",
 "suggest name" => "predlagaj ime",
 "cancel" => "prekliči",
-"replaced {new_name}" => "zamenjano je ime {new_name}",
-"undo" => "razveljavi",
 "replaced {new_name} with {old_name}" => "zamenjano 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",
diff --git a/apps/files/l10n/sr.php b/apps/files/l10n/sr.php
index e50d6612c4c43bff2c8eabfb61c36ac0e78e3339..fe71ee9c90d1b05bcd9712f9b5ca340dd0157d43 100644
--- a/apps/files/l10n/sr.php
+++ b/apps/files/l10n/sr.php
@@ -14,9 +14,8 @@
 "replace" => "замени",
 "suggest name" => "предложи назив",
 "cancel" => "откажи",
-"replaced {new_name}" => "замењено {new_name}",
-"undo" => "опозови",
 "replaced {new_name} with {old_name}" => "замењено {new_name} са {old_name}",
+"undo" => "опозови",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Неисправан назив. Следећи знакови нису дозвољени: \\, /, <, >, :, \", |, ? и *.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Не могу да отпремим датотеку као фасциклу или она има 0 бајтова",
 "Upload Error" => "Грешка при отпремању",
diff --git a/apps/files/l10n/sv.php b/apps/files/l10n/sv.php
index ca4dfcf553b8fefe61cc42e0cc25db140b6a2a41..ca9610a33c7766bb746df9c14008180b134b41fd 100644
--- a/apps/files/l10n/sv.php
+++ b/apps/files/l10n/sv.php
@@ -21,9 +21,8 @@
 "replace" => "ersätt",
 "suggest name" => "föreslå namn",
 "cancel" => "avbryt",
-"replaced {new_name}" => "ersatt {new_name}",
-"undo" => "ångra",
 "replaced {new_name} with {old_name}" => "ersatt {new_name} med {old_name}",
+"undo" => "ångra",
 "perform delete operation" => "utför raderingen",
 "'.' is an invalid file name." => "'.' är ett ogiltigt filnamn.",
 "File name cannot be empty." => "Filnamn kan inte vara tomt.",
@@ -60,7 +59,9 @@
 "Text file" => "Textfil",
 "Folder" => "Mapp",
 "From link" => "Från länk",
+"Deleted files" => "Raderade filer",
 "Cancel upload" => "Avbryt uppladdning",
+"You don’t have write permissions here." => "Du saknar skrivbehörighet här.",
 "Nothing in here. Upload something!" => "Ingenting här. Ladda upp något!",
 "Download" => "Ladda ner",
 "Unshare" => "Sluta dela",
diff --git a/apps/files/l10n/ta_LK.php b/apps/files/l10n/ta_LK.php
index 069a2ac58230462ba46cc32381d3ecb769c4a75a..304453f1290b87b5b30e3df562bf0c77488625ef 100644
--- a/apps/files/l10n/ta_LK.php
+++ b/apps/files/l10n/ta_LK.php
@@ -14,9 +14,8 @@
 "replace" => "மாற்றிடுக",
 "suggest name" => "பெயரை பரிந்துரைக்க",
 "cancel" => "இரத்து செய்க",
-"replaced {new_name}" => "மாற்றப்பட்டது {new_name}",
-"undo" => "முன் செயல் நீக்கம் ",
 "replaced {new_name} with {old_name}" => "{new_name} ஆனது {old_name} இனால் மாற்றப்பட்டது",
+"undo" => "முன் செயல் நீக்கம் ",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "செல்லுபடியற்ற பெயர்,'\\', '/', '<', '>', ':', '\"', '|', '?' மற்றும் '*' ஆகியன அனுமதிக்கப்படமாட்டாது.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "அடைவு அல்லது 0 bytes ஐ கொண்டுள்ளதால் உங்களுடைய கோப்பை பதிவேற்ற முடியவில்லை",
 "Upload Error" => "பதிவேற்றல் வழு",
diff --git a/apps/files/l10n/th_TH.php b/apps/files/l10n/th_TH.php
index fce74874f137bbddedcb5b5614b6c560f9cd912a..2353501b4782dfe8ba4649a43ef9dabf282ea3e4 100644
--- a/apps/files/l10n/th_TH.php
+++ b/apps/files/l10n/th_TH.php
@@ -20,9 +20,8 @@
 "replace" => "แทนที่",
 "suggest name" => "แนะนำชื่อ",
 "cancel" => "ยกเลิก",
-"replaced {new_name}" => "แทนที่ {new_name} แล้ว",
-"undo" => "เลิกทำ",
 "replaced {new_name} with {old_name}" => "แทนที่ {new_name} ด้วย {old_name} แล้ว",
+"undo" => "เลิกทำ",
 "perform delete operation" => "ดำเนินการตามคำสั่งลบ",
 "'.' is an invalid file name." => "'.' เป็นชื่อไฟล์ที่ไม่ถูกต้อง",
 "File name cannot be empty." => "ชื่อไฟล์ไม่สามารถเว้นว่างได้",
diff --git a/apps/files/l10n/tr.php b/apps/files/l10n/tr.php
index f6943f1f4d145e18ae1fd35e8e797140c28136c1..bcbef8daf3581dfd47cfe09cc87f59c863dcc9df 100644
--- a/apps/files/l10n/tr.php
+++ b/apps/files/l10n/tr.php
@@ -10,8 +10,10 @@
 "No file was uploaded" => "Hiç dosya yüklenmedi",
 "Missing a temporary folder" => "Geçici bir klasör eksik",
 "Failed to write to disk" => "Diske yazılamadı",
+"Not enough storage available" => "Yeterli disk alanı yok",
 "Invalid directory." => "Geçersiz dizin.",
 "Files" => "Dosyalar",
+"Delete permanently" => "Kalıcı olarak sil",
 "Delete" => "Sil",
 "Rename" => "İsim değiştir.",
 "Pending" => "Bekliyor",
@@ -19,12 +21,14 @@
 "replace" => "değiştir",
 "suggest name" => "Öneri ad",
 "cancel" => "iptal",
-"replaced {new_name}" => "değiştirilen {new_name}",
-"undo" => "geri al",
 "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",
 "'.' 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.",
+"Your storage is full, files can not be updated or synced anymore!" => "Depolama alanınız dolu, artık dosyalar güncellenmeyecek yada senkronizasyon edilmeyecek.",
+"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ı",
@@ -55,6 +59,7 @@
 "Text file" => "Metin dosyası",
 "Folder" => "Klasör",
 "From link" => "Bağlantıdan",
+"Deleted files" => "Dosyalar silindi",
 "Cancel upload" => "Yüklemeyi iptal et",
 "Nothing in here. Upload something!" => "Burada hiçbir şey yok. Birşeyler yükleyin!",
 "Download" => "İndir",
@@ -62,5 +67,6 @@
 "Upload too large" => "Yüklemeniz ç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"
+"Current scanning" => "Güncel tarama",
+"Upgrading filesystem cache..." => "Sistem dosyası önbelleği güncelleniyor"
 );
diff --git a/apps/files/l10n/uk.php b/apps/files/l10n/uk.php
index 7e499e6c2c83b8afd3b3d0a5a0d2ef300f17eee7..f5e161996c0e2e993ba98a802d348f50e4415a24 100644
--- a/apps/files/l10n/uk.php
+++ b/apps/files/l10n/uk.php
@@ -1,4 +1,7 @@
 <?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: ",
@@ -7,6 +10,7 @@
 "No file was uploaded" => "Не відвантажено жодного файлу",
 "Missing a temporary folder" => "Відсутній тимчасовий каталог",
 "Failed to write to disk" => "Невдалося записати на диск",
+"Not enough storage available" => "Місця більше немає",
 "Invalid directory." => "Невірний каталог.",
 "Files" => "Файли",
 "Delete permanently" => "Видалити назавжди",
@@ -17,9 +21,8 @@
 "replace" => "заміна",
 "suggest name" => "запропонуйте назву",
 "cancel" => "відміна",
-"replaced {new_name}" => "замінено {new_name}",
-"undo" => "відмінити",
 "replaced {new_name} with {old_name}" => "замінено {new_name} на {old_name}",
+"undo" => "відмінити",
 "perform delete operation" => "виконати операцію видалення",
 "'.' is an invalid file name." => "'.' це невірне ім'я файлу.",
 "File name cannot be empty." => " Ім'я файлу не може бути порожнім.",
@@ -56,7 +59,9 @@
 "Text file" => "Текстовий файл",
 "Folder" => "Папка",
 "From link" => "З посилання",
+"Deleted files" => "Видалено файлів",
 "Cancel upload" => "Перервати завантаження",
+"You don’t have write permissions here." => "У вас тут немає прав на запис.",
 "Nothing in here. Upload something!" => "Тут нічого немає. Відвантажте що-небудь!",
 "Download" => "Завантажити",
 "Unshare" => "Заборонити доступ",
diff --git a/apps/files/l10n/vi.php b/apps/files/l10n/vi.php
index b069246f01767292cddc72304271e04b25d285ec..affca6c12f86b9109dcd20781ea2aeb209598fec 100644
--- a/apps/files/l10n/vi.php
+++ b/apps/files/l10n/vi.php
@@ -21,9 +21,8 @@
 "replace" => "thay thế",
 "suggest name" => "tên gợi ý",
 "cancel" => "hủy",
-"replaced {new_name}" => "đã thay thế {new_name}",
-"undo" => "lùi lại",
 "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",
 "'.' 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",
@@ -60,6 +59,7 @@
 "Text file" => "Tập tin văn bản",
 "Folder" => "Thư mục",
 "From link" => "Từ liên kết",
+"Deleted files" => "File đã bị xóa",
 "Cancel upload" => "Hủy upload",
 "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",
diff --git a/apps/files/l10n/zh_CN.GB2312.php b/apps/files/l10n/zh_CN.GB2312.php
index 727b8038000d556e902c919de3387debb8e2fa04..fa75627f141da59894425a31de973b64b97cde34 100644
--- a/apps/files/l10n/zh_CN.GB2312.php
+++ b/apps/files/l10n/zh_CN.GB2312.php
@@ -14,9 +14,8 @@
 "replace" => "替换",
 "suggest name" => "推荐名称",
 "cancel" => "取消",
-"replaced {new_name}" => "已替换 {new_name}",
-"undo" => "撤销",
 "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" => "关闭",
diff --git a/apps/files/l10n/zh_CN.php b/apps/files/l10n/zh_CN.php
index 569aaf1b0aef7c14213241338860791500cb72e2..88fdc537c3aab28ae731fe0bcc9c7bd02f3651f5 100644
--- a/apps/files/l10n/zh_CN.php
+++ b/apps/files/l10n/zh_CN.php
@@ -19,9 +19,8 @@
 "replace" => "替换",
 "suggest name" => "建议名称",
 "cancel" => "取消",
-"replaced {new_name}" => "替换 {new_name}",
-"undo" => "撤销",
 "replaced {new_name} with {old_name}" => "已将 {old_name}替换成 {new_name}",
+"undo" => "撤销",
 "'.' is an invalid file name." => "'.' 是一个无效的文件名。",
 "File name cannot be empty." => "文件名不能为空。",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "无效名称,'\\', '/', '<', '>', ':', '\"', '|', '?' 和 '*' 不被允许使用。",
diff --git a/apps/files/l10n/zh_TW.php b/apps/files/l10n/zh_TW.php
index 7be0f1d658c7f4d96463b2ef4a2d6f7c90595dae..793fedac41260ef5630419250e01b2bc6bad9c03 100644
--- a/apps/files/l10n/zh_TW.php
+++ b/apps/files/l10n/zh_TW.php
@@ -21,9 +21,8 @@
 "replace" => "取代",
 "suggest name" => "建議檔名",
 "cancel" => "取消",
-"replaced {new_name}" => "已取代 {new_name}",
-"undo" => "復原",
 "replaced {new_name} with {old_name}" => "使用 {new_name} 取代 {old_name}",
+"undo" => "復原",
 "perform delete operation" => "進行刪除動作",
 "'.' is an invalid file name." => "'.' 是不合法的檔名。",
 "File name cannot be empty." => "檔名不能為空。",
diff --git a/apps/files/templates/admin.php b/apps/files/templates/admin.php
index ad69b5519d9a616a354256f4aea247ce3428d5b0..e1ca6afc4ada49f11ba2fa1da5c0df8bd242dec0 100644
--- a/apps/files/templates/admin.php
+++ b/apps/files/templates/admin.php
@@ -2,27 +2,27 @@
 
 <form name="filesForm" action='#' method='post'>
 	<fieldset class="personalblock">
-		<legend><strong><?php echo $l->t('File handling');?></strong></legend>
+		<legend><strong><?php p($l->t('File handling')); ?></strong></legend>
 		<?php if($_['uploadChangable']):?>
-			<label for="maxUploadSize"><?php echo $l->t( 'Maximum upload size' ); ?> </label>
-			<input name='maxUploadSize' id="maxUploadSize" value='<?php echo $_['uploadMaxFilesize'] ?>'/>
+			<label for="maxUploadSize"><?php p($l->t( 'Maximum upload size' )); ?> </label>
+			<input name='maxUploadSize' id="maxUploadSize" value='<?php p($_['uploadMaxFilesize']) ?>'/>
 			<?php if($_['displayMaxPossibleUploadSize']):?>
-				(<?php echo $l->t('max. possible: '); echo $_['maxPossibleUploadSize'] ?>)
+				(<?php p($l->t('max. possible: ')); p($_['maxPossibleUploadSize']) ?>)
 			<?php endif;?>
 			<br/>
 		<?php endif;?>
 		<input type="checkbox" name="allowZipDownload" id="allowZipDownload" value="1"
-			   title="<?php echo $l->t( 'Needed for multi-file and folder downloads.' ); ?>"
+			   title="<?php p($l->t( 'Needed for multi-file and folder downloads.' )); ?>"
 			   <?php if ($_['allowZipDownload']): ?> checked="checked"<?php endif; ?> />
-		<label for="allowZipDownload"><?php echo $l->t( 'Enable ZIP-download' ); ?></label><br/>
+		<label for="allowZipDownload"><?php p($l->t( 'Enable ZIP-download' )); ?></label><br/>
 
-		<input name="maxZipInputSize" id="maxZipInputSize" style="width:180px;" value='<?php echo $_['maxZipInputSize'] ?>'
-			   title="<?php echo $l->t( '0 is unlimited' ); ?>"
+		<input type="text" name="maxZipInputSize" id="maxZipInputSize" style="width:180px;" value='<?php p($_['maxZipInputSize']) ?>'
+			   title="<?php p($l->t( '0 is unlimited' )); ?>"
 			   <?php if (!$_['allowZipDownload']): ?> disabled="disabled"<?php endif; ?> /><br />
-		<em><?php echo $l->t( 'Maximum input size for ZIP files' ); ?> </em><br />
+		<em><?php p($l->t( 'Maximum input size for ZIP files' )); ?> </em><br />
 
-		<input type="hidden" value="<?php echo $_['requesttoken']; ?>" name="requesttoken" />
+		<input type="hidden" value="<?php p($_['requesttoken']); ?>" name="requesttoken" />
 		<input type="submit" name="submitFilesAdminSettings" id="submitFilesAdminSettings"
-			   value="<?php echo $l->t( 'Save' ); ?>"/>
+			   value="<?php p($l->t( 'Save' )); ?>"/>
 	</fieldset>
 </form>
diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php
index c7bf0d21c13dcf021d68b106ce22926bd4bc8bb7..a53df4e2d3e808af55e8d55136e56868cf627342 100644
--- a/apps/files/templates/index.php
+++ b/apps/files/templates/index.php
@@ -1,96 +1,97 @@
 <!--[if IE 8]><style>input[type="checkbox"]{padding:0;}table td{position:static !important;}</style><![endif]-->
 <div id="controls">
-	<?php echo($_['breadcrumb']); ?>
+	<?php print_unescaped($_['breadcrumb']); ?>
 	<?php if ($_['isCreatable']):?>
 		<div class="actions <?php if (isset($_['files']) and count($_['files'])==0):?>emptyfolder<?php endif; ?>">
 			<div id="new" class="button">
-				<a><?php echo $l->t('New');?></a>
+				<a><?php p($l->t('New'));?></a>
 				<ul>
-					<li style="background-image:url('<?php echo OCP\mimetype_icon('text/plain') ?>')"
-						data-type='file'><p><?php echo $l->t('Text file');?></p></li>
-					<li style="background-image:url('<?php echo OCP\mimetype_icon('dir') ?>')"
-						data-type='folder'><p><?php echo $l->t('Folder');?></p></li>
-					<li style="background-image:url('<?php echo OCP\image_path('core', 'actions/public.png') ?>')"
-						data-type='web'><p><?php echo $l->t('From link');?></p></li>
+					<li style="background-image:url('<?php p(OCP\mimetype_icon('text/plain')) ?>')"
+						data-type='file'><p><?php p($l->t('Text file'));?></p></li>
+					<li style="background-image:url('<?php p(OCP\mimetype_icon('dir')) ?>')"
+						data-type='folder'><p><?php p($l->t('Folder'));?></p></li>
+					<li style="background-image:url('<?php p(OCP\image_path('core', 'actions/public.png')) ?>')"
+						data-type='web'><p><?php p($l->t('From link'));?></p></li>
 				</ul>
 			</div>
 			<div id="upload" class="button"
-				 title="<?php echo $l->t('Upload') . ' max. '.$_['uploadMaxHumanFilesize'] ?>">
+				 title="<?php p($l->t('Upload') . ' max. '.$_['uploadMaxHumanFilesize']) ?>">
 				<form data-upload-id='1'
 					  id="data-upload-form"
 					  class="file_upload_form"
-					  action="<?php echo OCP\Util::linkTo('files', 'ajax/upload.php'); ?>"
+					  action="<?php print_unescaped(OCP\Util::linkTo('files', 'ajax/upload.php')); ?>"
 					  method="post"
 					  enctype="multipart/form-data"
 					  target="file_upload_target_1">
 					<input type="hidden" name="MAX_FILE_SIZE" id="max_upload"
-						   value="<?php echo $_['uploadMaxFilesize'] ?>">
+						   value="<?php p($_['uploadMaxFilesize']) ?>">
 					<!-- 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 echo $_['requesttoken'] ?>" id="requesttoken">
+					<input type="hidden" name="requesttoken" value="<?php p($_['requesttoken']) ?>" id="requesttoken">
 					<input type="hidden" class="max_human_file_size"
-						   value="(max <?php echo $_['uploadMaxHumanFilesize']; ?>)">
-					<input type="hidden" name="dir" value="<?php echo $_['dir'] ?>" id="dir">
+						   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>
 				</form>
 			</div>
 			<?php if ($_['trash'] ): ?>
 			<div id="trash" class="button">
-				<a><?php echo $l->t('Deleted files');?></a>
+				<a><?php p($l->t('Deleted files'));?></a>
 			</div>
 			<?php endif; ?>
 			<div id="uploadprogresswrapper">
 				<div id="uploadprogressbar"></div>
 				<input type="button" class="stop" style="display:none"
-					value="<?php echo $l->t('Cancel upload');?>"
+					value="<?php p($l->t('Cancel upload'));?>"
 					onclick="javascript:Files.cancelUploads();"
 				/>
 			</div>
 		</div>
 		<div id="file_action_panel"></div>
 	<?php else:?>
-		<input type="hidden" name="dir" value="<?php echo $_['dir'] ?>" id="dir">
+		<div class="crumb last"><?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 echo $_['permissions']; ?>" id="permissions">
+	<input type="hidden" name="permissions" value="<?php p($_['permissions']); ?>" id="permissions">
 </div>
 
 <?php if (isset($_['files']) and $_['isCreatable'] and count($_['files'])==0):?>
-	<div id="emptyfolder"><?php echo $l->t('Nothing in here. Upload something!')?></div>
+	<div id="emptyfolder"><?php p($l->t('Nothing in here. Upload something!'))?></div>
 <?php endif; ?>
 
-<table>
+<table id="filestable">
 	<thead>
 		<tr>
 			<th id='headerName'>
 				<input type="checkbox" id="select_all" />
-				<span class='name'><?php echo $l->t( 'Name' ); ?></span>
+				<span class='name'><?php p($l->t( 'Name' )); ?></span>
 				<span class='selectedActions'>
 					<?php if($_['allowZipDownload']) : ?>
 						<a href="" class="download">
 							<img class="svg" alt="Download"
-								 src="<?php echo OCP\image_path("core", "actions/download.svg"); ?>" />
-							<?php echo $l->t('Download')?>
+								 src="<?php print_unescaped(OCP\image_path("core", "actions/download.svg")); ?>" />
+							<?php p($l->t('Download'))?>
 						</a>
 					<?php endif; ?>
 				</span>
 			</th>
-			<th id="headerSize"><?php echo $l->t( 'Size' ); ?></th>
+			<th id="headerSize"><?php p($l->t( 'Size' )); ?></th>
 			<th id="headerDate">
-				<span id="modified"><?php echo $l->t( 'Modified' ); ?></span>
+				<span id="modified"><?php p($l->t( 'Modified' )); ?></span>
 				<?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">
-							<?php echo $l->t('Unshare')?>
-							<img class="svg" alt="<?php echo $l->t('Unshare')?>"
-								 src="<?php echo OCP\image_path("core", "actions/delete.svg"); ?>" />
+							<?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">
-							<?php echo $l->t('Delete')?>
-							<img class="svg" alt="<?php echo $l->t('Delete')?>"
-								 src="<?php echo OCP\image_path("core", "actions/delete.svg"); ?>" />
+							<?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")); ?>" />
 						</a></span>
 					<?php endif; ?>
 				<?php endif; ?>
@@ -98,24 +99,24 @@
 		</tr>
 	</thead>
 	<tbody id="fileList">
-		<?php echo($_['fileList']); ?>
+		<?php print_unescaped($_['fileList']); ?>
 	</tbody>
 </table>
 <div id="editor"></div>
-<div id="uploadsize-message" title="<?php echo $l->t('Upload too large')?>">
+<div id="uploadsize-message" title="<?php p($l->t('Upload too large'))?>">
 	<p>
-	<?php echo $l->t('The files you are trying to upload exceed the maximum size for file uploads on this server.');?>
+	<?php p($l->t('The files you are trying to upload exceed the maximum size for file uploads on this server.'));?>
 	</p>
 </div>
 <div id="scanning-message">
 	<h3>
-		<?php echo $l->t('Files are being scanned, please wait.');?> <span id='scan-count'></span>
+		<?php p($l->t('Files are being scanned, please wait.'));?> <span id='scan-count'></span>
 	</h3>
 	<p>
-		<?php echo $l->t('Current scanning');?> <span id='scan-current'></span>
+		<?php p($l->t('Current scanning'));?> <span id='scan-current'></span>
 	</p>
 </div>
 
 <!-- config hints for javascript -->
-<input type="hidden" name="allowZipDownload" id="allowZipDownload" value="<?php echo $_['allowZipDownload']; ?>" />
-<input type="hidden" name="usedSpacePercent" id="usedSpacePercent" value="<?php echo $_['usedSpacePercent']; ?>" />
+<input type="hidden" name="allowZipDownload" id="allowZipDownload" value="<?php p($_['allowZipDownload']); ?>" />
+<input type="hidden" name="usedSpacePercent" id="usedSpacePercent" value="<?php p($_['usedSpacePercent']); ?>" />
diff --git a/apps/files/templates/part.breadcrumb.php b/apps/files/templates/part.breadcrumb.php
index f01cb8d212a8eb0a7dac203a491509da912e0183..7ea1755d1d7459c8ac8ce2d01c8013328e876671 100644
--- a/apps/files/templates/part.breadcrumb.php
+++ b/apps/files/templates/part.breadcrumb.php
@@ -1,7 +1,7 @@
 <?php if(count($_["breadcrumb"])):?>
 	<div class="crumb">
-		<a href="<?php echo $_['baseURL']; ?>">
-			<img src="<?php echo OCP\image_path('core', 'places/home.svg');?>" class="svg" />
+		<a href="<?php print_unescaped($_['baseURL']); ?>">
+			<img src="<?php print_unescaped(OCP\image_path('core', 'places/home.svg'));?>" class="svg" />
 		</a>
 	</div>
 <?php endif;?>
@@ -9,8 +9,8 @@
 	$crumb = $_["breadcrumb"][$i];
 	$dir = str_replace('+', '%20', urlencode($crumb["dir"]));
 	$dir = str_replace('%2F', '/', $dir); ?>
-	<div class="crumb <?php if($i == count($_["breadcrumb"])-1) echo 'last';?> svg"
-		 data-dir='<?php echo $dir;?>'>
-	<a href="<?php echo $_['baseURL'].$dir; ?>"><?php echo OCP\Util::sanitizeHTML($crumb["name"]); ?></a>
+	<div class="crumb <?php if($i == count($_["breadcrumb"])-1) p('last');?> svg"
+		 data-dir='<?php p($dir);?>'>
+	<a href="<?php p($_['baseURL'].$dir); ?>"><?php p($crumb["name"]); ?></a>
 	</div>
 <?php endfor;
diff --git a/apps/files/templates/part.list.php b/apps/files/templates/part.list.php
index 3c6c5dbd26776b605046d9c6dcf4bb0e3eb95cf7..59267690e66585b8dd88637436dff55fc4619fa3 100644
--- a/apps/files/templates/part.list.php
+++ b/apps/files/templates/part.list.php
@@ -1,4 +1,4 @@
-<input type="hidden" id="disableSharing" data-status="<?php echo $_['disableSharing']; ?>">
+<input type="hidden" id="disableSharing" data-status="<?php p($_['disableSharing']); ?>">
 
 <?php foreach($_['files'] as $file):
 	$simple_file_size = OCP\simple_file_size($file['size']);
@@ -13,31 +13,30 @@
 	$name = str_replace('%2F', '/', $name);
 	$directory = str_replace('+', '%20', urlencode($file['directory']));
 	$directory = str_replace('%2F', '/', $directory); ?>
-	<tr data-id="<?php echo $file['fileid']; ?>"
-		data-file="<?php echo $name;?>"
-		data-type="<?php echo ($file['type'] == 'dir')?'dir':'file'?>"
-		data-mime="<?php echo $file['mimetype']?>"
-		data-size='<?php echo $file['size'];?>'
-		data-permissions='<?php echo $file['permissions']; ?>'>
+	<tr data-id="<?php p($file['fileid']); ?>"
+		data-file="<?php p($name);?>"
+		data-type="<?php ($file['type'] == 'dir')?p('dir'):p('file')?>"
+		data-mime="<?php p($file['mimetype'])?>"
+		data-size='<?php p($file['size']);?>'
+		data-permissions='<?php p($file['permissions']); ?>'>
 		<td class="filename svg"
 		<?php if($file['type'] == 'dir'): ?>
-			style="background-image:url(<?php echo OCP\mimetype_icon('dir'); ?>)"
+			style="background-image:url(<?php print_unescaped(OCP\mimetype_icon('dir')); ?>)"
 		<?php else: ?>
-			style="background-image:url(<?php echo OCP\mimetype_icon($file['mimetype']); ?>)"
+			style="background-image:url(<?php print_unescaped(OCP\mimetype_icon($file['mimetype'])); ?>)"
 		<?php endif; ?>
 			>
 		<?php if(!isset($_['readonly']) || !$_['readonly']): ?><input type="checkbox" /><?php endif; ?>
 		<?php if($file['type'] == 'dir'): ?>
-			<a class="name" href="<?php echo $_['baseURL'].$directory.'/'.$name; ?>" title="">
+			<a class="name" href="<?php p(rtrim($_['baseURL'],'/').'/'.trim($directory,'/').'/'.$name); ?>" title="">
 		<?php else: ?>
-			<a class="name" href="<?php echo $_['downloadURL'].$directory.'/'.$name; ?>" title="">
+			<a class="name" href="<?php p(rtrim($_['downloadURL'],'/').'/'.trim($directory,'/').'/'.$name); ?>" title="">
 		<?php endif; ?>
 			<span class="nametext">
 				<?php if($file['type'] == 'dir'):?>
-					<?php echo htmlspecialchars($file['name']);?>
+					<?php print_unescaped(htmlspecialchars($file['name']));?>
 				<?php else:?>
-					<?php echo htmlspecialchars($file['basename']);?><span
-						class='extension'><?php echo $file['extension'];?></span>
+					<?php print_unescaped(htmlspecialchars($file['basename']));?><span class='extension'><?php p($file['extension']);?></span>
 				<?php endif;?>
 			</span>
 			<?php if($file['type'] == 'dir'):?>
@@ -47,17 +46,17 @@
 			</a>
 		</td>
 		<td class="filesize"
-			title="<?php echo OCP\human_file_size($file['size']); ?>"
-			style="color:rgb(<?php echo $simple_size_color.','.$simple_size_color.','.$simple_size_color ?>)">
-				<?php echo $simple_file_size; ?>
+			title="<?php p(OCP\human_file_size($file['size'])); ?>"
+			style="color:rgb(<?php p($simple_size_color.','.$simple_size_color.','.$simple_size_color) ?>)">
+				<?php print_unescaped($simple_file_size); ?>
 		</td>
 		<td class="date">
 			<span class="modified"
-				  title="<?php echo $file['date']; ?>"
-				  style="color:rgb(<?php echo $relative_date_color.','
+				  title="<?php p($file['date']); ?>"
+				  style="color:rgb(<?php p($relative_date_color.','
 												.$relative_date_color.','
-												.$relative_date_color ?>)">
-				<?php echo $relative_modified_date; ?>
+												.$relative_date_color) ?>)">
+				<?php p($relative_modified_date); ?>
 			</span>
 		</td>
 	</tr>
diff --git a/apps/files/templates/upgrade.php b/apps/files/templates/upgrade.php
index de6cc7130284ca37c0148a18c8059e1ebc625c11..e03f086e47d487518539afdc6d0b8c345c1de706 100644
--- a/apps/files/templates/upgrade.php
+++ b/apps/files/templates/upgrade.php
@@ -1,4 +1,4 @@
 <div id="upgrade">
-	<?php echo $l->t('Upgrading filesystem cache...');?>
+	<?php p($l->t('Upgrading filesystem cache...'));?>
 	<div id="progressbar" />
 </div>
diff --git a/apps/files_encryption/appinfo/app.php b/apps/files_encryption/appinfo/app.php
index c7cd8ca32de87890a1057fb576e1bb705c0a284a..f7b2140b580afa15b02923ec1f3ac0d8f91b5e5e 100644
--- a/apps/files_encryption/appinfo/app.php
+++ b/apps/files_encryption/appinfo/app.php
@@ -1,12 +1,12 @@
 <?php
 
-OC::$CLASSPATH['OCA\Encryption\Crypt'] = 'apps/files_encryption/lib/crypt.php';
-OC::$CLASSPATH['OCA\Encryption\Hooks'] = 'apps/files_encryption/hooks/hooks.php';
-OC::$CLASSPATH['OCA\Encryption\Util'] = 'apps/files_encryption/lib/util.php';
-OC::$CLASSPATH['OCA\Encryption\Keymanager'] = 'apps/files_encryption/lib/keymanager.php';
-OC::$CLASSPATH['OCA\Encryption\Stream'] = 'apps/files_encryption/lib/stream.php';
-OC::$CLASSPATH['OCA\Encryption\Proxy'] = 'apps/files_encryption/lib/proxy.php';
-OC::$CLASSPATH['OCA\Encryption\Session'] = 'apps/files_encryption/lib/session.php';
+OC::$CLASSPATH['OCA\Encryption\Crypt'] = 'files_encryption/lib/crypt.php';
+OC::$CLASSPATH['OCA\Encryption\Hooks'] = 'files_encryption/hooks/hooks.php';
+OC::$CLASSPATH['OCA\Encryption\Util'] = 'files_encryption/lib/util.php';
+OC::$CLASSPATH['OCA\Encryption\Keymanager'] = 'files_encryption/lib/keymanager.php';
+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_FileProxy::register( new OCA\Encryption\Proxy() );
 
diff --git a/apps/files_encryption/l10n/de_DE.php b/apps/files_encryption/l10n/de_DE.php
index b942c659f9e2f01e81e4c91e1af7f5332494d720..4f08b98eb29fdb50d0866b4b8ead9a1e9a468e38 100644
--- a/apps/files_encryption/l10n/de_DE.php
+++ b/apps/files_encryption/l10n/de_DE.php
@@ -1,7 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Encryption" => "Verschlüsselung",
 "File encryption is enabled." => "Datei-Verschlüsselung ist aktiviert",
-"The following file types will not be encrypted:" => "Die folgenden Datei-Typen werden nicht verschlüsselt:",
-"Exclude the following file types from encryption:" => "Die folgenden Datei-Typen von der Verschlüsselung ausnehmen:",
+"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"
 );
diff --git a/apps/files_encryption/l10n/id.php b/apps/files_encryption/l10n/id.php
index 3f9a6c7d07f89c8f6d1ec9806981af61765b0251..6044348e72e335b5f813e25382185af6bfd9927f 100644
--- a/apps/files_encryption/l10n/id.php
+++ b/apps/files_encryption/l10n/id.php
@@ -1,4 +1,7 @@
 <?php $TRANSLATIONS = array(
-"Encryption" => "enkripsi",
-"None" => "tidak ada"
+"Encryption" => "Enkripsi",
+"File encryption is enabled." => "Enkripsi berkas aktif.",
+"The following file types will not be encrypted:" => "Tipe berkas berikut tidak akan dienkripsi:",
+"Exclude the following file types from encryption:" => "Kecualikan tipe berkas berikut dari enkripsi:",
+"None" => "Tidak ada"
 );
diff --git a/apps/files_encryption/l10n/nb_NO.php b/apps/files_encryption/l10n/nb_NO.php
index e52ecb868af102a058ea58e23d00456dc891a788..a5e16a034218f70cfbd03f2b55073b9c46934166 100644
--- a/apps/files_encryption/l10n/nb_NO.php
+++ b/apps/files_encryption/l10n/nb_NO.php
@@ -1,4 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Encryption" => "Kryptering",
+"File encryption is enabled." => "Fil-kryptering er aktivert.",
+"The following file types will not be encrypted:" => "Følgende filtyper vil ikke bli kryptert:",
+"Exclude the following file types from encryption:" => "Ekskluder følgende filtyper fra kryptering:",
 "None" => "Ingen"
 );
diff --git a/apps/files_encryption/l10n/tr.php b/apps/files_encryption/l10n/tr.php
index 0868d0a69053a9779b74f04d672f91d313cbb4c8..6b42c757e6577a64371ba5d57f679eb136d17c48 100644
--- a/apps/files_encryption/l10n/tr.php
+++ b/apps/files_encryption/l10n/tr.php
@@ -1,4 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Encryption" => "Şifreleme",
+"File encryption is enabled." => "Dosya şifreleme aktif.",
+"The following file types will not be encrypted:" => "Belirtilen dosya tipleri şifrelenmeyecek:",
+"Exclude the following file types from encryption:" => "Seçilen dosya tiplerini şifreleme:",
 "None" => "Hiçbiri"
 );
diff --git a/apps/files_encryption/l10n/uk.php b/apps/files_encryption/l10n/uk.php
index 8236c5afefd415f0220732f3bf7ff483910d6206..d495714119163fc5709491d5491a6a2795609cbb 100644
--- a/apps/files_encryption/l10n/uk.php
+++ b/apps/files_encryption/l10n/uk.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/templates/settings-personal.php b/apps/files_encryption/templates/settings-personal.php
index 47467c52c08a3879064624754a3e271815e63146..5f0accaed5fd960c3c6a2a08b3493f483148b841 100644
--- a/apps/files_encryption/templates/settings-personal.php
+++ b/apps/files_encryption/templates/settings-personal.php
@@ -1,19 +1,19 @@
 <form id="encryption">
 	<fieldset class="personalblock">
 		<legend>
-			<?php echo $l->t( 'Encryption' ); ?>
+			<?php p($l->t( 'Encryption' )); ?>
 		</legend>
 		<p>
-			<?php echo $l->t( 'File encryption is enabled.' ); ?>
+			<?php p($l->t( 'File encryption is enabled.' )); ?>
 		</p>
 		<?php if ( ! empty( $_["blacklist"] ) ): ?>
 		<p>
-			<?php $l->t( 'The following file types will not be encrypted:' ); ?>
+			<?php p($l->t( 'The following file types will not be encrypted:' )); ?>
 		</p>
 		<ul>
 			<?php foreach( $_["blacklist"] as $type ): ?>
 			<li>
-				<?php echo $type; ?>
+				<?php p($type); ?>
 			</li>
 			<?php endforeach; ?>
 		</ul>
diff --git a/apps/files_encryption/templates/settings.php b/apps/files_encryption/templates/settings.php
index f7ef8a8efe65772bb44d0775766c214a0c3e2ffa..b873d7f5aafd8e081088de28b8ad009aabcc5a56 100644
--- a/apps/files_encryption/templates/settings.php
+++ b/apps/files_encryption/templates/settings.php
@@ -2,17 +2,17 @@
 	<fieldset class="personalblock">
 		
 		<p>
-			<strong><?php echo $l->t( 'Encryption' ); ?></strong>
+			<strong><?php p($l->t( 'Encryption' )); ?></strong>
 			
-			<?php echo $l->t( "Exclude the following file types from encryption:" ); ?>
+			<?php p($l->t( "Exclude the following file types from encryption:" )); ?>
 			<br />
 			
 			<select 
 			id='encryption_blacklist' 
-			title="<?php echo $l->t( 'None' )?>" 
+			title="<?php p($l->t( 'None' ))?>" 
 			multiple="multiple">
 			<?php foreach($_["blacklist"] as $type): ?>
-				<option selected="selected" value="<?php echo $type; ?>"> <?php echo $type; ?> </option>
+				<option selected="selected" value="<?php p($type); ?>"> <?php p($type); ?> </option>
 			<?php endforeach;?>
 			</select>
 		</p>
diff --git a/apps/files_external/ajax/addMountPoint.php b/apps/files_external/ajax/addMountPoint.php
index 4cd8871b310c34384f979b0390a4274919cc23b2..fed2ddfcf3d95e3597b6426b0eac3cdf0cedabfa 100644
--- a/apps/files_external/ajax/addMountPoint.php
+++ b/apps/files_external/ajax/addMountPoint.php
@@ -10,9 +10,10 @@ if ($_POST['isPersonal'] == 'true') {
 	OCP\JSON::checkAdminUser();
 	$isPersonal = false;
 }
-OC_Mount_Config::addMountPoint($_POST['mountPoint'],
+$status = OC_Mount_Config::addMountPoint($_POST['mountPoint'],
 							   $_POST['class'],
 							   $_POST['classOptions'],
 							   $_POST['mountType'],
 							   $_POST['applicable'],
-							   $isPersonal);
\ No newline at end of file
+							   $isPersonal);
+OCP\JSON::success(array('data' => array('message' => $status)));
\ No newline at end of file
diff --git a/apps/files_external/ajax/addRootCertificate.php b/apps/files_external/ajax/addRootCertificate.php
index 7794238ab3619092042a149cc19c3dcfdde1426d..43fd6752c4ae9a1d85d4a95f4362a47cd05fcb1f 100644
--- a/apps/files_external/ajax/addRootCertificate.php
+++ b/apps/files_external/ajax/addRootCertificate.php
@@ -37,5 +37,5 @@ if ( $isValid ) {
 			OCP\Util::WARN);
 }
 
-header('Location: settings/personal.php');
+header('Location:' . OCP\Util::linkToRoute( "settings_personal" ));
 exit;
diff --git a/apps/files_external/appinfo/app.php b/apps/files_external/appinfo/app.php
index d976c0175232bfe3364f84cca636a40a708765d1..d786c6c7a2aa33552d1ad30c93bf325f4000f014 100644
--- a/apps/files_external/appinfo/app.php
+++ b/apps/files_external/appinfo/app.php
@@ -6,16 +6,16 @@
  * See the COPYING-README file.
  */
 
-OC::$CLASSPATH['OC\Files\Storage\StreamWrapper']='apps/files_external/lib/streamwrapper.php';
-OC::$CLASSPATH['OC\Files\Storage\FTP']='apps/files_external/lib/ftp.php';
-OC::$CLASSPATH['OC\Files\Storage\DAV']='apps/files_external/lib/webdav.php';
-OC::$CLASSPATH['OC\Files\Storage\Google']='apps/files_external/lib/google.php';
-OC::$CLASSPATH['OC\Files\Storage\SWIFT']='apps/files_external/lib/swift.php';
-OC::$CLASSPATH['OC\Files\Storage\SMB']='apps/files_external/lib/smb.php';
-OC::$CLASSPATH['OC\Files\Storage\AmazonS3']='apps/files_external/lib/amazons3.php';
-OC::$CLASSPATH['OC\Files\Storage\Dropbox']='apps/files_external/lib/dropbox.php';
-OC::$CLASSPATH['OC\Files\Storage\SFTP']='apps/files_external/lib/sftp.php';
-OC::$CLASSPATH['OC_Mount_Config']='apps/files_external/lib/config.php';
+OC::$CLASSPATH['OC\Files\Storage\StreamWrapper'] = 'files_external/lib/streamwrapper.php';
+OC::$CLASSPATH['OC\Files\Storage\FTP'] = 'files_external/lib/ftp.php';
+OC::$CLASSPATH['OC\Files\Storage\DAV'] = 'files_external/lib/webdav.php';
+OC::$CLASSPATH['OC\Files\Storage\Google'] = 'files_external/lib/google.php';
+OC::$CLASSPATH['OC\Files\Storage\SWIFT'] = 'files_external/lib/swift.php';
+OC::$CLASSPATH['OC\Files\Storage\SMB'] = 'files_external/lib/smb.php';
+OC::$CLASSPATH['OC\Files\Storage\AmazonS3'] = 'files_external/lib/amazons3.php';
+OC::$CLASSPATH['OC\Files\Storage\Dropbox'] = 'files_external/lib/dropbox.php';
+OC::$CLASSPATH['OC\Files\Storage\SFTP'] = 'files_external/lib/sftp.php';
+OC::$CLASSPATH['OC_Mount_Config'] = 'files_external/lib/config.php';
 
 OCP\App::registerAdmin('files_external', 'settings');
 if (OCP\Config::getAppValue('files_external', 'allow_user_mounting', 'yes') == 'yes') {
diff --git a/apps/files_external/appinfo/info.xml b/apps/files_external/appinfo/info.xml
index 2c04216a9fb00f17cbf31ab6dc569970b6a4a928..0542b7b10a7afe831d0b917b9daf284949ab08f5 100644
--- a/apps/files_external/appinfo/info.xml
+++ b/apps/files_external/appinfo/info.xml
@@ -5,7 +5,7 @@
 	<description>Mount external storage sources</description>
 	<licence>AGPL</licence>
 	<author>Robin Appelman, Michael Gapczynski</author>
-	<require>4.91</require>
+	<require>4.93</require>
 	<shipped>true</shipped>
 	<types>
 		<filesystem/>
diff --git a/apps/files_external/css/settings.css b/apps/files_external/css/settings.css
index ca4b1c3ba8937d6affb071e89621cf047fa227ad..94b453793b1badda59574975a89fb9da90893b4e 100644
--- a/apps/files_external/css/settings.css
+++ b/apps/files_external/css/settings.css
@@ -1,4 +1,7 @@
-.error { color: #FF3B3B; }
+td.status>span { display:inline-block; height:16px; width:16px; }
+span.success { background-image: url('../img/success.png'); background-repeat:no-repeat; }
+span.error { background-image: url('../img/error.png'); background-repeat:no-repeat; }
+span.waiting { background-image: url('../img/waiting.png'); background-repeat:no-repeat; }
 td.mountPoint, td.backend { width:10em; }
 td.remove>img { visibility:hidden; padding-top:0.8em; }
 tr:hover>td.remove>img { visibility:visible; cursor:pointer; }
diff --git a/apps/files_external/img/error.png b/apps/files_external/img/error.png
new file mode 100644
index 0000000000000000000000000000000000000000..e8cf45e7a41e358da5d573dc48edf966b9d8d3cb
Binary files /dev/null and b/apps/files_external/img/error.png differ
diff --git a/apps/files_external/img/success.png b/apps/files_external/img/success.png
new file mode 100644
index 0000000000000000000000000000000000000000..6f7022ee7f5672b43bdf72f848a7358e4473eb60
Binary files /dev/null and b/apps/files_external/img/success.png differ
diff --git a/apps/files_external/img/waiting.png b/apps/files_external/img/waiting.png
new file mode 100644
index 0000000000000000000000000000000000000000..02a8cbff0da63ad584ae7a5c11ddefdf0bd9e24b
Binary files /dev/null and b/apps/files_external/img/waiting.png differ
diff --git a/apps/files_external/js/dropbox.js b/apps/files_external/js/dropbox.js
index cd3c957e0a8470a0631ee423b7fbac2904f58f61..957daeb4d1f9152af29b06c85273b39f4cc760da 100644
--- a/apps/files_external/js/dropbox.js
+++ b/apps/files_external/js/dropbox.js
@@ -15,6 +15,9 @@ $(document).ready(function() {
 				if (pos != -1 && window.location.search.substr(pos, $(token).val().length) == $(token).val()) {
 					var token_secret = $(this).find('.configuration [data-parameter="token_secret"]');
 					var tr = $(this);
+					var statusSpan = $(tr).find('.status span');
+					statusSpan.removeClass();
+					statusSpan.addClass('waiting');
 					$.post(OC.filePath('files_external', 'ajax', 'dropbox.php'), { step: 2, app_key: app_key, app_secret: app_secret, request_token: $(token).val(), request_token_secret: $(token_secret).val() }, function(result) {
 						if (result && result.status == 'success') {
 							$(token).val(result.access_token);
@@ -24,23 +27,40 @@ $(document).ready(function() {
 							$(tr).find('.configuration input').attr('disabled', 'disabled');
 							$(tr).find('.configuration').append('<span id="access" style="padding-left:0.5em;">'+t('files_external', 'Access granted')+'</span>');
 						} else {
-							OC.dialogs.alert(result.data.message,
-                                t('files_external', 'Error configuring Dropbox storage')
-                            );
+							OC.dialogs.alert(result.data.message, t('files_external', 'Error configuring Dropbox storage'));
 						}
 					});
 				}
-			} else if ($(this).find('.mountPoint input').val() != '' && $(config).find('[data-parameter="app_key"]').val() != '' && $(config).find('[data-parameter="app_secret"]').val() != '' && $(this).find('.dropbox').length == 0) {
-				$(this).find('.configuration').append('<a class="button dropbox">'+t('files_external', 'Grant access')+'</a>');
+			} else {
+				onDropboxInputsChange($(this));
 			}
 		}
 	});
 
-	$('#externalStorage tbody').on('keyup', 'tr input', function() {
-		var tr = $(this).parent().parent();
-		if ($(tr).hasClass('\\\\OC\\\\Files\\\\Storage\\\\Dropbox') && $(tr).find('[data-parameter="configured"]').val() != 'true') {
+	$('#externalStorage').on('paste', 'tbody tr.\\\\OC\\\\Files\\\\Storage\\\\Dropbox td', function() {
+		var tr = $(this).parent();
+		setTimeout(function() {
+			onDropboxInputsChange(tr);
+		}, 20);
+	});
+
+	$('#externalStorage').on('keyup', 'tbody tr.\\\\OC\\\\Files\\\\Storage\\\\Dropbox td', function() {
+		onDropboxInputsChange($(this).parent());
+	});
+
+	$('#externalStorage').on('change', 'tbody tr.\\\\OC\\\\Files\\\\Storage\\\\Dropbox .chzn-select', function() {
+		onDropboxInputsChange($(this).parent().parent());
+	});
+
+	function onDropboxInputsChange(tr) {
+		if ($(tr).find('[data-parameter="configured"]').val() != 'true') {
 			var config = $(tr).find('.configuration');
-			if ($(tr).find('.mountPoint input').val() != '' && $(config).find('[data-parameter="app_key"]').val() != '' && $(config).find('[data-parameter="app_secret"]').val() != '') {
+			if ($(tr).find('.mountPoint input').val() != ''
+				&& $(config).find('[data-parameter="app_key"]').val() != ''
+				&& $(config).find('[data-parameter="app_secret"]').val() != ''
+				&& ($(tr).find('.chzn-select').length == 0
+				|| $(tr).find('.chzn-select').val() != null))
+			{
 				if ($(tr).find('.dropbox').length == 0) {
 					$(config).append('<a class="button dropbox">'+t('files_external', 'Grant access')+'</a>');
 				} else {
@@ -50,41 +70,37 @@ $(document).ready(function() {
 				$(tr).find('.dropbox').hide();
 			}
 		}
-	});
+	}
 
-	$('.dropbox').on('click', function(event) {
+	$('#externalStorage').on('click', '.dropbox', function(event) {
 		event.preventDefault();
+		var tr = $(this).parent().parent();
 		var app_key = $(this).parent().find('[data-parameter="app_key"]').val();
 		var app_secret = $(this).parent().find('[data-parameter="app_secret"]').val();
+		var statusSpan = $(tr).find('.status span');
 		if (app_key != '' && app_secret != '') {
 			var tr = $(this).parent().parent();
 			var configured = $(this).parent().find('[data-parameter="configured"]');
 			var token = $(this).parent().find('[data-parameter="token"]');
 			var token_secret = $(this).parent().find('[data-parameter="token_secret"]');
-			$.post(OC.filePath('files_external', 'ajax', 'dropbox.php'), { step: 1, app_key: app_key, app_secret: app_secret, callback: window.location.href }, function(result) {
+			$.post(OC.filePath('files_external', 'ajax', 'dropbox.php'), { step: 1, app_key: app_key, app_secret: app_secret, callback: location.protocol + '//' + location.host + location.pathname }, function(result) {
 				if (result && result.status == 'success') {
 					$(configured).val('false');
 					$(token).val(result.data.request_token);
 					$(token_secret).val(result.data.request_token_secret);
-					if (OC.MountConfig.saveStorage(tr)) {
-						window.location = result.data.url;
-					} else {
-						OC.dialogs.alert(
-                            t('files_external', 'Fill out all required fields'),
-                            t('files_external', 'Error configuring Dropbox storage')
-                        );
-					}
+					OC.MountConfig.saveStorage(tr);
+					statusSpan.removeClass();
+					statusSpan.addClass('waiting');
+					window.location = result.data.url;
 				} else {
-					OC.dialogs.alert(result.data.message,
-                        t('files_external', 'Error configuring Dropbox storage')
-                    );
+					OC.dialogs.alert(result.data.message, t('files_external', 'Error configuring Dropbox storage'));
 				}
 			});
 		} else {
 			OC.dialogs.alert(
-                t('files_external', 'Please provide a valid Dropbox app key and secret.'),
-                t('files_external', 'Error configuring Dropbox storage')
-            );
+				t('files_external', 'Please provide a valid Dropbox app key and secret.'),
+				t('files_external', 'Error configuring Dropbox storage')
+			);
 		}
 	});
 
diff --git a/apps/files_external/js/google.js b/apps/files_external/js/google.js
index 9b7f9514f12d38b3c9d885bcf4ec269b6503efd7..7be1b338e904fb1cba80cea821d28882a465d18b 100644
--- a/apps/files_external/js/google.js
+++ b/apps/files_external/js/google.js
@@ -1,19 +1,30 @@
 $(document).ready(function() {
 
-	$('#externalStorage tbody tr.\\\\OC\\\\Files\\\\Storage\\\\Google').each(function() {
-		var configured = $(this).find('[data-parameter="configured"]');
+	$('#externalStorage tbody tr.\\\\OC\\\\Files\\\\Storage\\\\Google').each(function(index, tr) {
+		setupGoogleRow(tr);
+	});
+
+	$('#externalStorage').on('change', '#selectBackend', function() {
+		if ($(this).val() == '\\OC\\Files\\Storage\\Google') {
+			setupGoogleRow($('#externalStorage tbody>tr:last').prev('tr'));
+		}
+	});
+
+	function setupGoogleRow(tr) {
+		var configured = $(tr).find('[data-parameter="configured"]');
 		if ($(configured).val() == 'true') {
-			$(this).find('.configuration')
-                .append('<span id="access" style="padding-left:0.5em;">'+t('files_external', 'Access granted')+'</span>');
+			$(tr).find('.configuration').append('<span id="access" style="padding-left:0.5em;">'+t('files_external', 'Access granted')+'</span>');
 		} else {
-			var token = $(this).find('[data-parameter="token"]');
-			var token_secret = $(this).find('[data-parameter="token_secret"]');
+			var token = $(tr).find('[data-parameter="token"]');
+			var token_secret = $(tr).find('[data-parameter="token_secret"]');
 			var params = {};
 			window.location.href.replace(/[?&]+([^=&]+)=([^&]*)/gi, function(m, key, value) {
 				params[key] = value;
 			});
 			if (params['oauth_token'] !== undefined && params['oauth_verifier'] !== undefined && decodeURIComponent(params['oauth_token']) == $(token).val()) {
-				var tr = $(this);
+				var statusSpan = $(tr).find('.status span');
+				statusSpan.removeClass();
+				statusSpan.addClass('waiting');
 				$.post(OC.filePath('files_external', 'ajax', 'google.php'), { step: 2, oauth_verifier: params['oauth_verifier'], request_token: $(token).val(), request_token_secret: $(token_secret).val() }, function(result) {
 					if (result && result.status == 'success') {
 						$(token).val(result.access_token);
@@ -22,61 +33,64 @@ $(document).ready(function() {
 						OC.MountConfig.saveStorage(tr);
 						$(tr).find('.configuration').append('<span id="access" style="padding-left:0.5em;">'+t('files_external', 'Access granted')+'</span>');
 					} else {
-						OC.dialogs.alert(result.data.message,
-                            t('files_external', 'Error configuring Google Drive storage')
-                        );
+						OC.dialogs.alert(result.data.message, t('files_external', 'Error configuring Google Drive storage'));
+						onGoogleInputsChange(tr);
 					}
 				});
-			} else if ($(this).find('.google').length == 0) {
-				$(this).find('.configuration').append('<a class="button google">'+t('files_external', 'Grant access')+'</a>');
+			} else {
+				onGoogleInputsChange(tr);
 			}
 		}
+	}
+
+	$('#externalStorage').on('paste', 'tbody tr.\\\\OC\\\\Files\\\\Storage\\\\Google td', function() {
+		var tr = $(this).parent();
+		setTimeout(function() {
+			onGoogleInputsChange(tr);
+		}, 20);
 	});
 
-	$('#externalStorage tbody').on('change', 'tr', function() {
-		if ($(this).hasClass('\\\\OC\\\\Files\\\\Storage\\\\Google') && $(this).find('[data-parameter="configured"]').val() != 'true') {
-			if ($(this).find('.mountPoint input').val() != '') {
-				if ($(this).find('.google').length == 0) {
-					$(this).find('.configuration').append('<a class="button google">'+t('files_external', 'Grant access')+'</a>');
-				}
-			}
-		}
+	$('#externalStorage').on('keyup', 'tbody tr.\\\\OC\\\\Files\\\\Storage\\\\Google td', function() {
+		onGoogleInputsChange($(this).parent());
 	});
 
-	$('#externalStorage tbody').on('keyup', 'tr .mountPoint input', function() {
-		var tr = $(this).parent().parent();
-		if ($(tr).hasClass('\\\\OC\\\\Files\\\\Storage\\\\Google') && $(tr).find('[data-parameter="configured"]').val() != 'true' && $(tr).find('.google').length > 0) {
-			if ($(this).val() != '') {
-				$(tr).find('.google').show();
-			} else {
+	$('#externalStorage').on('change', 'tbody tr.\\\\OC\\\\Files\\\\Storage\\\\Google .chzn-select', function() {
+		onGoogleInputsChange($(this).parent().parent());
+	});
+
+	function onGoogleInputsChange(tr) {
+		if ($(tr).find('[data-parameter="configured"]').val() != 'true') {
+			var config = $(tr).find('.configuration');
+			if ($(tr).find('.mountPoint input').val() != '' && ($(tr).find('.chzn-select').length == 0 || $(tr).find('.chzn-select').val() != null)) {
+				if ($(tr).find('.google').length == 0) {
+					$(config).append('<a class="button google">'+t('files_external', 'Grant access')+'</a>');
+				} else {
+					$(tr).find('.google').show();
+				}
+			} else if ($(tr).find('.google').length > 0) {
 				$(tr).find('.google').hide();
 			}
 		}
-	});
+	}
 
-	$('.google').on('click', function(event) {
+	$('#externalStorage').on('click', '.google', function(event) {
 		event.preventDefault();
 		var tr = $(this).parent().parent();
 		var configured = $(this).parent().find('[data-parameter="configured"]');
 		var token = $(this).parent().find('[data-parameter="token"]');
 		var token_secret = $(this).parent().find('[data-parameter="token_secret"]');
-		$.post(OC.filePath('files_external', 'ajax', 'google.php'), { step: 1, callback: window.location.href }, function(result) {
+		var statusSpan = $(tr).find('.status span');
+		$.post(OC.filePath('files_external', 'ajax', 'google.php'), { step: 1, callback: location.protocol + '//' + location.host + location.pathname }, function(result) {
 			if (result && result.status == 'success') {
 				$(configured).val('false');
 				$(token).val(result.data.request_token);
 				$(token_secret).val(result.data.request_token_secret);
-				if (OC.MountConfig.saveStorage(tr)) {
-					window.location = result.data.url;
-				} else {
-					OC.dialogs.alert(
-                        t('files_external', 'Fill out all required fields'),
-                        t('files_external', 'Error configuring Google Drive storage')
-                    );
-				}
+				OC.MountConfig.saveStorage(tr);
+				statusSpan.removeClass();
+				statusSpan.addClass('waiting');
+				window.location = result.data.url;
 			} else {
-				OC.dialogs.alert(result.data.message,
-                    t('files_external', 'Error configuring Google Drive storage')
-                );
+				OC.dialogs.alert(result.data.message, t('files_external', 'Error configuring Google Drive storage'));
 			}
 		});
 	});
diff --git a/apps/files_external/js/settings.js b/apps/files_external/js/settings.js
index 126903952704c9ae0e83908c98dca0f5e83fe126..ac408786ff6271a4088530927f2141075e495e63 100644
--- a/apps/files_external/js/settings.js
+++ b/apps/files_external/js/settings.js
@@ -4,6 +4,7 @@ OC.MountConfig={
 		if (mountPoint == '') {
 			return false;
 		}
+		var statusSpan = $(tr).find('.status span');
 		var backendClass = $(tr).find('.backend').data('class');
 		var configuration = $(tr).find('.configuration input');
 		var addMountPoint = true;
@@ -26,12 +27,20 @@ OC.MountConfig={
 				classOptions[$(input).data('parameter')] = $(input).val();
 			}
 		});
+		if ($('#externalStorage').data('admin') === true) {
+			var multiselect = $(tr).find('.chzn-select').val();
+			if (multiselect == null) {
+				return false;
+			}
+		}
 		if (addMountPoint) {
+			var status = false;
 			if ($('#externalStorage').data('admin') === true) {
 				var isPersonal = false;
-				var multiselect = $(tr).find('.chzn-select').val();
 				var oldGroups = $(tr).find('.applicable').data('applicable-groups');
 				var oldUsers = $(tr).find('.applicable').data('applicable-users');
+				var groups = [];
+				var users = [];
 				$.each(multiselect, function(index, value) {
 					var pos = value.indexOf('(group)');
 					if (pos != -1) {
@@ -40,30 +49,96 @@ OC.MountConfig={
 						if ($.inArray(applicable, oldGroups) != -1) {
 							oldGroups.splice($.inArray(applicable, oldGroups), 1);
 						}
+						groups.push(applicable);
 					} else {
 						var mountType = 'user';
 						var applicable = value;
 						if ($.inArray(applicable, oldUsers) != -1) {
 							oldUsers.splice($.inArray(applicable, oldUsers), 1);
 						}
+						users.push(applicable);
 					}
-					$.post(OC.filePath('files_external', 'ajax', 'addMountPoint.php'), { mountPoint: mountPoint, 'class': backendClass, classOptions: classOptions, mountType: mountType, applicable: applicable, isPersonal: isPersonal });
+					$.ajax({type: 'POST',
+						url: OC.filePath('files_external', 'ajax', 'addMountPoint.php'),
+						data: {
+							mountPoint: mountPoint,
+							'class': backendClass,
+							classOptions: classOptions,
+							mountType: mountType,
+							applicable: applicable,
+							isPersonal: isPersonal
+						},
+						async: false,
+						success: function(result) {
+							statusSpan.removeClass();
+							if (result && result.status == 'success' && result.data.message) {
+								status = true;
+								statusSpan.addClass('success');
+							} else {
+								statusSpan.addClass('error');
+							}
+						}
+					});
 				});
+				$(tr).find('.applicable').data('applicable-groups', groups);
+				$(tr).find('.applicable').data('applicable-users', users);
 				var mountType = 'group';
 				$.each(oldGroups, function(index, applicable) {
-					$.post(OC.filePath('files_external', 'ajax', 'removeMountPoint.php'), { mountPoint: mountPoint, mountType: mountType, applicable: applicable, isPersonal: isPersonal });
+					$.ajax({type: 'POST',
+						url: OC.filePath('files_external', 'ajax', 'removeMountPoint.php'),
+						data: {
+							mountPoint: mountPoint,
+							class: backendClass,
+							classOptions: classOptions,
+							mountType: mountType,
+							applicable: applicable,
+							isPersonal: isPersonal
+						},
+						async: false
+					});
 				});
 				var mountType = 'user';
 				$.each(oldUsers, function(index, applicable) {
-					$.post(OC.filePath('files_external', 'ajax', 'removeMountPoint.php'), { mountPoint: mountPoint, mountType: mountType, applicable: applicable, isPersonal: isPersonal });
+					$.ajax({type: 'POST',
+						url: OC.filePath('files_external', 'ajax', 'removeMountPoint.php'),
+						data: {
+							mountPoint: mountPoint,
+							class: backendClass,
+							classOptions: classOptions,
+							mountType: mountType,
+							applicable: applicable,
+							isPersonal: isPersonal
+						},
+						async: false
+					});
 				});
 			} else {
 				var isPersonal = true;
 				var mountType = 'user';
 				var applicable = OC.currentUser;
-				$.post(OC.filePath('files_external', 'ajax', 'addMountPoint.php'), { mountPoint: mountPoint, 'class': backendClass, classOptions: classOptions, mountType: mountType, applicable: applicable, isPersonal: isPersonal });
+				$.ajax({type: 'POST',
+					url: OC.filePath('files_external', 'ajax', 'addMountPoint.php'),
+					data: {
+						mountPoint: mountPoint,
+						'class': backendClass,
+						classOptions: classOptions,
+						mountType: mountType,
+						applicable: applicable,
+						isPersonal: isPersonal
+					},
+					async: false,
+					success: function(result) {
+						statusSpan.removeClass();
+						if (result && result.status == 'success' && result.data.message) {
+							status = true;
+							statusSpan.addClass('success');
+						} else {
+							statusSpan.addClass('error');
+						}
+					}
+				});
 			}
-			return true;
+			return status;
 		}
 	}
 };
@@ -71,7 +146,7 @@ OC.MountConfig={
 $(document).ready(function() {
 	$('.chzn-select').chosen();
 
-	$('#selectBackend').on('change', function() {
+	$('#externalStorage').on('change', '#selectBackend', function() {
 		var tr = $(this).parent().parent();
 		$('#externalStorage tbody').append($(tr).clone());
 		$('#externalStorage tbody tr').last().find('.mountPoint input').val('');
@@ -79,9 +154,10 @@ $(document).ready(function() {
 		var backendClass = $(this).val();
 		$(this).parent().text(selected);
 		if ($(tr).find('.mountPoint input').val() == '') {
-			$(tr).find('.mountPoint input').val(suggestMountPoint(selected.replace(/\s+/g, '')));
+			$(tr).find('.mountPoint input').val(suggestMountPoint(selected));
 		}
 		$(tr).addClass(backendClass);
+		$(tr).find('.status').append('<span class="waiting"></span>');
 		$(tr).find('.backend').data('class', backendClass);
 		var configurations = $(this).data('configurations');
 		var td = $(tr).find('td.configuration');
@@ -106,7 +182,11 @@ $(document).ready(function() {
 				return false;
 			}
 		});
-		$('.chz-select').chosen();
+		// Reset chosen
+		var chosen = $(tr).find('.applicable select');
+		chosen.parent().find('div').remove();
+		chosen.removeAttr('id').removeClass('chzn-done').css({display:'inline-block'});
+		chosen.chosen();
 		$(tr).find('td').last().attr('class', 'remove');
 		$(tr).find('td').last().removeAttr('style');
 		$(tr).removeAttr('id');
@@ -114,6 +194,11 @@ $(document).ready(function() {
 	});
 
 	function suggestMountPoint(defaultMountPoint) {
+		var pos = defaultMountPoint.indexOf('/');
+		if (pos !== -1) {
+			defaultMountPoint = defaultMountPoint.substring(0, pos);
+		}
+		defaultMountPoint = defaultMountPoint.replace(/\s+/g, '');
 		var i = 1;
 		var append = '';
 		var match = true;
@@ -135,11 +220,34 @@ $(document).ready(function() {
 		return defaultMountPoint+append;
 	}
 
-	$('#externalStorage').on('change', 'td', function() {
-		OC.MountConfig.saveStorage($(this).parent());
+	$('#externalStorage').on('paste', 'td', function() {
+		var tr = $(this).parent();
+		setTimeout(function() {
+			OC.MountConfig.saveStorage(tr);
+		}, 20);
 	});
 
-	$('td.remove>img').on('click', function() {
+	var timer;
+
+	$('#externalStorage').on('keyup', 'td input', function() {
+		clearTimeout(timer);
+		var tr = $(this).parent().parent();
+		if ($(this).val) {
+			timer = setTimeout(function() {
+				OC.MountConfig.saveStorage(tr);
+			}, 2000);
+		}
+	});
+
+	$('#externalStorage').on('change', 'td input:checkbox', function() {
+		OC.MountConfig.saveStorage($(this).parent().parent().parent());
+	});
+
+	$('#externalStorage').on('change', '.applicable .chzn-select', function() {
+		OC.MountConfig.saveStorage($(this).parent().parent());
+	});
+
+	$('#externalStorage').on('click', 'td.remove>img', function() {
 		var tr = $(this).parent().parent();
 		var mountPoint = $(tr).find('.mountPoint input').val();
 		if ( ! mountPoint) {
@@ -151,23 +259,25 @@ $(document).ready(function() {
 		if ($('#externalStorage').data('admin') === true) {
 			var isPersonal = false;
 			var multiselect = $(tr).find('.chzn-select').val();
-			$.each(multiselect, function(index, value) {
-				var pos = value.indexOf('(group)');
-				if (pos != -1) {
-					var mountType = 'group';
-					var applicable = value.substr(0, pos);
-				} else {
-					var mountType = 'user';
-					var applicable = value;
-				}
-				$.post(OC.filePath('files_external', 'ajax', 'removeMountPoint.php'), { mountPoint: mountPoint, mountType: mountType, applicable: applicable, isPersonal: isPersonal });
-			});
+			if (multiselect != null) {
+				$.each(multiselect, function(index, value) {
+					var pos = value.indexOf('(group)');
+					if (pos != -1) {
+						var mountType = 'group';
+						var applicable = value.substr(0, pos);
+					} else {
+						var mountType = 'user';
+						var applicable = value;
+					}
+					$.post(OC.filePath('files_external', 'ajax', 'removeMountPoint.php'), { mountPoint: mountPoint, mountType: mountType, applicable: applicable, isPersonal: isPersonal });
+				});
+			}
 		} else {
 			var mountType = 'user';
 			var applicable = OC.currentUser;
 			var isPersonal = true;
+			$.post(OC.filePath('files_external', 'ajax', 'removeMountPoint.php'), { mountPoint: mountPoint, mountType: mountType, applicable: applicable, isPersonal: isPersonal });
 		}
-		$.post(OC.filePath('files_external', 'ajax', 'removeMountPoint.php'), { mountPoint: mountPoint, mountType: mountType, applicable: applicable, isPersonal: isPersonal });
 		$(tr).remove();
 	});
 
diff --git a/apps/files_external/l10n/bg_BG.php b/apps/files_external/l10n/bg_BG.php
index 6342da3f3a2fed64407017e0a9663aec98b1b73f..66ad4a879d441a038c6c5f79359fccc22a613024 100644
--- a/apps/files_external/l10n/bg_BG.php
+++ b/apps/files_external/l10n/bg_BG.php
@@ -1,9 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Access granted" => "Достъпът е даден",
 "Grant access" => "Даване на достъп",
-"Fill out all required fields" => "Попълнете всички задължителни полета",
 "External Storage" => "Външно хранилище",
-"Backend" => "Администрация",
 "Configuration" => "Конфигурация",
 "Options" => "Опции",
 "Applicable" => "Приложимо",
diff --git a/apps/files_external/l10n/bn_BD.php b/apps/files_external/l10n/bn_BD.php
index a4a2b23030b9aefe8b0ac1c0069ba97b738cf2da..07ccd50074667723f638cc89f7c04d82f9246cfe 100644
--- a/apps/files_external/l10n/bn_BD.php
+++ b/apps/files_external/l10n/bn_BD.php
@@ -2,16 +2,12 @@
 "Access granted" => "অধিগমনের  অনুমতি প্রদান করা হলো",
 "Error configuring Dropbox storage" => "Dropbox সংরক্ষণাগার নির্ধারণ করতে সমস্যা ",
 "Grant access" => "অধিগমনের  অনুমতি প্রদান কর",
-"Fill out all required fields" => "আবশ্যিক সমস্ত ক্ষেত্র পূরণ করুন",
 "Please provide a valid Dropbox app key and secret." => "দয়া করে সঠিক এবং বৈধ Dropbox app key and secret প্রদান করুন।",
 "Error configuring Google Drive storage" => "Google Drive সংরক্ষণাগার নির্ধারণ করতে সমস্যা ",
 "External Storage" => "বাহ্যিক সংরক্ষণাগার",
-"Mount point" => "মাউন্ট পয়েন্ট",
-"Backend" => "পশ্চাদপট",
 "Configuration" => "কনফিগারেসন",
 "Options" => "বিকল্পসমূহ",
 "Applicable" => "প্রযোজ্য",
-"Add mount point" => "মাউন্ট পয়েন্ট যোগ কর",
 "None set" => "কোনটিই নির্ধারণ করা হয় নি",
 "All Users" => "সমস্ত ব্যবহারকারী",
 "Groups" => "গোষ্ঠীসমূহ",
diff --git a/apps/files_external/l10n/ca.php b/apps/files_external/l10n/ca.php
index e8a922ca0f9f22bfe09dcc080aec02411946de4b..aa9304d3301a234835b4cdf0291e8a31a0682632 100644
--- a/apps/files_external/l10n/ca.php
+++ b/apps/files_external/l10n/ca.php
@@ -2,18 +2,17 @@
 "Access granted" => "S'ha concedit l'accés",
 "Error configuring Dropbox storage" => "Error en configurar l'emmagatzemament Dropbox",
 "Grant access" => "Concedeix accés",
-"Fill out all required fields" => "Ompliu els camps requerits",
 "Please provide a valid Dropbox app key and secret." => "Proporcioneu una clau d'aplicació i secret vàlids per a Dropbox",
 "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.",
 "External Storage" => "Emmagatzemament extern",
-"Mount point" => "Punt de muntatge",
-"Backend" => "Dorsal",
+"Folder name" => "Nom de la carpeta",
+"External storage" => "Emmagatzemament extern",
 "Configuration" => "Configuració",
 "Options" => "Options",
 "Applicable" => "Aplicable",
-"Add mount point" => "Afegeix punt de muntatge",
+"Add storage" => "Afegeix emmagatzemament",
 "None set" => "Cap d'establert",
 "All Users" => "Tots els usuaris",
 "Groups" => "Grups",
diff --git a/apps/files_external/l10n/cs_CZ.php b/apps/files_external/l10n/cs_CZ.php
index 9c647fad939862d8810b34429821a7ac16e604a0..20bbe8acbaaf42d5b7f3e35b1f92481fcd14bbe1 100644
--- a/apps/files_external/l10n/cs_CZ.php
+++ b/apps/files_external/l10n/cs_CZ.php
@@ -2,18 +2,17 @@
 "Access granted" => "Přístup povolen",
 "Error configuring Dropbox storage" => "Chyba při nastavení úložiště Dropbox",
 "Grant access" => "Povolit přístup",
-"Fill out all required fields" => "Vyplňte všechna povinná pole",
 "Please provide a valid Dropbox app key and secret." => "Zadejte, prosím, platný klíč a bezpečnostní frázi aplikace Dropbox.",
 "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.",
 "External Storage" => "Externí úložiště",
-"Mount point" => "Přípojný bod",
-"Backend" => "Podpůrná vrstva",
+"Folder name" => "Název složky",
+"External storage" => "Externí úložiště",
 "Configuration" => "Nastavení",
 "Options" => "Možnosti",
 "Applicable" => "Přístupný pro",
-"Add mount point" => "Přidat bod připojení",
+"Add storage" => "Přidat úložiště",
 "None set" => "Nenastaveno",
 "All Users" => "Všichni uživatelé",
 "Groups" => "Skupiny",
diff --git a/apps/files_external/l10n/da.php b/apps/files_external/l10n/da.php
index bae89a6cfdd6fc8c593cbbcdff91123be7a6eebc..0c9c6c390443c5a789b73dad88908215cf08f4e4 100644
--- a/apps/files_external/l10n/da.php
+++ b/apps/files_external/l10n/da.php
@@ -2,18 +2,15 @@
 "Access granted" => "Adgang godkendt",
 "Error configuring Dropbox storage" => "Fejl ved konfiguration af Dropbox plads",
 "Grant access" => "Godkend adgang",
-"Fill out all required fields" => "Udfyld alle nødvendige felter",
 "Please provide a valid Dropbox app key and secret." => "Angiv venligst en valid Dropbox app nøgle og hemmelighed",
 "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.",
 "External Storage" => "Ekstern opbevaring",
-"Mount point" => "Monteringspunkt",
-"Backend" => "Backend",
+"Folder name" => "Mappenavn",
 "Configuration" => "Opsætning",
 "Options" => "Valgmuligheder",
 "Applicable" => "Kan anvendes",
-"Add mount point" => "Tilføj monteringspunkt",
 "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 277cc2e6efe64e39568bfabb77a3dbfd105e8094..24183772217a0d59ce1b14f7569b5ac653319aef 100644
--- a/apps/files_external/l10n/de.php
+++ b/apps/files_external/l10n/de.php
@@ -2,18 +2,17 @@
 "Access granted" => "Zugriff gestattet",
 "Error configuring Dropbox storage" => "Fehler beim Einrichten von Dropbox",
 "Grant access" => "Zugriff gestatten",
-"Fill out all required fields" => "Bitte alle notwendigen Felder füllen",
 "Please provide a valid Dropbox app key and secret." => "Bitte trage einen gültigen Dropbox-App-Key mit Secret ein.",
 "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.",
 "External Storage" => "Externer Speicher",
-"Mount point" => "Mount-Point",
-"Backend" => "Backend",
+"Folder name" => "Ordnername",
+"External storage" => "Externer Speicher",
 "Configuration" => "Konfiguration",
 "Options" => "Optionen",
 "Applicable" => "Zutreffend",
-"Add mount point" => "Mount-Point hinzufügen",
+"Add storage" => "Speicher hinzufügen",
 "None set" => "Nicht definiert",
 "All Users" => "Alle Benutzer",
 "Groups" => "Gruppen",
diff --git a/apps/files_external/l10n/de_DE.php b/apps/files_external/l10n/de_DE.php
index 5675eb057f019e7333fecdf5f89965da7d40140b..d55c0c6909de06d2c5b26b5fe74ef97e4c4ee181 100644
--- a/apps/files_external/l10n/de_DE.php
+++ b/apps/files_external/l10n/de_DE.php
@@ -2,18 +2,17 @@
 "Access granted" => "Zugriff gestattet",
 "Error configuring Dropbox storage" => "Fehler beim Einrichten von Dropbox",
 "Grant access" => "Zugriff gestatten",
-"Fill out all required fields" => "Bitte alle notwendigen Felder füllen",
 "Please provide a valid Dropbox app key and secret." => "Bitte tragen Sie einen gültigen Dropbox-App-Key mit Secret ein.",
 "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.",
 "External Storage" => "Externer Speicher",
-"Mount point" => "Mount-Point",
-"Backend" => "Backend",
+"Folder name" => "Ordnername",
+"External storage" => "Externer Speicher",
 "Configuration" => "Konfiguration",
 "Options" => "Optionen",
 "Applicable" => "Zutreffend",
-"Add mount point" => "Mount-Point hinzufügen",
+"Add storage" => "Speicher hinzufügen",
 "None set" => "Nicht definiert",
 "All Users" => "Alle Benutzer",
 "Groups" => "Gruppen",
diff --git a/apps/files_external/l10n/el.php b/apps/files_external/l10n/el.php
index 9bf499a911d3a47cfbb8d53834f4a0a021877853..38b5a098f6266fe169329cde07322dff6e65f3e6 100644
--- a/apps/files_external/l10n/el.php
+++ b/apps/files_external/l10n/el.php
@@ -2,18 +2,15 @@
 "Access granted" => "Προσβαση παρασχέθηκε",
 "Error configuring Dropbox storage" => "Σφάλμα ρυθμίζωντας αποθήκευση Dropbox ",
 "Grant access" => "Παροχή πρόσβασης",
-"Fill out all required fields" => "Συμπληρώστε όλα τα απαιτούμενα πεδία",
 "Please provide a valid Dropbox app key and secret." => "Παρακαλούμε δώστε έγκυρο κλειδί Dropbox και μυστικό.",
 "Error configuring Google Drive storage" => "Σφάλμα ρυθμίζωντας αποθήκευση Google Drive ",
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Προσοχή:</b> Ο \"smbclient\" δεν εγκαταστάθηκε. Δεν είναι δυνατή η προσάρτηση CIFS/SMB. Παρακαλώ ενημερώστε τον διαχειριστή συστήματος να το εγκαταστήσει.",
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>Προσοχή:</b> Η υποστήριξη FTP στην PHP δεν ενεργοποιήθηκε ή εγκαταστάθηκε. Δεν είναι δυνατή η προσάρτηση FTP. Παρακαλώ ενημερώστε τον διαχειριστή συστήματος να το εγκαταστήσει.",
 "External Storage" => "Εξωτερικό Αποθηκευτικό Μέσο",
-"Mount point" => "Σημείο προσάρτησης",
-"Backend" => "Σύστημα υποστήριξης",
+"Folder name" => "Όνομα φακέλου",
 "Configuration" => "Ρυθμίσεις",
 "Options" => "Επιλογές",
 "Applicable" => "Εφαρμόσιμο",
-"Add mount point" => "Προσθήκη σημείου προσάρτησης",
 "None set" => "Κανένα επιλεγμένο",
 "All Users" => "Όλοι οι Χρήστες",
 "Groups" => "Ομάδες",
diff --git a/apps/files_external/l10n/eo.php b/apps/files_external/l10n/eo.php
index 97453aafedb92eabac851765877f9cd71cc37799..b0afb77498f28d39dcc65fa278b1172f8eda92a2 100644
--- a/apps/files_external/l10n/eo.php
+++ b/apps/files_external/l10n/eo.php
@@ -2,16 +2,13 @@
 "Access granted" => "Alirpermeso donita",
 "Error configuring Dropbox storage" => "Eraro dum agordado de la memorservo Dropbox",
 "Grant access" => "Doni alirpermeson",
-"Fill out all required fields" => "Plenigu ĉiujn neprajn kampojn",
 "Please provide a valid Dropbox app key and secret." => "Bonvolu provizi ŝlosilon de la aplikaĵo Dropbox validan kaj sekretan.",
 "Error configuring Google Drive storage" => "Eraro dum agordado de la memorservo Google Drive",
 "External Storage" => "Malena memorilo",
-"Mount point" => "Surmetingo",
-"Backend" => "Motoro",
+"Folder name" => "Dosierujnomo",
 "Configuration" => "Agordo",
 "Options" => "Malneproj",
 "Applicable" => "Aplikebla",
-"Add mount point" => "Aldoni surmetingon",
 "None set" => "Nenio agordita",
 "All Users" => "Ĉiuj uzantoj",
 "Groups" => "Grupoj",
diff --git a/apps/files_external/l10n/es.php b/apps/files_external/l10n/es.php
index d4e566276496b028601743484c0373e1dd02e418..da22f41032070f52d6f585874e05fe778d487319 100644
--- a/apps/files_external/l10n/es.php
+++ b/apps/files_external/l10n/es.php
@@ -2,18 +2,17 @@
 "Access granted" => "Acceso garantizado",
 "Error configuring Dropbox storage" => "Error configurando el almacenamiento de Dropbox",
 "Grant access" => "Garantizar acceso",
-"Fill out all required fields" => "Rellenar todos los campos requeridos",
 "Please provide a valid Dropbox app key and secret." => "Por favor , proporcione un secreto y una contraseña válida de la app Dropbox.",
 "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.",
 "External Storage" => "Almacenamiento externo",
-"Mount point" => "Punto de montaje",
-"Backend" => "Motor",
+"Folder name" => "Nombre de la carpeta",
+"External storage" => "Almacenamiento externo",
 "Configuration" => "Configuración",
 "Options" => "Opciones",
 "Applicable" => "Aplicable",
-"Add mount point" => "Añadir punto de montaje",
+"Add storage" => "Añadir almacenamiento",
 "None set" => "No se ha configurado",
 "All Users" => "Todos los usuarios",
 "Groups" => "Grupos",
diff --git a/apps/files_external/l10n/es_AR.php b/apps/files_external/l10n/es_AR.php
index aa117e802743c5c661afb752bbcabbacb7d496ac..6706aa43a311ffde100251e5f4d1bdb1b840bb65 100644
--- a/apps/files_external/l10n/es_AR.php
+++ b/apps/files_external/l10n/es_AR.php
@@ -2,18 +2,17 @@
 "Access granted" => "Acceso permitido",
 "Error configuring Dropbox storage" => "Error al configurar el almacenamiento de Dropbox",
 "Grant access" => "Permitir acceso",
-"Fill out all required fields" => "Rellenar todos los campos requeridos",
 "Please provide a valid Dropbox app key and secret." => "Por favor, proporcioná un secreto y una contraseña válida para la aplicación Dropbox.",
 "Error configuring Google Drive storage" => "Error al configurar el almacenamiento de Google Drive",
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Advertencia:</b> El cliente smb (smbclient) no se encuentra instalado. El montado de archivos o ficheros CIFS/SMB no es posible. Por favor pida al administrador de su sistema que lo instale.",
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>Advertencia:</b> El soporte de FTP en PHP no se encuentra instalado. El montado de archivos o ficheros FTP no es posible. Por favor pida al administrador de su sistema que lo instale.",
 "External Storage" => "Almacenamiento externo",
-"Mount point" => "Punto de montaje",
-"Backend" => "Motor",
+"Folder name" => "Nombre de la carpeta",
+"External storage" => "Almacenamiento externo",
 "Configuration" => "Configuración",
 "Options" => "Opciones",
 "Applicable" => "Aplicable",
-"Add mount point" => "Añadir punto de montaje",
+"Add storage" => "Añadir almacenamiento",
 "None set" => "No fue configurado",
 "All Users" => "Todos los usuarios",
 "Groups" => "Grupos",
diff --git a/apps/files_external/l10n/et_EE.php b/apps/files_external/l10n/et_EE.php
index 86922bc751b3971a94350bf0d04c951655a8ee4f..fd0cdefd347cd7bfb232ebc93777c66aeb847390 100644
--- a/apps/files_external/l10n/et_EE.php
+++ b/apps/files_external/l10n/et_EE.php
@@ -2,16 +2,13 @@
 "Access granted" => "Ligipääs on antud",
 "Error configuring Dropbox storage" => "Viga Dropboxi salvestusruumi seadistamisel",
 "Grant access" => "Anna ligipääs",
-"Fill out all required fields" => "Täida kõik kohustuslikud lahtrid",
 "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",
 "External Storage" => "Väline salvestuskoht",
-"Mount point" => "Ühenduspunkt",
-"Backend" => "Admin",
+"Folder name" => "Kausta nimi",
 "Configuration" => "Seadistamine",
 "Options" => "Valikud",
 "Applicable" => "Rakendatav",
-"Add mount point" => "Lisa ühenduspunkt",
 "None set" => "Pole määratud",
 "All Users" => "Kõik kasutajad",
 "Groups" => "Grupid",
diff --git a/apps/files_external/l10n/eu.php b/apps/files_external/l10n/eu.php
index 597204c894d4e14c21a83c8beaee91dc96e28088..83be50deb00e2cbdffcc7b460c62222dd82bdb43 100644
--- a/apps/files_external/l10n/eu.php
+++ b/apps/files_external/l10n/eu.php
@@ -2,18 +2,17 @@
 "Access granted" => "Sarrera baimendua",
 "Error configuring Dropbox storage" => "Errore bat egon da Dropbox biltegiratzea konfiguratzean",
 "Grant access" => "Baimendu sarrera",
-"Fill out all required fields" => "Bete eskatutako eremu guztiak",
 "Please provide a valid Dropbox app key and secret." => "Mesedez eman baliozkoa den Dropbox app giltza eta sekretua",
 "Error configuring Google Drive storage" => "Errore bat egon da Google Drive biltegiratzea konfiguratzean",
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Abisua:</b> \"smbclient\" ez dago instalatuta. CIFS/SMB partekatutako karpetak montatzea ez da posible. Mesedez eskatu zure sistema kudeatzaileari instalatzea.",
 "<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>Abisua:</b> PHPren FTP modulua ez dago instalatuta edo gaitua. FTP partekatutako karpetak montatzea ez da posible. Mesedez eskatu zure sistema kudeatzaileari instalatzea.",
 "External Storage" => "Kanpoko Biltegiratzea",
-"Mount point" => "Montatze puntua",
-"Backend" => "Motorra",
+"Folder name" => "Karpetaren izena",
+"External storage" => "Kanpoko biltegiratzea",
 "Configuration" => "Konfigurazioa",
 "Options" => "Aukerak",
 "Applicable" => "Aplikagarria",
-"Add mount point" => "Gehitu muntatze puntua",
+"Add storage" => "Gehitu biltegiratzea",
 "None set" => "Ezarri gabe",
 "All Users" => "Erabiltzaile guztiak",
 "Groups" => "Taldeak",
diff --git a/apps/files_external/l10n/fa.php b/apps/files_external/l10n/fa.php
index 5acf3eac5a59a4e4cea5159330911a442d707e5b..a7eac596b04925a0c0c636fc751356180857a65a 100644
--- a/apps/files_external/l10n/fa.php
+++ b/apps/files_external/l10n/fa.php
@@ -3,6 +3,7 @@
 "Configuration" => "پیکربندی",
 "Options" => "تنظیمات",
 "Applicable" => "قابل اجرا",
+"All Users" => "تمام کاربران",
 "Groups" => "گروه ها",
 "Users" => "کاربران",
 "Delete" => "حذف",
diff --git a/apps/files_external/l10n/fi_FI.php b/apps/files_external/l10n/fi_FI.php
index 120c190790b37c92ef3e25a0a77e310cb3ca5c9c..4cf97f2fc35db8e525376a5be388b119e831133b 100644
--- a/apps/files_external/l10n/fi_FI.php
+++ b/apps/files_external/l10n/fi_FI.php
@@ -2,18 +2,15 @@
 "Access granted" => "Pääsy sallittu",
 "Error configuring Dropbox storage" => "Virhe Dropbox levyn asetuksia tehtäessä",
 "Grant access" => "Salli pääsy",
-"Fill out all required fields" => "Täytä kaikki vaaditut kentät",
 "Please provide a valid Dropbox app key and secret." => "Anna kelvollinen Dropbox-sovellusavain ja salainen vastaus.",
 "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.",
 "External Storage" => "Erillinen tallennusväline",
-"Mount point" => "Liitospiste",
-"Backend" => "Taustaosa",
+"Folder name" => "Kansion nimi",
 "Configuration" => "Asetukset",
 "Options" => "Valinnat",
 "Applicable" => "Sovellettavissa",
-"Add mount point" => "Lisää liitospiste",
 "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 0825a961b1c26ee555389a9a4e41f372fc826575..db4140b483db83aed824e20b16c3299d5a8bcf8e 100644
--- a/apps/files_external/l10n/fr.php
+++ b/apps/files_external/l10n/fr.php
@@ -2,18 +2,15 @@
 "Access granted" => "Accès autorisé",
 "Error configuring Dropbox storage" => "Erreur lors de la configuration du support de stockage Dropbox",
 "Grant access" => "Autoriser l'accès",
-"Fill out all required fields" => "Veuillez remplir tous les champs requis",
 "Please provide a valid Dropbox app key and secret." => "Veuillez fournir une clé d'application (app key) ainsi qu'un mot de passe valides.",
 "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.",
 "External Storage" => "Stockage externe",
-"Mount point" => "Point de montage",
-"Backend" => "Infrastructure",
+"Folder name" => "Nom du dossier",
 "Configuration" => "Configuration",
 "Options" => "Options",
 "Applicable" => "Disponible",
-"Add mount point" => "Ajouter un point de montage",
 "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 f8100e14620a97972c0d0e1ba5956505328e7c8e..715417e25a0d96dde674f0cec29d1ce6fbe24bb6 100644
--- a/apps/files_external/l10n/gl.php
+++ b/apps/files_external/l10n/gl.php
@@ -2,18 +2,17 @@
 "Access granted" => "Concedeuse acceso",
 "Error configuring Dropbox storage" => "Produciuse un erro ao configurar o almacenamento en Dropbox",
 "Grant access" => "Permitir o acceso",
-"Fill out all required fields" => "Cubrir todos os campos obrigatorios",
 "Please provide a valid Dropbox app key and secret." => "Forneza unha chave correcta e segreda do Dropbox.",
 "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.",
 "External Storage" => "Almacenamento externo",
-"Mount point" => "Punto de montaxe",
-"Backend" => "Infraestrutura",
+"Folder name" => "Nome do cartafol",
+"External storage" => "Almacenamento externo",
 "Configuration" => "Configuración",
 "Options" => "Opcións",
 "Applicable" => "Aplicábel",
-"Add mount point" => "Engadir un punto de montaxe",
+"Add storage" => "Engadir almacenamento",
 "None set" => "Ningún definido",
 "All Users" => "Todos os usuarios",
 "Groups" => "Grupos",
diff --git a/apps/files_external/l10n/he.php b/apps/files_external/l10n/he.php
index 3dc04d4e79c81ef34a48d6232d261b9e3dbb6221..9cba045d1eafe5d12b01ba1c05bbb5261af7f44c 100644
--- a/apps/files_external/l10n/he.php
+++ b/apps/files_external/l10n/he.php
@@ -2,16 +2,13 @@
 "Access granted" => "הוענקה גישה",
 "Error configuring Dropbox storage" => "אירעה שגיאה בעת הגדרת אחסון ב־Dropbox",
 "Grant access" => "הענקת גישה",
-"Fill out all required fields" => "נא למלא את כל השדות הנדרשים",
 "Please provide a valid Dropbox app key and secret." => "נא לספק קוד יישום וסוד תקניים של Dropbox.",
 "Error configuring Google Drive storage" => "אירעה שגיאה בעת הגדרת אחסון ב־Google Drive",
 "External Storage" => "אחסון חיצוני",
-"Mount point" => "נקודת עגינה",
-"Backend" => "מנגנון",
+"Folder name" => "שם התיקייה",
 "Configuration" => "הגדרות",
 "Options" => "אפשרויות",
 "Applicable" => "ניתן ליישום",
-"Add mount point" => "הוספת נקודת עגינה",
 "None set" => "לא הוגדרה",
 "All Users" => "כל המשתמשים",
 "Groups" => "קבוצות",
diff --git a/apps/files_external/l10n/hu_HU.php b/apps/files_external/l10n/hu_HU.php
index b8973c9641111ee2a505385899b83191b3d0b94e..9ecd2d1088b7a0d348409b470ee196c2d4c52309 100644
--- a/apps/files_external/l10n/hu_HU.php
+++ b/apps/files_external/l10n/hu_HU.php
@@ -2,18 +2,17 @@
 "Access granted" => "Érvényes hozzáférés",
 "Error configuring Dropbox storage" => "A Dropbox tárolót nem sikerült beállítani",
 "Grant access" => "Megadom a hozzáférést",
-"Fill out all required fields" => "Töltse ki az összes szükséges mezőt",
 "Please provide a valid Dropbox app key and secret." => "Adjon meg egy érvényes Dropbox app key-t és secretet!",
 "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.",
 "External Storage" => "Külső tárolási szolgáltatások becsatolása",
-"Mount point" => "Hova csatoljuk",
-"Backend" => "Külső tárolórendszer",
+"Folder name" => "Mappanév",
+"External storage" => "Külső tárolók",
 "Configuration" => "Beállítások",
 "Options" => "Opciók",
 "Applicable" => "Érvényességi kör",
-"Add mount point" => "Új csatolás létrehozása",
+"Add storage" => "Tároló becsatolása",
 "None set" => "Nincs beállítva",
 "All Users" => "Az összes felhasználó",
 "Groups" => "Csoportok",
diff --git a/apps/files_external/l10n/hy.php b/apps/files_external/l10n/hy.php
new file mode 100644
index 0000000000000000000000000000000000000000..3b80487278a16a8f1f7b407908ea855f3f5def10
--- /dev/null
+++ b/apps/files_external/l10n/hy.php
@@ -0,0 +1,3 @@
+<?php $TRANSLATIONS = array(
+"Delete" => "Ջնջել"
+);
diff --git a/apps/files_external/l10n/id.php b/apps/files_external/l10n/id.php
index 4b7850025f4e845a9165809b20d48ac204e9b7f2..647220706bae67ec6469ea2ae3c8c6e0ff100e71 100644
--- a/apps/files_external/l10n/id.php
+++ b/apps/files_external/l10n/id.php
@@ -1,14 +1,22 @@
 <?php $TRANSLATIONS = array(
-"Access granted" => "akses diberikan",
-"Grant access" => "berikan hak akses",
-"Fill out all required fields" => "isi semua field yang dibutuhkan",
-"External Storage" => "penyimpanan eksternal",
-"Configuration" => "konfigurasi",
-"Options" => "pilihan",
-"Applicable" => "berlaku",
-"None set" => "tidak satupun di set",
-"All Users" => "semua pengguna",
-"Groups" => "grup",
-"Users" => "pengguna",
-"Delete" => "hapus"
+"Access granted" => "Akses diberikan",
+"Error configuring Dropbox storage" => "Kesalahan dalam mengkonfigurasi 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",
+"Configuration" => "Konfigurasi",
+"Options" => "Pilihan",
+"Applicable" => "Berlaku",
+"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",
+"SSL root certificates" => "Sertifikat root SSL",
+"Import Root Certificate" => "Impor Sertifikat Root"
 );
diff --git a/apps/files_external/l10n/is.php b/apps/files_external/l10n/is.php
index 5110bf5ad2704d3c86b9aef8c99db2df8a2f1f39..6af53096facafd5205ff3deb9529ab3576397049 100644
--- a/apps/files_external/l10n/is.php
+++ b/apps/files_external/l10n/is.php
@@ -2,18 +2,15 @@
 "Access granted" => "Aðgengi veitt",
 "Error configuring Dropbox storage" => "Villa við að setja upp Dropbox gagnasvæði",
 "Grant access" => "Veita aðgengi",
-"Fill out all required fields" => "Fylltu út alla skilyrta reiti",
 "Please provide a valid Dropbox app key and secret." => "Gefðu upp virkan Dropbox lykil og leynikóða",
 "Error configuring Google Drive storage" => "Villa kom upp við að setja upp Google Drive gagnasvæð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>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.",
 "<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>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.",
 "External Storage" => "Ytri gagnageymsla",
-"Mount point" => "Mount svæði",
-"Backend" => "Stjórnun",
+"Folder name" => "Nafn möppu",
 "Configuration" => "Uppsetning",
 "Options" => "Stillingar",
 "Applicable" => "Gilt",
-"Add mount point" => "Bæta við mount svæði",
 "None set" => "Ekkert sett",
 "All Users" => "Allir notendur",
 "Groups" => "Hópar",
diff --git a/apps/files_external/l10n/it.php b/apps/files_external/l10n/it.php
index 98c83146d48456e28d571ed1be0cbefe1ffcbc20..d7e0c81a0b0b6e0f23f4fbb9c2e4dea96774d88a 100644
--- a/apps/files_external/l10n/it.php
+++ b/apps/files_external/l10n/it.php
@@ -2,18 +2,17 @@
 "Access granted" => "Accesso consentito",
 "Error configuring Dropbox storage" => "Errore durante la configurazione dell'archivio Dropbox",
 "Grant access" => "Concedi l'accesso",
-"Fill out all required fields" => "Compila tutti i campi richiesti",
 "Please provide a valid Dropbox app key and secret." => "Fornisci chiave di applicazione e segreto di Dropbox validi.",
 "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.",
 "External Storage" => "Archiviazione esterna",
-"Mount point" => "Punto di mount",
-"Backend" => "Motore",
+"Folder name" => "Nome della cartella",
+"External storage" => "Archiviazione esterna",
 "Configuration" => "Configurazione",
 "Options" => "Opzioni",
 "Applicable" => "Applicabile",
-"Add mount point" => "Aggiungi punto di mount",
+"Add storage" => "Aggiungi archiviazione",
 "None set" => "Nessuna impostazione",
 "All Users" => "Tutti gli utenti",
 "Groups" => "Gruppi",
diff --git a/apps/files_external/l10n/ja_JP.php b/apps/files_external/l10n/ja_JP.php
index cd09bb43db79c92a192bb834cc879b7ad8db4662..12a0b30938a5e668377371ead59d07e9005451fa 100644
--- a/apps/files_external/l10n/ja_JP.php
+++ b/apps/files_external/l10n/ja_JP.php
@@ -2,18 +2,17 @@
 "Access granted" => "アクセスは許可されました",
 "Error configuring Dropbox storage" => "Dropboxストレージの設定エラー",
 "Grant access" => "アクセスを許可",
-"Fill out all required fields" => "すべての必須フィールドを埋めて下さい",
 "Please provide a valid Dropbox app key and secret." => "有効なDropboxアプリのキーとパスワードを入力して下さい。",
 "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共有のマウントはできません。システム管理者にインストールをお願いして下さい。",
 "External Storage" => "外部ストレージ",
-"Mount point" => "マウントポイント",
-"Backend" => "バックエンド",
+"Folder name" => "フォルダ名",
+"External storage" => "外部ストレージ",
 "Configuration" => "設定",
 "Options" => "オプション",
 "Applicable" => "適用範囲",
-"Add mount point" => "マウントポイントを追加",
+"Add storage" => "ストレージを追加",
 "None set" => "未設定",
 "All Users" => "すべてのユーザ",
 "Groups" => "グループ",
diff --git a/apps/files_external/l10n/ka.php b/apps/files_external/l10n/ka.php
new file mode 100644
index 0000000000000000000000000000000000000000..14c0625e1f280d2661e7dd33cb07e27814ef1fe4
--- /dev/null
+++ b/apps/files_external/l10n/ka.php
@@ -0,0 +1,3 @@
+<?php $TRANSLATIONS = array(
+"Users" => "მომხმარებლები"
+);
diff --git a/apps/files_external/l10n/ko.php b/apps/files_external/l10n/ko.php
index 47b75f74b86cbdd05b197877b5c850eba041d44f..47de9aad5e0ff566e4812e0f00be6136605133d6 100644
--- a/apps/files_external/l10n/ko.php
+++ b/apps/files_external/l10n/ko.php
@@ -2,18 +2,15 @@
 "Access granted" => "접근 허가됨",
 "Error configuring Dropbox storage" => "Dropbox 저장소 설정 오류",
 "Grant access" => "접근 권한 부여",
-"Fill out all required fields" => "모든 필수 항목을 입력하십시오",
 "Please provide a valid Dropbox app key and secret." => "올바른 Dropbox 앱 키와 암호를 입력하십시오.",
 "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 공유를 마운트할 수 없습니다. 시스템 관리자에게 설치를 요청하십시오.",
 "External Storage" => "외부 저장소",
-"Mount point" => "마운트 지점",
-"Backend" => "백엔드",
+"Folder name" => "폴더 이름",
 "Configuration" => "설정",
 "Options" => "옵션",
 "Applicable" => "적용 가능",
-"Add mount point" => "마운트 지점 추가",
 "None set" => "설정되지 않음",
 "All Users" => "모든 사용자",
 "Groups" => "그룹",
diff --git a/apps/files_external/l10n/ku_IQ.php b/apps/files_external/l10n/ku_IQ.php
index c614168d773376d802f17789c1757cb4c211e0b3..59eabb36c9ffd7f5779582ff862c0ff9723ee4ea 100644
--- a/apps/files_external/l10n/ku_IQ.php
+++ b/apps/files_external/l10n/ku_IQ.php
@@ -1,3 +1,4 @@
 <?php $TRANSLATIONS = array(
+"Folder name" => "ناوی بوخچه",
 "Users" => "به‌كارهێنه‌ر"
 );
diff --git a/apps/files_external/l10n/lb.php b/apps/files_external/l10n/lb.php
index 7cbfaea6a57f851b2f1d96ca166dc103d220a6f7..2a62cad3fe90c3a6e2e97a7de790f5faf8ef0958 100644
--- a/apps/files_external/l10n/lb.php
+++ b/apps/files_external/l10n/lb.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"Folder name" => "Dossiers Numm:",
 "Groups" => "Gruppen",
 "Delete" => "Läschen"
 );
diff --git a/apps/files_external/l10n/lt_LT.php b/apps/files_external/l10n/lt_LT.php
index cdb168dd38515e081f5f87921aea5f64e20a4bf2..f7dca99ef654bb245aaf65135c2e4977990c4e3b 100644
--- a/apps/files_external/l10n/lt_LT.php
+++ b/apps/files_external/l10n/lt_LT.php
@@ -2,16 +2,13 @@
 "Access granted" => "Priėjimas suteiktas",
 "Error configuring Dropbox storage" => "Klaida nustatinėjant Dropbox talpyklą",
 "Grant access" => "Suteikti priėjimą",
-"Fill out all required fields" => "Užpildykite visus reikalingus laukelius",
 "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ą",
 "External Storage" => "Išorinės saugyklos",
-"Mount point" => "Saugyklos pavadinimas",
-"Backend" => "Posistemės pavadinimas",
+"Folder name" => "Katalogo pavadinimas",
 "Configuration" => "Konfigūracija",
 "Options" => "Nustatymai",
 "Applicable" => "Pritaikyti",
-"Add mount point" => "Pridėti išorinę saugyklą",
 "None set" => "Nieko nepasirinkta",
 "All Users" => "Visi vartotojai",
 "Groups" => "Grupės",
diff --git a/apps/files_external/l10n/lv.php b/apps/files_external/l10n/lv.php
index ee53346fcdeb3e8600539fc3e6666d46a9faed71..b37dbcbdc16adbeeace1cbaf2588e5ce6bec524f 100644
--- a/apps/files_external/l10n/lv.php
+++ b/apps/files_external/l10n/lv.php
@@ -2,18 +2,17 @@
 "Access granted" => "Piešķirta pieeja",
 "Error configuring Dropbox storage" => "Kļūda, konfigurējot Dropbox krātuvi",
 "Grant access" => "Piešķirt pieeju",
-"Fill out all required fields" => "Aizpildīt visus pieprasītos laukus",
 "Please provide a valid Dropbox app key and secret." => "Lūdzu, norādiet derīgu Dropbox lietotnes atslēgu un noslēpumu.",
 "Error configuring Google Drive storage" => "Kļūda, konfigurējot Google Drive krātuvi",
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<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ē.",
 "<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>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ē.",
 "External Storage" => "Ārējā krātuve",
-"Mount point" => "Montēšanas punkts",
-"Backend" => "Aizmugure",
+"Folder name" => "Mapes nosaukums",
+"External storage" => "Ārējā krātuve",
 "Configuration" => "Konfigurācija",
 "Options" => "Opcijas",
 "Applicable" => "Piemērojams",
-"Add mount point" => "Pievienot montēšanas punktu",
+"Add storage" => "Pievienot krātuvi",
 "None set" => "Neviens nav iestatīts",
 "All Users" => "Visi lietotāji",
 "Groups" => "Grupas",
diff --git a/apps/files_external/l10n/mk.php b/apps/files_external/l10n/mk.php
index e3c1e4652b3ff53d9537af9b23da7cc318b240ad..1f1a1c27831fd1a6d97e8f5bb4b23b0c13068082 100644
--- a/apps/files_external/l10n/mk.php
+++ b/apps/files_external/l10n/mk.php
@@ -2,18 +2,15 @@
 "Access granted" => "Пристапот е дозволен",
 "Error configuring Dropbox storage" => "Грешка при конфигурација на Dropbox",
 "Grant access" => "Дозволи пристап",
-"Fill out all required fields" => "Пополни ги сите задолжителни полиња",
 "Please provide a valid Dropbox app key and secret." => "Ве молам доставите валиден Dropbox клуч и тајна лозинка.",
 "Error configuring Google Drive storage" => "Грешка при конфигурација на Google Drive",
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Внимание:</b> \"smbclient\" не е инсталиран. Не е можно монтирање на CIFS/SMB дискови. Замолете го Вашиот систем администратор да го инсталира.",
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>Внимание:</b> Не е овозможена или инсталирани FTP подршка во PHP. Не е можно монтирање на FTP дискови. Замолете го Вашиот систем администратор да го инсталира.",
 "External Storage" => "Надворешно складиште",
-"Mount point" => "Точка на монтирање",
-"Backend" => "Админ",
+"Folder name" => "Име на папка",
 "Configuration" => "Конфигурација",
 "Options" => "Опции",
 "Applicable" => "Применливо",
-"Add mount point" => "Додади точка на монтирање",
 "None set" => "Ништо поставено",
 "All Users" => "Сите корисници",
 "Groups" => "Групи",
diff --git a/apps/files_external/l10n/my_MM.php b/apps/files_external/l10n/my_MM.php
new file mode 100644
index 0000000000000000000000000000000000000000..5acfbb0321e780fbde7413815f045f9ec50a4366
--- /dev/null
+++ b/apps/files_external/l10n/my_MM.php
@@ -0,0 +1,3 @@
+<?php $TRANSLATIONS = array(
+"Users" => "သုံးစွဲသူ"
+);
diff --git a/apps/files_external/l10n/nb_NO.php b/apps/files_external/l10n/nb_NO.php
index 273b40cf8eec029f3b887f06e01b47e234895f24..961ef2b1046bb8833751b47be4a337f77c761371 100644
--- a/apps/files_external/l10n/nb_NO.php
+++ b/apps/files_external/l10n/nb_NO.php
@@ -1,8 +1,21 @@
 <?php $TRANSLATIONS = array(
+"Access granted" => "Tilgang innvilget",
+"Error configuring Dropbox storage" => "Feil ved konfigurering av Dropbox-lagring",
+"Grant access" => "Gi tilgang",
+"External Storage" => "Ekstern lagring",
+"Folder name" => "Mappenavn",
+"External storage" => "Ekstern lagringsplass",
 "Configuration" => "Konfigurasjon",
 "Options" => "Innstillinger",
+"Applicable" => "Anvendelig",
+"Add storage" => "Legg til lagringsplass",
+"None set" => "Ingen valgt",
 "All Users" => "Alle brukere",
 "Groups" => "Grupper",
 "Users" => "Brukere",
-"Delete" => "Slett"
+"Delete" => "Slett",
+"Enable User External Storage" => "Aktiver ekstern lagring for bruker",
+"Allow users to mount their own external storage" => "Tillat brukere å koble til egne eksterne lagringsmedium",
+"SSL root certificates" => "SSL root-sertifikater",
+"Import Root Certificate" => "Importer root-sertifikat"
 );
diff --git a/apps/files_external/l10n/nl.php b/apps/files_external/l10n/nl.php
index 132c8cf3ac2713e6abfbda15fcfc1efe8b91e28c..ad3eda9747fe44c0dda8ef59b8e433a807598ee1 100644
--- a/apps/files_external/l10n/nl.php
+++ b/apps/files_external/l10n/nl.php
@@ -2,18 +2,17 @@
 "Access granted" => "Toegang toegestaan",
 "Error configuring Dropbox storage" => "Fout tijdens het configureren van Dropbox opslag",
 "Grant access" => "Sta toegang toe",
-"Fill out all required fields" => "Vul alle verplichte in",
 "Please provide a valid Dropbox app key and secret." => "Geef een geldige Dropbox key en secret.",
 "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.",
 "External Storage" => "Externe opslag",
-"Mount point" => "Aankoppelpunt",
-"Backend" => "Backend",
+"Folder name" => "Mapnaam",
+"External storage" => "Externe opslag",
 "Configuration" => "Configuratie",
 "Options" => "Opties",
 "Applicable" => "Van toepassing",
-"Add mount point" => "Aankoppelpunt toevoegen",
+"Add storage" => "Toevoegen opslag",
 "None set" => "Niets ingesteld",
 "All Users" => "Alle gebruikers",
 "Groups" => "Groepen",
diff --git a/apps/files_external/l10n/pl.php b/apps/files_external/l10n/pl.php
index 0da31bb6b4ac11962cf8d3f44303ccf23c5ca942..cd1b1fe84a1f4145a50bd3ba44a5b9d7c68c11f3 100644
--- a/apps/files_external/l10n/pl.php
+++ b/apps/files_external/l10n/pl.php
@@ -2,18 +2,17 @@
 "Access granted" => "Dostęp do",
 "Error configuring Dropbox storage" => "Wystąpił błąd podczas konfigurowania zasobu Dropbox",
 "Grant access" => "Udziel dostępu",
-"Fill out all required fields" => "Wypełnij wszystkie wymagane pola",
 "Please provide a valid Dropbox app key and secret." => "Proszę podać prawidłowy klucz aplikacji Dropbox i klucz sekretny.",
 "Error configuring Google Drive storage" => "Wystąpił błąd podczas konfigurowania zasobu Google Drive",
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Ostrzeżenie:</b> \"smbclient\" nie jest zainstalowany. Zamontowanie katalogów CIFS/SMB nie jest możliwe. Skontaktuj sie z administratorem w celu zainstalowania.",
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>Ostrzeżenie:</b> Wsparcie dla FTP w PHP nie jest zainstalowane lub włączone.  Skontaktuj sie z administratorem w celu zainstalowania lub włączenia go.",
 "External Storage" => "Zewnętrzna zasoby dyskowe",
-"Mount point" => "Punkt montowania",
-"Backend" => "Zaplecze",
+"Folder name" => "Nazwa folderu",
+"External storage" => "Zewnętrzne zasoby dyskowe",
 "Configuration" => "Konfiguracja",
 "Options" => "Opcje",
 "Applicable" => "Zastosowanie",
-"Add mount point" => "Dodaj punkt montowania",
+"Add storage" => "Dodaj zasoby dyskowe",
 "None set" => "Nie ustawione",
 "All Users" => "Wszyscy uzytkownicy",
 "Groups" => "Grupy",
diff --git a/apps/files_external/l10n/pt_BR.php b/apps/files_external/l10n/pt_BR.php
index 85393954886e39ab7d659d99169dee7edf6f5e8f..a358d56913916cff5bdeddc883acf765aba20a30 100644
--- a/apps/files_external/l10n/pt_BR.php
+++ b/apps/files_external/l10n/pt_BR.php
@@ -2,18 +2,17 @@
 "Access granted" => "Acesso concedido",
 "Error configuring Dropbox storage" => "Erro ao configurar armazenamento do Dropbox",
 "Grant access" => "Permitir acesso",
-"Fill out all required fields" => "Preencha todos os campos obrigatórios",
 "Please provide a valid Dropbox app key and secret." => "Por favor forneça um app key e secret válido do Dropbox",
 "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. Não será possí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. Não será possível montar compartilhamentos FTP. Por favor, peça ao seu administrador do sistema para instalá-lo.",
+"<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.",
 "External Storage" => "Armazenamento Externo",
-"Mount point" => "Ponto de montagem",
-"Backend" => "Backend",
+"Folder name" => "Nome da pasta",
+"External storage" => "Armazenamento Externo",
 "Configuration" => "Configuração",
 "Options" => "Opções",
 "Applicable" => "Aplicável",
-"Add mount point" => "Adicionar ponto de montagem",
+"Add storage" => "Adicionar Armazenamento",
 "None set" => "Nenhum definido",
 "All Users" => "Todos os Usuários",
 "Groups" => "Grupos",
diff --git a/apps/files_external/l10n/pt_PT.php b/apps/files_external/l10n/pt_PT.php
index 06dbc0cf6bd15cdfea768e35f14333ff6b96abd2..aac3c1c2ca0779e1ca00f13a17a6d3fd986e82e0 100644
--- a/apps/files_external/l10n/pt_PT.php
+++ b/apps/files_external/l10n/pt_PT.php
@@ -2,23 +2,22 @@
 "Access granted" => "Acesso autorizado",
 "Error configuring Dropbox storage" => "Erro ao configurar o armazenamento do Dropbox",
 "Grant access" => "Conceder acesso",
-"Fill out all required fields" => "Preencha todos os campos obrigatórios",
 "Please provide a valid Dropbox app key and secret." => "Por favor forneça uma \"app key\" e \"secret\" do Dropbox válidas.",
 "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>Aviso:</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> \"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.",
 "External Storage" => "Armazenamento Externo",
-"Mount point" => "Ponto de montagem",
-"Backend" => "Backend",
+"Folder name" => "Nome da pasta",
+"External storage" => "Armazenamento Externo",
 "Configuration" => "Configuração",
 "Options" => "Opções",
 "Applicable" => "Aplicável",
-"Add mount point" => "Adicionar ponto de montagem",
-"None set" => "Nenhum configurado",
+"Add storage" => "Adicionar armazenamento",
+"None set" => "Não definido",
 "All Users" => "Todos os utilizadores",
 "Groups" => "Grupos",
 "Users" => "Utilizadores",
-"Delete" => "Apagar",
+"Delete" => "Eliminar",
 "Enable User External Storage" => "Activar Armazenamento Externo para o Utilizador",
 "Allow users to mount their own external storage" => "Permitir que os utilizadores montem o seu próprio armazenamento externo",
 "SSL root certificates" => "Certificados SSL de raiz",
diff --git a/apps/files_external/l10n/ro.php b/apps/files_external/l10n/ro.php
index ca2c9f7e5c8c0eda8e01380f9b5fd7e5569b2272..5747205dc0590730806b6e5a0bff56918f86dc26 100644
--- a/apps/files_external/l10n/ro.php
+++ b/apps/files_external/l10n/ro.php
@@ -2,18 +2,15 @@
 "Access granted" => "Acces permis",
 "Error configuring Dropbox storage" => "Eroare la configurarea mediului de stocare Dropbox",
 "Grant access" => "Permite accesul",
-"Fill out all required fields" => "Completează toate câmpurile necesare",
 "Please provide a valid Dropbox app key and secret." => "Prezintă te rog o cheie de Dropbox validă și parola",
 "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.",
 "External Storage" => "Stocare externă",
-"Mount point" => "Punctul de montare",
-"Backend" => "Backend",
+"Folder name" => "Denumire director",
 "Configuration" => "Configurație",
 "Options" => "Opțiuni",
 "Applicable" => "Aplicabil",
-"Add mount point" => "Adaugă punct de montare",
 "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 b8b5f5b1cb2add548662c7bc8906f2c8863c7612..46b73a67f046d8bc53d8eaf4c29d0e5500821ff7 100644
--- a/apps/files_external/l10n/ru.php
+++ b/apps/files_external/l10n/ru.php
@@ -2,18 +2,17 @@
 "Access granted" => "Доступ предоставлен",
 "Error configuring Dropbox storage" => "Ошибка при настройке хранилища Dropbox",
 "Grant access" => "Предоставление доступа",
-"Fill out all required fields" => "Заполните все обязательные поля",
 "Please provide a valid Dropbox app key and secret." => "Пожалуйста, предоставьте действующий ключ Dropbox и пароль.",
 "Error configuring Google Drive storage" => "Ошибка при настройке хранилища Google Drive",
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Внимание:</b> \"smbclient\" не установлен. Подключение по CIFS/SMB невозможно. Пожалуйста, обратитесь к системному администратору, чтобы установить его.",
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>Внимание:</b> Поддержка FTP не включена в PHP. Подключение по FTP невозможно. Пожалуйста, обратитесь к системному администратору, чтобы включить.",
 "External Storage" => "Внешний носитель",
-"Mount point" => "Точка монтирования",
-"Backend" => "Подсистема",
+"Folder name" => "Имя папки",
+"External storage" => "Внешний носитель данных",
 "Configuration" => "Конфигурация",
 "Options" => "Опции",
 "Applicable" => "Применимый",
-"Add mount point" => "Добавить точку монтирования",
+"Add storage" => "Добавить носитель данных",
 "None set" => "Не установлено",
 "All Users" => "Все пользователи",
 "Groups" => "Группы",
diff --git a/apps/files_external/l10n/ru_RU.php b/apps/files_external/l10n/ru_RU.php
index e539b3cb2cf5b8368f02029367eed46b92d138a5..406e284b2781734bdcdde8fb67bf3c99845057a9 100644
--- a/apps/files_external/l10n/ru_RU.php
+++ b/apps/files_external/l10n/ru_RU.php
@@ -2,18 +2,15 @@
 "Access granted" => "Доступ разрешен",
 "Error configuring Dropbox storage" => "Ошибка при конфигурировании хранилища Dropbox",
 "Grant access" => "Предоставить доступ",
-"Fill out all required fields" => "Заполните все требуемые поля",
 "Please provide a valid Dropbox app key and secret." => "Пожалуйста представьте допустимый ключ приложения Dropbox и пароль.",
 "Error configuring Google Drive storage" => "Ошибка настройки хранилища Google Drive",
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Предупреждение:</b> \"smbclient\" не установлен. Подключение общих папок CIFS/SMB невозможно. Пожалуйста, обратитесь к системному администратору, чтобы установить его.",
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>Предупреждение:</b> Поддержка FTP в PHP не включена или не установлена. Подключение по FTP невозможно. Пожалуйста, обратитесь к системному администратору, чтобы установить ее.",
 "External Storage" => "Внешние системы хранения данных",
-"Mount point" => "Точка монтирования",
-"Backend" => "Бэкэнд",
+"Folder name" => "Имя папки",
 "Configuration" => "Конфигурация",
 "Options" => "Опции",
 "Applicable" => "Применимый",
-"Add mount point" => "Добавить точку монтирования",
 "None set" => "Не задан",
 "All Users" => "Все пользователи",
 "Groups" => "Группы",
diff --git a/apps/files_external/l10n/si_LK.php b/apps/files_external/l10n/si_LK.php
index b8e2c5714b3f3d6555578425ceef2fbf1999c80c..cc9cb9b9ce50084b2bb06281e90782e5c9df89c9 100644
--- a/apps/files_external/l10n/si_LK.php
+++ b/apps/files_external/l10n/si_LK.php
@@ -2,16 +2,13 @@
 "Access granted" => "පිවිසීමට හැක",
 "Error configuring Dropbox storage" => "Dropbox ගබඩාව වින්‍යාස කිරීමේ දෝශයක් ඇත",
 "Grant access" => "පිවිසුම ලබාදෙන්න",
-"Fill out all required fields" => "අත්‍යාවශ්‍ය තොරතුරු සියල්ල සම්පුර්ණ කරන්න",
 "Please provide a valid Dropbox app key and secret." => "කරුණාකර වලංගු Dropbox යෙදුම් යතුරක් හා රහසක් ලබාදෙන්න.",
 "Error configuring Google Drive storage" => "Google Drive ගබඩාව වින්‍යාස කිරීමේ දෝශයක් ඇත",
 "External Storage" => "භාහිර ගබඩාව",
-"Mount point" => "මවුන්ට් කළ ස්ථානය",
-"Backend" => "පසු පද්ධතිය",
+"Folder name" => "ෆොල්ඩරයේ නම",
 "Configuration" => "වින්‍යාසය",
 "Options" => "විකල්පයන්",
 "Applicable" => "අදාළ",
-"Add mount point" => "මවුන්ට් කරන ස්ථානයක් එකතු කරන්න",
 "None set" => "කිසිවක් නැත",
 "All Users" => "සියළු පරිශීලකයන්",
 "Groups" => "කණ්ඩායම්",
diff --git a/apps/files_external/l10n/sk_SK.php b/apps/files_external/l10n/sk_SK.php
index d464d192ffca90737a17fa1a0e8064ccbe62e156..af6b7b4ae6e2bb3fd4a6489735f0c7fda3ca8b4d 100644
--- a/apps/files_external/l10n/sk_SK.php
+++ b/apps/files_external/l10n/sk_SK.php
@@ -2,18 +2,17 @@
 "Access granted" => "Prístup povolený",
 "Error configuring Dropbox storage" => "Chyba pri konfigurácii úložiska Dropbox",
 "Grant access" => "Povoliť prístup",
-"Fill out all required fields" => "Vyplňte všetky vyžadované kolónky",
 "Please provide a valid Dropbox app key and secret." => "Zadajte platný kľúč aplikácie a heslo Dropbox",
 "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.",
 "External Storage" => "Externé úložisko",
-"Mount point" => "Prípojný bod",
-"Backend" => "Backend",
+"Folder name" => "Meno priečinka",
+"External storage" => "Externé úložisko",
 "Configuration" => "Nastavenia",
 "Options" => "Možnosti",
 "Applicable" => "Aplikovateľné",
-"Add mount point" => "Pridať prípojný bod",
+"Add storage" => "Pridať úložisko",
 "None set" => "Žiadne nastavené",
 "All Users" => "Všetci používatelia",
 "Groups" => "Skupiny",
diff --git a/apps/files_external/l10n/sl.php b/apps/files_external/l10n/sl.php
index f0db66ded963e1cad1c76791e820d27983159283..5614c93585adb26bdbb0e87dc76904470d0a2751 100644
--- a/apps/files_external/l10n/sl.php
+++ b/apps/files_external/l10n/sl.php
@@ -2,18 +2,15 @@
 "Access granted" => "Dostop je odobren",
 "Error configuring Dropbox storage" => "Napaka nastavljanja shrambe Dropbox",
 "Grant access" => "Odobri dostop",
-"Fill out all required fields" => "Zapolni vsa zahtevana polja",
 "Please provide a valid Dropbox app key and secret." => "Vpišite 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.",
 "External Storage" => "Zunanja podatkovna shramba",
-"Mount point" => "Priklopna točka",
-"Backend" => "Zaledje",
+"Folder name" => "Ime mape",
 "Configuration" => "Nastavitve",
 "Options" => "Možnosti",
 "Applicable" => "Se uporablja",
-"Add mount point" => "Dodaj priklopno točko",
 "None set" => "Ni nastavljeno",
 "All Users" => "Vsi uporabniki",
 "Groups" => "Skupine",
diff --git a/apps/files_external/l10n/sv.php b/apps/files_external/l10n/sv.php
index 0d42a1f4682c163c7f8c010016ba230e33a6d623..45d3589228f614f483049cbd0faa2a3c102af7f2 100644
--- a/apps/files_external/l10n/sv.php
+++ b/apps/files_external/l10n/sv.php
@@ -2,18 +2,17 @@
 "Access granted" => "Åtkomst beviljad",
 "Error configuring Dropbox storage" => "Fel vid konfigurering av Dropbox",
 "Grant access" => "Bevilja åtkomst",
-"Fill out all required fields" => "Fyll i alla obligatoriska fält",
 "Please provide a valid Dropbox app key and secret." => "Ange en giltig Dropbox nyckel och hemlighet.",
 "Error configuring Google Drive storage" => "Fel vid konfigurering av Google Drive",
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Varning:</b> \"smb-klienten\" är inte installerad. Montering av CIFS/SMB delningar är inte möjligt. Kontakta din systemadministratör för att få den installerad.",
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>Varning:</b> Stöd för FTP i PHP är inte aktiverat eller installerat. Montering av FTP-delningar är inte möjligt. Kontakta din systemadministratör för att få det installerat.",
 "External Storage" => "Extern lagring",
-"Mount point" => "Monteringspunkt",
-"Backend" => "Källa",
+"Folder name" => "Mappnamn",
+"External storage" => "Extern lagring",
 "Configuration" => "Konfiguration",
 "Options" => "Alternativ",
 "Applicable" => "Tillämplig",
-"Add mount point" => "Lägg till monteringspunkt",
+"Add storage" => "Lägg till lagring",
 "None set" => "Ingen angiven",
 "All Users" => "Alla användare",
 "Groups" => "Grupper",
diff --git a/apps/files_external/l10n/ta_LK.php b/apps/files_external/l10n/ta_LK.php
index 1e01b22efa00a75d9b7e220547dc82a514d11794..cee3b6edb8a2b669287a99296b232c942e17c651 100644
--- a/apps/files_external/l10n/ta_LK.php
+++ b/apps/files_external/l10n/ta_LK.php
@@ -2,16 +2,13 @@
 "Access granted" => "அனுமதி வழங்கப்பட்டது",
 "Error configuring Dropbox storage" => "Dropbox சேமிப்பை தகவமைப்பதில் வழு",
 "Grant access" => "அனுமதியை வழங்கல்",
-"Fill out all required fields" => "தேவையான எல்லா புலங்களையும் நிரப்புக",
 "Please provide a valid Dropbox app key and secret." => "தயவுசெய்து ஒரு செல்லுபடியான Dropbox செயலி சாவி மற்றும் இரகசியத்தை வழங்குக. ",
 "Error configuring Google Drive storage" => "Google இயக்க சேமிப்பகத்தை தகமைப்பதில் வழு",
 "External Storage" => "வெளி சேமிப்பு",
-"Mount point" => "ஏற்றப்புள்ளி",
-"Backend" => "பின்நிலை",
+"Folder name" => "கோப்புறை பெயர்",
 "Configuration" => "தகவமைப்பு",
 "Options" => "தெரிவுகள்",
 "Applicable" => "பயன்படத்தக்க",
-"Add mount point" => "ஏற்றப்புள்ளியை சேர்க்க",
 "None set" => "தொகுப்பில்லா",
 "All Users" => "பயனாளர்கள் எல்லாம்",
 "Groups" => "குழுக்கள்",
diff --git a/apps/files_external/l10n/th_TH.php b/apps/files_external/l10n/th_TH.php
index 870995c8e7a111b29725c696f7b8a7e62531c4c2..2f733eab9e8f4efca77ffada056b5a28167bb900 100644
--- a/apps/files_external/l10n/th_TH.php
+++ b/apps/files_external/l10n/th_TH.php
@@ -2,18 +2,15 @@
 "Access granted" => "การเข้าถึงได้รับอนุญาตแล้ว",
 "Error configuring Dropbox storage" => "เกิดข้อผิดพลาดในการกำหนดค่าพื้นที่จัดเก็บข้อมูล Dropbox",
 "Grant access" => "อนุญาตให้เข้าถึงได้",
-"Fill out all required fields" => "กรอกข้อมูลในช่องข้อมูลที่จำเป็นต้องกรอกทั้งหมด",
 "Please provide a valid Dropbox app key and secret." => "กรุณากรอกรหัส app key ของ Dropbox และรหัสลับ",
 "Error configuring Google Drive storage" => "เกิดข้อผิดพลาดในการกำหนดค่าการจัดเก็บข้อมูลในพื้นที่ของ Google Drive",
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>คำเตือน:</b> \"smbclient\" ยังไม่ได้ถูกติดตั้ง. การชี้ CIFS/SMB เพื่อแชร์ข้อมูลไม่สามารถกระทำได้ กรุณาสอบถามข้อมูลเพิ่มเติมจากผู้ดูแลระบบเพื่อติดตั้ง.",
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>คำเตือน:</b> การสนับสนุนการใช้งาน FTP ในภาษา PHP ยังไม่ได้ถูกเปิดใช้งานหรือถูกติดตั้ง. การชี้ FTP เพื่อแชร์ข้อมูลไม่สามารถดำเนินการได้ กรุณาสอบถามข้อมูลเพิ่มเติมจากผู้ดูแลระบบเพื่อติดตั้ง",
 "External Storage" => "พื้นทีจัดเก็บข้อมูลจากภายนอก",
-"Mount point" => "จุดชี้ตำแหน่ง",
-"Backend" => "ด้านหลังระบบ",
+"Folder name" => "ชื่อโฟลเดอร์",
 "Configuration" => "การกำหนดค่า",
 "Options" => "ตัวเลือก",
 "Applicable" => "สามารถใช้งานได้",
-"Add mount point" => "เพิ่มจุดชี้ตำแหน่ง",
 "None set" => "ยังไม่มีการกำหนด",
 "All Users" => "ผู้ใช้งานทั้งหมด",
 "Groups" => "กลุ่ม",
diff --git a/apps/files_external/l10n/tr.php b/apps/files_external/l10n/tr.php
index e9a045aab572b6749197bd27e2093387ad403181..cddb2b35e03e4ca2d1311a9d5c65d33f39a9a0e0 100644
--- a/apps/files_external/l10n/tr.php
+++ b/apps/files_external/l10n/tr.php
@@ -1,16 +1,19 @@
 <?php $TRANSLATIONS = array(
+"Access granted" => "Giriş kabul edildi",
+"Grant access" => "Erişim sağlandı",
+"Please provide a valid Dropbox app key and secret." => "Lütfen Dropbox app key ve secret temin ediniz",
 "External Storage" => "Harici Depolama",
-"Mount point" => "Bağlama Noktası",
-"Backend" => "Yönetici",
+"Folder name" => "Dizin ismi",
 "Configuration" => "Yapılandırma",
 "Options" => "Seçenekler",
 "Applicable" => "Uygulanabilir",
-"Add mount point" => "Bağlama noktası ekle",
 "None set" => "Hiçbiri",
 "All Users" => "Tüm Kullanıcılar",
 "Groups" => "Gruplar",
 "Users" => "Kullanıcılar",
 "Delete" => "Sil",
+"Enable User External Storage" => "Kullanıcılar için Harici Depolamayı Etkinleştir",
+"Allow users to mount their own external storage" => "Kullanıcıların kendi harici depolamalarını bağlamalarına izin ver",
 "SSL root certificates" => "SSL kök sertifikaları",
 "Import Root Certificate" => "Kök Sertifikalarını İçe Aktar"
 );
diff --git a/apps/files_external/l10n/uk.php b/apps/files_external/l10n/uk.php
index 56169171f64ccf64611ceea23669cedf66342ec9..34d19af0ee94ac061e583979c4dc7ba9521fb3a8 100644
--- a/apps/files_external/l10n/uk.php
+++ b/apps/files_external/l10n/uk.php
@@ -2,18 +2,17 @@
 "Access granted" => "Доступ дозволено",
 "Error configuring Dropbox storage" => "Помилка при налаштуванні сховища Dropbox",
 "Grant access" => "Дозволити доступ",
-"Fill out all required fields" => "Заповніть всі обов'язкові поля",
 "Please provide a valid Dropbox app key and secret." => "Будь ласка, надайте дійсний ключ та пароль Dropbox.",
 "Error configuring Google Drive storage" => "Помилка при налаштуванні сховища Google Drive",
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Попередження:</b> Клієнт \"smbclient\" не встановлено. Під'єднанатися до CIFS/SMB тек неможливо. Попрохайте системного адміністратора встановити його.",
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>Попередження:</b> Підтримка FTP в PHP не увімкнута чи не встановлена. Під'єднанатися до FTP тек неможливо. Попрохайте системного адміністратора встановити її.",
 "External Storage" => "Зовнішні сховища",
-"Mount point" => "Точка монтування",
-"Backend" => "Backend",
+"Folder name" => "Ім'я теки",
+"External storage" => "Зовнішнє сховище",
 "Configuration" => "Налаштування",
 "Options" => "Опції",
 "Applicable" => "Придатний",
-"Add mount point" => "Додати точку монтування",
+"Add storage" => "Додати сховище",
 "None set" => "Не встановлено",
 "All Users" => "Усі користувачі",
 "Groups" => "Групи",
diff --git a/apps/files_external/l10n/ur_PK.php b/apps/files_external/l10n/ur_PK.php
new file mode 100644
index 0000000000000000000000000000000000000000..278357b4d68c5ec2cb0ed08de2979f0c75aeacb1
--- /dev/null
+++ b/apps/files_external/l10n/ur_PK.php
@@ -0,0 +1,3 @@
+<?php $TRANSLATIONS = array(
+"Users" => "یوزرز"
+);
diff --git a/apps/files_external/l10n/vi.php b/apps/files_external/l10n/vi.php
index c522c669e1eae0b0822f5ba7fb64ef117cf2ac15..84f31e88924a8fafd610a0e98f68077b778406ad 100644
--- a/apps/files_external/l10n/vi.php
+++ b/apps/files_external/l10n/vi.php
@@ -2,18 +2,15 @@
 "Access granted" => "Đã cấp quyền truy cập",
 "Error configuring Dropbox storage" => "Lỗi cấu hình lưu trữ Dropbox ",
 "Grant access" => "Cấp quyền truy cập",
-"Fill out all required fields" => "Điền vào tất cả các trường bắt buộc",
 "Please provide a valid Dropbox app key and secret." => "Xin vui lòng cung cấp một ứng dụng Dropbox hợp lệ và mã bí mật.",
 "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ó.",
 "External Storage" => "Lưu trữ ngoài",
-"Mount point" => "Điểm gắn",
-"Backend" => "phụ trợ",
+"Folder name" => "Tên thư mục",
 "Configuration" => "Cấu hình",
 "Options" => "Tùy chọn",
 "Applicable" => "Áp dụng",
-"Add mount point" => "Thêm điểm lắp",
 "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 47983d3d7d4b93841c7d00e1bc7ed8c4ab89b7fa..74b9e3cad8134419b79993227992135b41cf5e93 100644
--- a/apps/files_external/l10n/zh_CN.GB2312.php
+++ b/apps/files_external/l10n/zh_CN.GB2312.php
@@ -2,16 +2,13 @@
 "Access granted" => "已授予权限",
 "Error configuring Dropbox storage" => "配置 Dropbox 存储出错",
 "Grant access" => "授予权限",
-"Fill out all required fields" => "填充全部必填字段",
 "Please provide a valid Dropbox app key and secret." => "请提供一个有效的 Dropbox app key 和 secret。",
 "Error configuring Google Drive storage" => "配置 Google Drive 存储失败",
 "External Storage" => "外部存储",
-"Mount point" => "挂载点",
-"Backend" => "后端",
+"Folder name" => "文件夹名",
 "Configuration" => "配置",
 "Options" => "选项",
 "Applicable" => "可应用",
-"Add mount point" => "添加挂载点",
 "None set" => "未设置",
 "All Users" => "所有用户",
 "Groups" => "群组",
diff --git a/apps/files_external/l10n/zh_CN.php b/apps/files_external/l10n/zh_CN.php
index 1bb88564630c7e54900a5ad5c0ce8aa9be2c2b8f..1860b6f70d71506eb2b75e34d7b16f6e32b6c3b5 100644
--- a/apps/files_external/l10n/zh_CN.php
+++ b/apps/files_external/l10n/zh_CN.php
@@ -2,18 +2,15 @@
 "Access granted" => "权限已授予。",
 "Error configuring Dropbox storage" => "配置Dropbox存储时出错",
 "Grant access" => "授权",
-"Fill out all required fields" => "完成所有必填项",
 "Please provide a valid Dropbox app key and secret." => "请提供有效的Dropbox应用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>“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 分享挂载无法实现。请咨询系统管理员进行安装。",
 "External Storage" => "外部存储",
-"Mount point" => "挂载点",
-"Backend" => "后端",
+"Folder name" => "目录名称",
 "Configuration" => "配置",
 "Options" => "选项",
 "Applicable" => "适用的",
-"Add mount point" => "增加挂载点",
 "None set" => "未设置",
 "All Users" => "所有用户",
 "Groups" => "组",
diff --git a/apps/files_external/l10n/zh_TW.php b/apps/files_external/l10n/zh_TW.php
index ab8c4caf24a480f2756b3370c9fb1edaca002a55..512a151a3c88b3c9756f725f832564419a0b2513 100644
--- a/apps/files_external/l10n/zh_TW.php
+++ b/apps/files_external/l10n/zh_TW.php
@@ -1,6 +1,6 @@
 <?php $TRANSLATIONS = array(
 "External Storage" => "外部儲存裝置",
-"Mount point" => "掛載點",
+"Folder name" => "資料夾名稱",
 "None set" => "尚未設定",
 "All Users" => "所有使用者",
 "Groups" => "群組",
diff --git a/apps/files_external/lib/amazons3.php b/apps/files_external/lib/amazons3.php
index 494885a1dd3f3d1d69a097730d8fc1a3ab40885f..7bcefd4176c94ac9da2e6a690c34a4a7b09cd98e 100644
--- a/apps/files_external/lib/amazons3.php
+++ b/apps/files_external/lib/amazons3.php
@@ -33,12 +33,16 @@ class AmazonS3 extends \OC\Files\Storage\Common {
 
 	private static $tempFiles = array();
 
-	// TODO options: storage class, encryption server side, encrypt before upload?
+	// TODO Update to new AWS SDK
 
 	public function __construct($params) {
-		$this->id = 'amazon::' . $params['key'] . md5($params['secret']);
-		$this->s3 = new \AmazonS3(array('key' => $params['key'], 'secret' => $params['secret']));
-		$this->bucket = $params['bucket'];
+		if (isset($params['key']) && isset($params['secret']) && isset($params['bucket'])) {
+			$this->id = 'amazon::' . $params['key'] . md5($params['secret']);
+			$this->s3 = new \AmazonS3(array('key' => $params['key'], 'secret' => $params['secret']));
+			$this->bucket = $params['bucket'];
+		} else {
+			throw new \Exception();
+		}
 	}
 
 	private function getObject($path) {
@@ -229,11 +233,6 @@ class AmazonS3 extends \OC\Files\Storage\Common {
 		return false;
 	}
 
-	public function free_space($path) {
-		// Infinite?
-		return false;
-	}
-
 	public function touch($path, $mtime = null) {
 		if (is_null($mtime)) {
 			$mtime = time();
@@ -245,4 +244,12 @@ class AmazonS3 extends \OC\Files\Storage\Common {
 		return $response->isOK();
 	}
 
+	public function test() {
+		$test = $this->s3->get_canonical_user_id();
+		if (isset($test['id']) && $test['id'] != '') {
+			return true;
+		}
+		return false;
+	}
+
 }
diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php
index 44e668a09c012adb52ec65046bec26210f282902..430269e03d9061f82bc98fa92ae6823251a33cf8 100755
--- a/apps/files_external/lib/config.php
+++ b/apps/files_external/lib/config.php
@@ -38,7 +38,7 @@ class OC_Mount_Config {
 	* @return array
 	*/
 	public static function getBackends() {
-		
+
 		$backends['\OC\Files\Storage\Local']=array(
 				'backend' => 'Local',
 				'configuration' => array(
@@ -77,7 +77,7 @@ class OC_Mount_Config {
 				'token' => '#token',
 				'token_secret' => '#token secret'),
 				'custom' => 'google');
-		
+
 		$backends['\OC\Files\Storage\SWIFT']=array(
 			'backend' => 'OpenStack Swift',
 			'configuration' => array(
@@ -86,7 +86,7 @@ class OC_Mount_Config {
 				'token' => '*Token',
 				'root' => '&Root',
 				'secure' => '!Secure ftps://'));
-							
+
 		if(OC_Mount_Config::checksmbclient()) $backends['\OC\Files\Storage\SMB']=array(
 			'backend' => 'SMB / CIFS',
 			'configuration' => array(
@@ -95,7 +95,7 @@ class OC_Mount_Config {
 				'password' => '*Password',
 				'share' => 'Share',
 				'root' => '&Root'));
-				
+
 		$backends['\OC\Files\Storage\DAV']=array(
 			'backend' => 'ownCloud / WebDAV',
 			'configuration' => array(
@@ -104,13 +104,13 @@ class OC_Mount_Config {
 				'password' => '*Password',
 				'root' => '&Root',
 				'secure' => '!Secure https://'));
-				
+
 		$backends['\OC\Files\Storage\SFTP']=array(
 			'backend' => 'SFTP',
 			'configuration' => array(
 				'host' => 'URL',
-				'user' => 'Username', 
-				'password' => '*Password', 
+				'user' => 'Username',
+				'password' => '*Password',
 				'root' => '&Root'));
 
 		return($backends);
@@ -143,7 +143,9 @@ class OC_Mount_Config {
 							'class' => $mount['class'],
 							'backend' => $backends[$mount['class']]['backend'],
 							'configuration' => $mount['options'],
-							'applicable' => array('groups' => array($group), 'users' => array()));
+							'applicable' => array('groups' => array($group), 'users' => array()),
+							'status' => self::getBackendStatus($mount['class'], $mount['options'])
+						);
 					}
 				}
 			}
@@ -162,10 +164,13 @@ class OC_Mount_Config {
 						$system[$mountPoint]['applicable']['users']
 							= array_merge($system[$mountPoint]['applicable']['users'], array($user));
 					} else {
-						$system[$mountPoint] = array('class' => $mount['class'],
+						$system[$mountPoint] = array(
+							'class' => $mount['class'],
 							'backend' => $backends[$mount['class']]['backend'],
 							'configuration' => $mount['options'],
-							'applicable' => array('groups' => array(), 'users' => array($user)));
+							'applicable' => array('groups' => array(), 'users' => array($user)),
+							'status' => self::getBackendStatus($mount['class'], $mount['options'])
+						);
 					}
 				}
 			}
@@ -190,14 +195,32 @@ class OC_Mount_Config {
 					$mount['class'] = '\OC\Files\Storage\\'.substr($mount['class'], 15);
 				}
 				// Remove '/uid/files/' from mount point
-				$personal[substr($mountPoint, strlen($uid) + 8)] = array('class' => $mount['class'],
-																'backend' => $backends[$mount['class']]['backend'],
-																'configuration' => $mount['options']);
+				$personal[substr($mountPoint, strlen($uid) + 8)] = array(
+					'class' => $mount['class'],
+					'backend' => $backends[$mount['class']]['backend'],
+					'configuration' => $mount['options'],
+					'status' => self::getBackendStatus($mount['class'], $mount['options'])
+				);
 			}
 		}
 		return $personal;
 	}
 
+	private static function getBackendStatus($class, $options) {
+		foreach ($options as &$option) {
+			$option = str_replace('$user', OCP\User::getUser(), $option);
+		}
+		if (class_exists($class)) {
+			try {
+				$storage = new $class($options);
+				return $storage->test();
+			} catch (Exception $exception) {
+				return false;
+			}
+		}
+		return false;
+	}
+
 	/**
 	* Add a mount point to the filesystem
 	* @param string Mount point
@@ -238,7 +261,7 @@ class OC_Mount_Config {
 			$mountPoints[$mountType] = $mount;
 		}
 		self::writeData($isPersonal, $mountPoints);
-		return true;
+		return self::getBackendStatus($class, $classOptions);
 	}
 
 	/**
@@ -279,13 +302,21 @@ class OC_Mount_Config {
 	* @return array
 	*/
 	private static function readData($isPersonal) {
+		$parser = new \OC\ArrayParser();
 		if ($isPersonal) {
-			$file = OC_User::getHome(OCP\User::getUser()).'/mount.php';
+			$phpFile = OC_User::getHome(OCP\User::getUser()).'/mount.php';
+			$jsonFile = OC_User::getHome(OCP\User::getUser()).'/mount.json';
 		} else {
-			$file = OC::$SERVERROOT.'/config/mount.php';
+			$phpFile = OC::$SERVERROOT.'/config/mount.php';
+			$jsonFile = OC::$SERVERROOT.'/config/mount.json';
 		}
-		if (is_file($file)) {
-			$mountPoints = include $file;
+		if (is_file($jsonFile)) {
+			$mountPoints = json_decode(file_get_contents($jsonFile), true);
+			if (is_array($mountPoints)) {
+				return $mountPoints;
+			}
+		} elseif (is_file($phpFile)) {
+			$mountPoints = $parser->parsePHP(file_get_contents($phpFile));
 			if (is_array($mountPoints)) {
 				return $mountPoints;
 			}
@@ -300,35 +331,11 @@ class OC_Mount_Config {
 	*/
 	private static function writeData($isPersonal, $data) {
 		if ($isPersonal) {
-			$file = OC_User::getHome(OCP\User::getUser()).'/mount.php';
+			$file = OC_User::getHome(OCP\User::getUser()).'/mount.json';
 		} else {
-			$file = OC::$SERVERROOT.'/config/mount.php';
+			$file = OC::$SERVERROOT.'/config/mount.json';
 		}
-		$content = "<?php return array (\n";
-		if (isset($data[self::MOUNT_TYPE_GROUP])) {
-			$content .= "\t'group' => array (\n";
-			foreach ($data[self::MOUNT_TYPE_GROUP] as $group => $mounts) {
-				$content .= "\t\t'".$group."' => array (\n";
-				foreach ($mounts as $mountPoint => $mount) {
-					$content .= "\t\t\t'".addcslashes($mountPoint, "'")."' => ".str_replace("\n", '', var_export($mount, true)).", \n";
-
-				}
-				$content .= "\t\t),\n";
-			}
-			$content .= "\t),\n";
-		}
-		if (isset($data[self::MOUNT_TYPE_USER])) {
-			$content .= "\t'user' => array (\n";
-			foreach ($data[self::MOUNT_TYPE_USER] as $user => $mounts) {
-				$content .= "\t\t'".$user."' => array (\n";
-				foreach ($mounts as $mountPoint => $mount) {
-					$content .= "\t\t\t'".addcslashes($mountPoint, "'")."' => ".str_replace("\n", '', var_export($mount, true)).",\n";
-				}
-				$content .= "\t\t),\n";
-			}
-			$content .= "\t),\n";
-		}
-		$content .= ");\n?>";
+		$content = json_encode($data);
 		@file_put_contents($file, $content);
 	}
 
@@ -394,7 +401,7 @@ class OC_Mount_Config {
 	}
 
 	/**
-	 * check if php-ftp is installed 
+	 * check if php-ftp is installed
 	 */
 	public static function checkphpftp() {
 		if(function_exists('ftp_login')) {
@@ -410,8 +417,12 @@ class OC_Mount_Config {
 	public static function checkDependencies() {
 		$l= new OC_L10N('files_external');
 		$txt='';
-		if(!OC_Mount_Config::checksmbclient()) $txt.=$l->t('<b>Warning:</b> "smbclient" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it.').'<br />';
-		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::checksmbclient()) {
+			$txt.=$l->t('<b>Warning:</b> "smbclient" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it.').'<br />';
+		}
+		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 />';
+		}
 
 		return($txt);
 	}
diff --git a/apps/files_external/lib/dropbox.php b/apps/files_external/lib/dropbox.php
index 11644e4a2c8e16519e69ca7041f23c35262a17c5..cb04e557f8a6b2b3c01a26e0a32330bd3c04cd65 100755
--- a/apps/files_external/lib/dropbox.php
+++ b/apps/files_external/lib/dropbox.php
@@ -40,8 +40,8 @@ class Dropbox extends \OC\Files\Storage\Common {
 			&& isset($params['token'])
 			&& isset($params['token_secret'])
 		) {
-			$this->id = 'dropbox::'.$params['app_key'] . $params['token']. '/' . $params['root'];
-			$this->root=isset($params['root'])?$params['root']:'';
+			$this->root = isset($params['root']) ? $params['root'] : '';
+			$this->id = 'dropbox::'.$params['app_key'] . $params['token']. '/' . $this->root;
 			$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');
diff --git a/apps/files_external/lib/ftp.php b/apps/files_external/lib/ftp.php
index 9b6c037bb57e6c6a766466a7a61787d5e04dc6ba..8a7375ebe38730a270ba74ea1f275543e100fffd 100644
--- a/apps/files_external/lib/ftp.php
+++ b/apps/files_external/lib/ftp.php
@@ -18,26 +18,31 @@ class FTP extends \OC\Files\Storage\StreamWrapper{
 	private static $tempFiles=array();
 
 	public function __construct($params) {
-		$this->host=$params['host'];
-		$this->user=$params['user'];
-		$this->password=$params['password'];
-		if (isset($params['secure'])) {
-			if (is_string($params['secure'])) {
-				$this->secure = ($params['secure'] === 'true');
+		if (isset($params['host']) && isset($params['user']) && isset($params['password'])) {
+			$this->host=$params['host'];
+			$this->user=$params['user'];
+			$this->password=$params['password'];
+			if (isset($params['secure'])) {
+				if (is_string($params['secure'])) {
+					$this->secure = ($params['secure'] === 'true');
+				} else {
+					$this->secure = (bool)$params['secure'];
+				}
 			} else {
-				$this->secure = (bool)$params['secure'];
+				$this->secure = false;
+			}
+			$this->root=isset($params['root'])?$params['root']:'/';
+			if ( ! $this->root || $this->root[0]!='/') {
+				$this->root='/'.$this->root;
+			}
+			//create the root folder if necessary
+			if ( ! $this->is_dir('')) {
+				$this->mkdir('');
 			}
 		} else {
-			$this->secure = false;
-		}
-		$this->root=isset($params['root'])?$params['root']:'/';
-		if ( ! $this->root || $this->root[0]!='/') {
-			$this->root='/'.$this->root;
-		}
-		//create the root folder if necesary
-		if ( ! $this->is_dir('')) {
-			$this->mkdir('');
+			throw new \Exception();
 		}
+		
 	}
 
 	public function getId(){
@@ -83,7 +88,7 @@ class FTP extends \OC\Files\Storage\StreamWrapper{
 				} else {
 					$ext='';
 				}
-				$tmpFile=OCP\Files::tmpFile($ext);
+				$tmpFile=\OCP\Files::tmpFile($ext);
 				\OC\Files\Stream\Close::registerCallback($tmpFile, array($this, 'writeBack'));
 				if ($this->file_exists($path)) {
 					$this->getFile($path, $tmpFile);
diff --git a/apps/files_external/lib/google.php b/apps/files_external/lib/google.php
index 7396c7e3f2795dfdaabf3faa22cf6a0904c5bcc1..ec7de3f35709dec0e879dbfd42d3e14f957a70d4 100644
--- a/apps/files_external/lib/google.php
+++ b/apps/files_external/lib/google.php
@@ -268,7 +268,7 @@ class Google extends \OC\Files\Storage\Common {
 						$name .= '.'.$extension;
 					}
 				}
-				$files[] = $name;
+				$files[] = basename($name);
 				// Cache entry for future use
 				$this->entries[$name] = $entry;
 			}
@@ -596,4 +596,11 @@ class Google extends \OC\Files\Storage\Common {
 
 	}
 
+	public function test() {
+		if ($this->free_space('')) {
+			return true;
+		}
+		return false;
+	}
+
 }
diff --git a/apps/files_external/lib/sftp.php b/apps/files_external/lib/sftp.php
index 551a5a64ef2f6e32347c32f28d59f54683ce9523..ede6c251fd9e18463590b04ff7ee72a725c5f536 100644
--- a/apps/files_external/lib/sftp.php
+++ b/apps/files_external/lib/sftp.php
@@ -7,8 +7,9 @@
  */
 namespace OC\Files\Storage;
 
-set_include_path(get_include_path() . PATH_SEPARATOR . \OC_App::getAppPath('files_external') . '/3rdparty/phpseclib/phpseclib');
-require('Net/SFTP.php');
+set_include_path(get_include_path() . PATH_SEPARATOR .
+	\OC_App::getAppPath('files_external') . '/3rdparty/phpseclib/phpseclib');
+require 'Net/SFTP.php';
 
 class SFTP extends \OC\Files\Storage\Common {
 	private $host;
@@ -31,7 +32,7 @@ class SFTP extends \OC\Files\Storage\Common {
 		$this->root = isset($params['root']) ? $this->cleanPath($params['root']) : '/';
 		if ($this->root[0] != '/') $this->root = '/' . $this->root;
 		if (substr($this->root, -1, 1) != '/') $this->root .= '/';
-		
+
 		$host_keys = $this->read_host_keys();
 
 		$this->client = new \Net_SFTP($this->host);
@@ -49,18 +50,18 @@ 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() {
 		if (!isset($params['host']) || !isset($params['user']) || !isset($params['password'])) {
 			throw new \Exception("Required parameters not set");
-		}	
+		}
 	}
-	
+
 	public function getId(){
 		return 'sftp::' . $this->user . '@' . $this->host . '/' . $this->root;
 	}
@@ -108,7 +109,7 @@ class SFTP extends \OC\Files\Storage\Common {
 						$host_key_arr = explode("::", $line, 2);
 						if (count($host_key_arr) == 2) {
 							$hosts[] = $host_key_arr[0];
-							$keys[] = $host_key_arr[1]; 
+							$keys[] = $host_key_arr[1];
 						}
 					}
 					return array_combine($hosts, $keys);
@@ -202,7 +203,7 @@ class SFTP extends \OC\Files\Storage\Common {
 					$tmp = \OC_Helper::tmpFile($ext);
 					$this->getFile($abs_path, $tmp);
 					return fopen($tmp, $mode);
-		
+
 				case 'w':
 				case 'wb':
 				case 'a':
@@ -241,10 +242,6 @@ class SFTP extends \OC\Files\Storage\Common {
 		}
 	}
 
-	public function free_space($path) {
-		return -1;
-	}
-
 	public function touch($path, $mtime=null) {
 		try {
 			if (!is_null($mtime)) return false;
diff --git a/apps/files_external/lib/smb.php b/apps/files_external/lib/smb.php
index 62f6591d25a5dcf4b7b096f57d21aed59f1c6fd9..961efb1a50a43123a43d299296cbb30d305875c7 100644
--- a/apps/files_external/lib/smb.php
+++ b/apps/files_external/lib/smb.php
@@ -18,22 +18,26 @@ class SMB extends \OC\Files\Storage\StreamWrapper{
 	private $share;
 
 	public function __construct($params) {
-		$this->host=$params['host'];
-		$this->user=$params['user'];
-		$this->password=$params['password'];
-		$this->share=$params['share'];
-		$this->root=isset($params['root'])?$params['root']:'/';
-		if ( ! $this->root || $this->root[0]!='/') {
-			$this->root='/'.$this->root;
-		}
-		if (substr($this->root, -1, 1)!='/') {
-			$this->root.='/';
-		}
-		if ( ! $this->share || $this->share[0]!='/') {
-			$this->share='/'.$this->share;
-		}
-		if(substr($this->share, -1, 1)=='/') {
-			$this->share = substr($this->share, 0, -1);
+		if (isset($params['host']) && isset($params['user']) && isset($params['password']) && isset($params['share'])) {
+			$this->host=$params['host'];
+			$this->user=$params['user'];
+			$this->password=$params['password'];
+			$this->share=$params['share'];
+			$this->root=isset($params['root'])?$params['root']:'/';
+			if ( ! $this->root || $this->root[0]!='/') {
+				$this->root='/'.$this->root;
+			}
+			if (substr($this->root, -1, 1)!='/') {
+				$this->root.='/';
+			}
+			if ( ! $this->share || $this->share[0]!='/') {
+				$this->share='/'.$this->share;
+			}
+			if (substr($this->share, -1, 1)=='/') {
+				$this->share = substr($this->share, 0, -1);
+			}
+		} else {
+			throw new \Exception();
 		}
 	}
 
diff --git a/apps/files_external/lib/streamwrapper.php b/apps/files_external/lib/streamwrapper.php
index a631e7ce06aafbb1c7369135cbe42484b741c5b3..4685877f26b7ea0bb0d7266bfceb897afa08f809 100644
--- a/apps/files_external/lib/streamwrapper.php
+++ b/apps/files_external/lib/streamwrapper.php
@@ -76,10 +76,6 @@ abstract class StreamWrapper extends \OC\Files\Storage\Common{
 		return fopen($this->constructUrl($path), $mode);
 	}
 
-	public function free_space($path) {
-		return 0;
-	}
-
 	public function touch($path, $mtime=null) {
 		$this->init();
 		if(is_null($mtime)) {
diff --git a/apps/files_external/lib/swift.php b/apps/files_external/lib/swift.php
index 0fd6fa143b816dff602231767ae57fe7b2e51cd1..68c4b48f17c18ae41562bc9a3f44122517bb10ac 100644
--- a/apps/files_external/lib/swift.php
+++ b/apps/files_external/lib/swift.php
@@ -264,27 +264,31 @@ class SWIFT extends \OC\Files\Storage\Common{
 	private function getSubContainerFile($container) {
 		try {
 			return $container->get_object(self::SUBCONTAINER_FILE);
-		} catch(NoSuchObjectException $e) {
+		} catch(\NoSuchObjectException $e) {
 			return $container->create_object(self::SUBCONTAINER_FILE);
 		}
 	}
 
 	public function __construct($params) {
-		$this->token=$params['token'];
-		$this->host=$params['host'];
-		$this->user=$params['user'];
-		$this->root=isset($params['root'])?$params['root']:'/';
-		if (isset($params['secure'])) {
-			if (is_string($params['secure'])) {
-				$this->secure = ($params['secure'] === 'true');
+		if (isset($params['token']) && isset($params['host']) && isset($params['user'])) {
+			$this->token=$params['token'];
+			$this->host=$params['host'];
+			$this->user=$params['user'];
+			$this->root=isset($params['root'])?$params['root']:'/';
+			if (isset($params['secure'])) {
+				if (is_string($params['secure'])) {
+					$this->secure = ($params['secure'] === 'true');
+				} else {
+					$this->secure = (bool)$params['secure'];
+				}
 			} else {
-				$this->secure = (bool)$params['secure'];
+				$this->secure = false;
+			}
+			if ( ! $this->root || $this->root[0]!='/') {
+				$this->root='/'.$this->root;
 			}
 		} else {
-			$this->secure = false;
-		}
-		if ( ! $this->root || $this->root[0]!='/') {
-			$this->root='/'.$this->root;
+			throw new \Exception();
 		}
 
 	}
@@ -478,10 +482,6 @@ class SWIFT extends \OC\Files\Storage\Common{
 		}
 	}
 
-	public function free_space($path) {
-		return 1024*1024*1024*8;
-	}
-
 	public function touch($path, $mtime=null) {
 		$this->init();
 		$obj=$this->getObject($path);
diff --git a/apps/files_external/lib/webdav.php b/apps/files_external/lib/webdav.php
index 039a07b1ef2a9b4a9229ddc59fb9c61a12e1cd9a..3ba7c48cd5742adcabbb94bc831364ee4c2f2ae2 100644
--- a/apps/files_external/lib/webdav.php
+++ b/apps/files_external/lib/webdav.php
@@ -23,28 +23,32 @@ class DAV extends \OC\Files\Storage\Common{
 	private static $tempFiles=array();
 
 	public function __construct($params) {
-		$host = $params['host'];
-		//remove leading http[s], will be generated in createBaseUri()
-		if (substr($host, 0, 8) == "https://") $host = substr($host, 8);
-		else if (substr($host, 0, 7) == "http://") $host = substr($host, 7);
-		$this->host=$host;
-		$this->user=$params['user'];
-		$this->password=$params['password'];
-		if (isset($params['secure'])) {
-			if (is_string($params['secure'])) {
-				$this->secure = ($params['secure'] === 'true');
+		if (isset($params['host']) && isset($params['user']) && isset($params['password'])) {
+			$host = $params['host'];
+			//remove leading http[s], will be generated in createBaseUri()
+			if (substr($host, 0, 8) == "https://") $host = substr($host, 8);
+			else if (substr($host, 0, 7) == "http://") $host = substr($host, 7);
+			$this->host=$host;
+			$this->user=$params['user'];
+			$this->password=$params['password'];
+			if (isset($params['secure'])) {
+				if (is_string($params['secure'])) {
+					$this->secure = ($params['secure'] === 'true');
+				} else {
+					$this->secure = (bool)$params['secure'];
+				}
 			} else {
-				$this->secure = (bool)$params['secure'];
+				$this->secure = false;
+			}
+			$this->root=isset($params['root'])?$params['root']:'/';
+			if ( ! $this->root || $this->root[0]!='/') {
+				$this->root='/'.$this->root;
+			}
+			if (substr($this->root, -1, 1)!='/') {
+				$this->root.='/';
 			}
 		} else {
-			$this->secure = false;
-		}
-		$this->root=isset($params['root'])?$params['root']:'/';
-		if ( ! $this->root || $this->root[0]!='/') {
-			$this->root='/'.$this->root;
-		}
-		if (substr($this->root, -1, 1)!='/') {
-			$this->root.='/';
+			throw new \Exception();
 		}
 	}
 
@@ -54,11 +58,11 @@ class DAV extends \OC\Files\Storage\Common{
 		}
 		$this->ready = true;
 
-		$settings = array(
-			'baseUri' => $this->createBaseUri(),
-			'userName' => $this->user,
-			'password' => $this->password,
-		);
+			$settings = array(
+				'baseUri' => $this->createBaseUri(),
+				'userName' => $this->user,
+				'password' => $this->password,
+			);
 
 		$this->client = new \Sabre_DAV_Client($settings);
 
@@ -69,7 +73,7 @@ class DAV extends \OC\Files\Storage\Common{
 				$this->client->addTrustedCertificates($certPath);
 			}
 		}
-		//create the root folder if necesary
+		//create the root folder if necessary
 		$this->mkdir('');
 	}
 
@@ -222,7 +226,7 @@ class DAV extends \OC\Files\Storage\Common{
 				return 0;
 			}
 		} catch(\Exception $e) {
-			return 0;
+			return \OC\Files\FREE_SPACE_UNKNOWN;
 		}
 	}
 
@@ -313,7 +317,7 @@ class DAV extends \OC\Files\Storage\Common{
 		}
 	}
 
-	private function cleanPath($path) {
+	public function cleanPath($path) {
 		if ( ! $path || $path[0]=='/') {
 			return substr($path, 1);
 		} else {
diff --git a/apps/files_external/personal.php b/apps/files_external/personal.php
index 268d1880232674137598cc8f32e6208d0c356c2a..90f5e159535c65d675c0a41cd4eb78396a249c6e 100755
--- a/apps/files_external/personal.php
+++ b/apps/files_external/personal.php
@@ -26,9 +26,9 @@ $backends = OC_Mount_Config::getBackends();
 // Remove local storage
 unset($backends['\OC\Files\Storage\Local']);
 $tmpl = new OCP\Template('files_external', 'settings');
-$tmpl->assign('isAdminPage', false, false);
+$tmpl->assign('isAdminPage', false);
 $tmpl->assign('mounts', OC_Mount_Config::getPersonalMountPoints());
 $tmpl->assign('certs', OC_Mount_Config::getCertificates());
-$tmpl->assign('dependencies', OC_Mount_Config::checkDependencies(), false);
+$tmpl->assign('dependencies', OC_Mount_Config::checkDependencies());
 $tmpl->assign('backends', $backends);
 return $tmpl->fetchPage();
diff --git a/apps/files_external/settings.php b/apps/files_external/settings.php
index cd0bfa99585a178ecad9856ecc4e0fe8f9f0ccd7..1a39affe2e6606e0d9cf439a8eaff63b139d578d 100644
--- a/apps/files_external/settings.php
+++ b/apps/files_external/settings.php
@@ -27,11 +27,11 @@ OCP\Util::addscript('3rdparty', 'chosen/chosen.jquery.min');
 OCP\Util::addStyle('files_external', 'settings');
 OCP\Util::addStyle('3rdparty', 'chosen/chosen');
 $tmpl = new OCP\Template('files_external', 'settings');
-$tmpl->assign('isAdminPage', true, false);
+$tmpl->assign('isAdminPage', true);
 $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('dependencies', OC_Mount_Config::checkDependencies(), false);
+$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 df8d7d6e2b5f441b0b9201d413ed0d1324311354..86492699fc2d3ffe0324c9b05ff3f21da9078215 100644
--- a/apps/files_external/templates/settings.php
+++ b/apps/files_external/templates/settings.php
@@ -1,38 +1,44 @@
 <form id="files_external">
 	<fieldset class="personalblock">
-	<legend><strong><?php echo $l->t('External Storage'); ?></strong></legend>
-		<?php if (isset($_['dependencies']) and ($_['dependencies']<>'')) echo ''.$_['dependencies'].''; ?>
-		<table id="externalStorage" data-admin='<?php echo json_encode($_['isAdminPage']); ?>'>
+	<legend><strong><?php p($l->t('External Storage')); ?></strong></legend>
+		<?php if (isset($_['dependencies']) and ($_['dependencies']<>'')) print_unescaped(''.$_['dependencies'].''); ?>
+		<table id="externalStorage" data-admin='<?php print_unescaped(json_encode($_['isAdminPage'])); ?>'>
 			<thead>
 				<tr>
-					<th><?php echo $l->t('Mount point'); ?></th>
-					<th><?php echo $l->t('Backend'); ?></th>
-					<th><?php echo $l->t('Configuration'); ?></th>
-					<!--<th><?php echo $l->t('Options'); ?></th> -->
-					<?php if ($_['isAdminPage']) echo '<th>'.$l->t('Applicable').'</th>'; ?>
+					<th></th>
+					<th><?php p($l->t('Folder name')); ?></th>
+					<th><?php p($l->t('External storage')); ?></th>
+					<th><?php p($l->t('Configuration')); ?></th>
+					<!--<th><?php p($l->t('Options')); ?></th> -->
+					<?php if ($_['isAdminPage']) print_unescaped('<th>'.$l->t('Applicable').'</th>'); ?>
 					<th>&nbsp;</th>
 				</tr>
 			</thead>
 			<tbody width="100%">
 			<?php $_['mounts'] = array_merge($_['mounts'], array('' => array())); ?>
 			<?php foreach ($_['mounts'] as $mountPoint => $mount): ?>
-				<tr <?php echo ($mountPoint != '') ? 'class="'.$mount['class'].'"' : 'id="addMountPoint"'; ?>>
+				<tr <?php print_unescaped(($mountPoint != '') ? 'class="'.OC_Util::sanitizeHTML($mount['class']).'"' : 'id="addMountPoint"'); ?>>
+					<td class="status">
+					<?php if (isset($mount['status'])): ?>
+						<span class="<?php p(($mount['status']) ? 'success' : 'error'); ?>"></span>
+					<?php endif; ?>
+					</td>
 					<td class="mountPoint"><input type="text" name="mountPoint"
-												  value="<?php echo $mountPoint; ?>"
-												  placeholder="<?php echo $l->t('Mount point'); ?>" /></td>
+												  value="<?php p($mountPoint); ?>"
+												  placeholder="<?php p($l->t('Folder name')); ?>" /></td>
 					<?php if ($mountPoint == ''): ?>
 						<td class="backend">
-							<select id="selectBackend" data-configurations='<?php echo json_encode($_['backends']); ?>'>
+							<select id="selectBackend" data-configurations='<?php print_unescaped(json_encode($_['backends'])); ?>'>
 								<option value="" disabled selected
-										style="display:none;"><?php echo $l->t('Add mount point'); ?></option>
+										style="display:none;"><?php p($l->t('Add storage')); ?></option>
 								<?php foreach ($_['backends'] as $class => $backend): ?>
-									<option value="<?php echo $class; ?>"><?php echo $backend['backend']; ?></option>
+									<option value="<?php p($class); ?>"><?php p($backend['backend']); ?></option>
 								<?php endforeach; ?>
 							</select>
 						</td>
 					<?php else: ?>
 						<td class="backend"
-							data-class="<?php echo $mount['class']; ?>"><?php echo $mount['backend']; ?></td>
+							data-class="<?php p($mount['class']); ?>"><?php p($mount['backend']); ?></td>
 					<?php endif; ?>
 					<td class ="configuration" width="100%">
 						<?php if (isset($mount['configuration'])): ?>
@@ -41,35 +47,34 @@
 									<?php $placeholder = $_['backends'][$mount['class']]['configuration'][$parameter]; ?>
 									<?php if (strpos($placeholder, '*') !== false): ?>
 										<input type="password"
-											   data-parameter="<?php echo $parameter; ?>"
-											   value="<?php echo $value; ?>"
-											   placeholder="<?php echo substr($placeholder, 1); ?>" />
+											   data-parameter="<?php p($parameter); ?>"
+											   value="<?php p($value); ?>"
+											   placeholder="<?php p(substr($placeholder, 1)); ?>" />
 									<?php elseif (strpos($placeholder, '!') !== false): ?>
 										<label><input type="checkbox"
-													  data-parameter="<?php echo $parameter; ?>"
+													  data-parameter="<?php p($parameter); ?>"
 													  <?php if ($value == 'true'): ?> checked="checked"<?php endif; ?>
-													  /><?php echo substr($placeholder, 1); ?></label>
+													  /><?php p(substr($placeholder, 1)); ?></label>
 									<?php elseif (strpos($placeholder, '&') !== false): ?>
 										<input type="text"
 											   class="optional"
-											   data-parameter="<?php echo $parameter; ?>"
-											   value="<?php echo $value; ?>"
-											   placeholder="<?php echo substr($placeholder, 5); ?>" />
+											   data-parameter="<?php p($parameter); ?>"
+											   value="<?php p($value); ?>"
+											   placeholder="<?php p(substr($placeholder, 5)); ?>" />
 									<?php elseif (strpos($placeholder, '#') !== false): ?>
 										<input type="hidden"
-											   data-parameter="<?php echo $parameter; ?>"
-											   value="<?php echo $value; ?>" />
+											   data-parameter="<?php p($parameter); ?>"
+											   value="<?php p($value); ?>" />
 									<?php else: ?>
 										<input type="text"
-											   data-parameter="<?php echo $parameter; ?>"
-											   value="<?php echo $value; ?>"
-											   placeholder="<?php echo $placeholder; ?>" />
+											   data-parameter="<?php p($parameter); ?>"
+											   value="<?php p($value); ?>"
+											   placeholder="<?php p($placeholder); ?>" />
 									<?php endif; ?>
 								<?php endif; ?>
 							<?php endforeach; ?>
-							<?php if (isset($_['backends'][$mount['class']]['custom'])): ?>
-								<?php OCP\Util::addScript('files_external',
-														  $_['backends'][$mount['class']]['custom']); ?>
+							<?php if (isset($_['backends'][$mount['class']]['custom']) && !in_array('files_external/js/'.$_['backends'][$mount['class']]['custom'], \OC_Util::$scripts)): ?>
+								<?php OCP\Util::addScript('files_external', $_['backends'][$mount['class']]['custom']); ?>
 							<?php endif; ?>
 						<?php endif; ?>
 					</td>
@@ -77,27 +82,27 @@
 					<td class="applicable"
 						align="right"
 						data-applicable-groups='<?php if (isset($mount['applicable']['groups']))
-														echo json_encode($mount['applicable']['groups']); ?>'
+														print_unescaped(json_encode($mount['applicable']['groups'])); ?>'
 						data-applicable-users='<?php if (isset($mount['applicable']['users']))
-														echo json_encode($mount['applicable']['users']); ?>'>
+														print_unescaped(json_encode($mount['applicable']['users'])); ?>'>
 							<select class="chzn-select"
 									multiple style="width:20em;"
-									data-placeholder="<?php echo $l->t('None set'); ?>">
-								<option value="all" <?php if (isset($mount['applicable']['users']) && in_array('all', $mount['applicable']['users'])) echo 'selected="selected"';?> ><?php echo $l->t('All Users'); ?></option>
-								<optgroup label="<?php echo $l->t('Groups'); ?>">
+									data-placeholder="<?php p($l->t('None set')); ?>">
+								<option value="all" <?php if (isset($mount['applicable']['users']) && in_array('all', $mount['applicable']['users'])) print_unescaped('selected="selected"');?> ><?php p($l->t('All Users')); ?></option>
+								<optgroup label="<?php p($l->t('Groups')); ?>">
 								<?php foreach ($_['groups'] as $group): ?>
-									<option value="<?php echo $group; ?>(group)"
+									<option value="<?php p($group); ?>(group)"
 									<?php if (isset($mount['applicable']['groups']) && in_array($group, $mount['applicable']['groups'])): ?>
 											selected="selected"
-									<?php endif; ?>><?php echo $group; ?></option>
+									<?php endif; ?>><?php p($group); ?></option>
 								<?php endforeach; ?>
 								</optgroup>
-								<optgroup label="<?php echo $l->t('Users'); ?>">
+								<optgroup label="<?php p($l->t('Users')); ?>">
 								<?php foreach ($_['users'] as $user): ?>
-									<option value="<?php echo $user; ?>"
+									<option value="<?php p($user); ?>"
 									<?php if (isset($mount['applicable']['users']) && in_array($user, $mount['applicable']['users'])): ?>
 											selected="selected"
-									<?php endif; ?>><?php echo $user; ?></option>
+									<?php endif; ?>><?php p($user); ?></option>
 								<?php endforeach; ?>
 								</optgroup>
 							</select>
@@ -105,10 +110,10 @@
 					<?php endif; ?>
 					<td <?php if ($mountPoint != ''): ?>class="remove"
 						<?php else: ?>style="visibility:hidden;"
-						<?php endif ?>><img alt="<?php echo $l->t('Delete'); ?>"
-											title="<?php echo $l->t('Delete'); ?>"
+						<?php endif ?>><img alt="<?php p($l->t('Delete')); ?>"
+											title="<?php p($l->t('Delete')); ?>"
 											class="svg action"
-											src="<?php echo image_path('core', 'actions/delete.svg'); ?>" /></td>
+											src="<?php print_unescaped(image_path('core', 'actions/delete.svg')); ?>" /></td>
 				</tr>
 			<?php endforeach; ?>
 			</tbody>
@@ -120,9 +125,9 @@
 			<input type="checkbox"
 				   name="allowUserMounting"
 				   id="allowUserMounting"
-				   value="1" <?php if ($_['allowUserMounting'] == 'yes') echo ' checked="checked"'; ?> />
-			<label for="allowUserMounting"><?php echo $l->t('Enable User External Storage'); ?></label><br/>
-			<em><?php echo $l->t('Allow users to mount their own external storage'); ?></em>
+				   value="1" <?php if ($_['allowUserMounting'] == 'yes') print_unescaped(' checked="checked"'); ?> />
+			<label for="allowUserMounting"><?php p($l->t('Enable User External Storage')); ?></label><br/>
+			<em><?php p($l->t('Allow users to mount their own external storage')); ?></em>
 		<?php endif; ?>
 	</fieldset>
 </form>
@@ -131,26 +136,27 @@
 <form id="files_external"
 	  method="post"
 	  enctype="multipart/form-data"
-	  action="<?php echo OCP\Util::linkTo('files_external', 'ajax/addRootCertificate.php'); ?>">
+	  action="<?php p(OCP\Util::linkTo('files_external', 'ajax/addRootCertificate.php')); ?>">
 <fieldset class="personalblock">
-		<legend><strong><?php echo $l->t('SSL root certificates');?></strong></legend>
-		<table id="sslCertificate" data-admin='<?php echo json_encode($_['isAdminPage']); ?>'>
+		<legend><strong><?php p($l->t('SSL root certificates'));?></strong></legend>
+		<table id="sslCertificate" data-admin='<?php print_unescaped(json_encode($_['isAdminPage'])); ?>'>
 			<tbody width="100%">
 			<?php foreach ($_['certs'] as $rootCert): ?>
-			<tr id="<?php echo $rootCert ?>">
-			<td class="rootCert"><?php echo $rootCert ?></td>
+			<tr id="<?php p($rootCert) ?>">
+			<td class="rootCert"><?php p($rootCert) ?></td>
 			<td <?php if ($rootCert != ''): ?>class="remove"
 				<?php else: ?>style="visibility:hidden;"
-				<?php endif; ?>><img alt="<?php echo $l->t('Delete'); ?>"
-									 title="<?php echo $l->t('Delete'); ?>"
+				<?php endif; ?>><img alt="<?php p($l->t('Delete')); ?>"
+									 title="<?php p($l->t('Delete')); ?>"
 									 class="svg action"
-									 src="<?php echo image_path('core', 'actions/delete.svg'); ?>" /></td>
+									 src="<?php print_unescaped(image_path('core', 'actions/delete.svg')); ?>" /></td>
 			</tr>
 			<?php endforeach; ?>
 			</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="submit" name="cert_import" value="<?php echo $l->t('Import Root Certificate'); ?>" />
+		<input type="submit" name="cert_import" value="<?php p($l->t('Import Root Certificate')); ?>" />
 </fieldset>
 </form>
 <?php endif; ?>
diff --git a/apps/files_sharing/appinfo/app.php b/apps/files_sharing/appinfo/app.php
index d3e05cc62d8c8fb2f0e3190f1de3a13640dc6338..5b5893abc930c0d2934ec6fa09472796f6d725ac 100644
--- a/apps/files_sharing/appinfo/app.php
+++ b/apps/files_sharing/appinfo/app.php
@@ -1,11 +1,11 @@
 <?php
 
-OC::$CLASSPATH['OC_Share_Backend_File'] = "apps/files_sharing/lib/share/file.php";
-OC::$CLASSPATH['OC_Share_Backend_Folder'] = 'apps/files_sharing/lib/share/folder.php';
-OC::$CLASSPATH['OC\Files\Storage\Shared'] = "apps/files_sharing/lib/sharedstorage.php";
-OC::$CLASSPATH['OC\Files\Cache\Shared_Cache'] = 'apps/files_sharing/lib/cache.php';
-OC::$CLASSPATH['OC\Files\Cache\Shared_Permissions'] = 'apps/files_sharing/lib/permissions.php';
-OC::$CLASSPATH['OC\Files\Cache\Shared_Watcher'] = 'apps/files_sharing/lib/watcher.php';
+OC::$CLASSPATH['OC_Share_Backend_File'] = 'files_sharing/lib/share/file.php';
+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_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');
diff --git a/apps/files_sharing/appinfo/info.xml b/apps/files_sharing/appinfo/info.xml
index 1f24a4dde83e50eb2a7f916fd0be89fbc5a99a04..9a199281a76f0eb072f372c9fe057a4e09aa6e13 100644
--- a/apps/files_sharing/appinfo/info.xml
+++ b/apps/files_sharing/appinfo/info.xml
@@ -5,7 +5,7 @@
 	<description>File sharing between users</description>
 	<licence>AGPL</licence>
 	<author>Michael Gapczynski</author>
-	<require>4.91</require>
+	<require>4.93</require>
 	<shipped>true</shipped>
 	<default_enable/>
 	<types>
diff --git a/apps/files_sharing/appinfo/update.php b/apps/files_sharing/appinfo/update.php
index 1d22b32b503100f337393356f7d7d3aeacf4d5b8..48e41e9304889fe1c1356ded114ffb6b08f299c7 100644
--- a/apps/files_sharing/appinfo/update.php
+++ b/apps/files_sharing/appinfo/update.php
@@ -52,7 +52,10 @@ if (version_compare($installedVersion, '0.3', '<')) {
 			}
 			catch (Exception $e) {
 				$update_error = true;
-				OCP\Util::writeLog('files_sharing', 'Upgrade Routine: Skipping sharing "'.$row['source'].'" to "'.$shareWith.'" (error is "'.$e->getMessage().'")', OCP\Util::WARN);
+				OCP\Util::writeLog('files_sharing',
+					'Upgrade Routine: Skipping sharing "'.$row['source'].'" to "'.$shareWith
+					.'" (error is "'.$e->getMessage().'")',
+					OCP\Util::WARN);
 			}
 			OC_Util::tearDownFS();
 		}
diff --git a/apps/files_sharing/css/public.css b/apps/files_sharing/css/public.css
index 13f42b130df5f48ad1211c8dbeb52b90ce5d06c9..13298f113f8f767f707374bffe612f37aa455624 100644
--- a/apps/files_sharing/css/public.css
+++ b/apps/files_sharing/css/public.css
@@ -71,4 +71,5 @@ p.info a {
 
 thead{
 	background-color: white;
+	padding-left:0 !important; /* fixes multiselect bar offset on shared page */
 }
diff --git a/apps/files_sharing/l10n/ka.php b/apps/files_sharing/l10n/ka.php
new file mode 100644
index 0000000000000000000000000000000000000000..0270d5d6f8c6a5516cb1e294839a69882573385e
--- /dev/null
+++ b/apps/files_sharing/l10n/ka.php
@@ -0,0 +1,4 @@
+<?php $TRANSLATIONS = array(
+"Password" => "პაროლი",
+"Download" => "გადმოწერა"
+);
diff --git a/apps/files_sharing/l10n/my_MM.php b/apps/files_sharing/l10n/my_MM.php
new file mode 100644
index 0000000000000000000000000000000000000000..dc7ec17e9c58249113282639cac8aa27f1c2b42a
--- /dev/null
+++ b/apps/files_sharing/l10n/my_MM.php
@@ -0,0 +1,6 @@
+<?php $TRANSLATIONS = array(
+"Password" => "စကားဝှက်",
+"Submit" => "ထည့်သွင်းမည်",
+"Download" => "ဒေါင်းလုတ်",
+"web services under your control" => "သင်၏ထိန်းချုပ်မှု့အောက်တွင်ရှိသော Web services"
+);
diff --git a/apps/files_sharing/l10n/ur_PK.php b/apps/files_sharing/l10n/ur_PK.php
new file mode 100644
index 0000000000000000000000000000000000000000..f68b714350f8a7b318978c7110586c8c58bdae4d
--- /dev/null
+++ b/apps/files_sharing/l10n/ur_PK.php
@@ -0,0 +1,4 @@
+<?php $TRANSLATIONS = array(
+"Password" => "پاسورڈ",
+"web services under your control" => "آپ کے اختیار میں ویب سروسیز"
+);
diff --git a/apps/files_sharing/lib/cache.php b/apps/files_sharing/lib/cache.php
index 9655e44787517b928af7f7101e5d92ca0a6d794c..fb0f6c7b5a6bd3b4fb4f8cad64b4f7e900471bac 100644
--- a/apps/files_sharing/lib/cache.php
+++ b/apps/files_sharing/lib/cache.php
@@ -71,8 +71,9 @@ class Shared_Cache extends Cache {
 			}
 		} else {
 			$query = \OC_DB::prepare(
-				'SELECT `fileid`, `storage`, `path`, `parent`, `name`, `mimetype`, `mimepart`, `size`, `mtime`, `encrypted`
-				FROM `*PREFIX*filecache` WHERE `fileid` = ?');
+				'SELECT `fileid`, `storage`, `path`, `parent`, `name`, `mimetype`, `mimepart`,'
+				.' `size`, `mtime`, `encrypted`'
+				.' FROM `*PREFIX*filecache` WHERE `fileid` = ?');
 			$result = $query->execute(array($file));
 			$data = $result->fetchRow();
 			$data['fileid'] = (int)$data['fileid'];
diff --git a/apps/files_sharing/lib/permissions.php b/apps/files_sharing/lib/permissions.php
index 2b068ff93502f45ed68151b472ce9f7ca4826257..6747faa4d4313269cbf1649774e625cbfd1f26f5 100644
--- a/apps/files_sharing/lib/permissions.php
+++ b/apps/files_sharing/lib/permissions.php
@@ -33,7 +33,8 @@ class Shared_Permissions extends Permissions {
 		if ($fileId == -1) {
 			return \OCP\PERMISSION_READ;
 		}
-		$source = \OCP\Share::getItemSharedWithBySource('file', $fileId, \OC_Share_Backend_File::FORMAT_SHARED_STORAGE, null, true);
+		$source = \OCP\Share::getItemSharedWithBySource('file', $fileId, \OC_Share_Backend_File::FORMAT_SHARED_STORAGE,
+			null, true);
 		if ($source) {
 			return $source['permissions'];
 		} else {
@@ -75,7 +76,7 @@ class Shared_Permissions extends Permissions {
 	 * @param int $fileId
 	 * @param string $user
 	 */
-	public function remove($fileId, $user) {
+	public function remove($fileId, $user = null) {
 		// Not a valid action for Shared Permissions
 	}
 
diff --git a/apps/files_sharing/lib/share/file.php b/apps/files_sharing/lib/share/file.php
index 6d3c55a008f0bdaf85fc14674f6a3f55f7d01f51..fa43e87b49e39be3091e81c27501bbe36704b1e7 100644
--- a/apps/files_sharing/lib/share/file.php
+++ b/apps/files_sharing/lib/share/file.php
@@ -72,7 +72,13 @@ class OC_Share_Backend_File implements OCP\Share_Backend_File_Dependent {
 	public function formatItems($items, $format, $parameters = null) {
 		if ($format == self::FORMAT_SHARED_STORAGE) {
 			// Only 1 item should come through for this format call
-			return array('path' => $items[key($items)]['path'], 'permissions' => $items[key($items)]['permissions'], 'uid_owner' => $items[key($items)]['uid_owner']);
+			return array(
+				'parent' => $items[key($items)]['parent'],
+				'path' => $items[key($items)]['path'],
+				'storage' => $items[key($items)]['storage'],
+				'permissions' => $items[key($items)]['permissions'],
+				'uid_owner' => $items[key($items)]['uid_owner']
+			);
 		} else if ($format == self::FORMAT_GET_FOLDER_CONTENTS) {
 			$files = array();
 			foreach ($items as $item) {
@@ -99,7 +105,13 @@ class OC_Share_Backend_File implements OCP\Share_Backend_File_Dependent {
 				}
 				$size += (int)$item['size'];
 			}
-			return array('fileid' => -1, 'name' => 'Shared', 'mtime' => $mtime, 'mimetype' => 'httpd/unix-directory', 'size' => $size);
+			return array(
+				'fileid' => -1,
+				'name' => 'Shared',
+				'mtime' => $mtime,
+				'mimetype' => 'httpd/unix-directory',
+				'size' => $size
+			);
 		} else if ($format == self::FORMAT_OPENDIR) {
 			$files = array();
 			foreach ($items as $item) {
@@ -129,13 +141,28 @@ class OC_Share_Backend_File implements OCP\Share_Backend_File_Dependent {
 			$source = \OCP\Share::getItemSharedWith('folder', $folder, \OC_Share_Backend_File::FORMAT_SHARED_STORAGE);
 			if ($source) {
 				$source['path'] = $source['path'].substr($target, strlen($folder));
-				return $source;
 			}
 		} else {
 			$source = \OCP\Share::getItemSharedWith('file', $target, \OC_Share_Backend_File::FORMAT_SHARED_STORAGE);
-			if ($source) {
-				return $source;
+		}
+		if ($source) {
+			if (isset($source['parent'])) {
+				$parent = $source['parent'];
+				while (isset($parent)) {
+					$query = \OC_DB::prepare('SELECT `parent`, `uid_owner` FROM `*PREFIX*share` WHERE `id` = ?', 1);
+					$item = $query->execute(array($parent))->fetchRow();
+					if (isset($item['parent'])) {
+						$parent = $item['parent'];
+					} else {
+						$fileOwner = $item['uid_owner'];
+						break;
+					}
+				}
+			} else {
+				$fileOwner = $source['uid_owner'];
 			}
+			$source['fileOwner'] = $fileOwner;
+			return $source;
 		}
 		\OCP\Util::writeLog('files_sharing', 'File source not found for: '.$target, \OCP\Util::ERROR);
 		return false;
diff --git a/apps/files_sharing/lib/share/folder.php b/apps/files_sharing/lib/share/folder.php
index 11c8c6b1e8066bd7d84dfbee563a5982607d3486..4426beec6368fa34e17b60f3d114ca6a5b47e2e6 100644
--- a/apps/files_sharing/lib/share/folder.php
+++ b/apps/files_sharing/lib/share/folder.php
@@ -33,7 +33,8 @@ class OC_Share_Backend_Folder extends OC_Share_Backend_File implements OCP\Share
 		}
 		while (!empty($parents)) {
 			$parents = "'".implode("','", $parents)."'";
-			$query = OC_DB::prepare('SELECT `fileid`, `name`, `mimetype` FROM `*PREFIX*filecache` WHERE `parent` IN ('.$parents.')');
+			$query = OC_DB::prepare('SELECT `fileid`, `name`, `mimetype` FROM `*PREFIX*filecache`'
+				.' WHERE `parent` IN ('.$parents.')');
 			$result = $query->execute();
 			$parents = array();
 			while ($file = $result->fetchRow()) {
@@ -47,4 +48,4 @@ class OC_Share_Backend_Folder extends OC_Share_Backend_File implements OCP\Share
 		return $children;
 	}
 
-}
\ No newline at end of file
+}
diff --git a/apps/files_sharing/lib/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php
index 65812b7e2fdeeb2b579f941688d359b9cfe8860c..be0e59e6732dc52bbc8e0ec99fdf94200b41dde6 100644
--- a/apps/files_sharing/lib/sharedstorage.php
+++ b/apps/files_sharing/lib/sharedstorage.php
@@ -45,11 +45,7 @@ class Shared extends \OC\Files\Storage\Common {
 	*/
 	private function getFile($target) {
 		if (!isset($this->files[$target])) {
-			$source = \OC_Share_Backend_File::getSource($target);
-			if ($source) {
-				$source['path'] = '/'.$source['uid_owner'].'/'.$source['path'];
-			}
-			$this->files[$target] = $source;
+			$this->files[$target] = \OC_Share_Backend_File::getSource($target);
 		}
 		return $this->files[$target];
 	}
@@ -62,8 +58,16 @@ class Shared extends \OC\Files\Storage\Common {
 	private function getSourcePath($target) {
 		$source = $this->getFile($target);
 		if ($source) {
-			\OC\Files\Filesystem::initMountPoints($source['uid_owner']);
-			return $source['path'];
+			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'];
+				} else {
+					$this->files[$target]['fullPath'] = false;
+				}
+			}
+			return $this->files[$target]['fullPath'];
 		}
 		return false;
 	}
@@ -240,7 +244,8 @@ class Shared extends \OC\Files\Storage\Common {
 	public function file_put_contents($path, $data) {
 		if ($source = $this->getSourcePath($path)) {
 			// Check if permission is granted
-			if (($this->file_exists($path) && !$this->isUpdatable($path)) || ($this->is_dir($path) && !$this->isCreatable($path))) {
+			if (($this->file_exists($path) && !$this->isUpdatable($path))
+				|| ($this->is_dir($path) && !$this->isCreatable($path))) {
 				return false;
 			}
 			$info = array(
@@ -314,7 +319,8 @@ class Shared extends \OC\Files\Storage\Common {
 		if ($this->isCreatable(dirname($path2))) {
 			$source = $this->fopen($path1, 'r');
 			$target = $this->fopen($path2, 'w');
-			return \OC_Helper::streamCopy($source, $target);
+			list ($count, $result) = \OC_Helper::streamCopy($source, $target);
+			return $result;
 		}
 		return false;
 	}
@@ -390,9 +396,12 @@ class Shared extends \OC\Files\Storage\Common {
 	}
 
 	public static function setup($options) {
-		if (!\OCP\User::isLoggedIn() || \OCP\User::getUser() != $options['user'] || \OCP\Share::getItemsSharedWith('file')) {
+		if (!\OCP\User::isLoggedIn() || \OCP\User::getUser() != $options['user']
+			|| \OCP\Share::getItemsSharedWith('file')) {
 			$user_dir = $options['user_dir'];
-			\OC\Files\Filesystem::mount('\OC\Files\Storage\Shared', array('sharedFolder' => '/Shared'), $user_dir.'/Shared/');
+			\OC\Files\Filesystem::mount('\OC\Files\Storage\Shared',
+				array('sharedFolder' => '/Shared'),
+				$user_dir.'/Shared/');
 		}
 	}
 
@@ -425,7 +434,7 @@ class Shared extends \OC\Files\Storage\Common {
 		}
 		$source = $this->getFile($path);
 		if ($source) {
-			return $source['uid_owner'];
+			return $source['fileOwner'];
 		}
 		return false;
 	}
diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php
index 38d598f7780849e06ed14d8da0819b730a1c52a1..1da972ad7e3fd295053a4b419de74cb1bdf2c501 100644
--- a/apps/files_sharing/public.php
+++ b/apps/files_sharing/public.php
@@ -43,7 +43,7 @@ if (isset($_GET['t'])) {
 			$path = \OC\Files\Filesystem::getPath($linkItem['file_source']);
 		}
 	}
-} 
+}
 if (isset($path)) {
 	if (!isset($linkItem['item_type'])) {
 		OCP\Util::writeLog('share', 'No item type set for share id: ' . $linkItem['id'], \OCP\Util::ERROR);
@@ -141,7 +141,9 @@ if (isset($path)) {
 			OCP\Util::addscript('files', 'keyboardshortcuts');
 			$files = array();
 			$rootLength = strlen($basePath) + 1;
+			$totalSize = 0;
 			foreach (\OC\Files\Filesystem::getDirectoryContent($path) as $i) {
+				$totalSize += $i['size'];
 				$i['date'] = OCP\Util::formatDate($i['mtime']);
 				if ($i['type'] == 'file') {
 					$fileinfo = pathinfo($i['name']);
@@ -168,16 +170,17 @@ if (isset($path)) {
 				}
 			}
 			$list = new OCP\Template('files', 'part.list', '');
-			$list->assign('files', $files, false);
+			$list->assign('files', $files);
 			$list->assign('disableSharing', true);
-			$list->assign('baseURL', OCP\Util::linkToPublic('files') . $urlLinkIdentifiers . '&path=', false);
-			$list->assign('downloadURL', OCP\Util::linkToPublic('files') . $urlLinkIdentifiers . '&download&path=', false);
+			$list->assign('baseURL', OCP\Util::linkToPublic('files') . $urlLinkIdentifiers . '&path=');
+			$list->assign('downloadURL',
+				OCP\Util::linkToPublic('files') . $urlLinkIdentifiers . '&download&path=');
 			$breadcrumbNav = new OCP\Template('files', 'part.breadcrumb', '');
-			$breadcrumbNav->assign('breadcrumb', $breadcrumb, false);
-			$breadcrumbNav->assign('baseURL', OCP\Util::linkToPublic('files') . $urlLinkIdentifiers . '&path=', false);
+			$breadcrumbNav->assign('breadcrumb', $breadcrumb);
+			$breadcrumbNav->assign('baseURL', OCP\Util::linkToPublic('files') . $urlLinkIdentifiers . '&path=');
 			$folder = new OCP\Template('files', 'index', '');
-			$folder->assign('fileList', $list->fetchPage(), false);
-			$folder->assign('breadcrumb', $breadcrumbNav->fetchPage(), false);
+			$folder->assign('fileList', $list->fetchPage());
+			$folder->assign('breadcrumb', $breadcrumbNav->fetchPage());
 			$folder->assign('dir', $getPath);
 			$folder->assign('isCreatable', false);
 			$folder->assign('permissions', 0);
@@ -186,9 +189,12 @@ if (isset($path)) {
 			$folder->assign('uploadMaxHumanFilesize', 0);
 			$folder->assign('allowZipDownload', intval(OCP\Config::getSystemValue('allowZipDownload', true)));
 			$folder->assign('usedSpacePercent', 0);
-			$tmpl->assign('folder', $folder->fetchPage(), false);
-			$tmpl->assign('allowZipDownload', intval(OCP\Config::getSystemValue('allowZipDownload', true)));
-			$tmpl->assign('downloadURL', OCP\Util::linkToPublic('files') . $urlLinkIdentifiers . '&download&path=' . urlencode($getPath));
+			$tmpl->assign('folder', $folder->fetchPage());
+			$allowZip = OCP\Config::getSystemValue('allowZipDownload', true)
+						&& $totalSize <= OCP\Config::getSystemValue('maxZipInputSize', OCP\Util::computerFileSize('800 MB'));
+			$tmpl->assign('allowZipDownload', intval($allowZip));
+			$tmpl->assign('downloadURL',
+				OCP\Util::linkToPublic('files') . $urlLinkIdentifiers . '&download&path=' . urlencode($getPath));
 		} else {
 			$tmpl->assign('dir', $dir);
 
@@ -209,4 +215,3 @@ if (isset($path)) {
 header('HTTP/1.0 404 Not Found');
 $tmpl = new OCP\Template('', '404', 'guest');
 $tmpl->printPage();
-
diff --git a/apps/files_sharing/templates/authenticate.php b/apps/files_sharing/templates/authenticate.php
index 6bce6857ac8667ed80a197b674a0f0c55ebf4fce..7a67b6e550343e0762bf8a5539883391e01d2c3b 100644
--- a/apps/files_sharing/templates/authenticate.php
+++ b/apps/files_sharing/templates/authenticate.php
@@ -1,9 +1,9 @@
-<form action="<?php echo $_['URL']; ?>" method="post">
+<form action="<?php p($_['URL']); ?>" method="post">
 	<fieldset>
 		<p class="infield">
-			<label for="password" class="infield"><?php echo $l->t('Password'); ?></label>
-			<input type="password" name="password" id="password" value="" autofocus />
-			<input type="submit" value="<?php echo $l->t('Submit'); ?>" />
+			<label for="password" class="infield"><?php p($l->t('Password')); ?></label>
+			<input type="password" name="password" id="password" placeholder="" value="" autofocus />
+			<input type="submit" value="<?php p($l->t('Submit')); ?>" />
 		</p>
 	</fieldset>
-</form>
\ No newline at end of file
+</form>
diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php
index 7776fd63b3c2656a130e47349c2c5d470c49d062..88692445ec308d2f45f5c001a92b08bad738b050 100644
--- a/apps/files_sharing/templates/public.php
+++ b/apps/files_sharing/templates/public.php
@@ -1,35 +1,43 @@
-<input type="hidden" name="dir" value="<?php echo $_['dir'] ?>" id="dir">
-<input type="hidden" name="downloadURL" value="<?php echo $_['downloadURL'] ?>" id="downloadURL">
-<input type="hidden" name="filename" value="<?php echo $_['filename'] ?>" id="filename">
-<input type="hidden" name="mimetype" value="<?php echo $_['mimetype'] ?>" id="mimetype">
+<input type="hidden" name="dir" value="<?php p($_['dir']) ?>" id="dir">
+<input type="hidden" name="downloadURL" value="<?php p($_['downloadURL']) ?>" id="downloadURL">
+<input type="hidden" name="filename" value="<?php p($_['filename']) ?>" id="filename">
+<input type="hidden" name="mimetype" value="<?php p($_['mimetype']) ?>" id="mimetype">
 <header><div id="header">
-	<a href="<?php echo link_to('', 'index.php'); ?>" title="" id="owncloud"><img class="svg" src="<?php echo image_path('', 'logo-wide.svg'); ?>" alt="ownCloud" /></a>
+	<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>
 	<div class="header-right">
 	<?php if (isset($_['folder'])): ?>
-		<span id="details"><?php echo $l->t('%s shared the folder %s with you', array($_['displayName'], $_['fileTarget'])) ?></span>
+		<span id="details"><?php p($l->t('%s shared the folder %s with you',
+			array($_['displayName'], $_['fileTarget']))) ?></span>
 	<?php else: ?>
-		<span id="details"><?php echo $l->t('%s shared the file %s with you', array($_['displayName'], $_['fileTarget'])) ?></span>
+		<span id="details"><?php p($l->t('%s shared the file %s with you',
+			array($_['displayName'], $_['fileTarget']))) ?></span>
 	<?php endif; ?>
 		<?php if (!isset($_['folder']) || $_['allowZipDownload']): ?>
-			<a href="<?php echo $_['downloadURL']; ?>" class="button" id="download"><img class="svg" alt="Download" src="<?php echo OCP\image_path("core", "actions/download.svg"); ?>" /><?php echo $l->t('Download')?></a>
+			<a href="<?php p($_['downloadURL']); ?>" class="button" id="download"><img
+				class="svg" alt="Download" src="<?php print_unescaped(OCP\image_path("core", "actions/download.svg")); ?>"
+				/><?php p($l->t('Download'))?></a>
 		<?php endif; ?>
 	</div>
 </div></header>
 <div id="preview">
 	<?php if (isset($_['folder'])): ?>
-		<?php echo $_['folder']; ?>
+		<?php print_unescaped($_['folder']); ?>
 	<?php else: ?>
 		<?php if (substr($_['mimetype'], 0, strpos($_['mimetype'], '/')) == 'image'): ?>
 			<div id="imgframe">
-				<img src="<?php echo $_['downloadURL']; ?>" />
+				<img src="<?php p($_['downloadURL']); ?>" />
 			</div>
 		<?php endif; ?>
 		<ul id="noPreview">
 			<li class="error">
-				<?php echo $l->t('No preview available for').' '.$_['fileTarget']; ?><br />
-				<a href="<?php echo $_['downloadURL']; ?>" id="download"><img class="svg" alt="Download" src="<?php echo OCP\image_path("core", "actions/download.svg"); ?>" /><?php echo $l->t('Download')?></a>
+				<?php p($l->t('No preview available for').' '.$_['fileTarget']); ?><br />
+				<a href="<?php p($_['downloadURL']); ?>" id="download"><img class="svg" alt="Download"
+					src="<?php print_unescaped(OCP\image_path("core", "actions/download.svg")); ?>"
+					/><?php p($l->t('Download'))?></a>
 			</li>
 		</ul>
 	<?php endif; ?>
 </div>
-<footer><p class="info"><a href="http://owncloud.org/">ownCloud</a> &ndash; <?php echo $l->t('web services under your control'); ?></p></footer>
+<footer><p class="info"><a href="http://owncloud.org/">ownCloud</a> &ndash;
+<?php p($l->t('web services under your control')); ?></p></footer>
diff --git a/apps/files_trashbin/ajax/delete.php b/apps/files_trashbin/ajax/delete.php
index 7a6bd1342ea278ea53d29f66d17ef4f31cd42ecf..1834fb54003a476aacf4b7c2a7339ff6d5e11ccd 100644
--- a/apps/files_trashbin/ajax/delete.php
+++ b/apps/files_trashbin/ajax/delete.php
@@ -3,22 +3,43 @@
 OCP\JSON::checkLoggedIn();
 OCP\JSON::callCheck();
 
-$file = $_REQUEST['file'];
+$files = $_POST['files'];
+$dirlisting = $_POST['dirlisting'];
+$list = json_decode($files);
 
-$path_parts = pathinfo($file);
-if ($path_parts['dirname'] == '.') {
-	$delimiter = strrpos($file, '.d');
-	$filename = substr($file, 0, $delimiter);
-	$timestamp =  substr($file, $delimiter+2);
-} else {
-	$filename = $file;
-	$timestamp = null;
+$error = array();
+$success = array();
+
+$i = 0;
+foreach ($list as $file) {
+	if ( $dirlisting=='0') {
+		$delimiter = strrpos($file, '.d');
+		$filename = substr($file, 0, $delimiter);
+		$timestamp =  substr($file, $delimiter+2);
+	} else {
+		$filename = $file;
+		$timestamp = null;
+	}
+
+	OCA\Files_Trashbin\Trashbin::delete($filename, $timestamp);
+	if (!OCA\Files_Trashbin\Trashbin::file_exists($filename, $timestamp)) {
+		$success[$i]['filename'] = $file;
+		$success[$i]['timestamp'] = $timestamp;
+		$i++;
+	} else {
+		$error[] = $filename;
+	}
 }
 
-if (OCA\Files_Trashbin\Trashbin::delete($filename, $timestamp)) {
-	OCP\JSON::success(array("data" => array("filename" => $file)));
-} else {
+if ( $error ) {
+	$filelist = '';
+	foreach ( $error as $e ) {
+		$filelist .= $e.', ';
+	}
 	$l = OC_L10N::get('files_trashbin');
-	OCP\JSON::error(array("data" => array("message" => $l->t("Couldn't delete %s permanently", array($file)))));
+	$message = $l->t("Couldn't delete %s permanently", array(rtrim($filelist, ', ')));
+	OCP\JSON::error(array("data" => array("message" => $message,
+			                               "success" => $success, "error" => $error)));
+} else {
+	OCP\JSON::success(array("data" => array("success" => $success)));
 }
-
diff --git a/apps/files_trashbin/ajax/undelete.php b/apps/files_trashbin/ajax/undelete.php
index 6320c1d08273fa0b719f90e6d6ee95c4a256a8f4..80de3c31f912379a955de633584afde20196891a 100644
--- a/apps/files_trashbin/ajax/undelete.php
+++ b/apps/files_trashbin/ajax/undelete.php
@@ -1,11 +1,11 @@
-<?php 
+<?php
 
 OCP\JSON::checkLoggedIn();
 OCP\JSON::callCheck();
 
-$files = $_REQUEST['files'];
-$dirlisting = $_REQUEST['dirlisting'];
-$list = explode(';', $files);
+$files = $_POST['files'];
+$dirlisting = $_POST['dirlisting'];
+$list = json_decode($files);
 
 $error = array();
 $success = array();
@@ -21,7 +21,7 @@ foreach ($list as $file) {
 		$filename = $path_parts['basename'];
 		$timestamp = null;
 	}
-	
+
 	if ( !OCA\Files_Trashbin\Trashbin::restore($file, $filename, $timestamp) ) {
 		$error[] = $filename;
 	} else {
diff --git a/apps/files_trashbin/appinfo/app.php b/apps/files_trashbin/appinfo/app.php
index b1a15cd13d19b8a99e03c9404c941f9cf9b714e9..a6a99db034c9f19deb1fa1d1e9b47e1e9254fe39 100644
--- a/apps/files_trashbin/appinfo/app.php
+++ b/apps/files_trashbin/appinfo/app.php
@@ -1,7 +1,7 @@
 <?php
 
-OC::$CLASSPATH['OCA\Files_Trashbin\Hooks'] = 'apps/files_trashbin/lib/hooks.php';
-OC::$CLASSPATH['OCA\Files_Trashbin\Trashbin'] = 'apps/files_trashbin/lib/trash.php';
+OC::$CLASSPATH['OCA\Files_Trashbin\Hooks'] = 'files_trashbin/lib/hooks.php';
+OC::$CLASSPATH['OCA\Files_Trashbin\Trashbin'] = 'files_trashbin/lib/trash.php';
+
 
-
 OCP\Util::connectHook('OC_Filesystem', 'delete', "OCA\Files_Trashbin\Hooks", "remove_hook");
diff --git a/apps/files_trashbin/appinfo/database.xml b/apps/files_trashbin/appinfo/database.xml
index 1144a1c9a974a1fd45af02620b5898062d929ccb..aae334b1489bfc8cf1db0a77ff96e9d6460ff725 100644
--- a/apps/files_trashbin/appinfo/database.xml
+++ b/apps/files_trashbin/appinfo/database.xml
@@ -18,7 +18,7 @@
     <type>text</type>
     <default></default>
     <notnull>true</notnull>
-    <length>50</length>
+    <length>250</length>
    </field>
 
    <field>
@@ -26,7 +26,7 @@
     <type>text</type>
     <default></default>
     <notnull>true</notnull>
-    <length>50</length>
+    <length>64</length>
    </field>
 
    <field>
@@ -42,7 +42,7 @@
     <type>text</type>
     <default></default>
     <notnull>true</notnull>
-    <length>200</length>
+    <length>512</length>
    </field>
      
    <field>
@@ -89,4 +89,30 @@
 
  </table>
 
+ <table>
+
+  <name>*dbprefix*files_trashsize</name>
+
+  <declaration>
+
+   <field>
+    <name>user</name>
+    <type>text</type>
+    <default></default>
+    <notnull>true</notnull>
+    <length>64</length>
+   </field>
+
+   <field>
+    <name>size</name>
+    <type>text</type>
+    <default></default>
+    <notnull>true</notnull>
+    <length>50</length>
+   </field>
+     
+  </declaration>
+
+ </table>
+
 </database>
diff --git a/apps/files_trashbin/appinfo/info.xml b/apps/files_trashbin/appinfo/info.xml
index e42173396024aab5f97d8dfb6cd83f79edd46b16..7f807da579ea0a8013c251123650fc5636e29505 100644
--- a/apps/files_trashbin/appinfo/info.xml
+++ b/apps/files_trashbin/appinfo/info.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <info>
 	<id>files_trashbin</id>
-	<name>Trash bin</name>
+	<name>Deleted files</name>
 	<description>Keep a copy of deleted files so that they can be restored if needed</description>
 	<licence>AGPL</licence>
 	<author>Bjoern Schiessle</author>
diff --git a/apps/files_trashbin/appinfo/update.php b/apps/files_trashbin/appinfo/update.php
new file mode 100644
index 0000000000000000000000000000000000000000..b0bf79cc510f4c5c22a1af8df09cb092df4f9c0a
--- /dev/null
+++ b/apps/files_trashbin/appinfo/update.php
@@ -0,0 +1,40 @@
+<?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');
+		
+	}
+}
\ No newline at end of file
diff --git a/apps/files_trashbin/appinfo/version b/apps/files_trashbin/appinfo/version
index 49d59571fbf6e077eece30f8c418b6aad15e20b0..be586341736ee60d6ca2be0f3762a307e8fe79f9 100644
--- a/apps/files_trashbin/appinfo/version
+++ b/apps/files_trashbin/appinfo/version
@@ -1 +1 @@
-0.1
+0.3
diff --git a/apps/files_trashbin/download.php b/apps/files_trashbin/download.php
index 665697dca5f37527980e54a4cae148543d7460da..60328e1dddbef395f01567cf0b21cc157125b951 100644
--- a/apps/files_trashbin/download.php
+++ b/apps/files_trashbin/download.php
@@ -26,7 +26,7 @@ OCP\User::checkLoggedIn();
 
 $filename = $_GET["file"];
 
-$view = new OC_FilesystemView('/'.\OCP\User::getUser().'/files_trashbin');
+$view = new OC_FilesystemView('/'.\OCP\User::getUser().'/files_trashbin/files');
 
 if(!$view->file_exists($filename)) {
 	header("HTTP/1.0 404 Not Found");
diff --git a/apps/files_trashbin/index.php b/apps/files_trashbin/index.php
index a2d4cc0a44df9cb2a221750af922b2da3ae64ec8..24ccd8c4609535299f006fb661a9cf05d85b3282 100644
--- a/apps/files_trashbin/index.php
+++ b/apps/files_trashbin/index.php
@@ -1,24 +1,26 @@
 <?php
 
-// Check if we are a user
+// Check if we are a user
 OCP\User::checkLoggedIn();
 
+OCP\App::setActiveNavigationEntry('files_index');
+
 OCP\Util::addScript('files_trashbin', 'trash');
 OCP\Util::addScript('files_trashbin', 'disableDefaultActions');
 OCP\Util::addScript('files', 'fileactions');
 $tmpl = new OCP\Template('files_trashbin', 'index', 'user');
 
 $user = \OCP\User::getUser();
-$view = new OC_Filesystemview('/'.$user.'/files_trashbin');
+$view = new OC_Filesystemview('/'.$user.'/files_trashbin/files');
 
 OCP\Util::addStyle('files', 'files');
 OCP\Util::addScript('files', 'filelist');
 
 $dir = isset($_GET['dir']) ? stripslashes($_GET['dir']) : '';
 
+$result = array();
 if ($dir) {
 	$dirlisting = true;
-	$view = new \OC_FilesystemView('/'.\OCP\User::getUser().'/files_trashbin');
 	$fullpath = \OCP\Config::getSystemValue('datadirectory').$view->getAbsolutePath($dir);
 	$dirContent = opendir($fullpath);
 	$i = 0;
@@ -35,13 +37,13 @@ if ($dir) {
 					'type' => $view->is_dir($dir.'/'.$entryName) ? 'dir' : 'file',
 					'location' => $dir,
 					);
-		}
+		}
 	}
-	closedir($fullpath);
-		
+	closedir($dirContent);
+
 } 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();
 }
 
@@ -66,35 +68,49 @@ foreach ($result as $r) {
 	$files[] = $i;
 }
 
-// Make breadcrumb
+function fileCmp($a, $b) {
+	if ($a['type'] == 'dir' and $b['type'] != 'dir') {
+		return -1;
+	} elseif ($a['type'] != 'dir' and $b['type'] == 'dir') {
+		return 1;
+	} else {
+		return strnatcasecmp($a['name'], $b['name']);
+	}
+}
+
+usort($files, "fileCmp");
+
+// Make breadcrumb
 $pathtohere = '';
-$breadcrumb = array();
-foreach (explode('/', $dir) as $i) {
+$breadcrumb = array();
+foreach (explode('/', $dir) as $i) {
 	if ($i != '') {
 		if ( preg_match('/^(.+)\.d[0-9]+$/', $i, $match) ) {
 			$name = $match[1];
 		} else {
 			$name = $i;
-		}
-		$pathtohere .= '/' . $i;
-		$breadcrumb[] = array('dir' => $pathtohere, 'name' => $name);
-	}
+		}
+		$pathtohere .= '/' . $i;
+		$breadcrumb[] = array('dir' => $pathtohere, 'name' => $name);
+	}
 }
 
-$breadcrumbNav = new OCP\Template('files', 'part.breadcrumb', '');
-$breadcrumbNav->assign('breadcrumb', $breadcrumb, false);
-$breadcrumbNav->assign('baseURL', OCP\Util::linkTo('files_trashbin', 'index.php') . '?dir=', false);
+$breadcrumbNav = new OCP\Template('files_trashbin', 'part.breadcrumb', '');
+$breadcrumbNav->assign('breadcrumb', $breadcrumb);
+$breadcrumbNav->assign('baseURL', OCP\Util::linkTo('files_trashbin', 'index.php') . '?dir=');
+$breadcrumbNav->assign('home', OCP\Util::linkTo('files', 'index.php'));
 
 $list = new OCP\Template('files_trashbin', 'part.list', '');
-$list->assign('files', $files, false);
-$list->assign('baseURL', OCP\Util::linkTo('files_trashbin', 'index.php'). '?dir='.$dir, false);
-$list->assign('downloadURL', OCP\Util::linkTo('files_trashbin', 'download.php') . '?file='.$dir, false);
+$list->assign('files', $files);
+$list->assign('baseURL', OCP\Util::linkTo('files_trashbin', 'index.php'). '?dir='.$dir);
+$list->assign('downloadURL', OCP\Util::linkTo('files_trashbin', 'download.php') . '?file='.$dir);
 $list->assign('disableSharing', true);
 $list->assign('dirlisting', $dirlisting);
+$tmpl->assign('dirlisting', $dirlisting);
 $list->assign('disableDownloadActions', true);
-$tmpl->assign('breadcrumb', $breadcrumbNav->fetchPage(), false);
-$tmpl->assign('fileList', $list->fetchPage(), false);
+$tmpl->assign('breadcrumb', $breadcrumbNav->fetchPage());
+$tmpl->assign('fileList', $list->fetchPage());
 $tmpl->assign('files', $files);
-$tmpl->assign('dir', OC_Filesystem::normalizePath($view->getAbsolutePath()));
+$tmpl->assign('dir', \OC\Files\Filesystem::normalizePath($view->getAbsolutePath()));
 
 $tmpl->printPage();
diff --git a/apps/files_trashbin/js/disableDefaultActions.js b/apps/files_trashbin/js/disableDefaultActions.js
index 27c3e13db4d12d05a8c8e9796b031d72c1232247..df08bfb1a50525ad29f4428643af471dc2fcf6b2 100644
--- a/apps/files_trashbin/js/disableDefaultActions.js
+++ b/apps/files_trashbin/js/disableDefaultActions.js
@@ -1,4 +1,4 @@
-/* disable download and sharing actions */
-var disableDownloadActions = true;
-var disableSharing = true;
+/* disable download and sharing actions */
+var disableDownloadActions = true;
+var disableSharing = true;
 var trashBinApp = true;
\ No newline at end of file
diff --git a/apps/files_trashbin/js/trash.js b/apps/files_trashbin/js/trash.js
index 6c810e4c2bd017ac92e8ad1b2e62f1c3ebd2c31b..39e76e10c9c6792cab6411c72dc319cead3fcddb 100644
--- a/apps/files_trashbin/js/trash.js
+++ b/apps/files_trashbin/js/trash.js
@@ -6,9 +6,10 @@ $(document).ready(function() {
 			var tr=$('tr').filterAttr('data-file', filename);
 			var spinner = '<img class="move2trash" title="'+t('files_trashbin', 'perform restore operation')+'" src="'+ OC.imagePath('core', 'loader.gif') +'"></a>';
 			var undeleteAction = $('tr').filterAttr('data-file',filename).children("td.date");
+			var files = tr.attr('data-file');
 			undeleteAction[0].innerHTML = undeleteAction[0].innerHTML+spinner;
 			$.post(OC.filePath('files_trashbin','ajax','undelete.php'),
-				{files:tr.attr('data-file'), dirlisting:tr.attr('data-dirlisting') },
+				{files:JSON.stringify([files]), dirlisting:tr.attr('data-dirlisting') },
 				function(result){
 					for (var i = 0; i < result.data.success.length; i++) {
 						var row = document.getElementById(result.data.success[i].filename);
@@ -18,35 +19,36 @@ $(document).ready(function() {
 						OC.dialogs.alert(result.data.message, 'Error');
 					}
 				});
-			
+
 			});
 		};
-		
+
 		FileActions.register('all', 'Delete', OC.PERMISSION_READ, function () {
 			return OC.imagePath('core', 'actions/delete');
 		}, function (filename) {
 			$('.tipsy').remove();
-			
+
 			var tr=$('tr').filterAttr('data-file', filename);
 			var deleteAction = $('tr').filterAttr('data-file',filename).children("td.date").children(".action.delete");
 			var oldHTML = deleteAction[0].outerHTML;
 			var newHTML = '<img class="move2trash" data-action="Delete" title="'+t('files', 'delete file permanently')+'" src="'+ OC.imagePath('core', 'loading.gif') +'"></a>';
+			var files = tr.attr('data-file');
 			deleteAction[0].outerHTML = newHTML;
-			
+
 			$.post(OC.filePath('files_trashbin','ajax','delete.php'),
-				{file:tr.attr('data-file') },
+				{files:JSON.stringify([files]), dirlisting:tr.attr('data-dirlisting') },
 				function(result){
-					if ( result.status == 'success' ) {
-						var row = document.getElementById(result.data.filename);
+					for (var i = 0; i < result.data.success.length; i++) {
+						var row = document.getElementById(result.data.success[i].filename);
 						row.parentNode.removeChild(row);
-					} else {
-						deleteAction[0].outerHTML = oldHTML;
+					}
+					if (result.status != 'success') {
 						OC.dialogs.alert(result.data.message, 'Error');
 					}
 				});
-			
+
 			});
-		
+
 		// Sets the select_all checkbox behaviour :
 		$('#select_all').click(function() {
 			if($(this).attr('checked')){
@@ -88,19 +90,19 @@ $(document).ready(function() {
 				}
 			}
 			processSelection();
-		});		
-		
+		});
+
 		$('.undelete').click('click',function(event) {
 			var spinner = '<img class="move2trash" title="'+t('files_trashbin', 'perform restore operation')+'" src="'+ OC.imagePath('core', 'loader.gif') +'"></a>';
 			var files=getSelectedFiles('file');
-			var fileslist=files.join(';');
+			var fileslist = JSON.stringify(files);
 			var dirlisting=getSelectedFiles('dirlisting')[0];
-			
-			for (var i in files) {
+
+			for (var i=0; i<files.length; i++) {
 				var undeleteAction = $('tr').filterAttr('data-file',files[i]).children("td.date");
 				undeleteAction[0].innerHTML = undeleteAction[0].innerHTML+spinner;
 			}
-			
+
 			$.post(OC.filePath('files_trashbin','ajax','undelete.php'),
 					{files:fileslist, dirlisting:dirlisting},
 					function(result){
@@ -111,10 +113,57 @@ $(document).ready(function() {
 						if (result.status != 'success') {
 							OC.dialogs.alert(result.data.message, 'Error');
 						}
-					});		
+					});
+			});
+
+		$('.delete').click('click',function(event) {
+			console.log("delete selected");
+			var spinner = '<img class="move2trash" title="'+t('files_trashbin', 'Delete permanently')+'" src="'+ OC.imagePath('core', 'loading.gif') +'"></a>';
+			var files=getSelectedFiles('file');
+			var fileslist = JSON.stringify(files);
+			var dirlisting=getSelectedFiles('dirlisting')[0];
+
+			for (var i=0; i<files.length; i++) {
+				var deleteAction = $('tr').filterAttr('data-file',files[i]).children("td.date");
+				deleteAction[0].innerHTML = deleteAction[0].innerHTML+spinner;
+			}
+
+			$.post(OC.filePath('files_trashbin','ajax','delete.php'),
+					{files:fileslist, dirlisting:dirlisting},
+					function(result){
+						for (var i = 0; i < result.data.success.length; i++) {
+							var row = document.getElementById(result.data.success[i].filename);
+							row.parentNode.removeChild(row);
+						}
+						if (result.status != 'success') {
+							OC.dialogs.alert(result.data.message, 'Error');
+						}
+					});
 			});
-	
 
+	$('#fileList').on('click', 'td.filename a', function(event) {
+		var mime = $(this).parent().parent().data('mime');
+		if (mime !== 'httpd/unix-directory') {
+			event.preventDefault();
+		}
+		var filename = $(this).parent().parent().attr('data-file');
+		var tr = $('tr').filterAttr('data-file',filename);
+		var renaming = tr.data('renaming');
+		if(!renaming && !FileList.isLoading(filename)){
+			if(mime.substr(0, 5) === 'text/'){ //no texteditor for now
+				return;
+			}
+			var type = $(this).parent().parent().data('type');
+			var permissions = $(this).parent().parent().data('permissions');
+			var action = FileActions.getDefault(mime, type, permissions);
+			if(action){
+				event.preventDefault();
+				action(filename);
+			}
+		}
+	});
+
+	FileActions.actions.dir = {};
 });
 
 function processSelection(){
@@ -180,4 +229,8 @@ function getSelectedFiles(property){
 		}
 	});
 	return files;
-}
\ No newline at end of file
+}
+
+function fileDownloadPath(dir, file) {
+	return OC.filePath('files_trashbin', '', 'download.php') + '?file='+encodeURIComponent(file);
+}
diff --git a/apps/files_trashbin/l10n/ar.php b/apps/files_trashbin/l10n/ar.php
index e38130fe2d3076603340d1202fef20a05320c785..7b2e286336753dc219700de49dc0eb0847e77dd3 100644
--- a/apps/files_trashbin/l10n/ar.php
+++ b/apps/files_trashbin/l10n/ar.php
@@ -1,3 +1,4 @@
 <?php $TRANSLATIONS = array(
-"Name" => "اسم"
+"Name" => "اسم",
+"Delete" => "إلغاء"
 );
diff --git a/apps/files_trashbin/l10n/bg_BG.php b/apps/files_trashbin/l10n/bg_BG.php
index 05965c2a9adccd301801f351dc681f107947c590..29e69a02fbb755aa1613b758361719f460c2b7c4 100644
--- a/apps/files_trashbin/l10n/bg_BG.php
+++ b/apps/files_trashbin/l10n/bg_BG.php
@@ -1,8 +1,9 @@
 <?php $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Невъзможно изтриване на %s завинаги",
 "Couldn't restore %s" => "Невъзможно възтановяване на %s",
-"perform restore operation" => "извършване на действие по възтановяване",
+"perform restore operation" => "извършване на действие по възстановяване",
 "delete file permanently" => "изтриване на файла завинаги",
+"Delete permanently" => "Изтриване завинаги",
 "Name" => "Име",
 "Deleted" => "Изтрито",
 "1 folder" => "1 папка",
@@ -10,5 +11,6 @@
 "1 file" => "1 файл",
 "{count} files" => "{count} файла",
 "Nothing in here. Your trash bin is empty!" => "Няма нищо. Кофата е празна!",
-"Restore" => "Възтановяване"
+"Restore" => "Възтановяване",
+"Delete" => "Изтриване"
 );
diff --git a/apps/files_trashbin/l10n/bn_BD.php b/apps/files_trashbin/l10n/bn_BD.php
index c669eff7e1fa48e713067caa9a110caa9a5c26ed..d61355c52c204f51da086053120b6fa9653cc910 100644
--- a/apps/files_trashbin/l10n/bn_BD.php
+++ b/apps/files_trashbin/l10n/bn_BD.php
@@ -3,5 +3,6 @@
 "1 folder" => "১টি ফোল্ডার",
 "{count} folders" => "{count} টি ফোল্ডার",
 "1 file" => "১টি ফাইল",
-"{count} files" => "{count} টি ফাইল"
+"{count} files" => "{count} টি ফাইল",
+"Delete" => "মুছে"
 );
diff --git a/apps/files_trashbin/l10n/ca.php b/apps/files_trashbin/l10n/ca.php
index 803b0c81ef0e411c1e7e1f6ef8d37e23c005f235..894ed6a729d5307af31a160f85abdba8029e8b97 100644
--- a/apps/files_trashbin/l10n/ca.php
+++ b/apps/files_trashbin/l10n/ca.php
@@ -3,6 +3,7 @@
 "Couldn't restore %s" => "No s'ha pogut restaurar %s",
 "perform restore operation" => "executa l'operació de restauració",
 "delete file permanently" => "esborra el fitxer permanentment",
+"Delete permanently" => "Esborra permanentment",
 "Name" => "Nom",
 "Deleted" => "Eliminat",
 "1 folder" => "1 carpeta",
@@ -10,5 +11,6 @@
 "1 file" => "1 fitxer",
 "{count} files" => "{count} fitxers",
 "Nothing in here. Your trash bin is empty!" => "La paperera està buida!",
-"Restore" => "Recupera"
+"Restore" => "Recupera",
+"Delete" => "Esborra"
 );
diff --git a/apps/files_trashbin/l10n/cs_CZ.php b/apps/files_trashbin/l10n/cs_CZ.php
index eeb27784d3e8ee52eba471ff90fd954f662744f0..d32af39877b590810707e6ba749efe3ebf6d004b 100644
--- a/apps/files_trashbin/l10n/cs_CZ.php
+++ b/apps/files_trashbin/l10n/cs_CZ.php
@@ -3,6 +3,7 @@
 "Couldn't restore %s" => "Nelze obnovit %s",
 "perform restore operation" => "provést obnovu",
 "delete file permanently" => "trvale odstranit soubor",
+"Delete permanently" => "Trvale odstranit",
 "Name" => "Název",
 "Deleted" => "Smazáno",
 "1 folder" => "1 složka",
@@ -10,5 +11,6 @@
 "1 file" => "1 soubor",
 "{count} files" => "{count} soubory",
 "Nothing in here. Your trash bin is empty!" => "Žádný obsah. Váš koš je prázdný.",
-"Restore" => "Obnovit"
+"Restore" => "Obnovit",
+"Delete" => "Smazat"
 );
diff --git a/apps/files_trashbin/l10n/da.php b/apps/files_trashbin/l10n/da.php
index 855888b3159dd7ced1e1cd2c26beffa3e1085474..ca4a2e8215d6ea2ee46925490851ccf856530646 100644
--- a/apps/files_trashbin/l10n/da.php
+++ b/apps/files_trashbin/l10n/da.php
@@ -3,6 +3,7 @@
 "Couldn't restore %s" => "Kunne ikke gendanne %s",
 "perform restore operation" => "udfør gendannelsesoperation",
 "delete file permanently" => "slet fil permanent",
+"Delete permanently" => "Slet permanent",
 "Name" => "Navn",
 "Deleted" => "Slettet",
 "1 folder" => "1 mappe",
@@ -10,5 +11,6 @@
 "1 file" => "1 fil",
 "{count} files" => "{count} filer",
 "Nothing in here. Your trash bin is empty!" => "Intet at se her. Din papirkurv er tom!",
-"Restore" => "Gendan"
+"Restore" => "Gendan",
+"Delete" => "Slet"
 );
diff --git a/apps/files_trashbin/l10n/de.php b/apps/files_trashbin/l10n/de.php
index 1271f5c313a68b3252c42387492e4e669d5fc19c..d1952c9635a14f85485bcae6837715c75e18f668 100644
--- a/apps/files_trashbin/l10n/de.php
+++ b/apps/files_trashbin/l10n/de.php
@@ -1,8 +1,9 @@
 <?php $TRANSLATIONS = array(
-"Couldn't delete %s permanently" => "Konnte %s nicht permanent löschen",
+"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",
-"delete file permanently" => "Datei permanent löschen",
+"delete file permanently" => "Datei dauerhaft löschen",
+"Delete permanently" => "Permanent löschen",
 "Name" => "Name",
 "Deleted" => "gelöscht",
 "1 folder" => "1 Ordner",
@@ -10,5 +11,6 @@
 "1 file" => "1 Datei",
 "{count} files" => "{count} Dateien",
 "Nothing in here. Your trash bin is empty!" => "Nichts zu löschen, der Papierkorb ist leer!",
-"Restore" => "Wiederherstellen"
+"Restore" => "Wiederherstellen",
+"Delete" => "Löschen"
 );
diff --git a/apps/files_trashbin/l10n/de_DE.php b/apps/files_trashbin/l10n/de_DE.php
index 7cb1834141bf28e0d862ae5196ab4e7e207e793f..269680ca2c3f0ce5537998be967e2d7d8aa02e5a 100644
--- a/apps/files_trashbin/l10n/de_DE.php
+++ b/apps/files_trashbin/l10n/de_DE.php
@@ -1,8 +1,9 @@
 <?php $TRANSLATIONS = array(
-"Couldn't delete %s permanently" => "Konnte %s nicht permanent löschen",
+"Couldn't delete %s permanently" => "Konnte %s nicht dauerhaft löschen",
 "Couldn't restore %s" => "Konnte %s nicht wiederherstellen",
-"perform restore operation" => "Führe die Wiederherstellung aus",
-"delete file permanently" => "Datei entgültig löschen",
+"perform restore operation" => "Wiederherstellung ausführen",
+"delete file permanently" => "Datei dauerhaft löschen",
+"Delete permanently" => "Endgültig löschen",
 "Name" => "Name",
 "Deleted" => "Gelöscht",
 "1 folder" => "1 Ordner",
@@ -10,5 +11,6 @@
 "1 file" => "1 Datei",
 "{count} files" => "{count} Dateien",
 "Nothing in here. Your trash bin is empty!" => "Nichts zu löschen, Ihr Papierkorb ist leer!",
-"Restore" => "Wiederherstellen"
+"Restore" => "Wiederherstellen",
+"Delete" => "Löschen"
 );
diff --git a/apps/files_trashbin/l10n/el.php b/apps/files_trashbin/l10n/el.php
index bc3c2350da66aac3c1b38c596973dda144bd723c..cf9471780c09264cdac51f51f09c375859c1127b 100644
--- a/apps/files_trashbin/l10n/el.php
+++ b/apps/files_trashbin/l10n/el.php
@@ -3,6 +3,7 @@
 "Couldn't restore %s" => "Αδυναμία επαναφοράς %s",
 "perform restore operation" => "εκτέλεση λειτουργία επαναφοράς",
 "delete file permanently" => "μόνιμη διαγραφή αρχείου",
+"Delete permanently" => "Μόνιμη διαγραφή",
 "Name" => "Όνομα",
 "Deleted" => "Διαγράφηκε",
 "1 folder" => "1 φάκελος",
@@ -10,5 +11,6 @@
 "1 file" => "1 αρχείο",
 "{count} files" => "{count} αρχεία",
 "Nothing in here. Your trash bin is empty!" => "Δεν υπάρχει τίποτα εδώ. Ο κάδος σας είναι άδειος!",
-"Restore" => "Επαναφορά"
+"Restore" => "Επαναφορά",
+"Delete" => "Διαγραφή"
 );
diff --git a/apps/files_trashbin/l10n/eo.php b/apps/files_trashbin/l10n/eo.php
index f357e3c10c2cab4d9903aed0ae53573eded18e35..e1e5acbb5a80f6a9bb6b381976ba053db0a94b02 100644
--- a/apps/files_trashbin/l10n/eo.php
+++ b/apps/files_trashbin/l10n/eo.php
@@ -4,5 +4,6 @@
 "{count} folders" => "{count} dosierujoj",
 "1 file" => "1 dosiero",
 "{count} files" => "{count} dosierujoj",
-"Restore" => "Restaŭri"
+"Restore" => "Restaŭri",
+"Delete" => "Forigi"
 );
diff --git a/apps/files_trashbin/l10n/es.php b/apps/files_trashbin/l10n/es.php
index c14b9776473022b05a89e3e977e55f9c9fc171cc..ebc01b1d21e43c702dc571212d9bba4410bbaf8f 100644
--- a/apps/files_trashbin/l10n/es.php
+++ b/apps/files_trashbin/l10n/es.php
@@ -3,6 +3,7 @@
 "Couldn't restore %s" => "No se puede restaurar %s",
 "perform restore operation" => "Restaurar",
 "delete file permanently" => "Eliminar archivo permanentemente",
+"Delete permanently" => "Eliminar permanentemente",
 "Name" => "Nombre",
 "Deleted" => "Eliminado",
 "1 folder" => "1 carpeta",
@@ -10,5 +11,6 @@
 "1 file" => "1 archivo",
 "{count} files" => "{count} archivos",
 "Nothing in here. Your trash bin is empty!" => "Nada aqui. La papelera esta vacia!",
-"Restore" => "Recuperar"
+"Restore" => "Recuperar",
+"Delete" => "Eliminar"
 );
diff --git a/apps/files_trashbin/l10n/es_AR.php b/apps/files_trashbin/l10n/es_AR.php
index c7f98e38df707da6d3ede74e526baa53d0aea196..bb78a39d6c33c0744fc02c5aa24ea484ae516483 100644
--- a/apps/files_trashbin/l10n/es_AR.php
+++ b/apps/files_trashbin/l10n/es_AR.php
@@ -3,6 +3,7 @@
 "Couldn't restore %s" => "No se pudo restaurar %s",
 "perform restore operation" => "Restaurar",
 "delete file permanently" => "Borrar archivo de manera permanente",
+"Delete permanently" => "Borrar de manera permanente",
 "Name" => "Nombre",
 "Deleted" => "Borrado",
 "1 folder" => "1 directorio",
@@ -10,5 +11,6 @@
 "1 file" => "1 archivo",
 "{count} files" => "{count} archivos",
 "Nothing in here. Your trash bin is empty!" => "No hay nada acá. ¡La papelera está vacía!",
-"Restore" => "Recuperar"
+"Restore" => "Recuperar",
+"Delete" => "Borrar"
 );
diff --git a/apps/files_trashbin/l10n/et_EE.php b/apps/files_trashbin/l10n/et_EE.php
index 8744ab5f1223e251ac80086efd5a6a12a0cf6968..73ae9dbee18023376de4214899a8f3d721136871 100644
--- a/apps/files_trashbin/l10n/et_EE.php
+++ b/apps/files_trashbin/l10n/et_EE.php
@@ -3,6 +3,7 @@
 "Couldn't restore %s" => "%s ei saa taastada",
 "perform restore operation" => "soorita taastamine",
 "delete file permanently" => "kustuta fail jäädavalt",
+"Delete permanently" => "Kustuta jäädavalt",
 "Name" => "Nimi",
 "Deleted" => "Kustutatud",
 "1 folder" => "1 kaust",
@@ -10,5 +11,6 @@
 "1 file" => "1 fail",
 "{count} files" => "{count} faili",
 "Nothing in here. Your trash bin is empty!" => "Siin pole midagi. Sinu prügikast on tühi!",
-"Restore" => "Taasta"
+"Restore" => "Taasta",
+"Delete" => "Kustuta"
 );
diff --git a/apps/files_trashbin/l10n/eu.php b/apps/files_trashbin/l10n/eu.php
index 6a4ff12545470fdce2f8d1b59a6d35bf0e6ca368..5a565436ede778f74ae895bfc139adc52900375d 100644
--- a/apps/files_trashbin/l10n/eu.php
+++ b/apps/files_trashbin/l10n/eu.php
@@ -3,6 +3,7 @@
 "Couldn't restore %s" => "Ezin izan da %s berreskuratu",
 "perform restore operation" => "berreskuratu",
 "delete file permanently" => "ezabatu fitxategia betirako",
+"Delete permanently" => "Ezabatu betirako",
 "Name" => "Izena",
 "Deleted" => "Ezabatuta",
 "1 folder" => "karpeta bat",
@@ -10,5 +11,6 @@
 "1 file" => "fitxategi bat",
 "{count} files" => "{count} fitxategi",
 "Nothing in here. Your trash bin is empty!" => "Ez dago ezer ez. Zure zakarrontzia hutsik dago!",
-"Restore" => "Berrezarri"
+"Restore" => "Berrezarri",
+"Delete" => "Ezabatu"
 );
diff --git a/apps/files_trashbin/l10n/fa.php b/apps/files_trashbin/l10n/fa.php
index 487d1657985c4b0e318e5cacb699a8fb8cc85d60..7cc695215e617500373d1d7e3b400de72c580bd3 100644
--- a/apps/files_trashbin/l10n/fa.php
+++ b/apps/files_trashbin/l10n/fa.php
@@ -4,5 +4,6 @@
 "{count} folders" => "{ شمار} پوشه ها",
 "1 file" => "1 پرونده",
 "{count} files" => "{ شمار } فایل ها",
-"Restore" => "بازیابی"
+"Restore" => "بازیابی",
+"Delete" => "حذف"
 );
diff --git a/apps/files_trashbin/l10n/fi_FI.php b/apps/files_trashbin/l10n/fi_FI.php
index ffdac8735b108c137d21cc42cc88ee228de84974..e18689956d08e11b9d4a8d19049444bed59a176a 100644
--- a/apps/files_trashbin/l10n/fi_FI.php
+++ b/apps/files_trashbin/l10n/fi_FI.php
@@ -3,6 +3,7 @@
 "Couldn't restore %s" => "Kohteen %s palautus epäonnistui",
 "perform restore operation" => "suorita palautustoiminto",
 "delete file permanently" => "poista tiedosto pysyvästi",
+"Delete permanently" => "Poista pysyvästi",
 "Name" => "Nimi",
 "Deleted" => "Poistettu",
 "1 folder" => "1 kansio",
@@ -10,5 +11,6 @@
 "1 file" => "1 tiedosto",
 "{count} files" => "{count} tiedostoa",
 "Nothing in here. Your trash bin is empty!" => "Tyhjää täynnä! Roskakorissa ei ole mitään.",
-"Restore" => "Palauta"
+"Restore" => "Palauta",
+"Delete" => "Poista"
 );
diff --git a/apps/files_trashbin/l10n/fr.php b/apps/files_trashbin/l10n/fr.php
index 609b2fa9bd75989ec4e5154dcd95439407b49467..0a783785efb5354687c58a73a59dad3198581173 100644
--- a/apps/files_trashbin/l10n/fr.php
+++ b/apps/files_trashbin/l10n/fr.php
@@ -3,6 +3,7 @@
 "Couldn't restore %s" => "Impossible de restaurer %s",
 "perform restore operation" => "effectuer l'opération de restauration",
 "delete file permanently" => "effacer définitivement le fichier",
+"Delete permanently" => "Supprimer de façon définitive",
 "Name" => "Nom",
 "Deleted" => "Effacé",
 "1 folder" => "1 dossier",
@@ -10,5 +11,6 @@
 "1 file" => "1 fichier",
 "{count} files" => "{count} fichiers",
 "Nothing in here. Your trash bin is empty!" => "Il n'y a rien ici. Votre corbeille est vide !",
-"Restore" => "Restaurer"
+"Restore" => "Restaurer",
+"Delete" => "Supprimer"
 );
diff --git a/apps/files_trashbin/l10n/gl.php b/apps/files_trashbin/l10n/gl.php
index ad9f6802e6637441bb6f52726ad9b5ad3f30131c..4e31dd0018a2cdc5a3e07a54ac29902bfd0ed79f 100644
--- a/apps/files_trashbin/l10n/gl.php
+++ b/apps/files_trashbin/l10n/gl.php
@@ -3,6 +3,7 @@
 "Couldn't restore %s" => "Non foi posíbel restaurar %s",
 "perform restore operation" => "realizar a operación de restauración",
 "delete file permanently" => "eliminar o ficheiro permanentemente",
+"Delete permanently" => "Eliminar permanentemente",
 "Name" => "Nome",
 "Deleted" => "Eliminado",
 "1 folder" => "1 cartafol",
@@ -10,5 +11,6 @@
 "1 file" => "1 ficheiro",
 "{count} files" => "{count} ficheiros",
 "Nothing in here. Your trash bin is empty!" => "Aquí non hai nada. O cesto do lixo está baleiro!",
-"Restore" => "Restablecer"
+"Restore" => "Restablecer",
+"Delete" => "Eliminar"
 );
diff --git a/apps/files_trashbin/l10n/he.php b/apps/files_trashbin/l10n/he.php
index d026add5d750ff13ad4f2a8b5aac10685c1ffde0..9c767d2222c818a39039bf5a13a07c29d322e059 100644
--- a/apps/files_trashbin/l10n/he.php
+++ b/apps/files_trashbin/l10n/he.php
@@ -1,7 +1,16 @@
 <?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" => "תיקייה אחת",
 "{count} folders" => "{count} תיקיות",
 "1 file" => "קובץ אחד",
-"{count} files" => "{count} קבצים"
+"{count} files" => "{count} קבצים",
+"Nothing in here. Your trash bin is empty!" => "שום דבר כאן. סל המחזור שלך ריק!",
+"Restore" => "שחזר",
+"Delete" => "מחיקה"
 );
diff --git a/apps/files_trashbin/l10n/hr.php b/apps/files_trashbin/l10n/hr.php
index 52255c7429a1ec582c450b8525f4109a2ca28a46..2cb86adfd405423190d97c24b545ae11bc04795f 100644
--- a/apps/files_trashbin/l10n/hr.php
+++ b/apps/files_trashbin/l10n/hr.php
@@ -1,3 +1,4 @@
 <?php $TRANSLATIONS = array(
-"Name" => "Ime"
+"Name" => "Ime",
+"Delete" => "Obriši"
 );
diff --git a/apps/files_trashbin/l10n/hu_HU.php b/apps/files_trashbin/l10n/hu_HU.php
index 931e5a7543e40b73c9cf5a4c76d5037d5c8d053d..9c158c2b9ecae46bf74d3039f7eaccd4a468458f 100644
--- a/apps/files_trashbin/l10n/hu_HU.php
+++ b/apps/files_trashbin/l10n/hu_HU.php
@@ -3,6 +3,7 @@
 "Couldn't restore %s" => "Nem sikerült %s visszaállítása",
 "perform restore operation" => "a visszaállítás végrehajtása",
 "delete file permanently" => "az állomány végleges törlése",
+"Delete permanently" => "Végleges törlés",
 "Name" => "Név",
 "Deleted" => "Törölve",
 "1 folder" => "1 mappa",
@@ -10,5 +11,6 @@
 "1 file" => "1 fájl",
 "{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"
+"Restore" => "Visszaállítás",
+"Delete" => "Törlés"
 );
diff --git a/apps/files_trashbin/l10n/hy.php b/apps/files_trashbin/l10n/hy.php
new file mode 100644
index 0000000000000000000000000000000000000000..3b80487278a16a8f1f7b407908ea855f3f5def10
--- /dev/null
+++ b/apps/files_trashbin/l10n/hy.php
@@ -0,0 +1,3 @@
+<?php $TRANSLATIONS = array(
+"Delete" => "Ջնջել"
+);
diff --git a/apps/files_trashbin/l10n/ia.php b/apps/files_trashbin/l10n/ia.php
index c2581f3de179c68b450cc8c311ef8d9a63a8c4c4..0a51752312f37a994aeda4b736d693241143e46a 100644
--- a/apps/files_trashbin/l10n/ia.php
+++ b/apps/files_trashbin/l10n/ia.php
@@ -1,3 +1,4 @@
 <?php $TRANSLATIONS = array(
-"Name" => "Nomine"
+"Name" => "Nomine",
+"Delete" => "Deler"
 );
diff --git a/apps/files_trashbin/l10n/id.php b/apps/files_trashbin/l10n/id.php
index 1a14d8b7c21bc7ace660c443bcd4ef7ce202a049..ab5fe25ac6b2ab270c59f328bd464ed148c2e0a0 100644
--- a/apps/files_trashbin/l10n/id.php
+++ b/apps/files_trashbin/l10n/id.php
@@ -1,3 +1,15 @@
 <?php $TRANSLATIONS = array(
-"Name" => "nama"
+"Couldn't delete %s permanently" => "Tidak dapat menghapus permanen %s",
+"Couldn't restore %s" => "Tidak dapat memulihkan %s",
+"perform restore operation" => "jalankan operasi pemulihan",
+"delete file permanently" => "hapus berkas secara permanen",
+"Name" => "Nama",
+"Deleted" => "Dihapus",
+"1 folder" => "1 map",
+"{count} folders" => "{count} map",
+"1 file" => "1 berkas",
+"{count} files" => "{count} berkas",
+"Nothing in here. Your trash bin is empty!" => "Tempat sampah anda kosong!",
+"Restore" => "Pulihkan",
+"Delete" => "Hapus"
 );
diff --git a/apps/files_trashbin/l10n/is.php b/apps/files_trashbin/l10n/is.php
index 416f641a8efa412078713cdc94d520d91b094096..fba36c91cb53b0184573d9df6884f5ee933ea71f 100644
--- a/apps/files_trashbin/l10n/is.php
+++ b/apps/files_trashbin/l10n/is.php
@@ -3,5 +3,6 @@
 "1 folder" => "1 mappa",
 "{count} folders" => "{count} möppur",
 "1 file" => "1 skrá",
-"{count} files" => "{count} skrár"
+"{count} files" => "{count} skrár",
+"Delete" => "Eyða"
 );
diff --git a/apps/files_trashbin/l10n/it.php b/apps/files_trashbin/l10n/it.php
index 8627682d088d08ab2a646ce43bd6094ef3abfde1..027b22c91ac0baa0a5f7529007c00bf6f3e45289 100644
--- a/apps/files_trashbin/l10n/it.php
+++ b/apps/files_trashbin/l10n/it.php
@@ -3,6 +3,7 @@
 "Couldn't restore %s" => "Impossibile ripristinare %s",
 "perform restore operation" => "esegui operazione di ripristino",
 "delete file permanently" => "elimina il file definitivamente",
+"Delete permanently" => "Elimina definitivamente",
 "Name" => "Nome",
 "Deleted" => "Eliminati",
 "1 folder" => "1 cartella",
@@ -10,5 +11,6 @@
 "1 file" => "1 file",
 "{count} files" => "{count} file",
 "Nothing in here. Your trash bin is empty!" => "Qui non c'è niente. Il tuo cestino è vuoto.",
-"Restore" => "Ripristina"
+"Restore" => "Ripristina",
+"Delete" => "Elimina"
 );
diff --git a/apps/files_trashbin/l10n/ja_JP.php b/apps/files_trashbin/l10n/ja_JP.php
index 2bccf3f3bd5c036b95116f0969e11d682dd5f01d..478aa400664677d1d898dfb78ea24db5800b7a0b 100644
--- a/apps/files_trashbin/l10n/ja_JP.php
+++ b/apps/files_trashbin/l10n/ja_JP.php
@@ -3,6 +3,7 @@
 "Couldn't restore %s" => "%s を復元出来ませんでした",
 "perform restore operation" => "復元操作を実行する",
 "delete file permanently" => "ファイルを完全に削除する",
+"Delete permanently" => "完全に削除する",
 "Name" => "名前",
 "Deleted" => "削除済み",
 "1 folder" => "1 フォルダ",
@@ -10,5 +11,6 @@
 "1 file" => "1 ファイル",
 "{count} files" => "{count} ファイル",
 "Nothing in here. Your trash bin is empty!" => "ここには何もありません。ゴミ箱は空です!",
-"Restore" => "復元"
+"Restore" => "復元",
+"Delete" => "削除"
 );
diff --git a/apps/files_trashbin/l10n/ka_GE.php b/apps/files_trashbin/l10n/ka_GE.php
index 43dba38f5c747886010870f70d5b4da53b089b0e..05068767863df0a674b962cc1b8fab5db515a332 100644
--- a/apps/files_trashbin/l10n/ka_GE.php
+++ b/apps/files_trashbin/l10n/ka_GE.php
@@ -3,5 +3,6 @@
 "1 folder" => "1 საქაღალდე",
 "{count} folders" => "{count} საქაღალდე",
 "1 file" => "1 ფაილი",
-"{count} files" => "{count} ფაილი"
+"{count} files" => "{count} ფაილი",
+"Delete" => "წაშლა"
 );
diff --git a/apps/files_trashbin/l10n/ko.php b/apps/files_trashbin/l10n/ko.php
index 61acd1276a75999d99c223e4e462fb21c400c700..b40546e34b8365be4d055b17493e79935800c29f 100644
--- a/apps/files_trashbin/l10n/ko.php
+++ b/apps/files_trashbin/l10n/ko.php
@@ -4,5 +4,6 @@
 "{count} folders" => "폴더 {count}개",
 "1 file" => "파일 1개",
 "{count} files" => "파일 {count}개",
-"Restore" => "복원"
+"Restore" => "복원",
+"Delete" => "삭제"
 );
diff --git a/apps/files_trashbin/l10n/lb.php b/apps/files_trashbin/l10n/lb.php
index d1bd7518663b72a34e7039db3f25774ae07736a1..01deea2350037c96bc26ede0753a6124fb31876e 100644
--- a/apps/files_trashbin/l10n/lb.php
+++ b/apps/files_trashbin/l10n/lb.php
@@ -1,3 +1,4 @@
 <?php $TRANSLATIONS = array(
-"Name" => "Numm"
+"Name" => "Numm",
+"Delete" => "Läschen"
 );
diff --git a/apps/files_trashbin/l10n/lt_LT.php b/apps/files_trashbin/l10n/lt_LT.php
index 4933e97202fcb949961159eebd6f8524a7d2bcae..513c7626c4e75f4dcae8d5f5428463c4e80b4b35 100644
--- a/apps/files_trashbin/l10n/lt_LT.php
+++ b/apps/files_trashbin/l10n/lt_LT.php
@@ -3,5 +3,6 @@
 "1 folder" => "1 aplankalas",
 "{count} folders" => "{count} aplankalai",
 "1 file" => "1 failas",
-"{count} files" => "{count} failai"
+"{count} files" => "{count} failai",
+"Delete" => "Ištrinti"
 );
diff --git a/apps/files_trashbin/l10n/lv.php b/apps/files_trashbin/l10n/lv.php
index 5ecb99b9892bc777115aacf5a3e036a5b8e4a270..d3c68e2a778ee342aae530370a0b61004cda85bf 100644
--- a/apps/files_trashbin/l10n/lv.php
+++ b/apps/files_trashbin/l10n/lv.php
@@ -3,6 +3,7 @@
 "Couldn't restore %s" => "Nevarēja atjaunot %s",
 "perform restore operation" => "veikt atjaunošanu",
 "delete file permanently" => "dzēst datni pavisam",
+"Delete permanently" => "Dzēst pavisam",
 "Name" => "Nosaukums",
 "Deleted" => "Dzēsts",
 "1 folder" => "1 mape",
@@ -10,5 +11,6 @@
 "1 file" => "1 datne",
 "{count} files" => "{count} datnes",
 "Nothing in here. Your trash bin is empty!" => "Šeit nekā nav. Jūsu miskaste ir tukša!",
-"Restore" => "Atjaunot"
+"Restore" => "Atjaunot",
+"Delete" => "Dzēst"
 );
diff --git a/apps/files_trashbin/l10n/mk.php b/apps/files_trashbin/l10n/mk.php
index b983c341e8cba6a6d2e57508e46de4110cd99c44..22b288b002f6e9476b9f2b4594dc4ac9d49e6069 100644
--- a/apps/files_trashbin/l10n/mk.php
+++ b/apps/files_trashbin/l10n/mk.php
@@ -3,5 +3,6 @@
 "1 folder" => "1 папка",
 "{count} folders" => "{count} папки",
 "1 file" => "1 датотека",
-"{count} files" => "{count} датотеки"
+"{count} files" => "{count} датотеки",
+"Delete" => "Избриши"
 );
diff --git a/apps/files_trashbin/l10n/ms_MY.php b/apps/files_trashbin/l10n/ms_MY.php
index 73e97b496e4d4773b13a1f676a100568d3e39dd4..381d599865ee81c0bb00ea74a894fb57f3233823 100644
--- a/apps/files_trashbin/l10n/ms_MY.php
+++ b/apps/files_trashbin/l10n/ms_MY.php
@@ -1,3 +1,4 @@
 <?php $TRANSLATIONS = array(
-"Name" => "Nama"
+"Name" => "Nama",
+"Delete" => "Padam"
 );
diff --git a/apps/files_trashbin/l10n/nb_NO.php b/apps/files_trashbin/l10n/nb_NO.php
index 49364753d13a8179652a8d52e955b078dcfe7f9b..fa9543a5eb06e1f45012e6752bfb9f852933b41a 100644
--- a/apps/files_trashbin/l10n/nb_NO.php
+++ b/apps/files_trashbin/l10n/nb_NO.php
@@ -1,7 +1,16 @@
 <?php $TRANSLATIONS = array(
+"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",
+"delete file permanently" => "slett filer permanent",
+"Delete permanently" => "Slett permanent",
 "Name" => "Navn",
+"Deleted" => "Slettet",
 "1 folder" => "1 mappe",
 "{count} folders" => "{count} mapper",
 "1 file" => "1 fil",
-"{count} files" => "{count} filer"
+"{count} files" => "{count} filer",
+"Nothing in here. Your trash bin is empty!" => "Ingenting her. Søppelkassen din er tom!",
+"Restore" => "Gjenopprett",
+"Delete" => "Slett"
 );
diff --git a/apps/files_trashbin/l10n/nl.php b/apps/files_trashbin/l10n/nl.php
index c4a26104ba46e56100c33c0d01d173eec91fa710..c576e5d81f8cc19b69fcc01463dc3b76f9954a33 100644
--- a/apps/files_trashbin/l10n/nl.php
+++ b/apps/files_trashbin/l10n/nl.php
@@ -3,6 +3,7 @@
 "Couldn't restore %s" => "Kon %s niet herstellen",
 "perform restore operation" => "uitvoeren restore operatie",
 "delete file permanently" => "verwijder bestanden definitief",
+"Delete permanently" => "Verwijder definitief",
 "Name" => "Naam",
 "Deleted" => "Verwijderd",
 "1 folder" => "1 map",
@@ -10,5 +11,6 @@
 "1 file" => "1 bestand",
 "{count} files" => "{count} bestanden",
 "Nothing in here. Your trash bin is empty!" => "Niets te vinden. Uw prullenbak is leeg!",
-"Restore" => "Herstellen"
+"Restore" => "Herstellen",
+"Delete" => "Verwijder"
 );
diff --git a/apps/files_trashbin/l10n/nn_NO.php b/apps/files_trashbin/l10n/nn_NO.php
index be60dabdf01029e0c4a5cbe92a850ccd558ecdd8..f8ab465ee42d5837bf5e2056ee07254860942f26 100644
--- a/apps/files_trashbin/l10n/nn_NO.php
+++ b/apps/files_trashbin/l10n/nn_NO.php
@@ -1,3 +1,4 @@
 <?php $TRANSLATIONS = array(
-"Name" => "Namn"
+"Name" => "Namn",
+"Delete" => "Slett"
 );
diff --git a/apps/files_trashbin/l10n/oc.php b/apps/files_trashbin/l10n/oc.php
index 2c705193c15d437b161b764f4c83780d9b102312..e6b939dac0c3565332ac03c58d7bdec703ed1798 100644
--- a/apps/files_trashbin/l10n/oc.php
+++ b/apps/files_trashbin/l10n/oc.php
@@ -1,3 +1,4 @@
 <?php $TRANSLATIONS = array(
-"Name" => "Nom"
+"Name" => "Nom",
+"Delete" => "Escafa"
 );
diff --git a/apps/files_trashbin/l10n/pl.php b/apps/files_trashbin/l10n/pl.php
index d2ada4c9466f157976bfeb9ab77027601f96f251..e5ea45b88aeee81c6601b0867100caedc733f444 100644
--- a/apps/files_trashbin/l10n/pl.php
+++ b/apps/files_trashbin/l10n/pl.php
@@ -1,8 +1,16 @@
 <?php $TRANSLATIONS = array(
+"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",
+"delete file permanently" => "trwale usuń plik",
+"Delete permanently" => "Trwale usuń",
 "Name" => "Nazwa",
+"Deleted" => "Usunięte",
 "1 folder" => "1 folder",
 "{count} folders" => "{count} foldery",
 "1 file" => "1 plik",
 "{count} files" => "{count} pliki",
-"Restore" => "Przywróć"
+"Nothing in here. Your trash bin is empty!" => "Nic tu nie ma. Twój kosz jest pusty!",
+"Restore" => "Przywróć",
+"Delete" => "Usuń"
 );
diff --git a/apps/files_trashbin/l10n/pt_BR.php b/apps/files_trashbin/l10n/pt_BR.php
index 5a6fc3a86beac3b322c49e6882a2334f6e3eba23..b9932a71023f7a344a385e5e23a162edc15b0ce9 100644
--- a/apps/files_trashbin/l10n/pt_BR.php
+++ b/apps/files_trashbin/l10n/pt_BR.php
@@ -3,6 +3,7 @@
 "Couldn't restore %s" => "Não foi possível restaurar %s",
 "perform restore operation" => "realizar operação de restauração",
 "delete file permanently" => "excluir arquivo permanentemente",
+"Delete permanently" => "Excluir permanentemente",
 "Name" => "Nome",
 "Deleted" => "Excluído",
 "1 folder" => "1 pasta",
@@ -10,5 +11,6 @@
 "1 file" => "1 arquivo",
 "{count} files" => "{count} arquivos",
 "Nothing in here. Your trash bin is empty!" => "Nada aqui. Sua lixeira está vazia!",
-"Restore" => "Restaurar"
+"Restore" => "Restaurar",
+"Delete" => "Excluir"
 );
diff --git a/apps/files_trashbin/l10n/pt_PT.php b/apps/files_trashbin/l10n/pt_PT.php
index 978ab452d6eb59c66e1585e628e3e2bfce13ddf0..a621587ea0bb0ef94690a7fe96bbc441a1edaad5 100644
--- a/apps/files_trashbin/l10n/pt_PT.php
+++ b/apps/files_trashbin/l10n/pt_PT.php
@@ -3,6 +3,7 @@
 "Couldn't restore %s" => "Não foi possível restaurar %s",
 "perform restore operation" => "Restaurar",
 "delete file permanently" => "Eliminar permanentemente o(s) ficheiro(s)",
+"Delete permanently" => "Eliminar permanentemente",
 "Name" => "Nome",
 "Deleted" => "Apagado",
 "1 folder" => "1 pasta",
@@ -10,5 +11,6 @@
 "1 file" => "1 ficheiro",
 "{count} files" => "{count} ficheiros",
 "Nothing in here. Your trash bin is empty!" => "Não ha ficheiros. O lixo está vazio",
-"Restore" => "Restaurar"
+"Restore" => "Restaurar",
+"Delete" => "Apagar"
 );
diff --git a/apps/files_trashbin/l10n/ro.php b/apps/files_trashbin/l10n/ro.php
index 6ece51e02cfd9e7673bb489e04cd2f67ca609540..6a919b62dfbb8a80edaff20fd98af6ac62aee07c 100644
--- a/apps/files_trashbin/l10n/ro.php
+++ b/apps/files_trashbin/l10n/ro.php
@@ -3,5 +3,6 @@
 "1 folder" => "1 folder",
 "{count} folders" => "{count} foldare",
 "1 file" => "1 fisier",
-"{count} files" => "{count} fisiere"
+"{count} files" => "{count} fisiere",
+"Delete" => "Șterge"
 );
diff --git a/apps/files_trashbin/l10n/ru.php b/apps/files_trashbin/l10n/ru.php
index f6c85a6800ef0c2ef47b678c009d62be89cc12a2..4cf9af1fc39f731232d3831902556a69819e26e1 100644
--- a/apps/files_trashbin/l10n/ru.php
+++ b/apps/files_trashbin/l10n/ru.php
@@ -3,6 +3,7 @@
 "Couldn't restore %s" => "%s не может быть восстановлен",
 "perform restore operation" => "выполнить операцию восстановления",
 "delete file permanently" => "удалить файл навсегда",
+"Delete permanently" => "Удалено навсегда",
 "Name" => "Имя",
 "Deleted" => "Удалён",
 "1 folder" => "1 папка",
@@ -10,5 +11,6 @@
 "1 file" => "1 файл",
 "{count} files" => "{count} файлов",
 "Nothing in here. Your trash bin is empty!" => "Здесь ничего нет. Ваша корзина пуста!",
-"Restore" => "Восстановить"
+"Restore" => "Восстановить",
+"Delete" => "Удалить"
 );
diff --git a/apps/files_trashbin/l10n/ru_RU.php b/apps/files_trashbin/l10n/ru_RU.php
index 379ee37af83d491b6897ca6e368536696efd9b31..04a899bdd5dfb6b2a0945b1198164b17079ce3f4 100644
--- a/apps/files_trashbin/l10n/ru_RU.php
+++ b/apps/files_trashbin/l10n/ru_RU.php
@@ -3,6 +3,7 @@
 "Couldn't restore %s" => "%s не может быть восстановлен",
 "perform restore operation" => "выполнить операцию восстановления",
 "delete file permanently" => "удалить файл навсегда",
+"Delete permanently" => "Удалить навсегда",
 "Name" => "Имя",
 "Deleted" => "Удалён",
 "1 folder" => "1 папка",
@@ -10,5 +11,6 @@
 "1 file" => "1 файл",
 "{count} files" => "{количество} файлов",
 "Nothing in here. Your trash bin is empty!" => "Здесь ничего нет. Ваша корзина пуста!",
-"Restore" => "Восстановить"
+"Restore" => "Восстановить",
+"Delete" => "Удалить"
 );
diff --git a/apps/files_trashbin/l10n/si_LK.php b/apps/files_trashbin/l10n/si_LK.php
index cb351afaec94b3d90407a2263c3e4387d8199fbf..71c5632977654828af903c662fb900a122fd0cd3 100644
--- a/apps/files_trashbin/l10n/si_LK.php
+++ b/apps/files_trashbin/l10n/si_LK.php
@@ -1,5 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Name" => "නම",
 "1 folder" => "1 ෆොල්ඩරයක්",
-"1 file" => "1 ගොනුවක්"
+"1 file" => "1 ගොනුවක්",
+"Delete" => "මකා දමන්න"
 );
diff --git a/apps/files_trashbin/l10n/sk_SK.php b/apps/files_trashbin/l10n/sk_SK.php
index b86e5d86e44c17936180c53d52d86bb9fdd44dba..c5806a5dee8da3063108527bd54c971ca245a327 100644
--- a/apps/files_trashbin/l10n/sk_SK.php
+++ b/apps/files_trashbin/l10n/sk_SK.php
@@ -3,6 +3,7 @@
 "Couldn't restore %s" => "Nemožno obnoviť %s",
 "perform restore operation" => "vykonať obnovu",
 "delete file permanently" => "trvalo zmazať súbor",
+"Delete permanently" => "Zmazať  trvalo",
 "Name" => "Meno",
 "Deleted" => "Zmazané",
 "1 folder" => "1 priečinok",
@@ -10,5 +11,6 @@
 "1 file" => "1 súbor",
 "{count} files" => "{count} súborov",
 "Nothing in here. Your trash bin is empty!" => "Žiadny obsah. Kôš je prázdny!",
-"Restore" => "Obnoviť"
+"Restore" => "Obnoviť",
+"Delete" => "Zmazať"
 );
diff --git a/apps/files_trashbin/l10n/sl.php b/apps/files_trashbin/l10n/sl.php
index 2579f95c86202115c13dc78cfeb15316585c8600..4765945747de1efdac7463745a662382e1c126c5 100644
--- a/apps/files_trashbin/l10n/sl.php
+++ b/apps/files_trashbin/l10n/sl.php
@@ -3,5 +3,6 @@
 "1 folder" => "1 mapa",
 "{count} folders" => "{count} map",
 "1 file" => "1 datoteka",
-"{count} files" => "{count} datotek"
+"{count} files" => "{count} datotek",
+"Delete" => "Izbriši"
 );
diff --git a/apps/files_trashbin/l10n/sr.php b/apps/files_trashbin/l10n/sr.php
index 36659e7080314690a3e7589bcbdcd614038512fc..2e7c139e389ef544ae1d67c0ef41ce9d01801a78 100644
--- a/apps/files_trashbin/l10n/sr.php
+++ b/apps/files_trashbin/l10n/sr.php
@@ -7,5 +7,6 @@
 "1 file" => "1 датотека",
 "{count} files" => "{count} датотеке/а",
 "Nothing in here. Your trash bin is empty!" => "Овде нема ништа. Корпа за отпатке је празна.",
-"Restore" => "Врати"
+"Restore" => "Врати",
+"Delete" => "Обриши"
 );
diff --git a/apps/files_trashbin/l10n/sr@latin.php b/apps/files_trashbin/l10n/sr@latin.php
index 52255c7429a1ec582c450b8525f4109a2ca28a46..2cb86adfd405423190d97c24b545ae11bc04795f 100644
--- a/apps/files_trashbin/l10n/sr@latin.php
+++ b/apps/files_trashbin/l10n/sr@latin.php
@@ -1,3 +1,4 @@
 <?php $TRANSLATIONS = array(
-"Name" => "Ime"
+"Name" => "Ime",
+"Delete" => "Obriši"
 );
diff --git a/apps/files_trashbin/l10n/sv.php b/apps/files_trashbin/l10n/sv.php
index 53bb7a6ce0f621668b98897ed2ab74e5b33d5469..6f8c2365818a0abcdaf820db7d317730921685fd 100644
--- a/apps/files_trashbin/l10n/sv.php
+++ b/apps/files_trashbin/l10n/sv.php
@@ -3,6 +3,7 @@
 "Couldn't restore %s" => "Kunde inte återställa %s",
 "perform restore operation" => "utför återställning",
 "delete file permanently" => "radera filen permanent",
+"Delete permanently" => "Radera permanent",
 "Name" => "Namn",
 "Deleted" => "Raderad",
 "1 folder" => "1 mapp",
@@ -10,5 +11,6 @@
 "1 file" => "1 fil",
 "{count} files" => "{count} filer",
 "Nothing in here. Your trash bin is empty!" => "Ingenting här. Din papperskorg är tom!",
-"Restore" => "Återskapa"
+"Restore" => "Återskapa",
+"Delete" => "Radera"
 );
diff --git a/apps/files_trashbin/l10n/ta_LK.php b/apps/files_trashbin/l10n/ta_LK.php
index a436e2344a4fd0b5fb18b88e570cc04b9c09770f..f21e5fc750de22b2f683f7fa128535f698fdfa17 100644
--- a/apps/files_trashbin/l10n/ta_LK.php
+++ b/apps/files_trashbin/l10n/ta_LK.php
@@ -3,5 +3,6 @@
 "1 folder" => "1 கோப்புறை",
 "{count} folders" => "{எண்ணிக்கை} கோப்புறைகள்",
 "1 file" => "1 கோப்பு",
-"{count} files" => "{எண்ணிக்கை} கோப்புகள்"
+"{count} files" => "{எண்ணிக்கை} கோப்புகள்",
+"Delete" => "நீக்குக"
 );
diff --git a/apps/files_trashbin/l10n/th_TH.php b/apps/files_trashbin/l10n/th_TH.php
index 8a031fb0d70dce9434a3a316843ab9682701ed66..3f5d44c763e819c6d4a2bebff5a63e88543a1482 100644
--- a/apps/files_trashbin/l10n/th_TH.php
+++ b/apps/files_trashbin/l10n/th_TH.php
@@ -7,5 +7,6 @@
 "1 file" => "1 ไฟล์",
 "{count} files" => "{count} ไฟล์",
 "Nothing in here. Your trash bin is empty!" => "ไม่มีอะไรอยู่ในนี้ ถังขยะของคุณยังว่างอยู่",
-"Restore" => "คืนค่า"
+"Restore" => "คืนค่า",
+"Delete" => "ลบ"
 );
diff --git a/apps/files_trashbin/l10n/tr.php b/apps/files_trashbin/l10n/tr.php
index 5b7064eceaf14f388ebadc3c3f5f0bf59383c965..c874d73316a22fd085e320944a10c91e73413662 100644
--- a/apps/files_trashbin/l10n/tr.php
+++ b/apps/files_trashbin/l10n/tr.php
@@ -1,7 +1,16 @@
 <?php $TRANSLATIONS = array(
+"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",
+"delete file permanently" => "Dosyayı kalıcı olarak sil",
+"Delete permanently" => "Kalıcı olarak sil",
 "Name" => "İsim",
+"Deleted" => "Silindi",
 "1 folder" => "1 dizin",
 "{count} folders" => "{count} dizin",
 "1 file" => "1 dosya",
-"{count} files" => "{count} dosya"
+"{count} files" => "{count} dosya",
+"Nothing in here. Your trash bin is empty!" => "Burası boş. Çöp kutun tamamen boş.",
+"Restore" => "Geri yükle",
+"Delete" => "Sil"
 );
diff --git a/apps/files_trashbin/l10n/uk.php b/apps/files_trashbin/l10n/uk.php
index 14c6931255a8550ea5fe7de0623d6ae7b7d030a6..df7dd24864c5d945e4c202f1178d006d418a61f7 100644
--- a/apps/files_trashbin/l10n/uk.php
+++ b/apps/files_trashbin/l10n/uk.php
@@ -1,7 +1,16 @@
 <?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" => "{count} папок",
 "1 file" => "1 файл",
-"{count} files" => "{count} файлів"
+"{count} files" => "{count} файлів",
+"Nothing in here. Your trash bin is empty!" => "Нічого немає. Ваший кошик для сміття пустий!",
+"Restore" => "Відновити",
+"Delete" => "Видалити"
 );
diff --git a/apps/files_trashbin/l10n/vi.php b/apps/files_trashbin/l10n/vi.php
index ac2a7be02917b305c119818ad24c4da6cd473e8e..165fa9cfd9497bc0af710679602d84cc2db9ab3a 100644
--- a/apps/files_trashbin/l10n/vi.php
+++ b/apps/files_trashbin/l10n/vi.php
@@ -3,6 +3,7 @@
 "Couldn't restore %s" => "Không thể khôi phục %s",
 "perform restore operation" => "thực hiện phục hồi",
 "delete file permanently" => "xóa file vĩnh viễn",
+"Delete permanently" => "Xóa vĩnh vễn",
 "Name" => "Tên",
 "Deleted" => "Đã xóa",
 "1 folder" => "1 thư mục",
@@ -10,5 +11,6 @@
 "1 file" => "1 tập tin",
 "{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"
+"Restore" => "Khôi phục",
+"Delete" => "Xóa"
 );
diff --git a/apps/files_trashbin/l10n/zh_CN.GB2312.php b/apps/files_trashbin/l10n/zh_CN.GB2312.php
index 2c6a7891e98078c2fd8c4356c8b16e9b1ced6bdd..606d80d441b0cb130b1758bb44b042004d4c75af 100644
--- a/apps/files_trashbin/l10n/zh_CN.GB2312.php
+++ b/apps/files_trashbin/l10n/zh_CN.GB2312.php
@@ -3,5 +3,6 @@
 "1 folder" => "1 个文件夹",
 "{count} folders" => "{count} 个文件夹",
 "1 file" => "1 个文件",
-"{count} files" => "{count} 个文件"
+"{count} files" => "{count} 个文件",
+"Delete" => "删除"
 );
diff --git a/apps/files_trashbin/l10n/zh_CN.php b/apps/files_trashbin/l10n/zh_CN.php
index 0060b1f31d63884502ca5f28fdb28ba7d27f841b..327a3e247079f4db06c3e201dad4bc12172ae30f 100644
--- a/apps/files_trashbin/l10n/zh_CN.php
+++ b/apps/files_trashbin/l10n/zh_CN.php
@@ -3,5 +3,6 @@
 "1 folder" => "1个文件夹",
 "{count} folders" => "{count} 个文件夹",
 "1 file" => "1 个文件",
-"{count} files" => "{count} 个文件"
+"{count} files" => "{count} 个文件",
+"Delete" => "删除"
 );
diff --git a/apps/files_trashbin/l10n/zh_TW.php b/apps/files_trashbin/l10n/zh_TW.php
index be61d9b0b6db63d1999d11cfe1ab32fa5c8e6ee1..0142e901f5848d62514438bb2b5409b5691cae18 100644
--- a/apps/files_trashbin/l10n/zh_TW.php
+++ b/apps/files_trashbin/l10n/zh_TW.php
@@ -1,7 +1,9 @@
 <?php $TRANSLATIONS = array(
+"Delete permanently" => "永久刪除",
 "Name" => "名稱",
 "1 folder" => "1 個資料夾",
 "{count} folders" => "{count} 個資料夾",
 "1 file" => "1 個檔案",
-"{count} files" => "{count} 個檔案"
+"{count} files" => "{count} 個檔案",
+"Delete" => "刪除"
 );
diff --git a/apps/files_trashbin/lib/hooks.php b/apps/files_trashbin/lib/hooks.php
index d6a62d447b88a580c0ba3d21c6464426b3f8e53b..9081706a2c56defdf26eb609a4f89ff8d2606b0b 100644
--- a/apps/files_trashbin/lib/hooks.php
+++ b/apps/files_trashbin/lib/hooks.php
@@ -1,23 +1,23 @@
 <?php
-/**
- * ownCloud - trash bin
- *
- * @author Bjoern Schiessle
- * @copyright 2013 Bjoern Schiessle schiessle@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/>.
- *
+/**
+ * ownCloud - trash bin
+ *
+ * @author Bjoern Schiessle
+ * @copyright 2013 Bjoern Schiessle schiessle@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/>.
+ *
  */
 
 /**
@@ -36,7 +36,7 @@ class Hooks {
 	 * to copy the file to the trash bin
 	 */
 	public static function remove_hook($params) {
-		
+
 		if ( \OCP\App::isEnabled('files_trashbin') ) {
 			$path = $params['path'];
 			Trashbin::move2trash($path);
diff --git a/apps/files_trashbin/lib/trash.php b/apps/files_trashbin/lib/trash.php
index 76844ca92e983b09707186d0c8e6a7dc5b0c6622..2fc8a8bc3c64fab96dcb3408cc900bcb9b628b55 100644
--- a/apps/files_trashbin/lib/trash.php
+++ b/apps/files_trashbin/lib/trash.php
@@ -1,111 +1,134 @@
 <?php
-/**
- * ownCloud - trash bin
- *
- * @author Bjoern Schiessle
- * @copyright 2013 Bjoern Schiessle schiessle@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 OCA\Files_Trashbin;
-
+/**
+ * ownCloud - trash bin
+ *
+ * @author Bjoern Schiessle
+ * @copyright 2013 Bjoern Schiessle schiessle@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 OCA\Files_Trashbin;
+
 class Trashbin {
-	
-	const DEFAULT_RETENTION_OBLIGATION=180; // how long do we keep files in the trash bin if no other value is defined in the config file (unit: days)
-	const DEFAULTMAXSIZE=50; // unit: percentage; 50% of available disk space/quota
-	
+	// how long do we keep files in the trash bin if no other value is defined in the config file (unit: days)
+	const DEFAULT_RETENTION_OBLIGATION=180;
+
+	// unit: percentage; 50% of available disk space/quota
+	const DEFAULTMAXSIZE=50;
+
 	/**
 	 * move file to the trash bin
-	 * 
+	 *
 	 * @param $file_path path to the deleted file/directory relative to the files root directory
 	 */
 	public static function move2trash($file_path) {
 		$user = \OCP\User::getUser();
-		$view = new \OC_FilesystemView('/'. $user);
-		if (!$view->is_dir('files_trashbin')) {
-			$view->mkdir('files_trashbin');
-			$view->mkdir("versions_trashbin");
-		}
-
-		$path_parts = pathinfo($file_path);
-
-		$deleted = $path_parts['basename'];
-		$location = $path_parts['dirname'];
-		$timestamp = time();
-		$mime = $view->getMimeType('files'.$file_path);
-
-		if ( $view->is_dir('files'.$file_path) ) {
-			$type = 'dir';
-		} else {
-			$type = 'file';
+		$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");
 		}
-		
-		if (  ($trashbinSize = \OCP\Config::getAppValue('files_trashbin', 'size')) === null ) {
-			$trashbinSize = self::calculateSize(new \OC_FilesystemView('/'. $user.'/files_trashbin'));
-			$trashbinSize += self::calculateSize(new \OC_FilesystemView('/'. $user.'/versions_trashbin'));
+
+		$path_parts = pathinfo($file_path);
+
+		$deleted = $path_parts['basename'];
+		$location = $path_parts['dirname'];
+		$timestamp = time();
+		$mime = $view->getMimeType('files'.$file_path);
+
+		if ( $view->is_dir('files'.$file_path) ) {
+			$type = 'dir';
+		} else {
+			$type = 'file';
+		}
+		
+		$trashbinSize = self::getTrashbinSize($user);
+		if ( $trashbinSize === false || $trashbinSize < 0 ) {
+			$trashbinSize = self::calculateSize(new \OC\Files\View('/'. $user.'/files_trashbin'));
 		}
-		$trashbinSize += self::copy_recursive($file_path, 'files_trashbin/'.$deleted.'.d'.$timestamp, $view);
+		$trashbinSize += self::copy_recursive($file_path, 'files_trashbin/files/'.$deleted.'.d'.$timestamp, $view);
 
-		if ( $view->file_exists('files_trashbin/'.$deleted.'.d'.$timestamp) ) {
-			$query = \OC_DB::prepare("INSERT INTO *PREFIX*files_trash (id,timestamp,location,type,mime,user) VALUES (?,?,?,?,?,?)");
+		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 ( !$result ) { // if file couldn't be added to the database than also don't store it in the trash bin.
-				$view->deleteAll('files_trashbin/'.$deleted.'.d'.$timestamp);
+				$view->deleteAll('files_trashbin/files/'.$deleted.'.d'.$timestamp);
 				\OC_Log::write('files_trashbin', 'trash bin database couldn\'t be updated', \OC_log::ERROR);
 				return;
-			}
-	
-			if ( \OCP\App::isEnabled('files_versions') ) {
-				if ( $view->is_dir('files_versions'.$file_path) ) {
-					$trashbinSize += self::calculateSize(new \OC_FilesystemView('/'. $user.'/files_versions/'.$file_path));
-					$view->rename('files_versions'.$file_path, 'versions_trashbin/'. $deleted.'.d'.$timestamp);
-				} else if ( $versions = \OCA\Files_Versions\Storage::getVersions($file_path) ) {
+			}
+			\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'], 'versions_trashbin/'. $deleted.'.v'.$v['version'].'.d'.$timestamp);
-					}
-				}
+						$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);
+				}
 			}
 		} 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 = \OCP\Util::computerFileSize(\OC_Preferences::getValue($user, 'files', 'quota'));
-		if ( $quota == null ) {
-			$quota = \OCP\Util::computerFileSize(\OC_Appconfig::getValue('files', 'default_quota'));
-		}
-		if ( $quota == null ) {
-			$quota = \OC\Files\Filesystem::free_space('/');
+		// 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');
 		}
-		
-		// 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;
+		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);
-		\OCP\Config::setAppValue('files_trashbin', 'size', $trashbinSize);
+		
+		self::setTrashbinSize($user, $trashbinSize);
+
 	}
-	
-	
+
+
 	/**
 	 * restore files from trash bin
 	 * @param $file path to the deleted file
@@ -114,46 +137,50 @@ class Trashbin {
 	 */
 	public static function restore($file, $filename, $timestamp) {
 		$user = \OCP\User::getUser();
-		$view = new \OC_FilesystemView('/'.$user);
+		$view = new \OC\Files\View('/'.$user);
 		
-		if (  ($trashbinSize = \OCP\Config::getAppValue('files_trashbin', 'size')) === null ) {
-			$trashbinSize = self::calculateSize(new \OC_FilesystemView('/'. $user.'/files_trashbin'));
-			$trashbinSize += self::calculateSize(new \OC_FilesystemView('/'. $user.'/versions_trashbin'));
+		$trashbinSize = self::getTrashbinSize($user);
+		if ( $trashbinSize === false || $trashbinSize < 0 ) {
+			$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);
 				return false;
 			}
-			
-			// if location no longer exists, restore file in the root directory
-			$location = $result[0]['location'];
-			if ( $result[0]['location'] != '/' && 
-				 (!$view->is_dir('files'.$result[0]['location']) ||
-				 !$view->isUpdatable('files'.$result[0]['location'])) ) {
-				$location = '';
+
+			// if location no longer exists, restore file in the root directory
+			$location = $result[0]['location'];
+			if ( $result[0]['location'] != '/' &&
+				(!$view->is_dir('files'.$result[0]['location']) ||
+				 !$view->isUpdatable('files'.$result[0]['location'])) ) {
+				$location = '';
 			}
 		} else {
-			$path_parts = pathinfo($filename);
+			$path_parts = pathinfo($file);
 			$result[] = array(
 					'location' => $path_parts['dirname'],
-					'type' => $view->is_dir('/files_trashbin/'.$file) ? 'dir' : 'files',
+					'type' => $view->is_dir('/files_trashbin/files/'.$file) ? 'dir' : 'files',
 					);
 			$location = '';
 		}
 		
-		$source = \OC_Filesystem::normalizePath('files_trashbin/'.$file);
-		$target = \OC_Filesystem::normalizePath('files/'.$location.'/'.$filename);
-		
+		$source = \OC\Files\Filesystem::normalizePath('files_trashbin/files/'.$file);
+		$target = \OC\Files\Filesystem::normalizePath('files/'.$location.'/'.$filename);
+
 		// we need a  extension in case a file/dir with the same name already exists
 		$ext = self::getUniqueExtension($location, $filename, $view);
 		$mtime = $view->filemtime($source);
 		if( $view->rename($source, $target.$ext) ) {
 			$view->touch($target.$ext, $mtime);
+			\OCP\Util::emitHook('\OCA\Files_Trashbin\Trashbin', 'post_restore', 
+					array('filePath' => \OC\Files\Filesystem::normalizePath('/'.$location.'/'.$filename.$ext),
+							'trashPath' => \OC\Files\Filesystem::normalizePath($file)));
 			if ($view->is_dir($target.$ext)) {
-				$trashbinSize -= self::calculateSize(new \OC_FilesystemView('/'.$user.'/'.$target.$ext));
+				$trashbinSize -= self::calculateSize(new \OC\Files\View('/'.$user.'/'.$target.$ext));
 			} else {
 				$trashbinSize -= $view->filesize($target.$ext);
 			}
@@ -163,29 +190,50 @@ class Trashbin {
 					$versionedFile = $filename;
 				} else {
 					$versionedFile = $file;
-				}
-				if ( $result[0]['type'] == 'dir' ) {
-					$trashbinSize -= self::calculateSize(new \OC_FilesystemView('/'.$user.'/'.'versions_trashbin/'. $file));
-					$view->rename(\OC_Filesystem::normalizePath('versions_trashbin/'. $file), \OC_Filesystem::normalizePath('files_versions/'.$location.'/'.$filename.$ext));
-				} else if ( $versions = self::getVersionsFromTrash($versionedFile, $timestamp) ) {
+				}
+				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('versions_trashbin/'.$versionedFile.'.v'.$v.'.d'.$timestamp);
-							$view->rename('versions_trashbin/'.$versionedFile.'.v'.$v.'.d'.$timestamp, 'files_versions/'.$location.'/'.$filename.$ext.'.v'.$v);
+							$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('versions_trashbin/'.$versionedFile.'.v'.$v);
-							$view->rename('versions_trashbin/'.$versionedFile.'.v'.$v, 'files_versions/'.$location.'/'.$filename.$ext.'.v'.$v);
-						}
-					}
-				}
+							$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');
+				}
+			}
+			
 			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));
 			}
 
-			\OCP\Config::setAppValue('files_trashbin', 'size', $trashbinSize);
+			self::setTrashbinSize($user, $trashbinSize);
+			
 			return true;
 		} else {
 			\OC_Log::write('files_trashbin', 'Couldn\'t restore file from trash bin, '.$filename, \OC_log::ERROR);
@@ -193,107 +241,129 @@ class Trashbin {
 
 		return false;
 	}
-	
-	/**
-	 * delete file from trash bin permanently
+
+	/**
+	 * 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) {
-		$user = \OCP\User::getUser();
-		$view = new \OC_FilesystemView('/'.$user);
-		$size = 0;
+	 * @param $timestamp of deletion time
+	 * @return size of deleted files
+	 */
+	public static function delete($filename, $timestamp=null) {
+		$user = \OCP\User::getUser();
+		$view = new \OC\Files\View('/'.$user);
+		$size = 0;
 	
-		if (  ($trashbinSize = \OCP\Config::getAppValue('files_trashbin', 'size')) === null ) {
-			$trashbinSize = self::calculateSize(new \OC_FilesystemView('/'. $user.'/files_trashbin'));
-			$trashbinSize += self::calculateSize(new \OC_FilesystemView('/'. $user.'/versions_trashbin'));
+		$trashbinSize = self::getTrashbinSize($user);
+		if ( $trashbinSize === false || $trashbinSize < 0 ) {
+			$trashbinSize = self::calculateSize(new \OC\Files\View('/'. $user.'/files_trashbin'));
 		}
-
-		if ( $timestamp ) {
-			$query = \OC_DB::prepare('DELETE FROM *PREFIX*files_trash WHERE user=? AND id=? AND timestamp=?');
-			$query->execute(array($user,$filename,$timestamp));
+
+		if ( $timestamp ) {
+			$query = \OC_DB::prepare('DELETE FROM *PREFIX*files_trash WHERE user=? AND id=? AND timestamp=?');
+			$query->execute(array($user,$filename,$timestamp));
 			$file = $filename.'.d'.$timestamp;
 		} else {
 			$file = $filename;
 		}
-		
+
 		if ( \OCP\App::isEnabled('files_versions') ) {
-			if ($view->is_dir('versions_trashbin/'.$file)) {
-				$size += self::calculateSize(new \OC_Filesystemview('/'.$user.'/versions_trashbin/'.$file));
-				$view->unlink('versions_trashbin/'.$file);
+			if ($view->is_dir('files_trashbin/versions/'.$file)) {
+				$size += self::calculateSize(new \OC\Files\view('/'.$user.'/files_trashbin/versions/'.$file));
+				$view->unlink('files_trashbin/versions/'.$file);
 			} else if ( $versions = self::getVersionsFromTrash($filename, $timestamp) ) {
 				foreach ($versions as $v) {
 					if ($timestamp ) {
-						$size += $view->filesize('/versions_trashbin/'.$filename.'.v'.$v.'.d'.$timestamp);
-						$view->unlink('/versions_trashbin/'.$filename.'.v'.$v.'.d'.$timestamp);
+						$size += $view->filesize('/files_trashbin/versions/'.$filename.'.v'.$v.'.d'.$timestamp);
+						$view->unlink('/files_trashbin/versions/'.$filename.'.v'.$v.'.d'.$timestamp);
 					} else {
-						$size += $view->filesize('/versions_trashbin/'.$filename.'.v'.$v);
-						$view->unlink('/versions_trashbin/'.$filename.'.v'.$v);
+						$size += $view->filesize('/files_trashbin/versions/'.$filename.'.v'.$v);
+						$view->unlink('/files_trashbin/versions/'.$filename.'.v'.$v);
 					}
 				}
 			}
-		}
+		}
+		
+		// Take care of encryption keys
+		$parts = pathinfo($file);
+		if ( $view->is_dir('/files_trashbin/files/'.$file) ) {
+			$keyfile = \OC\Files\Filesystem::normalizePath('files_trashbin/keyfiles/'.$filename);
+		} else {
+			$keyfile = \OC\Files\Filesystem::normalizePath('files_trashbin/keyfiles/'.$filename.'.key');
+		}
+		if ($timestamp) {
+			$keyfile .= '.d'.$timestamp;
+		}
+		if ( \OCP\App::isEnabled('files_encryption') && $view->file_exists($keyfile) ) {
+			if ( $view->is_dir($keyfile) ) {
+				$size += self::calculateSize(new \OC\Files\View('/'.$user.'/'.$keyfile));
+			} else {
+				$size += $view->filesize($keyfile);
+			}
+			$view->unlink($keyfile);
+		}
 	
-		if ($view->is_dir('/files_trashbin/'.$file)) {
-			$size += self::calculateSize(new \OC_Filesystemview('/'.$user.'/files_trashbin/'.$file));
+		if ($view->is_dir('/files_trashbin/files/'.$file)) {
+			$size += self::calculateSize(new \OC\Files\View('/'.$user.'/files_trashbin/files/'.$file));
 		} else {
-			$size += $view->filesize('/files_trashbin/'.$file);
+			$size += $view->filesize('/files_trashbin/files/'.$file);
 		}
-		$view->unlink('/files_trashbin/'.$file);
+		$view->unlink('/files_trashbin/files/'.$file);
 		$trashbinSize -= $size;
-		\OCP\Config::setAppValue('files_trashbin', 'size', $trashbinSize);
-		
-		return $size;
+		self::setTrashbinSize($user, $trashbinSize);
+		
+		return $size;
 	}
-	
-	
-	/**
+
+	/**
+	 * check to see whether a file exists in trashbin
+	 * @param $filename path to the file
+	 * @param $timestamp of deletion time
+	 * @return true if file exists, otherwise false
+	 */
+	public static function file_exists($filename, $timestamp=null) {
+		$user = \OCP\User::getUser();
+		$view = new \OC\Files\View('/'.$user);
+
+		if ($timestamp) {
+			$filename = $filename.'.d'.$timestamp;
+		} else {
+			$filename = $filename;
+		}
+
+		$target = \OC\Files\Filesystem::normalizePath('files_trashbin/files/'.$filename);
+		return $view->file_exists($target);
+	}
+
+	/**
 	 * clean up the trash bin
-	 * @param max. available disk space for trashbin
-	 */
+	 * @param max. available disk space for trashbin
+	 */
 	private static function expire($availableSpace) {
-		
+
 		$user = \OCP\User::getUser();
-		$view = new \OC_FilesystemView('/'.$user);
+		$view = new \OC\Files\View('/'.$user);
 		$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', self::DEFAULT_RETENTION_OBLIGATION);
-		
+
+		$retention_obligation = \OC_Config::getValue('trashbin_retention_obligation',
+			self::DEFAULT_RETENTION_OBLIGATION);
+
 		$limit = time() - ($retention_obligation * 86400);
 
 		foreach ( $result as $r ) {
 			$timestamp = $r['timestamp'];
 			$filename = $r['id'];
 			if ( $r['timestamp'] < $limit ) {
-				if ($view->is_dir('files_trashbin/'.$filename.'.d'.$timestamp)) {
-					$size += self::calculateSize(new \OC_FilesystemView('/'.$user.'/files_trashbin/'.$filename.'.d'.$timestamp));
-				} else {
-					$size += $view->filesize('files_trashbin/'.$filename.'.d'.$timestamp);
-				}
-				$view->unlink('files_trashbin/'.$filename.'.d'.$timestamp);
-				if ($r['type'] == 'dir') {
-					$size += self::calculateSize(new \OC_FilesystemView('/'.$user.'/versions_trashbin/'.$filename.'.d'.$timestamp));
-					$view->unlink('versions_trashbin/'.$filename.'.d'.$timestamp);
-				} else if ( $versions = self::getVersionsFromTrash($filename, $timestamp) ) {
-					foreach ($versions as $v) {
-						$size += $view->filesize('versions_trashbin/'.$filename.'.v'.$v.'.d'.$timestamp);
-						$view->unlink('versions_trashbin/'.$filename.'.v'.$v.'.d'.$timestamp);
-					}			
-				}
+				$size += self::delete($filename, $timestamp);
 			}
 		}
-		
-		$query = \OC_DB::prepare('DELETE FROM *PREFIX*files_trash WHERE user=? AND timestamp<?');
-		$query->execute(array($user,$limit));
-		
 		$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;
@@ -303,15 +373,16 @@ class Trashbin {
 				$size += $tmp;
 				$i++;
 			}
-			
+
+
 		}
-		
-		return $size;
+
+		return $size;
 	}
-	
+
 	/**
 	 * recursive copy to copy a whole directory
-	 * 
+	 *
 	 * @param $source source path, relative to the users files directory
 	 * @param $destination destination path relative to the users root directoy
 	 * @param $view file view for the users root directory
@@ -338,15 +409,15 @@ class Trashbin {
 		}
 		return $size;
 	}
-	
+
 	/**
 	 * find all versions which belong to the file we want to restore
 	 * @param $filename name of the file which should be restored
 	 * @param $timestamp timestamp when the file was deleted
 	 */
 	private static function getVersionsFromTrash($filename, $timestamp) {
-		$view = new \OC_FilesystemView('/'.\OCP\User::getUser().'/versions_trashbin');
-		$versionsName = \OCP\Config::getSystemValue('datadirectory').$view->getAbsolutePath($filename);
+		$view = new \OC\Files\View('/'.\OCP\User::getUser().'/files_trashbin/versions');
+		$versionsName = $view->getLocalFile($filename);
 		$versions = array();
 		if ($timestamp ) {
 			// fetch for old versions
@@ -354,20 +425,20 @@ class Trashbin {
 			$offset = -strlen($timestamp)-2;
 		} else {
 			$matches = glob( $versionsName.'.v*' );
-		}
-		
+		}
+
 		foreach( $matches as $ma ) {
 			if ( $timestamp ) {
-				$parts = explode( '.v', substr($ma, 0, $offset) );
+				$parts = explode( '.v', substr($ma, 0, $offset) );
 				$versions[] = ( end( $parts ) );
 			} else {
-				$parts = explode( '.v', $ma );
+				$parts = explode( '.v', $ma );
 				$versions[] = ( end( $parts ) );
 			}
 		}
 		return $versions;
 	}
-	
+
 	/**
 	 * find unique extension for restored file if a file with the same name already exists
 	 * @param $location where the file should be restored
@@ -376,36 +447,71 @@ class Trashbin {
 	 * @return string with unique extension
 	 */
 	private static function getUniqueExtension($location, $filename, $view) {
-		$ext = '';
-		if ( $view->file_exists('files'.$location.'/'.$filename) ) {
-			$tmpext = '.restored';
-			$ext = $tmpext;
-			$i = 1;
-			while ( $view->file_exists('files'.$location.'/'.$filename.$ext) ) {
-				$ext = $tmpext.$i;
-				$i++;
-			}
+		$ext = '';
+		if ( $view->file_exists('files'.$location.'/'.$filename) ) {
+			$tmpext = '.restored';
+			$ext = $tmpext;
+			$i = 1;
+			while ( $view->file_exists('files'.$location.'/'.$filename.$ext) ) {
+				$ext = $tmpext.$i;
+				$i++;
+			}
 		}
 		return $ext;
 	}
 
-	/**
+	/**
 	 * @brief get the size from a given root folder
-	 * @param $view file view on the root folder
-	 * @return size of the folder
-	 */
-	private static function calculateSize($view) {
-		$root = \OCP\Config::getSystemValue('datadirectory').$view->getAbsolutePath('');
-		$iterator = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($root), \RecursiveIteratorIterator::CHILD_FIRST);
-		$size = 0;
-		
+	 * @param $view file view on the root folder
+	 * @return size of the folder
+	 */
+	private static function calculateSize($view) {
+		$root = \OCP\Config::getSystemValue('datadirectory').$view->getAbsolutePath('');
+		if (!file_exists($root)) {
+			return 0;
+		}
+		$iterator = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($root),
+			\RecursiveIteratorIterator::CHILD_FIRST);
+		$size = 0;
+
 		foreach ($iterator as $path) {
 			$relpath = substr($path, strlen($root)-1);
 			if ( !$view->is_dir($relpath) ) {
 				$size += $view->filesize($relpath);
-			}
-		}
-		return $size;
+			}
+		}
+		return $size;
+	}
+
+	/**
+	 * get current size of trash bin from a given user
+	 *
+	 * @param $user user who owns the trash bin
+	 * @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=?');
+		$result = $query->execute(array($user))->fetchAll();
+
+		if ($result) {
+			return $result[0]['size'];
+		}
+		return false;
+	}
+	
+	/**
+	 * write to the database how much space is in use for the trash bin
+	 *
+	 * @param $user owner of the trash bin
+	 * @param $size size of the trash bin
+	 */
+	private static function setTrashbinSize($user, $size) {
+		if ( self::getTrashbinSize($user) === false) {
+			$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->execute(array($size, $user));
 	}
 	
-}
+}
diff --git a/apps/files_trashbin/templates/index.php b/apps/files_trashbin/templates/index.php
index c3e51b4becdfe4d5aad5e30a61c508453416000f..cb5edaa2c91e4718dbb678f3d8943ab9b0575ba9 100644
--- a/apps/files_trashbin/templates/index.php
+++ b/apps/files_trashbin/templates/index.php
@@ -1,34 +1,41 @@
 <!--[if IE 8]><style>input[type="checkbox"]{padding:0;}table td{position:static !important;}</style><![endif]-->
 <div id="controls">
-	<?php echo($_['breadcrumb']); ?>
+	<?php print_unescaped($_['breadcrumb']); ?>
 		<div id="file_action_panel"></div>
 </div>
 <div id='notification'></div>
 
-<?php if (isset($_['files']) && count($_['files'])==0):?>
-	<div id="emptyfolder"><?php echo $l->t('Nothing in here. Your trash bin is empty!')?></div>
+<?php if (isset($_['files']) && count($_['files'])==0 && $_['dirlisting'] == false):?>
+	<div id="emptyfolder"><?php p($l->t('Nothing in here. Your trash bin is empty!'))?></div>
 <?php endif; ?>
 
-<table>
+<table id="filestable">
 	<thead>
 		<tr>
 			<th id='headerName'>
 				<input type="checkbox" id="select_all" />
-				<span class='name'><?php echo $l->t( 'Name' ); ?></span>
+				<span class='name'><?php p($l->t( 'Name' )); ?></span>
 				<span class='selectedActions'>
 						<a href="" class="undelete">
-							<img class="svg" alt="<?php echo $l->t( 'Restore' ); ?>"
-								 src="<?php echo OCP\image_path("core", "actions/undelete.png"); ?>" />
-							<?php echo $l->t('Restore')?>
+							<img class="svg" alt="<?php p($l->t( 'Restore' )); ?>"
+								 src="<?php print_unescaped(OCP\image_path("core", "actions/undelete.png")); ?>" />
+							<?php p($l->t('Restore'))?>
 						</a>
 				</span>
 			</th>
 			<th id="headerDate">
-				<span id="modified"><?php echo $l->t( 'Deleted' ); ?></span>
+				<span id="modified"><?php p($l->t( 'Deleted' )); ?></span>
+				<span class="selectedActions">
+					<a href="" class="delete">
+						<?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")); ?>" />
+					</a>
+				</span>
 			</th>
 		</tr>
 	</thead>
 	<tbody id="fileList">
-		<?php echo($_['fileList']); ?>
+		<?php print_unescaped($_['fileList']); ?>
 	</tbody>
 </table>
diff --git a/apps/files_trashbin/templates/part.breadcrumb.php b/apps/files_trashbin/templates/part.breadcrumb.php
new file mode 100644
index 0000000000000000000000000000000000000000..2801e04e9ad9d5fc1ad15d77cbe4f1fbf62064d7
--- /dev/null
+++ b/apps/files_trashbin/templates/part.breadcrumb.php
@@ -0,0 +1,20 @@
+<div class="crumb">
+		<a href="<?php print_unescaped($_['home']); ?>">
+			<img src="<?php print_unescaped(OCP\image_path('core', 'places/home.svg'));?>" class="svg" />
+		</a>
+</div>
+<?php if(count($_["breadcrumb"])):?>
+	<div class="crumb svg"
+		 data-dir='<?php print_unescaped($_['baseURL']); ?>'>
+	<a href="<?php p($_['baseURL']); ?>"><?php p($l->t("Deleted Files")); ?></a>
+	</div>
+<?php endif;?>
+<?php for($i=0; $i<count($_["breadcrumb"]); $i++):
+	$crumb = $_["breadcrumb"][$i];
+	$dir = str_replace('+', '%20', urlencode($crumb["dir"]));
+	$dir = str_replace('%2F', '/', $dir); ?>
+	<div class="crumb <?php if($i == count($_["breadcrumb"])-1) p('last');?> svg"
+		 data-dir='<?php p($dir);?>'>
+	<a href="<?php p($_['baseURL'].$dir); ?>"><?php p($crumb["name"]); ?></a>
+	</div>
+<?php endfor;
diff --git a/apps/files_trashbin/templates/part.list.php b/apps/files_trashbin/templates/part.list.php
index fe8a71f44e6514c3ee04af38a310fca3c3e97d34..92a38bd26350ce2bca8c382eba06fa8db05372a8 100644
--- a/apps/files_trashbin/templates/part.list.php
+++ b/apps/files_trashbin/templates/part.list.php
@@ -1,59 +1,55 @@
-<input type="hidden" id="disableSharing" data-status="<?php echo $_['disableSharing']; ?>">
+<input type="hidden" id="disableSharing" data-status="<?php p($_['disableSharing']); ?>">
 <?php foreach($_['files'] as $file):
-	$simple_file_size = OCP\simple_file_size($file['size']);
-	// the bigger the file, the darker the shade of grey; megabytes*2
-	$simple_size_color = intval(200-$file['size']/(1024*1024)*2);
-	if($simple_size_color<0) $simple_size_color = 0;
 	$relative_deleted_date = OCP\relative_modified_date($file['timestamp']);
 	// the older the file, the brighter the shade of grey; days*14
-	$relative_date_color = round((time()-$file['mtime'])/60/60/24*14);
+	$relative_date_color = round((time()-$file['date'])/60/60/24*14);
 	if($relative_date_color>200) $relative_date_color = 200;
 	$name = str_replace('+', '%20', urlencode($file['name']));
 	$name = str_replace('%2F', '/', $name);
 	$directory = str_replace('+', '%20', urlencode($file['directory']));
 	$directory = str_replace('%2F', '/', $directory); ?>
-	<tr data-filename="<?php echo $file['name'];?>"
-		data-type="<?php echo ($file['type'] == 'dir')?'dir':'file'?>"
-		data-mime="<?php echo $file['mimetype']?>"
-		data-permissions='<?php echo $file['permissions']; ?>'
+	<tr data-filename="<?php p($file['name']);?>"
+		data-type="<?php ($file['type'] == 'dir')?p('dir'):p('file')?>"
+		data-mime="<?php p($file['mimetype'])?>"
+		data-permissions='<?php p($file['permissions']); ?>'
 		<?php if ( $_['dirlisting'] ): ?>
-		id="<?php echo $file['directory'].'/'.$file['name'];?>"
-		data-file="<?php echo $file['directory'].'/'.$file['name'];?>"
+		id="<?php p($file['directory'].'/'.$file['name']);?>"
+		data-file="<?php p($file['directory'].'/'.$file['name']);?>"
 		data-timestamp=''
 		data-dirlisting=1
 		<?php  else: ?>
-		id="<?php echo $file['name'].'.d'.$file['timestamp'];?>"
-		data-file="<?php echo $file['name'].'.d'.$file['timestamp'];?>"
-		data-timestamp='<?php echo $file['timestamp'];?>'
+		id="<?php p($file['name'].'.d'.$file['timestamp']);?>"
+		data-file="<?php p($file['name'].'.d'.$file['timestamp']);?>"
+		data-timestamp='<?php p($file['timestamp']);?>'
 		data-dirlisting=0
 		<?php endif; ?>>
 		<td class="filename svg"
 		<?php if($file['type'] == 'dir'): ?>
-			style="background-image:url(<?php echo OCP\mimetype_icon('dir'); ?>)"
+			style="background-image:url(<?php print_unescaped(OCP\mimetype_icon('dir')); ?>)"
 		<?php else: ?>
-			style="background-image:url(<?php echo OCP\mimetype_icon($file['mimetype']); ?>)"
+			style="background-image:url(<?php print_unescaped(OCP\mimetype_icon($file['mimetype'])); ?>)"
 		<?php endif; ?>
 			>
 		<?php if(!isset($_['readonly']) || !$_['readonly']): ?><input type="checkbox" /><?php endif; ?>
 		<?php if($file['type'] == 'dir'): ?>
 			<?php if( $_['dirlisting'] ): ?>
-				<a class="name" href="<?php echo $_['baseURL'].'/'.$name; ?>" title="">
+				<a class="name" href="<?php p($_['baseURL'].'/'.$name); ?>" title="">
 			<?php else: ?>
-				<a class="name" href="<?php echo $_['baseURL'].'/'.$name.'.d'.$file['timestamp']; ?>" title="">
+				<a class="name" href="<?php p($_['baseURL'].'/'.$name.'.d'.$file['timestamp']); ?>" title="">
 			<?php endif; ?>
 		<?php else: ?>
 			<?php if( $_['dirlisting'] ): ?>
-				<a class="name" href="<?php echo $_['downloadURL'].'/'.$name; ?>" title="">
+				<a class="name" href="<?php p($_['downloadURL'].'/'.$name); ?>" title="">
 			<?php else: ?>
-				<a class="name" href="<?php echo $_['downloadURL'].'/'.$name.'.d'.$file['timestamp'];?>" title="">
+				<a class="name" href="<?php p($_['downloadURL'].'/'.$name.'.d'.$file['timestamp']);?>" title="">
 			<?php endif; ?>
 		<?php endif; ?>
 			<span class="nametext">
 				<?php if($file['type'] == 'dir'):?>
-					<?php echo htmlspecialchars($file['name']);?>
+					<?php print_unescaped(htmlspecialchars($file['name']));?>
 				<?php else:?>
-					<?php echo htmlspecialchars($file['basename']);?><span
-						class='extension'><?php echo $file['extension'];?></span>
+					<?php print_unescaped(htmlspecialchars($file['basename']));?><span
+						class='extension'><?php p($file['extension']);?></span>
 				<?php endif;?>
 			</span>
 			<?php if($file['type'] == 'dir'):?>
@@ -64,13 +60,12 @@
 		</td>
 		<td class="date">
 			<span class="modified"
-				  title="<?php echo $file['date']; ?>"
-				  style="color:rgb(<?php echo $relative_date_color.','
+				  title="<?php p($file['date']); ?>"
+				  style="color:rgb(<?php p($relative_date_color.','
 												.$relative_date_color.','
-												.$relative_date_color ?>)">
-				<?php echo $relative_deleted_date; ?>
+												.$relative_date_color) ?>)">
+				<?php p($relative_deleted_date); ?>
 			</span>
 		</td>
 	</tr>
 <?php endforeach;
- 
\ No newline at end of file
diff --git a/apps/files_versions/ajax/getVersions.php b/apps/files_versions/ajax/getVersions.php
index 53fc04625c652ebaf27289b8a5c73ddbfa53399c..f9174c45a650a2acd4f44c42c4f3fbc05c7f7749 100644
--- a/apps/files_versions/ajax/getVersions.php
+++ b/apps/files_versions/ajax/getVersions.php
@@ -1,11 +1,10 @@
 <?php
 OCP\JSON::checkAppEnabled('files_versions');
 
-$userDirectory = "/".OCP\USER::getUser()."/files";
 $source = $_GET['source'];
-
+list ($uid, $filename) = OCA\Files_Versions\Storage::getUidAndFilename($source);
 $count = 5; //show the newest revisions
-if( ($versions = OCA\Files_Versions\Storage::getVersions( $source, $count)) ) {
+if( ($versions = OCA\Files_Versions\Storage::getVersions($uid, $filename, $count)) ) {
 
 	$versionsFormatted = array();
 
diff --git a/apps/files_versions/ajax/rollbackVersion.php b/apps/files_versions/ajax/rollbackVersion.php
index 2970915ac6360dddd22b47589a6d2ae8d128f73c..284b46ee09331867fea83d8d1f6e6f958ab6feab 100644
--- a/apps/files_versions/ajax/rollbackVersion.php
+++ b/apps/files_versions/ajax/rollbackVersion.php
@@ -14,4 +14,3 @@ if(OCA\Files_Versions\Storage::rollback( $file, $revision )) {
 	$l = OC_L10N::get('files_versions');
 	OCP\JSON::error(array("data" => array( "message" => $l->t("Could not revert: %s", array($file) ))));
 }
-
diff --git a/apps/files_versions/ajax/togglesettings.php b/apps/files_versions/ajax/togglesettings.php
deleted file mode 100644
index 546b37ae1aa85dc31054d759f681ed6aca633a09..0000000000000000000000000000000000000000
--- a/apps/files_versions/ajax/togglesettings.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-OCP\JSON::checkAppEnabled('files_versions');
-OCP\JSON::checkAdminUser();
-OCP\JSON::callCheck();
-if (OCP\Config::getSystemValue('versions', 'true')=='true') {
-	OCP\Config::setSystemValue('versions', 'false');
-} else {
-	OCP\Config::setSystemValue('versions', 'true');
-}
diff --git a/apps/files_versions/appinfo/app.php b/apps/files_versions/appinfo/app.php
index f7c6989ce2dc3bca084e3c693fe4962850f865ef..44d01f5cd5e893d8e62d3010fd6db638301f43cf 100644
--- a/apps/files_versions/appinfo/app.php
+++ b/apps/files_versions/appinfo/app.php
@@ -1,16 +1,13 @@
 <?php
 
 //require_once 'files_versions/versions.php';
-OC::$CLASSPATH['OCA\Files_Versions\Storage'] = 'apps/files_versions/lib/versions.php';
-OC::$CLASSPATH['OCA\Files_Versions\Hooks'] = 'apps/files_versions/lib/hooks.php';
-
-OCP\App::registerAdmin('files_versions', 'settings');
-OCP\App::registerPersonal('files_versions', 'settings-personal');
+OC::$CLASSPATH['OCA\Files_Versions\Storage'] = 'files_versions/lib/versions.php';
+OC::$CLASSPATH['OCA\Files_Versions\Hooks'] = 'files_versions/lib/hooks.php';
 
 OCP\Util::addscript('files_versions', 'versions');
 
 // Listen to write signals
 OCP\Util::connectHook('OC_Filesystem', 'write', "OCA\Files_Versions\Hooks", "write_hook");
 // Listen to delete and rename signals
-OCP\Util::connectHook('OC_Filesystem', 'post-delete', "OCA\Files_Versions\Hooks", "remove_hook");
+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");
diff --git a/apps/files_versions/appinfo/database.xml b/apps/files_versions/appinfo/database.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d385477698069402d94def7609e88dbfb24bce1e
--- /dev/null
+++ b/apps/files_versions/appinfo/database.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<database>
+
+ <name>*dbname*</name>
+ <create>true</create>
+ <overwrite>false</overwrite>
+
+ <charset>utf8</charset>
+
+ <table>
+
+  <name>*dbprefix*files_versions</name>
+
+  <declaration>
+
+   <field>
+    <name>user</name>
+    <type>text</type>
+    <default></default>
+    <notnull>true</notnull>
+    <length>64</length>
+   </field>
+   <field>
+    <name>size</name>
+    <type>text</type>
+    <default></default>
+    <notnull>true</notnull>
+    <length>50</length>
+   </field>
+   
+  </declaration>
+
+ </table>
+
+</database>
diff --git a/apps/files_versions/appinfo/info.xml b/apps/files_versions/appinfo/info.xml
index 0155f8e830ff790b1ffe5ef09adea73248f85a74..44878da5e4d8ccabc2d4bd9a45a5ec5616fc54da 100644
--- a/apps/files_versions/appinfo/info.xml
+++ b/apps/files_versions/appinfo/info.xml
@@ -4,7 +4,7 @@
 	<name>Versions</name>
 	<licence>AGPL</licence>
 	<author>Frank Karlitschek</author>
-	<require>4.91</require>
+	<require>4.93</require>
 	<shipped>true</shipped>
 	<description>Versioning of files</description>
 	<types>
diff --git a/apps/files_versions/appinfo/version b/apps/files_versions/appinfo/version
index e6d5cb833c634c4e2972335825d1100492e7c96b..e4c0d46e55ffb2237c9e900aa77172886f6c8aa5 100644
--- a/apps/files_versions/appinfo/version
+++ b/apps/files_versions/appinfo/version
@@ -1 +1 @@
-1.0.2
\ No newline at end of file
+1.0.3
\ No newline at end of file
diff --git a/apps/files_versions/history.php b/apps/files_versions/history.php
index 437a3fec0652c281c9ea351e1bbab926d6550180..719a7208fedb1effff25b7b8366812279952fa73 100644
--- a/apps/files_versions/history.php
+++ b/apps/files_versions/history.php
@@ -59,7 +59,8 @@ if ( isset( $_GET['path'] ) ) {
 
 	// show the history only if there is something to show
 	$count = 999; //show the newest revisions
-	if( ($versions = OCA\Files_Versions\Storage::getVersions( $path, $count)) ) {
+	list ($uid, $filename) = OCA\Files_Versions\Storage::getUidAndFilename($path);
+	if( ($versions = OCA\Files_Versions\Storage::getVersions($uid, $filename, $count)) ) {
 
 		$tmpl->assign( 'versions', array_reverse( $versions ) );
 
diff --git a/apps/files_versions/js/versions.js b/apps/files_versions/js/versions.js
index b9c54689813be409332a467055674047cf8dd0e5..a5b244174831654ac1277f419943c7e561337383 100644
--- a/apps/files_versions/js/versions.js
+++ b/apps/files_versions/js/versions.js
@@ -1,19 +1,9 @@
-$(document).ready(function() {
-        $('#versions').bind('change', function() {
-                var checked = 1;
-                if (!this.checked) {
-                        checked = 0;
-                }
-                $.post(OC.filePath('files_versions','ajax','togglesettings.php'), 'versions='+checked);
-        });
-});
-
 $(document).ready(function(){
 	if (typeof FileActions !== 'undefined') {
-		// Add history button to 'files/index.php'
+		// Add versions button to 'files/index.php'
 		FileActions.register(
 			'file'
-			, t('files_versions', 'History')
+			, t('files_versions', 'Versions')
 			, OC.PERMISSION_UPDATE
 			, function() {
 				// Specify icon for hitory button
@@ -41,6 +31,10 @@ $(document).ready(function(){
 	}
 });
 
+function goToVersionPage(url){
+	window.location.assign(url);
+}
+
 function createVersionsDropdown(filename, files) {
 
 	var historyUrl = OC.linkTo('files_versions', 'history.php') + '?path='+encodeURIComponent( $( '#dir' ).val() ).replace( /%2F/g, '/' )+'/'+encodeURIComponent( filename );
@@ -51,7 +45,7 @@ function createVersionsDropdown(filename, files) {
 	html += '<option value=""></option>';
 	html += '</select>';
 	html += '</div>';
-	html += '<input type="button" value="All versions..." onclick="window.location=\''+historyUrl+'\'" name="makelink" id="makelink" />';
+	html += '<input type="button" value="All versions..." name="makelink" id="makelink" />';
 	html += '<input id="link" style="display:none; width:90%;" />';
 
 	if (filename) {
@@ -61,6 +55,10 @@ function createVersionsDropdown(filename, files) {
 		$(html).appendTo($('thead .share'));
 	}
 
+	$("#makelink").click(function() {
+		goToVersionPage(historyUrl);
+	});
+
 	$.ajax({
 		type: 'GET',
 		url: OC.filePath('files_versions', 'ajax', 'getVersions.php'),
diff --git a/apps/files_versions/l10n/ar.php b/apps/files_versions/l10n/ar.php
index 1f1f3100405941888a419eb9dcf8fff0c7496af4..b84445972d35eb2ac6efca53e5a037366fffef6a 100644
--- a/apps/files_versions/l10n/ar.php
+++ b/apps/files_versions/l10n/ar.php
@@ -1,5 +1,3 @@
 <?php $TRANSLATIONS = array(
-"History" => "السجل الزمني",
-"Files Versioning" => "أصدرة الملفات",
-"Enable" => "تفعيل"
+"Versions" => "الإصدارات"
 );
diff --git a/apps/files_versions/l10n/bg_BG.php b/apps/files_versions/l10n/bg_BG.php
index 6ecf12d0b00c50686c7a413e339db78a6e3c764b..6a1882c2bfddb954b77451753f671f4cabc45ef9 100644
--- a/apps/files_versions/l10n/bg_BG.php
+++ b/apps/files_versions/l10n/bg_BG.php
@@ -1,4 +1,3 @@
 <?php $TRANSLATIONS = array(
-"History" => "История",
-"Enable" => "Включено"
+"Versions" => "Версии"
 );
diff --git a/apps/files_versions/l10n/bn_BD.php b/apps/files_versions/l10n/bn_BD.php
index dffa4d79a06f72c21afa13fd361bb5041512aa1e..f3b0071a356113deb1855f60080875bc13bff700 100644
--- a/apps/files_versions/l10n/bn_BD.php
+++ b/apps/files_versions/l10n/bn_BD.php
@@ -1,5 +1,3 @@
 <?php $TRANSLATIONS = array(
-"History" => "ইতিহাস",
-"Files Versioning" => "ফাইল ভার্সন করা",
-"Enable" => "সক্রিয় "
+"Versions" => "ভার্সন"
 );
diff --git a/apps/files_versions/l10n/ca.php b/apps/files_versions/l10n/ca.php
index fc900c47dc7e5b857f11170c34d05fda8de2e785..433d974c8cb041d24d11c6caf0324f407cd4afb9 100644
--- a/apps/files_versions/l10n/ca.php
+++ b/apps/files_versions/l10n/ca.php
@@ -6,8 +6,6 @@
 "File %s could not be reverted to version %s" => "El fitxer %s no s'ha pogut revertir a la versió %s",
 "No old versions available" => "No hi ha versións antigues disponibles",
 "No path specified" => "No heu especificat el camí",
-"History" => "Historial",
-"Revert a file to a previous version by clicking on its revert button" => "Reverteix un fitxer a una versió anterior fent clic en el seu botó de reverteix",
-"Files Versioning" => "Fitxers de Versions",
-"Enable" => "Habilita"
+"Versions" => "Versions",
+"Revert a file to a previous version by clicking on its revert button" => "Reverteix un fitxer a una versió anterior fent clic en el seu botó de reverteix"
 );
diff --git a/apps/files_versions/l10n/cs_CZ.php b/apps/files_versions/l10n/cs_CZ.php
index 22d4a2ad827235619e465c7712732c96797aab6f..087d800137e7a1f5bf10c089ac5db8122a436e85 100644
--- a/apps/files_versions/l10n/cs_CZ.php
+++ b/apps/files_versions/l10n/cs_CZ.php
@@ -6,8 +6,6 @@
 "File %s could not be reverted to version %s" => "Soubor %s nemohl být navrácen na verzi %s",
 "No old versions available" => "Nejsou dostupné žádné starší verze",
 "No path specified" => "Nezadána cesta",
-"History" => "Historie",
-"Revert a file to a previous version by clicking on its revert button" => "Navraťte soubor do předchozí verze kliknutím na tlačítko navrátit",
-"Files Versioning" => "Verzování souborů",
-"Enable" => "Povolit"
+"Versions" => "Verze",
+"Revert a file to a previous version by clicking on its revert button" => "Navraťte soubor do předchozí verze kliknutím na tlačítko navrátit"
 );
diff --git a/apps/files_versions/l10n/da.php b/apps/files_versions/l10n/da.php
index 93fcb9c99cf6f57157ce2a14d475fd16aac33c1c..447a3d2b85df8f4e0367eef94eada8119f1b6e8c 100644
--- a/apps/files_versions/l10n/da.php
+++ b/apps/files_versions/l10n/da.php
@@ -6,8 +6,6 @@
 "File %s could not be reverted to version %s" => "Filen %s blev genskabt til version: %s",
 "No old versions available" => "Ingen gamle version tilgængelige",
 "No path specified" => "Ingen sti specificeret",
-"History" => "Historik",
-"Revert a file to a previous version by clicking on its revert button" => "Genskab en fil til en tidligere version ved at klikke på denne genskab knap.",
-"Files Versioning" => "Versionering af filer",
-"Enable" => "Aktiver"
+"Versions" => "Versioner",
+"Revert a file to a previous version by clicking on its revert button" => "Genskab en fil til en tidligere version ved at klikke på denne genskab knap."
 );
diff --git a/apps/files_versions/l10n/de.php b/apps/files_versions/l10n/de.php
index f62043dade2bcf46f3471aacdf597015e8c0f8b8..c34a8c1fd3ed3e67291c3d79f44a7b31b2cc0672 100644
--- a/apps/files_versions/l10n/de.php
+++ b/apps/files_versions/l10n/de.php
@@ -6,8 +6,6 @@
 "File %s could not be reverted to version %s" => "Datei %s konnte nicht auf Version %s zurückgesetzt werden",
 "No old versions available" => "Keine älteren Versionen verfügbar",
 "No path specified" => "Kein Pfad angegeben",
-"History" => "Historie",
-"Revert a file to a previous version by clicking on its revert button" => "Setzen Sie eine Datei durch klicken auf den Zurücksetzen Button zurück",
-"Files Versioning" => "Dateiversionierung",
-"Enable" => "Aktivieren"
+"Versions" => "Versionen",
+"Revert a file to a previous version by clicking on its revert button" => "Setze eine Datei durch klicken auf den Zurücksetzen Button zurück"
 );
diff --git a/apps/files_versions/l10n/de_DE.php b/apps/files_versions/l10n/de_DE.php
index 1cf2a63a1de0696a15847a10cc26e9fc84458711..c0b2f2a83f77bbdd8b16a993d6d174f83e902453 100644
--- a/apps/files_versions/l10n/de_DE.php
+++ b/apps/files_versions/l10n/de_DE.php
@@ -4,10 +4,8 @@
 "File %s was reverted to version %s" => "Die Datei %s wurde zur 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",
-"No old versions available" => "keine älteren Versionen verfügbar",
+"No old versions available" => "Keine älteren Versionen verfügbar",
 "No path specified" => "Kein Pfad angegeben",
-"History" => "Historie",
-"Revert a file to a previous version by clicking on its revert button" => "Setze eine Datei durch Klicken, auf den Zurücksetzen-Button, auf einer frühere Version zurück",
-"Files Versioning" => "Dateiversionierung",
-"Enable" => "Aktivieren"
+"Versions" => "Versionen",
+"Revert a file to a previous version by clicking on its revert button" => "Setze eine Datei durch Klicken auf den Zurücksetzen-Button auf eine frühere Version zurück"
 );
diff --git a/apps/files_versions/l10n/el.php b/apps/files_versions/l10n/el.php
index 8b7ecf085fb6b20fb96c56d0836b664a49d6f0e1..6e1900b233b7a5ca016a93f1a9c710a2edc37108 100644
--- a/apps/files_versions/l10n/el.php
+++ b/apps/files_versions/l10n/el.php
@@ -6,8 +6,5 @@
 "File %s could not be reverted to version %s" => "Το αρχείο %s δεν είναι δυνατό να επαναφερθεί στην έκδοση %s",
 "No old versions available" => "Μη διαθέσιμες παλιές εκδόσεις",
 "No path specified" => "Δεν καθορίστηκε διαδρομή",
-"History" => "Ιστορικό",
-"Revert a file to a previous version by clicking on its revert button" => "Επαναφορά ενός αρχείου σε προηγούμενη έκδοση πατώντας στο κουμπί επαναφοράς",
-"Files Versioning" => "Εκδόσεις Αρχείων",
-"Enable" => "Ενεργοποίηση"
+"Revert a file to a previous version by clicking on its revert button" => "Επαναφορά ενός αρχείου σε προηγούμενη έκδοση πατώντας στο κουμπί επαναφοράς"
 );
diff --git a/apps/files_versions/l10n/es.php b/apps/files_versions/l10n/es.php
index 608e171a4b12a99b7f5efc4c043e77787675b1eb..8c1a30f822aeba4dbba2b3217cdce06a10d2bdb2 100644
--- a/apps/files_versions/l10n/es.php
+++ b/apps/files_versions/l10n/es.php
@@ -6,8 +6,6 @@
 "File %s could not be reverted to version %s" => "El archivo %s no puede ser revertido a la version %s",
 "No old versions available" => "No hay versiones antiguas disponibles",
 "No path specified" => "Ruta no especificada",
-"History" => "Historial",
-"Revert a file to a previous version by clicking on its revert button" => "Revertir un archivo a una versión anterior haciendo clic en el boton de revertir",
-"Files Versioning" => "Versionado de archivos",
-"Enable" => "Habilitar"
+"Versions" => "Revisiones",
+"Revert a file to a previous version by clicking on its revert button" => "Revertir un archivo a una versión anterior haciendo clic en el boton de revertir"
 );
diff --git a/apps/files_versions/l10n/es_AR.php b/apps/files_versions/l10n/es_AR.php
index dc604e2a9c8930bd6e3335e0bd744eb50ae284db..363693c913b86701f400256af6bef2289c1c7d77 100644
--- a/apps/files_versions/l10n/es_AR.php
+++ b/apps/files_versions/l10n/es_AR.php
@@ -6,8 +6,6 @@
 "File %s could not be reverted to version %s" => "El archivo %s no pudo ser revertido a la versión %s",
 "No old versions available" => "No hay versiones antiguas disponibles",
 "No path specified" => "Ruta de acceso no especificada",
-"History" => "Historia",
-"Revert a file to a previous version by clicking on its revert button" => "Revertí un archivo a una versión anterior haciendo click en su botón de \"revertir\"",
-"Files Versioning" => "Versionado de archivos",
-"Enable" => "Activar"
+"Versions" => "Versiones",
+"Revert a file to a previous version by clicking on its revert button" => "Revertí un archivo a una versión anterior haciendo click en su botón de \"revertir\""
 );
diff --git a/apps/files_versions/l10n/et_EE.php b/apps/files_versions/l10n/et_EE.php
index 4aa80c4f55e7d478898a9877aa8767109592648c..fa2a33f9dda11cef85b7f15bfa58a74d756c4604 100644
--- a/apps/files_versions/l10n/et_EE.php
+++ b/apps/files_versions/l10n/et_EE.php
@@ -2,8 +2,5 @@
 "success" => "korras",
 "failure" => "ebaõnnestus",
 "No old versions available" => "Vanu versioone pole saadaval",
-"No path specified" => "Asukohta pole määratud",
-"History" => "Ajalugu",
-"Files Versioning" => "Failide versioonihaldus",
-"Enable" => "Luba"
+"No path specified" => "Asukohta pole määratud"
 );
diff --git a/apps/files_versions/l10n/eu.php b/apps/files_versions/l10n/eu.php
index d7f7a796639a079b3799c22277ed6bbac57e2b13..2a7f279af16ebe97f40838ec90b346496d915a4a 100644
--- a/apps/files_versions/l10n/eu.php
+++ b/apps/files_versions/l10n/eu.php
@@ -6,8 +6,6 @@
 "File %s could not be reverted to version %s" => "%s fitxategia ezin da %s bertsiora leheneratu",
 "No old versions available" => "Ez dago bertsio zaharrik eskuragarri",
 "No path specified" => "Ez da bidea zehaztu",
-"History" => "Historia",
-"Revert a file to a previous version by clicking on its revert button" => "Itzuli fitxategi bat aurreko bertsio batera leheneratu bere leheneratu botoia sakatuz",
-"Files Versioning" => "Fitxategien Bertsioak",
-"Enable" => "Gaitu"
+"Versions" => "Bertsioak",
+"Revert a file to a previous version by clicking on its revert button" => "Itzuli fitxategi bat aurreko bertsio batera leheneratu bere leheneratu botoia sakatuz"
 );
diff --git a/apps/files_versions/l10n/fa.php b/apps/files_versions/l10n/fa.php
index 9b618fdd320ddfde7bf0b49010aa024c9a3a96ed..4ec6aa1bbb434d1a2f4aa95e8b7c3fc2fc6ce0fb 100644
--- a/apps/files_versions/l10n/fa.php
+++ b/apps/files_versions/l10n/fa.php
@@ -1,4 +1,8 @@
 <?php $TRANSLATIONS = array(
-"History" => "تاریخچه",
-"Enable" => "فعال"
+"Could not revert: %s" => "بازگردانی امکان ناپذیر است: %s",
+"success" => "موفقیت",
+"failure" => "شکست",
+"No old versions available" => "هیچ نسخه قدیمی در دسترس نیست",
+"No path specified" => "هیچ مسیری مشخص نشده است",
+"Revert a file to a previous version by clicking on its revert button" => "بازگردانی یک پرورنده به نسخه قدیمی اش از  طریق دکمه بازگردانی امکان پذیر است"
 );
diff --git a/apps/files_versions/l10n/fi_FI.php b/apps/files_versions/l10n/fi_FI.php
index 61e073d4e06953b7108ac830845cc23462601801..0dec7fc2580469145ed99fcade72ad5cf14dcaa0 100644
--- a/apps/files_versions/l10n/fi_FI.php
+++ b/apps/files_versions/l10n/fi_FI.php
@@ -6,8 +6,5 @@
 "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 path specified" => "Polkua ei ole määritetty",
-"History" => "Historia",
-"Revert a file to a previous version by clicking on its revert button" => "Palauta tiedoston edellinen versio napsauttamalla palautuspainiketta",
-"Files Versioning" => "Tiedostojen versiointi",
-"Enable" => "Käytä"
+"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 6b2cf9ba6b5f141fd8b87e7447eb81f6e427aacd..76ad8fc97a6b8dff2f161e95fab4e2ce33efc17f 100644
--- a/apps/files_versions/l10n/fr.php
+++ b/apps/files_versions/l10n/fr.php
@@ -6,8 +6,5 @@
 "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é",
-"History" => "Historique",
-"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",
-"Files Versioning" => "Versionnage des fichiers",
-"Enable" => "Activer"
+"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/gl.php b/apps/files_versions/l10n/gl.php
index b822b223cc1fba2049dc848df2adbec4ba3412dd..586ef8c3a68efafd303c8dc4daa7db15b676e139 100644
--- a/apps/files_versions/l10n/gl.php
+++ b/apps/files_versions/l10n/gl.php
@@ -6,8 +6,6 @@
 "File %s could not be reverted to version %s" => "Non foi posíbel reverter o ficheiro %s á versión %s",
 "No old versions available" => "Non hai versións antigas dispoñíbeis",
 "No path specified" => "Non foi indicada a ruta",
-"History" => "Historial",
-"Revert a file to a previous version by clicking on its revert button" => "Reverta un ficheiro a unha versión anterior premendo no botón reversión",
-"Files Versioning" => "Sistema de versión de ficheiros",
-"Enable" => "Activar"
+"Versions" => "Versións",
+"Revert a file to a previous version by clicking on its revert button" => "Reverta un ficheiro a unha versión anterior premendo no botón reversión"
 );
diff --git a/apps/files_versions/l10n/hu_HU.php b/apps/files_versions/l10n/hu_HU.php
index dcf28838158e2221d6f3b6566d971ae7c8b15014..9f7420157e1a683619a8eee153e88e5bb49bd19f 100644
--- a/apps/files_versions/l10n/hu_HU.php
+++ b/apps/files_versions/l10n/hu_HU.php
@@ -6,8 +6,6 @@
 "File %s could not be reverted to version %s" => "%s állományt nem sikerült átállítani erre a változatra: %s",
 "No old versions available" => "Nincs régebbi változat",
 "No path specified" => "Nincs megadva az útvonal",
-"History" => "Korábbi változatok",
-"Revert a file to a previous version by clicking on its revert button" => "Az állomány átállítható egy régebbi változatra, ha a gombra kattint",
-"Files Versioning" => "Az állományok verzionálása",
-"Enable" => "engedélyezve"
+"Versions" => "Az állományok korábbi változatai",
+"Revert a file to a previous version by clicking on its revert button" => "Az állomány átállítható egy régebbi változatra, ha a gombra kattint"
 );
diff --git a/apps/files_versions/l10n/id.php b/apps/files_versions/l10n/id.php
index 6c553327c42aca3414bdffb9850465b8737d405a..4662aa86432630bce00ac0c08bfafd00642d9044 100644
--- a/apps/files_versions/l10n/id.php
+++ b/apps/files_versions/l10n/id.php
@@ -1,5 +1,10 @@
 <?php $TRANSLATIONS = array(
-"History" => "riwayat",
-"Files Versioning" => "pembuatan versi file",
-"Enable" => "aktifkan"
+"Could not revert: %s" => "Tidak dapat mengembalikan: %s",
+"success" => "sukses",
+"File %s was reverted to version %s" => "Berkas %s telah dikembalikan ke versi %s",
+"failure" => "gagal",
+"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"
 );
diff --git a/apps/files_versions/l10n/is.php b/apps/files_versions/l10n/is.php
index ccb8287b71e9be068471d5db9332e2b5fd34ea66..d165a78c31ef2c7b51d222bc2f657d16c42bb037 100644
--- a/apps/files_versions/l10n/is.php
+++ b/apps/files_versions/l10n/is.php
@@ -1,5 +1,3 @@
 <?php $TRANSLATIONS = array(
-"History" => "Saga",
-"Files Versioning" => "Útgáfur af skrám",
-"Enable" => "Virkja"
+"Versions" => "Útgáfur"
 );
diff --git a/apps/files_versions/l10n/it.php b/apps/files_versions/l10n/it.php
index 3289f7f68d179e5bb696cb9be0a4440225f50237..bca00879993cd8b8d25ba51fb5ffe5df59e367af 100644
--- a/apps/files_versions/l10n/it.php
+++ b/apps/files_versions/l10n/it.php
@@ -6,8 +6,6 @@
 "File %s could not be reverted to version %s" => "Il file %s non può essere ripristinato alla versione %s",
 "No old versions available" => "Non sono disponibili versioni precedenti",
 "No path specified" => "Nessun percorso specificato",
-"History" => "Cronologia",
-"Revert a file to a previous version by clicking on its revert button" => "Ripristina un file a una versione precedente facendo clic sul rispettivo pulsante di ripristino",
-"Files Versioning" => "Controllo di versione dei file",
-"Enable" => "Abilita"
+"Versions" => "Versioni",
+"Revert a file to a previous version by clicking on its revert button" => "Ripristina un file a una versione precedente facendo clic sul rispettivo pulsante di ripristino"
 );
diff --git a/apps/files_versions/l10n/ja_JP.php b/apps/files_versions/l10n/ja_JP.php
index 16018765708033fcbf6b8ebeb30c19532b0d20a1..0c2dbd401c4eb1950686a7c5844ff1e6db2102d0 100644
--- a/apps/files_versions/l10n/ja_JP.php
+++ b/apps/files_versions/l10n/ja_JP.php
@@ -6,8 +6,6 @@
 "File %s could not be reverted to version %s" => "ファイル %s をバージョン %s に戻せませんでした",
 "No old versions available" => "利用可能な古いバージョンはありません",
 "No path specified" => "パスが指定されていません",
-"History" => "履歴",
-"Revert a file to a previous version by clicking on its revert button" => "もとに戻すボタンをクリックすると、ファイルを過去のバージョンに戻します",
-"Files Versioning" => "ファイルのバージョン管理",
-"Enable" => "有効化"
+"Versions" => "バージョン",
+"Revert a file to a previous version by clicking on its revert button" => "もとに戻すボタンをクリックすると、ファイルを過去のバージョンに戻します"
 );
diff --git a/apps/files_versions/l10n/lv.php b/apps/files_versions/l10n/lv.php
index 2203dc706b82565bcd4535c88b108d147791e2b0..bf8d40fa0f0b6fca378602ff349d4b40501bccef 100644
--- a/apps/files_versions/l10n/lv.php
+++ b/apps/files_versions/l10n/lv.php
@@ -6,8 +6,6 @@
 "File %s could not be reverted to version %s" => "Datni %s nevarēja atgriezt uz versiju %s",
 "No old versions available" => "Nav pieejamu vecāku versiju",
 "No path specified" => "Nav norādīts ceļš",
-"History" => "Vēsture",
-"Revert a file to a previous version by clicking on its revert button" => "Atgriez datni uz iepriekšēju versiju, spiežot uz tās atgriešanas pogu",
-"Files Versioning" => "Datņu versiju izskošana",
-"Enable" => "Aktivēt"
+"Versions" => "Versijas",
+"Revert a file to a previous version by clicking on its revert button" => "Atgriez datni uz iepriekšēju versiju, spiežot uz tās atgriešanas pogu"
 );
diff --git a/apps/files_versions/l10n/mk.php b/apps/files_versions/l10n/mk.php
index d3ec233fe4130e90f7a181a397a3ceac7e720951..6a1882c2bfddb954b77451753f671f4cabc45ef9 100644
--- a/apps/files_versions/l10n/mk.php
+++ b/apps/files_versions/l10n/mk.php
@@ -1,5 +1,3 @@
 <?php $TRANSLATIONS = array(
-"History" => "Историја",
-"Files Versioning" => "Верзии на датотеки",
-"Enable" => "Овозможи"
+"Versions" => "Версии"
 );
diff --git a/apps/files_versions/l10n/nl.php b/apps/files_versions/l10n/nl.php
index fb1cfc3533c4ed30e2ef7a406af7052b9c888f52..9208852212180edef43fa67dedaf884a4dbacf31 100644
--- a/apps/files_versions/l10n/nl.php
+++ b/apps/files_versions/l10n/nl.php
@@ -6,8 +6,6 @@
 "File %s could not be reverted to version %s" => "Bestand %s kon niet worden teruggedraaid naar versie %s",
 "No old versions available" => "Geen oudere versies beschikbaar",
 "No path specified" => "Geen pad opgegeven",
-"History" => "Geschiedenis",
-"Revert a file to a previous version by clicking on its revert button" => "Draai een bestand terug naar een voorgaande versie door te klikken op de terugdraai knop",
-"Files Versioning" => "Bestand versies",
-"Enable" => "Activeer"
+"Versions" => "Versies",
+"Revert a file to a previous version by clicking on its revert button" => "Draai een bestand terug naar een voorgaande versie door te klikken op de terugdraai knop"
 );
diff --git a/apps/files_versions/l10n/pl.php b/apps/files_versions/l10n/pl.php
index ae3bfc4a842d4b40b3cf2e36c20954b695be9fba..68944e86760cec54b3c80094ea8e4acd5c409d39 100644
--- a/apps/files_versions/l10n/pl.php
+++ b/apps/files_versions/l10n/pl.php
@@ -6,8 +6,6 @@
 "File %s could not be reverted to version %s" => "Plik %s nie mógł być przywrócony do wersji %s",
 "No old versions available" => "Nie są dostępne żadne starsze wersje",
 "No path specified" => "Nie podano ścieżki",
-"History" => "Historia",
-"Revert a file to a previous version by clicking on its revert button" => "Przywróć plik do poprzedniej wersji klikając w jego przycisk przywrócenia",
-"Files Versioning" => "Wersjonowanie plików",
-"Enable" => "Włącz"
+"Versions" => "Wersje",
+"Revert a file to a previous version by clicking on its revert button" => "Przywróć plik do poprzedniej wersji klikając w jego przycisk przywrócenia"
 );
diff --git a/apps/files_versions/l10n/pt_BR.php b/apps/files_versions/l10n/pt_BR.php
index 9ce509c6534aca66d695abb21ad74fb190babbcd..f13b7931d4b7cfe0f38775578f4ce71e02e925a9 100644
--- a/apps/files_versions/l10n/pt_BR.php
+++ b/apps/files_versions/l10n/pt_BR.php
@@ -1,13 +1,11 @@
 <?php $TRANSLATIONS = array(
-"Could not revert: %s" => "Não foi possível reverter: %s",
+"Could not revert: %s" => "Impossível reverter: %s",
 "success" => "sucesso",
 "File %s was reverted to version %s" => "Arquivo %s revertido à versão %s",
 "failure" => "falha",
 "File %s could not be reverted to version %s" => "Arquivo %s não pôde ser revertido à versão %s",
 "No old versions available" => "Nenhuma versão antiga disponível",
 "No path specified" => "Nenhum caminho especificado",
-"History" => "Histórico",
-"Revert a file to a previous version by clicking on its revert button" => "Reverta um arquivo a uma versão anterior clicando no botão reverter",
-"Files Versioning" => "Versionamento de Arquivos",
-"Enable" => "Habilitar"
+"Versions" => "Versões",
+"Revert a file to a previous version by clicking on its revert button" => "Reverta um arquivo a uma versão anterior clicando no botão reverter"
 );
diff --git a/apps/files_versions/l10n/pt_PT.php b/apps/files_versions/l10n/pt_PT.php
index 629809f95560b74cc13706bfb83115c6cc00fec3..93379547295fc4d6fc9c64167d5ccf5e2790e50e 100644
--- a/apps/files_versions/l10n/pt_PT.php
+++ b/apps/files_versions/l10n/pt_PT.php
@@ -6,8 +6,6 @@
 "File %s could not be reverted to version %s" => "Não foi possível reverter o ficheiro %s para a versão %s",
 "No old versions available" => "Não existem versões mais antigas",
 "No path specified" => "Nenhum caminho especificado",
-"History" => "Histórico",
-"Revert a file to a previous version by clicking on its revert button" => "Reverter um ficheiro para uma versão anterior clicando no seu botão reverter.",
-"Files Versioning" => "Versionamento de Ficheiros",
-"Enable" => "Activar"
+"Versions" => "Versões",
+"Revert a file to a previous version by clicking on its revert button" => "Reverter um ficheiro para uma versão anterior clicando no seu botão reverter."
 );
diff --git a/apps/files_versions/l10n/ru.php b/apps/files_versions/l10n/ru.php
index 221d24ce8d118c0677a730d5a10a7519b8670820..7377fbb5382e1ace08f0a9e2c5fca494e84e7f9d 100644
--- a/apps/files_versions/l10n/ru.php
+++ b/apps/files_versions/l10n/ru.php
@@ -6,8 +6,6 @@
 "File %s could not be reverted to version %s" => "Файл %s не может быть возвращён к версии %s",
 "No old versions available" => "Нет доступных старых версий",
 "No path specified" => "Путь не указан",
-"History" => "История",
-"Revert a file to a previous version by clicking on its revert button" => "Вернуть файл к предыдущей версии нажатием на кнопку возврата",
-"Files Versioning" => "Версии файлов",
-"Enable" => "Включить"
+"Versions" => "Версии",
+"Revert a file to a previous version by clicking on its revert button" => "Вернуть файл к предыдущей версии нажатием на кнопку возврата"
 );
diff --git a/apps/files_versions/l10n/sk_SK.php b/apps/files_versions/l10n/sk_SK.php
index 8b46e93bb9782fecca915915b23aabb626a87de6..50e4af4d96490bbedccaa27af135cd2ddac3acaf 100644
--- a/apps/files_versions/l10n/sk_SK.php
+++ b/apps/files_versions/l10n/sk_SK.php
@@ -6,8 +6,6 @@
 "File %s could not be reverted to version %s" => "Súbor %s nemohol byť obnovený na verziu %s",
 "No old versions available" => "Nie sú dostupné žiadne staršie verzie",
 "No path specified" => "Nevybrali ste cestu",
-"History" => "História",
-"Revert a file to a previous version by clicking on its revert button" => "Obnovte súbor do predošlej verzie kliknutím na tlačítko obnoviť",
-"Files Versioning" => "Vytváranie verzií súborov",
-"Enable" => "Zapnúť"
+"Versions" => "Verzie",
+"Revert a file to a previous version by clicking on its revert button" => "Obnovte súbor do predošlej verzie kliknutím na tlačítko obnoviť"
 );
diff --git a/apps/files_versions/l10n/sl.php b/apps/files_versions/l10n/sl.php
index 7f386c9edaa2d8a6d49755c776f34f414e73185f..b6ad6a1e9bb1f19615e8af948080d128afe34770 100644
--- a/apps/files_versions/l10n/sl.php
+++ b/apps/files_versions/l10n/sl.php
@@ -1,5 +1,3 @@
 <?php $TRANSLATIONS = array(
-"History" => "Zgodovina",
-"Files Versioning" => "Sledenje različicam",
-"Enable" => "Omogoči"
+"No old versions available" => "Starejših različic ni na voljo"
 );
diff --git a/apps/files_versions/l10n/sv.php b/apps/files_versions/l10n/sv.php
index 853644848f4f894dd43259081e70482d4332025c..46e2c0f8bcf3db3616af8d82a23ddf06c750b7bb 100644
--- a/apps/files_versions/l10n/sv.php
+++ b/apps/files_versions/l10n/sv.php
@@ -6,8 +6,5 @@
 "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",
-"History" => "Historik",
-"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",
-"Files Versioning" => "Versionshantering av filer",
-"Enable" => "Aktivera"
+"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/tr.php b/apps/files_versions/l10n/tr.php
index e9a4c4702e13b2d635ef060cf5469d57b0d958c4..745400d331c866257bfabed643675fa8d2e35ff7 100644
--- a/apps/files_versions/l10n/tr.php
+++ b/apps/files_versions/l10n/tr.php
@@ -1,5 +1,10 @@
 <?php $TRANSLATIONS = array(
-"History" => "Geçmiş",
-"Files Versioning" => "Dosya Sürümleri",
-"Enable" => "Etkinleştir"
+"Could not revert: %s" => "Geri alınamıyor: %s",
+"success" => "Başarılı.",
+"File %s was reverted to version %s" => "Dosya %s, %s versiyonuna döndürüldü",
+"failure" => "hata",
+"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"
 );
diff --git a/apps/files_versions/l10n/uk.php b/apps/files_versions/l10n/uk.php
index 49acda810792942ad0243edac376e8e921195ea2..e722d95497b290ba8568c3379669d1d7db6e1980 100644
--- a/apps/files_versions/l10n/uk.php
+++ b/apps/files_versions/l10n/uk.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/vi.php b/apps/files_versions/l10n/vi.php
index 675cb841c789b9a01a803f86f1cd9e37b08a6ed3..f2499e7bf355fe4dae3b0bff6fb4caabc67e0ed5 100644
--- a/apps/files_versions/l10n/vi.php
+++ b/apps/files_versions/l10n/vi.php
@@ -6,8 +6,5 @@
 "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",
-"History" => "Lịch sử",
-"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",
-"Files Versioning" => "Phiên bản tập tin",
-"Enable" => "Bật "
+"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.php b/apps/files_versions/l10n/zh_CN.php
index 14301ff0c04a39f35edfe677115e8394fac33c49..65d0d284a076f4fe67bcaf7bf2f0902f6c07d66a 100644
--- a/apps/files_versions/l10n/zh_CN.php
+++ b/apps/files_versions/l10n/zh_CN.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/hooks.php b/apps/files_versions/lib/hooks.php
index dc02c605c44ce51877a807dd7ffa4572c47550a6..7891b20e92fd2a74e6a28c3cd18d00a1e3efd9db 100644
--- a/apps/files_versions/lib/hooks.php
+++ b/apps/files_versions/lib/hooks.php
@@ -20,13 +20,10 @@ class Hooks {
 	public static function write_hook( $params ) {
 
 		if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
-
-			$versions = new Storage( new \OC\Files\View('') );
-
 			$path = $params[\OC\Files\Filesystem::signal_param_path];
-
-			if($path<>'') $versions->store( $path );
-
+			if($path<>'') {
+				Storage::store($path);
+			}
 		}
 	}
 
@@ -40,13 +37,11 @@ class Hooks {
 	 */
 	public static function remove_hook($params) {
 		if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
-		
-			$versions = new Storage( new \OC_FilesystemView('') );
-		
 			$path = $params[\OC\Files\Filesystem::signal_param_path];
-		
-			if($path<>'') $versions->delete( $path );
-		
+			if($path<>'') {
+				Storage::delete($path);
+			}
+
 		}
 	}
 
@@ -59,15 +54,13 @@ class Hooks {
 	 */
 	public static function rename_hook($params) {
 		if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
-		
-			$versions = new Storage( new \OC_FilesystemView('') );
-		
 			$oldpath = $params['oldpath'];
 			$newpath = $params['newpath'];
-		
-			if($oldpath<>'' && $newpath<>'') $versions->rename( $oldpath, $newpath );
-		
+			if($oldpath<>'' && $newpath<>'') {
+				Storage::rename( $oldpath, $newpath );
+			}
+
 		}
 	}
-	
+
 }
diff --git a/apps/files_versions/lib/versions.php b/apps/files_versions/lib/versions.php
index f23381cb156311af5077e62398dd7dd799c57134..20611c61ec7a7b2ae9303279b6167a0798bd6534 100644
--- a/apps/files_versions/lib/versions.php
+++ b/apps/files_versions/lib/versions.php
@@ -19,53 +19,82 @@ class Storage {
 
 	const DEFAULTENABLED=true;
 	const DEFAULTMAXSIZE=50; // unit: percentage; 50% of available disk space/quota
-	
+
 	private static $max_versions_per_interval = array(
-														1 => array('intervalEndsAfter' => 10,     //first 10sec, one version every 2sec
-																	'step' => 2),
-														2 => array('intervalEndsAfter' => 60,     //next minute, one version every 10sec
-																	'step' => 10),
-														3 => array('intervalEndsAfter' => 3600,     //next hour, one version every minute
-																	'step' => 60),
-														4 => array('intervalEndsAfter' => 86400,   //next 24h, one version every hour
-																	'step' => 3600),
-														5 => array('intervalEndsAfter' => 2592000,   //next 30days, one version per day
-																	'step' => 86400),
-														6 => array('intervalEndsAfter' => -1,      //until the end one version per week
-																	'step' => 604800),
-			);	
-
-	private static function getUidAndFilename($filename)
-	{
-		if (\OCP\App::isEnabled('files_sharing')
-		    && substr($filename, 0, 7) == '/Shared'
-		    && $source = \OCP\Share::getItemSharedWith('file',
-					substr($filename, 7),
-					\OC_Share_Backend_File::FORMAT_SHARED_STORAGE)) {
-			$filename = $source['path'];
-			$pos = strpos($filename, '/files', 1);
-			$uid = substr($filename, 1, $pos - 1);
-			$filename = substr($filename, $pos + 6);
-		} else {
-			$uid = \OCP\User::getUser();
+		//first 10sec, one version every 2sec
+		1 => array('intervalEndsAfter' => 10,      'step' => 2),
+		//next minute, one version every 10sec
+		2 => array('intervalEndsAfter' => 60,      'step' => 10),
+		//next hour, one version every minute
+		3 => array('intervalEndsAfter' => 3600,    'step' => 60),
+		//next 24h, one version every hour
+		4 => array('intervalEndsAfter' => 86400,   'step' => 3600),
+		//next 30days, one version per day
+		5 => array('intervalEndsAfter' => 2592000, 'step' => 86400),
+		//until the end one version per week
+		6 => array('intervalEndsAfter' => -1,      'step' => 604800),
+	);
+
+	public static function getUidAndFilename($filename) {
+		$uid = \OC\Files\Filesystem::getOwner($filename);
+		\OC\Files\Filesystem::initMountPoints($uid);
+		if ( $uid != \OCP\User::getUser() ) {
+			$info = \OC\Files\Filesystem::getFileInfo($filename);
+			$ownerView = new \OC\Files\View('/'.$uid.'/files');
+			$filename = $ownerView->getPath($info['fileid']);
 		}
 		return array($uid, $filename);
 	}
 
+	/**
+	 * get current size of all versions from a given user
+	 * 
+	 * @param $user user who owns the versions
+	 * @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=?');
+		$result = $query->execute(array($user))->fetchAll();
+		
+		if ($result) {
+			return $result[0]['size'];
+		}
+		return false;
+	}
+
+	/**
+	 * write to the database how much space is in use for versions
+	 * 
+	 * @param $user owner of the versions
+	 * @param $size size of the versions
+	 */
+	private static function setVersionsSize($user, $size) {
+		if ( self::getVersionsSize($user) === false) {
+			$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->execute(array($size, $user));
+	}
+	
 	/**
 	 * store a new version of a file.
 	 */
-	public function store($filename) {
+	public static function store($filename) {
 		if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
+			
+			// if the file gets streamed we need to remove the .part extension
+			// to get the right target
+			$ext = pathinfo($filename, PATHINFO_EXTENSION);
+			if ($ext === 'part') {
+				$filename = substr($filename, 0, strlen($filename)-5);
+			}
+			
 			list($uid, $filename) = self::getUidAndFilename($filename);
-			$files_view = new \OC\Files\View('/'.\OCP\User::getUser() .'/files');
-			$users_view = new \OC\Files\View('/'.\OCP\User::getUser());
 
-			//check if source file already exist as version to avoid recursions.
-			// todo does this check work?
-			if ($users_view->file_exists($filename)) {
-				return false;
-			}
+			$files_view = new \OC\Files\View('/'.$uid .'/files');
+			$users_view = new \OC\Files\View('/'.$uid);
+			$versions_view = new \OC\Files\View('/'.$uid.'/files_versions');
 
 			// check if filename is a directory
 			if($files_view->is_dir($filename)) {
@@ -79,23 +108,25 @@ class Storage {
 
 			// create all parent folders
 			$info=pathinfo($filename);
-			$versionsFolderName=\OCP\Config::getSystemValue('datadirectory').$users_view->getAbsolutePath('files_versions/');
+			$versionsFolderName=$versions_view->getLocalFolder('');
 			if(!file_exists($versionsFolderName.'/'.$info['dirname'])) {
 				mkdir($versionsFolderName.'/'.$info['dirname'], 0750, true);
 			}
 
 			// store a new version of a file
-			$result = $users_view->copy('files'.$filename, 'files_versions'.$filename.'.v'.$users_view->filemtime('files'.$filename));
-			if (  ($versionsSize = \OCP\Config::getAppValue('files_versions', 'size')) === null ) {
+			$users_view->copy('files'.$filename, 'files_versions'.$filename.'.v'.$users_view->filemtime('files'.$filename));
+			$versionsSize = self::getVersionsSize($uid);
+			if (  $versionsSize === false || $versionsSize < 0 ) {
 				$versionsSize = self::calculateSize($uid);
 			}
+
 			$versionsSize += $users_view->filesize('files'.$filename);
-			
+
 			// expire old revisions if necessary
 			$newSize = self::expire($filename, $versionsSize);
-			
+
 			if ( $newSize != $versionsSize ) {
-				\OCP\Config::setAppValue('files_versions', 'size', $versionsSize);
+				self::setVersionsSize($uid, $newSize);
 			}
 		}
 	}
@@ -106,43 +137,43 @@ class Storage {
 	 */
 	public static function delete($filename) {
 		list($uid, $filename) = self::getUidAndFilename($filename);
-		$versions_fileview = new \OC_FilesystemView('/'.$uid .'/files_versions');
-		
-		$abs_path = \OCP\Config::getSystemValue('datadirectory').$versions_fileview->getAbsolutePath('').$filename.'.v';
-		if( ($versions = self::getVersions($filename)) ) {
-			if (  ($versionsSize = \OCP\Config::getAppValue('files_versions', 'size')) === null ) {
+		$versions_fileview = new \OC\Files\View('/'.$uid .'/files_versions');
+
+		$abs_path = $versions_fileview->getLocalFile($filename.'.v');
+		if( ($versions = self::getVersions($uid, $filename)) ) {
+			$versionsSize = self::getVersionsSize($uid);
+			if ( $versionsSize === false || $versionsSize < 0 ) {
 				$versionsSize = self::calculateSize($uid);
 			}
 			foreach ($versions as $v) {
 				unlink($abs_path . $v['version']);
 				$versionsSize -= $v['size'];
 			}
-			\OCP\Config::setAppValue('files_versions', 'size', $versionsSize);
+			self::setVersionsSize($uid, $versionsSize);
 		}
 	}
-	
+
 	/**
 	 * rename versions of a file
 	 */
 	public static function rename($oldpath, $newpath) {
 		list($uid, $oldpath) = self::getUidAndFilename($oldpath);
 		list($uidn, $newpath) = self::getUidAndFilename($newpath);
-		$versions_view = new \OC_FilesystemView('/'.$uid .'/files_versions');
-		$files_view = new \OC_FilesystemView('/'.$uid .'/files');
-		$abs_newpath = \OCP\Config::getSystemValue('datadirectory').$versions_view->getAbsolutePath('').$newpath;
-		
+		$versions_view = new \OC\Files\View('/'.$uid .'/files_versions');
+		$files_view = new \OC\Files\View('/'.$uid .'/files');
+		$abs_newpath = $versions_view->getLocalFile($newpath);
+
 		if ( $files_view->is_dir($oldpath) && $versions_view->is_dir($oldpath) ) {
 			$versions_view->rename($oldpath, $newpath);
-		} else 	if ( ($versions = Storage::getVersions($oldpath)) ) {
+		} else 	if ( ($versions = Storage::getVersions($uid, $oldpath)) ) {
 			$info=pathinfo($abs_newpath);
 			if(!file_exists($info['dirname'])) mkdir($info['dirname'], 0750, true);
-			$versions = Storage::getVersions($oldpath);
 			foreach ($versions as $v) {
 				$versions_view->rename($oldpath.'.v'.$v['version'], $newpath.'.v'.$v['version']);
 			}
 		}
 	}
-	
+
 	/**
 	 * rollback to an old version of a file.
 	 */
@@ -152,14 +183,14 @@ class Storage {
 			list($uid, $filename) = self::getUidAndFilename($filename);
 			$users_view = new \OC\Files\View('/'.$uid);
 			$versionCreated = false;
-			
+
 			//first create a new version
 			$version = 'files_versions'.$filename.'.v'.$users_view->filemtime('files'.$filename);
 			if ( !$users_view->file_exists($version)) {
 				$users_view->copy('files'.$filename, 'files_versions'.$filename.'.v'.$users_view->filemtime('files'.$filename));
 				$versionCreated = true;
 			}
-			
+
 			// rollback
 			if( @$users_view->copy('files_versions'.$filename.'.v'.$revision, 'files'.$filename) ) {
 				$users_view->touch('files'.$filename, $revision);
@@ -177,27 +208,27 @@ class Storage {
 
 	/**
 	 * @brief get a list of all available versions of a file in descending chronological order
+	 * @param $uid user id from the owner of the file
 	 * @param $filename file to find versions of, relative to the user files dir
 	 * @param $count number of versions to return
 	 * @returns array
 	 */
-	public static function getVersions( $filename, $count = 0 ) {
+	public static function getVersions($uid, $filename, $count = 0 ) {
 		if( \OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true' ) {
-			list($uid, $filename) = self::getUidAndFilename($filename);
-			$versions_fileview = new \OC\Files\View('/' . \OCP\User::getUser() . '/files_versions');
-
-			$versionsName = \OCP\Config::getSystemValue('datadirectory').$versions_fileview->getAbsolutePath($filename);
+			$versions_fileview = new \OC\Files\View('/' . $uid . '/files_versions');
+			$versionsName = $versions_fileview->getLocalFile($filename);
+			
 			$versions = array();
 			// fetch for old versions
-			$matches = glob( $versionsName.'.v*' );
-			
+			$matches = glob(preg_quote($versionsName).'.v*' );
+
 			if ( !$matches ) {
 				return $versions;
 			}
 
 			sort( $matches );
 
-			$files_view = new \OC_FilesystemView('/'.$uid.'/files');
+			$files_view = new \OC\Files\View('/'.$uid.'/files');
 			$local_file = $files_view->getLocalFile($filename);
 			$local_file_md5 = \md5_file( $local_file );
 
@@ -248,24 +279,27 @@ class Storage {
 	 */
 	private static function calculateSize($uid) {
 		if( \OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true' ) {
-			$versions_fileview = new \OC_FilesystemView('/'.$uid.'/files_versions');
-			$versionsRoot = \OCP\Config::getSystemValue('datadirectory').$versions_fileview->getAbsolutePath('');
-				
-			$iterator = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($versionsRoot), \RecursiveIteratorIterator::CHILD_FIRST);
-				
+			$versions_fileview = new \OC\Files\View('/'.$uid.'/files_versions');
+			$versionsRoot = $versions_fileview->getLocalFolder('');
+
+			$iterator = new \RecursiveIteratorIterator(
+				new \RecursiveDirectoryIterator($versionsRoot),
+				\RecursiveIteratorIterator::CHILD_FIRST
+			);
+
 			$size = 0;
-							
+
 			foreach ($iterator as $path) {
 				if ( preg_match('/^.+\.v(\d+)$/', $path, $match) ) {
 					$relpath = substr($path, strlen($versionsRoot)-1);
 					$size += $versions_fileview->filesize($relpath);
 				}
 			}
-			
+
 			return $size;
 		}
 	}
-	
+
 	/**
 	 * @brief returns all stored file versions from a given user
 	 * @param $uid id to the user
@@ -273,26 +307,29 @@ class Storage {
 	 */
 	private static function getAllVersions($uid) {
 		if( \OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true' ) {
-			$versions_fileview = new \OC_FilesystemView('/'.$uid.'/files_versions');
-			$versionsRoot = \OCP\Config::getSystemValue('datadirectory').$versions_fileview->getAbsolutePath('');
-			
-			$iterator = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($versionsRoot), \RecursiveIteratorIterator::CHILD_FIRST);
-			
+			$versions_fileview = new \OC\Files\View('/'.$uid.'/files_versions');
+			$versionsRoot = $versions_fileview->getLocalFolder('');
+
+			$iterator = new \RecursiveIteratorIterator(
+				new \RecursiveDirectoryIterator($versionsRoot),
+				\RecursiveIteratorIterator::CHILD_FIRST
+			);
+
 			$versions = array();
-			
+
 			foreach ($iterator as $path) {
 				if ( preg_match('/^.+\.v(\d+)$/', $path, $match) ) {
 					$relpath = substr($path, strlen($versionsRoot)-1);
 					$versions[$match[1].'#'.$relpath] = array('path' => $relpath, 'timestamp' => $match[1]);
 				}
 			}
-			
+
 			ksort($versions);
-			
+
 			$i = 0;
-			
+
 			$result = array();
-			
+
 			foreach( $versions as $key => $value ) {
 				$i++;
 				$size = $versions_fileview->filesize($value['path']);
@@ -301,14 +338,14 @@ class Storage {
 				$result['all'][$key]['version'] = $value['timestamp'];
 				$result['all'][$key]['path'] = $filename;
 				$result['all'][$key]['size'] = $size;
-				
+
 				$filename = substr($value['path'], 0, -strlen($value['timestamp'])-2);
 				$result['by_file'][$filename][$key]['version'] = $value['timestamp'];
 				$result['by_file'][$filename][$key]['path'] = $filename;
 				$result['by_file'][$filename][$key]['size'] = $size;
-				
+
 			}
-			
+
 			return $result;
 		}
 	}
@@ -318,68 +355,71 @@ class Storage {
 	 */
 	private static function expire($filename, $versionsSize = null) {
 		if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
-			list($uid, $filename) = self::getUidAndFilename($filename);			
-			$versions_fileview = new \OC_FilesystemView('/'.$uid.'/files_versions');
-			
+			list($uid, $filename) = self::getUidAndFilename($filename);
+			$versions_fileview = new \OC\Files\View('/'.$uid.'/files_versions');
+
 			// get available disk space for user
-			$quota = \OCP\Util::computerFileSize(\OC_Preferences::getValue($uid, 'files', 'quota'));
-			if ( $quota == null ) {
-				$quota = \OCP\Util::computerFileSize(\OC_Appconfig::getValue('files', 'default_quota'));
+			$quota = \OC_Preferences::getValue($uid, 'files', 'quota');
+			if ( $quota === null || $quota === 'default') {
+				$quota = \OC_Appconfig::getValue('files', 'default_quota');
 			}
-			if ( $quota == null ) {
-				$quota = \OC\Files\Filesystem::free_space('/');
+			if ( $quota === null || $quota === 'none' ) {
+				$quota = \OC\Files\Filesystem::free_space('/') / count(\OCP\User::getUsers());
+			} else {
+				$quota = \OCP\Util::computerFileSize($quota);
 			}
 			
 			// make sure that we have the current size of the version history
 			if ( $versionsSize === null ) {
-				if (  ($versionsSize = \OCP\Config::getAppValue('files_versions', 'size')) === null ) {
+				$versionsSize = self::getVersionsSize($uid);
+				if (  $versionsSize === false || $versionsSize < 0 ) {
 					$versionsSize = self::calculateSize($uid);
 				}
 			}
 
 			// calculate available space for version history
-			$files_view = new \OC_FilesystemView('/'.$uid.'/files');
+			$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;
-			} 
+			}
 
-			// after every 1000s run reduce the number of all versions not only for the current file 
+			// after every 1000s run reduce the number of all versions not only for the current file
 			$random = rand(0, 1000);
 			if ($random == 0) {
 				$result = Storage::getAllVersions($uid);
 				$versions_by_file = $result['by_file'];
 				$all_versions = $result['all'];
 			} else {
-				$all_versions = Storage::getVersions($filename);
+				$all_versions = Storage::getVersions($uid, $filename);
 				$versions_by_file[$filename] = $all_versions;
 			}
-			
+
 			$time = time();
-			
+
 			// it is possible to expire versions from more than one file
 			// iterate through all given files
 			foreach ($versions_by_file as $filename => $versions) {
 				$versions = array_reverse($versions);	// newest version first
-				
+
 				$interval = 1;
-				$step = Storage::$max_versions_per_interval[$interval]['step'];			
+				$step = Storage::$max_versions_per_interval[$interval]['step'];
 				if (Storage::$max_versions_per_interval[$interval]['intervalEndsAfter'] == -1) {
 					$nextInterval = -1;
 				} else {
 					$nextInterval = $time - Storage::$max_versions_per_interval[$interval]['intervalEndsAfter'];
 				}
-				
+
 				$firstVersion = reset($versions);
 				$firstKey = key($versions);
 				$prevTimestamp = $firstVersion['version'];
 				$nextVersion = $firstVersion['version'] - $step;
 				$remaining_versions[$firstKey] = $firstVersion;
 				unset($versions[$firstKey]);
-				
+
 				foreach ($versions as $key => $version) {
 					$newInterval = true;
 					while ( $newInterval ) {
@@ -409,22 +449,22 @@ class Storage {
 					$prevTimestamp = $version['version'];
 				}
 			}
-			
-			// check if enough space is available after versions are rearranged.
-			// if not we delete the oldest versions until we meet the size limit for versions
-			$numOfVersions = count($all_versions);
-			$i = 0; 
-			while ($availableSpace < 0) {
-				if ($i = $numOfVersions-2) break; // keep at least the last version
+
+			// Check if enough space is available after versions are rearranged.
+			// If not we delete the oldest versions until we meet the size limit for versions,
+			// but always keep the two latest versions
+			$numOfVersions = count($all_versions) -2 ;
+			$i = 0;
+			while ($availableSpace < 0 && $i < $numOfVersions) {
 				$versions_fileview->unlink($all_versions[$i]['path'].'.v'.$all_versions[$i]['version']);
 				$versionsSize -= $all_versions[$i]['size'];
 				$availableSpace += $all_versions[$i]['size'];
 				$i++;
 			}
-		
+
 			return $versionsSize; // finally return the new size of the version history
 		}
-		
+
 		return false;
 	}
 }
diff --git a/apps/files_versions/settings.php b/apps/files_versions/settings.php
deleted file mode 100644
index f2873b8f7c2cfebeaf0b23e20e763f3d23fe455b..0000000000000000000000000000000000000000
--- a/apps/files_versions/settings.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-OCP\User::checkAdminUser();
-
-OCP\Util::addscript( 'files_versions', 'versions' );
-
-$tmpl = new OCP\Template( 'files_versions', 'settings');
-
-return $tmpl->fetchPage();
diff --git a/apps/files_versions/templates/history.php b/apps/files_versions/templates/history.php
index 850ece89c98fc30277d22bbc785e57e8dd61da94..f7284439041e7762f50723fc87bbf5a7d77ae12b 100644
--- a/apps/files_versions/templates/history.php
+++ b/apps/files_versions/templates/history.php
@@ -5,28 +5,29 @@
 if( isset( $_['message'] ) ) {
 
 
-	if( isset($_['path'] ) ) echo('<strong>File: '.$_['path'] ).'</strong><br>';
-	echo('<strong>'.$_['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'] ) ) {
 
-		echo( '<div id="feedback-messages" class="'.$_['outcome_stat'].'"><h3>'.$_['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>';
 
 	}
 
-	echo( '<strong>Versions of '.$_['path'] ).'</strong><br>';
-	echo('<p><em>'.$l->t('Revert a file to a previous version by clicking on its revert button').'</em></p><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 ) {
-		echo ' ';
-		echo OCP\Util::formatDate( doubleval($v['version']) );
-		echo ' <a href="'.OCP\Util::linkTo('files_versions', 'history.php', array('path' => $_['path'], 'revert' => $v['version'])) .'" class="button">Revert</a><br /><br />';
+		p(' ');
+		p(OCP\Util::formatDate( doubleval($v['version'])));
+		print_unescaped(' <a href="'.OCP\Util::linkTo('files_versions', 'history.php',
+			array('path' => $_['path'], 'revert' => $v['version'])) .'" class="button">Revert</a><br /><br />');
 		if ( $v['cur'] ) {
-			echo '  (<b>Current</b>)';
+			print_unescaped('  (<b>Current</b>)');
 		}
-		echo '<br /><br />';
+		print_unescaped('<br /><br />');
 	}
 
 }
diff --git a/apps/files_versions/templates/settings.php b/apps/files_versions/templates/settings.php
deleted file mode 100644
index bfca8366f5da50d78ce670fdcf9d088f35ca306f..0000000000000000000000000000000000000000
--- a/apps/files_versions/templates/settings.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<form id="versionssettings">
-	<fieldset class="personalblock">
-		<legend><strong><?php echo $l->t('Files Versioning');?></strong></legend>
-		<input type="checkbox" name="versions" id="versions" value="1" <?php if (OCP\Config::getSystemValue('versions', 'true')=='true') echo ' checked="checked"'; ?> /> <label for="versions"><?php echo $l->t('Enable'); ?></label> <br/>
-	</fieldset>
-</form>
diff --git a/apps/user_ldap/ajax/testConfiguration.php b/apps/user_ldap/ajax/testConfiguration.php
index f8038e31469c545fd91682c9d975bab39c833989..7ce1258a7967e7b8cd711f021b4f0fe4346b213d 100644
--- a/apps/user_ldap/ajax/testConfiguration.php
+++ b/apps/user_ldap/ajax/testConfiguration.php
@@ -32,10 +32,13 @@ $connection = new \OCA\user_ldap\lib\Connection('', null);
 if($connection->setConfiguration($_POST)) {
 	//Configuration is okay
 	if($connection->bind()) {
-		OCP\JSON::success(array('message' => $l->t('The configuration is valid and the connection could be established!')));
+		OCP\JSON::success(array('message'
+			=> $l->t('The configuration is valid and the connection could be established!')));
 	} else {
-		OCP\JSON::error(array('message' => $l->t('The configuration is valid, but the Bind failed. Please check the server settings and credentials.')));
+		OCP\JSON::error(array('message'
+			=> $l->t('The configuration is valid, but the Bind failed. Please check the server settings and credentials.')));
 	}
 } else {
-	OCP\JSON::error(array('message' => $l->t('The configuration is invalid. Please look in the ownCloud log for further details.')));
+	OCP\JSON::error(array('message'
+		=> $l->t('The configuration is invalid. Please look in the ownCloud log for further details.')));
 }
diff --git a/apps/user_ldap/appinfo/app.php b/apps/user_ldap/appinfo/app.php
index dec87684c9e52d7d4a1d31a7a2c86935370fb826..89410b5ef07e821cae7046c55197c98bda73a409 100644
--- a/apps/user_ldap/appinfo/app.php
+++ b/apps/user_ldap/appinfo/app.php
@@ -51,5 +51,7 @@ $entry = array(
 
 OCP\Backgroundjob::addRegularTask('OCA\user_ldap\lib\Jobs', 'updateGroups');
 if(OCP\App::isEnabled('user_webdavauth')) {
-	OCP\Util::writeLog('user_ldap', 'user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour', OCP\Util::WARN);
+	OCP\Util::writeLog('user_ldap',
+		'user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour',
+		OCP\Util::WARN);
 }
diff --git a/apps/user_ldap/appinfo/info.xml b/apps/user_ldap/appinfo/info.xml
index 53269edfb34b179d426da751810b74efb681d156..148a72cecbb4449d27a248719a1f1e3d70de5609 100644
--- a/apps/user_ldap/appinfo/info.xml
+++ b/apps/user_ldap/appinfo/info.xml
@@ -2,12 +2,14 @@
 <info>
 	<id>user_ldap</id>
 	<name>LDAP user and group backend</name>
-	<description>Authenticate users and groups by LDAP resp. Active Directoy.
+	<description>Authenticate users and groups by LDAP respectively Active
+		Directory.
 
-	This app is not compatible to the WebDAV user backend.</description>
+		This app is not compatible with the WebDAV user backend.
+	</description>
 	<licence>AGPL</licence>
 	<author>Dominik Schmidt and Arthur Schiwon</author>
-	<require>4.91</require>
+	<require>4.93</require>
 	<shipped>true</shipped>
 	<types>
 		<authentication/>
diff --git a/apps/user_ldap/appinfo/update.php b/apps/user_ldap/appinfo/update.php
index bc32d4ef4ccc32b3fd70fbb9ab58b7cfe5b162c9..2fcbf1902ac54b9c65479047b4457ff10c2ee0aa 100644
--- a/apps/user_ldap/appinfo/update.php
+++ b/apps/user_ldap/appinfo/update.php
@@ -58,7 +58,9 @@ foreach($objects as $object) {
 		try {
 			$updateQuery->execute(array($newDN, $uuid, $dn['ldap_dn']));
 		} catch(Exception $e) {
-		    \OCP\Util::writeLog('user_ldap', 'Could not update '.$object.' '.$dn['ldap_dn'].' in the mappings table. ', \OCP\Util::WARN);
+			\OCP\Util::writeLog('user_ldap',
+				'Could not update '.$object.' '.$dn['ldap_dn'].' in the mappings table. ',
+				\OCP\Util::WARN);
 		}
 
 	}
diff --git a/apps/user_ldap/appinfo/version b/apps/user_ldap/appinfo/version
index e4d93c8d610789d4b4c12e5f8be7d4c8fc6a489b..e619108dd639e5f36f97f73ae82d8819bdbb20b0 100644
--- a/apps/user_ldap/appinfo/version
+++ b/apps/user_ldap/appinfo/version
@@ -1 +1 @@
-0.3.9.4
\ No newline at end of file
+0.3.9.5
\ No newline at end of file
diff --git a/apps/user_ldap/group_ldap.php b/apps/user_ldap/group_ldap.php
index 02ceecaea0bd3492678ce14394050f3289b49335..efa5f8b4fe32d9f99eedc2c7231ce35661077568 100644
--- a/apps/user_ldap/group_ldap.php
+++ b/apps/user_ldap/group_ldap.php
@@ -177,7 +177,8 @@ class GROUP_LDAP extends lib\Access implements \OCP\GroupInterface {
 			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'),
+					\OCP\Util::mb_str_replace('%uid', $member,
+						$this->connection>ldapLoginFilter, 'UTF-8'),
 					$this->getFilterPartForUserSearch($search)
 				));
 				$ldap_users = $this->fetchListOfUsers($filter, 'dn');
@@ -188,7 +189,9 @@ class GROUP_LDAP extends lib\Access implements \OCP\GroupInterface {
 			} else {
 				//we got DNs, check if we need to filter by search or we can give back all of them
 				if(!empty($search)) {
-					if(!$this->readAttribute($member, $this->connection->ldapUserDisplayName, $this->getFilterPartForUserSearch($search))) {
+					if(!$this->readAttribute($member,
+						$this->connection->ldapUserDisplayName,
+						$this->getFilterPartForUserSearch($search))) {
 						continue;
 					}
 				}
@@ -206,6 +209,19 @@ class GROUP_LDAP extends lib\Access implements \OCP\GroupInterface {
 		return $groupUsers;
 	}
 
+	/**
+	 * @brief get a list of all display names in a group
+	 * @returns array with display names (value) and user ids(key)
+	 */
+	public function displayNamesInGroup($gid, $search, $limit, $offset) {
+		$users = $this->usersInGroup($gid, $search, $limit, $offset);
+		$displayNames = array();
+		foreach($users as $user) {
+			$displayNames[$user] = \OC_User::getDisplayName($user);
+		}
+		return $displayNames;
+	}
+
 	/**
 	 * @brief get a list of all groups
 	 * @returns array with group names
@@ -225,7 +241,8 @@ class GROUP_LDAP extends lib\Access implements \OCP\GroupInterface {
 			return $ldap_groups;
 		}
 
-		// if we'd pass -1 to LDAP search, we'd end up in a Protocol error. With a limit of 0, we get 0 results. So we pass null.
+		// if we'd pass -1 to LDAP search, we'd end up in a Protocol
+		// error. With a limit of 0, we get 0 results. So we pass null.
 		if($limit <= 0) {
 			$limit = null;
 		}
@@ -234,7 +251,8 @@ class GROUP_LDAP extends lib\Access implements \OCP\GroupInterface {
 			$this->getFilterPartForGroupSearch($search)
 		));
 		\OCP\Util::writeLog('user_ldap', 'getGroups Filter '.$filter, \OCP\Util::DEBUG);
-		$ldap_groups = $this->fetchListOfGroups($filter, array($this->connection->ldapGroupDisplayName, 'dn'), $limit, $offset);
+		$ldap_groups = $this->fetchListOfGroups($filter, array($this->connection->ldapGroupDisplayName, 'dn'),
+			$limit, $offset);
 		$ldap_groups = $this->ownCloudGroupNames($ldap_groups);
 
 		$this->connection->writeToCache($cachekey, $ldap_groups);
@@ -282,7 +300,6 @@ class GROUP_LDAP extends lib\Access implements \OCP\GroupInterface {
 	* compared with OC_USER_BACKEND_CREATE_USER etc.
 	*/
 	public function implementsActions($actions) {
-		//always returns false, because possible actions are modifying actions. We do not write to LDAP, at least for now.
-		return false;
+		return (bool)(OC_GROUP_BACKEND_GET_DISPLAYNAME	& $actions);
 	}
-}
\ No newline at end of file
+}
diff --git a/apps/user_ldap/group_proxy.php b/apps/user_ldap/group_proxy.php
index 5aa1aef0e0eb128608900370555b787b14a8173c..68d2efe38718dd00d1ed9bc8a4610c833f765e50 100644
--- a/apps/user_ldap/group_proxy.php
+++ b/apps/user_ldap/group_proxy.php
@@ -135,6 +135,22 @@ class Group_Proxy extends lib\Proxy implements \OCP\GroupInterface {
 		return $users;
 	}
 
+	/**
+	 * @brief get a list of all display names in a group
+	 * @returns array with display names (value) and user ids(key)
+	 */
+	public function displayNamesInGroup($gid, $search, $limit, $offset) {
+		$displayNames = array();
+
+		foreach($this->backends as $backend) {
+			$backendUsers = $backend->displayNamesInGroup($gid, $search, $limit, $offset);
+			if (is_array($backendUsers)) {
+				$displayNames = array_merge($displayNames, $backendUsers);
+			}
+		}
+		return $displayNames;
+	}
+
 	/**
 	 * @brief get a list of all groups
 	 * @returns array with group names
diff --git a/apps/user_ldap/l10n/ca.php b/apps/user_ldap/l10n/ca.php
index e4f27e25a7fab324d162cf5d6dfc1cab603a982d..abdecb164e8f29c1f4bd0487e556ba56743994f7 100644
--- a/apps/user_ldap/l10n/ca.php
+++ b/apps/user_ldap/l10n/ca.php
@@ -48,6 +48,7 @@
 "Turn off SSL certificate validation." => "Desactiva la validació de certificat SSL.",
 "If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Si la connexió només funciona amb aquesta opció, importeu el certificat SSL del servidor LDAP en el vostre servidor ownCloud.",
 "Not recommended, use for testing only." => "No recomanat, ús només per proves.",
+"Cache Time-To-Live" => "Memòria de cau Time-To-Live",
 "in seconds. A change empties the cache." => "en segons. Un canvi buidarà la memòria de cau.",
 "Directory Settings" => "Arranjaments de carpetes",
 "User Display Name Field" => "Camp per mostrar el nom d'usuari",
@@ -63,7 +64,12 @@
 "Group Search Attributes" => "Atributs de cerca de grup",
 "Group-Member association" => "Associació membres-grup",
 "Special Attributes" => "Atributs especials",
+"Quota Field" => "Camp de quota",
+"Quota Default" => "Quota per defecte",
 "in bytes" => "en bytes",
+"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.",
+"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 4c74f195cf44d5718bd2fba58f234cd0e1e1bd4a..c5d77026b9e9b317dc7b6a1bbc46ef67d1ef298a 100644
--- a/apps/user_ldap/l10n/cs_CZ.php
+++ b/apps/user_ldap/l10n/cs_CZ.php
@@ -1,5 +1,5 @@
 <?php $TRANSLATIONS = array(
-"Failed to delete the server configuration" => "Selhalo smazání konfigurace serveru",
+"Failed to delete the server configuration" => "Selhalo smazání nastavení serveru",
 "The configuration is valid and the connection could be established!" => "Nastavení je v pořádku a spojení bylo navázáno.",
 "The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Konfigurace je v pořádku, ale spojení selhalo. Zkontrolujte, prosím, nastavení serveru a přihlašovací údaje.",
 "The configuration is invalid. Please look in the ownCloud log for further details." => "Nastavení je neplatné. Zkontrolujte, prosím, záznam ownCloud pro další podrobnosti.",
@@ -48,6 +48,7 @@
 "Turn off SSL certificate validation." => "Vypnout ověřování SSL certifikátu.",
 "If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Pokud připojení pracuje pouze s touto možností, tak importujte SSL certifikát SSL serveru do Vašeho serveru ownCloud",
 "Not recommended, use for testing only." => "Není doporučeno, pouze pro testovací účely.",
+"Cache Time-To-Live" => "TTL vyrovnávací paměti",
 "in seconds. A change empties the cache." => "ve vteřinách. Změna vyprázdní vyrovnávací paměť.",
 "Directory Settings" => "Nastavení adresáře",
 "User Display Name Field" => "Pole pro zobrazované jméno uživatele",
@@ -63,7 +64,12 @@
 "Group Search Attributes" => "Atributy vyhledávání skupin",
 "Group-Member association" => "Asociace člena skupiny",
 "Special Attributes" => "Speciální atributy",
+"Quota Field" => "Pole pro kvótu",
+"Quota Default" => "Výchozí kvóta",
 "in bytes" => "v bajtech",
+"Email Field" => "Pole e-mailu",
+"User Home Folder Naming Rule" => "Pravidlo pojmenování domovské složky uživatele",
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Ponechte prázdné pro uživatelské jméno (výchozí). Jinak uveďte LDAP/AD parametr.",
+"Test Configuration" => "Vyzkoušet nastavení",
 "Help" => "Nápověda"
 );
diff --git a/apps/user_ldap/l10n/de.php b/apps/user_ldap/l10n/de.php
index a1da7d49cbea5ef2c8768ad22f06b730c482f796..6217a6d4821ab8b27d01d03938134e5951beec78 100644
--- a/apps/user_ldap/l10n/de.php
+++ b/apps/user_ldap/l10n/de.php
@@ -12,7 +12,7 @@
 "Do you really want to delete the current Server Configuration?" => "Wollen 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. 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. Bitten Sie Ihren Systemadministrator das Modul zu installieren.",
+"<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",
@@ -38,12 +38,12 @@
 "When unchecked, this configuration will be skipped." => "Konfiguration wird übersprungen wenn deaktiviert",
 "Port" => "Port",
 "Backup (Replica) Host" => "Backup Host (Kopie)",
-"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Gib einen optionalen Backup Host an. Es muss sich um eine kopie des Haupt LDAP/AD Servers handeln.",
+"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Gib 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 aktiviert  wird ownCloud ausschließlich den Backupserver verwenden",
+"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." => "Benutze es nicht zusätzlich für LDAPS Verbindungen, es wird scheitern.",
+"Do not use it additionally for LDAPS connections, it will fail." => "Benutze es nicht zusammen mit LDAPS Verbindungen, es wird fehlschlagen.",
 "Case insensitve LDAP server (Windows)" => "LDAP-Server (Windows: Groß- und Kleinschreibung bleibt unbeachtet)",
 "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.",
@@ -55,7 +55,7 @@
 "Base User Tree" => "Basis-Benutzerbaum",
 "One User Base DN per line" => "Ein Benutzer Base DN pro Zeile",
 "User Search Attributes" => "Benutzersucheigenschaften",
-"Optional; one attribute per line" => "Optional, eine Eigenschaft pro Zeile",
+"Optional; one attribute per line" => "Optional; eine Eigenschaft 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",
diff --git a/apps/user_ldap/l10n/de_DE.php b/apps/user_ldap/l10n/de_DE.php
index 69faf5dc45d62cfa9ac99463eaddd429fb2e530d..bff7b0312c7cbdb8002cee8c6e35ec5e81198c1e 100644
--- a/apps/user_ldap/l10n/de_DE.php
+++ b/apps/user_ldap/l10n/de_DE.php
@@ -1,20 +1,20 @@
 <?php $TRANSLATIONS = array(
 "Failed to delete the server configuration" => "Das Löschen der Server-Konfiguration schlug fehl",
-"The configuration is valid and the connection could be established!" => "Die Konfiguration ist valide und eine Verbindung konnte hergestellt werden!",
-"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Die Konfiguration ist valide, aber das Herstellen einer 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 nicht valide. Weitere Details können Sie im ownCloud-Log nachlesen.",
+"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.",
 "Deletion failed" => "Löschen fehlgeschlagen",
-"Take over settings from recent server configuration?" => "Sollen die Einstellungen der letzten Server-Konfiguration übernommen werden?",
+"Take over settings from recent server configuration?" => "Sollen die Einstellungen der letzten Serverkonfiguration übernommen werden?",
 "Keep settings?" => "Einstellungen behalten?",
-"Cannot add server configuration" => "Das Hinzufügen der Server-Konfiguration schlug fehl",
-"Connection test succeeded" => "Verbindungs-Test erfolgreich",
-"Connection test failed" => "Verbindungs-Test fehlgeschlagen",
-"Do you really want to delete the current Server Configuration?" => "Möchten Sie wirklich die Server-Konfiguration löschen?",
+"Cannot add server configuration" => "Das Hinzufügen der Serverkonfiguration schlug fehl",
+"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?",
 "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.",
-"Server configuration" => "Server-Konfiguration",
-"Add Server Configuration" => "Server-Konfiguration hinzufügen",
+"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",
@@ -33,37 +33,43 @@
 "Group Filter" => "Gruppen-Filter",
 "Defines the filter to apply, when retrieving groups." => "Definiert den Filter für die Anfrage der Gruppen.",
 "without any placeholder, e.g. \"objectClass=posixGroup\"." => "ohne Platzhalter, z.B.: \"objectClass=posixGroup\"",
-"Connection Settings" => "Verbindungs-Einstellungen",
+"Connection Settings" => "Verbindungseinstellungen",
 "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." => "Optionaler Backup Host. Es muss ein Replikat des eigentlichen LDAP/AD Servers sein.",
+"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",
 "Disable Main Server" => "Hauptserver deaktivieren",
-"When switched on, ownCloud will only connect to the replica server." => "Wenn eingeschaltet wird sich ownCloud nur mit dem Replilat-Server verbinden.",
+"When switched on, ownCloud will only connect to the replica server." => "Wenn eingeschaltet wird sich die ownCloud nur mit dem Replikat-Server verbinden.",
 "Use TLS" => "Nutze TLS",
-"Do not use it additionally for LDAPS connections, it will fail." => "Benutze es nicht zusätzlich für LDAPS Verbindungen, es wird scheitern.",
+"Do not use it additionally for LDAPS connections, it will fail." => "Benutzen Sie es nicht in Verbindung mit LDAPS Verbindungen, es wird fehlschlagen.",
 "Case insensitve LDAP server (Windows)" => "LDAP-Server (Windows: Groß- und Kleinschreibung bleibt unbeachtet)",
 "Turn off SSL certificate validation." => "Schalten Sie die SSL-Zertifikatsprüfung aus.",
 "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" => "Verzeichnis-Einstellungen",
+"Directory Settings" => "Verzeichniseinstellungen",
 "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",
-"Optional; one attribute per line" => "Optional; Ein Attribut 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",
 "Group Search Attributes" => "Gruppen-Suche Eigenschaften",
 "Group-Member association" => "Assoziation zwischen Gruppe und Benutzer",
-"Special Attributes" => "besondere Eigenschaften",
+"Special Attributes" => "Besondere Eigenschaften",
+"Quota Field" => "Kontingent Feld",
+"Quota Default" => "Kontingent Standard",
 "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.",
+"Test Configuration" => "Testkonfiguration",
 "Help" => "Hilfe"
 );
diff --git a/apps/user_ldap/l10n/el.php b/apps/user_ldap/l10n/el.php
index 7c0940dc09c6466fc406a25d63eee02ac103ac06..96ec818043720609a18b29cc0732afe1422ca3fe 100644
--- a/apps/user_ldap/l10n/el.php
+++ b/apps/user_ldap/l10n/el.php
@@ -1,6 +1,19 @@
 <?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" => "Η διαγραφή απέτυχε",
+"Keep settings?" => "Διατήρηση ρυθμίσεων;",
+"Cannot add server configuration" => "Αδυναμία προσθήκης ρυθμίσεων διακομιστή",
+"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",
@@ -18,6 +31,7 @@
 "Group Filter" => "Group Filter",
 "Defines the filter to apply, when retrieving groups." => "Καθορίζει το φίλτρο που θα ισχύει κατά την ανάκτηση ομάδων.",
 "without any placeholder, e.g. \"objectClass=posixGroup\"." => "χωρίς κάποια μεταβλητή, π.χ. \"objectClass=ΟμάδαPosix\".",
+"Connection Settings" => "Ρυθμίσεις Σύνδεσης",
 "Port" => "Θύρα",
 "Use TLS" => "Χρήση TLS",
 "Case insensitve LDAP server (Windows)" => "LDAP server (Windows) με διάκριση πεζών-ΚΕΦΑΛΑΙΩΝ",
@@ -25,6 +39,7 @@
 "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." => "Δεν προτείνεται, χρήση μόνο για δοκιμές.",
 "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",
diff --git a/apps/user_ldap/l10n/es.php b/apps/user_ldap/l10n/es.php
index c0a444c0c7d1666d58eeaadd1c82c51d9d799855..1f0f92e7ac495ac08a4a4c7780443375de79eddf 100644
--- a/apps/user_ldap/l10n/es.php
+++ b/apps/user_ldap/l10n/es.php
@@ -15,7 +15,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>Advertencia:</b> El módulo LDAP de PHP no está instalado, el sistema no funcionará. Por favor consulte al administrador del sistema para instalarlo.",
 "Server configuration" => "Configuración del Servidor",
 "Add Server Configuration" => "Agregar configuracion del servidor",
-"Host" => "Máquina",
+"Host" => "Servidor",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "Puede omitir el protocolo, excepto si requiere SSL. En ese caso, empiece con ldaps://",
 "Base DN" => "DN base",
 "One Base DN per line" => "Un DN Base por línea",
@@ -48,6 +48,7 @@
 "Turn off SSL certificate validation." => "Apagar la validación por certificado SSL.",
 "If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Si la conexión sólo funciona con esta opción, importe el certificado SSL del servidor LDAP en su servidor ownCloud.",
 "Not recommended, use for testing only." => "No recomendado, sólo para pruebas.",
+"Cache Time-To-Live" => "Cache TTL",
 "in seconds. A change empties the cache." => "en segundos. Un cambio vacía la cache.",
 "Directory Settings" => "Configuracion de directorio",
 "User Display Name Field" => "Campo de nombre de usuario a mostrar",
@@ -63,7 +64,11 @@
 "Group Search Attributes" => "Atributos de busqueda de grupo",
 "Group-Member association" => "Asociación Grupo-Miembro",
 "Special Attributes" => "Atributos especiales",
+"Quota Field" => "Cuota",
+"Quota Default" => "Cuota por defecto",
 "in bytes" => "en bytes",
+"Email Field" => "E-mail",
 "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.",
+"Test Configuration" => "Configuración de prueba",
 "Help" => "Ayuda"
 );
diff --git a/apps/user_ldap/l10n/eu.php b/apps/user_ldap/l10n/eu.php
index 7ab4d00e7566dc0db095635d0a784dd82262a9bc..5e9fd014c64f3a5875ea41d396007b1a078e0e67 100644
--- a/apps/user_ldap/l10n/eu.php
+++ b/apps/user_ldap/l10n/eu.php
@@ -4,6 +4,7 @@
 "The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Konfigurazioa ongi dago, baina Bind-ek huts egin du. Mesedez egiaztatu zerbitzariaren ezarpenak eta kredentzialak.",
 "The configuration is invalid. Please look in the ownCloud log for further details." => "Konfigurazioa ez dago ongi. Mesedez ikusi ownCloud-en egunerokoa informazio gehiago eskuratzeko.",
 "Deletion failed" => "Ezabaketak huts egin du",
+"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",
 "Connection test succeeded" => "Konexio froga ongi burutu da",
@@ -47,6 +48,7 @@
 "Turn off SSL certificate validation." => "Ezgaitu SSL ziurtagirien egiaztapena.",
 "If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Konexioa aukera hau ezinbestekoa badu, inportatu LDAP zerbitzariaren SSL ziurtagiria zure ownCloud zerbitzarian.",
 "Not recommended, use for testing only." => "Ez da aholkatzen, erabili bakarrik frogak egiteko.",
+"Cache Time-To-Live" => "Katxearen Bizi-Iraupena",
 "in seconds. A change empties the cache." => "segundutan. Aldaketak katxea husten du.",
 "Directory Settings" => "Karpetaren Ezarpenak",
 "User Display Name Field" => "Erabiltzaileen bistaratzeko izena duen eremua",
@@ -62,7 +64,12 @@
 "Group Search Attributes" => "Taldekatu Bilaketa Atributuak ",
 "Group-Member association" => "Talde-Kide elkarketak",
 "Special Attributes" => "Atributu Bereziak",
+"Quota Field" => "Kuota Eremua",
+"Quota Default" => "Kuota Lehenetsia",
 "in bytes" => "bytetan",
+"Email Field" => "Eposta eremua",
+"User Home Folder Naming Rule" => "Erabiltzailearen Karpeta Nagusia Izendatzeko Patroia",
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Utzi hutsik erabiltzaile izenarako (lehentsia). Bestela zehaztu LDAP/AD atributua.",
+"Test Configuration" => "Egiaztatu Konfigurazioa",
 "Help" => "Laguntza"
 );
diff --git a/apps/user_ldap/l10n/gl.php b/apps/user_ldap/l10n/gl.php
index 36c1f7af11483e626e05e5094aa6e7767da4398c..deb6dbb5553a2e395c758588eaefb2eb8a0672c0 100644
--- a/apps/user_ldap/l10n/gl.php
+++ b/apps/user_ldap/l10n/gl.php
@@ -1,9 +1,24 @@
 <?php $TRANSLATIONS = array(
+"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",
+"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",
+"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?",
+"Confirm Deletion" => "Confirmar a eliminación",
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>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.",
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Aviso:</b> O módulo PHP LDAP non está instalado, o servidor non funcionará. Consulte co administrador do sistema para instalalo.",
+"Server configuration" => "Configuración do servidor",
+"Add Server Configuration" => "Engadir a configuración do servidor",
 "Host" => "Servidor",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "Pode omitir o protocolo agás que precise de SSL. Nese caso comece con ldaps://",
 "Base DN" => "DN base",
+"One Base DN per line" => "Un DN base por liña",
 "You can specify Base DN for users and groups in the Advanced tab" => "Pode especificar a DN base para usuarios e grupos na lapela de «Avanzado»",
 "User DN" => "DN do usuario",
 "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 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.",
@@ -18,21 +33,43 @@
 "Group Filter" => "Filtro de grupo",
 "Defines the filter to apply, when retrieving groups." => "Define o filtro a aplicar cando se recompilan os grupos.",
 "without any placeholder, e.g. \"objectClass=posixGroup\"." => "sen ningunha marca de posición, como p.ex «objectClass=grupoPosix».",
+"Connection Settings" => "Axustes da conexión",
+"Configuration Active" => "Configuración activa",
+"When unchecked, this configuration will be skipped." => "Se está sen marcar, omítese esta configuración.",
 "Port" => "Porto",
+"Backup (Replica) Host" => "Servidor da copia de seguranza (Réplica)",
+"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Indicar un servidor de copia de seguranza opcional. Debe ser unha réplica do servidor principal LDAP/AD.",
+"Backup (Replica) Port" => "Porto da copia de seguranza (Réplica)",
+"Disable Main Server" => "Desactivar o servidor principal",
+"When switched on, ownCloud will only connect to the replica server." => "Cando está activado, ownCloud só se conectará ao servidor de réplica.",
 "Use TLS" => "Usar TLS",
+"Do not use it additionally for LDAPS connections, it will fail." => "Non utilizalo ademais para conexións LDAPS xa que fallará.",
 "Case insensitve LDAP server (Windows)" => "Servidor LDAP que non distingue entre maiúsculas e minúsculas (Windows)",
 "Turn off SSL certificate validation." => "Desactiva a validación do certificado SSL.",
-"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Se a conexión só funciona con esta opción importa o certificado SSL do servidor LDAP no seu servidor ownCloud.",
+"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Se a conexión só funciona con esta opción importe o certificado SSL do servidor LDAP no seu servidor ownCloud.",
 "Not recommended, use for testing only." => "Non se recomenda. Só para probas.",
+"Cache Time-To-Live" => "Tempo de persistencia da caché",
 "in seconds. A change empties the cache." => "en segundos. Calquera cambio baleira a caché.",
+"Directory Settings" => "Axustes do directorio",
 "User Display Name Field" => "Campo de mostra do nome de usuario",
 "The LDAP attribute to use to generate the user`s ownCloud name." => "O atributo LDAP a empregar para xerar o nome de usuario de ownCloud.",
 "Base User Tree" => "Base da árbore de usuarios",
+"One User Base DN per line" => "Un DN base de usuario por liña",
+"User Search Attributes" => "Atributos de busca do usuario",
+"Optional; one attribute per line" => "Opcional; un atributo por liña",
 "Group Display Name Field" => "Campo de mostra do nome de grupo",
 "The LDAP attribute to use to generate the groups`s ownCloud name." => "O atributo LDAP úsase para xerar os nomes dos grupos de ownCloud.",
 "Base Group Tree" => "Base da árbore de grupo",
+"One Group Base DN per line" => "Un DN base de grupo por liña",
+"Group Search Attributes" => "Atributos de busca do grupo",
 "Group-Member association" => "Asociación de grupos e membros",
+"Special Attributes" => "Atributos especiais",
+"Quota Field" => "Campo de cota",
+"Quota Default" => "Cota predeterminada",
 "in bytes" => "en bytes",
+"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.",
+"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 5c563b7b6f3cdcc987af135a07c74a44c12a551c..c9b0e282f1d26908fa3ab55e391f036f8083f1de 100644
--- a/apps/user_ldap/l10n/he.php
+++ b/apps/user_ldap/l10n/he.php
@@ -7,6 +7,7 @@
 "User Login Filter" => "סנן כניסת משתמש",
 "User List Filter" => "סנן רשימת משתמשים",
 "Group Filter" => "סנן קבוצה",
+"Port" => "פורט",
 "in seconds. A change empties the cache." => "בשניות. שינוי מרוקן את המטמון.",
 "in bytes" => "בבתים",
 "Help" => "עזרה"
diff --git a/apps/user_ldap/l10n/hu_HU.php b/apps/user_ldap/l10n/hu_HU.php
index c7dfc125d7997f3c1d703a5773f27968e13aed70..a82a64ab32f1387660ebfb3b93c38cf19f6db002 100644
--- a/apps/user_ldap/l10n/hu_HU.php
+++ b/apps/user_ldap/l10n/hu_HU.php
@@ -48,6 +48,7 @@
 "Turn off SSL certificate validation." => "Ne ellenőrizzük az SSL-tanúsítvány érvényességét",
 "If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "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!",
 "Not recommended, use for testing only." => "Nem javasolt, csak tesztelésre érdemes használni.",
+"Cache Time-To-Live" => "A gyorsítótár tárolási időtartama",
 "in seconds. A change empties the cache." => "másodpercben. A változtatás törli a cache tartalmát.",
 "Directory Settings" => "Címtár beállítások",
 "User Display Name Field" => "A felhasználónév mezője",
@@ -63,7 +64,12 @@
 "Group Search Attributes" => "A csoportok lekérdezett attribútumai",
 "Group-Member association" => "A csoporttagság attribútuma",
 "Special Attributes" => "Különleges attribútumok",
+"Quota Field" => "Kvóta mező",
+"Quota Default" => "Alapértelmezett kvóta",
 "in bytes" => "bájtban",
+"Email Field" => "Email mező",
+"User Home Folder Naming Rule" => "A home könyvtár elérési útvonala",
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Hagyja üresen, ha a felhasználónevet kívánja használni. Ellenkező esetben adjon meg egy LDAP/AD attribútumot!",
+"Test Configuration" => "A beállítások tesztelése",
 "Help" => "Súgó"
 );
diff --git a/apps/user_ldap/l10n/id.php b/apps/user_ldap/l10n/id.php
index c07892386d6a2f747c582afcbd0a8202ab8cca8f..5912789c85640cc78afcd098ec9ad1e52c8fd9c7 100644
--- a/apps/user_ldap/l10n/id.php
+++ b/apps/user_ldap/l10n/id.php
@@ -1,14 +1,69 @@
 <?php $TRANSLATIONS = array(
+"Failed to delete the server configuration" => "Gagal menghapus konfigurasi server",
+"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",
+"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",
+"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?",
+"Confirm Deletion" => "Konfirmasi Penghapusan",
+"<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>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.",
+"<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",
+"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",
+"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.",
+"use %%uid placeholder, e.g. \"uid=%%uid\"" => "gunakan pengganti %%uid, mis. \"uid=%%uid\"",
+"User List Filter" => "Daftar Filter Pengguna",
+"Defines the filter to apply, when retrieving users." => "Definisikan filter untuk diterapkan saat menerima pengguna.",
+"without any placeholder, e.g. \"objectClass=person\"." => "tanpa pengganti apapun, mis. \"objectClass=seseorang\".",
 "Group Filter" => "saringan grup",
+"Defines the filter to apply, when retrieving groups." => "Definisikan filter untuk diterapkan saat menerima grup.",
+"without any placeholder, e.g. \"objectClass=posixGroup\"." => "tanpa pengganti apapaun, mis. \"objectClass=posixGroup\".",
+"Connection Settings" => "Pengaturan Koneksi",
+"Configuration Active" => "Konfigurasi Aktif",
+"When unchecked, this configuration will be skipped." => "Jika tidak dicentang, konfigurasi ini dilewati.",
 "Port" => "port",
+"Backup (Replica) Host" => "Host Cadangan (Replika)",
+"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Berikan pilihan host cadangan. Harus merupakan replika dari server LDAP/AD utama.",
+"Backup (Replica) Port" => "Port Cadangan (Replika)",
+"Disable Main Server" => "Nonaktifkan Server Utama",
+"When switched on, ownCloud will only connect to the replica server." => "Saat diaktifkan, ownCloud hanya akan terhubung ke server replika.",
 "Use TLS" => "gunakan TLS",
+"Do not use it additionally for LDAPS connections, it will fail." => "Jangan gunakan utamanya untuk koneksi LDAPS, koneksi akan gagal.",
+"Case insensitve LDAP server (Windows)" => "Server LDAP dengan kapitalisasi tidak sensitif (Windows)",
 "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.",
 "in seconds. A change empties the cache." => "dalam detik. perubahan mengosongkan cache",
+"Directory Settings" => "Pengaturan Direktori",
+"User Display Name Field" => "Bidang Tampilan Nama Pengguna",
+"The LDAP attribute to use to generate the user`s ownCloud name." => "Atribut LDAP yang digunakan untuk menghasilkan nama pengguna ownCloud.",
+"Base User Tree" => "Pohon Pengguna Dasar",
+"One User Base DN per line" => "Satu Pengguna Base DN per baris",
+"User Search Attributes" => "Atribut Pencarian Pengguna",
+"Optional; one attribute per line" => "Pilihan; satu atribut per baris",
+"Group Display Name Field" => "Bidang Tampilan Nama Grup",
+"The LDAP attribute to use to generate the groups`s ownCloud name." => "Atribut LDAP yang digunakan untuk menghasilkan nama grup ownCloud.",
+"Base Group Tree" => "Pohon Grup Dasar",
+"One Group Base DN per line" => "Satu Grup Base DN per baris",
+"Group Search Attributes" => "Atribut Pencarian Grup",
+"Group-Member association" => "asosiasi Anggota-Grup",
+"Special Attributes" => "Atribut Khusus",
 "in bytes" => "dalam bytes",
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Biarkan nama pengguna kosong (default). Atau tetapkan atribut LDAP/AD.",
 "Help" => "bantuan"
 );
diff --git a/apps/user_ldap/l10n/it.php b/apps/user_ldap/l10n/it.php
index 594529190d94cf28dbeea404d8461aa0e073a9dd..a2790fd1dec60f2a6e4079930e25590b93878d89 100644
--- a/apps/user_ldap/l10n/it.php
+++ b/apps/user_ldap/l10n/it.php
@@ -48,6 +48,7 @@
 "Turn off SSL certificate validation." => "Disattiva il controllo del certificato SSL.",
 "If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Se la connessione funziona esclusivamente con questa opzione, importa il certificato SSL del server LDAP nel tuo server ownCloud.",
 "Not recommended, use for testing only." => "Non consigliato, utilizzare solo per test.",
+"Cache Time-To-Live" => "Tempo di vita della cache",
 "in seconds. A change empties the cache." => "in secondi. Il cambio svuota la cache.",
 "Directory Settings" => "Impostazioni delle cartelle",
 "User Display Name Field" => "Campo per la visualizzazione del nome utente",
@@ -63,7 +64,12 @@
 "Group Search Attributes" => "Attributi di ricerca gruppo",
 "Group-Member association" => "Associazione gruppo-utente ",
 "Special Attributes" => "Attributi speciali",
+"Quota Field" => "Campo Quota",
+"Quota Default" => "Quota predefinita",
 "in bytes" => "in byte",
+"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.",
+"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 11ad6cc7a377ab93bc5ab2c3a11c163010e33c32..3ae7d2e639222326d4e24adcbbb9d434776845e4 100644
--- a/apps/user_ldap/l10n/ja_JP.php
+++ b/apps/user_ldap/l10n/ja_JP.php
@@ -48,6 +48,7 @@
 "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" => "キャッシュのTTL",
 "in seconds. A change empties the cache." => "秒。変更後にキャッシュがクリアされます。",
 "Directory Settings" => "ディレクトリ設定",
 "User Display Name Field" => "ユーザ表示名のフィールド",
@@ -63,7 +64,12 @@
 "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/ka.php b/apps/user_ldap/l10n/ka.php
new file mode 100644
index 0000000000000000000000000000000000000000..169926283e9a39b2a4de635e76e739143a1cdf3b
--- /dev/null
+++ b/apps/user_ldap/l10n/ka.php
@@ -0,0 +1,4 @@
+<?php $TRANSLATIONS = array(
+"Password" => "პაროლი",
+"Help" => "შველა"
+);
diff --git a/apps/user_ldap/l10n/my_MM.php b/apps/user_ldap/l10n/my_MM.php
new file mode 100644
index 0000000000000000000000000000000000000000..ee8d3dd26fa873eab8252b207db2e52f80d080e4
--- /dev/null
+++ b/apps/user_ldap/l10n/my_MM.php
@@ -0,0 +1,4 @@
+<?php $TRANSLATIONS = array(
+"Password" => "စကားဝှက်",
+"Help" => "အကူအညီ"
+);
diff --git a/apps/user_ldap/l10n/nb_NO.php b/apps/user_ldap/l10n/nb_NO.php
index 8aab71354b092f141150b5078b6b643ecf5df111..c4700245f24059f50b3be04e0bd8c061b40d3d5d 100644
--- a/apps/user_ldap/l10n/nb_NO.php
+++ b/apps/user_ldap/l10n/nb_NO.php
@@ -1,11 +1,58 @@
 <?php $TRANSLATIONS = array(
-"Deletion failed" => "Sletting feilet",
+"Failed to delete the server configuration" => "Klarte ikke å slette tjener-konfigurasjonen.",
+"The configuration is valid and the connection could be established!" => "Konfigurasjonen er i orden og tilkoblingen skal være etablert!",
+"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Konfigurasjonen er i orden, men Bind mislyktes. Vennligst sjekk tjener-konfigurasjonen og påloggingsinformasjonen.",
+"The configuration is invalid. Please look in the ownCloud log for further details." => "Konfigurasjonen er ikke i orden. Vennligst se ownClouds logfil for flere detaljer.",
+"Deletion failed" => "Sletting mislyktes",
+"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",
+"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?",
+"Confirm Deletion" => "Bekreft sletting",
+"<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>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.",
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Warning:</b> PHP LDAP modulen er ikke installert, hjelperen vil ikke virke. Vennligst be din system-administrator om å installere den.",
+"Server configuration" => "Tjener-konfigurasjon",
+"Add Server Configuration" => "Legg til tjener-konfigurasjon",
+"Host" => "Tjener",
+"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Du kan utelate protokollen, men du er påkrevd å bruke SSL.  Deretter starte med ldaps://",
+"Base DN" => "Base DN",
+"One Base DN per line" => "En hoved DN pr. linje",
+"You can specify Base DN for users and groups in the Advanced tab" => "Du kan spesifisere Base DN for brukere og grupper under Avansert fanen",
+"User DN" => "Bruker 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 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.",
 "Password" => "Passord",
+"For anonymous access, leave DN and Password empty." => "For anonym tilgang, la DN- og passord-feltet stå tomt.",
+"User Login Filter" => "Brukerpålogging filter",
+"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Definerer filteret som skal brukes når et påloggingsforsøk blir utført. %%uid erstatter brukernavnet i innloggingshandlingen.",
+"use %%uid placeholder, e.g. \"uid=%%uid\"" => "bruk %%uid plassholder, f.eks. \"uid=%%uid\"",
+"User List Filter" => "Brukerliste filter",
+"Defines the filter to apply, when retrieving users." => "Definerer filteret som skal brukes, når systemet innhenter brukere.",
+"without any placeholder, e.g. \"objectClass=person\"." => "uten noe plassholder, f.eks. \"objectClass=person\".",
 "Group Filter" => "Gruppefilter",
+"Defines the filter to apply, when retrieving groups." => "Definerer filteret som skal brukes, når systemet innhenter grupper.",
+"without any placeholder, e.g. \"objectClass=posixGroup\"." => "uten noe plassholder, f.eks. \"objectClass=posixGroup\".",
+"Configuration Active" => "Konfigurasjon aktiv",
+"When unchecked, this configuration will be skipped." => "Når ikke huket av så vil denne konfigurasjonen bli hoppet over.",
 "Port" => "Port",
+"Backup (Replica) Host" => "Sikkerhetskopierings (Replica) vert",
 "Use TLS" => "Bruk TLS",
+"Case insensitve LDAP server (Windows)" => "Case-insensitiv LDAP tjener (Windows)",
+"Turn off SSL certificate validation." => "Slå av SSL-sertifikat validering",
+"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Hvis tilgang kun fungerer med dette alternativet, importer LDAP-tjenerens SSL-sertifikat til din egen ownCloud tjener.",
 "Not recommended, use for testing only." => "Ikke anbefalt, bruk kun for testing",
 "in seconds. A change empties the cache." => "i sekunder. En endring tømmer bufferen.",
+"User Display Name Field" => "Vis brukerens navnfelt",
+"The LDAP attribute to use to generate the user`s ownCloud name." => "LDAP-attributen å bruke for å generere brukers ownCloud navn.",
+"Base User Tree" => "Hovedbruker tre",
+"One User Base DN per line" => "En Bruker Base DN pr. linje",
+"Group Display Name Field" => "Vis gruppens navnfelt",
+"The LDAP attribute to use to generate the groups`s ownCloud name." => "LDAP-attributen å bruke for å generere gruppens ownCloud navn.",
+"Base Group Tree" => "Hovedgruppe tre",
+"One Group Base DN per line" => "En gruppe hoved-DN pr. linje",
+"Group-Member association" => "gruppe-medlem assosiasjon",
 "in bytes" => "i bytes",
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "La stå tom for brukernavn (standard). Ellers, spesifiser en LDAP/AD attributt.",
 "Help" => "Hjelp"
 );
diff --git a/apps/user_ldap/l10n/nl.php b/apps/user_ldap/l10n/nl.php
index 0eda263aa116bf7c8ec6dc6644518d798920b51e..7973c66cd10d8cc3d5dee001a2a04d787aa6d63f 100644
--- a/apps/user_ldap/l10n/nl.php
+++ b/apps/user_ldap/l10n/nl.php
@@ -48,6 +48,7 @@
 "Turn off SSL certificate validation." => "Schakel SSL certificaat validatie uit.",
 "If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Als de connectie alleen werkt met deze optie, importeer dan het LDAP server SSL certificaat naar je ownCloud server.",
 "Not recommended, use for testing only." => "Niet aangeraden, gebruik alleen voor test doeleinden.",
+"Cache Time-To-Live" => "Cache time-to-live",
 "in seconds. A change empties the cache." => "in seconden. Een verandering maakt de cache leeg.",
 "Directory Settings" => "Mapinstellingen",
 "User Display Name Field" => "Gebruikers Schermnaam Veld",
@@ -63,7 +64,12 @@
 "Group Search Attributes" => "Attributen voor groepszoekopdrachten",
 "Group-Member association" => "Groepslid associatie",
 "Special Attributes" => "Speciale attributen",
+"Quota Field" => "Quota veld",
+"Quota Default" => "Quota standaard",
 "in bytes" => "in bytes",
+"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.",
+"Test Configuration" => "Test configuratie",
 "Help" => "Help"
 );
diff --git a/apps/user_ldap/l10n/pl.php b/apps/user_ldap/l10n/pl.php
index ef3f9140ef75365d2312e498d67ed46c424bbf40..776aa445e4eebbf8f32d15ffffd9d553d7b2209b 100644
--- a/apps/user_ldap/l10n/pl.php
+++ b/apps/user_ldap/l10n/pl.php
@@ -1,9 +1,24 @@
 <?php $TRANSLATIONS = array(
+"Failed to delete the server configuration" => "Nie można usunąć konfiguracji serwera",
+"The configuration is valid and the connection could be established!" => "Konfiguracja jest prawidłowa i można ustanowić połączenie!",
+"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Konfiguracja jest prawidłowa, ale Bind nie. Sprawdź ustawienia serwera i poświadczenia.",
+"The configuration is invalid. Please look in the ownCloud log for further details." => "Konfiguracja jest nieprawidłowa. Proszę przejrzeć logi dziennika ownCloud ",
 "Deletion failed" => "Skasowanie nie powiodło się",
+"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",
+"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?",
+"Confirm Deletion" => "Potwierdź usunięcie",
 "<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>Ostrzeżenie:</b> Aplikacje user_ldap i user_webdavauth nie są  kompatybilne. Mogą powodować nieoczekiwane zachowanie. Poproś administratora o wyłączenie jednej z nich.",
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Ostrzeżenie:</b>  Moduł PHP LDAP nie jest zainstalowany i nie będzie działał. Poproś administratora o włączenie go.",
+"Server configuration" => "Konfiguracja servera",
+"Add Server Configuration" => "Dodaj konfigurację servera",
 "Host" => "Host",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "Można pominąć protokół, z wyjątkiem wymaganego protokołu SSL. Następnie uruchom z ldaps://",
 "Base DN" => "Baza DN",
+"One Base DN per line" => "Jedna baza DN na linię",
 "You can specify Base DN for users and groups in the Advanced tab" => "Bazę DN można określić dla użytkowników i grup w karcie Zaawansowane",
 "User DN" => "Użytkownik 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 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",
@@ -18,21 +33,43 @@
 "Group Filter" => "Grupa filtrów",
 "Defines the filter to apply, when retrieving groups." => "Definiuje filtry do zastosowania, podczas pobierania grup.",
 "without any placeholder, e.g. \"objectClass=posixGroup\"." => "bez żadnych symboli zastępczych np. \"objectClass=posixGroup\".",
+"Connection Settings" => "Konfiguracja połączeń",
+"Configuration Active" => "Konfiguracja archiwum",
+"When unchecked, this configuration will be skipped." => "Gdy niezaznaczone, ta konfiguracja zostanie pominięta.",
 "Port" => "Port",
+"Backup (Replica) Host" => "Kopia zapasowa (repliki) host",
+"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Dać opcjonalnie  hosta kopii zapasowej . To musi być repliką głównego serwera LDAP/AD.",
+"Backup (Replica) Port" => "Kopia zapasowa (repliki) Port",
+"Disable Main Server" => "Wyłącz serwer główny",
+"When switched on, ownCloud will only connect to the replica server." => "Po włączeniu, ownCloud tylko połączy się z serwerem repliki.",
 "Use TLS" => "Użyj TLS",
+"Do not use it additionally for LDAPS connections, it will fail." => "Nie używaj go dodatkowo dla połączeń protokołu LDAPS, zakończy się niepowodzeniem.",
 "Case insensitve LDAP server (Windows)" => "Wielkość liter serwera LDAP (Windows)",
 "Turn off SSL certificate validation." => "Wyłączyć sprawdzanie poprawności certyfikatu SSL.",
 "If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Jeśli połączenie działa tylko z tą opcją, zaimportuj certyfikat SSL serwera LDAP w serwerze ownCloud.",
 "Not recommended, use for testing only." => "Niezalecane, użyj tylko testowo.",
+"Cache Time-To-Live" => "Przechowuj czas życia",
 "in seconds. A change empties the cache." => "w sekundach. Zmiana opróżnia pamięć podręczną.",
+"Directory Settings" => "Ustawienia katalogów",
 "User Display Name Field" => "Pole wyświetlanej nazwy użytkownika",
 "The LDAP attribute to use to generate the user`s ownCloud name." => "Atrybut LDAP służy do generowania nazwy użytkownika ownCloud.",
 "Base User Tree" => "Drzewo bazy użytkowników",
+"One User Base DN per line" => "Jeden użytkownik Bazy DN na linię",
+"User Search Attributes" => "Szukaj atrybutów",
+"Optional; one attribute per line" => "Opcjonalnie; jeden atrybut w wierszu",
 "Group Display Name Field" => "Pole wyświetlanej nazwy grupy",
 "The LDAP attribute to use to generate the groups`s ownCloud name." => "Atrybut LDAP służy do generowania nazwy grup ownCloud.",
 "Base Group Tree" => "Drzewo bazy grup",
+"One Group Base DN per line" => "Jedna grupa bazy DN na linię",
+"Group Search Attributes" => "Grupa atrybutów wyszukaj",
 "Group-Member association" => "Członek grupy stowarzyszenia",
+"Special Attributes" => "Specjalne atrybuty",
+"Quota Field" => "Pole przydziału",
+"Quota Default" => "Przydział domyślny",
 "in bytes" => "w bajtach",
+"Email Field" => "Pole email",
+"User Home Folder Naming Rule" => "Reguły nazewnictwa folderu domowego użytkownika",
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Pozostaw puste dla user name (domyślnie). W przeciwnym razie podaj atrybut LDAP/AD.",
+"Test Configuration" => "Konfiguracja testowa",
 "Help" => "Pomoc"
 );
diff --git a/apps/user_ldap/l10n/pt_BR.php b/apps/user_ldap/l10n/pt_BR.php
index dd4019fc35e0f73eb7eb3affedb0e540f40c1977..a728ea15fde20d9a9e366d70841a6a81f8b61261 100644
--- a/apps/user_ldap/l10n/pt_BR.php
+++ b/apps/user_ldap/l10n/pt_BR.php
@@ -1,12 +1,24 @@
 <?php $TRANSLATIONS = array(
+"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.",
+"The configuration is invalid. Please look in the ownCloud log for further details." => "A configuração é inválida. Leia o log do ownCloud para mais detalhes.",
 "Deletion failed" => "Remoção falhou",
+"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",
+"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?",
 "Confirm Deletion" => "Confirmar Exclusão",
 "<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>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.",
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<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.",
-"Host" => "Host",
+"Server configuration" => "Configuração de servidor",
+"Add Server Configuration" => "Adicionar Configuração de Servidor",
+"Host" => "Servidor",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "Você pode omitir o protocolo, exceto quando requerer SSL. Então inicie com ldaps://",
 "Base DN" => "DN Base",
+"One Base DN per line" => "Uma base DN por linha",
 "You can specify Base DN for users and groups in the Advanced tab" => "Você pode especificar DN Base para usuários e grupos na guia Avançada",
 "User DN" => "DN Usuário",
 "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 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.",
@@ -16,26 +28,48 @@
 "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Define o filtro pra aplicar ao efetuar uma tentativa de login. %%uuid substitui o nome de usuário na ação de login.",
 "use %%uid placeholder, e.g. \"uid=%%uid\"" => "use %%uid placeholder, ex. \"uid=%%uid\"",
 "User List Filter" => "Filtro de Lista de Usuário",
-"Defines the filter to apply, when retrieving users." => "Define filtro a aplicar ao obter usuários.",
+"Defines the filter to apply, when retrieving users." => "Define filtro a ser aplicado ao obter usuários.",
 "without any placeholder, e.g. \"objectClass=person\"." => "sem nenhum espaço reservado, ex. \"objectClass=person\".",
 "Group Filter" => "Filtro de Grupo",
 "Defines the filter to apply, when retrieving groups." => "Define o filtro a aplicar ao obter grupos.",
 "without any placeholder, e.g. \"objectClass=posixGroup\"." => "sem nenhum espaço reservado, ex.  \"objectClass=posixGroup\"",
+"Connection Settings" => "Configurações de Conexão",
+"Configuration Active" => "Configuração ativa",
+"When unchecked, this configuration will be skipped." => "Quando não marcada, esta configuração será ignorada.",
 "Port" => "Porta",
+"Backup (Replica) Host" => "Servidor de Backup (Réplica)",
+"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Defina um servidor de backup opcional. Ele deverá ser uma réplica do servidor LDAP/AD principal.",
+"Backup (Replica) Port" => "Porta do Backup (Réplica)",
+"Disable Main Server" => "Desativar Servidor Principal",
+"When switched on, ownCloud will only connect to the replica server." => "Quando ativado, ownCloud somente se conectará ao servidor de réplica.",
 "Use TLS" => "Usar TLS",
+"Do not use it additionally for LDAPS connections, it will fail." => "Não use adicionalmente para conexões LDAPS, pois falhará.",
 "Case insensitve LDAP server (Windows)" => "Servidor LDAP sensível à caixa alta (Windows)",
 "Turn off SSL certificate validation." => "Desligar validação de certificado SSL.",
 "If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Se a conexão só funciona com essa opção, importe o certificado SSL do servidor LDAP no seu servidor ownCloud.",
 "Not recommended, use for testing only." => "Não recomendado, use somente para testes.",
+"Cache Time-To-Live" => "Cache Time-To-Live",
 "in seconds. A change empties the cache." => "em segundos. Uma mudança esvaziará o cache.",
+"Directory Settings" => "Configurações de Diretório",
 "User Display Name Field" => "Campo Nome de Exibição de Usuário",
 "The LDAP attribute to use to generate the user`s ownCloud name." => "O atributo LDAP para usar para gerar nome ownCloud do usuário.",
 "Base User Tree" => "Árvore de Usuário Base",
+"One User Base DN per line" => "Um usuário-base DN por linha",
+"User Search Attributes" => "Atributos de Busca de Usuário",
+"Optional; one attribute per line" => "Opcional; um atributo por linha",
 "Group Display Name Field" => "Campo Nome de Exibição de Grupo",
 "The LDAP attribute to use to generate the groups`s ownCloud name." => "O atributo LDAP para usar para gerar nome ownCloud do grupo.",
 "Base Group Tree" => "Árvore de Grupo Base",
+"One Group Base DN per line" => "Um grupo-base DN por linha",
+"Group Search Attributes" => "Atributos de Busca de Grupo",
 "Group-Member association" => "Associação Grupo-Membro",
+"Special Attributes" => "Atributos Especiais",
+"Quota Field" => "Campo de Cota",
+"Quota Default" => "Cota Padrão",
 "in bytes" => "em bytes",
+"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.",
+"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 bfe6656b3b688df9c4aff407441a8688a09e5b10..3092d061437e537618aa08824aab23c5eaadc819 100644
--- a/apps/user_ldap/l10n/pt_PT.php
+++ b/apps/user_ldap/l10n/pt_PT.php
@@ -48,6 +48,7 @@
 "Turn off SSL certificate validation." => "Desligar a validação de certificado SSL.",
 "If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Se a ligação apenas funcionar com está opção, importe o certificado SSL do servidor LDAP para o seu servidor do ownCloud.",
 "Not recommended, use for testing only." => "Não recomendado, utilizado apenas para testes!",
+"Cache Time-To-Live" => "Cache do tempo de vida dos objetos no servidor",
 "in seconds. A change empties the cache." => "em segundos. Uma alteração esvazia a cache.",
 "Directory Settings" => "Definições de directorias",
 "User Display Name Field" => "Mostrador do nome de utilizador.",
@@ -63,7 +64,12 @@
 "Group Search Attributes" => "Atributos de pesquisa de grupo",
 "Group-Member association" => "Associar utilizador ao grupo.",
 "Special Attributes" => "Atributos especiais",
+"Quota Field" => "Quota",
+"Quota Default" => "Quota padrão",
 "in bytes" => "em bytes",
+"Email Field" => "Campo de email",
+"User Home Folder Naming Rule" => "Regra da pasta inicial do utilizador",
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Deixe vazio para nome de utilizador (padrão). De outro modo, especifique um atributo LDAP/AD.",
+"Test Configuration" => "Testar a configuração",
 "Help" => "Ajuda"
 );
diff --git a/apps/user_ldap/l10n/ru.php b/apps/user_ldap/l10n/ru.php
index c66530174a9f24e5e7c44e03cc59d52989b01276..0746e1e8929f33876af29823c6d528d77e626199 100644
--- a/apps/user_ldap/l10n/ru.php
+++ b/apps/user_ldap/l10n/ru.php
@@ -48,6 +48,7 @@
 "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 сертификат SSL сервера LDAP.",
 "Not recommended, use for testing only." => "Не рекомендуется, используйте только для тестирования.",
+"Cache Time-To-Live" => "Кэш времени жизни",
 "in seconds. A change empties the cache." => "в секундах. Изменение очистит кэш.",
 "Directory Settings" => "Настройки каталога",
 "User Display Name Field" => "Поле отображаемого имени пользователя",
@@ -63,7 +64,12 @@
 "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/sk_SK.php b/apps/user_ldap/l10n/sk_SK.php
index 727765a15073abe0d5f6ce479ed21960d376680b..cb55762e64f6beeea256f7a145d1dc5fdeed53dd 100644
--- a/apps/user_ldap/l10n/sk_SK.php
+++ b/apps/user_ldap/l10n/sk_SK.php
@@ -48,6 +48,7 @@
 "Turn off SSL certificate validation." => "Vypnúť overovanie SSL certifikátu.",
 "If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Ak pripojenie pracuje len s touto možnosťou, tak importujte SSL certifikát LDAP serveru do vášho servera ownCloud.",
 "Not recommended, use for testing only." => "Nie je doporučované, len pre testovacie účely.",
+"Cache Time-To-Live" => "Životnosť objektov v cache",
 "in seconds. A change empties the cache." => "v sekundách. Zmena vyprázdni vyrovnávaciu pamäť.",
 "Directory Settings" => "Nastavenie priečinka",
 "User Display Name Field" => "Pole pre zobrazenia mena používateľa",
@@ -63,7 +64,12 @@
 "Group Search Attributes" => "Atribúty vyhľadávania skupín",
 "Group-Member association" => "Priradenie člena skupiny",
 "Special Attributes" => "Špeciálne atribúty",
+"Quota Field" => "Pole kvóty",
+"Quota Default" => "Predvolená kvóta",
 "in bytes" => "v bajtoch",
+"Email Field" => "Pole email",
+"User Home Folder Naming Rule" => "Pravidlo pre nastavenie mena používateľského priečinka dát",
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Nechajte prázdne pre používateľské meno (predvolené). Inak uveďte atribút LDAP/AD.",
+"Test Configuration" => "Test nastavenia",
 "Help" => "Pomoc"
 );
diff --git a/apps/user_ldap/l10n/sv.php b/apps/user_ldap/l10n/sv.php
index 702912f9c682fe479ee26d6128caafee87e52a0f..12ecc7b1633c15ea469f48cbd7d0d619d26814af 100644
--- a/apps/user_ldap/l10n/sv.php
+++ b/apps/user_ldap/l10n/sv.php
@@ -63,7 +63,9 @@
 "Group Search Attributes" => "Gruppsökningsattribut",
 "Group-Member association" => "Attribut för gruppmedlemmar",
 "Special Attributes" => "Specialattribut",
+"Quota Field" => "Kvotfält",
 "in bytes" => "i bytes",
+"Email Field" => "E-postfält",
 "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.",
 "Help" => "Hjälp"
 );
diff --git a/apps/user_ldap/l10n/tr.php b/apps/user_ldap/l10n/tr.php
index 1bed9e246c924af9031d228ae725d191a4ecfb6c..7bcabb0448a3c8f81dab7e05e39fbae020dd3d62 100644
--- a/apps/user_ldap/l10n/tr.php
+++ b/apps/user_ldap/l10n/tr.php
@@ -1,16 +1,22 @@
 <?php $TRANSLATIONS = array(
 "Deletion failed" => "Silme başarısız oldu",
-"Host" => "Konak",
-"Base DN" => "Base DN",
-"User DN" => "User DN",
+"Keep settings?" => "Ayarları kalsınmı?",
+"Connection test succeeded" => "Bağlantı testi başarılı oldu",
+"Connection test failed" => "Bağlantı testi başarısız oldu",
+"Confirm Deletion" => "Silmeyi onayla",
+"Host" => "Sunucu",
+"Base DN" => "Ana DN",
+"User DN" => "Kullanıcı DN",
 "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 Açma Süzgeci",
+"User Login Filter" => "Kullanıcı Oturum Filtresi",
 "use %%uid placeholder, e.g. \"uid=%%uid\"" => "%%uid yer tutucusunu kullanın, örneğin \"uid=%%uid\"",
-"User List Filter" => "Kullanıcı Liste Süzgeci",
+"User List Filter" => "Kullanıcı Liste Filtresi",
 "without any placeholder, e.g. \"objectClass=person\"." => "bir yer tutucusu olmadan, örneğin \"objectClass=person\"",
 "Group Filter" => "Grup Süzgeci",
+"Connection Settings" => "Bağlantı ayarları",
 "Port" => "Port",
+"Disable Main Server" => "Ana sunucuyu devredışı birak",
 "Use TLS" => "TLS kullan",
 "Turn off SSL certificate validation." => "SSL sertifika doğrulamasını kapat.",
 "Not recommended, use for testing only." => "Önerilmez, sadece test için kullanın.",
diff --git a/apps/user_ldap/l10n/uk.php b/apps/user_ldap/l10n/uk.php
index 643a7495890b89e6ef74ac4c75ef6d04e0e337e5..623d34c98e6a5f3a26b8a8b58b4187a5e95c07d9 100644
--- a/apps/user_ldap/l10n/uk.php
+++ b/apps/user_ldap/l10n/uk.php
@@ -33,25 +33,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." => "Не використовуйте це додатково для під'єднання до LDAP, бо виконано не буде.",
 "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." => "Не рекомендується, використовуйте лише для тестів.",
+"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" => "Один Користувач Base 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" => "Одна Група Base DN на одній строчці",
+"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/ur_PK.php b/apps/user_ldap/l10n/ur_PK.php
new file mode 100644
index 0000000000000000000000000000000000000000..4c606a138081f80fed2752ffeaba5a345108481a
--- /dev/null
+++ b/apps/user_ldap/l10n/ur_PK.php
@@ -0,0 +1,4 @@
+<?php $TRANSLATIONS = array(
+"Password" => "پاسورڈ",
+"Help" => "مدد"
+);
diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php
index 4aa8ae8e8a49fd1dea84d6f81f7821a13b621bbc..a8cfd45bf4d630f3cd48ce35da40c00c3e082eca 100644
--- a/apps/user_ldap/lib/access.php
+++ b/apps/user_ldap/lib/access.php
@@ -48,7 +48,9 @@ abstract class Access {
 	 */
 	public function readAttribute($dn, $attr, $filter = 'objectClass=*') {
 		if(!$this->checkConnection()) {
-			\OCP\Util::writeLog('user_ldap', 'No LDAP Connector assigned, access impossible for readAttribute.', \OCP\Util::WARN);
+			\OCP\Util::writeLog('user_ldap',
+				'No LDAP Connector assigned, access impossible for readAttribute.',
+				\OCP\Util::WARN);
 			return false;
 		}
 		$cr = $this->connection->getConnectionResource();
@@ -123,7 +125,8 @@ abstract class Access {
 			return $result;
 		}
 
-		//OID sometimes gives back DNs with whitespace after the comma a la "uid=foo, cn=bar, dn=..." We need to tackle this!
+		//OID sometimes gives back DNs with whitespace after the comma
+		// a la "uid=foo, cn=bar, dn=..." We need to tackle this!
 		$dn = preg_replace('/([^\\\]),(\s+)/u', '\1,', $dn);
 
 		//make comparisons and everything work
@@ -141,6 +144,9 @@ abstract class Access {
 			'\;' => '\5c3B',
 			'\"' => '\5c22',
 			'\#' => '\5c23',
+			'('  => '\28',
+			')'  => '\29',
+			'*'  => '\2A',
 		);
 		$dn = str_replace(array_keys($replacements), array_values($replacements), $dn);
 
@@ -218,7 +224,8 @@ abstract class Access {
 	 * @param $ldapname optional, the display name of the object
 	 * @returns string with with the name to use in ownCloud, false on DN outside of search DN
 	 *
-	 * returns the internal ownCloud name for the given LDAP DN of the group, false on DN outside of search DN or failure
+	 * returns the internal ownCloud name for the given LDAP DN of the
+	 * group, false on DN outside of search DN or failure
 	 */
 	public function dn2groupname($dn, $ldapname = null) {
 		//To avoid bypassing the base DN settings under certain circumstances
@@ -620,7 +627,8 @@ abstract class Access {
 	 * @brief executes an LDAP search
 	 * @param $filter the LDAP filter for the search
 	 * @param $base an array containing the LDAP subtree(s) that shall be searched
-	 * @param $attr optional, when a certain attribute shall be filtered out
+	 * @param $attr optional, array, one or more attributes that shall be
+	 * retrieved. Results will according to the order in the array.
 	 * @returns array with the search result
 	 *
 	 * Executes an LDAP search
@@ -645,11 +653,21 @@ 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) {
-			\OCP\Util::writeLog('user_ldap', 'Error when searching: '.ldap_error($link_resource).' code '.ldap_errno($link_resource), \OCP\Util::ERROR);
+		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);
 			\OCP\Util::writeLog('user_ldap', 'Attempt for Paging?  '.print_r($pagedSearchOK, true), \OCP\Util::ERROR);
 			return array();
 		}
+
+		// Do the server-side sorting
+		foreach(array_reverse($attr) as $sortAttr){
+			foreach($sr as $searchResource) {
+				ldap_sort($link_resource, $searchResource, $sortAttr);
+			}
+		}
+
 		$findings = array();
 		foreach($sr as $key => $res) {
 		    $findings = array_merge($findings, ldap_get_entries($link_resource, $res ));
@@ -668,7 +686,9 @@ abstract class Access {
 			if($skipHandling) {
 				return;
 			}
-			//if count is bigger, then the server does not support paged search. Instead, he did a normal search. We set a flag here, so the callee knows how to deal with it.
+			// if count is bigger, then the server does not support
+			// paged search. Instead, he did a normal search. We set a
+			// flag here, so the callee knows how to deal with it.
 			if($findings['count'] <= $limit) {
 				$this->pagedSearchedSuccessful = true;
 			}
@@ -702,7 +722,9 @@ abstract class Access {
 						$key = mb_strtolower($key, 'UTF-8');
 						if(isset($item[$key])) {
 							if($key != 'dn') {
-								$selection[$i][$key] = $this->resemblesDN($key) ? $this->sanitizeDN($item[$key][0]) : $item[$key][0];
+								$selection[$i][$key] = $this->resemblesDN($key) ?
+									$this->sanitizeDN($item[$key][0])
+									: $item[$key][0];
 							} else {
 								$selection[$i][$key] = $this->sanitizeDN($item[$key]);
 							}
@@ -806,7 +828,9 @@ abstract class Access {
 	 * @return string the final filter part to use in LDAP searches
 	 */
 	public function getFilterPartForUserSearch($search) {
-		return $this->getFilterPartForSearch($search, $this->connection->ldapAttributesForUserSearch, $this->connection->ldapUserDisplayName);
+		return $this->getFilterPartForSearch($search,
+			$this->connection->ldapAttributesForUserSearch,
+			$this->connection->ldapUserDisplayName);
 	}
 
 	/**
@@ -815,7 +839,9 @@ abstract class Access {
 	 * @return string the final filter part to use in LDAP searches
 	 */
 	public function getFilterPartForGroupSearch($search) {
-		return $this->getFilterPartForSearch($search, $this->connection->ldapAttributesForGroupSearch, $this->connection->ldapGroupDisplayName);
+		return $this->getFilterPartForSearch($search,
+			$this->connection->ldapAttributesForGroupSearch,
+			$this->connection->ldapGroupDisplayName);
 	}
 
 	/**
@@ -874,13 +900,15 @@ abstract class Access {
 		foreach($testAttributes as $attribute) {
 			\OCP\Util::writeLog('user_ldap', 'Testing '.$attribute.' as UUID attr', \OCP\Util::DEBUG);
 
-		    $value = $this->readAttribute($dn, $attribute);
-		    if(is_array($value) && isset($value[0]) && !empty($value[0])) {
+			$value = $this->readAttribute($dn, $attribute);
+			if(is_array($value) && isset($value[0]) && !empty($value[0])) {
 				\OCP\Util::writeLog('user_ldap', 'Setting '.$attribute.' as UUID attr', \OCP\Util::DEBUG);
 				$this->connection->ldapUuidAttribute = $attribute;
 				return true;
-		    }
-		    \OCP\Util::writeLog('user_ldap', 'The looked for uuid attr is not '.$attribute.', result was '.print_r($value, true), \OCP\Util::DEBUG);
+			}
+			\OCP\Util::writeLog('user_ldap',
+				'The looked for uuid attr is not '.$attribute.', result was '.print_r($value, true),
+				\OCP\Util::DEBUG);
 		}
 
 		return false;
@@ -888,7 +916,9 @@ abstract class Access {
 
 	public function getUUID($dn) {
 		if($this->detectUuidAttribute($dn)) {
-			\OCP\Util::writeLog('user_ldap', 'UUID Checking \ UUID for '.$dn.' using '. $this->connection->ldapUuidAttribute, \OCP\Util::DEBUG);
+			\OCP\Util::writeLog('user_ldap',
+				'UUID Checking \ UUID for '.$dn.' using '. $this->connection->ldapUuidAttribute,
+				\OCP\Util::DEBUG);
 			$uuid = $this->readAttribute($dn, $this->connection->ldapUuidAttribute);
 			if(!is_array($uuid) && $this->connection->ldapOverrideUuidAttribute) {
 				$this->detectUuidAttribute($dn, true);
@@ -1027,13 +1057,18 @@ abstract class Access {
 		$pagedSearchOK = false;
 		if($this->connection->hasPagedResultSupport && !is_null($limit)) {
 			$offset = intval($offset); //can be null
-			\OCP\Util::writeLog('user_ldap', 'initializing paged search for  Filter'.$filter.' base '.print_r($bases, true).' attr '.print_r($attr, true). ' limit ' .$limit.' offset '.$offset, \OCP\Util::INFO);
+			\OCP\Util::writeLog('user_ldap',
+				'initializing paged search for  Filter'.$filter.' base '.print_r($bases, true)
+				.' attr '.print_r($attr, true). ' limit ' .$limit.' offset '.$offset,
+				\OCP\Util::INFO);
 			//get the cookie from the search for the previous search, required by LDAP
 			foreach($bases as $base) {
 
 				$cookie = $this->getPagedResultCookie($base, $filter, $limit, $offset);
 				if(empty($cookie) && ($offset > 0)) {
-					//no cookie known, although the offset is not 0. Maybe cache run out. We need to start all over *sigh* (btw, Dear Reader, did you need LDAP paged searching was designed by MSFT?)
+					// no cookie known, although the offset is not 0. Maybe cache run out. We need
+					// to start all over *sigh* (btw, Dear Reader, did you need LDAP paged
+					// searching was designed by MSFT?)
 					$reOffset = ($offset - $limit) < 0 ? 0 : $offset - $limit;
 					//a bit recursive, $offset of 0 is the exit
 					\OCP\Util::writeLog('user_ldap', 'Looking for cookie L/O '.$limit.'/'.$reOffset, \OCP\Util::INFO);
@@ -1049,13 +1084,16 @@ abstract class Access {
 					if($offset > 0) {
 						\OCP\Util::writeLog('user_ldap', 'Cookie '.$cookie, \OCP\Util::INFO);
 					}
-					$pagedSearchOK = ldap_control_paged_result($this->connection->getConnectionResource(), $limit, false, $cookie);
+					$pagedSearchOK = ldap_control_paged_result($this->connection->getConnectionResource(),
+						$limit, false, $cookie);
 					if(!$pagedSearchOK) {
 						return false;
 					}
 					\OCP\Util::writeLog('user_ldap', 'Ready for a paged search', \OCP\Util::INFO);
 				} else {
-					\OCP\Util::writeLog('user_ldap', 'No paged search for us, Cpt., Limit '.$limit.' Offset '.$offset, \OCP\Util::INFO);
+					\OCP\Util::writeLog('user_ldap',
+						'No paged search for us, Cpt., Limit '.$limit.' Offset '.$offset,
+						\OCP\Util::INFO);
 				}
 
 			}
diff --git a/apps/user_ldap/lib/connection.php b/apps/user_ldap/lib/connection.php
index 0bf2efe35afc387cc6437ea872c58c3e5f9521b3..6643428afe4082429ad92fc0b1d22eb10cae07f6 100644
--- a/apps/user_ldap/lib/connection.php
+++ b/apps/user_ldap/lib/connection.php
@@ -76,7 +76,8 @@ class Connection {
 		$this->configPrefix = $configPrefix;
 		$this->configID = $configID;
 		$this->cache = \OC_Cache::getGlobalCache();
-		$this->config['hasPagedResultSupport'] = (function_exists('ldap_control_paged_result') && function_exists('ldap_control_paged_result_response'));
+		$this->config['hasPagedResultSupport'] = (function_exists('ldap_control_paged_result')
+			&& function_exists('ldap_control_paged_result_response'));
 	}
 
 	public function __destruct() {
@@ -274,9 +275,36 @@ class Connection {
 	 * @return returns an array that maps internal variable names to database fields
 	 */
 	private function getConfigTranslationArray() {
-		static $array = array('ldap_host'=>'ldapHost', 'ldap_port'=>'ldapPort', 'ldap_backup_host'=>'ldapBackupHost', 'ldap_backup_port'=>'ldapBackupPort', 'ldap_override_main_server' => 'ldapOverrideMainServer', 'ldap_dn'=>'ldapAgentName', 'ldap_agent_password'=>'ldapAgentPassword', 'ldap_base'=>'ldapBase', 'ldap_base_users'=>'ldapBaseUsers', 'ldap_base_groups'=>'ldapBaseGroups', 'ldap_userlist_filter'=>'ldapUserFilter', 'ldap_login_filter'=>'ldapLoginFilter', 'ldap_group_filter'=>'ldapGroupFilter', 'ldap_display_name'=>'ldapUserDisplayName', 'ldap_group_display_name'=>'ldapGroupDisplayName',
-
-		'ldap_tls'=>'ldapTLS', 'ldap_nocase'=>'ldapNoCase', 'ldap_quota_def'=>'ldapQuotaDefault', 'ldap_quota_attr'=>'ldapQuotaAttribute', 'ldap_email_attr'=>'ldapEmailAttribute', 'ldap_group_member_assoc_attribute'=>'ldapGroupMemberAssocAttr', 'ldap_cache_ttl'=>'ldapCacheTTL', 'home_folder_naming_rule' => 'homeFolderNamingRule', 'ldap_turn_off_cert_check' => 'turnOffCertCheck', 'ldap_configuration_active' => 'ldapConfigurationActive', 'ldap_attributes_for_user_search' => 'ldapAttributesForUserSearch', 'ldap_attributes_for_group_search' => 'ldapAttributesForGroupSearch');
+		static $array = array(
+			'ldap_host'=>'ldapHost',
+			'ldap_port'=>'ldapPort',
+			'ldap_backup_host'=>'ldapBackupHost',
+			'ldap_backup_port'=>'ldapBackupPort',
+			'ldap_override_main_server' => 'ldapOverrideMainServer',
+			'ldap_dn'=>'ldapAgentName',
+			'ldap_agent_password'=>'ldapAgentPassword',
+			'ldap_base'=>'ldapBase',
+			'ldap_base_users'=>'ldapBaseUsers',
+			'ldap_base_groups'=>'ldapBaseGroups',
+			'ldap_userlist_filter'=>'ldapUserFilter',
+			'ldap_login_filter'=>'ldapLoginFilter',
+			'ldap_group_filter'=>'ldapGroupFilter',
+			'ldap_display_name'=>'ldapUserDisplayName',
+			'ldap_group_display_name'=>'ldapGroupDisplayName',
+
+			'ldap_tls'=>'ldapTLS',
+			'ldap_nocase'=>'ldapNoCase',
+			'ldap_quota_def'=>'ldapQuotaDefault',
+			'ldap_quota_attr'=>'ldapQuotaAttribute',
+			'ldap_email_attr'=>'ldapEmailAttribute',
+			'ldap_group_member_assoc_attribute'=>'ldapGroupMemberAssocAttr',
+			'ldap_cache_ttl'=>'ldapCacheTTL',
+			'home_folder_naming_rule' => 'homeFolderNamingRule',
+			'ldap_turn_off_cert_check' => 'turnOffCertCheck',
+			'ldap_configuration_active' => 'ldapConfigurationActive',
+			'ldap_attributes_for_user_search' => 'ldapAttributesForUserSearch',
+			'ldap_attributes_for_group_search' => 'ldapAttributesForGroupSearch'
+		);
 		return $array;
 	}
 
@@ -295,7 +323,8 @@ class Connection {
 
 		foreach($config as $parameter => $value) {
 			if(($parameter == 'homeFolderNamingRule'
-				|| $params[$parameter] == 'homeFolderNamingRule')
+				|| (isset($params[$parameter])
+					&& $params[$parameter] == 'homeFolderNamingRule'))
 				&& !empty($value)) {
 				$value = 'attr:'.$value;
 			}
@@ -328,9 +357,6 @@ class Connection {
 				case 'ldapAgentPassword':
 					$value = base64_encode($value);
 					break;
-				case 'homeFolderNamingRule':
-					$value = empty($value) ? 'opt:username' : $value;
-					break;
 				case 'ldapBase':
 				case 'ldapBaseUsers':
 				case 'ldapBaseGroups':
@@ -365,10 +391,10 @@ class Connection {
 		$config = array();
 		foreach($trans as $dbKey => $classKey) {
 			if($classKey == 'homeFolderNamingRule') {
-				if(strpos($this->config[$classKey], 'opt') === 0) {
-					$config[$dbKey] = '';
-				} else {
+				if(strpos($this->config[$classKey], 'attr:') === 0) {
 					$config[$dbKey] = substr($this->config[$classKey], 5);
+				} else {
+					$config[$dbKey] = '';
 				}
 				continue;
 			} else if((strpos($classKey, 'ldapBase') !== false)
@@ -387,7 +413,8 @@ class Connection {
 	 * @returns true if configuration seems OK, false otherwise
 	 */
 	private function validateConfiguration() {
-		//first step: "soft" checks: settings that are not really necessary, but advisable. If left empty, give an info message
+		// first step: "soft" checks: settings that are not really
+		// necessary, but advisable. If left empty, give an info message
 		if(empty($this->config['ldapBaseUsers'])) {
 			\OCP\Util::writeLog('user_ldap', 'Base tree for Users is empty, using Base DN', \OCP\Util::INFO);
 			$this->config['ldapBaseUsers'] = $this->config['ldapBase'];
@@ -397,11 +424,16 @@ class Connection {
 			$this->config['ldapBaseGroups'] = $this->config['ldapBase'];
 		}
 		if(empty($this->config['ldapGroupFilter']) && empty($this->config['ldapGroupMemberAssocAttr'])) {
-			\OCP\Util::writeLog('user_ldap', 'No group filter is specified, LDAP group feature will not be used.', \OCP\Util::INFO);
+			\OCP\Util::writeLog('user_ldap',
+				'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')) && (!is_null($this->configID))) {
+		if(!in_array($this->config['ldapUuidAttribute'], array('auto', 'entryuuid', 'nsuniqueid', 'objectguid'))
+			&& (!is_null($this->configID))) {
 			\OCP\Config::setAppValue($this->configID, $this->configPrefix.'ldap_uuid_attribute', 'auto');
-			\OCP\Util::writeLog('user_ldap', 'Illegal value for the UUID Attribute, reset to autodetect.', \OCP\Util::INFO);
+			\OCP\Util::writeLog('user_ldap',
+				'Illegal value for the UUID Attribute, reset to autodetect.',
+				\OCP\Util::INFO);
 		}
 		if(empty($this->config['ldapBackupPort'])) {
 			//force default
@@ -417,7 +449,9 @@ class Connection {
 		if((strpos($this->config['ldapHost'], 'ldaps') === 0)
 			&& $this->config['ldapTLS']) {
 			$this->config['ldapTLS'] = false;
-			\OCP\Util::writeLog('user_ldap', 'LDAPS (already using secure connection) and TLS do not work together. Switched off TLS.', \OCP\Util::INFO);
+			\OCP\Util::writeLog('user_ldap',
+				'LDAPS (already using secure connection) and TLS do not work together. Switched off TLS.',
+				\OCP\Util::INFO);
 		}
 
 
@@ -434,20 +468,28 @@ class Connection {
 		}
 		if((empty($this->config['ldapAgentName']) && !empty($this->config['ldapAgentPassword']))
 			|| (!empty($this->config['ldapAgentName']) && empty($this->config['ldapAgentPassword']))) {
-			\OCP\Util::writeLog('user_ldap', 'Either no password given for the user agent or a password is given, but no LDAP agent; won`t connect.', \OCP\Util::WARN);
+			\OCP\Util::writeLog('user_ldap',
+				'Either no password given for the user agent or a password is given, but no LDAP agent; won`t connect.',
+				\OCP\Util::WARN);
 			$configurationOK = false;
 		}
 		//TODO: check if ldapAgentName is in DN form
-		if(empty($this->config['ldapBase']) && (empty($this->config['ldapBaseUsers']) && empty($this->config['ldapBaseGroups']))) {
+		if(empty($this->config['ldapBase'])
+			&& (empty($this->config['ldapBaseUsers'])
+			&& empty($this->config['ldapBaseGroups']))) {
 			\OCP\Util::writeLog('user_ldap', 'No Base DN given, won`t connect.', \OCP\Util::WARN);
 			$configurationOK = false;
 		}
 		if(empty($this->config['ldapUserDisplayName'])) {
-			\OCP\Util::writeLog('user_ldap', 'No user display name attribute specified, won`t connect.', \OCP\Util::WARN);
+			\OCP\Util::writeLog('user_ldap',
+				'No user display name attribute specified, won`t connect.',
+				\OCP\Util::WARN);
 			$configurationOK = false;
 		}
 		if(empty($this->config['ldapGroupDisplayName'])) {
-			\OCP\Util::writeLog('user_ldap', 'No group display name attribute specified, won`t connect.', \OCP\Util::WARN);
+			\OCP\Util::writeLog('user_ldap',
+				'No group display name attribute specified, won`t connect.',
+				\OCP\Util::WARN);
 			$configurationOK = false;
 		}
 		if(empty($this->config['ldapLoginFilter'])) {
@@ -455,7 +497,9 @@ class Connection {
 			$configurationOK = false;
 		}
 		if(mb_strpos($this->config['ldapLoginFilter'], '%uid', 0, 'UTF-8') === false) {
-			\OCP\Util::writeLog('user_ldap', 'Login filter does not contain %uid place holder, won`t connect.', \OCP\Util::WARN);
+			\OCP\Util::writeLog('user_ldap',
+				'Login filter does not contain %uid place holder, won`t connect.',
+				\OCP\Util::WARN);
 			\OCP\Util::writeLog('user_ldap', 'Login filter was ' . $this->config['ldapLoginFilter'], \OCP\Util::DEBUG);
 			$configurationOK = false;
 		}
@@ -493,7 +537,7 @@ class Connection {
 			'ldap_cache_ttl'                    => 600,
 			'ldap_uuid_attribute'				=> 'auto',
 			'ldap_override_uuid_attribute'		=> 0,
-			'home_folder_naming_rule'           => 'opt:username',
+			'home_folder_naming_rule'           => '',
 			'ldap_turn_off_cert_check'			=> 0,
 			'ldap_configuration_active'			=> 1,
 			'ldap_attributes_for_user_search'	=> '',
@@ -519,13 +563,17 @@ class Connection {
 		if(!$this->ldapConnectionRes) {
 			if(!function_exists('ldap_connect')) {
 				$phpLDAPinstalled = false;
-				\OCP\Util::writeLog('user_ldap', 'function ldap_connect is not available. Make sure that the PHP ldap module is installed.', \OCP\Util::ERROR);
+				\OCP\Util::writeLog('user_ldap',
+					'function ldap_connect is not available. Make sure that the PHP ldap module is installed.',
+					\OCP\Util::ERROR);
 
 				return false;
 			}
 			if($this->config['turnOffCertCheck']) {
 				if(putenv('LDAPTLS_REQCERT=never')) {
-					\OCP\Util::writeLog('user_ldap', 'Turned off SSL certificate validation successfully.', \OCP\Util::WARN);
+					\OCP\Util::writeLog('user_ldap',
+						'Turned off SSL certificate validation successfully.',
+						\OCP\Util::WARN);
 				} else {
 					\OCP\Util::writeLog('user_ldap', 'Could not turn off SSL certificate validation.', \OCP\Util::WARN);
 				}
@@ -583,7 +631,9 @@ class Connection {
 		}
 		$ldapLogin = @ldap_bind($cr, $this->config['ldapAgentName'], $this->config['ldapAgentPassword']);
 		if(!$ldapLogin) {
-			\OCP\Util::writeLog('user_ldap', 'Bind failed: ' . ldap_errno($cr) . ': ' . ldap_error($cr), \OCP\Util::ERROR);
+			\OCP\Util::writeLog('user_ldap',
+				'Bind failed: ' . ldap_errno($cr) . ': ' . ldap_error($cr),
+				\OCP\Util::ERROR);
 			$this->ldapConnectionRes = null;
 			return false;
 		}
diff --git a/apps/user_ldap/lib/helper.php b/apps/user_ldap/lib/helper.php
index 29ce998dae700c5b21edf2b6ed550152e6a82a7c..308da3ef724237c280083ad1f0811e60c7bb3c8e 100644
--- a/apps/user_ldap/lib/helper.php
+++ b/apps/user_ldap/lib/helper.php
@@ -54,7 +54,7 @@ class Helper {
 			WHERE `configkey` LIKE ?
 		';
 		if($activeConfigurations) {
-			$query .= ' AND `configvalue` = 1';
+			$query .= ' AND `configvalue` = \'1\'';
 		}
 		$query = \OCP\DB::prepare($query);
 
@@ -86,8 +86,8 @@ class Helper {
 			DELETE
 			FROM `*PREFIX*appconfig`
 			WHERE `configkey` LIKE ?
-				AND `appid` = "user_ldap"
-				AND `configkey` NOT IN ("enabled", "installed_version", "types", "bgjUpdateGroupsLastRun")
+				AND `appid` = \'user_ldap\'
+				AND `configkey` NOT IN (\'enabled\', \'installed_version\', \'types\', \'bgjUpdateGroupsLastRun\')
 		');
 		$res = $query->execute(array($prefix.'%'));
 
@@ -102,4 +102,3 @@ class Helper {
 		return true;
 	}
 }
-
diff --git a/apps/user_ldap/lib/jobs.php b/apps/user_ldap/lib/jobs.php
index b265a8339efa9aed93a5fd438b9462892d6587b1..094d11db3d5d55681d968f077da5573dfe78ba89 100644
--- a/apps/user_ldap/lib/jobs.php
+++ b/apps/user_ldap/lib/jobs.php
@@ -42,7 +42,9 @@ class Jobs {
 		$actualGroups = self::getGroupBE()->getGroups();
 
 		if(empty($actualGroups) && empty($knownGroups)) {
-			\OCP\Util::writeLog('user_ldap', 'bgJ "updateGroups" – groups do not seem to be configured properly, aborting.', \OCP\Util::INFO);
+			\OCP\Util::writeLog('user_ldap',
+				'bgJ "updateGroups" – groups do not seem to be configured properly, aborting.',
+				\OCP\Util::INFO);
 			\OCP\Config::setAppValue('user_ldap', 'bgjUpdateGroupsLastRun', time());
 			return;
 		}
@@ -75,19 +77,25 @@ class Jobs {
 		    $hasChanged = false;
 		    foreach(array_diff($knownUsers, $actualUsers) as $removedUser) {
 		        \OCP\Util::emitHook('OC_User', 'post_removeFromGroup', array('uid' => $removedUser, 'gid' => $group));
-		        \OCP\Util::writeLog('user_ldap', 'bgJ "updateGroups" – "'.$removedUser.'" removed from "'.$group.'".', \OCP\Util::INFO);
+		        \OCP\Util::writeLog('user_ldap',
+				'bgJ "updateGroups" – "'.$removedUser.'" removed from "'.$group.'".',
+				\OCP\Util::INFO);
 		        $hasChanged = true;
 		    }
 		    foreach(array_diff($actualUsers, $knownUsers) as $addedUser) {
 		        \OCP\Util::emitHook('OC_User', 'post_addFromGroup', array('uid' => $addedUser, 'gid' => $group));
-		        \OCP\Util::writeLog('user_ldap', 'bgJ "updateGroups" – "'.$addedUser.'" added to "'.$group.'".', \OCP\Util::INFO);
+		        \OCP\Util::writeLog('user_ldap',
+				'bgJ "updateGroups" – "'.$addedUser.'" added to "'.$group.'".',
+				\OCP\Util::INFO);
 		        $hasChanged = true;
 		    }
 		    if($hasChanged) {
 				$query->execute(array(serialize($actualUsers), $group));
 		    }
 		}
-		\OCP\Util::writeLog('user_ldap', 'bgJ "updateGroups" – FINISHED dealing with known Groups.', \OCP\Util::DEBUG);
+		\OCP\Util::writeLog('user_ldap',
+			'bgJ "updateGroups" – FINISHED dealing with known Groups.',
+			\OCP\Util::DEBUG);
 	}
 
 	static private function handleCreatedGroups($createdGroups) {
@@ -98,11 +106,15 @@ class Jobs {
 			VALUES (?, ?)
 		');
 		foreach($createdGroups as $createdGroup) {
-			\OCP\Util::writeLog('user_ldap', 'bgJ "updateGroups" – new group "'.$createdGroup.'" found.', \OCP\Util::INFO);
+			\OCP\Util::writeLog('user_ldap',
+				'bgJ "updateGroups" – new group "'.$createdGroup.'" found.',
+				\OCP\Util::INFO);
 			$users = serialize(self::getGroupBE()->usersInGroup($createdGroup));
 		    $query->execute(array($createdGroup, $users));
 		}
-		\OCP\Util::writeLog('user_ldap', 'bgJ "updateGroups" – FINISHED dealing with created Groups.', \OCP\Util::DEBUG);
+		\OCP\Util::writeLog('user_ldap',
+			'bgJ "updateGroups" – FINISHED dealing with created Groups.',
+			\OCP\Util::DEBUG);
 	}
 
 	static private function handleRemovedGroups($removedGroups) {
@@ -113,10 +125,14 @@ class Jobs {
 			WHERE `owncloudname` = ?
 		');
 		foreach($removedGroups as $removedGroup) {
-			\OCP\Util::writeLog('user_ldap', 'bgJ "updateGroups" – group "'.$removedGroup.'" was removed.', \OCP\Util::INFO);
+			\OCP\Util::writeLog('user_ldap',
+				'bgJ "updateGroups" – group "'.$removedGroup.'" was removed.',
+				\OCP\Util::INFO);
 		    $query->execute(array($removedGroup));
 		}
-		\OCP\Util::writeLog('user_ldap', 'bgJ "updateGroups" – FINISHED dealing with removed groups.', \OCP\Util::DEBUG);
+		\OCP\Util::writeLog('user_ldap',
+			'bgJ "updateGroups" – FINISHED dealing with removed groups.',
+			\OCP\Util::DEBUG);
 	}
 
 	static private function getConnector() {
@@ -154,4 +170,4 @@ class Jobs {
 
 		return self::$groupsFromDB;
 	}
-}
\ No newline at end of file
+}
diff --git a/apps/user_ldap/settings.php b/apps/user_ldap/settings.php
index d5d2f648b38c100cd3d1acd5f25dd78e070e43d3..05497ae8a3375790a9bd2530f3f46bc338a0fc27 100644
--- a/apps/user_ldap/settings.php
+++ b/apps/user_ldap/settings.php
@@ -42,17 +42,7 @@ OCP\Util::addstyle('user_ldap', 'settings');
 $tmpl = new OCP\Template('user_ldap', 'settings');
 
 $prefixes = \OCA\user_ldap\lib\Helper::getServerConfigurationPrefixes();
-$scoHtml = '';
-$i = 1;
-$sel = ' selected';
-foreach($prefixes as $prefix) {
-	$scoHtml .= '<option value="'.$prefix.'"'.$sel.'>'.$i++.'. Server</option>';
-	$sel = '';
-}
-if(count($prefixes) == 0) {
-	$scoHtml .= '<option value="" selected>1. Server</option>';
-}
-$tmpl->assign('serverConfigurationOptions', $scoHtml, false);
+$tmpl->assign('serverConfigurationPrefixes', $prefixes);
 
 // assign default values
 if(!isset($ldap)) {
diff --git a/apps/user_ldap/templates/settings.php b/apps/user_ldap/templates/settings.php
index c6f1834e0131100b85203f0d5e20b2d5eb44f675..d3c2c298904305f72af82fc52ddf8e872987e6d7 100644
--- a/apps/user_ldap/templates/settings.php
+++ b/apps/user_ldap/templates/settings.php
@@ -5,61 +5,98 @@
 		<li><a href="#ldapSettings-2">Advanced</a></li>
 	</ul>
 		<?php if(OCP\App::isEnabled('user_webdavauth')) {
-			echo '<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>';
+			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>');
 		}
 		if(!function_exists('ldap_connect')) {
-			echo '<p class="ldapwarning">'.$l->t('<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it.').'</p>';
+			print_unescaped('<p class="ldapwarning">'.$l->t('<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it.').'</p>');
 		}
 		?>
 	<fieldset id="ldapSettings-1">
-		<p><label for="ldap_serverconfig_chooser"><?php echo $l->t('Server configuration');?></label><select id="ldap_serverconfig_chooser" name="ldap_serverconfig_chooser">
-		<?php echo $_['serverConfigurationOptions']; ?>
-		<option value="NEW"><?php echo $l->t('Add Server Configuration');?></option>
+		<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 ) {
+			?>
+				<option value="" selected>1. Server</option>');
+			<?php
+		} else {
+			$i = 1;
+			$sel = ' selected';
+			foreach($_['serverConfigurationPrefixes'] as $prefix) {
+				?>
+				<option value="<?php p($prefix); ?>"<?php p($sel); ?>><?php p($i++); ?>. Server</option>
+				<?php
+			}
+		}
+		?>
+		<option value="NEW"><?php p($l->t('Add Server Configuration'));?></option>
 		</select>
-		<button id="ldap_action_delete_configuration" name="ldap_action_delete_configuration">Delete Configuration</button>
+		<button id="ldap_action_delete_configuration"
+			name="ldap_action_delete_configuration">Delete Configuration</button>
 		</p>
-		<p><label for="ldap_host"><?php echo $l->t('Host');?></label><input type="text" id="ldap_host" name="ldap_host" data-default="<?php echo $_['ldap_host_default']; ?>" title="<?php echo $l->t('You can omit the protocol, except you require SSL. Then start with ldaps://');?>"></p>
-		<p><label for="ldap_base"><?php echo $l->t('Base DN');?></label><textarea id="ldap_base" name="ldap_base" placeholder="<?php echo $l->t('One Base DN per line');?>" title="<?php echo $l->t('You can specify Base DN for users and groups in the Advanced tab');?>" data-default="<?php echo $_['ldap_base_default']; ?>" ></textarea></p>
-		<p><label for="ldap_dn"><?php echo $l->t('User DN');?></label><input type="text" id="ldap_dn" name="ldap_dn" data-default="<?php echo $_['ldap_dn_default']; ?>" title="<?php echo $l->t('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.');?>" /></p>
-		<p><label for="ldap_agent_password"><?php echo $l->t('Password');?></label><input type="password" id="ldap_agent_password" name="ldap_agent_password" data-default="<?php echo $_['ldap_agent_password_default']; ?>" title="<?php echo $l->t('For anonymous access, leave DN and Password empty.');?>" /></p>
-		<p><label for="ldap_login_filter"><?php echo $l->t('User Login Filter');?></label><input type="text" id="ldap_login_filter" name="ldap_login_filter" data-default="<?php echo $_['ldap_login_filter_default']; ?>" title="<?php echo $l->t('Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action.');?>" /><br /><small><?php echo $l->t('use %%uid placeholder, e.g. "uid=%%uid"');?></small></p>
-		<p><label for="ldap_userlist_filter"><?php echo $l->t('User List Filter');?></label><input type="text" id="ldap_userlist_filter" name="ldap_userlist_filter" data-default="<?php echo $_['ldap_userlist_filter_default']; ?>" title="<?php echo $l->t('Defines the filter to apply, when retrieving users.');?>" /><br /><small><?php echo $l->t('without any placeholder, e.g. "objectClass=person".');?></small></p>
-		<p><label for="ldap_group_filter"><?php echo $l->t('Group Filter');?></label><input type="text" id="ldap_group_filter" name="ldap_group_filter" data-default="<?php echo $_['ldap_group_filter_default']; ?>" title="<?php echo $l->t('Defines the filter to apply, when retrieving groups.');?>" /><br /><small><?php echo $l->t('without any placeholder, e.g. "objectClass=posixGroup".');?></small></p>
+		<p><label for="ldap_host"><?php p($l->t('Host'));?></label>
+		<input type="text" id="ldap_host" name="ldap_host" data-default="<?php p($_['ldap_host_default']); ?>"
+			title="<?php p($l->t('You can omit the protocol, except you require SSL. Then start with ldaps://'));?>"></p>
+		<p><label for="ldap_base"><?php p($l->t('Base DN'));?></label>
+		<textarea id="ldap_base" name="ldap_base" placeholder="<?php p($l->t('One Base DN per line'));?>"
+			title="<?php p($l->t('You can specify Base DN for users and groups in the Advanced tab'));?>"
+			data-default="<?php p($_['ldap_base_default']); ?>" ></textarea></p>
+		<p><label for="ldap_dn"><?php p($l->t('User DN'));?></label>
+		<input type="text" id="ldap_dn" name="ldap_dn" data-default="<?php p($_['ldap_dn_default']); ?>"
+			title="<?php p($l->t('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.'));?>" /></p>
+		<p><label for="ldap_agent_password"><?php p($l->t('Password'));?></label>
+		<input type="password" id="ldap_agent_password" name="ldap_agent_password"
+			data-default="<?php p($_['ldap_agent_password_default']); ?>"
+			title="<?php p($l->t('For anonymous access, leave DN and Password empty.'));?>" /></p>
+		<p><label for="ldap_login_filter"><?php p($l->t('User Login Filter'));?></label>
+		<input type="text" id="ldap_login_filter" name="ldap_login_filter"
+			data-default="<?php p($_['ldap_login_filter_default']); ?>"
+			title="<?php p($l->t('Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action.'));?>" />
+				<br /><small><?php p($l->t('use %%uid placeholder, e.g. "uid=%%uid"'));?></small></p>
+		<p><label for="ldap_userlist_filter"><?php p($l->t('User List Filter'));?></label>
+		<input type="text" id="ldap_userlist_filter" name="ldap_userlist_filter"
+			data-default="<?php p($_['ldap_userlist_filter_default']); ?>"
+			title="<?php p($l->t('Defines the filter to apply, when retrieving users.'));?>" />
+			<br /><small><?php p($l->t('without any placeholder, e.g. "objectClass=person".'));?></small></p>
+		<p><label for="ldap_group_filter"><?php p($l->t('Group Filter'));?></label>
+		<input type="text" id="ldap_group_filter" name="ldap_group_filter"
+			data-default="<?php p($_['ldap_group_filter_default']); ?>"
+			title="<?php p($l->t('Defines the filter to apply, when retrieving groups.'));?>" />
+			<br /><small><?php p($l->t('without any placeholder, e.g. "objectClass=posixGroup".'));?></small></p>
 	</fieldset>
 	<fieldset id="ldapSettings-2">
 		<div id="ldapAdvancedAccordion">
-			<h3><?php echo $l->t('Connection Settings');?></h3>
+			<h3><?php p($l->t('Connection Settings'));?></h3>
 			<div>
-				<p><label for="ldap_configuration_active"><?php echo $l->t('Configuration Active');?></label><input type="checkbox" id="ldap_configuration_active" name="ldap_configuration_active" value="1" data-default="<?php echo $_['ldap_configuration_active_default']; ?>"  title="<?php echo $l->t('When unchecked, this configuration will be skipped.');?>" /></p>
-				<p><label for="ldap_port"><?php echo $l->t('Port');?></label><input type="number" id="ldap_port" name="ldap_port" data-default="<?php echo $_['ldap_port_default']; ?>"  /></p>
-				<p><label for="ldap_backup_host"><?php echo $l->t('Backup (Replica) Host');?></label><input type="text" id="ldap_backup_host" name="ldap_backup_host" data-default="<?php echo $_['ldap_backup_host_default']; ?>" title="<?php echo $l->t('Give an optional backup host. It must be a replica of the main LDAP/AD server.');?>"></p>
-				<p><label for="ldap_backup_port"><?php echo $l->t('Backup (Replica) Port');?></label><input type="number" id="ldap_backup_port" name="ldap_backup_port" data-default="<?php echo $_['ldap_backup_port_default']; ?>"  /></p>
-				<p><label for="ldap_override_main_server"><?php echo $l->t('Disable Main Server');?></label><input type="checkbox" id="ldap_override_main_server" name="ldap_override_main_server" value="1" data-default="<?php echo $_['ldap_override_main_server_default']; ?>"  title="<?php echo $l->t('When switched on, ownCloud will only connect to the replica server.');?>" /></p>
-				<p><label for="ldap_tls"><?php echo $l->t('Use TLS');?></label><input type="checkbox" id="ldap_tls" name="ldap_tls" value="1" data-default="<?php echo $_['ldap_tls_default']; ?>" title="<?php echo $l->t('Do not use it additionally for LDAPS connections, it will fail.');?>" /></p>
-				<p><label for="ldap_nocase"><?php echo $l->t('Case insensitve LDAP server (Windows)');?></label><input type="checkbox" id="ldap_nocase" name="ldap_nocase" data-default="<?php echo $_['ldap_nocase_default']; ?>"  value="1"<?php if (isset($_['ldap_nocase']) && ($_['ldap_nocase'])) echo ' checked'; ?>></p>
-				<p><label for="ldap_turn_off_cert_check"><?php echo $l->t('Turn off SSL certificate validation.');?></label><input type="checkbox" id="ldap_turn_off_cert_check" name="ldap_turn_off_cert_check" title="<?php echo $l->t('If connection only works with this option, import the LDAP server\'s SSL certificate in your ownCloud server.');?>" data-default="<?php echo $_['ldap_turn_off_cert_check_default']; ?>" value="1"><br/><small><?php echo $l->t('Not recommended, use for testing only.');?></small></p>
-				<p><label for="ldap_cache_ttl">Cache Time-To-Live</label><input type="number" id="ldap_cache_ttl" name="ldap_cache_ttl" title="<?php echo $l->t('in seconds. A change empties the cache.');?>" data-default="<?php echo $_['ldap_cache_ttl_default']; ?>" /></p>
+				<p><label for="ldap_configuration_active"><?php p($l->t('Configuration Active'));?></label><input type="checkbox" id="ldap_configuration_active" name="ldap_configuration_active" value="1" data-default="<?php p($_['ldap_configuration_active_default']); ?>"  title="<?php p($l->t('When unchecked, this configuration will be skipped.'));?>" /></p>
+				<p><label for="ldap_port"><?php p($l->t('Port'));?></label><input type="number" id="ldap_port" name="ldap_port" data-default="<?php p($_['ldap_port_default']); ?>"  /></p>
+				<p><label for="ldap_backup_host"><?php p($l->t('Backup (Replica) Host'));?></label><input type="text" id="ldap_backup_host" name="ldap_backup_host" data-default="<?php p($_['ldap_backup_host_default']); ?>" title="<?php p($l->t('Give an optional backup host. It must be a replica of the main LDAP/AD server.'));?>"></p>
+				<p><label for="ldap_backup_port"><?php p($l->t('Backup (Replica) Port'));?></label><input type="number" id="ldap_backup_port" name="ldap_backup_port" data-default="<?php p($_['ldap_backup_port_default']); ?>"  /></p>
+				<p><label for="ldap_override_main_server"><?php p($l->t('Disable Main Server'));?></label><input type="checkbox" id="ldap_override_main_server" name="ldap_override_main_server" value="1" data-default="<?php p($_['ldap_override_main_server_default']); ?>"  title="<?php p($l->t('When switched on, ownCloud will only connect to the replica server.'));?>" /></p>
+				<p><label for="ldap_tls"><?php p($l->t('Use TLS'));?></label><input type="checkbox" id="ldap_tls" name="ldap_tls" value="1" data-default="<?php p($_['ldap_tls_default']); ?>" title="<?php p($l->t('Do not use it additionally for LDAPS connections, it will fail.'));?>" /></p>
+				<p><label for="ldap_nocase"><?php p($l->t('Case insensitve LDAP server (Windows)'));?></label><input type="checkbox" id="ldap_nocase" name="ldap_nocase" data-default="<?php p($_['ldap_nocase_default']); ?>"  value="1"<?php if (isset($_['ldap_nocase']) && ($_['ldap_nocase'])) p(' checked'); ?>></p>
+				<p><label for="ldap_turn_off_cert_check"><?php p($l->t('Turn off SSL certificate validation.'));?></label><input type="checkbox" id="ldap_turn_off_cert_check" name="ldap_turn_off_cert_check" title="<?php p($l->t('If connection only works with this option, import the LDAP server\'s SSL certificate in your ownCloud server.'));?>" data-default="<?php p($_['ldap_turn_off_cert_check_default']); ?>" value="1"><br/><small><?php p($l->t('Not recommended, use for testing only.'));?></small></p>
+				<p><label for="ldap_cache_ttl"><?php p($l->t('Cache Time-To-Live'));?></label><input type="number" id="ldap_cache_ttl" name="ldap_cache_ttl" title="<?php p($l->t('in seconds. A change empties the cache.'));?>" data-default="<?php p($_['ldap_cache_ttl_default']); ?>" /></p>
 			</div>
-			<h3><?php echo $l->t('Directory Settings');?></h3>
+			<h3><?php p($l->t('Directory Settings'));?></h3>
 			<div>
-				<p><label for="ldap_display_name"><?php echo $l->t('User Display Name Field');?></label><input type="text" id="ldap_display_name" name="ldap_display_name" data-default="<?php echo $_['ldap_display_name_default']; ?>" title="<?php echo $l->t('The LDAP attribute to use to generate the user`s ownCloud name.');?>" /></p>
-				<p><label for="ldap_base_users"><?php echo $l->t('Base User Tree');?></label><textarea id="ldap_base_users" name="ldap_base_users" placeholder="<?php echo $l->t('One User Base DN per line');?>" data-default="<?php echo $_['ldap_base_users_default']; ?>" title="<?php echo $l->t('Base User Tree');?>"></textarea></p>
-				<p><label for="ldap_attributes_for_user_search"><?php echo $l->t('User Search Attributes');?></label><textarea id="ldap_attributes_for_user_search" name="ldap_attributes_for_user_search" placeholder="<?php echo $l->t('Optional; one attribute per line');?>" data-default="<?php echo $_['ldap_attributes_for_user_search_default']; ?>" title="<?php echo $l->t('User Search Attributes');?>"></textarea></p>
-				<p><label for="ldap_group_display_name"><?php echo $l->t('Group Display Name Field');?></label><input type="text" id="ldap_group_display_name" name="ldap_group_display_name" data-default="<?php echo $_['ldap_group_display_name_default']; ?>" title="<?php echo $l->t('The LDAP attribute to use to generate the groups`s ownCloud name.');?>" /></p>
-				<p><label for="ldap_base_groups"><?php echo $l->t('Base Group Tree');?></label><textarea id="ldap_base_groups" name="ldap_base_groups" placeholder="<?php echo $l->t('One Group Base DN per line');?>" data-default="<?php echo $_['ldap_base_groups_default']; ?>" title="<?php echo $l->t('Base Group Tree');?>"></textarea></p>
-				<p><label for="ldap_attributes_for_group_search"><?php echo $l->t('Group Search Attributes');?></label><textarea id="ldap_attributes_for_group_search" name="ldap_attributes_for_group_search" placeholder="<?php echo $l->t('Optional; one attribute per line');?>" data-default="<?php echo $_['ldap_attributes_for_group_search_default']; ?>" title="<?php echo $l->t('Group Search Attributes');?>"></textarea></p>
-				<p><label for="ldap_group_member_assoc_attribute"><?php echo $l->t('Group-Member association');?></label><select id="ldap_group_member_assoc_attribute" name="ldap_group_member_assoc_attribute" data-default="<?php echo $_['ldap_group_member_assoc_attribute_default']; ?>" ><option value="uniqueMember"<?php if (isset($_['ldap_group_member_assoc_attribute']) && ($_['ldap_group_member_assoc_attribute'] == 'uniqueMember')) echo ' selected'; ?>>uniqueMember</option><option value="memberUid"<?php if (isset($_['ldap_group_member_assoc_attribute']) && ($_['ldap_group_member_assoc_attribute'] == 'memberUid')) echo ' selected'; ?>>memberUid</option><option value="member"<?php if (isset($_['ldap_group_member_assoc_attribute']) && ($_['ldap_group_member_assoc_attribute'] == 'member')) echo ' selected'; ?>>member (AD)</option></select></p>
+				<p><label for="ldap_display_name"><?php p($l->t('User Display Name Field'));?></label><input type="text" id="ldap_display_name" name="ldap_display_name" data-default="<?php p($_['ldap_display_name_default']); ?>" title="<?php p($l->t('The LDAP attribute to use to generate the user`s ownCloud name.'));?>" /></p>
+				<p><label for="ldap_base_users"><?php p($l->t('Base User Tree'));?></label><textarea id="ldap_base_users" name="ldap_base_users" placeholder="<?php p($l->t('One User Base DN per line'));?>" data-default="<?php p($_['ldap_base_users_default']); ?>" title="<?php p($l->t('Base User Tree'));?>"></textarea></p>
+				<p><label for="ldap_attributes_for_user_search"><?php p($l->t('User Search Attributes'));?></label><textarea id="ldap_attributes_for_user_search" name="ldap_attributes_for_user_search" placeholder="<?php p($l->t('Optional; one attribute per line'));?>" data-default="<?php p($_['ldap_attributes_for_user_search_default']); ?>" title="<?php p($l->t('User Search Attributes'));?>"></textarea></p>
+				<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>
 			</div>
-			<h3><?php echo $l->t('Special Attributes');?></h3>
+			<h3><?php p($l->t('Special Attributes'));?></h3>
 			<div>
-				<p><label for="ldap_quota_attr">Quota Field</label><input type="text" id="ldap_quota_attr" name="ldap_quota_attr" data-default="<?php echo $_['ldap_quota_attr_default']; ?>"/></p>
-				<p><label for="ldap_quota_def">Quota Default</label><input type="text" id="ldap_quota_def" name="ldap_quota_def" data-default="<?php echo $_['ldap_quota_def_default']; ?>" title="<?php echo $l->t('in bytes');?>" /></p>
-				<p><label for="ldap_email_attr">Email Field</label><input type="text" id="ldap_email_attr" name="ldap_email_attr" data-default="<?php echo $_['ldap_email_attr_default']; ?>" /></p>
-				<p><label for="home_folder_naming_rule">User Home Folder Naming Rule</label><input type="text" id="home_folder_naming_rule" name="home_folder_naming_rule" title="<?php echo $l->t('Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute.');?>" data-default="<?php echo $_['home_folder_naming_rule_default']; ?>" /></p>
+				<p><label for="ldap_quota_attr"><?php p($l->t('Quota Field'));?></label><input type="text" id="ldap_quota_attr" name="ldap_quota_attr" data-default="<?php p($_['ldap_quota_attr_default']); ?>"/></p>
+				<p><label for="ldap_quota_def"><?php p($l->t('Quota Default'));?></label><input type="text" id="ldap_quota_def" name="ldap_quota_def" data-default="<?php p($_['ldap_quota_def_default']); ?>" title="<?php p($l->t('in bytes'));?>" /></p>
+				<p><label for="ldap_email_attr"><?php p($l->t('Email Field'));?></label><input type="text" id="ldap_email_attr" name="ldap_email_attr" data-default="<?php p($_['ldap_email_attr_default']); ?>" /></p>
+				<p><label for="home_folder_naming_rule"><?php p($l->t('User Home Folder Naming Rule'));?></label><input type="text" id="home_folder_naming_rule" name="home_folder_naming_rule" title="<?php p($l->t('Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute.'));?>" data-default="<?php p($_['home_folder_naming_rule_default']); ?>" /></p>
 			</div>
 		</div>
 	</fieldset>
-	<input id="ldap_submit" type="submit" value="Save" /> <button id="ldap_action_test_connection" name="ldap_action_test_connection">Test Configuration</button> <a href="http://doc.owncloud.org/server/5.0/admin_manual/auth_ldap.html" target="_blank"><img src="<?php echo OCP\Util::imagePath('', 'actions/info.png'); ?>" style="height:1.75ex" /> <?php echo $l->t('Help');?></a>
+	<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>
 
 </form>
diff --git a/apps/user_ldap/user_ldap.php b/apps/user_ldap/user_ldap.php
index 7778c37c7949506d1402fc582c9554a778907e25..44a1947859805c5935b06e68d6cb53aa8ac8ccff 100644
--- a/apps/user_ldap/user_ldap.php
+++ b/apps/user_ldap/user_ldap.php
@@ -112,7 +112,8 @@ class USER_LDAP extends lib\Access implements \OCP\UserInterface {
 			return $ldap_users;
 		}
 
-		// if we'd pass -1 to LDAP search, we'd end up in a Protocol error. With a limit of 0, we get 0 results. So we pass null.
+		// if we'd pass -1 to LDAP search, we'd end up in a Protocol
+		// error. With a limit of 0, we get 0 results. So we pass null.
 		if($limit <= 0) {
 			$limit = null;
 		}
@@ -121,9 +122,12 @@ class USER_LDAP extends lib\Access implements \OCP\UserInterface {
 			$this->getFilterPartForUserSearch($search)
 		));
 
-		\OCP\Util::writeLog('user_ldap', 'getUsers: Options: search '.$search.' limit '.$limit.' offset '.$offset.' Filter: '.$filter, \OCP\Util::DEBUG);
+		\OCP\Util::writeLog('user_ldap',
+			'getUsers: Options: search '.$search.' limit '.$limit.' offset '.$offset.' Filter: '.$filter,
+			\OCP\Util::DEBUG);
 		//do the search and translate results to owncloud names
-		$ldap_users = $this->fetchListOfUsers($filter, array($this->connection->ldapUserDisplayName, 'dn'), $limit, $offset);
+		$ldap_users = $this->fetchListOfUsers($filter, array($this->connection->ldapUserDisplayName, 'dn'),
+			$limit, $offset);
 		$ldap_users = $this->ownCloudUserNames($ldap_users);
 		\OCP\Util::writeLog('user_ldap', 'getUsers: '.count($ldap_users). ' Users found', \OCP\Util::DEBUG);
 
@@ -189,11 +193,13 @@ class USER_LDAP extends lib\Access implements \OCP\UserInterface {
 				//check for / at the beginning or pattern c:\ resp. c:/
 				if(
 					'/' == $path[0]
-					|| (3 < strlen($path) && ctype_alpha($path[0]) && $path[1] == ':' && ('\\' == $path[2] || '/' == $path[2]))
+					|| (3 < strlen($path) && ctype_alpha($path[0])
+						&& $path[1] == ':' && ('\\' == $path[2] || '/' == $path[2]))
 				) {
 					$homedir = $path;
 				} else {
-					$homedir = \OCP\Config::getSystemValue('datadirectory', \OC::$SERVERROOT.'/data' ) . '/' . $homedir[0];
+					$homedir = \OCP\Config::getSystemValue('datadirectory',
+						\OC::$SERVERROOT.'/data' ) . '/' . $homedir[0];
 				}
 				$this->connection->writeToCache($cacheKey, $homedir);
 				return $homedir;
@@ -221,7 +227,7 @@ class USER_LDAP extends lib\Access implements \OCP\UserInterface {
 			$this->connection->ldapUserDisplayName);
 
 		if($displayName && (count($displayName) > 0)) {
-			$this->connection->writeToCache($cacheKey, $displayName);
+			$this->connection->writeToCache($cacheKey, $displayName[0]);
 			return $displayName[0];
 		}
 
@@ -258,7 +264,10 @@ class USER_LDAP extends lib\Access implements \OCP\UserInterface {
 	* compared with OC_USER_BACKEND_CREATE_USER etc.
 	*/
 	public function implementsActions($actions) {
-		return (bool)((OC_USER_BACKEND_CHECK_PASSWORD | OC_USER_BACKEND_GET_HOME) & $actions);
+		return (bool)((OC_USER_BACKEND_CHECK_PASSWORD
+			| OC_USER_BACKEND_GET_HOME
+			| OC_USER_BACKEND_GET_DISPLAYNAME)
+			& $actions);
 	}
 
 	/**
@@ -267,4 +276,4 @@ class USER_LDAP extends lib\Access implements \OCP\UserInterface {
 	public function hasUserListings() {
 		return true;
 	}
-}
\ No newline at end of file
+}
diff --git a/apps/user_webdavauth/appinfo/app.php b/apps/user_webdavauth/appinfo/app.php
index c4c131b7ef0205001588f76ffd6046bf13c21034..3cd227bddbefa4bbe7b1005f992d0ed54c64fd3e 100755
--- a/apps/user_webdavauth/appinfo/app.php
+++ b/apps/user_webdavauth/appinfo/app.php
@@ -21,7 +21,7 @@
 *
 */
 
-require_once 'apps/user_webdavauth/user_webdavauth.php';
+require_once OC_App::getAppPath('user_webdavauth').'/user_webdavauth.php';
 
 OC_APP::registerAdmin('user_webdavauth', 'settings');
 
diff --git a/apps/user_webdavauth/appinfo/info.xml b/apps/user_webdavauth/appinfo/info.xml
index f62f03577e8bdf682f4018bce195b0b44049009c..76b314e48aa4a440dc1f19f85558c27167fd8ffd 100755
--- a/apps/user_webdavauth/appinfo/info.xml
+++ b/apps/user_webdavauth/appinfo/info.xml
@@ -7,7 +7,7 @@
 	This app is not compatible to the LDAP user and group backend.</description>
 	<licence>AGPL</licence>
 	<author>Frank Karlitschek</author>
-	<require>4.91</require>
+	<require>4.93</require>
 	<shipped>true</shipped>
 	<types>
 		<authentication/>
diff --git a/apps/user_webdavauth/l10n/de.php b/apps/user_webdavauth/l10n/de.php
index f893bddc71ce599a7d16c97609c703427e57a150..c86ff44e55cb398bb682fc943b011f42bcb82fee 100644
--- a/apps/user_webdavauth/l10n/de.php
+++ b/apps/user_webdavauth/l10n/de.php
@@ -1,5 +1,5 @@
 <?php $TRANSLATIONS = array(
 "WebDAV Authentication" => "WebDAV Authentifikation",
 "URL: http://" => "URL: http://",
-"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloud wird die Benutzer-Anmeldedaten an diese URL schicken. Dieses Plugin prüft die Anmeldedaten auf ihre Gültigkeit und interpretiert die HTTP Statusfehler 401 und 403 als ungültige, sowie alle Anderen als gültige Anmeldedaten."
+"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloud sendet die Benutzerdaten an diese URL. Dieses Plugin prüft die Antwort und wird die Statuscodes 401 und 403 als ungültige Daten und alle anderen Antworten als gültige Daten interpretieren."
 );
diff --git a/apps/user_webdavauth/l10n/de_DE.php b/apps/user_webdavauth/l10n/de_DE.php
index 8f67575fc0fd6ae8665f1f4800823fff606a5b3f..bd5d328e477cacf71815a0bd0ccddbc6691ec9c3 100644
--- a/apps/user_webdavauth/l10n/de_DE.php
+++ b/apps/user_webdavauth/l10n/de_DE.php
@@ -1,5 +1,5 @@
 <?php $TRANSLATIONS = array(
 "WebDAV Authentication" => "WebDAV Authentifizierung",
 "URL: http://" => "URL: http://",
-"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 interpretieren und alle anderen Antworten als gültige Daten."
+"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/tr.php b/apps/user_webdavauth/l10n/tr.php
index 245a5101341d2a51e59b2cc0575b907f85eb3945..4a2f6d2403b5781c4a8bdc51a6cb4c61e27ba82f 100644
--- a/apps/user_webdavauth/l10n/tr.php
+++ b/apps/user_webdavauth/l10n/tr.php
@@ -1,3 +1,4 @@
 <?php $TRANSLATIONS = array(
+"WebDAV Authentication" => "WebDAV Kimlik doğrulaması",
 "URL: http://" => "URL: http://"
 );
diff --git a/apps/user_webdavauth/l10n/uk.php b/apps/user_webdavauth/l10n/uk.php
index 245a5101341d2a51e59b2cc0575b907f85eb3945..66887df54b51295cea65e22c7de385efe8ae44ff 100644
--- a/apps/user_webdavauth/l10n/uk.php
+++ b/apps/user_webdavauth/l10n/uk.php
@@ -1,3 +1,5 @@
 <?php $TRANSLATIONS = array(
-"URL: http://" => "URL: http://"
+"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/settings.php b/apps/user_webdavauth/settings.php
index 7eabb0d48cc545c67bd5199f0957853d9941b561..ae9cb7e4c921074524c6213ad533ad28d7a09fb5 100755
--- a/apps/user_webdavauth/settings.php
+++ b/apps/user_webdavauth/settings.php
@@ -26,7 +26,7 @@ OC_Util::checkAdminUser();
 if($_POST) {
 	// CSRF check
 	OCP\JSON::callCheck();
-	
+
 	if(isset($_POST['webdav_url'])) {
 		OC_CONFIG::setValue('user_webdavauth_url', strip_tags($_POST['webdav_url']));
 	}
diff --git a/apps/user_webdavauth/templates/settings.php b/apps/user_webdavauth/templates/settings.php
index 45f4d81aecf844dbfb8ea11660db8d7437df14b0..ec6524ee4f79a9029b4441b465f1cee8270d6db5 100755
--- a/apps/user_webdavauth/templates/settings.php
+++ b/apps/user_webdavauth/templates/settings.php
@@ -1,9 +1,9 @@
 <form id="webdavauth" action="#" method="post">
 	<fieldset class="personalblock">
-		<legend><strong><?php echo $l->t('WebDAV Authentication');?></strong></legend>
-		<p><label for="webdav_url"><?php echo $l->t('URL: http://');?><input type="text" id="webdav_url" name="webdav_url" value="<?php echo $_['webdav_url']; ?>"></label>
-		 <input type="hidden" name="requesttoken" value="<?php echo $_['requesttoken'] ?>" id="requesttoken">
+		<legend><strong><?php p($l->t('WebDAV Authentication'));?></strong></legend>
+		<p><label for="webdav_url"><?php p($l->t('URL: http://'));?><input type="text" id="webdav_url" name="webdav_url" value="<?php p($_['webdav_url']); ?>"></label>
+		 <input type="hidden" name="requesttoken" value="<?php p($_['requesttoken']) ?>" id="requesttoken">
 		<input type="submit" value="Save" />
-		<br /><?php echo $l->t('ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials.'); ?>
+		<br /><?php p($l->t('ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials.')); ?>
 	</fieldset>
 </form>
diff --git a/autotest.cmd b/autotest.cmd
index 053860db5473f73d9ad36fab0c5126ecb9058827..a511faef9c603b81cb3980900fff70e82d5053a6 100644
--- a/autotest.cmd
+++ b/autotest.cmd
@@ -4,14 +4,14 @@
 :: @author Thomas Müller
 :: @author Tobias Ramforth (translated into Windows batch file)
 ::
-:: @copyright 2012 Thomas Müller thomas.mueller@tmit.eu
+:: @copyright 2012, 2013 Thomas Müller thomas.mueller@tmit.eu
 ::
 @echo off
 
 set DATADIR=data-autotest
 set BASEDIR=%~dp0
 
-:: create autoconfig for sqlite, mysql and postgresql
+:: create autoconfig for sqlite, mysql, postgresql and mssql
 echo ^<?php                                      > .\tests\autoconfig-sqlite.php
 echo $AUTOCONFIG ^= array ^(                     >> .\tests\autoconfig-sqlite.php
 echo  'installed' ^=^> false^,                   >> .\tests\autoconfig-sqlite.php
@@ -50,16 +50,35 @@ echo   'dbhost' ^=^> 'localhost'^,               >> .\tests\autoconfig-pgsql.php
 echo   'dbpass' ^=^> 'owncloud'^,                >> .\tests\autoconfig-pgsql.php
 echo ^)^;                                        >> .\tests\autoconfig-pgsql.php
 
+echo ^<?php                                      > .\tests\autoconfig-mssql.php
+echo $AUTOCONFIG ^= array ^(                     >> .\tests\autoconfig-mssql.php
+echo   'installed' ^=^> false^,                  >> .\tests\autoconfig-mssql.php
+echo   'dbtype' ^=^> 'mssql'^,                   >> .\tests\autoconfig-mssql.php
+echo   'dbtableprefix' ^=^> 'oc_'^,              >> .\tests\autoconfig-mssql.php
+echo   'adminlogin' ^=^> 'admin'^,               >> .\tests\autoconfig-mssql.php
+echo   'adminpass' ^=^> 'admin'^,                >> .\tests\autoconfig-mssql.php
+echo   'directory' ^=^> '%BASEDIR%%DATADIR%'^,   >> .\tests\autoconfig-mssql.php
+echo   'dbuser' ^=^> 'oc_autotest'^,             >> .\tests\autoconfig-mssql.php
+echo   'dbname' ^=^> 'oc_autotest'^,             >> .\tests\autoconfig-mssql.php
+echo   'dbhost' ^=^> 'localhost\sqlexpress'^,    >> .\tests\autoconfig-mssql.php
+echo   'dbpass' ^=^> 'owncloud'^,                >> .\tests\autoconfig-mssql.php
+echo ^)^;                                        >> .\tests\autoconfig-mssql.php
+
 echo localhost:5432:*:oc_autotest:owncloud > %APPDATA%\postgresql\pgpass.conf
 
 ::
 :: start test execution
 ::
-::call:execute_tests "sqlite"
-call:execute_tests "mysql"
-::call:execute_tests "mssql"
-::call:execute_tests "ora"
-::call:execute_tests "pgsql"
+if [%1] == [] (
+	echo "Running on all database backends"
+	call:execute_tests "sqlite"
+	call:execute_tests "mysql"
+	call:execute_tests "mssql"
+	::call:execute_tests "ora"
+	call:execute_tests "pgsql"
+) else (
+	call:execute_tests "%1"
+)
 
 goto:eof
 
@@ -83,6 +102,9 @@ goto:eof
 	if "%~1" == "mysql" mysql -u oc_autotest -powncloud -e "DROP DATABASE oc_autotest"
 	
 	if "%~1" == "pgsql" dropdb -h localhost -p 5432 -U oc_autotest -w oc_autotest
+
+	:: we assume a sqlexpress installation
+	if "%~1" == "mssql" sqlcmd -S localhost\sqlexpress -U oc_autotest -P owncloud -Q "IF EXISTS (SELECT name FROM sys.databases WHERE name=N'oc_autotest') DROP DATABASE [oc_autotest]"
 	
 	:: copy autoconfig
 	copy /y %BASEDIR%\tests\autoconfig-%~1.php %BASEDIR%\config\autoconfig.php
@@ -96,9 +118,8 @@ goto:eof
 	rmdir /s /q coverage-html-%~1
 	md coverage-html-%~1
 	php -f enable_all.php
-	::phpunit --log-junit autotest-results-%~1.xml --coverage-clover autotest-clover-%~1.xml --coverage-html coverage-html-%~1
-	::phpunit --bootstrap bootstrap.php --configuration phpunit.xml
-	php win32-phpunit.php --bootstrap bootstrap.php --configuration phpunit.xml --log-junit autotest-results-%~1.xml --coverage-clover autotest-clover-%~1.xml --coverage-html coverage-html-%~1
+
+	php win32-phpunit.php --bootstrap bootstrap.php --configuration phpunit-autotest.xml --log-junit autotest-results-%~1.xml --coverage-clover autotest-clover-%~1.xml --coverage-html coverage-html-%~1
 	echo "Done with testing %~1 ..."
 	cd %BASEDIR%
 goto:eof
@@ -114,4 +135,10 @@ goto:eof
 ::  - to enable dropdb I decided to add following line to pg_hba.conf (this is not the safest way but I don't care for the testing machine):
 :: local	all	all	trust
 ::
+:: NOTES on mssql:
+::  we assume the usage of a local installed sqlexpress
+::  create a user 'oc_autotest' with password 'owncloud' and assign the server role 'dbcreator'
+::  make sure the sqlserver is configured to allow sql authentication
+::
+
 
diff --git a/config/config.sample.php b/config/config.sample.php
index 2f394c41a3bdc8a044659817a223c5b647713ab6..ec61ceefd6cd27167c5ba1a472f68caac5c4d1e9 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -136,7 +136,7 @@ $CONFIG = array(
 "remember_login_cookie_lifetime" => 60*60*24*15,
 
 /* Custom CSP policy, changing this will overwrite the standard policy */
-"custom_csp_policy" => "default-src \'self\'; script-src \'self\' \'unsafe-eval\'; style-src \'self\' \'unsafe-inline\'; frame-src *; img-src *; font-src \'self\' data:",
+"custom_csp_policy" => "default-src 'self'; script-src 'self' 'unsafe-eval'; style-src 'self' 'unsafe-inline'; frame-src *; img-src *; font-src 'self' data:",
 
 /* 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 6704a00c5a2c5345debf862a51715af80fbd58f1..9201b48cb954af5849b0b19334a376b37486a444 100644
--- a/core/ajax/share.php
+++ b/core/ajax/share.php
@@ -34,7 +34,13 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
 						$shareWith = null;
 					}
 					
-					$token = OCP\Share::shareItem($_POST['itemType'], $_POST['itemSource'], $shareType, $shareWith, $_POST['permissions']);
+					$token = OCP\Share::shareItem(
+						$_POST['itemType'],
+						$_POST['itemSource'],
+						$shareType,
+						$shareWith,
+						$_POST['permissions']
+					);
 					
 					if (is_string($token)) {
 						OC_JSON::success(array('data' => array('token' => $token)));
@@ -59,7 +65,13 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
 			break;
 		case 'setPermissions':
 			if (isset($_POST['shareType']) && isset($_POST['shareWith']) && isset($_POST['permissions'])) {
-				$return = OCP\Share::setPermissions($_POST['itemType'], $_POST['itemSource'], $_POST['shareType'], $_POST['shareWith'], $_POST['permissions']);
+				$return = OCP\Share::setPermissions(
+					$_POST['itemType'],
+					$_POST['itemSource'],
+					$_POST['shareType'],
+					$_POST['shareWith'],
+					$_POST['permissions']
+				);
 				($return) ? OC_JSON::success() : OC_JSON::error();
 			}
 			break;
@@ -86,9 +98,11 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
 			if ($type === 'dir')
 				$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));
+			$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')
-				$text = (string)$l->t('User %s shared the folder "%s" with you. It is available for download here: %s', array($displayName, $file, $link));
+				$text = (string)$l->t('User %s shared the folder "%s" with you. It is available for download here: %s',
+					array($displayName, $file, $link));
 
 
 			$default_from = OCP\Util::getDefaultEmailAddress('sharing-noreply');
@@ -112,14 +126,29 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
 			}
 			break;
 		case 'getItem':
-			if (isset($_GET['itemType']) && isset($_GET['itemSource']) && isset($_GET['checkReshare']) && isset($_GET['checkShares'])) {
+			if (isset($_GET['itemType'])
+				&& isset($_GET['itemSource'])
+				&& isset($_GET['checkReshare'])
+				&& isset($_GET['checkShares'])) {
 				if ($_GET['checkReshare'] == 'true') {
-					$reshare = OCP\Share::getItemSharedWithBySource($_GET['itemType'], $_GET['itemSource'], OCP\Share::FORMAT_NONE, null, true);
+					$reshare = OCP\Share::getItemSharedWithBySource(
+						$_GET['itemType'],
+						$_GET['itemSource'],
+						OCP\Share::FORMAT_NONE,
+						null,
+						true
+					);
 				} else {
 					$reshare = false;
 				}
 				if ($_GET['checkShares'] == 'true') {
-					$shares = OCP\Share::getItemShared($_GET['itemType'], $_GET['itemSource'], OCP\Share::FORMAT_NONE, null, true);
+					$shares = OCP\Share::getItemShared(
+						$_GET['itemType'],
+						$_GET['itemSource'],
+						OCP\Share::FORMAT_NONE,
+						null,
+						true
+					);
 				} else {
 					$shares = false;
 				}
@@ -156,8 +185,8 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
 				$users = array();
 				$limit = 0;
 				$offset = 0;
-				while ($count < 4 && count($users) == $limit) {
-					$limit = 4 - $count;
+				while ($count < 15 && count($users) == $limit) {
+					$limit = 15 - $count;
 					if ($sharePolicy == 'groups_only') {
 						$users = OC_Group::DisplayNamesInGroups($groups, $_GET['search'], $limit, $offset);
 					} else {
@@ -165,21 +194,34 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
 					}
 					$offset += $limit;
 					foreach ($users as $uid => $displayName) {
-						if ((!isset($_GET['itemShares']) || !is_array($_GET['itemShares'][OCP\Share::SHARE_TYPE_USER]) || !in_array($uid, $_GET['itemShares'][OCP\Share::SHARE_TYPE_USER])) && $uid != OC_User::getUser()) {
-							$shareWith[] = array('label' => $displayName, 'value' => array('shareType' => OCP\Share::SHARE_TYPE_USER, 'shareWith' => $uid));
+						if ((!isset($_GET['itemShares'])
+							|| !is_array($_GET['itemShares'][OCP\Share::SHARE_TYPE_USER])
+							|| !in_array($uid, $_GET['itemShares'][OCP\Share::SHARE_TYPE_USER]))
+							&& $uid != OC_User::getUser()) {
+							$shareWith[] = array(
+								'label' => $displayName,
+								'value' => array('shareType' => OCP\Share::SHARE_TYPE_USER,
+								'shareWith' => $uid)
+							);
 							$count++;
 						}
 					}
 				}
 				$count = 0;
 				foreach ($groups as $group) {
-					if ($count < 4) {
+					if ($count < 15) {
 						if (stripos($group, $_GET['search']) !== false
 							&& (!isset($_GET['itemShares'])
 							|| !isset($_GET['itemShares'][OCP\Share::SHARE_TYPE_GROUP])
 							|| !is_array($_GET['itemShares'][OCP\Share::SHARE_TYPE_GROUP])
 							|| !in_array($group, $_GET['itemShares'][OCP\Share::SHARE_TYPE_GROUP]))) {
-							$shareWith[] = array('label' => $group.' (group)', 'value' => array('shareType' => OCP\Share::SHARE_TYPE_GROUP, 'shareWith' => $group));
+							$shareWith[] = array(
+								'label' => $group.' (group)',
+								'value' => array(
+									'shareType' => OCP\Share::SHARE_TYPE_GROUP,
+									'shareWith' => $group
+								)
+							);
 							$count++;
 						}
 					} else {
diff --git a/core/ajax/translations.php b/core/ajax/translations.php
index e52a2e9b1e8292b8d90295b77858ddc465c9261f..c9c642077982b0671a39ba156f932e1176248b3c 100644
--- a/core/ajax/translations.php
+++ b/core/ajax/translations.php
@@ -21,7 +21,8 @@
 *
 */
 
-$app = $_POST["app"];
+$app = isset($_POST["app"]) ? $_POST["app"] : "";
+
 $app = OC_App::cleanAppId($app);
 
 $l = OC_L10N::get( $app );
diff --git a/core/ajax/update.php b/core/ajax/update.php
index 20ab045c89243b09f433dac2900caba7acb57b17..8b20150d43248ae38ec263619a62719dfc8c09e2 100644
--- a/core/ajax/update.php
+++ b/core/ajax/update.php
@@ -4,6 +4,7 @@ $RUNTIME_NOAPPS = true;
 require_once '../../lib/base.php';
 
 if (OC::checkUpgrade(false)) {
+	\OC_DB::enableCaching(false);
 	$updateEventSource = new OC_EventSource();
 	$watcher = new UpdateWatcher($updateEventSource);
 	OC_Hook::connect('update', 'success', $watcher, 'success');
@@ -16,10 +17,6 @@ if (OC::checkUpgrade(false)) {
 	} catch (Exception $exception) {
 		$watcher->failure($exception->getMessage());
 	}
-	$minimizerCSS = new OC_Minimizer_CSS();
-	$minimizerCSS->clearCache();
-	$minimizerJS = new OC_Minimizer_JS();
-	$minimizerJS->clearCache();
 	OC_Config::setValue('version', implode('.', OC_Util::getVersion()));
 	OC_App::checkAppsRequirements();
 	// load all apps to also upgrade enabled apps
@@ -64,4 +61,4 @@ class UpdateWatcher {
 		$this->eventSource->close();
 	}
 
-}
\ No newline at end of file
+}
diff --git a/core/css/share.css b/core/css/share.css
index e806d25982e2b9ad8731103584255d07484e1857..2d6849b4bb1361b1978906716ce0974fd7d1c643 100644
--- a/core/css/share.css
+++ b/core/css/share.css
@@ -24,6 +24,18 @@
  #shareWithList li {
  	padding-top:.1em;
  }
+ 
+ #shareWithList li:first-child {
+	 white-space:normal;
+ }
+
+ #shareWithList .cruds {
+	 margin-left:-10px;
+ }
+
+#shareWithList .unshare img, #shareWithList .showCruds img {
+	vertical-align:text-bottom; /* properly align icons */
+}
 
  #dropdown label {
  	font-weight:400;
@@ -43,6 +55,7 @@
  	float:right;
  	opacity:.5;
  	padding:.3em 0 0 .3em !important;
+	margin-top:-5px;
  }
 
  #link {
@@ -75,4 +88,12 @@
 
  a.showCruds:hover,a.unshare:hover {
  	opacity:1;
- }
\ No newline at end of file
+ }
+
+.reshare { white-space:normal; } /* fix shared by text going out of box */
+
+.ui-autocomplete { /* limit dropdown height to 4 1/2 entries */
+	max-height:103px;
+	overflow-y:auto;
+	overflow-x:hidden;
+}
diff --git a/core/css/styles.css b/core/css/styles.css
index c2e1ad92088b3c2ce915b80efd46e52e561b6218..0725e658965e1145c2ce524399417a13b609ad69 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -32,12 +32,12 @@ background:linear-gradient(top, #35537a 0%,#1d2d42 100%); /* W3C */
 filter:progid:DXImageTransform.Microsoft.gradient( startColorstr='#35537a', endColorstr='#1d2d42',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 0.5em; }
+.header-right { float:right; vertical-align:middle; padding:0.5em; }
 .header-right > * { vertical-align:middle; }
 
+
 /* INPUTS */
-input[type="text"], input[type="password"] { cursor:text; }
-input[type="text"], input[type="password"], input[type="search"],
+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 {
 	width:10em; margin:.3em; padding:.6em .5em .4em;
 	font-size:1em; font-family:Arial, Verdana, sans-serif;
@@ -46,12 +46,22 @@ textarea, select, button, .button, #quota, div.jp-progress, .pager li a {
 	-moz-border-radius:.5em; -webkit-border-radius:.5em; border-radius:.5em;
 }
 input[type="hidden"] { height:0; width:0; }
-input[type="text"], input[type="password"], input[type="search"], textarea { background:#f8f8f8; color:#555; cursor:text; }
-input[type="text"], input[type="password"], input[type="search"] { -webkit-appearance:textfield; -moz-appearance:textfield; -webkit-box-sizing:content-box; -moz-box-sizing:content-box; box-sizing:content-box; }
+input[type="text"], input[type="password"], input[type="search"], input[type="number"], input[type="email"], textarea {
+	background:#f8f8f8; color:#555; cursor:text;
+}
+input[type="text"], input[type="password"], input[type="search"], input[type="number"], input[type="email"] {
+	-webkit-appearance:textfield; -moz-appearance:textfield;
+	-webkit-box-sizing:content-box; -moz-box-sizing:content-box; box-sizing:content-box;
+}
 input[type="text"]:hover, input[type="text"]:focus, input[type="text"]:active,
 input[type="password"]:hover, input[type="password"]:focus, input[type="password"]:active,
+input[type="number"]:hover, input[type="number"]:focus, input[type="number"]:active,
 .searchbox input[type="search"]:hover, .searchbox input[type="search"]:focus, .searchbox input[type="search"]:active,
-textarea:hover, textarea:focus, textarea:active { background-color:#fff; color:#333; -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); opacity:1; }
+input[type="email"]:hover, input[type="email"]:focus, input[type="email"]:active,
+textarea:hover, textarea:focus, textarea:active {
+	background-color:#fff; color:#333;
+	-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); opacity:1;
+}
 input[type="checkbox"] { margin:0; padding:0; height:auto; width:auto; }
 input[type="checkbox"]:hover+label, input[type="checkbox"]:focus+label { color:#111 !important; }
 #quota { cursor:default; }
@@ -138,6 +148,7 @@ input[type="submit"].enabled { background:#66f866; border:1px solid #5e5; -moz-b
 #body-login div.buttons { text-align:center; }
 #body-login p.info { width:22em; text-align:center; margin:2em auto; color:#777; text-shadow:#fff 0 1px 0; }
 #body-login p.info a { font-weight:bold; color:#777; }
+#body-login #submit.login { margin-right:7px; } /* quick fix for log in button not being aligned with input fields, should be properly fixed by input field width later */
 
 #login { min-height:30em; margin:2em auto 0; border-bottom:1px solid #f8f8f8; background:#eee; }
 #login form { width:22em; margin:2em auto 2em; padding:0; }
@@ -196,7 +207,7 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; }
 #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 + 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;
@@ -258,8 +269,8 @@ fieldset.warning a { color:#b94a48 !important; font-weight:bold; }
 #expand:hover img, #expand:focus img, #expand:active img { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); opacity:1; }
 #expanddiv {
 	position:absolute; right:0; top:45px; z-index:76; display:none;
-	background-color:#444; border-bottom-left-radius:7px; box-shadow: 0 0 20px rgb(29,45,68);
-	background:#383c43 url('../img/noise.png') repeat; border-bottom:1px #333 solid; border-left:border-bottom:1px #333 solid;
+	background:#383c43 url('../img/noise.png') repeat;
+	border-bottom-left-radius:7px; border-bottom:1px #333 solid; border-left:1px #333 solid;
 	-moz-box-shadow:0 0 7px rgb(29,45,68); -webkit-box-shadow:0 0 7px rgb(29,45,68); box-shadow:0 0 7px rgb(29,45,68);
 }
 	#expanddiv a {
diff --git a/core/img/actions/caret-dark.png b/core/img/actions/caret-dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..ce7e1e6980298b86b6eb5bbf9008ea7dfb67699f
Binary files /dev/null and b/core/img/actions/caret-dark.png differ
diff --git a/core/img/actions/caret-dark.svg b/core/img/actions/caret-dark.svg
new file mode 100644
index 0000000000000000000000000000000000000000..abb1dc192d228813753b156c4e370059a3408767
--- /dev/null
+++ b/core/img/actions/caret-dark.svg
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   width="10"
+   height="10"
+   id="svg2403"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="caret.svg"
+   inkscape:export-filename="caret.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1280"
+     inkscape:window-height="773"
+     id="namedview3047"
+     showgrid="false"
+     inkscape:zoom="25.279067"
+     inkscape:cx="-3.063006"
+     inkscape:cy="6.0978375"
+     inkscape:window-x="0"
+     inkscape:window-y="-1"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2403"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <metadata
+     id="metadata15">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs2405">
+    <linearGradient
+       x1="11.644068"
+       y1="2.4988678"
+       x2="11.644068"
+       y2="15.00281"
+       id="linearGradient2392"
+       xlink:href="#linearGradient3678"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(1.0000001,1.1920928e-8)" />
+    <linearGradient
+       x1="8.4964771"
+       y1="-0.061573759"
+       x2="8.4964771"
+       y2="8.083209"
+       id="linearGradient2395"
+       xlink:href="#linearGradient3678"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0526316,0,0,0.9843625,0.5789474,0.06024281)" />
+    <linearGradient
+       id="linearGradient3678">
+      <stop
+         id="stop3680"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3682"
+         style="stop-color:#e6e6e6;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+  </defs>
+  <path
+     sodipodi:nodetypes="cccc"
+     inkscape:connector-curvature="0"
+     id="path3768"
+     d="M 1,2 5,10 9,2.011 z"
+     style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
+  <path
+     style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#999999;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+     d="M 1,1 5,9 9,1.011 z"
+     id="path3716"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccc" />
+</svg>
diff --git a/core/img/actions/triangle-n.png b/core/img/actions/triangle-n.png
index b0d7183caabd7e536b1b543c731f119aa78fdbac..14825f701146398259292881410727962c776ad8 100644
Binary files a/core/img/actions/triangle-n.png and b/core/img/actions/triangle-n.png differ
diff --git a/core/img/actions/triangle-n.svg b/core/img/actions/triangle-n.svg
index 35658631111caa6694338f4bff7dbac7189a88cf..e8d70fa8ce3387c7e8f7146f247c599f1c03bd2f 100644
--- a/core/img/actions/triangle-n.svg
+++ b/core/img/actions/triangle-n.svg
@@ -57,10 +57,10 @@
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:document-units="px"
-     inkscape:window-width="1920"
-     inkscape:window-height="1025"
-     inkscape:window-x="-2"
-     inkscape:window-y="-3"
+     inkscape:window-width="1280"
+     inkscape:window-height="773"
+     inkscape:window-x="0"
+     inkscape:window-y="-1"
      inkscape:window-maximized="1" />
   <metadata
      id="metadata6082">
@@ -79,14 +79,10 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
     <path
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       d="M 12,12 8,3.9999999 3.9999999,11.989 z"
+       id="path3716"
        inkscape:connector-curvature="0"
-       d="M 14.5,15 1.5,15 8,3 14.5,15 z"
-       id="path2843-0-1-6-6"
-       style="opacity:0.6;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <path
-       inkscape:connector-curvature="0"
-       d="m 14.5,13.49996 -13,0 6.49999,-12 6.50001,12 z"
-       id="path2843-39-5-5"
-       style="opacity:0.7;color:#000000;fill:url(#linearGradient7308);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+       sodipodi:nodetypes="cccc" />
   </g>
 </svg>
diff --git a/core/img/actions/triangle-s.png b/core/img/actions/triangle-s.png
index 53590a2197bd73dd8987a77f59a2a87f9111b14f..f36faef2b8ad8c706943eafbed40748ca791e5a0 100644
Binary files a/core/img/actions/triangle-s.png and b/core/img/actions/triangle-s.png differ
diff --git a/core/img/actions/triangle-s.svg b/core/img/actions/triangle-s.svg
index f899300bbca0e7750ba729ad7ac3fced18b2ce1d..396c61e01e22bdf981f039d22840b496673eee2d 100644
--- a/core/img/actions/triangle-s.svg
+++ b/core/img/actions/triangle-s.svg
@@ -14,7 +14,7 @@
    height="16px"
    id="svg6077"
    version="1.1"
-   inkscape:version="0.48.2 r9819"
+   inkscape:version="0.48.3.1 r9886"
    sodipodi:docname="triangle-s.svg"
    inkscape:export-filename="/home/tol/tanghus-owncloud/core/img/actions/triangle-s.png"
    inkscape:export-xdpi="90"
@@ -57,10 +57,10 @@
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:document-units="px"
-     inkscape:window-width="1600"
-     inkscape:window-height="845"
-     inkscape:window-x="-2"
-     inkscape:window-y="-3"
+     inkscape:window-width="1280"
+     inkscape:window-height="773"
+     inkscape:window-x="0"
+     inkscape:window-y="-1"
      inkscape:window-maximized="1" />
   <metadata
      id="metadata6082">
@@ -70,7 +70,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -79,14 +79,10 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
     <path
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       d="M 4,3.9999999 8,12 12,4.0109999 z"
+       id="path3716"
        inkscape:connector-curvature="0"
-       d="M 14.5,3 1.5,3 8,15 14.5,3 z"
-       id="path2843-0-1-6-6"
-       style="opacity:0.6;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <path
-       inkscape:connector-curvature="0"
-       d="m 14.5,1.49996 -13,0 6.49999,12 6.50001,-12 z"
-       id="path2843-39-5-5"
-       style="opacity:0.7;color:#000000;fill:url(#linearGradient7308);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+       sodipodi:nodetypes="cccc" />
   </g>
 </svg>
diff --git a/core/img/filetypes/application-msexcel.png b/core/img/filetypes/application-msexcel.png
index abcd93689a08ec9bdbf0984927e8da06c043c7cd..b977d7e52e2446ea01201c5c7209ac3a05f12c9f 100644
Binary files a/core/img/filetypes/application-msexcel.png and b/core/img/filetypes/application-msexcel.png differ
diff --git a/core/img/filetypes/application-mspowerpoint.png b/core/img/filetypes/application-mspowerpoint.png
index b4aaad9a45c9abbee2d47611a6963101b64a8023..c4eff0387d5888c638ba09473ba6d2369f7b56f0 100644
Binary files a/core/img/filetypes/application-mspowerpoint.png and b/core/img/filetypes/application-mspowerpoint.png differ
diff --git a/core/img/filetypes/application-msword.png b/core/img/filetypes/application-msword.png
index e8b230c59cb66c6ce473c43cf2b7253e22129d75..ae8ecbf47672a874c0958d0d113a56162c2bd364 100644
Binary files a/core/img/filetypes/application-msword.png and b/core/img/filetypes/application-msword.png differ
diff --git a/core/img/filetypes/ms-excel.png b/core/img/filetypes/ms-excel.png
index abcd93689a08ec9bdbf0984927e8da06c043c7cd..b977d7e52e2446ea01201c5c7209ac3a05f12c9f 100644
Binary files a/core/img/filetypes/ms-excel.png and b/core/img/filetypes/ms-excel.png differ
diff --git a/core/img/filetypes/ms-powerpoint.png b/core/img/filetypes/ms-powerpoint.png
index b4aaad9a45c9abbee2d47611a6963101b64a8023..c4eff0387d5888c638ba09473ba6d2369f7b56f0 100644
Binary files a/core/img/filetypes/ms-powerpoint.png and b/core/img/filetypes/ms-powerpoint.png differ
diff --git a/core/img/logo-square.png b/core/img/logo-square.png
deleted file mode 100644
index b836de8f3be81ab3cb2673e3db1c94d4a3966e5e..0000000000000000000000000000000000000000
Binary files a/core/img/logo-square.png and /dev/null differ
diff --git a/core/img/logo-sticker.jpg b/core/img/logo-sticker.jpg
deleted file mode 100644
index ad2bf63ca37aa064d4f7c05c6e293bcafcb5e702..0000000000000000000000000000000000000000
Binary files a/core/img/logo-sticker.jpg and /dev/null differ
diff --git a/core/img/logo-sticker.svg b/core/img/logo-sticker.svg
deleted file mode 100644
index e48f7a78c7d91cc0cd5c25c2ed082be598af4ee3..0000000000000000000000000000000000000000
--- a/core/img/logo-sticker.svg
+++ /dev/null
@@ -1,764 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="Layer_1"
-   x="0px"
-   y="0px"
-   width="269.29132"
-   height="191.33858"
-   viewBox="0 0 269.29131 191.33857"
-   enable-background="new 0 0 595.275 311.111"
-   xml:space="preserve"
-   inkscape:version="0.48.2 r9819"
-   sodipodi:docname="logo.svg"
-   inkscape:export-filename="/home/user/owncloud/core/img/logo-sticker.png"
-   inkscape:export-xdpi="300.00223"
-   inkscape:export-ydpi="300.00223"><metadata
-   id="metadata327"><rdf:RDF><cc:Work
-       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
-   id="defs325"><linearGradient
-   inkscape:collect="always"
-   xlink:href="#SVGID_1_"
-   id="linearGradient3353"
-   gradientUnits="userSpaceOnUse"
-   x1="288.49411"
-   y1="55.888199"
-   x2="288.49411"
-   y2="339.22189" /><linearGradient
-   inkscape:collect="always"
-   xlink:href="#SVGID_2_"
-   id="linearGradient3355"
-   gradientUnits="userSpaceOnUse"
-   x1="251.2114"
-   y1="55.888199"
-   x2="251.2114"
-   y2="339.22159" /><linearGradient
-   inkscape:collect="always"
-   xlink:href="#SVGID_3_"
-   id="linearGradient3357"
-   gradientUnits="userSpaceOnUse"
-   x1="293.22461"
-   y1="55.888199"
-   x2="293.22461"
-   y2="339.22171" /><linearGradient
-   inkscape:collect="always"
-   xlink:href="#SVGID_4_"
-   id="linearGradient3359"
-   gradientUnits="userSpaceOnUse"
-   x1="375.33401"
-   y1="55.888199"
-   x2="375.33401"
-   y2="339.22159" /><linearGradient
-   inkscape:collect="always"
-   xlink:href="#SVGID_5_"
-   id="linearGradient3361"
-   gradientUnits="userSpaceOnUse"
-   x1="334.49411"
-   y1="55.888199"
-   x2="334.49411"
-   y2="339.22159" /><linearGradient
-   inkscape:collect="always"
-   xlink:href="#SVGID_6_"
-   id="linearGradient3363"
-   gradientUnits="userSpaceOnUse"
-   x1="458.42679"
-   y1="55.8867"
-   x2="458.42679"
-   y2="339.2236" /><linearGradient
-   inkscape:collect="always"
-   xlink:href="#SVGID_7_"
-   id="linearGradient3365"
-   gradientUnits="userSpaceOnUse"
-   x1="413.16309"
-   y1="55.888199"
-   x2="413.16309"
-   y2="339.22131" /><linearGradient
-   inkscape:collect="always"
-   xlink:href="#SVGID_8_"
-   id="linearGradient3367"
-   gradientUnits="userSpaceOnUse"
-   x1="290.76169"
-   y1="55.8867"
-   x2="290.76169"
-   y2="339.2236" /><linearGradient
-   inkscape:collect="always"
-   xlink:href="#SVGID_9_"
-   id="linearGradient3369"
-   gradientUnits="userSpaceOnUse"
-   x1="346.77341"
-   y1="55.888199"
-   x2="346.77341"
-   y2="339.22119" />
-	<linearGradient
-   y2="339.22189"
-   x2="288.49411"
-   y1="55.888199"
-   x1="288.49411"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_1_">
-		<stop
-   id="stop261"
-   style="stop-color:#BED5E1"
-   offset="0" />
-		<stop
-   id="stop263"
-   style="stop-color:#567B8F"
-   offset="1" />
-	</linearGradient>
-	
-	<linearGradient
-   y2="339.22159"
-   x2="251.2114"
-   y1="55.888199"
-   x1="251.2114"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_2_">
-		<stop
-   id="stop268"
-   style="stop-color:#BED5E1"
-   offset="0" />
-		<stop
-   id="stop270"
-   style="stop-color:#567B8F"
-   offset="1" />
-	</linearGradient>
-	
-	<linearGradient
-   y2="339.22171"
-   x2="293.22461"
-   y1="55.888199"
-   x1="293.22461"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_3_">
-		<stop
-   id="stop275"
-   style="stop-color:#BED5E1"
-   offset="0" />
-		<stop
-   id="stop277"
-   style="stop-color:#567B8F"
-   offset="1" />
-	</linearGradient>
-	
-	<linearGradient
-   y2="339.22159"
-   x2="375.33401"
-   y1="55.888199"
-   x1="375.33401"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_4_">
-		<stop
-   id="stop282"
-   style="stop-color:#BED5E1"
-   offset="0" />
-		<stop
-   id="stop284"
-   style="stop-color:#567B8F"
-   offset="1" />
-	</linearGradient>
-	
-	<linearGradient
-   y2="339.22159"
-   x2="334.49411"
-   y1="55.888199"
-   x1="334.49411"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_5_">
-		<stop
-   id="stop289"
-   style="stop-color:#BED5E1"
-   offset="0" />
-		<stop
-   id="stop291"
-   style="stop-color:#567B8F"
-   offset="1" />
-	</linearGradient>
-	
-	<linearGradient
-   y2="339.2236"
-   x2="458.42679"
-   y1="55.8867"
-   x1="458.42679"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_6_">
-		<stop
-   id="stop296"
-   style="stop-color:#BED5E1"
-   offset="0" />
-		<stop
-   id="stop298"
-   style="stop-color:#567B8F"
-   offset="1" />
-	</linearGradient>
-	
-	<linearGradient
-   y2="339.22131"
-   x2="413.16309"
-   y1="55.888199"
-   x1="413.16309"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_7_">
-		<stop
-   id="stop303"
-   style="stop-color:#BED5E1"
-   offset="0" />
-		<stop
-   id="stop305"
-   style="stop-color:#567B8F"
-   offset="1" />
-	</linearGradient>
-	
-	<linearGradient
-   y2="339.2236"
-   x2="290.76169"
-   y1="55.8867"
-   x1="290.76169"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_8_">
-		<stop
-   id="stop310"
-   style="stop-color:#BED5E1"
-   offset="0" />
-		<stop
-   id="stop312"
-   style="stop-color:#567B8F"
-   offset="1" />
-	</linearGradient>
-	
-	<linearGradient
-   y2="339.22119"
-   x2="346.77341"
-   y1="55.888199"
-   x1="346.77341"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_9_">
-		<stop
-   id="stop317"
-   style="stop-color:#BED5E1"
-   offset="0" />
-		<stop
-   id="stop319"
-   style="stop-color:#567B8F"
-   offset="1" />
-	</linearGradient>
-	
-</defs><sodipodi:namedview
-   pagecolor="#ffffff"
-   bordercolor="#666666"
-   borderopacity="1"
-   objecttolerance="10"
-   gridtolerance="10"
-   guidetolerance="10"
-   inkscape:pageopacity="0"
-   inkscape:pageshadow="2"
-   inkscape:window-width="1280"
-   inkscape:window-height="774"
-   id="namedview323"
-   showgrid="false"
-   inkscape:zoom="2"
-   inkscape:cx="156.13378"
-   inkscape:cy="107.57751"
-   inkscape:window-x="0"
-   inkscape:window-y="26"
-   inkscape:window-maximized="1"
-   inkscape:current-layer="Layer_1"
-   units="mm"
-   fit-margin-top="0"
-   fit-margin-left="0"
-   fit-margin-right="0"
-   fit-margin-bottom="0"
-   showguides="true"
-   inkscape:guide-bbox="true" />
-<pattern
-   y="565.223"
-   width="69"
-   height="69"
-   patternUnits="userSpaceOnUse"
-   id="Polka_Dot_Pattern"
-   viewBox="2.125 -70.896 69 69"
-   overflow="visible">
-	<g
-   id="g4">
-		<polygon
-   fill="none"
-   points="71.125,-1.896 2.125,-1.896 2.125,-70.896 71.125,-70.896   "
-   id="polygon6" />
-		<polygon
-   fill="#F6BB60"
-   points="71.125,-1.896 2.125,-1.896 2.125,-70.896 71.125,-70.896   "
-   id="polygon8" />
-		<g
-   id="g10">
-			<path
-   fill="#FFFFFF"
-   d="M61.772-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path12" />
-			<path
-   fill="#FFFFFF"
-   d="M54.105-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path14" />
-			<path
-   fill="#FFFFFF"
-   d="M46.439-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path16" />
-			<path
-   fill="#FFFFFF"
-   d="M38.772-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path18" />
-			<path
-   fill="#FFFFFF"
-   d="M31.105-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path20" />
-			<path
-   fill="#FFFFFF"
-   d="M23.439-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path22" />
-			<path
-   fill="#FFFFFF"
-   d="M15.772-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path24" />
-			<path
-   fill="#FFFFFF"
-   d="M8.105-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path26" />
-			<path
-   fill="#FFFFFF"
-   d="M0.439-71.653c0.018,0.072,0.008,0.127-0.026,0.19C0.361-71.362,0.3-71.4,0.248-71.335     c-0.051,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.07,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.038-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.051-0.12-0.064-0.187c-0.021-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.215,0.124-0.215,0.224c0.002,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path28" />
-		</g>
-		<g
-   id="g30">
-			<path
-   fill="#FFFFFF"
-   d="M69.439-71.653c0.018,0.072,0.008,0.127-0.026,0.19c-0.052,0.101-0.113,0.062-0.165,0.128     c-0.051,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.07,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.038-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.051-0.12-0.064-0.187c-0.021-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.215,0.124-0.215,0.224c0.002,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path32" />
-		</g>
-		<path
-   fill="#FFFFFF"
-   d="M0.495-71.653c0.018,0.072,0.008,0.127-0.026,0.19c-0.052,0.101-0.113,0.062-0.165,0.128    c-0.051,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161    c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631    c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45    c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.07,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221    c0.038-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.051-0.12-0.064-0.187c-0.021-0.114,0.002-0.224,0-0.337    c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207    c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.215,0.124-0.215,0.224C0.5-71.68,0.503-71.744,0.51-71.626    c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path34" />
-		<g
-   id="g36">
-			<g
-   id="g38">
-				<path
-   fill="#FFFFFF"
-   d="M69.439-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path40" />
-				<path
-   fill="#FFFFFF"
-   d="M61.778-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path42" />
-				<path
-   fill="#FFFFFF"
-   d="M54.118-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path44" />
-				<path
-   fill="#FFFFFF"
-   d="M46.458-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path46" />
-				<path
-   fill="#FFFFFF"
-   d="M38.797-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path48" />
-				<path
-   fill="#FFFFFF"
-   d="M31.137-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path50" />
-				<path
-   fill="#FFFFFF"
-   d="M23.477-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path52" />
-				<path
-   fill="#FFFFFF"
-   d="M15.816-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path54" />
-				<path
-   fill="#FFFFFF"
-   d="M8.156-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path56" />
-				<path
-   fill="#FFFFFF"
-   d="M0.495-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143C2-61.45,2.217-61.397,2.391-61.46c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path58" />
-			</g>
-			<g
-   id="g60">
-				<path
-   fill="#FFFFFF"
-   d="M69.439-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path62" />
-				<path
-   fill="#FFFFFF"
-   d="M61.778-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path64" />
-				<path
-   fill="#FFFFFF"
-   d="M54.118-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path66" />
-				<path
-   fill="#FFFFFF"
-   d="M46.458-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path68" />
-				<path
-   fill="#FFFFFF"
-   d="M38.797-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path70" />
-				<path
-   fill="#FFFFFF"
-   d="M31.137-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path72" />
-				<path
-   fill="#FFFFFF"
-   d="M23.477-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path74" />
-				<path
-   fill="#FFFFFF"
-   d="M15.816-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path76" />
-				<path
-   fill="#FFFFFF"
-   d="M8.156-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path78" />
-				<path
-   fill="#FFFFFF"
-   d="M0.495-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224C0.5-56.374,0.503-56.438,0.51-56.32      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path80" />
-			</g>
-			<g
-   id="g82">
-				<path
-   fill="#FFFFFF"
-   d="M69.439-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path84" />
-				<path
-   fill="#FFFFFF"
-   d="M61.778-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path86" />
-				<path
-   fill="#FFFFFF"
-   d="M54.118-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path88" />
-				<path
-   fill="#FFFFFF"
-   d="M46.458-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path90" />
-				<path
-   fill="#FFFFFF"
-   d="M38.797-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path92" />
-				<path
-   fill="#FFFFFF"
-   d="M31.137-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path94" />
-				<path
-   fill="#FFFFFF"
-   d="M23.477-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path96" />
-				<path
-   fill="#FFFFFF"
-   d="M15.816-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path98" />
-				<path
-   fill="#FFFFFF"
-   d="M8.156-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path100" />
-				<path
-   fill="#FFFFFF"
-   d="M0.495-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path102" />
-			</g>
-			<g
-   id="g104">
-				<path
-   fill="#FFFFFF"
-   d="M69.439-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path106" />
-				<path
-   fill="#FFFFFF"
-   d="M61.778-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path108" />
-				<path
-   fill="#FFFFFF"
-   d="M54.118-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path110" />
-				<path
-   fill="#FFFFFF"
-   d="M46.458-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path112" />
-				<path
-   fill="#FFFFFF"
-   d="M38.797-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path114" />
-				<path
-   fill="#FFFFFF"
-   d="M31.137-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path116" />
-				<path
-   fill="#FFFFFF"
-   d="M23.477-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path118" />
-				<path
-   fill="#FFFFFF"
-   d="M15.816-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path120" />
-				<path
-   fill="#FFFFFF"
-   d="M8.156-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      C8.15-41.004,8.149-41.02,8.14-41.04"
-   id="path122" />
-				<path
-   fill="#FFFFFF"
-   d="M0.495-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path124" />
-			</g>
-			<g
-   id="g126">
-				<path
-   fill="#FFFFFF"
-   d="M69.439-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path128" />
-				<path
-   fill="#FFFFFF"
-   d="M61.778-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path130" />
-				<path
-   fill="#FFFFFF"
-   d="M54.118-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path132" />
-				<path
-   fill="#FFFFFF"
-   d="M46.458-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path134" />
-				<path
-   fill="#FFFFFF"
-   d="M38.797-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path136" />
-				<path
-   fill="#FFFFFF"
-   d="M31.137-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path138" />
-				<path
-   fill="#FFFFFF"
-   d="M23.477-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path140" />
-				<path
-   fill="#FFFFFF"
-   d="M15.816-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path142" />
-				<path
-   fill="#FFFFFF"
-   d="M8.156-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path144" />
-				<path
-   fill="#FFFFFF"
-   d="M0.495-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224C0.5-33.416,0.503-33.48,0.51-33.362      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path146" />
-			</g>
-			<g
-   id="g148">
-				<path
-   fill="#FFFFFF"
-   d="M69.439-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path150" />
-				<path
-   fill="#FFFFFF"
-   d="M61.778-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path152" />
-				<path
-   fill="#FFFFFF"
-   d="M54.118-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path154" />
-				<path
-   fill="#FFFFFF"
-   d="M46.458-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path156" />
-				<path
-   fill="#FFFFFF"
-   d="M38.797-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path158" />
-				<path
-   fill="#FFFFFF"
-   d="M31.137-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path160" />
-				<path
-   fill="#FFFFFF"
-   d="M23.477-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path162" />
-				<path
-   fill="#FFFFFF"
-   d="M15.816-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path164" />
-				<path
-   fill="#FFFFFF"
-   d="M8.156-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path166" />
-				<path
-   fill="#FFFFFF"
-   d="M0.495-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path168" />
-			</g>
-			<g
-   id="g170">
-				<path
-   fill="#FFFFFF"
-   d="M69.439-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path172" />
-				<path
-   fill="#FFFFFF"
-   d="M61.778-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path174" />
-				<path
-   fill="#FFFFFF"
-   d="M54.118-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path176" />
-				<path
-   fill="#FFFFFF"
-   d="M46.458-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path178" />
-				<path
-   fill="#FFFFFF"
-   d="M38.797-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path180" />
-				<path
-   fill="#FFFFFF"
-   d="M31.137-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path182" />
-				<path
-   fill="#FFFFFF"
-   d="M23.477-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path184" />
-				<path
-   fill="#FFFFFF"
-   d="M15.816-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path186" />
-				<path
-   fill="#FFFFFF"
-   d="M8.156-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path188" />
-				<path
-   fill="#FFFFFF"
-   d="M0.495-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224C0.5-18.11,0.503-18.175,0.51-18.057      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path190" />
-			</g>
-			<g
-   id="g192">
-				<path
-   fill="#FFFFFF"
-   d="M69.439-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362C69-9.692,69.159-9.523,69.154-9.4c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path194" />
-				<path
-   fill="#FFFFFF"
-   d="M61.778-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path196" />
-				<path
-   fill="#FFFFFF"
-   d="M54.118-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path198" />
-				<path
-   fill="#FFFFFF"
-   d="M46.458-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path200" />
-				<path
-   fill="#FFFFFF"
-   d="M38.797-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path202" />
-				<path
-   fill="#FFFFFF"
-   d="M31.137-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path204" />
-				<path
-   fill="#FFFFFF"
-   d="M23.477-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path206" />
-				<path
-   fill="#FFFFFF"
-   d="M15.816-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053C17.933-7.969,17.839-8.227,18-8.34      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path208" />
-				<path
-   fill="#FFFFFF"
-   d="M8.156-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      C7.915-10.05,7.866-9.836,7.886-9.75C7.717-9.692,7.876-9.523,7.871-9.4C7.868-9.351,7.83-9.295,7.826-9.239      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      C9.114-7.652,9.321-7.799,9.48-7.837c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path210" />
-				<path
-   fill="#FFFFFF"
-   d="M0.495-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      C0.254-10.05,0.205-9.836,0.225-9.75C0.056-9.692,0.215-9.523,0.21-9.4c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37C0.33-8.671,0.501-8.456,0.668-8.325c0.19,0.148,0.365,0.572,0.608,0.631      C1.454-7.652,1.66-7.799,1.819-7.837C2-7.88,2.217-7.827,2.391-7.89c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46C3.477-8.933,3.471-8.995,3.5-9.071      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path212" />
-			</g>
-		</g>
-		<g
-   id="g214">
-			<path
-   fill="#FFFFFF"
-   d="M69.439-2.778c0.018,0.072,0.008,0.127-0.026,0.19C69.361-2.487,69.3-2.525,69.248-2.46     c-0.051,0.062-0.099,0.276-0.079,0.362C69-2.04,69.159-1.871,69.154-1.748c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     C70.397,0,70.604-0.146,70.763-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.07,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.038-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.051-0.12-0.064-0.187c-0.021-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.215,0.124-0.215,0.224c0.002,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path216" />
-			<path
-   fill="#FFFFFF"
-   d="M61.778-2.778c0.018,0.072,0.007,0.127-0.026,0.19C61.7-2.487,61.64-2.525,61.587-2.46     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     C62.737,0,62.943-0.146,63.103-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224C61.915-3.117,61.78-3.02,61.781-2.92c0.001,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path218" />
-			<path
-   fill="#FFFFFF"
-   d="M54.118-2.778c0.018,0.072,0.007,0.127-0.026,0.19C54.04-2.487,53.98-2.525,53.927-2.46     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     C55.077,0,55.283-0.146,55.442-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224C54.255-3.117,54.12-3.02,54.121-2.92c0.001,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path220" />
-			<path
-   fill="#FFFFFF"
-   d="M46.458-2.778c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     C47.416,0,47.623-0.146,47.782-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224C46.594-3.117,46.459-3.02,46.46-2.92c0.001,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path222" />
-			<path
-   fill="#FFFFFF"
-   d="M38.797-2.778c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     C39.756,0,39.962-0.146,40.122-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224C38.934-3.117,38.799-3.02,38.8-2.92c0.001,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path224" />
-			<path
-   fill="#FFFFFF"
-   d="M31.137-2.778c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     C32.095,0,32.302-0.146,32.461-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224C31.273-3.117,31.139-3.02,31.14-2.92c0.001,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path226" />
-			<path
-   fill="#FFFFFF"
-   d="M23.477-2.778c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     C24.435,0,24.642-0.146,24.801-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path228" />
-			<path
-   fill="#FFFFFF"
-   d="M15.816-2.778c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     C16.774,0,16.981-0.146,17.14-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169     C15.81-2.74,15.809-2.756,15.8-2.776"
-   id="path230" />
-			<path
-   fill="#FFFFFF"
-   d="M8.156-2.778c0.018,0.072,0.007,0.127-0.026,0.19C8.077-2.487,8.018-2.525,7.965-2.46     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35C7.868-1.698,7.83-1.643,7.826-1.587     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     C9.114,0,9.321-0.146,9.48-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789C8.954-3.54,8.847-3.448,8.692-3.367     c-0.17,0.088-0.139,0.166-0.318,0.224C8.292-3.117,8.158-3.02,8.159-2.92C8.16-2.805,8.164-2.869,8.17-2.751     C8.15-2.74,8.149-2.756,8.14-2.776"
-   id="path232" />
-			<path
-   fill="#FFFFFF"
-   d="M0.495-2.778c0.018,0.072,0.008,0.127-0.026,0.19C0.417-2.487,0.356-2.525,0.304-2.46     C0.253-2.397,0.205-2.184,0.225-2.098C0.056-2.04,0.215-1.871,0.21-1.748c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37C0.33-1.019,0.501-0.804,0.668-0.673c0.19,0.148,0.365,0.572,0.608,0.631     C1.454,0,1.66-0.146,1.819-0.185C2-0.228,2.217-0.175,2.391-0.237c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.07,0.339-0.263,0.376-0.46C3.477-1.28,3.471-1.343,3.5-1.419     c0.038-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.051-0.12-0.064-0.187c-0.021-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789C1.293-3.54,1.187-3.448,1.031-3.367     c-0.17,0.088-0.139,0.166-0.318,0.224C0.632-3.117,0.498-3.02,0.498-2.92C0.5-2.805,0.503-2.869,0.51-2.751     C0.489-2.74,0.488-2.756,0.479-2.776"
-   id="path234" />
-		</g>
-	</g>
-</pattern>
-<rect
-   width="269.29132"
-   height="191.33858"
-   id="rect236"
-   style="fill:#1d2d44;fill-opacity:1"
-   x="-2.2128221e-05"
-   y="0" />
-<path
-   style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-   d="M 151.3125 48.21875 C 142.49706 48.21875 135.375 55.340804 135.375 64.15625 C 135.375 67.790003 136.58498 71.134412 138.625 73.8125 C 143.05052 68.690264 149.58219 65.4375 156.875 65.4375 C 160.44297 65.4375 163.82637 66.232019 166.875 67.625 C 167.12183 66.508738 167.25 65.347793 167.25 64.15625 C 167.25 55.340804 160.12795 48.21875 151.3125 48.21875 z M 130.5 55.59375 C 125.90916 55.59375 122.21875 59.315405 122.21875 63.90625 C 122.21875 65.39263 122.60223 66.797093 123.28125 68 C 126.05154 66.437244 129.25431 65.53125 132.65625 65.53125 C 132.98456 65.53125 133.30078 65.544578 133.625 65.5625 C 133.58831 65.097112 133.5625 64.630967 133.5625 64.15625 C 133.5625 61.599256 134.11787 59.166392 135.09375 56.96875 C 133.77981 56.087661 132.20557 55.59375 130.5 55.59375 z M 169.8125 61.3125 C 169.47334 61.3125 169.14642 61.354138 168.8125 61.375 C 168.95694 62.285711 169.0625 63.205299 169.0625 64.15625 C 169.0625 65.636182 168.87428 67.064236 168.53125 68.4375 C 172.55313 70.663266 175.89314 73.993558 178.09375 78.03125 C 180.37629 76.842954 182.92252 76.08737 185.625 75.90625 C 184.92852 67.738261 178.1617 61.3125 169.8125 61.3125 z M 156.875 67.25 C 144.53955 67.25 134.5625 77.226221 134.5625 89.5625 C 134.5625 101.89745 144.53904 111.875 156.875 111.875 C 169.21096 111.875 179.1875 101.89743 179.1875 89.5625 C 179.1875 77.226243 169.21045 67.25 156.875 67.25 z M 132.65625 67.34375 C 123.08628 67.34375 115.34375 75.086276 115.34375 84.65625 C 115.34375 90.289891 118.02796 95.277127 122.1875 98.4375 C 123.94108 95.055345 127.46306 92.75 131.53125 92.75 C 132.02293 92.75 132.49487 92.809591 132.96875 92.875 C 132.81999 91.79271 132.75 90.685421 132.75 89.5625 C 132.75 84.193591 134.49763 79.228747 137.46875 75.21875 C 135.69026 72.993291 134.4175 70.319305 133.875 67.40625 C 133.47293 67.378399 133.06546 67.34375 132.65625 67.34375 z M 186.90625 77.65625 C 184.00037 77.65625 181.2783 78.398129 178.875 79.65625 C 180.23967 82.67909 181 86.033032 181 89.5625 C 181 96.171137 178.34296 102.17185 174.03125 106.53125 C 177.19878 110.04787 181.79449 112.25 186.90625 112.25 C 196.47622 112.25 204.21875 104.50747 204.21875 94.9375 C 204.21875 85.367526 196.47622 77.65625 186.90625 77.65625 z M 113.65625 79.9375 C 104.84055 79.9375 97.6875 87.028054 97.6875 95.84375 C 97.6875 104.65945 104.84055 111.8125 113.65625 111.8125 C 117.01163 111.8125 120.11987 110.76708 122.6875 109 C 121.62651 107.35134 121 105.38027 121 103.28125 C 121 102.1918 121.16075 101.14515 121.46875 100.15625 C 116.66189 96.682399 113.53125 91.029365 113.53125 84.65625 C 113.53125 83.036981 113.74463 81.471225 114.125 79.96875 C 113.96712 79.964167 113.81527 79.9375 113.65625 79.9375 z M 207.375 93.625 C 206.90471 93.625 206.44965 93.678572 206 93.75 C 206.02476 94.147511 206.03125 94.533755 206.03125 94.9375 C 206.03125 100.02057 204.02565 104.63412 200.78125 108.0625 C 202.37738 109.91862 204.72187 111.09375 207.375 111.09375 C 212.20769 111.09375 216.125 107.20769 216.125 102.375 C 216.125 97.542308 212.20769 93.625 207.375 93.625 z M 131.53125 94.5625 C 126.69881 94.5625 122.8125 98.448806 122.8125 103.28125 C 122.8125 108.11369 126.69881 112.03125 131.53125 112.03125 C 135.23538 112.03125 138.37946 109.71993 139.65625 106.46875 C 136.54083 103.29573 134.30182 99.247768 133.3125 94.75 C 132.73357 94.630281 132.14596 94.5625 131.53125 94.5625 z M 227.375 101.90625 L 227.375 119.1875 L 218.21875 119.1875 C 212.23332 119.1875 207.375 124.07701 207.375 130.0625 C 207.375 136.04708 212.23332 140.90625 218.21875 140.90625 L 220.875 140.90625 L 221.78125 140.90625 C 223.53715 140.90625 225.29053 140.05346 226.6875 138.75 C 228.08447 137.44654 229.15068 135.64094 229.1875 133.625 C 229.2503 130.1648 229.1875 120.09375 229.1875 120.09375 L 229.1875 119.65625 L 229.1875 101.90625 L 227.375 101.90625 z M 143.65625 109.71875 L 143.65625 133.625 C 143.65625 137.64282 146.9509 140.90625 150.96875 140.90625 L 150.96875 139.09375 C 147.92856 139.09375 145.46875 136.66518 145.46875 133.625 L 145.46875 110.84375 C 144.83775 110.50457 144.25208 110.11089 143.65625 109.71875 z M 125.53125 111.9375 C 122.32097 115.00063 120.3125 119.31345 120.3125 124.09375 C 120.3125 133.36896 127.85039 140.90625 137.125 140.90625 L 137.125 139.09375 C 128.82821 139.09375 122.125 132.39094 122.125 124.09375 C 122.125 119.63107 124.07296 115.62037 127.15625 112.875 C 126.57996 112.60953 126.04617 112.29857 125.53125 111.9375 z M 104.1875 119.125 C 98.202067 119.125 93.34375 123.98326 93.34375 129.96875 L 93.34375 140 L 95.15625 140 L 95.15625 129.96875 C 95.15625 124.96124 99.180065 120.90625 104.1875 120.90625 C 109.19592 120.90625 113.25 124.96124 113.25 129.96875 L 113.25 140 L 115.0625 140 L 115.0625 129.96875 C 115.0625 123.98326 110.17376 119.125 104.1875 119.125 z M 165.03125 119.1875 C 159.04548 119.1875 154.1875 124.07673 154.1875 130.0625 C 154.1875 136.04828 159.04548 140.9375 165.03125 140.9375 C 171.01703 140.9375 175.90625 136.04828 175.90625 130.0625 C 175.90625 124.07673 171.01703 119.1875 165.03125 119.1875 z M 44.03125 119.21875 C 38.045976 119.21875 33.15625 124.07723 33.15625 130.0625 C 33.15625 136.04778 38.045976 140.90625 44.03125 140.90625 C 50.016523 140.90625 54.875 136.04778 54.875 130.0625 C 54.875 124.07723 50.016523 119.21875 44.03125 119.21875 z M 60.3125 120.03125 L 60.3125 133.625 C 60.3125 137.64298 63.576678 140.90625 67.59375 140.90625 C 70.331694 140.90625 72.747402 139.39243 74 137.15625 C 75.243529 139.39243 77.637589 140.90625 80.375 140.90625 C 84.392851 140.90625 87.6875 137.64298 87.6875 133.625 L 87.6875 120.03125 L 85.875 120.03125 L 85.875 133.625 C 85.875 136.66502 83.415197 139.09375 80.375 139.09375 C 77.334799 139.09375 74.90625 136.66502 74.90625 133.625 L 74.90625 120.03125 L 73.09375 120.03125 L 73.09375 133.625 C 73.09375 136.66518 70.634983 139.09375 67.59375 139.09375 C 64.554582 139.09375 62.125 136.66502 62.125 133.625 L 62.125 120.03125 L 60.3125 120.03125 z M 180.65625 120.03125 L 180.65625 130.0625 C 180.65625 136.04708 185.51457 140.90625 191.5 140.90625 C 197.48544 140.90625 202.375 136.04718 202.375 130.0625 L 202.375 120.03125 L 200.5625 120.03125 L 200.5625 130.0625 C 200.5625 135.06882 196.50744 139.09375 191.5 139.09375 C 186.49257 139.09375 182.46875 135.06892 182.46875 130.0625 L 182.46875 120.03125 L 180.65625 120.03125 z M 165.03125 121 C 170.03909 121 174.09375 125.05467 174.09375 130.0625 C 174.09375 135.07034 170.03909 139.125 165.03125 139.125 C 160.02342 139.125 156 135.07034 156 130.0625 C 156 125.05467 160.02342 121 165.03125 121 z M 218.21875 121 L 227.375 121 C 227.382 122.19758 227.4321 130.44662 227.375 133.59375 C 227.3494 134.99421 226.58126 136.39946 225.46875 137.4375 C 224.35624 138.47554 222.91652 139.09375 221.78125 139.09375 L 218.21875 139.09375 C 213.21132 139.09375 209.1875 135.06892 209.1875 130.0625 C 209.1875 125.05499 213.21132 121 218.21875 121 z M 44.03125 121.03125 C 49.038583 121.03125 53.0625 125.05517 53.0625 130.0625 C 53.0625 135.06984 49.038583 139.09375 44.03125 139.09375 C 39.023917 139.09375 34.96875 135.06984 34.96875 130.0625 C 34.96875 125.05517 39.023917 121.03125 44.03125 121.03125 z "
-   id="circle238" />
-
-
-
-
-
-
-
-
-
-
-</svg>
\ No newline at end of file
diff --git a/core/img/logo-wide.png b/core/img/logo-wide.png
index 702f1d97e5b7bdf6da6a10eea3ebfda32e594be0..b0c90984e44bb4b8244339c62c609749f7db6db5 100644
Binary files a/core/img/logo-wide.png and b/core/img/logo-wide.png differ
diff --git a/core/img/logo-wide.svg b/core/img/logo-wide.svg
index 37fc0007479055e1324f465ee53f01cd6fd31a16..cf8eace5204242c4ddd230f1c268cd5f0dd327a6 100644
--- a/core/img/logo-wide.svg
+++ b/core/img/logo-wide.svg
@@ -19,8 +19,11 @@
    viewBox="0 0 147.33262 32"
    enable-background="new 0 0 595.275 311.111"
    xml:space="preserve"
-   inkscape:version="0.48.2 r9819"
-   sodipodi:docname="logo-wide.svg"><metadata
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="logo-wide.svg"
+   inkscape:export-filename="logo-wide.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90"><metadata
    id="metadata327"><rdf:RDF><cc:Work
        rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
          rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
@@ -260,14 +263,14 @@
    inkscape:pageopacity="0"
    inkscape:pageshadow="2"
    inkscape:window-width="1280"
-   inkscape:window-height="774"
+   inkscape:window-height="773"
    id="namedview323"
-   showgrid="false"
-   inkscape:zoom="4.8179832"
-   inkscape:cx="73.94445"
-   inkscape:cy="21.619195"
+   showgrid="true"
+   inkscape:zoom="2.8284271"
+   inkscape:cx="74.404008"
+   inkscape:cy="18.870615"
    inkscape:window-x="0"
-   inkscape:window-y="26"
+   inkscape:window-y="-1"
    inkscape:window-maximized="1"
    inkscape:current-layer="Layer_1"
    showguides="true"
@@ -275,7 +278,13 @@
    fit-margin-top="0"
    fit-margin-left="0"
    fit-margin-right="0"
-   fit-margin-bottom="0" />
+   fit-margin-bottom="0"><inkscape:grid
+     type="xygrid"
+     id="grid3149"
+     empspacing="4"
+     visible="true"
+     enabled="true"
+     snapvisiblegridlinesonly="true" /></sodipodi:namedview>
 <pattern
    y="565.223"
    width="69"
@@ -748,44 +757,40 @@
 
 
 
-<g
-   id="g4811"
-   transform="matrix(0.49975595,0,0,0.49975595,82.761244,31.693374)"><path
-     inkscape:connector-curvature="0"
-     id="path4576"
-     d="m 43.646673,-38.417697 0,31.7187492 c 0,4.01782 3.29464,7.28125004 7.3125,7.28125004 l 0,-1.81250004 c -3.04019,0 -5.5,-2.42857 -5.5,-5.46875 l 0,-31.7187492 -1.8125,0 z m 83.718747,0 0,17.281249 -9.15625,0 c -5.98544,0 -10.84375,4.88951 -10.84375,10.875 0,5.9845802 4.85831,10.84375024 10.84375,10.84375024 l 2.65625,0 0.90625,0 c 1.75589,0 3.50927,-0.85279 4.90625,-2.15625004 1.39697,-1.30346 2.46318,-3.10906 2.5,-5.125 0.0628,-3.4602002 0,-13.5312502 0,-13.5312502 l 0,-0.4375 0,-17.749999 -1.8125,0 z m -90.249997,5.375 c -9.27468,0 -16.8125,7.537289 -16.8125,16.812499 0,9.2752102 7.53789,16.81250024 16.8125,16.81250024 l 0,-1.81250004 c -8.29679,0 -15,-6.70281 -15,-15.0000002 0,-8.29719 6.70326,-15 15,-15 l 0,-1.812499 z M 4.1779234,-21.198948 c -5.98544,0 -10.84375,4.85826 -10.84375,10.84375 l 0,10.03125024 1.8125,0 0,-10.03125024 c 0,-5.00751 4.02380001,-9.0625 9.03125,-9.0625 5.00842,0 9.0624996,4.05499 9.0624996,9.0625 l 0,10.03125024 1.8125,0 0,-10.03125024 c 0,-5.98549 -4.88875,-10.84375 -10.8749996,-10.84375 z m 60.8437496,0.0625 c -5.98578,0 -10.84375,4.88923 -10.84375,10.875 0,5.9857802 4.85797,10.87500024 10.84375,10.87500024 5.98577,0 10.875,-4.88922004 10.875,-10.87500024 0,-5.98577 -4.88923,-10.875 -10.875,-10.875 z m -121,0.0312 c -0.605,0 -1.20257,0.0608 -1.78125,0.15625 0.13317,0.58261 0.26534,1.17968 0.34375,1.78125 0.4646,-0.0728 0.95217,-0.125 1.4375,-0.125 5.00732,0 9.03125,4.02392 9.03125,9.03125 0,5.0073402 -4.02393,9.0312502 -9.03125,9.0312502 -2.45581,0 -4.71206,-0.95417 -6.34375,-2.53125 -0.39944,0.43386 -0.81248,0.85451 -1.25,1.25 1.96253,1.90787004 4.64884,3.09375004 7.59375,3.09375004 5.98526,0 10.84375,-4.85847004 10.84375,-10.84375024 0,-5.98527 -4.85849,-10.84375 -10.84375,-10.84375 z m 16.28125,0.8125 0,13.5937502 c 0,4.01798 3.26418,7.28125004 7.28125,7.28125004 2.73793,0 5.15364,-1.51382 6.40625,-3.75000004 1.24352,2.23618004 3.63758,3.75000004 6.375,3.75000004 4.01785,0 7.3125,-3.26327004 7.3125,-7.28125004 l 0,-13.5937502 -1.8125,0 0,13.5937502 c 0,3.04002 -2.45981,5.46875 -5.5,5.46875 -3.04021,0 -5.46875,-2.42873 -5.46875,-5.46875 l 0,-13.5937502 -1.8125,0 0,13.5937502 c 0,3.04018 -2.45878,5.46875 -5.5,5.46875 -3.03918,0 -5.46875,-2.42873 -5.46875,-5.46875 l 0,-13.5937502 -1.8125,0 z m 120.34375,0 0,10.03125 c 0,5.9845802 4.85831,10.84375024 10.84375,10.84375024 5.98543,0 10.874997,-4.85907004 10.874997,-10.84375024 l 0,-10.03125 -1.8125,0 0,10.03125 c 0,5.0063202 -4.055067,9.0312502 -9.062497,9.0312502 -5.00743,0 -9.03125,-4.02483 -9.03125,-9.0312502 l 0,-10.03125 -1.8125,0 z m -15.625,0.96875 c 5.00783,0 9.0625,4.05467 9.0625,9.0625 0,5.0078402 -4.05467,9.0625002 -9.0625,9.0625002 -5.00784,0 -9.03125,-4.05466 -9.03125,-9.0625002 0,-5.00783 4.02341,-9.0625 9.03125,-9.0625 z m 53.187497,0 9.15625,0 c 0.007,1.19758 0.0571,9.4466202 0,12.5937502 -0.0256,1.40046 -0.79375,2.80571 -1.90625,3.84375 -1.11251,1.03804 -2.55224,1.65625 -3.6875,1.65625 l -3.5625,0 c -5.00743,0 -9.03125,-4.02483 -9.03125,-9.0312502 0,-5.00751 4.02382,-9.0625 9.03125,-9.0625 z"
-     style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" /><g
-     transform="translate(-263.29083,-71.636453)"
-     id="g4665"><path
-       id="path4645"
-       d="m 130.5,15.593752 c -4.59084,0 -8.28125,3.721655 -8.28125,8.3125 0,1.48638 0.38348,2.890843 1.0625,4.09375 2.77029,-1.562756 5.97306,-2.46875 9.375,-2.46875 0.32831,0 0.64453,0.01333 0.96875,0.03125 -0.0367,-0.465388 -0.0625,-0.931533 -0.0625,-1.40625 0,-2.556994 0.55537,-4.989858 1.53125,-7.1875 -1.31394,-0.881089 -2.88818,-1.375 -4.59375,-1.375 z"
-       style="fill:#ffffff;fill-opacity:1;stroke:none"
-       inkscape:connector-curvature="0" /><path
-       id="path4647"
-       d="m 113.65625,39.937502 c -8.8157,0 -15.968749,7.090554 -15.968749,15.90625 0,8.8157 7.153049,15.96875 15.968749,15.96875 3.35538,0 6.46362,-1.04542 9.03125,-2.8125 -1.06099,-1.64866 -1.6875,-3.61973 -1.6875,-5.71875 0,-1.08945 0.16075,-2.1361 0.46875,-3.125 -4.80686,-3.473851 -7.9375,-9.126885 -7.9375,-15.5 0,-1.619269 0.21338,-3.185025 0.59375,-4.6875 -0.15788,-0.0046 -0.30973,-0.03125 -0.46875,-0.03125 z"
-       style="fill:#ffffff;fill-opacity:1;stroke:none"
-       inkscape:connector-curvature="0" /><path
-       id="path4649"
-       d="m 132.65625,27.343752 c -9.56997,0 -17.3125,7.742526 -17.3125,17.3125 0,5.633641 2.68421,10.620877 6.84375,13.78125 1.75358,-3.382155 5.27556,-5.6875 9.34375,-5.6875 0.49168,0 0.96362,0.05959 1.4375,0.125 -0.14876,-1.08229 -0.21875,-2.189579 -0.21875,-3.3125 0,-5.368909 1.74763,-10.333753 4.71875,-14.34375 -1.77849,-2.225459 -3.05125,-4.899445 -3.59375,-7.8125 -0.40207,-0.02785 -0.80954,-0.0625 -1.21875,-0.0625 z"
-       style="fill:#ffffff;fill-opacity:1;stroke:none"
-       inkscape:connector-curvature="0" /><path
-       id="path4651"
-       d="m 169.8125,21.312502 c -0.33916,0 -0.66608,0.04164 -1,0.0625 0.14444,0.910711 0.25,1.830299 0.25,2.78125 0,1.479932 -0.18822,2.907986 -0.53125,4.28125 4.02188,2.225766 7.36189,5.556058 9.5625,9.59375 2.28254,-1.188296 4.82877,-1.94388 7.53125,-2.125 -0.69648,-8.167989 -7.4633,-14.59375 -15.8125,-14.59375 z"
-       style="fill:#ffffff;fill-opacity:1;stroke:none"
-       inkscape:connector-curvature="0" /><path
-       id="path4653"
-       d="m 151.3125,8.2187518 c -8.81544,0 -15.9375,7.1220542 -15.9375,15.9375002 0,3.633753 1.20998,6.978162 3.25,9.65625 4.42552,-5.122236 10.95719,-8.375 18.25,-8.375 3.56797,0 6.95137,0.794519 10,2.1875 0.24683,-1.116262 0.375,-2.277207 0.375,-3.46875 0,-8.815446 -7.12205,-15.9375002 -15.9375,-15.9375002 z"
-       style="fill:#ffffff;fill-opacity:1;stroke:none"
-       inkscape:connector-curvature="0" /><path
-       id="path4657"
-       d="m 186.90625,37.656252 c -2.90588,0 -5.62795,0.741879 -8.03125,2 1.36467,3.02284 2.125,6.376782 2.125,9.90625 0,6.608637 -2.65704,12.60935 -6.96875,16.96875 3.16753,3.51662 7.76324,5.71875 12.875,5.71875 9.56997,0 17.3125,-7.74253 17.3125,-17.3125 0,-9.569974 -7.74253,-17.28125 -17.3125,-17.28125 z"
-       style="fill:#ffffff;fill-opacity:1;stroke:none"
-       inkscape:connector-curvature="0" /><path
-       id="path4659"
-       d="m 131.53125,54.562502 c -4.83244,0 -8.71875,3.886306 -8.71875,8.71875 0,4.83244 3.88631,8.75 8.71875,8.75 3.70413,0 6.84821,-2.31132 8.125,-5.5625 -3.11542,-3.17302 -5.35443,-7.220982 -6.34375,-11.71875 -0.57893,-0.119719 -1.16654,-0.1875 -1.78125,-0.1875 z"
-       style="fill:#ffffff;fill-opacity:1;stroke:none"
-       inkscape:connector-curvature="0" /><path
-       id="path4661"
-       d="m 156.875,27.250002 c -12.33545,0 -22.3125,9.976221 -22.3125,22.3125 0,12.33495 9.97654,22.3125 22.3125,22.3125 12.33596,0 22.3125,-9.97757 22.3125,-22.3125 0,-12.336257 -9.97705,-22.3125 -22.3125,-22.3125 z"
-       style="fill:#ffffff;fill-opacity:1;stroke:none"
-       inkscape:connector-curvature="0" /></g></g></svg>
\ No newline at end of file
+<path
+   style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+   d="M 104 13 L 104 28.34375 C 104 30.351679 105.7108 32 107.71875 32 L 107.71875 31 C 106.1994 31 105.00005 29.863098 105 28.34375 L 105 13 L 104 13 z M 146 13 L 146 21 L 141.46875 21 C 138.47749 21 136 23.571216 136 26.5625 C 136 29.55333 138.47761 32.027578 141.46875 32 L 143.25 32 C 144.12752 32 144.98935 31.557662 145.6875 30.90625 C 146.38564 30.254838 146.9816 29.351228 147 28.34375 L 147 13 L 146 13 z M 101.5 15 C 96.864928 15 93 18.864659 93 23.5 C 93 28.135341 96.864963 32 101.5 32 L 101.5 31 C 97.353634 31 94 27.64657 94 23.5 C 94 19.35343 97.353659 16 101.5 16 L 101.5 15 z M 55.5 21 C 54.894287 21 54.299303 21.092367 53.75 21.28125 C 53.820997 21.606183 53.900137 21.944789 53.9375 22.28125 C 54.426854 22.100793 54.944546 22 55.5 22 C 58.00269 22 60 23.997307 60 26.5 C 60 29.002698 58.00269 31 55.5 31 C 54.05604 31 52.789695 30.324452 51.96875 29.28125 C 51.770697 29.536182 51.534658 29.766418 51.3125 30 C 52.329062 31.207716 53.832794 32 55.5 32 C 58.49143 32 61 29.49143 61 26.5 C 61 23.508576 58.49143 21 55.5 21 z M 63 21 L 63 28.34375 C 63.000084 30.351759 64.992445 32 67 32 C 68.368297 32 69.905251 31.305044 70.53125 30.1875 C 71.152707 31.305044 72.631958 32 74 32 C 76.007944 32 78 30.351759 78 28.34375 L 78 21 L 77 21 L 77 28.34375 C 77.000063 29.863018 75.519353 31 74 31 C 72.480637 31 71.000069 29.997995 71 28.34375 L 71 21 L 70 21 L 70 28.34375 C 70.000063 29.863098 68.519868 31 67 31 C 65.481152 31 64.000063 29.863018 64 28.34375 L 64 21 L 63 21 z M 85.53125 21 C 82.53999 21 80 23.539966 80 26.53125 L 80 32 L 81 32 L 81 26.53125 C 81 24.028717 83.028747 22 85.53125 22 C 88.034238 22 90 24.028717 90 26.53125 L 90 32 L 91 32 L 91 26.53125 C 91 23.539966 88.522913 21 85.53125 21 z M 115.5 21 C 112.50857 21 110 23.508576 110 26.5 C 110 29.491429 112.50857 32 115.5 32 C 118.49142 32 121 29.491429 121 26.5 C 121 23.508576 118.49142 21 115.5 21 z M 123 21 L 123 26.5625 C 123 29.553329 125.47749 32 128.46875 32 C 131.46 32 134 29.553379 134 26.5625 L 134 21 L 133 21 L 133 26.5625 C 133 29.064438 130.97124 31 128.46875 31 C 125.96625 31 124 29.064488 124 26.5625 L 124 21 L 123 21 z M 115.5 22 C 118.00269 22 120 23.997307 120 26.5 C 120 29.002698 118.00269 31 115.5 31 C 112.9973 31 111 29.002698 111 26.5 C 111 23.997307 112.9973 22 115.5 22 z M 141.46875 22 L 146 22 L 146 28.34375 C 145.9872 29.043638 145.64973 29.731233 145.09375 30.25 C 144.53777 30.768767 143.81736 31 143.25 31 L 141.46875 31 C 138.96626 31 137 29.064488 137 26.5625 C 137 24.059967 138.96626 22 141.46875 22 z "
+   transform="translate(-3.1713867e-6,0)"
+   id="path4576" /><path
+   id="path4645"
+   d="m 16.398236,3.6857007 c -2.294299,0 -4.138603,1.8599193 -4.138603,4.1542214 0,0.7428272 0.191646,1.444716 0.53099,2.0458759 1.384469,-0.7809966 2.985072,-1.2337725 4.685212,-1.2337725 0.164075,0 0.322108,0.00666 0.484139,0.015617 -0.01834,-0.2325805 -0.03123,-0.4655392 -0.03123,-0.7027818 0,-1.277873 0.27755,-2.4937113 0.765251,-3.5919959 C 18.037341,3.9325357 17.250605,3.6857007 16.398236,3.6857007 z"
+   style="fill:#ffffff;fill-opacity:1;stroke:none"
+   inkscape:connector-curvature="0" /><path
+   id="path4647"
+   d="m 7.9804722,15.851635 c -4.4056985,0 -7.9804773346191,3.543546 -7.9804773346191,7.949243 0,4.405698 3.5747788346191,7.980478 7.9804773346191,7.980478 1.6768711,0 3.2302328,-0.522455 4.5134208,-1.405564 -0.530236,-0.823928 -0.843338,-1.808982 -0.843338,-2.857979 0,-0.54446 0.08034,-1.067529 0.234261,-1.561738 -2.4022573,-1.736077 -3.9668133,-4.561215 -3.9668133,-7.746217 0,-0.809239 0.1066379,-1.591735 0.2967301,-2.342606 -0.078902,-0.0023 -0.1547894,-0.01562 -0.2342606,-0.01562 z"
+   style="fill:#ffffff;fill-opacity:1;stroke:none"
+   inkscape:connector-curvature="0" /><path
+   id="path4649"
+   d="m 17.475835,9.5578332 c -4.782649,0 -8.6520246,3.8693738 -8.6520246,8.6520248 0,2.815446 1.3414496,5.307847 3.4202046,6.887262 0.876362,-1.690252 2.636493,-2.842362 4.669595,-2.842362 0.24572,0 0.481575,0.02978 0.718399,0.06247 -0.07434,-0.540881 -0.109322,-1.094255 -0.109322,-1.655441 0,-2.683145 0.873389,-5.164355 2.358224,-7.168375 C 18.9921,12.381225 18.35603,11.044884 18.084913,9.5890679 17.883976,9.5751497 17.68034,9.5578332 17.475835,9.5578332 z"
+   style="fill:#ffffff;fill-opacity:1;stroke:none"
+   inkscape:connector-curvature="0" /><path
+   id="path4651"
+   d="m 36.044892,6.5436801 c -0.169497,0 -0.332877,0.02081 -0.499756,0.031235 0.07218,0.4551333 0.124939,0.9147028 0.124939,1.3899463 0,0.7396048 -0.09406,1.4532833 -0.265495,2.1395799 2.009958,1.11234 3.679148,2.776673 4.778916,4.794534 1.140713,-0.593858 2.413207,-0.971466 3.763787,-1.061982 -0.34807,-4.0820006 -3.729828,-7.2933129 -7.902391,-7.2933129 z"
+   style="fill:#ffffff;fill-opacity:1;stroke:none"
+   inkscape:connector-curvature="0" /><path
+   id="path4653"
+   d="m 26.799407,5.1362321e-7 c -4.405568,0 -7.96486,3.55928898637679 -7.96486,7.96486058637679 0,1.8159896 0.604694,3.4873779 1.624207,4.8257679 2.21168,-2.559867 5.47592,-4.1854556 9.120546,-4.1854556 1.783114,0 3.473988,0.3970656 4.997559,1.0932161 C 34.700214,9.1405309 34.764268,8.5603418 34.764268,7.9648611 34.764268,3.5592895 31.204981,5.1362321e-7 26.799407,5.1362321e-7 z"
+   style="fill:#ffffff;fill-opacity:1;stroke:none"
+   inkscape:connector-curvature="0" /><path
+   id="path4657"
+   d="m 44.587596,14.711566 c -1.452231,0 -2.812602,0.370759 -4.013665,0.999512 0.682002,1.510683 1.061981,3.186835 1.061981,4.950708 0,3.302705 -1.327872,6.301597 -3.482674,8.480233 1.582992,1.757452 3.879725,2.85798 6.434358,2.85798 4.782649,0 8.652024,-3.869376 8.652024,-8.652025 0,-4.782652 -3.869375,-8.636408 -8.652024,-8.636408 z"
+   style="fill:#ffffff;fill-opacity:1;stroke:none"
+   inkscape:connector-curvature="0" /><path
+   id="path4659"
+   d="m 16.91361,23.160565 c -2.415041,0 -4.357247,1.942205 -4.357247,4.357248 0,2.41504 1.942206,4.372864 4.357247,4.372864 1.851161,0 3.422433,-1.155096 4.060517,-2.779892 -1.55695,-1.585736 -2.675908,-3.608729 -3.170327,-5.856515 -0.289324,-0.05983 -0.582985,-0.09371 -0.89019,-0.09371 z"
+   style="fill:#ffffff;fill-opacity:1;stroke:none"
+   inkscape:connector-curvature="0" /><path
+   id="path4661"
+   d="m 29.5793,9.510981 c -6.164715,0 -11.150805,4.985676 -11.150805,11.150805 0,6.164464 4.985835,11.150804 11.150805,11.150804 6.164969,0 11.150804,-4.98635 11.150804,-11.150804 0,-6.165118 -4.98609,-11.150805 -11.150804,-11.150805 z"
+   style="fill:#ffffff;fill-opacity:1;stroke:none"
+   inkscape:connector-curvature="0" /></svg>
\ No newline at end of file
diff --git a/core/js/config.php b/core/js/config.php
index 9069175ed6fa58d542ee165fbb4fe3dbad42ef9e..0aaa44822876b339d4b47c73ad8f6145069b6d0e 100644
--- a/core/js/config.php
+++ b/core/js/config.php
@@ -29,8 +29,33 @@ $array = array(
 	"oc_current_user" =>  "\"".OC_User::getUser(). "\"",
 	"oc_requesttoken" =>  "\"".OC_Util::callRegister(). "\"",
 	"datepickerFormatDate" => json_encode($l->l('jsdate', 'jsdate')),
-	"dayNames" =>  json_encode(array((string)$l->t('Sunday'), (string)$l->t('Monday'), (string)$l->t('Tuesday'), (string)$l->t('Wednesday'), (string)$l->t('Thursday'), (string)$l->t('Friday'), (string)$l->t('Saturday'))),
-	"monthNames" => json_encode(array((string)$l->t('January'), (string)$l->t('February'), (string)$l->t('March'), (string)$l->t('April'), (string)$l->t('May'), (string)$l->t('June'), (string)$l->t('July'), (string)$l->t('August'), (string)$l->t('September'), (string)$l->t('October'), (string)$l->t('November'), (string)$l->t('December'))),
+	"dayNames" =>  json_encode(
+		array(
+			(string)$l->t('Sunday'),
+			(string)$l->t('Monday'),
+			(string)$l->t('Tuesday'),
+			(string)$l->t('Wednesday'),
+			(string)$l->t('Thursday'),
+			(string)$l->t('Friday'),
+			(string)$l->t('Saturday')
+		)
+	),
+	"monthNames" => json_encode(
+		array(
+			(string)$l->t('January'),
+			(string)$l->t('February'),
+			(string)$l->t('March'),
+			(string)$l->t('April'),
+			(string)$l->t('May'),
+			(string)$l->t('June'),
+			(string)$l->t('July'),
+			(string)$l->t('August'),
+			(string)$l->t('September'),
+			(string)$l->t('October'),
+			(string)$l->t('November'),
+			(string)$l->t('December')
+		)
+	),
 	"firstDay" => json_encode($l->l('firstday', 'firstday')) ,
 	);
 
@@ -38,4 +63,3 @@ $array = array(
 foreach ($array as  $setting => $value) {
 	echo("var ". $setting ."=".$value.";\n");
 }
-?>
\ No newline at end of file
diff --git a/core/js/js.js b/core/js/js.js
index 6d5d65403fb104103c882a4ee11d081bfb34e2ec..1a94215c27bf71b4ffeb598e0911ca40b8626fc3 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -1,7 +1,7 @@
 /**
  * Disable console output unless DEBUG mode is enabled.
  * Add 
- *     define('DEBUG', true);
+ *	 define('DEBUG', true);
  * To the end of config/config.php to enable debug mode.
  * The undefined checks fix the broken ie8 console
  */
@@ -44,13 +44,13 @@ function t(app,text, vars){
 		}
 	}
 	var _build = function (text, vars) {
-        return text.replace(/{([^{}]*)}/g,
-            function (a, b) {
-                var r = vars[b];
-                return typeof r === 'string' || typeof r === 'number' ? r : a;
-            }
-        );
-    };
+		return text.replace(/{([^{}]*)}/g,
+			function (a, b) {
+				var r = vars[b];
+				return typeof r === 'string' || typeof r === 'number' ? r : a;
+			}
+		);
+	};
 	if( typeof( t.cache[app][text] ) !== 'undefined' ){
 		if(typeof vars === 'object') {
 			return _build(t.cache[app][text], vars);
@@ -274,7 +274,7 @@ var OC={
 		var popup = $('#appsettings_popup');
 		if(popup.length == 0) {
 			$('body').prepend('<div class="popup hidden" id="appsettings_popup"></div>');
-            popup = $('#appsettings_popup');
+			popup = $('#appsettings_popup');
 			popup.addClass(settings.hasClass('topright') ? 'topright' : 'bottomleft');
 		}
 		if(popup.is(':visible')) {
@@ -317,35 +317,44 @@ OC.addStyle.loaded=[];
 OC.addScript.loaded=[];
 
 OC.Notification={
-    getDefaultNotificationFunction: null,
-    setDefault: function(callback) {
-        OC.Notification.getDefaultNotificationFunction = callback;
-    },
-    hide: function(callback) {
-        $("#notification").text('');
-        $('#notification').fadeOut('400', function(){
-            if (OC.Notification.isHidden()) {
-                if (OC.Notification.getDefaultNotificationFunction) {
-                    OC.Notification.getDefaultNotificationFunction.call();
-                }
-            }
-            if (callback) {
-                callback.call();
-            }
-        });
-    },
-    showHtml: function(html) {
-        var notification = $('#notification');
-        notification.hide();
-        notification.html(html);
-        notification.fadeIn().css("display","inline");
-    },
-    show: function(text) {
-        var notification = $('#notification');
-        notification.hide();
-        notification.text(text);
-        notification.fadeIn().css("display","inline");
-    },
+	queuedNotifications: [],
+	getDefaultNotificationFunction: null,
+	setDefault: function(callback) {
+		OC.Notification.getDefaultNotificationFunction = callback;
+	},
+	hide: function(callback) {
+		$('#notification').fadeOut('400', function(){
+			if (OC.Notification.isHidden()) {
+				if (OC.Notification.getDefaultNotificationFunction) {
+					OC.Notification.getDefaultNotificationFunction.call();
+				}
+			}
+			if (callback) {
+				callback.call();
+			}
+			$('#notification').empty();
+			if(OC.Notification.queuedNotifications.length > 0){
+				OC.Notification.showHtml(OC.Notification.queuedNotifications[0]);
+				OC.Notification.queuedNotifications.shift();
+			}
+		});
+	},
+	showHtml: function(html) {
+		if(($('#notification').filter('span.undo').length == 1) || OC.Notification.isHidden()){
+			$('#notification').html(html);
+			$('#notification').fadeIn().css("display","inline");
+		}else{
+			OC.Notification.queuedNotifications.push(html);
+		}
+	},
+	show: function(text) {
+		if(($('#notification').filter('span.undo').length == 1) || OC.Notification.isHidden()){
+			$('#notification').html(text);
+			$('#notification').fadeIn().css("display","inline");
+		}else{
+			OC.Notification.queuedNotifications.push($(text).html());
+		}
+	},
 	isHidden: function() {
 		return ($("#notification").text() === '');
 	}
@@ -548,7 +557,7 @@ function replaceSVG(){
  */
 function object(o) {
 	function F() {}
-    F.prototype = o;
+	F.prototype = o;
 	return new F();
 }
 
@@ -584,6 +593,7 @@ function fillWindow(selector) {
 }
 
 $(document).ready(function(){
+	sessionHeartBeat();
 
 	if(!SVGSupport()){ //replace all svg images with png images for browser that dont support svg
 		replaceSVG();
@@ -669,7 +679,7 @@ $(document).ready(function(){
 	$('#settings #expanddiv').click(function(event){
 		event.stopPropagation();
 	});
-	$(window).click(function(){//hide the settings menu when clicking outside it
+	$(document).click(function(){//hide the settings menu when clicking outside it
 		$('#settings #expanddiv').slideUp(200);
 	});
 
@@ -815,3 +825,17 @@ OC.set=function(name, value) {
 	}
 	context[tail]=value;
 };
+
+
+/**
+ * Calls the server periodically every 15 mins to ensure that session doesnt
+ * time out
+ */
+function sessionHeartBeat(){
+	OC.Router.registerLoadedCallback(function(){
+		var url = OC.Router.generate('heartbeat');
+		setInterval(function(){
+			$.post(url);
+		}, 900000);
+	});
+}
diff --git a/core/js/multiselect.js b/core/js/multiselect.js
index 623c6e0f7e1c02a71a781bdf1341b426f5050f23..bc4223feb64735cffe364eb953b17d076e544cae 100644
--- a/core/js/multiselect.js
+++ b/core/js/multiselect.js
@@ -266,8 +266,9 @@
 			}
 			list.append(list.find('li.creator'));
 			var pos=button.position();
-			if($(document).height() > (button.offset().top+button.outerHeight() + list.children().length * button.height())
-				|| $(document).height()/2 > pos.top
+			if(($(document).height() > (button.offset().top+button.outerHeight() + list.children().length * button.height())
+				&& $(document).height() - button.offset().top > (button.offset().top+button.outerHeight() + list.children().length * button.height()))
+				|| $(document).height()/2 > button.offset().top
 			) {
 				list.css({
 					top:pos.top+button.outerHeight()-5,
diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js
index 28dec97fd307a3d77095e792d2015d6428491245..cfbca2833c7a64aed507ada1cf1472b55acb81e5 100644
--- a/core/js/oc-dialogs.js
+++ b/core/js/oc-dialogs.js
@@ -129,13 +129,13 @@ var OCdialogs = {
 					var p;
 					if ($(c_id).data('multiselect') == true) {
 						p = [];
-						$(c_id+' .filepicker_element_selected #filename').each(function(i, elem) {
+						$(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()
+						p = p+'/'+$(c_id+' .filepicker_element_selected .filename').text()
 					}
 					callback(p);
 					$(c_id).dialog('close');
@@ -216,13 +216,15 @@ var OCdialogs = {
 		}
 	},
 	fillFilePicker:function(r, dialog_content_id) {
-		var entry_template = '<div onclick="javascript:OC.dialogs.handlePickerClick(this, \'*ENTRYNAME*\',\''+dialog_content_id+'\')" data="*ENTRYTYPE*"><img src="*MIMETYPEICON*" style="margin-right:1em;"><span id="filename">*NAME*</span><div style="float:right;margin-right:1em;">*LASTMODDATE*</div></div>';
+		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);
 		});
 		
-		$(dialog_content_id + ' #filelist').html(names);
+		$(dialog_content_id + ' #filelist').html(names).on('click', '[data="file"]', function() {
+			OC.dialogs.handlePickerClick(this, $(this).data('entryname'), $(this).data('dcid'));
+		});
 		$(dialog_content_id + ' .filepicker_loader').css('visibility', 'hidden');
 	},
 	handleTreeListSelect:function(event) {
diff --git a/core/js/router.js b/core/js/router.js
index 3562785b3420ef01963ff39b74eccb20f5caa57c..b94721673a73c879156bf3f45b9e4d27524b5738 100644
--- a/core/js/router.js
+++ b/core/js/router.js
@@ -1,11 +1,11 @@
-OC.router_base_url = OC.webroot + '/index.php/',
+OC.router_base_url = OC.webroot + '/index.php',
 OC.Router = {
 	// register your ajax requests to load after the loading of the routes
 	// has finished. otherwise you face problems with race conditions
 	registerLoadedCallback: function(callback){
 		this.routes_request.done(callback);
 	},
-	routes_request: $.ajax(OC.router_base_url + 'core/routes.json', {
+	routes_request: $.ajax(OC.router_base_url + '/core/routes.json', {
 		dataType: 'json',
 		success: function(jsondata) {
 			if (jsondata.status === 'success') {
diff --git a/core/js/setup.js b/core/js/setup.js
index 2656cac2f45be916b0be82d31c5e28208dea08b1..76812b2997969e28dc8bc3725b56ab2aaf7a9138 100644
--- a/core/js/setup.js
+++ b/core/js/setup.js
@@ -5,6 +5,7 @@ $(document).ready(function() {
 		mysql:!!$('#hasMySQL').val(),
 		postgresql:!!$('#hasPostgreSQL').val(),
 		oracle:!!$('#hasOracle').val(),
+		mssql:!!$('#hasMSSQL').val()
 	};
 	
 	$('#selectDbType').buttonset();
@@ -41,6 +42,12 @@ $(document).ready(function() {
 		$('#dbhost').show(250);
 		$('#dbhostlabel').show(250);
 	});
+    
+	$('#mssql').click(function() {
+		$('#use_other_db').slideDown(250);
+		$('#dbhost').show(250);
+		$('#dbhostlabel').show(250);
+	});
 
 	$('input[checked]').trigger('click');
 
diff --git a/core/js/share.js b/core/js/share.js
index 6d1c3954044c03f2dfc47ed26967195d0c0e7595..34f24da4df746eeb788a104936888776210a2c96 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -24,9 +24,9 @@ OC.Share={
 						var file = $('tr').filterAttr('data-file', OC.basename(item));
 						if (file.length > 0) {
 							var action = $(file).find('.fileactions .action').filterAttr('data-action', 'Share');
-							action.find('img').attr('src', image);
+							var img = action.find('img').attr('src', image);
 							action.addClass('permanent');
-							action.html(t('core', 'Shared'));
+							action.html(' '+t('core', 'Shared')).prepend(img);
 						}
 						var dir = $('#dir').val();
 						if (dir.length > 1) {
@@ -40,7 +40,7 @@ OC.Share={
 									if (img.attr('src') != OC.imagePath('core', 'actions/public')) {
 										img.attr('src', image);
 										action.addClass('permanent');
-										action.html(t('core', 'Shared'));
+										action.html(' '+t('core', 'Shared')).prepend(img);
 									}
 								}
 								last = path;
@@ -84,13 +84,13 @@ OC.Share={
 			$('a.share[data-item="'+itemSource+'"]').css('background', 'url('+image+') no-repeat center');
 		} else {
 			var action = $(file).find('.fileactions .action').filterAttr('data-action', 'Share');
-			action.find('img').attr('src', image);
+			var img = action.find('img').attr('src', image);
 			if (shares) {
 				action.addClass('permanent');
-				action.html(t('core', 'Shared'));
+				action.html(' '+t('core', 'Shared')).prepend(img);
 			} else {
 				action.removeClass('permanent');
-				action.html(t('core', 'Share'));
+				action.html(' '+t('core', 'Share')).prepend(img);
 			}
 		}
 		if (shares) {
@@ -186,8 +186,8 @@ OC.Share={
 				html += '</div>';
 				html += '</div>';
 				html += '<form id="emailPrivateLink" >';
-				html += '<input id="email" style="display:none; width:65%;" value="" placeholder="'+t('core', 'Email link to person')+'" type="text" />';
-				html += '<input id="emailButton" style="display:none; float:right;" type="submit" value="'+t('core', 'Send')+'" />';
+				html += '<input id="email" style="display:none; width:62%;" value="" placeholder="'+t('core', 'Email link to person')+'" type="text" />';
+				html += '<input id="emailButton" style="display:none;" type="submit" value="'+t('core', 'Send')+'" />';
 				html += '</form>';
 			}
 			html += '<div id="expiration">';
@@ -213,7 +213,7 @@ OC.Share={
 					}
 				});
 			}
-			$('#shareWith').autocomplete({minLength: 2, source: function(search, response) {
+			$('#shareWith').autocomplete({minLength: 1, source: function(search, response) {
 	// 			if (cache[search.term]) {
 	// 				response(cache[search.term]);
 	// 			} else {
@@ -309,12 +309,12 @@ OC.Share={
 			if (permissions & OC.PERMISSION_SHARE) {
 				shareChecked = 'checked="checked"';
 			}
-			var html = '<li style="clear: both;" data-share-type="'+shareType+'" data-share-with="'+shareWith+'" title="' + shareWith + '">';
+			var html = '<li style="clear: both;" data-share-type="'+escapeHTML(shareType)+'" data-share-with="'+escapeHTML(shareWith)+'" title="' + escapeHTML(shareWith) + '">';
 			html += '<a href="#" class="unshare" style="display:none;"><img class="svg" alt="'+t('core', 'Unshare')+'" src="'+OC.imagePath('core', 'actions/delete')+'"/></a>';
 			if(shareWith.length > 14){
-				html += shareWithDisplayName.substr(0,11) + '...';
+				html += escapeHTML(shareWithDisplayName.substr(0,11) + '...');
 			}else{
-				html += shareWithDisplayName;
+				html += escapeHTML(shareWithDisplayName);
 			}
 			if (possiblePermissions & OC.PERMISSION_CREATE || possiblePermissions & OC.PERMISSION_UPDATE || possiblePermissions & OC.PERMISSION_DELETE) {
 				if (editChecked == '') {
diff --git a/core/l10n/be.php b/core/l10n/be.php
new file mode 100644
index 0000000000000000000000000000000000000000..ecf16e5d6a7efc9404a6c8cf94ed9e85f4ce5dda
--- /dev/null
+++ b/core/l10n/be.php
@@ -0,0 +1,6 @@
+<?php $TRANSLATIONS = array(
+"Advanced" => "Дасведчаны",
+"Finish setup" => "Завяршыць ўстаноўку.",
+"prev" => "Папярэдняя",
+"next" => "Далей"
+);
diff --git a/core/l10n/ca.php b/core/l10n/ca.php
index d260241c4d6fab767d789b92ecd48c0f09f367db..3837ceb0f9233b129afe1baad37041e5b668a3eb 100644
--- a/core/l10n/ca.php
+++ b/core/l10n/ca.php
@@ -85,7 +85,7 @@
 "Sending ..." => "Enviant...",
 "Email sent" => "El correu electrónic s'ha enviat",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "L'actualització ha estat incorrecte. Comuniqueu aquest error a <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">la comunitat ownCloud</a>.",
-"The update was successful. Redirecting you to ownCloud now." => "L'actualització ha estat correcte. Ara sou redireccionat a ownCloud.",
+"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}",
 "You will receive a link to reset your password via Email." => "Rebreu un enllaç al correu electrònic per reiniciar la contrasenya.",
diff --git a/core/l10n/de.php b/core/l10n/de.php
index c18cf7259c5c2c51d128fe4eee186340d31eb238..e60f061ff3c120dce602053fd7ced913edbe272a 100644
--- a/core/l10n/de.php
+++ b/core/l10n/de.php
@@ -1,8 +1,8 @@
 <?php $TRANSLATIONS = array(
-"User %s shared a file with you" => "Der Nutzer %s hat eine Datei für Dich freigegeben",
-"User %s shared a folder with you" => "%s hat ein Verzeichnis für Dich freigegeben",
-"User %s shared the file \"%s\" with you. It is available for download here: %s" => "%s hat eine Datei \"%s\" für Dich freigegeben. Sie ist zum Download hier ferfügbar: %s",
-"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "%s hat eine Verzeichnis \"%s\" für Dich freigegeben. Es ist zum Download hier ferfügbar: %s",
+"User %s shared a file with you" => "Der Nutzer %s hat eine Datei mit Dir geteilt",
+"User %s shared a folder with you" => "%s hat ein Verzeichnis mit Dir geteilt",
+"User %s shared the file \"%s\" with you. It is available for download here: %s" => "%s hat die Datei \"%s\" mit Dir geteilt. Sie ist hier zum Download verfügbar: %s",
+"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "%s hat den Ordner \"%s\" mit Dir geteilt. Er ist hier zum Download verfügbar: %s",
 "Category type not provided." => "Kategorie nicht angegeben.",
 "No category to add?" => "Keine Kategorie hinzuzufügen?",
 "This category already exists: %s" => "Die Kategorie '%s' existiert bereits.",
@@ -53,22 +53,22 @@
 "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.",
-"Shared" => "Freigegeben",
-"Share" => "Freigeben",
-"Error while sharing" => "Fehler beim Freigeben",
-"Error while unsharing" => "Fehler beim Aufheben der Freigabe",
+"Shared" => "Geteilt",
+"Share" => "Teilen",
+"Error while sharing" => "Fehler beim Teilen",
+"Error while unsharing" => "Fehler beim Aufheben der Teilung",
 "Error while changing permissions" => "Fehler beim Ändern der Rechte",
-"Shared with you and the group {group} by {owner}" => "{owner} hat dies für Dich und die Gruppe {group} freigegeben",
-"Shared with you by {owner}" => "{owner} hat dies für Dich freigegeben",
-"Share with" => "Freigeben für",
-"Share with link" => "Über einen Link freigeben",
+"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",
+"Share with" => "Teilen mit",
+"Share with link" => "Über einen Link freigegeben",
 "Password protect" => "Passwortschutz",
 "Password" => "Passwort",
 "Email link to person" => "Link per E-Mail verschicken",
 "Send" => "Senden",
 "Set expiration date" => "Setze ein Ablaufdatum",
 "Expiration date" => "Ablaufdatum",
-"Share via email:" => "Über eine E-Mail freigeben:",
+"Share via email:" => "Über eine E-Mail teilen:",
 "No people found" => "Niemand gefunden",
 "Resharing is not allowed" => "Weiterverteilen ist nicht erlaubt",
 "Shared in {item} with {user}" => "Für {user} in {item} freigegeben",
@@ -78,7 +78,7 @@
 "create" => "erstellen",
 "update" => "aktualisieren",
 "delete" => "löschen",
-"share" => "freigeben",
+"share" => "teilen",
 "Password protected" => "Durch ein Passwort geschützt",
 "Error unsetting expiration date" => "Fehler beim entfernen des Ablaufdatums",
 "Error setting expiration date" => "Fehler beim Setzen des Ablaufdatums",
@@ -109,7 +109,7 @@
 "Security Warning" => "Sicherheitswarnung",
 "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 Daten-Verzeichnis und deine Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert.",
+"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.",
 "Create an <strong>admin account</strong>" => "<strong>Administrator-Konto</strong> anlegen",
 "Advanced" => "Fortgeschritten",
diff --git a/core/l10n/de_DE.php b/core/l10n/de_DE.php
index b099510d0d9eed511ae9ba5adf0c52e9a827e791..9a975ddcb8700f62ad9745bca86c1cd8fd3a09cc 100644
--- a/core/l10n/de_DE.php
+++ b/core/l10n/de_DE.php
@@ -1,8 +1,8 @@
 <?php $TRANSLATIONS = array(
-"User %s shared a file with you" => "Der Nutzer %s hat eine Datei für Sie freigegeben",
-"User %s shared a folder with you" => "%s hat ein Verzeichnis für Sie freigegeben",
-"User %s shared the file \"%s\" with you. It is available for download here: %s" => "%s hat eine Datei \"%s\" für Sie freigegeben. Sie ist zum Download hier ferfügbar: %s",
-"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "%s hat eine Verzeichnis \"%s\" für Sie freigegeben. Es ist zum Download hier ferfügbar: %s",
+"User %s shared a file with you" => "Der Nutzer %s hat eine Datei mit Ihnen geteilt",
+"User %s shared a folder with you" => "%s hat einen Ordner mit Ihnen geteilt",
+"User %s shared the file \"%s\" with you. It is available for download here: %s" => "%s hat die Datei \"%s\" mit Ihnen geteilt. Sie ist hier zum Download verfügbar: %s",
+"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "%s hat den Ordner \"%s\" mit Ihnen geteilt. Er ist hier zum Download verfügbar: %s",
 "Category type not provided." => "Kategorie nicht angegeben.",
 "No category to add?" => "Keine Kategorie hinzuzufügen?",
 "This category already exists: %s" => "Die Kategorie '%s' existiert bereits.",
@@ -53,22 +53,22 @@
 "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.",
-"Shared" => "Freigegeben",
-"Share" => "Freigeben",
-"Error while sharing" => "Fehler bei der Freigabe",
-"Error while unsharing" => "Fehler bei der Aufhebung der Freigabe",
+"Shared" => "Geteilt",
+"Share" => "Teilen",
+"Error while sharing" => "Fehler beim Teilen",
+"Error while unsharing" => "Fehler bei der Aufhebung der Teilung",
 "Error while changing permissions" => "Fehler bei der Änderung der Rechte",
-"Shared with you and the group {group} by {owner}" => "Durch {owner} für Sie und die Gruppe {group} freigegeben.",
-"Shared with you by {owner}" => "Durch {owner} für Sie freigegeben.",
-"Share with" => "Freigeben für",
-"Share with link" => "Über einen Link freigeben",
+"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.",
+"Share with" => "Teilen mit",
+"Share with link" => "Über einen Link teilen",
 "Password protect" => "Passwortschutz",
 "Password" => "Passwort",
 "Email link to person" => "Link per E-Mail verschicken",
 "Send" => "Senden",
 "Set expiration date" => "Setze ein Ablaufdatum",
 "Expiration date" => "Ablaufdatum",
-"Share via email:" => "Mittels einer E-Mail freigeben:",
+"Share via email:" => "Mittels einer E-Mail teilen:",
 "No people found" => "Niemand gefunden",
 "Resharing is not allowed" => "Das Weiterverteilen ist nicht erlaubt",
 "Shared in {item} with {user}" => "Freigegeben in {item} von {user}",
@@ -78,13 +78,13 @@
 "create" => "erstellen",
 "update" => "aktualisieren",
 "delete" => "löschen",
-"share" => "freigeben",
+"share" => "teilen",
 "Password protected" => "Durch ein Passwort geschützt",
 "Error unsetting expiration date" => "Fehler beim Entfernen des Ablaufdatums",
 "Error setting expiration date" => "Fehler beim Setzen des Ablaufdatums",
 "Sending ..." => "Sende ...",
 "Email sent" => "Email gesendet",
-"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 Gemeinschaft</a>.",
+"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.",
 "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}",
@@ -109,8 +109,8 @@
 "Security Warning" => "Sicherheitshinweis",
 "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." => "Dein Daten-Verzeichnis 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 wahrscheinlich konfigurieren.",
+"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.",
+"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.",
 "Create an <strong>admin account</strong>" => "<strong>Administrator-Konto</strong> anlegen",
 "Advanced" => "Fortgeschritten",
 "Data folder" => "Datenverzeichnis",
diff --git a/core/l10n/el.php b/core/l10n/el.php
index 54720f5ecb38ca5d28ce537e4c0fe97718008c63..62d12569337314cd7cc6b2920c387fd59423b91b 100644
--- a/core/l10n/el.php
+++ b/core/l10n/el.php
@@ -53,6 +53,7 @@
 "Error" => "Σφάλμα",
 "The app name is not specified." => "Δεν καθορίστηκε το όνομα της εφαρμογής.",
 "The required file {file} is not installed!" => "Το απαιτούμενο αρχείο {file} δεν εγκαταστάθηκε!",
+"Shared" => "Κοινόχρηστα",
 "Share" => "Διαμοιρασμός",
 "Error while sharing" => "Σφάλμα κατά τον διαμοιρασμό",
 "Error while unsharing" => "Σφάλμα κατά το σταμάτημα του διαμοιρασμού",
@@ -83,6 +84,8 @@
 "Error setting expiration date" => "Σφάλμα κατά τον ορισμό ημ. λήξης",
 "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}",
 "You will receive a link to reset your password via Email." => "Θα λάβετε ένα σύνδεσμο για να επαναφέρετε τον κωδικό πρόσβασής σας μέσω ηλεκτρονικού ταχυδρομείου.",
@@ -106,6 +109,8 @@
 "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." => "Ο κατάλογος δεδομένων και τα αρχεία σας είναι πιθανό προσβάσιμα από το internet γιατί δεν δουλεύει το αρχείο .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" => "Φάκελος δεδομένων",
@@ -125,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/eu.php b/core/l10n/eu.php
index 8c36254caf8e7e6bf3c3c3c63aea27ea912128e9..834af44b382b375a813ae6bf6eed93d746339614 100644
--- a/core/l10n/eu.php
+++ b/core/l10n/eu.php
@@ -1,8 +1,8 @@
 <?php $TRANSLATIONS = array(
-"User %s shared a file with you" => "%s erabiltzaileak zurekin fitxategi bat partekatu du ",
-"User %s shared a folder with you" => "%s erabiltzaileak zurekin karpeta bat partekatu du ",
-"User %s shared the file \"%s\" with you. It is available for download here: %s" => "%s erabiltzaileak \"%s\" fitxategia zurekin partekatu du. Hemen duzu eskuragarri:  %s",
-"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "%s erabiltzaileak \"%s\" karpeta zurekin partekatu du. Hemen duzu eskuragarri:  %s",
+"User %s shared a file with you" => "%s erabiltzaileak zurekin fitxategi bat elkarbanatu du ",
+"User %s shared a folder with you" => "%s erabiltzaileak zurekin karpeta bat elkarbanatu du ",
+"User %s shared the file \"%s\" with you. It is available for download here: %s" => "%s erabiltzaileak \"%s\" fitxategia zurekin elkarbanatu du. Hemen duzu eskuragarri:  %s",
+"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "%s erabiltzaileak \"%s\" karpeta zurekin elkarbanatu du. Hemen duzu eskuragarri:  %s",
 "Category type not provided." => "Kategoria mota ez da zehaztu.",
 "No category to add?" => "Ez dago gehitzeko kategoriarik?",
 "This category already exists: %s" => "Kategoria hau dagoeneko existitzen da: %s",
@@ -58,8 +58,8 @@
 "Error while sharing" => "Errore bat egon da elkarbanatzean",
 "Error while unsharing" => "Errore bat egon da elkarbanaketa desegitean",
 "Error while changing permissions" => "Errore bat egon da baimenak aldatzean",
-"Shared with you and the group {group} by {owner}" => "{owner}-k zu eta {group} taldearekin partekatuta",
-"Shared with you by {owner}" => "{owner}-k zurekin partekatuta",
+"Shared with you and the group {group} by {owner}" => "{owner}-k zu eta {group} taldearekin elkarbanatuta",
+"Shared with you by {owner}" => "{owner}-k zurekin elkarbanatuta",
 "Share with" => "Elkarbanatu honekin",
 "Share with link" => "Elkarbanatu lotura batekin",
 "Password protect" => "Babestu pasahitzarekin",
@@ -71,7 +71,7 @@
 "Share via email:" => "Elkarbanatu eposta bidez:",
 "No people found" => "Ez da inor aurkitu",
 "Resharing is not allowed" => "Berriz elkarbanatzea ez dago baimendua",
-"Shared in {item} with {user}" => "{user}ekin {item}-n partekatuta",
+"Shared in {item} with {user}" => "{user}ekin {item}-n elkarbanatuta",
 "Unshare" => "Ez elkarbanatu",
 "can edit" => "editatu dezake",
 "access control" => "sarrera kontrola",
diff --git a/core/l10n/fa.php b/core/l10n/fa.php
index 10a57962f649ab01958fa69b2b1fd9bb34c0ce46..2420ee67df5493a89d1a486cc9e7c1c922140819 100644
--- a/core/l10n/fa.php
+++ b/core/l10n/fa.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  ارائه نشده است.",
 "Error adding %s to favorites." => "خطای اضافه کردن %s  به علاقه مندی ها.",
@@ -52,6 +53,7 @@
 "Error" => "خطا",
 "The app name is not specified." => "نام برنامه تعیین نشده است.",
 "The required file {file} is not installed!" => "پرونده { پرونده} درخواست شده نصب نشده است !",
+"Shared" => "اشتراک گذاشته شده",
 "Share" => "اشتراک‌گزاری",
 "Error while sharing" => "خطا درحال به اشتراک گذاشتن",
 "Error while unsharing" => "خطا درحال لغو اشتراک",
@@ -63,6 +65,7 @@
 "Password protect" => "نگهداری کردن رمز عبور",
 "Password" => "گذرواژه",
 "Email link to person" => "پیوند ایمیل برای شخص.",
+"Send" => "ارسال",
 "Set expiration date" => "تنظیم تاریخ انقضا",
 "Expiration date" => "تاریخ انقضا",
 "Share via email:" => "از طریق ایمیل به اشتراک بگذارید :",
@@ -79,6 +82,10 @@
 "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}" => "از لینک زیر جهت دوباره سازی پسورد استفاده کنید :\n{link}",
 "You will receive a link to reset your password via Email." => "شما یک نامه الکترونیکی حاوی یک لینک جهت بازسازی گذرواژه دریافت خواهید کرد.",
@@ -122,5 +129,6 @@
 "remember" => "بیاد آوری",
 "Log in" => "ورود",
 "prev" => "بازگشت",
-"next" => "بعدی"
+"next" => "بعدی",
+"Updating ownCloud to version %s, this may take a while." => "به روز رسانی OwnCloud به نسخه ی %s، این عملیات ممکن است زمان بر باشد."
 );
diff --git a/core/l10n/gl.php b/core/l10n/gl.php
index 8fd9292ce610a7f5507921ca3c0774ca24f59dd7..194c28e7cfbea90996336cd57b12682df0c58076 100644
--- a/core/l10n/gl.php
+++ b/core/l10n/gl.php
@@ -5,6 +5,7 @@
 "User %s shared the folder \"%s\" with you. It is available for download here: %s" => "O usuario %s compartiu o cartafol «%s» con vostede. Teno dispoñíbel en: %s",
 "Category type not provided." => "Non se indicou o tipo de categoría",
 "No category to add?" => "Sen categoría que engadir?",
+"This category already exists: %s" => "Esta categoría xa existe: %s",
 "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.",
@@ -52,6 +53,7 @@
 "Error" => "Erro",
 "The app name is not specified." => "Non se especificou o nome do aplicativo.",
 "The required file {file} is not installed!" => "Non está instalado o ficheiro {file} que se precisa",
+"Shared" => "Compartir",
 "Share" => "Compartir",
 "Error while sharing" => "Produciuse un erro ao compartir",
 "Error while unsharing" => "Produciuse un erro ao deixar de compartir",
@@ -82,6 +84,8 @@
 "Error setting expiration date" => "Produciuse un erro ao definir a data de caducidade",
 "Sending ..." => "Enviando...",
 "Email sent" => "Correo enviado",
+"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "A actualización non foi satisfactoria, informe deste problema á  <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">comunidade de ownCloud</a>.",
+"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}",
 "You will receive a link to reset your password via Email." => "Recibirá unha ligazón por correo para restabelecer o contrasinal",
@@ -105,6 +109,8 @@
 "Security Warning" => "Aviso de seguranza",
 "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.",
+"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 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>.",
 "Create an <strong>admin account</strong>" => "Crear unha <strong>contra de administrador</strong>",
 "Advanced" => "Avanzado",
 "Data folder" => "Cartafol de datos",
@@ -124,6 +130,7 @@
 "Lost your password?" => "Perdeu o contrasinal?",
 "remember" => "lembrar",
 "Log in" => "Conectar",
+"Alternative Logins" => "Accesos alternativos",
 "prev" => "anterior",
 "next" => "seguinte",
 "Updating ownCloud to version %s, this may take a while." => "Actualizando ownCloud a versión %s,  esto pode levar un anaco."
diff --git a/core/l10n/he.php b/core/l10n/he.php
index 75c378ceceb61fa6db5626a44b68dabbb033f643..1db5820bdf736824ff58afce5c391943eaec6907 100644
--- a/core/l10n/he.php
+++ b/core/l10n/he.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 לא סופק.",
 "Error adding %s to favorites." => "אירעה שגיאה בעת הוספת %s למועדפים.",
@@ -52,6 +53,7 @@
 "Error" => "שגיאה",
 "The app name is not specified." => "שם היישום לא צוין.",
 "The required file {file} is not installed!" => "הקובץ הנדרש {file} אינו מותקן!",
+"Shared" => "שותף",
 "Share" => "שתף",
 "Error while sharing" => "שגיאה במהלך השיתוף",
 "Error while unsharing" => "שגיאה במהלך ביטול השיתוף",
@@ -82,6 +84,8 @@
 "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}",
 "You will receive a link to reset your password via Email." => "יישלח לתיבת הדוא״ל שלך קישור לאיפוס הססמה.",
@@ -105,6 +109,8 @@
 "Security Warning" => "אזהרת אבטחה",
 "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 לא עובד.",
+"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" => "תיקיית נתונים",
@@ -124,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/id.php b/core/l10n/id.php
index 697195e75149fec21ceecb792eed7cbf30365b76..0be3ef20fb5b3ce2953ffce8b4227b59483641f4 100644
--- a/core/l10n/id.php
+++ b/core/l10n/id.php
@@ -1,6 +1,12 @@
 <?php $TRANSLATIONS = array(
+"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",
@@ -23,9 +29,14 @@
 "Settings" => "Setelan",
 "seconds ago" => "beberapa detik yang lalu",
 "1 minute ago" => "1 menit lalu",
+"{minutes} minutes ago" => "{minutes} menit yang lalu",
+"1 hour ago" => "1 jam yang lalu",
+"{hours} hours ago" => "{hours} jam yang lalu",
 "today" => "hari ini",
 "yesterday" => "kemarin",
+"{days} days ago" => "{days} hari yang lalu",
 "last month" => "bulan kemarin",
+"{months} months ago" => "{months} bulan yang lalu",
 "months ago" => "beberapa bulan lalu",
 "last year" => "tahun kemarin",
 "years ago" => "beberapa tahun lalu",
@@ -35,7 +46,8 @@
 "Yes" => "Ya",
 "Ok" => "Oke",
 "Error" => "gagal",
-"Share" => "berbagi",
+"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",
@@ -45,6 +57,8 @@
 "Share with link" => "bagikan dengan tautan",
 "Password protect" => "lindungi dengan kata kunci",
 "Password" => "Password",
+"Email link to person" => "Email link ini ke orang",
+"Send" => "Kirim",
 "Set expiration date" => "set tanggal kadaluarsa",
 "Expiration date" => "tanggal kadaluarsa",
 "Share via email:" => "berbagi memlalui surel:",
@@ -61,9 +75,13 @@
 "Password protected" => "dilindungi kata kunci",
 "Error unsetting expiration date" => "gagal melepas tanggal kadaluarsa",
 "Error setting expiration date" => "gagal memasang tanggal kadaluarsa",
+"Sending ..." => "Sedang 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",
@@ -100,6 +118,7 @@
 "Lost your password?" => "Lupa password anda?",
 "remember" => "selalu login",
 "Log in" => "Masuk",
+"Alternative Logins" => "Login dengan cara lain",
 "prev" => "sebelum",
 "next" => "selanjutnya"
 );
diff --git a/core/l10n/ka.php b/core/l10n/ka.php
new file mode 100644
index 0000000000000000000000000000000000000000..b8deeb1e550a99e8582fe83fe1a0d4b70b0b5e70
--- /dev/null
+++ b/core/l10n/ka.php
@@ -0,0 +1,12 @@
+<?php $TRANSLATIONS = array(
+"seconds ago" => "წამის წინ",
+"1 minute ago" => "1 წუთის წინ",
+"1 hour ago" => "1 საათის წინ",
+"today" => "დღეს",
+"yesterday" => "გუშინ",
+"Password" => "პაროლი",
+"Personal" => "პერსონა",
+"Users" => "მომხმარებლები",
+"Admin" => "ადმინისტრატორი",
+"Help" => "შველა"
+);
diff --git a/core/l10n/ka_GE.php b/core/l10n/ka_GE.php
index 731a3534558fcc4c28c2cc2c01d14de085e9a61f..4cdada58d906443a4c2c19faf6607163794c5fdf 100644
--- a/core/l10n/ka_GE.php
+++ b/core/l10n/ka_GE.php
@@ -48,7 +48,7 @@
 "Set expiration date" => "მიუთითე ვადის გასვლის დრო",
 "Expiration date" => "ვადის გასვლის დრო",
 "Share via email:" => "გააზიარე მეილზე",
-"No people found" => "გვერდი არ არის ნაპოვნი",
+"No people found" => "მომხმარებელი არ არის ნაპოვნი",
 "Resharing is not allowed" => "მეორეჯერ გაზიარება არ არის დაშვებული",
 "Unshare" => "გაზიარების მოხსნა",
 "can edit" => "შეგიძლია შეცვლა",
@@ -64,11 +64,11 @@
 "Use the following link to reset your password: {link}" => "გამოიყენე შემდეგი ლინკი პაროლის შესაცვლელად: {link}",
 "You will receive a link to reset your password via Email." => "თქვენ მოგივათ პაროლის შესაცვლელი ლინკი მეილზე",
 "Username" => "მომხმარებელი",
-"Request reset" => "რესეტის მოთხოვნა",
+"Request reset" => "პაროლის შეცვლის მოთხოვნა",
 "Your password was reset" => "თქვენი პაროლი შეცვლილია",
 "To login page" => "შესვლის გვერდზე",
 "New password" => "ახალი პაროლი",
-"Reset password" => "პაროლის რესეტი",
+"Reset password" => "პაროლის შეცვლა",
 "Personal" => "პირადი",
 "Users" => "მომხმარებლები",
 "Apps" => "აპლიკაციები",
@@ -81,16 +81,16 @@
 "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." => "შემთხვევითი სიმბოლოების გენერატორის გარეშე, შემტევმა შეიძლება ამოიცნოს თქვენი პაროლი შეგიცვალოთ ის და დაეუფლოს თქვენს ექაუნთს.",
-"Create an <strong>admin account</strong>" => "შექმენი ადმინ ექაუნტი",
+"Create an <strong>admin account</strong>" => "შექმენი <strong>ადმინ ექაუნტი</strong>",
 "Advanced" => "Advanced",
 "Data folder" => "მონაცემთა საქაღალდე",
-"Configure the database" => "ბაზის კონფიგურირება",
+"Configure the database" => "მონაცემთა ბაზის კონფიგურირება",
 "will be used" => "გამოყენებული იქნება",
-"Database user" => "ბაზის მომხმარებელი",
-"Database password" => "ბაზის პაროლი",
-"Database name" => "ბაზის სახელი",
+"Database user" => "მონაცემთა ბაზის მომხმარებელი",
+"Database password" => "მონაცემთა ბაზის პაროლი",
+"Database name" => "მონაცემთა ბაზის სახელი",
 "Database tablespace" => "ბაზის ცხრილის ზომა",
-"Database host" => "ბაზის ჰოსტი",
+"Database host" => "მონაცემთა ბაზის ჰოსტი",
 "Finish setup" => "კონფიგურაციის დასრულება",
 "web services under your control" => "თქვენი კონტროლის ქვეშ მყოფი ვებ სერვისები",
 "Log out" => "გამოსვლა",
diff --git a/core/l10n/my_MM.php b/core/l10n/my_MM.php
new file mode 100644
index 0000000000000000000000000000000000000000..97631d4df58bc0df15dc225769088b9747a15063
--- /dev/null
+++ b/core/l10n/my_MM.php
@@ -0,0 +1,64 @@
+<?php $TRANSLATIONS = array(
+"No category to add?" => "ထည့်ရန်ခေါင်းစဉ်မရှိဘူးလား",
+"No categories selected for deletion." => "ဖျက်ရန်အတွက်ခေါင်းစဉ်မရွေးထားပါ",
+"January" => "ဇန်နဝါရီ",
+"February" => "ဖေဖော်ဝါရီ",
+"March" => "မတ်",
+"April" => "ဧပြီ",
+"May" => "မေ",
+"June" => "ဇွန်",
+"July" => "ဇူလိုင်",
+"August" => "ဩဂုတ်",
+"September" => "စက်တင်ဘာ",
+"October" => "အောက်တိုဘာ",
+"November" => "နိုဝင်ဘာ",
+"December" => "ဒီဇင်ဘာ",
+"seconds ago" => "စက္ကန့်အနည်းငယ်က",
+"1 minute ago" => "၁ မိနစ်အရင်က",
+"1 hour ago" => "၁ နာရီ အရင်က",
+"today" => "ယနေ့",
+"yesterday" => "မနေ့က",
+"last month" => "ပြီးခဲ့သောလ",
+"last year" => "မနှစ်က",
+"years ago" => "နှစ် အရင်က",
+"Choose" => "ရွေးချယ်",
+"Cancel" => "ပယ်ဖျက်မည်",
+"No" => "မဟုတ်ဘူး",
+"Yes" => "ဟုတ်",
+"Ok" => "အိုကေ",
+"Password" => "စကားဝှက်",
+"Set expiration date" => "သက်တမ်းကုန်ဆုံးမည့်ရက်သတ်မှတ်မည်",
+"Expiration date" => "သက်တမ်းကုန်ဆုံးမည့်ရက်",
+"Share via email:" => "အီးမေးလ်ဖြင့်ဝေမျှမည် -",
+"Resharing is not allowed" => "ပြန်လည်ဝေမျှခြင်းခွင့်မပြုပါ",
+"can edit" => "ပြင်ဆင်နိုင်",
+"create" => "ဖန်တီးမည်",
+"delete" => "ဖျက်မည်",
+"share" => "ဝေမျှမည်",
+"Password protected" => "စကားဝှက်ဖြင့်ကာကွယ်ထားသည်",
+"You will receive a link to reset your password via Email." => "အီးမေးလ်မှတစ်ဆင့် သင်၏စကားဝှက်ကို ပြန်ဖော်ရန်အတွက် Link တစ်ခုလက်ခံရရှိပါလိမ့်မယ်။",
+"Username" => "သုံးစွဲသူအမည်",
+"Your password was reset" => "သင်၏စကားဝှက်ကိုပြန်ဖော်ပြီးပါပြီ။",
+"To login page" => "ဝင်ရောက်သည့်စာမျက်နှာသို့",
+"New password" => "စကားဝှက်အသစ်",
+"Users" => "သုံးစွဲသူ",
+"Apps" => "Apps",
+"Admin" => "အက်ဒမင်",
+"Help" => "အကူအညီ",
+"Cloud not found" => "မတွေ့ရှိမိပါ",
+"Add" => "ပေါင်းထည့်",
+"Security Warning" => "လုံခြုံရေးသတိပေးချက်",
+"Create an <strong>admin account</strong>" => "<strong>အက်ဒမင်အကောင့်</strong>တစ်ခုဖန်တီးမည်",
+"Advanced" => "အဆင့်မြင့်",
+"Data folder" => "အချက်အလက်ဖိုလ်ဒါလ်",
+"Database user" => "Database သုံးစွဲသူ",
+"Database password" => "Database စကားဝှက်",
+"Database name" => "Database အမည်",
+"Finish setup" => "တပ်ဆင်ခြင်းပြီးပါပြီ။",
+"web services under your control" => "သင်၏ထိန်းချုပ်မှု့အောက်တွင်ရှိသော Web services",
+"Lost your password?" => "သင်၏စကားဝှက်ပျောက်သွားပြီလား။",
+"remember" => "မှတ်မိစေသည်",
+"Log in" => "ဝင်ရောက်ရန်",
+"prev" => "ယခင်",
+"next" => "နောက်သို့"
+);
diff --git a/core/l10n/pl.php b/core/l10n/pl.php
index 8f548fe5be6728952b9c913c6460d6bc59afd3b9..4914ec66918ca8fac55f1633e104ab6cceb6e4a3 100644
--- a/core/l10n/pl.php
+++ b/core/l10n/pl.php
@@ -1,15 +1,16 @@
 <?php $TRANSLATIONS = array(
-"User %s shared a file with you" => "Użytkownik %s współdzieli plik z tobą",
-"User %s shared a folder with you" => "Uzytkownik %s wspóldzieli folder z toba",
-"User %s shared the file \"%s\" with you. It is available for download here: %s" => "Użytkownik %s współdzieli plik \"%s\" z tobą. Jest dostępny tutaj: %s",
-"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Uzytkownik %s wspóldzieli folder \"%s\" z toba. Jest dostepny tutaj: %s",
-"Category type not provided." => "Typ kategorii nie podany.",
-"No category to add?" => "Brak kategorii",
-"Object type not provided." => "Typ obiektu nie podany.",
-"%s ID not provided." => "%s ID nie podany.",
-"Error adding %s to favorites." => "Błąd dodania %s do ulubionych.",
-"No categories selected for deletion." => "Nie ma kategorii zaznaczonych do usunięcia.",
-"Error removing %s from favorites." => "Błąd usunięcia %s z ulubionych.",
+"User %s shared a file with you" => "Użytkownik %s udostępnił ci plik",
+"User %s shared a folder with you" => "Użytkownik %s udostępnił ci folder",
+"User %s shared the file \"%s\" with you. It is available for download here: %s" => "Użytkownik %s udostępnił ci plik „%s”. Możesz pobrać go stąd: %s",
+"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Użytkownik %s udostępnił ci folder „%s”. Możesz pobrać go stąd: %s",
+"Category type not provided." => "Nie podano typu kategorii.",
+"No category to add?" => "Brak kategorii do dodania?",
+"This category already exists: %s" => "Ta kategoria już istnieje: %s",
+"Object type not provided." => "Nie podano typu obiektu.",
+"%s ID not provided." => "Nie podano ID %s.",
+"Error adding %s to favorites." => "Błąd podczas dodawania %s do ulubionych.",
+"No categories selected for deletion." => "Nie zaznaczono kategorii do usunięcia.",
+"Error removing %s from favorites." => "Błąd podczas usuwania %s z ulubionych.",
 "Sunday" => "Niedziela",
 "Monday" => "Poniedziałek",
 "Tuesday" => "Wtorek",
@@ -31,63 +32,65 @@
 "December" => "Grudzień",
 "Settings" => "Ustawienia",
 "seconds ago" => "sekund temu",
-"1 minute ago" => "1 minute temu",
+"1 minute ago" => "1 minutę temu",
 "{minutes} minutes ago" => "{minutes} minut temu",
-"1 hour ago" => "1 godzine temu",
+"1 hour ago" => "1 godzinę temu",
 "{hours} hours ago" => "{hours} godzin temu",
 "today" => "dziś",
 "yesterday" => "wczoraj",
 "{days} days ago" => "{days} dni temu",
-"last month" => "ostani miesiąc",
+"last month" => "w zeszłym miesiącu",
 "{months} months ago" => "{months} miesięcy temu",
 "months ago" => "miesięcy temu",
-"last year" => "ostatni rok",
+"last year" => "w zeszłym roku",
 "years ago" => "lat temu",
 "Choose" => "Wybierz",
 "Cancel" => "Anuluj",
 "No" => "Nie",
 "Yes" => "Tak",
-"Ok" => "Ok",
-"The object type is not specified." => "Typ obiektu nie jest określony.",
+"Ok" => "OK",
+"The object type is not specified." => "Nie określono typu obiektu.",
 "Error" => "Błąd",
-"The app name is not specified." => "Nazwa aplikacji nie jest określona.",
-"The required file {file} is not installed!" => "Żądany plik {file} nie jest zainstalowany!",
+"The app name is not specified." => "Nie określono nazwy aplikacji.",
+"The required file {file} is not installed!" => "Wymagany plik {file} nie jest zainstalowany!",
 "Shared" => "Udostępniono",
 "Share" => "Udostępnij",
 "Error while sharing" => "Błąd podczas współdzielenia",
 "Error while unsharing" => "Błąd podczas zatrzymywania współdzielenia",
 "Error while changing permissions" => "Błąd przy zmianie uprawnień",
-"Shared with you and the group {group} by {owner}" => "Udostępnione Tobie i grupie {group} przez {owner}",
-"Shared with you by {owner}" => "Udostępnione Ci przez {owner}",
+"Shared with you and the group {group} by {owner}" => "Udostępnione tobie i grupie {group} przez {owner}",
+"Shared with you by {owner}" => "Udostępnione tobie przez {owner}",
 "Share with" => "Współdziel z",
-"Share with link" => "Współdziel z link",
-"Password protect" => "Zabezpieczone hasłem",
+"Share with link" => "Współdziel wraz z odnośnikiem",
+"Password protect" => "Zabezpiecz hasłem",
 "Password" => "Hasło",
-"Email link to person" => "Email do osoby",
+"Email link to person" => "Wyślij osobie odnośnik poprzez e-mail",
 "Send" => "Wyślij",
 "Set expiration date" => "Ustaw datę wygaśnięcia",
 "Expiration date" => "Data wygaśnięcia",
-"Share via email:" => "Współdziel poprzez maila",
+"Share via email:" => "Współdziel poprzez e-mail:",
 "No people found" => "Nie znaleziono ludzi",
 "Resharing is not allowed" => "Współdzielenie nie jest możliwe",
 "Shared in {item} with {user}" => "Współdzielone w {item} z {user}",
 "Unshare" => "Zatrzymaj współdzielenie",
-"can edit" => "można edytować",
+"can edit" => "może edytować",
 "access control" => "kontrola dostępu",
 "create" => "utwórz",
 "update" => "uaktualnij",
 "delete" => "usuń",
 "share" => "współdziel",
 "Password protected" => "Zabezpieczone hasłem",
-"Error unsetting expiration date" => "Błąd niszczenie daty wygaśnięcia",
+"Error unsetting expiration date" => "Błąd podczas usuwania daty wygaśnięcia",
 "Error setting expiration date" => "Błąd podczas ustawiania daty wygaśnięcia",
 "Sending ..." => "Wysyłanie...",
-"Email sent" => "Wyślij Email",
-"ownCloud password reset" => "restart hasła",
-"Use the following link to reset your password: {link}" => "Proszę użyć tego odnośnika do zresetowania hasła: {link}",
+"Email sent" => "E-mail wysłany",
+"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Aktualizacja zakończyła się niepowodzeniem. Zgłoś ten problem <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">spoleczności ownCloud</a>.",
+"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}",
 "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." => "Wyślij zresetowany email.",
-"Request failed!" => "Próba nieudana!",
+"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",
@@ -96,20 +99,22 @@
 "Reset password" => "Zresetuj hasło",
 "Personal" => "Osobiste",
 "Users" => "Użytkownicy",
-"Apps" => "Programy",
+"Apps" => "Aplikacje",
 "Admin" => "Administrator",
 "Help" => "Pomoc",
 "Access forbidden" => "Dostęp zabroniony",
 "Cloud not found" => "Nie odnaleziono chmury",
-"Edit categories" => "Edytuj kategorię",
+"Edit categories" => "Edytuj kategorie",
 "Add" => "Dodaj",
 "Security Warning" => "Ostrzeżenie o zabezpieczeniach",
-"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Niedostępny bezpieczny generator liczb losowych, należy włączyć 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 być w stanie przewidzieć resetujące hasło tokena i przejąć kontrolę nad swoim kontem.",
-"Create an <strong>admin account</strong>" => "Tworzenie <strong>konta administratora</strong>",
+"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.",
+"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>." => "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>.",
+"Create an <strong>admin account</strong>" => "Utwórz <strong>konta administratora</strong>",
 "Advanced" => "Zaawansowane",
 "Data folder" => "Katalog danych",
-"Configure the database" => "Konfiguracja bazy danych",
+"Configure the database" => "Skonfiguruj bazę danych",
 "will be used" => "zostanie użyte",
 "Database user" => "Użytkownik bazy danych",
 "Database password" => "Hasło do bazy danych",
@@ -118,14 +123,15 @@
 "Database host" => "Komputer bazy danych",
 "Finish setup" => "Zakończ konfigurowanie",
 "web services under your control" => "usługi internetowe pod kontrolą",
-"Log out" => "Wylogowuje użytkownika",
+"Log out" => "Wyloguj",
 "Automatic logon rejected!" => "Automatyczne logowanie odrzucone!",
-"If you did not change your password recently, your account may be compromised!" => "Jeśli nie było zmianie niedawno hasło, Twoje konto może być zagrożone!",
-"Please change your password to secure your account again." => "Proszę zmienić swoje hasło, aby zabezpieczyć swoje konto ponownie.",
+"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!",
+"Please change your password to secure your account again." => "Zmień swoje hasło, aby ponownie zabezpieczyć swoje konto.",
 "Lost your password?" => "Nie pamiętasz hasła?",
-"remember" => "Zapamiętanie",
+"remember" => "pamiętaj",
 "Log in" => "Zaloguj",
+"Alternative Logins" => "Alternatywne loginy",
 "prev" => "wstecz",
 "next" => "naprzód",
-"Updating ownCloud to version %s, this may take a while." => "Aktualizowanie ownCloud do wersji %s, może to potrwać chwilę."
+"Updating ownCloud to version %s, this may take a while." => "Aktualizowanie ownCloud do wersji %s. Może to trochę potrwać."
 );
diff --git a/core/l10n/sk_SK.php b/core/l10n/sk_SK.php
index b2c2dcf989f535c440817cbe6d1b59962270c1c9..7e32dac57e41de2ed26c5b2f759f73a96f9a6cdb 100644
--- a/core/l10n/sk_SK.php
+++ b/core/l10n/sk_SK.php
@@ -1,11 +1,11 @@
 <?php $TRANSLATIONS = array(
 "User %s shared a file with you" => "Používateľ %s zdieľa s Vami súbor",
-"User %s shared a folder with you" => "Používateľ %s zdieľa s Vami adresár",
+"User %s shared a folder with you" => "Používateľ %s zdieľa s Vami priečinok",
 "User %s shared the file \"%s\" with you. It is available for download here: %s" => "Používateľ %s zdieľa s Vami súbor \"%s\".  Môžete si ho stiahnuť tu: %s",
-"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Používateľ %s zdieľa s Vami adresár \"%s\".  Môžete si ho stiahnuť tu: %s",
-"Category type not provided." => "Neposkytnutý kategorický typ.",
+"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Používateľ %s zdieľa s Vami priečinok \"%s\".  Môžete si ho stiahnuť tu: %s",
+"Category type not provided." => "Neposkytnutý typ kategórie.",
 "No category to add?" => "Žiadna kategória pre pridanie?",
-"This category already exists: %s" => "Kategéria: %s už existuje.",
+"This category already exists: %s" => "Kategória: %s už existuje.",
 "Object type not provided." => "Neposkytnutý typ objektu.",
 "%s ID not provided." => "%s ID neposkytnuté.",
 "Error adding %s to favorites." => "Chyba pri pridávaní %s do obľúbených položiek.",
@@ -52,9 +52,9 @@
 "The object type is not specified." => "Nešpecifikovaný typ objektu.",
 "Error" => "Chyba",
 "The app name is not specified." => "Nešpecifikované meno aplikácie.",
-"The required file {file} is not installed!" => "Požadovaný súbor {file} nie je inštalovaný!",
+"The required file {file} is not installed!" => "Požadovaný súbor {file} nie je nainštalovaný!",
 "Shared" => "Zdieľané",
-"Share" => "Zdieľaj",
+"Share" => "Zdieľať",
 "Error while sharing" => "Chyba počas zdieľania",
 "Error while unsharing" => "Chyba počas ukončenia zdieľania",
 "Error while changing permissions" => "Chyba počas zmeny oprávnení",
@@ -64,7 +64,7 @@
 "Share with link" => "Zdieľať cez odkaz",
 "Password protect" => "Chrániť heslom",
 "Password" => "Heslo",
-"Email link to person" => "Odoslať odkaz osobe e-mailom",
+"Email link to person" => "Odoslať odkaz emailom",
 "Send" => "Odoslať",
 "Set expiration date" => "Nastaviť dátum expirácie",
 "Expiration date" => "Dátum expirácie",
@@ -74,18 +74,18 @@
 "Shared in {item} with {user}" => "Zdieľané v {item} s {user}",
 "Unshare" => "Zrušiť zdieľanie",
 "can edit" => "môže upraviť",
-"access control" => "riadenie prístupu",
+"access control" => "prístupové práva",
 "create" => "vytvoriť",
-"update" => "aktualizácia",
-"delete" => "zmazať",
+"update" => "aktualizovať",
+"delete" => "vymazať",
 "share" => "zdieľať",
 "Password protected" => "Chránené heslom",
-"Error unsetting expiration date" => "Chyba pri odstraňovaní dátumu vypršania platnosti",
-"Error setting expiration date" => "Chyba pri nastavení dátumu vypršania platnosti",
+"Error unsetting expiration date" => "Chyba pri odstraňovaní dátumu expirácie",
+"Error setting expiration date" => "Chyba pri nastavení dátumu expirácie",
 "Sending ..." => "Odosielam ...",
 "Email sent" => "Email odoslaný",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Aktualizácia nebola úspešná. Problém nahláste na <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>.",
-"The update was successful. Redirecting you to ownCloud now." => "Aktualizácia bola úspešná. Presmerovávam na ownCloud.",
+"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}",
 "You will receive a link to reset your password via Email." => "Odkaz pre obnovenie hesla obdržíte e-mailom.",
@@ -96,7 +96,7 @@
 "Your password was reset" => "Vaše heslo bolo obnovené",
 "To login page" => "Na prihlasovaciu stránku",
 "New password" => "Nové heslo",
-"Reset password" => "Obnova hesla",
+"Reset password" => "Obnovenie hesla",
 "Personal" => "Osobné",
 "Users" => "Používatelia",
 "Apps" => "Aplikácie",
@@ -112,7 +112,7 @@
 "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.",
 "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>." => "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>.",
 "Create an <strong>admin account</strong>" => "Vytvoriť <strong>administrátorský účet</strong>",
-"Advanced" => "Pokročilé",
+"Advanced" => "Rozšírené",
 "Data folder" => "Priečinok dát",
 "Configure the database" => "Nastaviť databázu",
 "will be used" => "bude použité",
@@ -130,7 +130,7 @@
 "Lost your password?" => "Zabudli ste heslo?",
 "remember" => "zapamätať",
 "Log in" => "Prihlásiť sa",
-"Alternative Logins" => "Altrnatívne loginy",
+"Alternative Logins" => "Alternatívne prihlasovanie",
 "prev" => "späť",
 "next" => "ďalej",
 "Updating ownCloud to version %s, this may take a while." => "Aktualizujem ownCloud na verziu %s, môže to chvíľu trvať."
diff --git a/core/l10n/ta_LK.php b/core/l10n/ta_LK.php
index f7ad09fbc7e9772fd9b6a34dc83afe4a07348d22..9863ca8154e80b85e80be36669fd038637e4345f 100644
--- a/core/l10n/ta_LK.php
+++ b/core/l10n/ta_LK.php
@@ -91,7 +91,7 @@
 "Admin" => "நிர்வாகி",
 "Help" => "உதவி",
 "Access forbidden" => "அணுக தடை",
-"Cloud not found" => "Cloud கண்டுப்பிடிப்படவில்லை",
+"Cloud not found" => "Cloud காணப்படவில்லை",
 "Edit categories" => "வகைகளை தொகுக்க",
 "Add" => "சேர்க்க",
 "Security Warning" => "பாதுகாப்பு எச்சரிக்கை",
diff --git a/core/l10n/tr.php b/core/l10n/tr.php
index 201b511647ccee8c9b651e82cf2c79e0186120c8..9d9ff0e7ebabeacc9294c87a0cef5cbdeea58cc1 100644
--- a/core/l10n/tr.php
+++ b/core/l10n/tr.php
@@ -5,6 +5,7 @@
 "User %s shared the folder \"%s\" with you. It is available for download here: %s" => "%s kullanıcısı \"%s\" dizinini sizinle paylaştı. %s adresinden indirilebilir",
 "Category type not provided." => "Kategori türü desteklenmemektedir.",
 "No category to add?" => "Eklenecek kategori yok?",
+"This category already exists: %s" => "Bu kategori zaten mevcut:  %s",
 "Object type not provided." => "Nesne türü desteklenmemektedir.",
 "%s ID not provided." => "%s ID belirtilmedi.",
 "Error adding %s to favorites." => "%s favorilere eklenirken hata oluştu",
@@ -52,6 +53,7 @@
 "Error" => "Hata",
 "The app name is not specified." => "uygulama adı belirtilmedi.",
 "The required file {file} is not installed!" => "İhtiyaç duyulan {file} dosyası kurulu değil.",
+"Shared" => "Paylaşılan",
 "Share" => "Paylaş",
 "Error while sharing" => "Paylaşım sırasında hata  ",
 "Error while unsharing" => "Paylaşım iptal ediliyorken hata",
@@ -82,6 +84,8 @@
 "Error setting expiration date" => "Geçerlilik tarihi tanımlama hatası",
 "Sending ..." => "Gönderiliyor...",
 "Email sent" => "Eposta gönderildi",
+"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Güncelleme başarılı olmadı. Lütfen bu hatayı bildirin <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>.",
+"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}",
 "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.",
@@ -105,6 +109,8 @@
 "Security Warning" => "Güvenlik Uyarisi",
 "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.",
+"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>." => "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>.",
 "Create an <strong>admin account</strong>" => "Bir <strong>yönetici hesabı</strong> oluşturun",
 "Advanced" => "Gelişmiş",
 "Data folder" => "Veri klasörü",
@@ -124,6 +130,7 @@
 "Lost your password?" => "Parolanızı mı unuttunuz?",
 "remember" => "hatırla",
 "Log in" => "Giriş yap",
+"Alternative Logins" => "Alternatif Girişler",
 "prev" => "önceki",
 "next" => "sonraki",
 "Updating ownCloud to version %s, this may take a while." => "Owncloud %s versiyonuna güncelleniyor. Biraz zaman alabilir."
diff --git a/core/l10n/uk.php b/core/l10n/uk.php
index a2f297fc224e18791a4587fa881414dad69de4ea..685a31d52edffa8b1153a089c2fe840702de00c6 100644
--- a/core/l10n/uk.php
+++ b/core/l10n/uk.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 до обраного.",
@@ -108,6 +109,8 @@
 "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>обліковий запис адміністратора</strong>",
 "Advanced" => "Додатково",
 "Data folder" => "Каталог даних",
diff --git a/core/l10n/ur_PK.php b/core/l10n/ur_PK.php
new file mode 100644
index 0000000000000000000000000000000000000000..e2448c4d651789fd23ea55c4f978187f66f783d9
--- /dev/null
+++ b/core/l10n/ur_PK.php
@@ -0,0 +1,78 @@
+<?php $TRANSLATIONS = array(
+"No category to add?" => "شامل کرنے کے لیے کوئی زمرہ نہیں؟",
+"No categories selected for deletion." => "ختم کرنے کے لیے کسی زمرہ جات کا انتخاب نہیں کیا گیا۔",
+"January" => "جنوری",
+"February" => "فرورئ",
+"March" => "مارچ",
+"April" => "اپریل",
+"May" => "مئی",
+"June" => "جون",
+"July" => "جولائی",
+"August" => "اگست",
+"September" => "ستمبر",
+"October" => "اکتوبر",
+"November" => "نومبر",
+"December" => "دسمبر",
+"Settings" => "سیٹینگز",
+"Choose" => "منتخب کریں",
+"Cancel" => "منسوخ کریں",
+"No" => "نہیں",
+"Yes" => "ہاں",
+"Ok" => "اوکے",
+"Error" => "ایرر",
+"Error while sharing" => "شئیرنگ کے دوران ایرر",
+"Error while unsharing" => "شئیرنگ ختم کرنے  کے دوران ایرر",
+"Error while changing permissions" => "اختیارات کو تبدیل کرنے کے دوران ایرر",
+"Share with" => "اس کے ساتھ شئیر کریں",
+"Share with link" => "لنک کے ساتھ شئیر کریں",
+"Password protect" => "پاسورڈ سے محفوظ کریں",
+"Password" => "پاسورڈ",
+"Set expiration date" => "تاریخ معیاد سیٹ کریں",
+"Expiration date" => "تاریخ معیاد",
+"No people found" => "کوئی لوگ نہیں ملے۔",
+"Resharing is not allowed" => "دوبارہ شئیر کرنے کی اجازت نہیں",
+"Unshare" => "شئیرنگ ختم کریں",
+"can edit" => "ایڈٹ کر سکے",
+"access control" => "اسیس کنٹرول",
+"create" => "نیا بنائیں",
+"update" => "اپ ڈیٹ",
+"delete" => "ختم کریں",
+"share" => "شئیر کریں",
+"Password protected" => "پاسورڈ سے محفوظ کیا گیا ہے",
+"ownCloud password reset" => "اون کلاؤڈ پاسورڈ ری سیٹ",
+"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" => "مدد",
+"Access forbidden" => "پہنچ کی اجازت نہیں",
+"Cloud not found" => "نہیں مل سکا",
+"Edit categories" => "زمرہ جات کی تدوین کریں",
+"Add" => "شامل کریں",
+"Create an <strong>admin account</strong>" => "ایک<strong> ایڈمن اکاؤنٹ</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" => "لاگ آؤٹ",
+"Lost your password?" => "کیا آپ پاسورڈ بھول گئے ہیں؟",
+"remember" => "یاد رکھیں",
+"Log in" => "لاگ ان",
+"prev" => "پچھلا",
+"next" => "اگلا"
+);
diff --git a/core/lostpassword/controller.php b/core/lostpassword/controller.php
index 3ef8eaf71aa78ae4fb9373fe4ae4a4468ce28601..fbcf4a87f22c876de23c7c7a92338851eca01036 100644
--- a/core/lostpassword/controller.php
+++ b/core/lostpassword/controller.php
@@ -44,7 +44,11 @@ class OC_Core_LostPassword_Controller {
 				$msg = $tmpl->fetchPage();
 				$l = OC_L10N::get('core');
 				$from = OCP\Util::getDefaultEmailAddress('lostpassword-noreply');
-				OC_Mail::send($email, $_POST['user'], $l->t('ownCloud password reset'), $msg, $from, 'ownCloud');
+				try {
+					OC_Mail::send($email, $_POST['user'], $l->t('ownCloud password reset'), $msg, $from, 'ownCloud');
+				} catch (Exception $e) {
+					OC_Template::printErrorPage( 'A problem occurs during sending the e-mail please contact your administrator.');
+				}
 				self::displayLostPasswordPage(false, true);
 			} else {
 				self::displayLostPasswordPage(true, false);
diff --git a/core/lostpassword/templates/lostpassword.php b/core/lostpassword/templates/lostpassword.php
index 55c070f3e0cff518cf157fdf68d46d899d6cc44e..dc9f0bc8ad380b891df236caf3ffc8830ebd6fca 100644
--- a/core/lostpassword/templates/lostpassword.php
+++ b/core/lostpassword/templates/lostpassword.php
@@ -9,7 +9,7 @@
 			<?php endif; ?>
 			<p class="infield">
 				<label for="user" class="infield"><?php echo $l->t( 'Username' ); ?></label>
-				<input type="text" name="user" id="user" value="" autocomplete="off" required autofocus />
+				<input type="text" name="user" id="user" placeholder="" value="" autocomplete="off" required autofocus />
 			</p>
 			<input type="submit" id="submit" value="<?php echo $l->t('Request reset'); ?>" />
 		<?php endif; ?>
diff --git a/core/routes.php b/core/routes.php
index 2527816b662c13e65baa950e2dde498162aaea28..be19b66bf72baaf76e5f5aa138905622a4075b02 100644
--- a/core/routes.php
+++ b/core/routes.php
@@ -69,3 +69,8 @@ $this->create('app_script', '/apps/{app}/{file}')
 	->defaults(array('file' => 'index.php'))
 	->requirements(array('file' => '.*.php'))
 	->action('OC', 'loadAppScriptFile');
+
+// used for heartbeat
+$this->create('heartbeat', '/heartbeat')->action(function(){
+	// do nothing
+});
\ No newline at end of file
diff --git a/core/setup.php b/core/setup.php
index f16385466cb8fcc0bf4ddcc4c8a0c65fd2bea1cc..77eed5376d6ccc10961ad7693a885dc9ec843d9f 100644
--- a/core/setup.php
+++ b/core/setup.php
@@ -16,6 +16,7 @@ $hasSQLite = class_exists('SQLite3');
 $hasMySQL = is_callable('mysql_connect');
 $hasPostgreSQL = is_callable('pg_connect');
 $hasOracle = is_callable('oci_connect');
+$hasMSSQL = is_callable('sqlsrv_connect');
 $datadir = OC_Config::getValue('datadirectory', OC::$SERVERROOT.'/data');
 
 // Protect data directory here, so we can test if the protection is working
@@ -26,6 +27,7 @@ $opts = array(
 	'hasMySQL' => $hasMySQL,
 	'hasPostgreSQL' => $hasPostgreSQL,
 	'hasOracle' => $hasOracle,
+	'hasMSSQL' => $hasMSSQL,
 	'directory' => $datadir,
 	'secureRNG' => OC_Util::secureRNG_available(),
 	'htaccessWorking' => OC_Util::ishtaccessworking(),
diff --git a/core/templates/403.php b/core/templates/403.php
index fbf0e64fdb6e570692667b39965ed87ea347504b..6e910fd2e829262ed03db8b6e9db481a7e3e404a 100644
--- a/core/templates/403.php
+++ b/core/templates/403.php
@@ -9,7 +9,7 @@ if(!isset($_)) {//also provide standalone error page
 ?>
 <ul>
 	<li class='error'>
-		<?php echo $l->t( 'Access forbidden' ); ?><br/>
-		<p class='hint'><?php if(isset($_['file'])) echo $_['file']?></p>
+		<?php p($l->t( 'Access forbidden' )); ?><br/>
+		<p class='hint'><?php if(isset($_['file'])) p($_['file'])?></p>
 	</li>
 </ul>
diff --git a/core/templates/404.php b/core/templates/404.php
index c111fd70fa92eb17d1597e83c54b20a00b8c4de5..ee17f0de8e1957c5b66335010ee163005a52409a 100644
--- a/core/templates/404.php
+++ b/core/templates/404.php
@@ -9,7 +9,7 @@ if(!isset($_)) {//also provide standalone error page
 ?>
 <ul>
 	<li class='error'>
-		<?php echo $l->t( 'Cloud not found' ); ?><br/>
-		<p class='hint'><?php if(isset($_['file'])) echo $_['file']?></p>
+		<?php p($l->t( 'Cloud not found' )); ?><br/>
+		<p class='hint'><?php if(isset($_['file'])) p($_['file'])?></p>
 	</li>
 </ul>
diff --git a/core/templates/edit_categories_dialog.php b/core/templates/edit_categories_dialog.php
index d0b7b5ee62afe254329e5c6c962e36259f6dadd9..ea155bdf0ba3532456f5a83e54eafeb624d23e08 100644
--- a/core/templates/edit_categories_dialog.php
+++ b/core/templates/edit_categories_dialog.php
@@ -1,19 +1,19 @@
 <?php
 $categories = isset($_['categories'])?$_['categories']:array();
 ?>
-<div id="edit_categories_dialog" title="<?php echo $l->t('Edit categories'); ?>">
+<div id="edit_categories_dialog" title="<?php p($l->t('Edit categories')); ?>">
 <!-- ?php print_r($types); ? -->
 	<form method="post" id="categoryform">
 	<div class="scrollarea">
 	<ul id="categorylist">
 	<?php foreach($categories as $category): ?>
-	<li><input type="checkbox" name="categories[]" value="<?php echo $category; ?>" /><?php echo $category; ?></li>
+	<li><input type="checkbox" name="categories[]" value="<?php p($category); ?>" /><?php p($category); ?></li>
 	<?php endforeach; ?>
 	</ul>
 	</div>
 	<div class="bottombuttons">
 		<input type="text" id="category_addinput" name="category" />
-		<button id="category_addbutton" disabled="disabled"><?php echo $l->t('Add'); ?></button>
+		<button id="category_addbutton" disabled="disabled"><?php p($l->t('Add')); ?></button>
 	</div>
 	</form>
 </div>
diff --git a/core/templates/error.php b/core/templates/error.php
index 4f05e008f99b0857536adb37af798ab86945ffa6..ac91357b350e1f53a1bcadf72bf5ebfeac6fdb43 100644
--- a/core/templates/error.php
+++ b/core/templates/error.php
@@ -1,8 +1,8 @@
 <ul>
 	<?php foreach($_["errors"] as $error):?>
 		<li class='error'>
-			<?php echo $error['error'] ?><br/>
-			<p class='hint'><?php if(isset($error['hint']))echo $error['hint'] ?></p>
+			<?php p($error['error']) ?><br/>
+			<p class='hint'><?php if(isset($error['hint']))print_unescaped($error['hint']) ?></p>
 		</li>
 	<?php endforeach ?>
 </ul>
diff --git a/core/templates/exception.php b/core/templates/exception.php
deleted file mode 100644
index 62d6cf2ade5c57d135a0880fc6e514ce7206e68c..0000000000000000000000000000000000000000
--- a/core/templates/exception.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<ul>
-	<li class='error'>
-		<details>
-		<summary class="error">We're sorry, but something went terribly wrong.<br></summary>
-		<p class="exception">
-		<?php
-		if($_['showsysinfo'] == true) {
-			echo 'If you would like to support ownCloud\'s developers and report this error in our <a href="https://github.com/owncloud/core">bug tracker</a>, please copy the following informations into the description. <br><br><textarea readonly>';
-			echo 'Message: '  . $_['message'] . "\n";
-			echo 'Error Code: '  . $_['code'] . "\n";
-			echo 'File: '  . $_['file'] . "\n";
-			echo 'Line: '  . $_['line'] . "\n\n";
-			echo 'PHP: '  . $_['sysinfo']['phpversion'] . "\n";
-			echo 'OS: '  . $_['sysinfo']['os'] . "\n";
-			echo 'OS Release: '  . $_['sysinfo']['osrelease'] . "\n";
-			echo 'OS Arch.: '  . $_['sysinfo']['osarchitecture'] . "\n";
-			echo 'PHP-Server-Interface: '  . $_['sysinfo']['phpserverinterface'] . "\n";
-			echo 'Protocol: '  . $_['sysinfo']['serverprotocol'] . "\n";
-			echo 'HTTPS: '  . $_['sysinfo']['https'] . "\n";
-			echo 'Request Method: '  . $_['sysinfo']['requestmethod'] . "\n";
-			echo 'Database: '  . $_['sysinfo']['database'] . "\n";
-			echo '</textarea>';
-		} else {
-			echo 'Your administrator has disabled systeminformations.';
-		}
-		?>
-		</p>
-		</details>
-	</li>
-</ul>
diff --git a/core/templates/installation.php b/core/templates/installation.php
index b3b7cfc4b8b0a73fc0e6652b307c7142027eba31..842686932c77f92947ea63b8c32a635027cc0539 100644
--- a/core/templates/installation.php
+++ b/core/templates/installation.php
@@ -1,7 +1,8 @@
-<input type='hidden' id='hasMySQL' value='<?php echo $_['hasMySQL'] ?>'>
-<input type='hidden' id='hasSQLite' value='<?php echo $_['hasSQLite'] ?>'>
-<input type='hidden' id='hasPostgreSQL' value='<?php echo $_['hasPostgreSQL'] ?>'>
-<input type='hidden' id='hasOracle' value='<?php echo $_['hasOracle'] ?>'>
+<input type='hidden' id='hasMySQL' value='<?php p($_['hasMySQL']) ?>'>
+<input type='hidden' id='hasSQLite' value='<?php p($_['hasSQLite']) ?>'>
+<input type='hidden' id='hasPostgreSQL' value='<?php p($_['hasPostgreSQL']) ?>'>
+<input type='hidden' id='hasOracle' value='<?php p($_['hasOracle']) ?>'>
+<input type='hidden' id='hasMSSQL' value='<?php p($_['hasMSSQL']) ?>'>
 <form action="index.php" method="post">
 <input type="hidden" name="install" value="true" />
 	<?php if(count($_['errors']) > 0): ?>
@@ -9,10 +10,10 @@
 		<?php foreach($_['errors'] as $err): ?>
 		<li>
 			<?php if(is_array($err)):?>
-				<?php print $err['error']; ?>
-				<p class='hint'><?php print $err['hint']; ?></p>
+				<?php print_unescaped($err['error']); ?>
+				<p class='hint'><?php print_unescaped($err['hint']); ?></p>
 			<?php else: ?>
-				<?php print $err; ?>
+				<?php print_unescaped($err); ?>
 			<?php endif; ?>
 		</li>
 		<?php endforeach; ?>
@@ -20,118 +21,143 @@
 	<?php endif; ?>
 	<?php if(!$_['secureRNG']): ?>
 	<fieldset class="warning">
-		<legend><strong><?php echo $l->t('Security Warning');?></strong></legend>
-		<p><?php echo $l->t('No secure random number generator is available, please enable the PHP OpenSSL extension.');?><br/>
-		<?php echo $l->t('Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account.');?></p>		
+		<legend><strong><?php p($l->t('Security Warning'));?></strong></legend>
+		<p><?php p($l->t('No secure random number generator is available, please enable the PHP OpenSSL extension.'));?><br/>
+		<?php p($l->t('Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account.'));?></p>
 	</fieldset>
 	<?php endif; ?>
 	<?php if(!$_['htaccessWorking']): ?>
 	<fieldset class="warning">
-		<legend><strong><?php echo $l->t('Security Warning');?></strong></legend>
-		<p><?php echo $l->t('Your data directory and files are probably accessible from the internet because the .htaccess file does not work.');?><br>
-		<?php echo $l->t('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>
+		<legend><strong><?php p($l->t('Security Warning'));?></strong></legend>
+		<p><?php p($l->t('Your data directory and files are probably accessible from the internet because the .htaccess file does not work.'));?><br>
+		<?php print_unescaped($l->t('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>
 	</fieldset>
 	<?php endif; ?>
 	<fieldset id="adminaccount">
-		<legend><?php echo $l->t( 'Create an <strong>admin account</strong>' ); ?></legend>
+		<legend><?php print_unescaped($l->t( 'Create an <strong>admin account</strong>' )); ?></legend>
 		<p class="infield grouptop">
-			<input type="text" name="adminlogin" id="adminlogin" value="<?php print OC_Helper::init_var('adminlogin'); ?>" autocomplete="off" autofocus required />
-			<label for="adminlogin" class="infield"><?php echo $l->t( 'Username' ); ?></label>
-			<img class="svg" src="<?php echo image_path('', 'actions/user.svg'); ?>" alt="" />
+			<input type="text" name="adminlogin" id="adminlogin" placeholder=""
+				value="<?php p(OC_Helper::init_var('adminlogin')); ?>" autocomplete="off" autofocus required />
+			<label for="adminlogin" class="infield"><?php p($l->t( 'Username' )); ?></label>
+			<img class="svg" src="<?php p(image_path('', 'actions/user.svg')); ?>" alt="" />
 		</p>
 		<p class="infield groupbottom">
-			<input type="password" name="adminpass" data-typetoggle="#show" id="adminpass" value="<?php print OC_Helper::init_var('adminpass'); ?>" />
-			<label for="adminpass" class="infield"><?php echo $l->t( 'Password' ); ?></label>
-			<img class="svg" id="adminpass-icon" src="<?php echo image_path('', 'actions/password.svg'); ?>" alt="" />
+			<input type="password" name="adminpass" data-typetoggle="#show" id="adminpass" placeholder=""
+				value="<?php p(OC_Helper::init_var('adminpass')); ?>" />
+			<label for="adminpass" class="infield"><?php p($l->t( 'Password' )); ?></label>
+			<img class="svg" id="adminpass-icon" src="<?php print_unescaped(image_path('', 'actions/password.svg')); ?>" alt="" />
 			<input type="checkbox" id="show" name="show" />
 			<label for="show"></label>
 		</p>
 	</fieldset>
 
 	<fieldset id="datadirField">
-		<legend><a id="showAdvanced"><?php echo $l->t( 'Advanced' ); ?> <img class="svg" src="<?php echo image_path('', 'actions/triangle-s.svg'); ?>" /></a></legend>
+		<legend><a id="showAdvanced"><?php p($l->t( 'Advanced' )); ?> <img class="svg" src="<?php print_unescaped(image_path('', 'actions/caret-dark.svg')); ?>" /></a></legend>
 		<div id="datadirContent">
-			<label for="directory"><?php echo $l->t( 'Data folder' ); ?></label>
-			<input type="text" name="directory" id="directory" value="<?php print OC_Helper::init_var('directory', $_['directory']); ?>" />
+			<label for="directory"><?php p($l->t( 'Data folder' )); ?></label>
+			<input type="text" name="directory" id="directory"
+				value="<?php p(OC_Helper::init_var('directory', $_['directory'])); ?>" />
 		</div>
 	</fieldset>
 
 	<fieldset id='databaseField'>
-		<?php if($_['hasMySQL'] or $_['hasPostgreSQL'] or $_['hasOracle']) $hasOtherDB = true; else $hasOtherDB =false; //other than SQLite ?>
-		<legend><?php echo $l->t( 'Configure the database' ); ?></legend>
+		<?php if($_['hasMySQL'] or $_['hasPostgreSQL'] or $_['hasOracle'] or $_['hasMSSQL'])
+			$hasOtherDB = true; else $hasOtherDB =false; //other than SQLite ?>
+		<legend><?php p($l->t( 'Configure the database' )); ?></legend>
 		<div id="selectDbType">
 		<?php if($_['hasSQLite']): ?>
 		<input type='hidden' id='hasSQLite' value="true" />
 		<?php if(!$hasOtherDB): ?>
-		<p>SQLite <?php echo $l->t( 'will be used' ); ?>.</p>
+		<p>SQLite <?php p($l->t( 'will be used' )); ?>.</p>
 		<input type="hidden" id="dbtype" name="dbtype" value="sqlite" />
 		<?php else: ?>
-		<input type="radio" name="dbtype" value="sqlite" id="sqlite" <?php OC_Helper::init_radio('dbtype', 'sqlite', 'sqlite'); ?>/>
+		<input type="radio" name="dbtype" value="sqlite" id="sqlite"
+			<?php OC_Helper::init_radio('dbtype', 'sqlite', 'sqlite'); ?>/>
 		<label class="sqlite" for="sqlite">SQLite</label>
 		<?php endif; ?>
 		<?php endif; ?>
 
 		<?php if($_['hasMySQL']): ?>
 		<input type='hidden' id='hasMySQL' value='true'/>
-		<?php if(!$_['hasSQLite'] and !$_['hasPostgreSQL'] and !$_['hasOracle']): ?>
-		<p>MySQL <?php echo $l->t( 'will be used' ); ?>.</p>
+		<?php if(!$_['hasSQLite'] and !$_['hasPostgreSQL'] and !$_['hasOracle'] and !$_['hasMSSQL']): ?>
+		<p>MySQL <?php p($l->t( 'will be used' )); ?>.</p>
 		<input type="hidden" id="dbtype" name="dbtype" value="mysql" />
 		<?php else: ?>
-		<input type="radio" name="dbtype" value="mysql" id="mysql" <?php OC_Helper::init_radio('dbtype', 'mysql', 'sqlite'); ?>/>
+		<input type="radio" name="dbtype" value="mysql" id="mysql"
+			<?php OC_Helper::init_radio('dbtype', 'mysql', 'sqlite'); ?>/>
 		<label class="mysql" for="mysql">MySQL</label>
 		<?php endif; ?>
 		<?php endif; ?>
 
 		<?php if($_['hasPostgreSQL']): ?>
-		<?php if(!$_['hasSQLite'] and !$_['hasMySQL'] and !$_['hasOracle']): ?>
-		<p>PostgreSQL <?php echo $l->t( 'will be used' ); ?>.</p>
+		<?php if(!$_['hasSQLite'] and !$_['hasMySQL'] and !$_['hasOracle'] and !$_['hasMSSQL']): ?>
+		<p>PostgreSQL <?php p($l->t( 'will be used' )); ?>.</p>
 		<input type="hidden" id="dbtype" name="dbtype" value="pgsql" />
 		<?php else: ?>
 		<label class="pgsql" for="pgsql">PostgreSQL</label>
-		<input type="radio" name="dbtype" value='pgsql' id="pgsql" <?php OC_Helper::init_radio('dbtype', 'pgsql', 'sqlite'); ?>/>
+		<input type="radio" name="dbtype" value='pgsql' id="pgsql"
+			<?php OC_Helper::init_radio('dbtype', 'pgsql', 'sqlite'); ?>/>
 		<?php endif; ?>
 		<?php endif; ?>
 
 		<?php if($_['hasOracle']): ?>
-		<?php if(!$_['hasSQLite'] and !$_['hasMySQL'] and !$_['hasPostgreSQL']): ?>
-		<p>Oracle <?php echo $l->t( 'will be used' ); ?>.</p>
+		<?php if(!$_['hasSQLite'] and !$_['hasMySQL'] and !$_['hasPostgreSQL'] and !$_['hasMSSQL']): ?>
+		<p>Oracle <?php p($l->t( 'will be used' )); ?>.</p>
 		<input type="hidden" id="dbtype" name="dbtype" value="oci" />
 		<?php else: ?>
 		<label class="oci" for="oci">Oracle</label>
-		<input type="radio" name="dbtype" value='oci' id="oci" <?php OC_Helper::init_radio('dbtype', 'oci', 'sqlite'); ?>/>
+		<input type="radio" name="dbtype" value='oci' id="oci"
+			<?php OC_Helper::init_radio('dbtype', 'oci', 'sqlite'); ?>/>
 		<?php endif; ?>
 		<?php endif; ?>
+        
+		<?php if($_['hasMSSQL']): ?>
+		<input type='hidden' id='hasMSSQL' value='true'/>
+		<?php if(!$_['hasSQLite'] and !$_['hasMySQL'] and !$_['hasPostgreSQL'] and !$_['hasOracle']): ?>
+		<p>MS SQL <?php p($l->t( 'will be used' )); ?>.</p>
+		<input type="hidden" id="dbtype" name="dbtype" value="mssql" />
+		<?php else: ?>
+		<label class="mssql" for="mssql">MS SQL</label>
+		<input type="radio" name="dbtype" value='mssql' id="mssql" <?php OC_Helper::init_radio('dbtype', 'mssql', 'sqlite'); ?>/>
+		<?php endif; ?>
+		<?php endif; ?>        
 		</div>
 
 		<?php if($hasOtherDB): ?>
 		<div id="use_other_db">
 			<p class="infield grouptop">
-				<label for="dbuser" class="infield"><?php echo $l->t( 'Database user' ); ?></label>
-				<input type="text" name="dbuser" id="dbuser" value="<?php print OC_Helper::init_var('dbuser'); ?>" autocomplete="off" />
+				<label for="dbuser" class="infield"><?php p($l->t( 'Database user' )); ?></label>
+				<input type="text" name="dbuser" id="dbuser" placeholder=""
+					value="<?php p(OC_Helper::init_var('dbuser')); ?>" autocomplete="off" />
 			</p>
 			<p class="infield groupmiddle">
-				<label for="dbpass" class="infield"><?php echo $l->t( 'Database password' ); ?></label>
-				<input type="password" name="dbpass" id="dbpass" value="<?php print OC_Helper::init_var('dbpass'); ?>" />
+				<label for="dbpass" class="infield"><?php p($l->t( 'Database password' )); ?></label>
+				<input type="password" name="dbpass" id="dbpass" placeholder=""
+					value="<?php p(OC_Helper::init_var('dbpass')); ?>" />
 			</p>
 			<p class="infield groupmiddle">
-				<label for="dbname" class="infield"><?php echo $l->t( 'Database name' ); ?></label>
-				<input type="text" name="dbname" id="dbname" value="<?php print OC_Helper::init_var('dbname'); ?>" autocomplete="off" pattern="[0-9a-zA-Z$_-]+" />
+				<label for="dbname" class="infield"><?php p($l->t( 'Database name' )); ?></label>
+				<input type="text" name="dbname" id="dbname" placeholder=""
+					value="<?php p(OC_Helper::init_var('dbname')); ?>"
+					autocomplete="off" pattern="[0-9a-zA-Z$_-]+" />
 			</p>
 		</div>
 		<?php endif; ?>
 		<?php if($_['hasOracle']): ?>
 		<div id="use_oracle_db">
 			<p class="infield groupmiddle">
-				<label for="dbtablespace" class="infield"><?php echo $l->t( 'Database tablespace' ); ?></label>
-				<input type="text" name="dbtablespace" id="dbtablespace" value="<?php print OC_Helper::init_var('dbtablespace'); ?>" autocomplete="off" />
+				<label for="dbtablespace" class="infield"><?php p($l->t( 'Database tablespace' )); ?></label>
+				<input type="text" name="dbtablespace" id="dbtablespace" placeholder=""
+					value="<?php p(OC_Helper::init_var('dbtablespace')); ?>" autocomplete="off" />
 			</p>
 		</div>
 		<?php endif; ?>
 		<p class="infield groupbottom">
-			<label for="dbhost" class="infield" id="dbhostlabel"><?php echo $l->t( 'Database host' ); ?></label>
-			<input type="text" name="dbhost" id="dbhost" value="<?php print OC_Helper::init_var('dbhost', 'localhost'); ?>" />
+			<label for="dbhost" class="infield" id="dbhostlabel"><?php p($l->t( 'Database host' )); ?></label>
+			<input type="text" name="dbhost" id="dbhost" placeholder=""
+				value="<?php p(OC_Helper::init_var('dbhost', 'localhost')); ?>" />
 		</p>
 	</fieldset>
 
-	<div class="buttons"><input type="submit" class="primary" value="<?php echo $l->t( 'Finish setup' ); ?>" /></div>
+	<div class="buttons"><input type="submit" class="primary" value="<?php p($l->t( 'Finish setup' )); ?>" /></div>
 </form>
diff --git a/core/templates/layout.base.php b/core/templates/layout.base.php
index 2049bcb36da73c5daa904b036bd2e5748047da11..336df27ef1c93e00dd0978dae3ffa9893f066bda 100644
--- a/core/templates/layout.base.php
+++ b/core/templates/layout.base.php
@@ -1,27 +1,33 @@
 <!DOCTYPE html>
-<html>
+<!--[if lt IE 7]><html class="ng-csp ie ie6 lte9 lte8 lte7"><![endif]-->
+<!--[if IE 7]><html class="ng-csp ie ie7 lte9 lte8 lte7"><![endif]-->
+<!--[if IE 8]><html class="ng-csp ie ie8 lte9 lte8"><![endif]-->
+<!--[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>
 		<title>ownCloud</title>
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-		<link rel="shortcut icon" href="<?php echo image_path('', 'favicon.png'); ?>" /><link rel="apple-touch-icon-precomposed" href="<?php echo image_path('', 'favicon-touch.png'); ?>" />
+		<link rel="shortcut icon" href="<?php print_unescaped(image_path('', 'favicon.png')); ?>" />
+		<link rel="apple-touch-icon-precomposed" href="<?php print_unescaped(image_path('', 'favicon-touch.png')); ?>" />
 		<?php foreach ($_['cssfiles'] as $cssfile): ?>
-			<link rel="stylesheet" href="<?php echo $cssfile; ?>" type="text/css" media="screen" />
+			<link rel="stylesheet" href="<?php print_unescaped($cssfile); ?>" type="text/css" media="screen" />
 		<?php endforeach; ?>
 		<?php foreach ($_['jsfiles'] as $jsfile): ?>
-			<script type="text/javascript" src="<?php echo $jsfile; ?>"></script>
+			<script type="text/javascript" src="<?php print_unescaped($jsfile); ?>"></script>
 		<?php endforeach; ?>
 		<?php foreach ($_['headers'] as $header): ?>
 			<?php
-				echo '<'.$header['tag'].' ';
+				print_unescaped('<'.$header['tag'].' ');
 				foreach ($header['attributes'] as $name => $value) {
-					echo "$name='$value' ";
+					print_unescaped("$name='$value' ");
 				};
-				echo '/>';
+				print_unescaped('/>');
 			?>
 		<?php endforeach; ?>
 	</head>
 
 	<body>
-		<?php echo $_['content']; ?>
+		<?php print_unescaped($_['content']); ?>
 	</body>
 </html>
diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php
index 69330aa9fceba0c0982c7f169fb9e994b9e3afe3..04161925436ec4720ff9f474042dd246bb65b619 100644
--- a/core/templates/layout.guest.php
+++ b/core/templates/layout.guest.php
@@ -1,24 +1,30 @@
 <!DOCTYPE html>
-<html>
+<!--[if lt IE 7]><html class="ng-csp ie ie6 lte9 lte8 lte7"><![endif]-->
+<!--[if IE 7]><html class="ng-csp ie ie7 lte9 lte8 lte7"><![endif]-->
+<!--[if IE 8]><html class="ng-csp ie ie8 lte9 lte8"><![endif]-->
+<!--[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>
 		<title>ownCloud</title>
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 		<meta name="apple-itunes-app" content="app-id=543672169">
-		<link rel="shortcut icon" href="<?php echo image_path('', 'favicon.png'); ?>" /><link rel="apple-touch-icon-precomposed" href="<?php echo image_path('', 'favicon-touch.png'); ?>" />
+		<link rel="shortcut icon" href="<?php print_unescaped(image_path('', 'favicon.png')); ?>" />
+		<link rel="apple-touch-icon-precomposed" href="<?php print_unescaped(image_path('', 'favicon-touch.png')); ?>" />
 		<?php foreach($_['cssfiles'] as $cssfile): ?>
-			<link rel="stylesheet" href="<?php echo $cssfile; ?>" type="text/css" media="screen" />
+			<link rel="stylesheet" href="<?php print_unescaped($cssfile); ?>" type="text/css" media="screen" />
 		<?php endforeach; ?>
 		<?php foreach($_['jsfiles'] as $jsfile): ?>
-			<script type="text/javascript" src="<?php echo $jsfile; ?>"></script>
+			<script type="text/javascript" src="<?php print_unescaped($jsfile); ?>"></script>
 		<?php endforeach; ?>
 	
 		<?php foreach($_['headers'] as $header): ?>
 			<?php
-				echo '<'.$header['tag'].' ';
+				print_unescaped('<'.$header['tag'].' ');
 				foreach($header['attributes'] as $name=>$value) {
-					echo "$name='$value' ";
+					print_unescaped("$name='$value' ");
 				};
-				echo '/>';
+				print_unescaped('/>');
 			?>
 		<?php endforeach; ?>
 	</head>
@@ -26,10 +32,11 @@
 	<body id="body-login">
 		<div id="login">
 			<header><div id="header">
-				<img src="<?php echo image_path('', 'logo.svg'); ?>" class="svg" alt="ownCloud" />
+				<img src="<?php print_unescaped(image_path('', 'logo.svg')); ?>" class="svg" alt="ownCloud" />
 			</div></header>
-			<?php echo $_['content']; ?>
+			<?php print_unescaped($_['content']); ?>
 		</div>
-		<footer><p class="info"><a href="http://owncloud.org/">ownCloud</a> &ndash; <?php echo $l->t( 'web services under your control' ); ?></p></footer>
+		<footer><p class="info"><a href="http://owncloud.org/">ownCloud</a> &ndash;
+			<?php p($l->t( 'web services under your control' )); ?></p></footer>
 	</body>
 </html>
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index 2d00bdb5c8ec9874832ccce416c99396132fccb3..982efb412b6e1ca61e920eb6ac66b6252fe7abfa 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -1,68 +1,81 @@
 <!DOCTYPE html>
-<html>
+<!--[if lt IE 7]><html class="ng-csp ie ie6 lte9 lte8 lte7"><![endif]-->
+<!--[if IE 7]><html class="ng-csp ie ie7 lte9 lte8 lte7"><![endif]-->
+<!--[if IE 8]><html class="ng-csp ie ie8 lte9 lte8"><![endif]-->
+<!--[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>
-		<title><?php echo !empty($_['application'])?$_['application'].' | ':'' ?>ownCloud <?php echo !empty($_['user_displayname'])?' ('.$_['user_displayname'].') ':'' ?></title>
+		<title><?php p(!empty($_['application'])?$_['application'].' | ':'') ?>ownCloud
+			<?php p(trim($_['user_displayname']) != '' ?' ('.$_['user_displayname'].') ':'') ?></title>
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 		<meta name="apple-itunes-app" content="app-id=543672169">
-		<link rel="shortcut icon" href="<?php echo image_path('', 'favicon.png'); ?>" /><link rel="apple-touch-icon-precomposed" href="<?php echo image_path('', 'favicon-touch.png'); ?>" />
+		<link rel="shortcut icon" href="<?php print_unescaped(image_path('', 'favicon.png')); ?>" />
+		<link rel="apple-touch-icon-precomposed" href="<?php print_unescaped(image_path('', 'favicon-touch.png')); ?>" />
 		<?php foreach($_['cssfiles'] as $cssfile): ?>
-			<link rel="stylesheet" href="<?php echo $cssfile; ?>" type="text/css" media="screen" />
+			<link rel="stylesheet" href="<?php print_unescaped($cssfile); ?>" type="text/css" media="screen" />
 		<?php endforeach; ?>
 		<?php foreach($_['jsfiles'] as $jsfile): ?>
-			<script type="text/javascript" src="<?php echo $jsfile; ?>"></script>
+			<script type="text/javascript" src="<?php print_unescaped($jsfile); ?>"></script>
 		<?php endforeach; ?>
 		<?php foreach($_['headers'] as $header): ?>
 			<?php
-				echo '<'.$header['tag'].' ';
+				print_unescaped('<'.$header['tag'].' ');
 				foreach($header['attributes'] as $name=>$value) {
-					echo "$name='$value' ";
+					print_unescaped("$name='$value' ");
 				};
-				echo '/>';
+				print_unescaped('/>');
 			?>
 		<?php endforeach; ?>
 	</head>
 
-	<body id="<?php echo $_['bodyid'];?>">
+	<body id="<?php p($_['bodyid']);?>">
 	<div id="notification-container">
 		<div id="notification"></div>
 	</div>
 	<header><div id="header">
-			<a href="<?php echo link_to('', 'index.php'); ?>" title="" id="owncloud"><img class="svg" src="<?php echo image_path('', 'logo-wide.svg'); ?>" alt="ownCloud" /></a>
+			<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">
-					<?php echo $_['displayname'] ?>
-					<img class="svg" src="<?php echo image_path('', 'actions/caret.svg'); ?>" />
+					<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>
 				<div id="expanddiv">
 				<?php foreach($_['settingsnavigation'] as $entry):?>
 					<li>
-						<a href="<?php echo $entry['href']; ?>" title="" <?php if( $entry["active"] ): ?> class="active"<?php endif; ?>>
-							<img class="svg" alt="" src="<?php echo $entry['icon']; ?>">
-							<?php echo $entry['name'] ?>
+						<a href="<?php print_unescaped($entry['href']); ?>" title=""
+							<?php if( $entry["active"] ): ?> class="active"<?php endif; ?>>
+							<img class="svg" alt="" src="<?php print_unescaped($entry['icon']); ?>">
+							<?php p($entry['name']) ?>
 						</a>
 					</li>
 				<?php endforeach; ?>
 					<li>
-						<a id="logout" href="<?php echo link_to('', 'index.php'); ?>?logout=true">
-							<img class="svg" alt="" src="<?php echo image_path('', 'actions/logout.svg'); ?>" /> <?php echo $l->t('Log out');?>
+						<a id="logout" href="<?php print_unescaped(link_to('', 'index.php')); ?>?logout=true">
+							<img class="svg" alt="" src="<?php print_unescaped(image_path('', 'actions/logout.svg')); ?>" />
+							<?php p($l->t('Log out'));?>
 						</a>
 					</li>
 				</div>
 			</ul>
 
 			<form class="searchbox" action="#" method="post">
-				<input id="searchbox" class="svg" type="search" name="query" value="<?php if(isset($_POST['query'])) {echo OC_Util::sanitizeHTML($_POST['query']);};?>" autocomplete="off" x-webkit-speech />
+				<input id="searchbox" class="svg" type="search" name="query"
+					value="<?php if(isset($_POST['query'])) {p($_POST['query']);};?>"
+					autocomplete="off" x-webkit-speech />
 			</form>
 		</div></header>
 
 		<nav><div id="navigation">
 			<ul id="apps" class="svg">
 				<?php foreach($_['navigation'] as $entry): ?>
-					<li data-id="<?php echo $entry['id']; ?>">
-						<a href="<?php echo $entry['href']; ?>" title="" <?php if( $entry['active'] ): ?> class="active"<?php endif; ?>>
-							<img class="icon svg" src="<?php echo $entry['icon']; ?>"/>
-							<?php echo $entry['name']; ?>
+					<li data-id="<?php p($entry['id']); ?>">
+						<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']); ?>
 						</a>
 					</li>
 				<?php endforeach; ?>
@@ -71,7 +84,7 @@
 
 		<div id="content-wrapper">
 			<div id="content">
-				<?php echo $_['content']; ?>
+				<?php print_unescaped($_['content']); ?>
 			</div>
 		</div>
 	</body>
diff --git a/core/templates/login.php b/core/templates/login.php
index 3be2b039b032aa9b95b52c77f809c5f2ef11b9a9..2c9884f52469f8963887493b9441aee1c7eade02 100644
--- a/core/templates/login.php
+++ b/core/templates/login.php
@@ -2,54 +2,54 @@
 <form method="post">
 	<fieldset>
 	<?php if (!empty($_['redirect_url'])) {
-		echo '<input type="hidden" name="redirect_url" value="' . $_['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 echo $l->t('Automatic logon rejected!'); ?><br>
-				<small><?php echo $l->t('If you did not change your password recently, your account may be compromised!'); ?></small>
+				<?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 echo $l->t('Please change your password to secure your account again.'); ?></small>
+				<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 echo OC_Helper::linkToRoute('core_lostpassword_index') ?>">
+			<a href="<?php print_unescaped(OC_Helper::linkToRoute('core_lostpassword_index')) ?>">
 				<li class="errors">
-					<?php echo $l->t('Lost your password?'); ?>
+					<?php p($l->t('Lost your password?')); ?>
 				</li>
 			</a>
 			<?php endif; ?>
 		</ul>
 		<p class="infield grouptop">
-			<input type="text" name="user" id="user"
-				   value="<?php echo $_['username']; ?>"<?php echo $_['user_autofocus'] ? ' autofocus' : ''; ?>
+			<input type="text" name="user" id="user" placeholder=""
+				   value="<?php p($_['username']); ?>"<?php p($_['user_autofocus'] ? ' autofocus' : ''); ?>
 				   autocomplete="on" required/>
-			<label for="user" class="infield"><?php echo $l->t('Username'); ?></label>
-			<img class="svg" src="<?php echo image_path('', 'actions/user.svg'); ?>" alt=""/>
+			<label for="user" class="infield"><?php p($l->t('Username')); ?></label>
+			<img class="svg" src="<?php print_unescaped(image_path('', 'actions/user.svg')); ?>" alt=""/>
 		</p>
 
 		<p class="infield groupbottom">
-			<input type="password" name="password" id="password" value="" data-typetoggle="#show"
-				   required<?php echo $_['user_autofocus'] ? '' : ' autofocus'; ?> />
-			<label for="password" class="infield"><?php echo $l->t('Password'); ?></label>
-			<img class="svg" id="password-icon" src="<?php echo image_path('', 'actions/password.svg'); ?>" alt=""/>
+			<input type="password" name="password" id="password" value="" data-typetoggle="#show" placeholder=""
+				   required<?php p($_['user_autofocus'] ? '' : ' autofocus'); ?> />
+			<label for="password" class="infield"><?php p($l->t('Password')); ?></label>
+			<img class="svg" id="password-icon" src="<?php print_unescaped(image_path('', 'actions/password.svg')); ?>" alt=""/>
 			<input type="checkbox" id="show" name="show" />
 			<label for="show"></label>
 		</p>
 		<input type="checkbox" name="remember_login" value="1" id="remember_login"/><label
-			for="remember_login"><?php echo $l->t('remember'); ?></label>
+			for="remember_login"><?php p($l->t('remember')); ?></label>
 		<input type="hidden" name="timezone-offset" id="timezone-offset"/>
-		<input type="submit" id="submit" class="login primary" value="<?php echo $l->t('Log in'); ?>"/>
+		<input type="submit" id="submit" class="login primary" value="<?php p($l->t('Log in')); ?>"/>
 	</fieldset>
 </form>
 <?php if (!empty($_['alt_login'])) { ?>
 <form id="alternative-logins">
 	<fieldset>
-		<legend><?php echo $l->t('Alternative Logins') ?></legend>
+		<legend><?php p($l->t('Alternative Logins')) ?></legend>
 		<ul>
 			<?php foreach($_['alt_login'] as $login): ?>
-				<li><a class="button" href="<?php echo $login['href']; ?>" ><?php echo $login['name']; ?></a></li>
+				<li><a class="button" href="<?php print_unescaped($login['href']); ?>" ><?php p($login['name']); ?></a></li>
 			<?php endforeach; ?>
 		</ul>
 	</fieldset>
diff --git a/core/templates/part.pagenavi.php b/core/templates/part.pagenavi.php
index d43023a7822cc3e2e172e8ab8a5e4ceabfe9717e..2f5c218376568e52d8f3ee802f492f71587a284a 100644
--- a/core/templates/part.pagenavi.php
+++ b/core/templates/part.pagenavi.php
@@ -1,15 +1,15 @@
 <ol class="pager">
 	<?php if($_['page']>0):?>
-	<li class="pagerbutton1"><a href="<?php echo $_['url'].($_['page']-1);?>"><?php echo $l->t( 'prev' ); ?></a></li>
+	<li class="pagerbutton1"><a href="<?php print_unescaped($_['url'].($_['page']-1));?>"><?php p($l->t( 'prev' )); ?></a></li>
 	<?php endif; ?>
 	<?php if ($_['pagestart']>0):?>
 	&hellip;
 	<?php endif;?>
 	<?php for ($i=$_['pagestart']; $i < $_['pagestop'];$i++):?>
 		<?php if ($_['page']!=$i):?>
-		<li><a href="<?php echo $_['url'].$i;?>"><?php echo $i+1;?></a></li>
+		<li><a href="<?php print_unescaped($_['url'].$i);?>"><?php p($i+1);?></a></li>
 		<?php else:?>
-		<li><?php echo $i+1;?></li>
+		<li><?php p($i+1);?></li>
 		<?php endif?>
 	<?php endfor;?>
 	<?php if ($_['pagestop']<$_['pagecount']):?>
@@ -17,6 +17,6 @@
 	<?php endif;?>
 
 	<?php if(($_['page']+1)<$_['pagecount']):?>
-	<li class="pagerbutton2"><a href="<?php echo $_['url'].($_['page']+1);?>"><?php echo $l->t( 'next' ); ?></a></li>
+	<li class="pagerbutton2"><a href="<?php print_unescaped($_['url'].($_['page']+1));?>"><?php p($l->t( 'next' )); ?></a></li>
 	<?php endif; ?>
 </ol>
diff --git a/core/templates/update.php b/core/templates/update.php
index ae714dcfb92211849acd7dbde483e4e2f246bdd6..a652d5f195a4830651c291f20a8fbad036d5048d 100644
--- a/core/templates/update.php
+++ b/core/templates/update.php
@@ -1,5 +1,6 @@
 <ul>
 	<li class='update'>
-		<?php echo $l->t('Updating ownCloud to version %s, this may take a while.', array($_['version'])); ?><br /><br />
+		<?php p($l->t('Updating ownCloud to version %s, this may take a while.',
+			array($_['version']))); ?><br /><br />
 	</li>
 </ul>
diff --git a/l10n/af_ZA/files.po b/l10n/af_ZA/files.po
index bdbedc57b7bf3dc07a0eab866247429a8166cc3b..e864f4fc420285ec07719bbc2affce4a890935dc 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-02-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\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: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
 "MIME-Version: 1.0\n"
@@ -50,27 +50,27 @@ msgid ""
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:31
+#: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:32
+#: ajax/upload.php:31
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:33
+#: ajax/upload.php:32
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:34
+#: ajax/upload.php:33
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:52
+#: ajax/upload.php:51
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:83
+#: ajax/upload.php:82
 msgid "Invalid directory."
 msgstr ""
 
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:127 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:127 templates/index.php:92 templates/index.php:93
 msgid "Delete"
 msgstr ""
 
@@ -90,40 +90,36 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:253
+#: js/filelist.js:251
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:295
-msgid "replaced {new_name}"
+#: js/filelist.js:298
+msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:295 js/filelist.js:297
+#: js/filelist.js:298
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:297
-msgid "replaced {new_name} with {old_name}"
-msgstr ""
-
-#: js/filelist.js:322
+#: js/filelist.js:323
 msgid "perform delete operation"
 msgstr ""
 
@@ -149,74 +145,74 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:224
+#: js/files.js:225
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:261
+#: js/files.js:262
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:261
+#: js/files.js:262
 msgid "Upload Error"
 msgstr ""
 
-#: js/files.js:272
+#: js/files.js:273
 msgid "Close"
 msgstr ""
 
-#: js/files.js:311
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr ""
 
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr ""
 
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:496
+#: js/files.js:497
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:569
+#: js/files.js:570
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:574
+#: js/files.js:575
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:953 templates/index.php:68
 msgid "Name"
 msgstr ""
 
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:954 templates/index.php:79
 msgid "Size"
 msgstr ""
 
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:955 templates/index.php:81
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:969
+#: js/files.js:974
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:971
+#: js/files.js:976
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:979
+#: js/files.js:984
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:981
+#: js/files.js:986
 msgid "{count} files"
 msgstr ""
 
@@ -280,33 +276,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:53
+msgid "You don’t have write permissions here."
+msgstr ""
+
+#: templates/index.php:60
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:73
+#: templates/index.php:74
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:86 templates/index.php:87
 msgid "Unshare"
 msgstr ""
 
-#: templates/index.php:105
+#: templates/index.php:106
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:107
+#: templates/index.php:108
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:112
+#: templates/index.php:113
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:115
+#: templates/index.php:116
 msgid "Current scanning"
 msgstr ""
 
diff --git a/l10n/af_ZA/files_external.po b/l10n/af_ZA/files_external.po
index fab8ff9b425b8c0d755233767254c681d9d79f56..d8d3d0197b653027605df01cc367b13c38844dc9 100644
--- a/l10n/af_ZA/files_external.po
+++ b/l10n/af_ZA/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-05 00:19+0100\n"
-"PO-Revision-Date: 2012-08-12 22:34+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-02-28 00:04+0100\n"
+"PO-Revision-Date: 2013-02-27 23:04+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: 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"
@@ -17,37 +17,33 @@ msgstr ""
 "Language: af_ZA\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:405
+#: lib/config.php:421
 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:406
+#: lib/config.php:424
 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 "
@@ -58,63 +54,63 @@ msgstr ""
 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 "Gebruikers"
 
-#: templates/settings.php:108 templates/settings.php:109
-#: templates/settings.php:144 templates/settings.php:145
+#: templates/settings.php:113 templates/settings.php:114
+#: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
 msgstr ""
 
-#: 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:136
+#: templates/settings.php:141
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:153
+#: templates/settings.php:159
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/af_ZA/files_trashbin.po b/l10n/af_ZA/files_trashbin.po
index 6fd4dfb314f0749233a1c5a547d30bc533f82b3d..ab00b3efd96780ac1409f6633e0f35f2ff3409f5 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-02-08 00:10+0100\n"
-"PO-Revision-Date: 2013-02-07 23:11+0000\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: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
 "MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Language: af_ZA\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:22
+#: ajax/delete.php:40
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
@@ -27,35 +27,39 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:33
+#: js/trash.js:34
 msgid "delete file permanently"
 msgstr ""
 
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr ""
+
+#: js/trash.js:174 templates/index.php:17
 msgid "Name"
 msgstr ""
 
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:175 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:135
+#: js/trash.js:184
 msgid "1 folder"
 msgstr ""
 
-#: js/trash.js:137
+#: js/trash.js:186
 msgid "{count} folders"
 msgstr ""
 
-#: js/trash.js:145
+#: js/trash.js:194
 msgid "1 file"
 msgstr ""
 
-#: js/trash.js:147
+#: js/trash.js:196
 msgid "{count} files"
 msgstr ""
 
@@ -66,3 +70,11 @@ 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/af_ZA/files_versions.po b/l10n/af_ZA/files_versions.po
index 14eaae14745a492f99f498e1fdd438ff5bc81c50..cf1a612ba6ed129afd9e8319b3984db150301695 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-08 00:10+0100\n"
-"PO-Revision-Date: 2013-02-07 23:11+0000\n"
+"POT-Creation-Date: 2013-02-28 00:04+0100\n"
+"PO-Revision-Date: 2013-02-27 23:04+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
 "MIME-Version: 1.0\n"
@@ -48,18 +48,10 @@ msgstr ""
 msgid "No path specified"
 msgstr ""
 
-#: js/versions.js:16
-msgid "History"
+#: 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 ""
-
-#: templates/settings.php:3
-msgid "Files Versioning"
-msgstr ""
-
-#: templates/settings.php:4
-msgid "Enable"
-msgstr ""
diff --git a/l10n/af_ZA/lib.po b/l10n/af_ZA/lib.po
index fb18d9680196f961b82875a17f7aa7728fd92ede..5c1a70c23db1a60a631074dbf025af37e6522eda 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-11 15:39+0100\n"
-"PO-Revision-Date: 2013-02-11 14:41+0000\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: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
 "MIME-Version: 1.0\n"
@@ -17,27 +17,27 @@ msgstr ""
 "Language: af_ZA\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:339
+#: app.php:349
 msgid "Help"
 msgstr "Hulp"
 
-#: app.php:346
+#: app.php:362
 msgid "Personal"
 msgstr "Persoonlik"
 
-#: app.php:351
+#: app.php:373
 msgid "Settings"
 msgstr "Instellings"
 
-#: app.php:356
+#: app.php:385
 msgid "Users"
 msgstr "Gebruikers"
 
-#: app.php:363
+#: app.php:398
 msgid "Apps"
 msgstr "Toepassings"
 
-#: app.php:365
+#: app.php:406
 msgid "Admin"
 msgstr "Admin"
 
@@ -49,15 +49,15 @@ msgstr ""
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:203 files.php:228
+#: files.php:204 files.php:231
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:227
+#: files.php:228
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: helper.php:226
+#: helper.php:228
 msgid "couldn't be determined"
 msgstr ""
 
@@ -97,87 +97,92 @@ msgstr ""
 msgid "Specify a data folder."
 msgstr ""
 
-#: setup.php:53
+#: setup.php:55
 #, php-format
 msgid "%s enter the database username."
 msgstr ""
 
-#: setup.php:56
+#: setup.php:58
 #, php-format
 msgid "%s enter the database name."
 msgstr ""
 
-#: setup.php:59
+#: setup.php:61
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr ""
 
-#: setup.php:62
+#: setup.php:64
 #, php-format
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:126 setup.php:291 setup.php:336
+#: setup.php:128 setup.php:320 setup.php:365
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:127 setup.php:150 setup.php:204
+#: setup.php:129 setup.php:152 setup.php:229
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:149 setup.php:423 setup.php:489
+#: setup.php:151 setup.php:453 setup.php:520
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:203
+#: setup.php:228
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:255 setup.php:357 setup.php:366 setup.php:384 setup.php:394
-#: setup.php:403 setup.php:430 setup.php:496 setup.php:522 setup.php:529
-#: setup.php:540 setup.php:547 setup.php:556 setup.php:564 setup.php:573
-#: setup.php:579
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:256 setup.php:358 setup.php:367 setup.php:385 setup.php:395
-#: setup.php:404 setup.php:431 setup.php:497 setup.php:523 setup.php:530
-#: setup.php:541 setup.php:557 setup.php:565 setup.php:574
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:270
+#: setup.php:299
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:271
+#: setup.php:300
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:276
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:277
+#: setup.php:306
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:548 setup.php:580
+#: setup.php:579 setup.php:611
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:644
+#: setup.php:631
+#, php-format
+msgid "MS SQL username and/or password not valid: %s"
+msgstr ""
+
+#: setup.php:849
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:645
+#: setup.php:850
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
@@ -234,16 +239,16 @@ msgstr ""
 msgid "years ago"
 msgstr ""
 
-#: updater.php:75
+#: updater.php:78
 #, php-format
 msgid "%s is available. Get <a href=\"%s\">more information</a>"
 msgstr ""
 
-#: updater.php:77
+#: updater.php:81
 msgid "up to date"
 msgstr ""
 
-#: updater.php:80
+#: updater.php:84
 msgid "updates check is disabled"
 msgstr ""
 
diff --git a/l10n/af_ZA/settings.po b/l10n/af_ZA/settings.po
index 9884e8d4a2d0e9781a70c77ae87064da3daf0a13..f1cfa82d304c0af4053d275fc378e255024ba401 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-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 23:05+0000\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: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
 "MIME-Version: 1.0\n"
@@ -21,8 +21,8 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr ""
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:15
-#: ajax/togglegroups.php:18
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr ""
 
@@ -70,12 +70,12 @@ 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 ""
@@ -116,7 +116,7 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:96
+#: js/personal.js:99
 msgid "Saving..."
 msgstr ""
 
@@ -145,23 +145,23 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
-#: js/users.js:190
+#: js/users.js:191
 msgid "add group"
 msgstr ""
 
-#: js/users.js:351
+#: js/users.js:352
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:357
+#: js/users.js:358
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
 msgid "__language_name__"
 msgstr ""
 
@@ -207,19 +207,19 @@ msgstr ""
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:61
+#: templates/admin.php:63
+#, php-format
 msgid ""
-"This ownCloud server can't set system locale to "
-"\"en_US.UTF-8\"/\"en_US.UTF8\". 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 en_US.UTF-8/en_US.UTF8."
+"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:72
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:75
+#: 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 "
@@ -229,98 +229,98 @@ msgid ""
 " of ownCloud."
 msgstr ""
 
-#: templates/admin.php:89
+#: templates/admin.php:92
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:98
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:108
+#: 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:118
+#: 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:125
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:131
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:132
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:140
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:147
+#: templates/admin.php:150
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:148
+#: templates/admin.php:151
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:155
+#: templates/admin.php:158
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:161
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:165
+#: templates/admin.php:168
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:181
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:179
+#: templates/admin.php:182
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:182
+#: templates/admin.php:185
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr ""
 
-#: templates/admin.php:192
+#: templates/admin.php:195
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:193
+#: templates/admin.php:196
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:220
+#: templates/admin.php:223
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:227 templates/personal.php:98
+#: templates/admin.php:230 templates/personal.php:102
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:230 templates/personal.php:100
+#: templates/admin.php:233 templates/personal.php:105
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -330,51 +330,51 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr ""
 
-#: templates/apps.php:10
+#: templates/apps.php:11
 msgid "Add your App"
 msgstr ""
 
-#: templates/apps.php:11
+#: templates/apps.php:12
 msgid "More Apps"
 msgstr ""
 
-#: templates/apps.php:24
+#: templates/apps.php:28
 msgid "Select an App"
 msgstr ""
 
-#: templates/apps.php:28
+#: templates/apps.php:34
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:29
+#: templates/apps.php:36
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
-#: templates/apps.php:31
+#: templates/apps.php:38
 msgid "Update"
 msgstr ""
 
-#: templates/help.php:3
+#: 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 ""
 
@@ -383,79 +383,79 @@ msgstr ""
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:14
+#: templates/personal.php:15
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:25
+#: templates/personal.php:26
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:36 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
 msgid "Password"
 msgstr "Wagwoord"
 
-#: templates/personal.php:37
+#: templates/personal.php:38
 msgid "Your password was changed"
 msgstr ""
 
-#: templates/personal.php:38
+#: templates/personal.php:39
 msgid "Unable to change your password"
 msgstr ""
 
-#: templates/personal.php:39
+#: templates/personal.php:40
 msgid "Current password"
 msgstr ""
 
-#: templates/personal.php:40
+#: templates/personal.php:42
 msgid "New password"
 msgstr "Nuwe wagwoord"
 
-#: templates/personal.php:42
+#: templates/personal.php:44
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:54 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:78
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:55
+#: templates/personal.php:57
 msgid "Your display name was changed"
 msgstr ""
 
-#: templates/personal.php:56
+#: templates/personal.php:58
 msgid "Unable to change your display name"
 msgstr ""
 
-#: templates/personal.php:59
+#: templates/personal.php:61
 msgid "Change display name"
 msgstr ""
 
-#: templates/personal.php:68
+#: templates/personal.php:70
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:69
+#: templates/personal.php:72
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:70
+#: templates/personal.php:73
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:76 templates/personal.php:77
+#: templates/personal.php:79 templates/personal.php:80
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:82
+#: templates/personal.php:86
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:87
+#: templates/personal.php:91
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:89
+#: templates/personal.php:93
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
diff --git a/l10n/af_ZA/user_ldap.po b/l10n/af_ZA/user_ldap.po
index e8faea36b86dc740c39962803dcf9844771c1aad..982e4b399ca20a313537b497e87601c044010a5c 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-02-08 00:10+0100\n"
-"PO-Revision-Date: 2013-02-07 23:11+0000\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: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
 "MIME-Version: 1.0\n"
@@ -21,17 +21,17 @@ msgstr ""
 msgid "Failed to delete the server configuration"
 msgstr ""
 
-#: ajax/testConfiguration.php:35
+#: ajax/testConfiguration.php:36
 msgid "The configuration is valid and the connection could be established!"
 msgstr ""
 
-#: ajax/testConfiguration.php:37
+#: ajax/testConfiguration.php:39
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
 msgstr ""
 
-#: ajax/testConfiguration.php:40
+#: ajax/testConfiguration.php:43
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
@@ -86,224 +86,248 @@ msgstr ""
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:17
+#: templates/settings.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:23
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:25
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:26
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:27
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:28
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:32
 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:24
+#: templates/settings.php:33
 msgid "Password"
 msgstr "Wagwoord"
 
-#: templates/settings.php:24
+#: templates/settings.php:36
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:37
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:40
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:41
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:42
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:45
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:46
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:47
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:50
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:51
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:55
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:34
+#: templates/settings.php:58
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:60
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:39
+#: templates/settings.php:63
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:65
+msgid "Cache Time-To-Live"
+msgstr ""
+
+#: templates/settings.php:65
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:67
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:47
+#: templates/settings.php:71
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:47 templates/settings.php:50
+#: templates/settings.php:71 templates/settings.php:74
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:74
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:75
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:77
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:79
+msgid "Quota Field"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Quota Default"
+msgstr ""
+
+#: templates/settings.php:80
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:81
+msgid "Email Field"
+msgstr ""
+
+#: templates/settings.php:82
+msgid "User Home Folder Naming Rule"
+msgstr ""
+
+#: templates/settings.php:82
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:62
+#: templates/settings.php:86
+msgid "Test Configuration"
+msgstr ""
+
+#: templates/settings.php:86
 msgid "Help"
 msgstr "Hulp"
diff --git a/l10n/ar/core.po b/l10n/ar/core.po
index 5da0c711520f7b39fbe3c860d258e4a2c8ebf8fe..a937cafae05ea9698aefc0e4943f2d798fc9aaa3 100644
--- a/l10n/ar/core.po
+++ b/l10n/ar/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 14:31+0000\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"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -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 "إعادة تعيين كلمة سر ownCloud"
 
diff --git a/l10n/ar/files.po b/l10n/ar/files.po
index 35fd5981edbdcf59c97de475ab77a589b69e22b4..62e5779a43a2c7a3c34f17237466a5330c5be399 100644
--- a/l10n/ar/files.po
+++ b/l10n/ar/files.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\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: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -51,27 +51,27 @@ msgid ""
 "the HTML form"
 msgstr "حجم الملف الذي تريد ترفيعه أعلى مما MAX_FILE_SIZE يسمح به في واجهة ال HTML."
 
-#: ajax/upload.php:31
+#: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
 msgstr "تم ترفيع جزء من الملفات الذي تريد ترفيعها فقط"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:31
 msgid "No file was uploaded"
 msgstr "لم يتم ترفيع أي من الملفات"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:32
 msgid "Missing a temporary folder"
 msgstr "المجلد المؤقت غير موجود"
 
-#: ajax/upload.php:34
+#: ajax/upload.php:33
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:52
+#: ajax/upload.php:51
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:83
+#: ajax/upload.php:82
 msgid "Invalid directory."
 msgstr ""
 
@@ -83,7 +83,7 @@ msgstr "الملفات"
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:127 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:127 templates/index.php:92 templates/index.php:93
 msgid "Delete"
 msgstr "محذوف"
 
@@ -91,40 +91,36 @@ msgstr "محذوف"
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:253
+#: js/filelist.js:251
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:295
-msgid "replaced {new_name}"
+#: js/filelist.js:298
+msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:295 js/filelist.js:297
+#: js/filelist.js:298
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:297
-msgid "replaced {new_name} with {old_name}"
-msgstr ""
-
-#: js/filelist.js:322
+#: js/filelist.js:323
 msgid "perform delete operation"
 msgstr ""
 
@@ -150,74 +146,74 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:224
+#: js/files.js:225
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:261
+#: js/files.js:262
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:261
+#: js/files.js:262
 msgid "Upload Error"
 msgstr ""
 
-#: js/files.js:272
+#: js/files.js:273
 msgid "Close"
 msgstr "إغلق"
 
-#: js/files.js:311
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr ""
 
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr ""
 
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:496
+#: js/files.js:497
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:569
+#: js/files.js:570
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:574
+#: js/files.js:575
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:953 templates/index.php:68
 msgid "Name"
 msgstr "الاسم"
 
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:954 templates/index.php:79
 msgid "Size"
 msgstr "حجم"
 
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:955 templates/index.php:81
 msgid "Modified"
 msgstr "معدل"
 
-#: js/files.js:969
+#: js/files.js:974
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:971
+#: js/files.js:976
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:979
+#: js/files.js:984
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:981
+#: js/files.js:986
 msgid "{count} files"
 msgstr ""
 
@@ -281,33 +277,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:53
+msgid "You don’t have write permissions here."
+msgstr ""
+
+#: templates/index.php:60
 msgid "Nothing in here. Upload something!"
 msgstr "لا يوجد شيء هنا. إرفع بعض الملفات!"
 
-#: templates/index.php:73
+#: templates/index.php:74
 msgid "Download"
 msgstr "تحميل"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:86 templates/index.php:87
 msgid "Unshare"
 msgstr "إلغاء مشاركة"
 
-#: templates/index.php:105
+#: templates/index.php:106
 msgid "Upload too large"
 msgstr "حجم الترفيع أعلى من المسموح"
 
-#: templates/index.php:107
+#: templates/index.php:108
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "حجم الملفات التي تريد ترفيعها أعلى من المسموح على الخادم."
 
-#: templates/index.php:112
+#: templates/index.php:113
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:115
+#: templates/index.php:116
 msgid "Current scanning"
 msgstr ""
 
diff --git a/l10n/ar/files_external.po b/l10n/ar/files_external.po
index a4a00601d16e8aff6de043125c1aaa474387c84d..d7c1d01ac437892069d65c18ae63a89393858f02 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: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-11 23:22+0000\n"
+"POT-Creation-Date: 2013-02-28 00:04+0100\n"
+"PO-Revision-Date: 2013-02-27 23:04+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -17,37 +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"
 
-#: 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:421
 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:424
 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 "
@@ -58,63 +54,63 @@ msgstr ""
 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 "المستخدمين"
 
-#: 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 "حذف"
 
-#: 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/ar/files_trashbin.po b/l10n/ar/files_trashbin.po
index 174bde4c7f5f7b8cbf0179015ba07be75440f96c..e15d676d00fd52bc8120a887f416c9e3cc924db3 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-02-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 10:07+0000\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: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@ 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:22
+#: ajax/delete.php:40
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
@@ -27,35 +27,39 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:33
+#: js/trash.js:34
 msgid "delete file permanently"
 msgstr ""
 
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr ""
+
+#: js/trash.js:174 templates/index.php:17
 msgid "Name"
 msgstr "اسم"
 
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:175 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:135
+#: js/trash.js:184
 msgid "1 folder"
 msgstr ""
 
-#: js/trash.js:137
+#: js/trash.js:186
 msgid "{count} folders"
 msgstr ""
 
-#: js/trash.js:145
+#: js/trash.js:194
 msgid "1 file"
 msgstr ""
 
-#: js/trash.js:147
+#: js/trash.js:196
 msgid "{count} files"
 msgstr ""
 
@@ -66,3 +70,11 @@ 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/ar/files_versions.po b/l10n/ar/files_versions.po
index b915753cedc255c124a0be2220800a01967904f0..c086e82cd3196102a8f8ca536ddd92f42d5e8af3 100644
--- a/l10n/ar/files_versions.po
+++ b/l10n/ar/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-08 00:10+0100\n"
-"PO-Revision-Date: 2013-02-07 23:11+0000\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"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -49,18 +49,10 @@ msgstr ""
 msgid "No path specified"
 msgstr ""
 
-#: js/versions.js:16
-msgid "History"
-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 ""
-
-#: templates/settings.php:3
-msgid "Files Versioning"
-msgstr "أصدرة الملفات"
-
-#: templates/settings.php:4
-msgid "Enable"
-msgstr "تفعيل"
diff --git a/l10n/ar/lib.po b/l10n/ar/lib.po
index 458bcb72e2dc2d89d3fb446a1fefd3a95a2fc6f5..f30930423780db12b32e0d4fd730d33381e85f9c 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-11 15:39+0100\n"
-"PO-Revision-Date: 2013-02-11 14:40+0000\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: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -17,27 +17,27 @@ msgstr ""
 "Language: ar\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
-#: app.php:339
+#: app.php:349
 msgid "Help"
 msgstr "المساعدة"
 
-#: app.php:346
+#: app.php:362
 msgid "Personal"
 msgstr "شخصي"
 
-#: app.php:351
+#: app.php:373
 msgid "Settings"
 msgstr "تعديلات"
 
-#: app.php:356
+#: app.php:385
 msgid "Users"
 msgstr "المستخدمين"
 
-#: app.php:363
+#: app.php:398
 msgid "Apps"
 msgstr ""
 
-#: app.php:365
+#: app.php:406
 msgid "Admin"
 msgstr ""
 
@@ -49,15 +49,15 @@ msgstr ""
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:203 files.php:228
+#: files.php:204 files.php:231
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:227
+#: files.php:228
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: helper.php:226
+#: helper.php:228
 msgid "couldn't be determined"
 msgstr ""
 
@@ -97,87 +97,92 @@ msgstr ""
 msgid "Specify a data folder."
 msgstr ""
 
-#: setup.php:53
+#: setup.php:55
 #, php-format
 msgid "%s enter the database username."
 msgstr ""
 
-#: setup.php:56
+#: setup.php:58
 #, php-format
 msgid "%s enter the database name."
 msgstr ""
 
-#: setup.php:59
+#: setup.php:61
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr ""
 
-#: setup.php:62
+#: setup.php:64
 #, php-format
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:126 setup.php:291 setup.php:336
+#: setup.php:128 setup.php:320 setup.php:365
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:127 setup.php:150 setup.php:204
+#: setup.php:129 setup.php:152 setup.php:229
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:149 setup.php:423 setup.php:489
+#: setup.php:151 setup.php:453 setup.php:520
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:203
+#: setup.php:228
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:255 setup.php:357 setup.php:366 setup.php:384 setup.php:394
-#: setup.php:403 setup.php:430 setup.php:496 setup.php:522 setup.php:529
-#: setup.php:540 setup.php:547 setup.php:556 setup.php:564 setup.php:573
-#: setup.php:579
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:256 setup.php:358 setup.php:367 setup.php:385 setup.php:395
-#: setup.php:404 setup.php:431 setup.php:497 setup.php:523 setup.php:530
-#: setup.php:541 setup.php:557 setup.php:565 setup.php:574
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:270
+#: setup.php:299
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:271
+#: setup.php:300
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:276
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:277
+#: setup.php:306
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:548 setup.php:580
+#: setup.php:579 setup.php:611
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:644
+#: setup.php:631
+#, php-format
+msgid "MS SQL username and/or password not valid: %s"
+msgstr ""
+
+#: setup.php:849
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:645
+#: setup.php:850
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
@@ -234,16 +239,16 @@ msgstr ""
 msgid "years ago"
 msgstr ""
 
-#: updater.php:75
+#: updater.php:78
 #, php-format
 msgid "%s is available. Get <a href=\"%s\">more information</a>"
 msgstr ""
 
-#: updater.php:77
+#: updater.php:81
 msgid "up to date"
 msgstr ""
 
-#: updater.php:80
+#: updater.php:84
 msgid "updates check is disabled"
 msgstr ""
 
diff --git a/l10n/ar/settings.po b/l10n/ar/settings.po
index b4b4bf6b248610ae07823b3bff3cbbd4e5ed23ad..bf92440de5e23e76588b888d1fbd1f7f51dcba16 100644
--- a/l10n/ar/settings.po
+++ b/l10n/ar/settings.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 23:05+0000\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: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -24,8 +24,8 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "فشل تحميل القائمة من الآب ستور"
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:15
-#: ajax/togglegroups.php:18
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr "لم يتم التأكد من الشخصية بنجاح"
 
@@ -73,12 +73,12 @@ 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 "فشل إضافة المستخدم الى المجموعة %s"
 
-#: ajax/togglegroups.php:34
+#: ajax/togglegroups.php:36
 #, php-format
 msgid "Unable to remove user from group %s"
 msgstr "فشل إزالة المستخدم من المجموعة %s"
@@ -119,7 +119,7 @@ msgstr "خطأ"
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:96
+#: js/personal.js:99
 msgid "Saving..."
 msgstr "حفظ"
 
@@ -148,23 +148,23 @@ msgstr "مدير المجموعة"
 msgid "Delete"
 msgstr "حذف"
 
-#: js/users.js:190
+#: js/users.js:191
 msgid "add group"
 msgstr ""
 
-#: js/users.js:351
+#: js/users.js:352
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:357
+#: js/users.js:358
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -210,19 +210,19 @@ msgstr ""
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:61
+#: templates/admin.php:63
+#, php-format
 msgid ""
-"This ownCloud server can't set system locale to "
-"\"en_US.UTF-8\"/\"en_US.UTF8\". 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 en_US.UTF-8/en_US.UTF8."
+"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:72
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:75
+#: 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 "
@@ -232,98 +232,98 @@ msgid ""
 " of ownCloud."
 msgstr ""
 
-#: templates/admin.php:89
+#: templates/admin.php:92
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:98
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:108
+#: 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:118
+#: 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:125
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:131
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:132
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:140
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:147
+#: templates/admin.php:150
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:148
+#: templates/admin.php:151
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:155
+#: templates/admin.php:158
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:161
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:165
+#: templates/admin.php:168
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:181
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:179
+#: templates/admin.php:182
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:182
+#: templates/admin.php:185
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr ""
 
-#: templates/admin.php:192
+#: templates/admin.php:195
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:193
+#: templates/admin.php:196
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:220
+#: templates/admin.php:223
 msgid "More"
 msgstr "المزيد"
 
-#: templates/admin.php:227 templates/personal.php:98
+#: templates/admin.php:230 templates/personal.php:102
 msgid "Version"
 msgstr "إصدار"
 
-#: templates/admin.php:230 templates/personal.php:100
+#: templates/admin.php:233 templates/personal.php:105
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -333,51 +333,51 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "طوّر من قبل <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud مجتمع</a>, الـ <a href=\"https://github.com/owncloud\" target=\"_blank\">النص المصدري</a> مرخص بموجب <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">رخصة أفيرو العمومية</abbr></a>."
 
-#: templates/apps.php:10
+#: templates/apps.php:11
 msgid "Add your App"
 msgstr "أضف تطبيقاتك"
 
-#: templates/apps.php:11
+#: templates/apps.php:12
 msgid "More Apps"
 msgstr "المزيد من التطبيقات"
 
-#: templates/apps.php:24
+#: templates/apps.php:28
 msgid "Select an App"
 msgstr "إختر تطبيقاً"
 
-#: templates/apps.php:28
+#: templates/apps.php:34
 msgid "See application page at apps.owncloud.com"
 msgstr "راجع صفحة التطبيق على apps.owncloud.com"
 
-#: templates/apps.php:29
+#: templates/apps.php:36
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-ترخيص من قبل <span class=\"author\"></span>"
 
-#: templates/apps.php:31
+#: templates/apps.php:38
 msgid "Update"
 msgstr "حدث"
 
-#: templates/help.php:3
+#: 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 "دعم تجاري"
 
@@ -386,79 +386,79 @@ msgstr "دعم تجاري"
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "تم إستهلاك <strong>%s</strong> من المتوفر <strong>%s</strong>"
 
-#: templates/personal.php:14
+#: templates/personal.php:15
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:25
+#: templates/personal.php:26
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:36 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
 msgid "Password"
 msgstr "كلمات السر"
 
-#: templates/personal.php:37
+#: templates/personal.php:38
 msgid "Your password was changed"
 msgstr "لقد تم تغيير كلمة السر"
 
-#: templates/personal.php:38
+#: templates/personal.php:39
 msgid "Unable to change your password"
 msgstr "لم يتم تعديل كلمة السر بنجاح"
 
-#: templates/personal.php:39
+#: templates/personal.php:40
 msgid "Current password"
 msgstr "كلمات السر الحالية"
 
-#: templates/personal.php:40
+#: templates/personal.php:42
 msgid "New password"
 msgstr "كلمات سر جديدة"
 
-#: templates/personal.php:42
+#: templates/personal.php:44
 msgid "Change password"
 msgstr "عدل كلمة السر"
 
-#: templates/personal.php:54 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:78
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:55
+#: templates/personal.php:57
 msgid "Your display name was changed"
 msgstr ""
 
-#: templates/personal.php:56
+#: templates/personal.php:58
 msgid "Unable to change your display name"
 msgstr ""
 
-#: templates/personal.php:59
+#: templates/personal.php:61
 msgid "Change display name"
 msgstr ""
 
-#: templates/personal.php:68
+#: templates/personal.php:70
 msgid "Email"
 msgstr "العنوان البريدي"
 
-#: templates/personal.php:69
+#: templates/personal.php:72
 msgid "Your email address"
 msgstr "عنوانك البريدي"
 
-#: templates/personal.php:70
+#: templates/personal.php:73
 msgid "Fill in an email address to enable password recovery"
 msgstr "أدخل عنوانك البريدي لتفعيل استرجاع كلمة المرور"
 
-#: templates/personal.php:76 templates/personal.php:77
+#: templates/personal.php:79 templates/personal.php:80
 msgid "Language"
 msgstr "اللغة"
 
-#: templates/personal.php:82
+#: templates/personal.php:86
 msgid "Help translate"
 msgstr "ساعد في الترجمه"
 
-#: templates/personal.php:87
+#: templates/personal.php:91
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:89
+#: templates/personal.php:93
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "إستخدم هذا العنوان للإتصال بـ ownCloud في مدير الملفات"
 
diff --git a/l10n/ar/user_ldap.po b/l10n/ar/user_ldap.po
index 059e10baefd5414a8032a185c02ab7640be9d9ab..e9c5205c1558b1047a223e6bbd5b2bf7d1e153dc 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-02-08 00:10+0100\n"
-"PO-Revision-Date: 2013-02-07 23:11+0000\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: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -21,17 +21,17 @@ msgstr ""
 msgid "Failed to delete the server configuration"
 msgstr ""
 
-#: ajax/testConfiguration.php:35
+#: ajax/testConfiguration.php:36
 msgid "The configuration is valid and the connection could be established!"
 msgstr ""
 
-#: ajax/testConfiguration.php:37
+#: ajax/testConfiguration.php:39
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
 msgstr ""
 
-#: ajax/testConfiguration.php:40
+#: ajax/testConfiguration.php:43
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
@@ -86,224 +86,248 @@ msgstr ""
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:17
+#: templates/settings.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:23
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:25
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:26
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:27
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:28
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:32
 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:24
+#: templates/settings.php:33
 msgid "Password"
 msgstr "كلمة المرور"
 
-#: templates/settings.php:24
+#: templates/settings.php:36
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:37
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:40
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:41
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:42
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:45
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:46
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:47
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:50
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:51
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:55
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:34
+#: templates/settings.php:58
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:60
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:39
+#: templates/settings.php:63
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:65
+msgid "Cache Time-To-Live"
+msgstr ""
+
+#: templates/settings.php:65
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:67
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:47
+#: templates/settings.php:71
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:47 templates/settings.php:50
+#: templates/settings.php:71 templates/settings.php:74
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:74
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:75
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:77
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:79
+msgid "Quota Field"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Quota Default"
+msgstr ""
+
+#: templates/settings.php:80
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:81
+msgid "Email Field"
+msgstr ""
+
+#: templates/settings.php:82
+msgid "User Home Folder Naming Rule"
+msgstr ""
+
+#: templates/settings.php:82
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:62
+#: templates/settings.php:86
+msgid "Test Configuration"
+msgstr ""
+
+#: templates/settings.php:86
 msgid "Help"
 msgstr "المساعدة"
diff --git a/l10n/be/core.po b/l10n/be/core.po
index e5b4699d86e2b2dd94e7de328fbc1b24603979a1..dcb31520cd14ed450359645c8828c93ea38e980d 100644
--- a/l10n/be/core.po
+++ b/l10n/be/core.po
@@ -3,13 +3,14 @@
 # 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-15 00:05+0100\n"
-"PO-Revision-Date: 2011-07-25 16:05+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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"
 "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"
@@ -502,7 +503,7 @@ msgstr ""
 
 #: templates/installation.php:52
 msgid "Advanced"
-msgstr ""
+msgstr "Дасведчаны"
 
 #: templates/installation.php:54
 msgid "Data folder"
@@ -539,7 +540,7 @@ msgstr ""
 
 #: templates/installation.php:136
 msgid "Finish setup"
-msgstr ""
+msgstr "Завяршыць ўстаноўку."
 
 #: templates/layout.guest.php:33
 msgid "web services under your control"
@@ -581,11 +582,11 @@ 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/be/files.po b/l10n/be/files.po
index 8a60af5a9604b5a61de98e0d83ce812c0bab2031..5c01708ef4db86195177a8cbc7c2a10f546630a9 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-02-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\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: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
 "MIME-Version: 1.0\n"
@@ -50,27 +50,27 @@ msgid ""
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:31
+#: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:32
+#: ajax/upload.php:31
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:33
+#: ajax/upload.php:32
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:34
+#: ajax/upload.php:33
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:52
+#: ajax/upload.php:51
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:83
+#: ajax/upload.php:82
 msgid "Invalid directory."
 msgstr ""
 
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:127 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:127 templates/index.php:92 templates/index.php:93
 msgid "Delete"
 msgstr ""
 
@@ -90,40 +90,36 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:253
+#: js/filelist.js:251
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:295
-msgid "replaced {new_name}"
+#: js/filelist.js:298
+msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:295 js/filelist.js:297
+#: js/filelist.js:298
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:297
-msgid "replaced {new_name} with {old_name}"
-msgstr ""
-
-#: js/filelist.js:322
+#: js/filelist.js:323
 msgid "perform delete operation"
 msgstr ""
 
@@ -149,74 +145,74 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:224
+#: js/files.js:225
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:261
+#: js/files.js:262
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:261
+#: js/files.js:262
 msgid "Upload Error"
 msgstr ""
 
-#: js/files.js:272
+#: js/files.js:273
 msgid "Close"
 msgstr ""
 
-#: js/files.js:311
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr ""
 
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr ""
 
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:496
+#: js/files.js:497
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:569
+#: js/files.js:570
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:574
+#: js/files.js:575
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:953 templates/index.php:68
 msgid "Name"
 msgstr ""
 
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:954 templates/index.php:79
 msgid "Size"
 msgstr ""
 
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:955 templates/index.php:81
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:969
+#: js/files.js:974
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:971
+#: js/files.js:976
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:979
+#: js/files.js:984
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:981
+#: js/files.js:986
 msgid "{count} files"
 msgstr ""
 
@@ -280,33 +276,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:53
+msgid "You don’t have write permissions here."
+msgstr ""
+
+#: templates/index.php:60
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:73
+#: templates/index.php:74
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:86 templates/index.php:87
 msgid "Unshare"
 msgstr ""
 
-#: templates/index.php:105
+#: templates/index.php:106
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:107
+#: templates/index.php:108
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:112
+#: templates/index.php:113
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:115
+#: templates/index.php:116
 msgid "Current scanning"
 msgstr ""
 
diff --git a/l10n/be/files_external.po b/l10n/be/files_external.po
index de27bede652979e9bc443cf5247f00d000a9f554..016c8149190f930e448856d5afa9ba1afc6280ef 100644
--- a/l10n/be/files_external.po
+++ b/l10n/be/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-15 00:04+0100\n"
-"PO-Revision-Date: 2012-08-12 22:34+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-02-28 00:04+0100\n"
+"PO-Revision-Date: 2013-02-27 23:04+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,37 +17,33 @@ 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"
 
-#: 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:413
+#: lib/config.php:421
 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:414
+#: lib/config.php:424
 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 "
@@ -58,63 +54,63 @@ msgstr ""
 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 ""
 
-#: templates/settings.php:108 templates/settings.php:109
-#: templates/settings.php:144 templates/settings.php:145
+#: templates/settings.php:113 templates/settings.php:114
+#: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
 msgstr ""
 
-#: 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:136
+#: templates/settings.php:141
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:153
+#: templates/settings.php:159
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/be/files_trashbin.po b/l10n/be/files_trashbin.po
index c9d67b5a277534d2a8d8d7e61f6d01a73cef1df5..79e1f2ab9e49b142891dd54e32c9f6d119b2cfae 100644
--- a/l10n/be/files_trashbin.po
+++ b/l10n/be/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-02-15 00:05+0100\n"
-"PO-Revision-Date: 2013-01-31 16:03+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,7 +17,7 @@ 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:22
+#: ajax/delete.php:40
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
@@ -27,35 +27,39 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:33
+#: js/trash.js:34
 msgid "delete file permanently"
 msgstr ""
 
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr ""
+
+#: js/trash.js:174 templates/index.php:17
 msgid "Name"
 msgstr ""
 
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:175 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:135
+#: js/trash.js:184
 msgid "1 folder"
 msgstr ""
 
-#: js/trash.js:137
+#: js/trash.js:186
 msgid "{count} folders"
 msgstr ""
 
-#: js/trash.js:145
+#: js/trash.js:194
 msgid "1 file"
 msgstr ""
 
-#: js/trash.js:147
+#: js/trash.js:196
 msgid "{count} files"
 msgstr ""
 
@@ -66,3 +70,11 @@ 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/be/files_versions.po b/l10n/be/files_versions.po
index 28ff041ebff6c4faddc893d14be6ce3deb39ca46..8b4294e5f202ba0032637496d0b30c6a677aea8c 100644
--- a/l10n/be/files_versions.po
+++ b/l10n/be/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-15 00:05+0100\n"
-"PO-Revision-Date: 2012-08-12 22:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-02-28 00:04+0100\n"
+"PO-Revision-Date: 2013-02-27 23:04+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -48,18 +48,10 @@ msgstr ""
 msgid "No path specified"
 msgstr ""
 
-#: js/versions.js:16
-msgid "History"
+#: 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 ""
-
-#: templates/settings.php:3
-msgid "Files Versioning"
-msgstr ""
-
-#: templates/settings.php:4
-msgid "Enable"
-msgstr ""
diff --git a/l10n/be/lib.po b/l10n/be/lib.po
index 5f4d28d5e4db1be71c0330e9e94dcbd8e65f9b27..1759595aea3442911faee8cfe7549778e98b8535 100644
--- a/l10n/be/lib.po
+++ b/l10n/be/lib.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:05+0100\n"
-"PO-Revision-Date: 2012-07-27 22:23+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-02-27 14:35+0100\n"
+"PO-Revision-Date: 2013-02-27 13:36+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"
@@ -97,87 +97,92 @@ msgstr ""
 msgid "Specify a data folder."
 msgstr ""
 
-#: setup.php:53
+#: setup.php:55
 #, php-format
 msgid "%s enter the database username."
 msgstr ""
 
-#: setup.php:56
+#: setup.php:58
 #, php-format
 msgid "%s enter the database name."
 msgstr ""
 
-#: setup.php:59
+#: setup.php:61
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr ""
 
-#: setup.php:62
+#: setup.php:64
 #, php-format
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:126 setup.php:294 setup.php:339
+#: setup.php:128 setup.php:320 setup.php:365
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:127 setup.php:150 setup.php:204
+#: setup.php:129 setup.php:152 setup.php:229
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:149 setup.php:427 setup.php:494
+#: setup.php:151 setup.php:453 setup.php:520
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:203
+#: setup.php:228
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:257 setup.php:360 setup.php:369 setup.php:387 setup.php:397
-#: setup.php:406 setup.php:435 setup.php:501 setup.php:527 setup.php:534
-#: setup.php:545 setup.php:552 setup.php:561 setup.php:569 setup.php:578
-#: setup.php:584
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:258 setup.php:361 setup.php:370 setup.php:388 setup.php:398
-#: setup.php:407 setup.php:436 setup.php:502 setup.php:528 setup.php:535
-#: setup.php:546 setup.php:562 setup.php:570 setup.php:579
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:273
+#: setup.php:299
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:274
+#: setup.php:300
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:279
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:280
+#: setup.php:306
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:553 setup.php:585
+#: setup.php:579 setup.php:611
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:649
+#: setup.php:631
+#, php-format
+msgid "MS SQL username and/or password not valid: %s"
+msgstr ""
+
+#: setup.php:849
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:651
+#: setup.php:850
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
diff --git a/l10n/be/settings.po b/l10n/be/settings.po
index 8610e96b1adabe38912670dc70dbebd77f9b60f8..22ae916f22aafbce6068102e85bb9022550a5264 100644
--- a/l10n/be/settings.po
+++ b/l10n/be/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-15 00:05+0100\n"
-"PO-Revision-Date: 2011-07-25 16:05+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,8 +21,8 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr ""
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:15
-#: ajax/togglegroups.php:18
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr ""
 
@@ -70,12 +70,12 @@ 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 ""
@@ -116,7 +116,7 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:96
+#: js/personal.js:99
 msgid "Saving..."
 msgstr ""
 
@@ -161,7 +161,7 @@ msgstr ""
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
 msgid "__language_name__"
 msgstr ""
 
@@ -207,19 +207,19 @@ msgstr ""
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:61
+#: templates/admin.php:63
+#, php-format
 msgid ""
-"This ownCloud server can't set system locale to "
-"\"en_US.UTF-8\"/\"en_US.UTF8\". 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 en_US.UTF-8/en_US.UTF8."
+"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:72
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:75
+#: 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 "
@@ -229,98 +229,98 @@ msgid ""
 " of ownCloud."
 msgstr ""
 
-#: templates/admin.php:89
+#: templates/admin.php:92
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:98
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:108
+#: 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:118
+#: 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:125
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:131
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:132
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:140
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:147
+#: templates/admin.php:150
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:148
+#: templates/admin.php:151
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:155
+#: templates/admin.php:158
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:161
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:165
+#: templates/admin.php:168
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:181
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:179
+#: templates/admin.php:182
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:182
+#: templates/admin.php:185
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr ""
 
-#: templates/admin.php:192
+#: templates/admin.php:195
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:193
+#: templates/admin.php:196
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:220
+#: templates/admin.php:223
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:227 templates/personal.php:98
+#: templates/admin.php:230 templates/personal.php:102
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:230 templates/personal.php:100
+#: templates/admin.php:233 templates/personal.php:105
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -330,51 +330,51 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr ""
 
-#: templates/apps.php:10
+#: templates/apps.php:11
 msgid "Add your App"
 msgstr ""
 
-#: templates/apps.php:11
+#: templates/apps.php:12
 msgid "More Apps"
 msgstr ""
 
-#: templates/apps.php:24
+#: templates/apps.php:28
 msgid "Select an App"
 msgstr ""
 
-#: templates/apps.php:28
+#: templates/apps.php:34
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:29
+#: templates/apps.php:36
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
-#: templates/apps.php:31
+#: templates/apps.php:38
 msgid "Update"
 msgstr ""
 
-#: templates/help.php:3
+#: 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 ""
 
@@ -383,79 +383,79 @@ msgstr ""
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:14
+#: templates/personal.php:15
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:25
+#: templates/personal.php:26
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:36 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
 msgid "Password"
 msgstr ""
 
-#: templates/personal.php:37
+#: templates/personal.php:38
 msgid "Your password was changed"
 msgstr ""
 
-#: templates/personal.php:38
+#: templates/personal.php:39
 msgid "Unable to change your password"
 msgstr ""
 
-#: templates/personal.php:39
+#: templates/personal.php:40
 msgid "Current password"
 msgstr ""
 
-#: templates/personal.php:40
+#: templates/personal.php:42
 msgid "New password"
 msgstr ""
 
-#: templates/personal.php:42
+#: templates/personal.php:44
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:54 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:78
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:55
+#: templates/personal.php:57
 msgid "Your display name was changed"
 msgstr ""
 
-#: templates/personal.php:56
+#: templates/personal.php:58
 msgid "Unable to change your display name"
 msgstr ""
 
-#: templates/personal.php:59
+#: templates/personal.php:61
 msgid "Change display name"
 msgstr ""
 
-#: templates/personal.php:68
+#: templates/personal.php:70
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:69
+#: templates/personal.php:72
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:70
+#: templates/personal.php:73
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:76 templates/personal.php:77
+#: templates/personal.php:79 templates/personal.php:80
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:82
+#: templates/personal.php:86
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:87
+#: templates/personal.php:91
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:89
+#: templates/personal.php:93
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
diff --git a/l10n/be/user_ldap.po b/l10n/be/user_ldap.po
index 1d422381d076050aa5db1a0f502242749f9456e1..c807e563d2863707e585c93ed0c4157762bd51ea 100644
--- a/l10n/be/user_ldap.po
+++ b/l10n/be/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:05+0100\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-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: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,17 +21,17 @@ msgstr ""
 msgid "Failed to delete the server configuration"
 msgstr ""
 
-#: ajax/testConfiguration.php:35
+#: ajax/testConfiguration.php:36
 msgid "The configuration is valid and the connection could be established!"
 msgstr ""
 
-#: ajax/testConfiguration.php:37
+#: ajax/testConfiguration.php:39
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
 msgstr ""
 
-#: ajax/testConfiguration.php:40
+#: ajax/testConfiguration.php:43
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
@@ -86,224 +86,248 @@ msgstr ""
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:17
+#: templates/settings.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:23
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:25
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:26
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:27
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:28
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:32
 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:24
+#: templates/settings.php:33
 msgid "Password"
 msgstr ""
 
-#: templates/settings.php:24
+#: templates/settings.php:36
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:37
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:40
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:41
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:42
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:45
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:46
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:47
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:50
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:51
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:55
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:34
+#: templates/settings.php:58
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:60
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:39
+#: templates/settings.php:63
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:65
+msgid "Cache Time-To-Live"
+msgstr ""
+
+#: templates/settings.php:65
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:67
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:47
+#: templates/settings.php:71
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:47 templates/settings.php:50
+#: templates/settings.php:71 templates/settings.php:74
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:74
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:75
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:77
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:79
+msgid "Quota Field"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Quota Default"
+msgstr ""
+
+#: templates/settings.php:80
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:81
+msgid "Email Field"
+msgstr ""
+
+#: templates/settings.php:82
+msgid "User Home Folder Naming Rule"
+msgstr ""
+
+#: templates/settings.php:82
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:62
+#: templates/settings.php:86
+msgid "Test Configuration"
+msgstr ""
+
+#: templates/settings.php:86
 msgid "Help"
 msgstr ""
diff --git a/l10n/bg_BG/core.po b/l10n/bg_BG/core.po
index 06b082dffc5d1f9dfa07b4c0b1480ace347f5665..4b1cd9d3cbc56197aea322beaf773102eed01dec 100644
--- a/l10n/bg_BG/core.po
+++ b/l10n/bg_BG/core.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-10 00:08+0100\n"
-"PO-Revision-Date: 2013-02-09 10:30+0000\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"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -164,55 +164,55 @@ msgstr ""
 msgid "Settings"
 msgstr "Настройки"
 
-#: js/js.js:766
+#: js/js.js:767
 msgid "seconds ago"
 msgstr "преди секунди"
 
-#: js/js.js:767
+#: js/js.js:768
 msgid "1 minute ago"
 msgstr "преди 1 минута"
 
-#: js/js.js:768
+#: js/js.js:769
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:769
+#: js/js.js:770
 msgid "1 hour ago"
 msgstr "преди 1 час"
 
-#: js/js.js:770
+#: js/js.js:771
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:771
+#: js/js.js:772
 msgid "today"
 msgstr "днес"
 
-#: js/js.js:772
+#: js/js.js:773
 msgid "yesterday"
 msgstr "вчера"
 
-#: js/js.js:773
+#: js/js.js:774
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:774
+#: js/js.js:775
 msgid "last month"
 msgstr "последният месец"
 
-#: js/js.js:775
+#: js/js.js:776
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:776
+#: js/js.js:777
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:777
+#: js/js.js:778
 msgid "last year"
 msgstr "последната година"
 
-#: js/js.js:778
+#: js/js.js:779
 msgid "years ago"
 msgstr "последните години"
 
@@ -255,14 +255,14 @@ 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:29 js/share.js:43 js/share.js:90
 msgid "Shared"
 msgstr ""
 
+#: js/share.js:93
+msgid "Share"
+msgstr "Споделяне"
+
 #: js/share.js:141 js/share.js:622
 msgid "Error while sharing"
 msgstr ""
@@ -390,7 +390,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 ""
 
diff --git a/l10n/bg_BG/files.po b/l10n/bg_BG/files.po
index 449ff417fa107fe61ae9d0d82c5f80ef495c056c..a7013ebbba82e32282fe3b674b4091db32e37828 100644
--- a/l10n/bg_BG/files.po
+++ b/l10n/bg_BG/files.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\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: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -52,27 +52,27 @@ msgid ""
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:31
+#: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:32
+#: ajax/upload.php:31
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:33
+#: ajax/upload.php:32
 msgid "Missing a temporary folder"
 msgstr "Липсва временна папка"
 
-#: ajax/upload.php:34
+#: ajax/upload.php:33
 msgid "Failed to write to disk"
 msgstr "Възникна проблем при запис в диска"
 
-#: ajax/upload.php:52
+#: ajax/upload.php:51
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:83
+#: ajax/upload.php:82
 msgid "Invalid directory."
 msgstr "Невалидна директория."
 
@@ -82,9 +82,9 @@ msgstr "Файлове"
 
 #: js/fileactions.js:125
 msgid "Delete permanently"
-msgstr ""
+msgstr "Изтриване завинаги"
 
-#: js/fileactions.js:127 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:127 templates/index.php:92 templates/index.php:93
 msgid "Delete"
 msgstr "Изтриване"
 
@@ -92,40 +92,36 @@ msgstr "Изтриване"
 msgid "Rename"
 msgstr "Преименуване"
 
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
 msgid "Pending"
 msgstr "Чакащо"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "replace"
 msgstr "препокриване"
 
-#: js/filelist.js:253
+#: js/filelist.js:251
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "cancel"
 msgstr "отказ"
 
-#: js/filelist.js:295
-msgid "replaced {new_name}"
+#: js/filelist.js:298
+msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:295 js/filelist.js:297
+#: js/filelist.js:298
 msgid "undo"
 msgstr "възтановяване"
 
-#: js/filelist.js:297
-msgid "replaced {new_name} with {old_name}"
-msgstr ""
-
-#: js/filelist.js:322
+#: js/filelist.js:323
 msgid "perform delete operation"
 msgstr ""
 
@@ -151,74 +147,74 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:224
+#: js/files.js:225
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:261
+#: js/files.js:262
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:261
+#: js/files.js:262
 msgid "Upload Error"
 msgstr "Възникна грешка при качването"
 
-#: js/files.js:272
+#: js/files.js:273
 msgid "Close"
 msgstr "Затвори"
 
-#: js/files.js:311
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr ""
 
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr ""
 
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "Качването е спряно."
 
-#: js/files.js:496
+#: js/files.js:497
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:569
+#: js/files.js:570
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:574
+#: js/files.js:575
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:953 templates/index.php:68
 msgid "Name"
 msgstr "Име"
 
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:954 templates/index.php:79
 msgid "Size"
 msgstr "Размер"
 
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:955 templates/index.php:81
 msgid "Modified"
 msgstr "Променено"
 
-#: js/files.js:969
+#: js/files.js:974
 msgid "1 folder"
 msgstr "1 папка"
 
-#: js/files.js:971
+#: js/files.js:976
 msgid "{count} folders"
 msgstr "{count} папки"
 
-#: js/files.js:979
+#: js/files.js:984
 msgid "1 file"
 msgstr "1 файл"
 
-#: js/files.js:981
+#: js/files.js:986
 msgid "{count} files"
 msgstr "{count} файла"
 
@@ -282,33 +278,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr "Спри качването"
 
-#: templates/index.php:59
+#: templates/index.php:53
+msgid "You don’t have write permissions here."
+msgstr ""
+
+#: templates/index.php:60
 msgid "Nothing in here. Upload something!"
 msgstr "Няма нищо тук. Качете нещо."
 
-#: templates/index.php:73
+#: templates/index.php:74
 msgid "Download"
 msgstr "Изтегляне"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:86 templates/index.php:87
 msgid "Unshare"
 msgstr ""
 
-#: templates/index.php:105
+#: templates/index.php:106
 msgid "Upload too large"
 msgstr "Файлът който сте избрали за качване е прекалено голям"
 
-#: templates/index.php:107
+#: templates/index.php:108
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:112
+#: templates/index.php:113
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:115
+#: templates/index.php:116
 msgid "Current scanning"
 msgstr ""
 
diff --git a/l10n/bg_BG/files_external.po b/l10n/bg_BG/files_external.po
index 66a058cb8777c4c7cefbe21ba98b4ad37ead97d6..0113c0ba14f31c82fc914b66b9885043b3b3abbf 100644
--- a/l10n/bg_BG/files_external.po
+++ b/l10n/bg_BG/files_external.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-10 00:08+0100\n"
-"PO-Revision-Date: 2013-02-09 10:20+0000\n"
-"Last-Translator: Stefan Ilivanov <ilivanov@gmail.com>\n"
+"POT-Creation-Date: 2013-02-28 00:04+0100\n"
+"PO-Revision-Date: 2013-02-27 23:04+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: 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"
@@ -18,37 +18,33 @@ msgstr ""
 "Language: bg_BG\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:405
+#: lib/config.php:421
 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:406
+#: lib/config.php:424
 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 "
@@ -59,63 +55,63 @@ msgstr ""
 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"
-msgstr "Администрация"
-
 #: templates/settings.php:10
+msgid "External storage"
+msgstr ""
+
+#: 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 "Потребители"
 
-#: templates/settings.php:108 templates/settings.php:109
-#: templates/settings.php:144 templates/settings.php:145
+#: templates/settings.php:113 templates/settings.php:114
+#: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
 msgstr "Изтриване"
 
-#: 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:136
+#: templates/settings.php:141
 msgid "SSL root certificates"
 msgstr "SSL основни сертификати"
 
-#: templates/settings.php:153
+#: templates/settings.php:159
 msgid "Import Root Certificate"
 msgstr "Импортиране на основен сертификат"
diff --git a/l10n/bg_BG/files_trashbin.po b/l10n/bg_BG/files_trashbin.po
index f46acd62e56203ce67c1997a2e450a6db2b0c22d..794a8d34f60e021c87c0686efe31c4ea70545773 100644
--- a/l10n/bg_BG/files_trashbin.po
+++ b/l10n/bg_BG/files_trashbin.po
@@ -3,14 +3,15 @@
 # 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-02-15 00:05+0100\n"
-"PO-Revision-Date: 2013-02-14 17:50+0000\n"
-"Last-Translator: Stefan Ilivanov <ilivanov@gmail.com>\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: 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"
@@ -18,7 +19,7 @@ msgstr ""
 "Language: bg_BG\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:22
+#: ajax/delete.php:40
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "Невъзможно изтриване на %s завинаги"
@@ -28,35 +29,39 @@ msgstr "Невъзможно изтриване на %s завинаги"
 msgid "Couldn't restore %s"
 msgstr "Невъзможно възтановяване на %s"
 
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
 msgid "perform restore operation"
-msgstr "извършване на действие по възтановяване"
+msgstr "извършване на действие по възстановяване"
 
-#: js/trash.js:33
+#: js/trash.js:34
 msgid "delete file permanently"
 msgstr "изтриване на файла завинаги"
 
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr "Изтриване завинаги"
+
+#: js/trash.js:174 templates/index.php:17
 msgid "Name"
 msgstr "Име"
 
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:175 templates/index.php:27
 msgid "Deleted"
 msgstr "Изтрито"
 
-#: js/trash.js:135
+#: js/trash.js:184
 msgid "1 folder"
 msgstr "1 папка"
 
-#: js/trash.js:137
+#: js/trash.js:186
 msgid "{count} folders"
 msgstr "{count} папки"
 
-#: js/trash.js:145
+#: js/trash.js:194
 msgid "1 file"
 msgstr "1 файл"
 
-#: js/trash.js:147
+#: js/trash.js:196
 msgid "{count} files"
 msgstr "{count} файла"
 
@@ -67,3 +72,11 @@ 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/bg_BG/files_versions.po b/l10n/bg_BG/files_versions.po
index c79f0e63842b01f745bf921039e3d2284db24198..895db875d9a5bcc9565ba01505ae024ee68f5024 100644
--- a/l10n/bg_BG/files_versions.po
+++ b/l10n/bg_BG/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-08 00:10+0100\n"
-"PO-Revision-Date: 2013-02-07 23:11+0000\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"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -49,18 +49,10 @@ msgstr ""
 msgid "No path specified"
 msgstr ""
 
-#: js/versions.js:16
-msgid "History"
-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 ""
-
-#: templates/settings.php:3
-msgid "Files Versioning"
-msgstr ""
-
-#: templates/settings.php:4
-msgid "Enable"
-msgstr "Включено"
diff --git a/l10n/bg_BG/lib.po b/l10n/bg_BG/lib.po
index 6ffc3d0f7eed36f123d618e53ed552f99bed52f3..62eed2e5d4d40ed1c6953d9d087f168e772a79ae 100644
--- a/l10n/bg_BG/lib.po
+++ b/l10n/bg_BG/lib.po
@@ -3,14 +3,15 @@
 # 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-02-15 00:05+0100\n"
-"PO-Revision-Date: 2013-02-14 17:30+0000\n"
-"Last-Translator: Stefan Ilivanov <ilivanov@gmail.com>\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"
 "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"
@@ -98,90 +99,95 @@ msgstr "Въведете парола за администратор."
 msgid "Specify a data folder."
 msgstr "Укажете папка за данни"
 
-#: setup.php:53
+#: setup.php:55
 #, php-format
 msgid "%s enter the database username."
 msgstr "%s въведете потребителско име за базата с данни."
 
-#: setup.php:56
+#: setup.php:58
 #, php-format
 msgid "%s enter the database name."
 msgstr "%s въведете име на базата с данни."
 
-#: setup.php:59
+#: setup.php:61
 #, php-format
 msgid "%s you may not use dots in the database name"
-msgstr ""
+msgstr "%s, не можете да ползвате точки в името на базата от данни"
 
-#: setup.php:62
+#: setup.php:64
 #, php-format
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:126 setup.php:294 setup.php:339
+#: setup.php:128 setup.php:320 setup.php:365
 msgid "PostgreSQL username and/or password not valid"
-msgstr ""
+msgstr "Невалидно PostgreSQL потребителско име и/или парола"
 
-#: setup.php:127 setup.php:150 setup.php:204
+#: setup.php:129 setup.php:152 setup.php:229
 msgid "You need to enter either an existing account or the administrator."
-msgstr ""
+msgstr "Необходимо е да влезете в всъществуващ акаунт или като администратора"
 
-#: setup.php:149 setup.php:427 setup.php:494
+#: setup.php:151 setup.php:453 setup.php:520
 msgid "Oracle username and/or password not valid"
-msgstr ""
+msgstr "Невалидно Oracle потребителско име и/или парола"
 
-#: setup.php:203
+#: setup.php:228
 msgid "MySQL username and/or password not valid"
-msgstr ""
+msgstr "Невалидно MySQL потребителско име и/или парола"
 
-#: setup.php:257 setup.php:360 setup.php:369 setup.php:387 setup.php:397
-#: setup.php:406 setup.php:435 setup.php:501 setup.php:527 setup.php:534
-#: setup.php:545 setup.php:552 setup.php:561 setup.php:569 setup.php:578
-#: setup.php:584
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
-msgstr ""
+msgstr "Грешка в базата от данни: \"%s\""
 
-#: setup.php:258 setup.php:361 setup.php:370 setup.php:388 setup.php:398
-#: setup.php:407 setup.php:436 setup.php:502 setup.php:528 setup.php:535
-#: setup.php:546 setup.php:562 setup.php:570 setup.php:579
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:273
+#: setup.php:299
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
-msgstr ""
+msgstr "MySQL потребителят '%s'@'localhost' вече съществува"
 
-#: setup.php:274
+#: setup.php:300
 msgid "Drop this user from MySQL"
-msgstr ""
+msgstr "Изтриване на потребителя от MySQL"
 
-#: setup.php:279
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
-msgstr ""
+msgstr "MySQL потребителят  '%s'@'%%' вече съществува."
 
-#: setup.php:280
+#: setup.php:306
 msgid "Drop this user from MySQL."
-msgstr ""
+msgstr "Изтриване на потребителя от MySQL."
 
-#: setup.php:553 setup.php:585
+#: setup.php:579 setup.php:611
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:649
+#: setup.php:631
+#, php-format
+msgid "MS SQL username and/or password not valid: %s"
+msgstr "Невалидно MS SQL потребителско име и/или парола: %s"
+
+#: setup.php:849
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:651
+#: setup.php:850
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr ""
+msgstr "Моля направете повторна справка с <a href='%s'>ръководството за инсталиране</a>."
 
 #: template.php:113
 msgid "seconds ago"
diff --git a/l10n/bg_BG/settings.po b/l10n/bg_BG/settings.po
index c68881f51e6e4f7a923909d1a9b0ba97ca6eaf90..4a17d6cb1fdfb1ffec288143af01c22a83db07a1 100644
--- a/l10n/bg_BG/settings.po
+++ b/l10n/bg_BG/settings.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:05+0100\n"
-"PO-Revision-Date: 2013-02-14 17:50+0000\n"
-"Last-Translator: Stefan Ilivanov <ilivanov@gmail.com>\n"
+"POT-Creation-Date: 2013-03-04 00:06+0100\n"
+"PO-Revision-Date: 2013-03-03 16:20+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"
@@ -24,8 +24,8 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr ""
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:15
-#: ajax/togglegroups.php:18
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr "Възникна проблем с идентификацията"
 
@@ -73,12 +73,12 @@ 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 ""
@@ -119,7 +119,7 @@ msgstr "Грешка"
 msgid "Updated"
 msgstr "Обновено"
 
-#: js/personal.js:96
+#: js/personal.js:99
 msgid "Saving..."
 msgstr "Записване..."
 
@@ -164,7 +164,7 @@ msgstr ""
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -194,7 +194,7 @@ msgstr ""
 #: 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"
@@ -210,19 +210,19 @@ msgstr ""
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:61
+#: templates/admin.php:63
+#, php-format
 msgid ""
-"This ownCloud server can't set system locale to "
-"\"en_US.UTF-8\"/\"en_US.UTF8\". 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 en_US.UTF-8/en_US.UTF8."
+"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:72
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:75
+#: 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 "
@@ -232,98 +232,98 @@ msgid ""
 " of ownCloud."
 msgstr ""
 
-#: templates/admin.php:89
+#: templates/admin.php:92
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:98
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:108
+#: 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:118
+#: 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:125
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:131
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:132
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:140
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:147
+#: templates/admin.php:150
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:148
+#: templates/admin.php:151
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:155
+#: templates/admin.php:158
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:161
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:165
+#: templates/admin.php:168
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:181
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:179
+#: templates/admin.php:182
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:182
+#: templates/admin.php:185
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr ""
 
-#: templates/admin.php:192
+#: templates/admin.php:195
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:193
+#: templates/admin.php:196
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:220
+#: templates/admin.php:223
 msgid "More"
 msgstr "Още"
 
-#: templates/admin.php:227 templates/personal.php:98
+#: templates/admin.php:230 templates/personal.php:102
 msgid "Version"
 msgstr "Версия"
 
-#: templates/admin.php:230 templates/personal.php:100
+#: templates/admin.php:233 templates/personal.php:105
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -333,51 +333,51 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr ""
 
-#: templates/apps.php:10
+#: templates/apps.php:11
 msgid "Add your App"
 msgstr "Добавете Ваше приложение"
 
-#: templates/apps.php:11
+#: templates/apps.php:12
 msgid "More Apps"
 msgstr "Още приложения"
 
-#: templates/apps.php:24
+#: templates/apps.php:28
 msgid "Select an App"
 msgstr "Изберете приложение"
 
-#: templates/apps.php:28
+#: templates/apps.php:34
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:29
+#: templates/apps.php:36
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
-#: templates/apps.php:31
+#: templates/apps.php:38
 msgid "Update"
 msgstr "Обновяване"
 
-#: templates/help.php:3
+#: 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 "Платена поддръжка"
 
@@ -386,79 +386,79 @@ msgstr "Платена поддръжка"
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:14
+#: templates/personal.php:15
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:25
+#: templates/personal.php:26
 msgid "Show First Run Wizard again"
 msgstr "Покажи настройките за първоначално зареждане отново"
 
-#: templates/personal.php:36 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
 msgid "Password"
 msgstr "Парола"
 
-#: templates/personal.php:37
+#: templates/personal.php:38
 msgid "Your password was changed"
 msgstr ""
 
-#: templates/personal.php:38
+#: templates/personal.php:39
 msgid "Unable to change your password"
 msgstr "Промяната на паролата не беше извършена"
 
-#: templates/personal.php:39
+#: templates/personal.php:40
 msgid "Current password"
 msgstr "Текуща парола"
 
-#: templates/personal.php:40
+#: templates/personal.php:42
 msgid "New password"
 msgstr "Нова парола"
 
-#: templates/personal.php:42
+#: templates/personal.php:44
 msgid "Change password"
 msgstr "Промяна на паролата"
 
-#: templates/personal.php:54 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:78
 msgid "Display Name"
 msgstr "Екранно име"
 
-#: templates/personal.php:55
+#: templates/personal.php:57
 msgid "Your display name was changed"
 msgstr ""
 
-#: templates/personal.php:56
+#: templates/personal.php:58
 msgid "Unable to change your display name"
 msgstr ""
 
-#: templates/personal.php:59
+#: templates/personal.php:61
 msgid "Change display name"
 msgstr ""
 
-#: templates/personal.php:68
+#: templates/personal.php:70
 msgid "Email"
 msgstr "E-mail"
 
-#: templates/personal.php:69
+#: templates/personal.php:72
 msgid "Your email address"
 msgstr "Вашия email адрес"
 
-#: templates/personal.php:70
+#: templates/personal.php:73
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:76 templates/personal.php:77
+#: templates/personal.php:79 templates/personal.php:80
 msgid "Language"
 msgstr "Език"
 
-#: templates/personal.php:82
+#: templates/personal.php:86
 msgid "Help translate"
 msgstr "Помогнете с превода"
 
-#: templates/personal.php:87
+#: templates/personal.php:91
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:89
+#: templates/personal.php:93
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
diff --git a/l10n/bg_BG/user_ldap.po b/l10n/bg_BG/user_ldap.po
index fd4876ac72a7eaa4231fddc16100d1340a8f5836..43ed372ee085a76bda2fe35e74711485eda09585 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-02-08 00:10+0100\n"
-"PO-Revision-Date: 2013-02-07 23:11+0000\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: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -21,17 +21,17 @@ msgstr ""
 msgid "Failed to delete the server configuration"
 msgstr ""
 
-#: ajax/testConfiguration.php:35
+#: ajax/testConfiguration.php:36
 msgid "The configuration is valid and the connection could be established!"
 msgstr ""
 
-#: ajax/testConfiguration.php:37
+#: ajax/testConfiguration.php:39
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
 msgstr ""
 
-#: ajax/testConfiguration.php:40
+#: ajax/testConfiguration.php:43
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
@@ -86,224 +86,248 @@ msgstr ""
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:17
+#: templates/settings.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:23
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:25
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:26
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:27
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:28
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:32
 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:24
+#: templates/settings.php:33
 msgid "Password"
 msgstr "Парола"
 
-#: templates/settings.php:24
+#: templates/settings.php:36
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:37
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:40
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:41
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:42
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:45
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:46
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:47
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:50
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:51
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:55
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:34
+#: templates/settings.php:58
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:60
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:39
+#: templates/settings.php:63
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:65
+msgid "Cache Time-To-Live"
+msgstr ""
+
+#: templates/settings.php:65
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:67
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:47
+#: templates/settings.php:71
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:47 templates/settings.php:50
+#: templates/settings.php:71 templates/settings.php:74
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:74
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:75
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:77
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:79
+msgid "Quota Field"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Quota Default"
+msgstr ""
+
+#: templates/settings.php:80
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:81
+msgid "Email Field"
+msgstr ""
+
+#: templates/settings.php:82
+msgid "User Home Folder Naming Rule"
+msgstr ""
+
+#: templates/settings.php:82
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:62
+#: templates/settings.php:86
+msgid "Test Configuration"
+msgstr ""
+
+#: templates/settings.php:86
 msgid "Help"
 msgstr "Помощ"
diff --git a/l10n/bn_BD/core.po b/l10n/bn_BD/core.po
index 924aa6894fe84bb545dfcb4d10018e7d24f6e132..4bac9a5d5fb4884248655187d3c3e7d8d46967cc 100644
--- a/l10n/bn_BD/core.po
+++ b/l10n/bn_BD/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 14:31+0000\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"
 "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
 "MIME-Version: 1.0\n"
@@ -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 "ownCloud কূটশব্দ পূনঃনির্ধারণ"
 
diff --git a/l10n/bn_BD/files.po b/l10n/bn_BD/files.po
index 929307cb9cbbf1c1ac62fbc51c557e940d93d8d3..3b17926554c5ff5b603b4ba54e5b2c6397595cee 100644
--- a/l10n/bn_BD/files.po
+++ b/l10n/bn_BD/files.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\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: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
 "MIME-Version: 1.0\n"
@@ -51,27 +51,27 @@ msgid ""
 "the HTML form"
 msgstr "আপলোড করা ফাইলটি HTML  ফর্মে নির্ধারিত  MAX_FILE_SIZE নির্দেশিত সর্বোচ্চ আকার অতিক্রম করেছে "
 
-#: ajax/upload.php:31
+#: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
 msgstr "আপলোড করা ফাইলটি আংশিক আপলোড করা হয়েছে"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:31
 msgid "No file was uploaded"
 msgstr "কোন ফাইল আপলোড করা হয় নি"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:32
 msgid "Missing a temporary folder"
 msgstr "অস্থায়ী ফোল্ডার খোয়া গিয়েছে"
 
-#: ajax/upload.php:34
+#: ajax/upload.php:33
 msgid "Failed to write to disk"
 msgstr "ডিস্কে লিখতে ব্যর্থ"
 
-#: ajax/upload.php:52
+#: ajax/upload.php:51
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:83
+#: ajax/upload.php:82
 msgid "Invalid directory."
 msgstr "ভুল ডিরেক্টরি"
 
@@ -83,7 +83,7 @@ msgstr "ফাইল"
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:127 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:127 templates/index.php:92 templates/index.php:93
 msgid "Delete"
 msgstr "মুছে ফেল"
 
@@ -91,40 +91,36 @@ msgstr "মুছে ফেল"
 msgid "Rename"
 msgstr "পূনঃনামকরণ"
 
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
 msgid "Pending"
 msgstr "মুলতুবি"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "{new_name} already exists"
 msgstr "{new_name} টি বিদ্যমান"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "replace"
 msgstr "প্রতিস্থাপন"
 
-#: js/filelist.js:253
+#: js/filelist.js:251
 msgid "suggest name"
 msgstr "নাম সুপারিশ করুন"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "cancel"
 msgstr "বাতিল"
 
-#: js/filelist.js:295
-msgid "replaced {new_name}"
-msgstr "{new_name}  প্রতিস্থাপন করা হয়েছে"
+#: js/filelist.js:298
+msgid "replaced {new_name} with {old_name}"
+msgstr "{new_name} কে {old_name} নামে প্রতিস্থাপন করা হয়েছে"
 
-#: js/filelist.js:295 js/filelist.js:297
+#: js/filelist.js:298
 msgid "undo"
 msgstr "ক্রিয়া প্রত্যাহার"
 
-#: js/filelist.js:297
-msgid "replaced {new_name} with {old_name}"
-msgstr "{new_name} কে {old_name} নামে প্রতিস্থাপন করা হয়েছে"
-
-#: js/filelist.js:322
+#: js/filelist.js:323
 msgid "perform delete operation"
 msgstr ""
 
@@ -150,74 +146,74 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:224
+#: js/files.js:225
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:261
+#: js/files.js:262
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "আপনার ফাইলটি আপলোড করা সম্ভব হলো না, কেননা এটি হয় একটি ফোল্ডার কিংবা এর আকার ০ বাইট"
 
-#: js/files.js:261
+#: js/files.js:262
 msgid "Upload Error"
 msgstr "আপলোড করতে সমস্যা "
 
-#: js/files.js:272
+#: js/files.js:273
 msgid "Close"
 msgstr "বন্ধ"
 
-#: js/files.js:311
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr "১টি ফাইল আপলোড করা হচ্ছে"
 
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr "{count} টি ফাইল আপলোড করা হচ্ছে"
 
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "আপলোড বাতিল করা হয়েছে।"
 
-#: js/files.js:496
+#: js/files.js:497
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "ফাইল আপলোড চলমান। এই পৃষ্ঠা পরিত্যাগ করলে আপলোড বাতিল করা হবে।"
 
-#: js/files.js:569
+#: js/files.js:570
 msgid "URL cannot be empty."
 msgstr "URL ফাঁকা রাখা যাবে না।"
 
-#: js/files.js:574
+#: js/files.js:575
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "ফোল্ডারের নামটি সঠিক নয়। 'ভাগাভাগি করা' শুধুমাত্র Owncloud  এর জন্য সংরক্ষিত।"
 
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:953 templates/index.php:68
 msgid "Name"
 msgstr "নাম"
 
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:954 templates/index.php:79
 msgid "Size"
 msgstr "আকার"
 
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:955 templates/index.php:81
 msgid "Modified"
 msgstr "পরিবর্তিত"
 
-#: js/files.js:969
+#: js/files.js:974
 msgid "1 folder"
 msgstr "১টি ফোল্ডার"
 
-#: js/files.js:971
+#: js/files.js:976
 msgid "{count} folders"
 msgstr "{count} টি ফোল্ডার"
 
-#: js/files.js:979
+#: js/files.js:984
 msgid "1 file"
 msgstr "১টি ফাইল"
 
-#: js/files.js:981
+#: js/files.js:986
 msgid "{count} files"
 msgstr "{count} টি ফাইল"
 
@@ -281,33 +277,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr "আপলোড বাতিল কর"
 
-#: templates/index.php:59
+#: templates/index.php:53
+msgid "You don’t have write permissions here."
+msgstr ""
+
+#: templates/index.php:60
 msgid "Nothing in here. Upload something!"
 msgstr "এখানে কিছুই নেই। কিছু আপলোড করুন !"
 
-#: templates/index.php:73
+#: templates/index.php:74
 msgid "Download"
 msgstr "ডাউনলোড"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:86 templates/index.php:87
 msgid "Unshare"
 msgstr "ভাগাভাগি বাতিল "
 
-#: templates/index.php:105
+#: templates/index.php:106
 msgid "Upload too large"
 msgstr "আপলোডের আকারটি অনেক বড়"
 
-#: templates/index.php:107
+#: templates/index.php:108
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "আপনি এই সার্ভারে আপলোড করার জন্য অনুমোদিত ফাইলের সর্বোচ্চ আকারের চেয়ে বৃহদাকার ফাইল আপলোড করার চেষ্টা করছেন "
 
-#: templates/index.php:112
+#: templates/index.php:113
 msgid "Files are being scanned, please wait."
 msgstr "ফাইলগুলো স্ক্যান করা হচ্ছে, দয়া করে অপেক্ষা করুন।"
 
-#: templates/index.php:115
+#: templates/index.php:116
 msgid "Current scanning"
 msgstr "বর্তমান স্ক্যানিং"
 
diff --git a/l10n/bn_BD/files_external.po b/l10n/bn_BD/files_external.po
index fc11b94750f27e4559d84d3a5f906635fce6e5d5..d0c094dd70b12e340154829641b968e450e60c9c 100644
--- a/l10n/bn_BD/files_external.po
+++ b/l10n/bn_BD/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-01-11 00:05+0100\n"
-"PO-Revision-Date: 2013-01-10 10:28+0000\n"
-"Last-Translator: Shubhra Paul <paul_shubhra@yahoo.com>\n"
+"POT-Creation-Date: 2013-02-28 00:04+0100\n"
+"PO-Revision-Date: 2013-02-27 23:04+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: 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"
@@ -17,37 +17,33 @@ msgstr ""
 "Language: bn_BD\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 "Dropbox সংরক্ষণাগার নির্ধারণ করতে সমস্যা "
 
-#: 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 "দয়া করে সঠিক এবং বৈধ Dropbox app key and secret প্রদান করুন।"
 
-#: 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 "Google Drive সংরক্ষণাগার নির্ধারণ করতে সমস্যা "
 
-#: lib/config.php:434
+#: lib/config.php:421
 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:424
 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 "
@@ -58,63 +54,63 @@ msgstr ""
 msgid "External Storage"
 msgstr "বাহ্যিক সংরক্ষণাগার"
 
-#: templates/settings.php:8 templates/settings.php:22
-msgid "Mount point"
-msgstr "মাউন্ট পয়েন্ট"
-
-#: templates/settings.php:9
-msgid "Backend"
-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: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"
-msgstr "মাউন্ট পয়েন্ট যোগ কর"
+#: 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 "ব্যবহারকারী"
 
-#: templates/settings.php:108 templates/settings.php:109
-#: templates/settings.php:144 templates/settings.php:145
+#: templates/settings.php:113 templates/settings.php:114
+#: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
 msgstr "মুছে ফেল"
 
-#: 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:136
+#: templates/settings.php:141
 msgid "SSL root certificates"
 msgstr "SSL  রুট সনদপত্র"
 
-#: templates/settings.php:153
+#: templates/settings.php:159
 msgid "Import Root Certificate"
 msgstr "রুট সনদপত্রটি আমদানি করুন"
diff --git a/l10n/bn_BD/files_trashbin.po b/l10n/bn_BD/files_trashbin.po
index b2577e03d2d5d16f0bcc1ffdd4c6873697e559bb..d4cfe626a62b961a19c02223c2495e08d1f33160 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-02-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 10:07+0000\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: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
 "MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Language: bn_BD\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:22
+#: ajax/delete.php:40
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
@@ -27,35 +27,39 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:33
+#: js/trash.js:34
 msgid "delete file permanently"
 msgstr ""
 
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr ""
+
+#: js/trash.js:174 templates/index.php:17
 msgid "Name"
 msgstr "রাম"
 
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:175 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:135
+#: js/trash.js:184
 msgid "1 folder"
 msgstr "১টি ফোল্ডার"
 
-#: js/trash.js:137
+#: js/trash.js:186
 msgid "{count} folders"
 msgstr "{count} টি ফোল্ডার"
 
-#: js/trash.js:145
+#: js/trash.js:194
 msgid "1 file"
 msgstr "১টি ফাইল"
 
-#: js/trash.js:147
+#: js/trash.js:196
 msgid "{count} files"
 msgstr "{count} টি ফাইল"
 
@@ -66,3 +70,11 @@ 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/bn_BD/files_versions.po b/l10n/bn_BD/files_versions.po
index 3c072f781609835c2af596e7df2803ac409ca9e2..446a2d3471cbb16ae0b862435f561fccf9389813 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-02-08 00:10+0100\n"
-"PO-Revision-Date: 2013-02-07 23:11+0000\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"
 "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
 "MIME-Version: 1.0\n"
@@ -48,18 +48,10 @@ msgstr ""
 msgid "No path specified"
 msgstr ""
 
-#: js/versions.js:16
-msgid "History"
-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 ""
-
-#: templates/settings.php:3
-msgid "Files Versioning"
-msgstr "ফাইল ভার্সন করা"
-
-#: templates/settings.php:4
-msgid "Enable"
-msgstr "সক্রিয় "
diff --git a/l10n/bn_BD/lib.po b/l10n/bn_BD/lib.po
index 747a2e28198dd65e9d4f1490da35ca6db08d3a72..27e8d80e84f0c397e306d16cb9b9cf7453d87188 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-11 15:39+0100\n"
-"PO-Revision-Date: 2013-02-11 14:41+0000\n"
+"POT-Creation-Date: 2013-02-27 14:35+0100\n"
+"PO-Revision-Date: 2013-02-27 13:36+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
 "MIME-Version: 1.0\n"
@@ -17,27 +17,27 @@ msgstr ""
 "Language: bn_BD\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:339
+#: app.php:349
 msgid "Help"
 msgstr "সহায়িকা"
 
-#: app.php:346
+#: app.php:362
 msgid "Personal"
 msgstr "ব্যক্তিগত"
 
-#: app.php:351
+#: app.php:373
 msgid "Settings"
 msgstr "নিয়ামকসমূহ"
 
-#: app.php:356
+#: app.php:385
 msgid "Users"
 msgstr "ব্যভহারকারী"
 
-#: app.php:363
+#: app.php:398
 msgid "Apps"
 msgstr "অ্যাপ"
 
-#: app.php:365
+#: app.php:406
 msgid "Admin"
 msgstr "প্রশাসক"
 
@@ -49,15 +49,15 @@ msgstr "ZIP ডাউনলোড বন্ধ করা আছে।"
 msgid "Files need to be downloaded one by one."
 msgstr "ফাইলগুলো একে একে ডাউনলোড করা আবশ্যক।"
 
-#: files.php:203 files.php:228
+#: files.php:204 files.php:231
 msgid "Back to Files"
 msgstr "ফাইলে ফিরে চল"
 
-#: files.php:227
+#: files.php:228
 msgid "Selected files too large to generate zip file."
 msgstr "নির্বাচিত ফাইলগুলো এতই বৃহৎ যে জিপ ফাইল তৈরী করা সম্ভব নয়।"
 
-#: helper.php:226
+#: helper.php:228
 msgid "couldn't be determined"
 msgstr ""
 
@@ -97,87 +97,92 @@ msgstr ""
 msgid "Specify a data folder."
 msgstr ""
 
-#: setup.php:53
+#: setup.php:55
 #, php-format
 msgid "%s enter the database username."
 msgstr ""
 
-#: setup.php:56
+#: setup.php:58
 #, php-format
 msgid "%s enter the database name."
 msgstr ""
 
-#: setup.php:59
+#: setup.php:61
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr ""
 
-#: setup.php:62
+#: setup.php:64
 #, php-format
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:126 setup.php:291 setup.php:336
+#: setup.php:128 setup.php:320 setup.php:365
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:127 setup.php:150 setup.php:204
+#: setup.php:129 setup.php:152 setup.php:229
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:149 setup.php:423 setup.php:489
+#: setup.php:151 setup.php:453 setup.php:520
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:203
+#: setup.php:228
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:255 setup.php:357 setup.php:366 setup.php:384 setup.php:394
-#: setup.php:403 setup.php:430 setup.php:496 setup.php:522 setup.php:529
-#: setup.php:540 setup.php:547 setup.php:556 setup.php:564 setup.php:573
-#: setup.php:579
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:256 setup.php:358 setup.php:367 setup.php:385 setup.php:395
-#: setup.php:404 setup.php:431 setup.php:497 setup.php:523 setup.php:530
-#: setup.php:541 setup.php:557 setup.php:565 setup.php:574
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:270
+#: setup.php:299
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:271
+#: setup.php:300
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:276
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:277
+#: setup.php:306
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:548 setup.php:580
+#: setup.php:579 setup.php:611
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:644
+#: setup.php:631
+#, php-format
+msgid "MS SQL username and/or password not valid: %s"
+msgstr ""
+
+#: setup.php:849
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:645
+#: setup.php:850
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
@@ -234,16 +239,16 @@ msgstr "গত বছর"
 msgid "years ago"
 msgstr "বছর পূর্বে"
 
-#: updater.php:75
+#: updater.php:78
 #, php-format
 msgid "%s is available. Get <a href=\"%s\">more information</a>"
 msgstr "%s এখন সুলভ।  <a href=\"%s\">আরও জানুন</a>"
 
-#: updater.php:77
+#: updater.php:81
 msgid "up to date"
 msgstr "সর্বশেষ"
 
-#: updater.php:80
+#: updater.php:84
 msgid "updates check is disabled"
 msgstr "পরিবর্ধন পরীক্ষণ করা বন্ধ রাখা হয়েছে"
 
diff --git a/l10n/bn_BD/settings.po b/l10n/bn_BD/settings.po
index a188eabb80bde10c8e32f9623037e412f3f18705..609d01de0bf9aaf096fd8beec865ec65d2c8801d 100644
--- a/l10n/bn_BD/settings.po
+++ b/l10n/bn_BD/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 23:05+0000\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: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
 "MIME-Version: 1.0\n"
@@ -22,8 +22,8 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "অ্যাপস্টোর থেকে তালিকা লোড করতে সক্ষম নয়"
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:15
-#: ajax/togglegroups.php:18
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr "অনুমোদন ঘটিত সমস্যা"
 
@@ -71,12 +71,12 @@ 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 " %s গোষ্ঠীতে ব্যবহারকারী যোগ করা সম্ভব হলো না "
 
-#: ajax/togglegroups.php:34
+#: ajax/togglegroups.php:36
 #, php-format
 msgid "Unable to remove user from group %s"
 msgstr "%s গোষ্ঠী থেকে ব্যবহারকারীকে অপসারণ করা সম্ভব হলো না"
@@ -117,7 +117,7 @@ msgstr "সমস্যা"
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:96
+#: js/personal.js:99
 msgid "Saving..."
 msgstr "সংরক্ষণ করা হচ্ছে.."
 
@@ -146,23 +146,23 @@ msgstr "গোষ্ঠী প্রশাসক"
 msgid "Delete"
 msgstr "মুছে ফেল"
 
-#: js/users.js:190
+#: js/users.js:191
 msgid "add group"
 msgstr ""
 
-#: js/users.js:351
+#: js/users.js:352
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:357
+#: js/users.js:358
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -208,19 +208,19 @@ msgstr ""
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:61
+#: templates/admin.php:63
+#, php-format
 msgid ""
-"This ownCloud server can't set system locale to "
-"\"en_US.UTF-8\"/\"en_US.UTF8\". 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 en_US.UTF-8/en_US.UTF8."
+"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:72
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:75
+#: 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 "
@@ -230,98 +230,98 @@ msgid ""
 " of ownCloud."
 msgstr ""
 
-#: templates/admin.php:89
+#: templates/admin.php:92
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:98
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:108
+#: 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:118
+#: 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:125
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:131
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:132
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:140
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:147
+#: templates/admin.php:150
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:148
+#: templates/admin.php:151
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:155
+#: templates/admin.php:158
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:161
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:165
+#: templates/admin.php:168
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:181
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:179
+#: templates/admin.php:182
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:182
+#: templates/admin.php:185
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr ""
 
-#: templates/admin.php:192
+#: templates/admin.php:195
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:193
+#: templates/admin.php:196
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:220
+#: templates/admin.php:223
 msgid "More"
 msgstr "বেশী"
 
-#: templates/admin.php:227 templates/personal.php:98
+#: templates/admin.php:230 templates/personal.php:102
 msgid "Version"
 msgstr "ভার্সন"
 
-#: templates/admin.php:230 templates/personal.php:100
+#: templates/admin.php:233 templates/personal.php:105
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -331,51 +331,51 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "তৈলী করেছেন <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud সম্প্রদায়</a>, যার <a href=\"https://github.com/owncloud\" target=\"_blank\"> উৎস কোডটি <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> এর অধীনে লাইসেন্সকৃত।"
 
-#: templates/apps.php:10
+#: templates/apps.php:11
 msgid "Add your App"
 msgstr "আপনার অ্যাপটি যোগ করুন"
 
-#: templates/apps.php:11
+#: templates/apps.php:12
 msgid "More Apps"
 msgstr "আরও অ্যাপ"
 
-#: templates/apps.php:24
+#: templates/apps.php:28
 msgid "Select an App"
 msgstr "অ্যাপ নির্বাচন করুন"
 
-#: templates/apps.php:28
+#: templates/apps.php:34
 msgid "See application page at apps.owncloud.com"
 msgstr "apps.owncloud.com এ অ্যাপ্লিকেসন পৃষ্ঠা দেখুন"
 
-#: templates/apps.php:29
+#: templates/apps.php:36
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-লাইসেন্সধারী <span class=\"author\"></span>"
 
-#: templates/apps.php:31
+#: templates/apps.php:38
 msgid "Update"
 msgstr "পরিবর্ধন"
 
-#: templates/help.php:3
+#: 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 "বাণিজ্যিক সাপোর্ট"
 
@@ -384,79 +384,79 @@ msgstr "বাণিজ্যিক সাপোর্ট"
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "আপনি ব্যবহার করছেন  <strong>%s</strong>, সুলভ  <strong>%s</strong> এর মধ্যে।"
 
-#: templates/personal.php:14
+#: templates/personal.php:15
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:25
+#: templates/personal.php:26
 msgid "Show First Run Wizard again"
 msgstr "প্রথমবার চালানোর যাদুকর পূনরায় প্রদর্শন কর"
 
-#: templates/personal.php:36 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
 msgid "Password"
 msgstr "কূটশব্দ"
 
-#: templates/personal.php:37
+#: templates/personal.php:38
 msgid "Your password was changed"
 msgstr "আপনার কূটশব্দটি পরিবর্তন করা হয়েছে "
 
-#: templates/personal.php:38
+#: templates/personal.php:39
 msgid "Unable to change your password"
 msgstr "আপনার কূটশব্দটি পরিবর্তন করতে সক্ষম নয়"
 
-#: templates/personal.php:39
+#: templates/personal.php:40
 msgid "Current password"
 msgstr "বর্তমান কূটশব্দ"
 
-#: templates/personal.php:40
+#: templates/personal.php:42
 msgid "New password"
 msgstr "নতুন কূটশব্দ"
 
-#: templates/personal.php:42
+#: templates/personal.php:44
 msgid "Change password"
 msgstr "কূটশব্দ পরিবর্তন করুন"
 
-#: templates/personal.php:54 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:78
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:55
+#: templates/personal.php:57
 msgid "Your display name was changed"
 msgstr ""
 
-#: templates/personal.php:56
+#: templates/personal.php:58
 msgid "Unable to change your display name"
 msgstr ""
 
-#: templates/personal.php:59
+#: templates/personal.php:61
 msgid "Change display name"
 msgstr ""
 
-#: templates/personal.php:68
+#: templates/personal.php:70
 msgid "Email"
 msgstr "ই-মেইল "
 
-#: templates/personal.php:69
+#: templates/personal.php:72
 msgid "Your email address"
 msgstr "আপনার ই-মেইল ঠিকানা"
 
-#: templates/personal.php:70
+#: templates/personal.php:73
 msgid "Fill in an email address to enable password recovery"
 msgstr "কূটশব্দ পূনরূদ্ধার সক্রিয় করার জন্য ই-মেইল ঠিকানাটি পূরণ করুন"
 
-#: templates/personal.php:76 templates/personal.php:77
+#: templates/personal.php:79 templates/personal.php:80
 msgid "Language"
 msgstr "ভাষা"
 
-#: templates/personal.php:82
+#: templates/personal.php:86
 msgid "Help translate"
 msgstr "অনুবাদ করতে সহায়তা করুন"
 
-#: templates/personal.php:87
+#: templates/personal.php:91
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:89
+#: templates/personal.php:93
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "আপনার ownCloud এ সংযুক্ত হতে এই ঠিকানাটি আপনার ফাইল ব্যবস্থাপকে ব্যবহার করুন"
 
diff --git a/l10n/bn_BD/user_ldap.po b/l10n/bn_BD/user_ldap.po
index b39dcc30cbc3fc44d190cd9d42eaa1176acc8337..57c372738472efeb1fae338ea2f9801848b36ed6 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-02-08 00:10+0100\n"
-"PO-Revision-Date: 2013-02-07 23:11+0000\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: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
 "MIME-Version: 1.0\n"
@@ -21,17 +21,17 @@ msgstr ""
 msgid "Failed to delete the server configuration"
 msgstr ""
 
-#: ajax/testConfiguration.php:35
+#: ajax/testConfiguration.php:36
 msgid "The configuration is valid and the connection could be established!"
 msgstr ""
 
-#: ajax/testConfiguration.php:37
+#: ajax/testConfiguration.php:39
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
 msgstr ""
 
-#: ajax/testConfiguration.php:40
+#: ajax/testConfiguration.php:43
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
@@ -86,224 +86,248 @@ msgstr ""
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:17
+#: templates/settings.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:23
 msgid "Host"
 msgstr "হোস্ট"
 
-#: templates/settings.php:21
+#: templates/settings.php:25
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "SSL আবশ্যক  না হলে  আপনি এই প্রটোকলটি মুছে ফেলতে পারেন । এরপর শুরু করুন এটা দিয়ে ldaps://"
 
-#: templates/settings.php:22
+#: templates/settings.php:26
 msgid "Base DN"
 msgstr "ভিত্তি  DN"
 
-#: templates/settings.php:22
+#: templates/settings.php:27
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:28
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "সুচারু ট্যঅবে গিয়ে আপনি ব্যবহারকারি এবং গোষ্ঠীসমূহের জন্য ভিত্তি DN নির্ধারণ করতে পারেন।"
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "User DN"
 msgstr "ব্যবহারকারি  DN"
 
-#: templates/settings.php:23
+#: templates/settings.php:32
 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:24
+#: templates/settings.php:33
 msgid "Password"
 msgstr "কূটশব্দ"
 
-#: templates/settings.php:24
+#: templates/settings.php:36
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "অজ্ঞাতকুলশীল অধিগমনের জন্য DN এবং কূটশব্দটি ফাঁকা রাখুন।"
 
-#: templates/settings.php:25
+#: templates/settings.php:37
 msgid "User Login Filter"
 msgstr "ব্যবহারকারির প্রবেশ ছাঁকনী"
 
-#: templates/settings.php:25
+#: templates/settings.php:40
 #, 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:25
+#: templates/settings.php:41
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "%%uid স্থানধারক ব্যবহার করুন, উদাহরণঃ  \"uid=%%uid\""
 
-#: templates/settings.php:26
+#: templates/settings.php:42
 msgid "User List Filter"
 msgstr "ব্যবহারকারী তালিকা ছাঁকনী"
 
-#: templates/settings.php:26
+#: templates/settings.php:45
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "ব্যবহারকারী উদ্ধার করার সময় প্রয়োগের জন্য ছাঁকনী নির্ধারণ করবে।"
 
-#: templates/settings.php:26
+#: templates/settings.php:46
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "কোন স্থানধারক ব্যতীত, যেমনঃ \"objectClass=person\"।"
 
-#: templates/settings.php:27
+#: templates/settings.php:47
 msgid "Group Filter"
 msgstr "গোষ্ঠী ছাঁকনী"
 
-#: templates/settings.php:27
+#: templates/settings.php:50
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "গোষ্ঠীসমূহ উদ্ধার করার সময় প্রয়োগের জন্য ছাঁকনী নির্ধারণ করবে।"
 
-#: templates/settings.php:27
+#: templates/settings.php:51
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "কোন স্থান ধারক ব্যতীত, উদাহরণঃ\"objectClass=posixGroup\"।"
 
-#: templates/settings.php:31
+#: templates/settings.php:55
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:34
+#: templates/settings.php:58
 msgid "Port"
 msgstr "পোর্ট"
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:60
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Use TLS"
 msgstr "TLS ব্যবহার কর"
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:39
+#: templates/settings.php:63
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "বর্ণ অসংবেদী LDAP  সার্ভার (উইন্ডোজ)"
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid "Turn off SSL certificate validation."
 msgstr "SSL সনদপত্র যাচাইকরণ বন্ধ রাক।"
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 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:40
+#: templates/settings.php:64
 msgid "Not recommended, use for testing only."
 msgstr "অনুমোদিত নয়, শুধুমাত্র পরীক্ষামূলক ব্যবহারের জন্য।"
 
-#: templates/settings.php:41
+#: templates/settings.php:65
+msgid "Cache Time-To-Live"
+msgstr ""
+
+#: templates/settings.php:65
 msgid "in seconds. A change empties the cache."
 msgstr "সেকেন্ডে। কোন পরিবর্তন ক্যাসে খালি করবে।"
 
-#: templates/settings.php:43
+#: templates/settings.php:67
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "User Display Name Field"
 msgstr "ব্যবহারকারীর প্রদর্শিতব্য নামের ক্ষেত্র"
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "ব্যবহারকারীর ownCloud নাম তৈরি করার জন্য ব্যভহৃত LDAP বৈশিষ্ট্য।"
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "Base User Tree"
 msgstr "ভিত্তি ব্যবহারকারি বৃক্ষাকারে"
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:47
+#: templates/settings.php:71
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:47 templates/settings.php:50
+#: templates/settings.php:71 templates/settings.php:74
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "Group Display Name Field"
 msgstr "গোষ্ঠীর প্রদর্শিতব্য নামের ক্ষেত্র"
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "গোষ্ঠীর ownCloud নাম তৈরি করার জন্য ব্যভহৃত LDAP বৈশিষ্ট্য।"
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "Base Group Tree"
 msgstr "ভিত্তি গোষ্ঠী বৃক্ষাকারে"
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:74
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:75
 msgid "Group-Member association"
 msgstr "গোষ্ঠী-সদস্য সংস্থাপন"
 
-#: templates/settings.php:53
+#: templates/settings.php:77
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:79
+msgid "Quota Field"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Quota Default"
+msgstr ""
+
+#: templates/settings.php:80
 msgid "in bytes"
 msgstr "বাইটে"
 
-#: templates/settings.php:58
+#: templates/settings.php:81
+msgid "Email Field"
+msgstr ""
+
+#: templates/settings.php:82
+msgid "User Home Folder Naming Rule"
+msgstr ""
+
+#: templates/settings.php:82
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "ব্যবহারকারী নামের জন্য ফাঁকা রাখুন (পূর্বনির্ধারিত)। অন্যথায়, LDAP/AD বৈশিষ্ট্য নির্ধারণ করুন।"
 
-#: templates/settings.php:62
+#: templates/settings.php:86
+msgid "Test Configuration"
+msgstr ""
+
+#: templates/settings.php:86
 msgid "Help"
 msgstr "সহায়িকা"
diff --git a/l10n/ca/core.po b/l10n/ca/core.po
index 54541ac94e7ee2beaaeae27a0cd0d4b1f10746da..1ec21d10858ec0b824f7d7be77eaf9509ad29ec1 100644
--- a/l10n/ca/core.po
+++ b/l10n/ca/core.po
@@ -6,13 +6,14 @@
 #   <joan@montane.cat>, 2012.
 #  <rcalvoi@yahoo.com>, 2013.
 #   <rcalvoi@yahoo.com>, 2011-2013.
+#  <sacoo2@hotmail.com>, 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 14:32+0000\n"
-"Last-Translator: rogerc <rcalvoi@yahoo.com>\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"
 "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"
@@ -20,24 +21,24 @@ msgstr ""
 "Language: ca\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'usuari %s ha compartit un fitxer amb vós"
 
-#: ajax/share.php:87
+#: ajax/share.php:99
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr "L'usuari %s ha compartit una carpeta amb vós"
 
-#: ajax/share.php: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'usuari %s ha compartit el fitxer \"%s\" amb vós. Està disponible per a la descàrrega a: %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 +84,79 @@ msgstr "No hi ha categories per eliminar."
 msgid "Error removing %s from favorites."
 msgstr "Error en eliminar %s dels preferits."
 
-#: js/config.php:32
+#: js/config.php:34
 msgid "Sunday"
 msgstr "Diumenge"
 
-#: js/config.php:32
+#: js/config.php:35
 msgid "Monday"
 msgstr "Dilluns"
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Tuesday"
 msgstr "Dimarts"
 
-#: js/config.php:32
+#: js/config.php:37
 msgid "Wednesday"
 msgstr "Dimecres"
 
-#: js/config.php:32
+#: js/config.php:38
 msgid "Thursday"
 msgstr "Dijous"
 
-#: 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 "Gener"
 
-#: js/config.php:33
+#: js/config.php:46
 msgid "February"
 msgstr "Febrer"
 
-#: js/config.php:33
+#: js/config.php:47
 msgid "March"
 msgstr "Març"
 
-#: js/config.php:33
+#: js/config.php:48
 msgid "April"
 msgstr "Abril"
 
-#: js/config.php:33
+#: js/config.php:49
 msgid "May"
 msgstr "Maig"
 
-#: js/config.php:33
+#: js/config.php:50
 msgid "June"
 msgstr "Juny"
 
-#: js/config.php:33
+#: js/config.php:51
 msgid "July"
 msgstr "Juliol"
 
-#: js/config.php:33
+#: js/config.php:52
 msgid "August"
 msgstr "Agost"
 
-#: js/config.php:33
+#: js/config.php:53
 msgid "September"
 msgstr "Setembre"
 
-#: js/config.php:33
+#: js/config.php:54
 msgid "October"
 msgstr "Octubre"
 
-#: js/config.php:33
+#: js/config.php:55
 msgid "November"
 msgstr "Novembre"
 
-#: js/config.php:33
+#: js/config.php:56
 msgid "December"
 msgstr "Desembre"
 
@@ -163,55 +164,55 @@ msgstr "Desembre"
 msgid "Settings"
 msgstr "Arranjament"
 
-#: js/js.js:767
+#: js/js.js:768
 msgid "seconds ago"
 msgstr "segons enrere"
 
-#: js/js.js:768
+#: js/js.js:769
 msgid "1 minute ago"
 msgstr "fa 1 minut"
 
-#: js/js.js:769
+#: js/js.js:770
 msgid "{minutes} minutes ago"
 msgstr "fa {minutes} minuts"
 
-#: js/js.js:770
+#: js/js.js:771
 msgid "1 hour ago"
 msgstr "fa 1 hora"
 
-#: js/js.js:771
+#: js/js.js:772
 msgid "{hours} hours ago"
 msgstr "fa {hours} hores"
 
-#: js/js.js:772
+#: js/js.js:773
 msgid "today"
 msgstr "avui"
 
-#: js/js.js:773
+#: js/js.js:774
 msgid "yesterday"
 msgstr "ahir"
 
-#: js/js.js:774
+#: js/js.js:775
 msgid "{days} days ago"
 msgstr "fa {days} dies"
 
-#: js/js.js:775
+#: js/js.js:776
 msgid "last month"
 msgstr "el mes passat"
 
-#: js/js.js:776
+#: js/js.js:777
 msgid "{months} months ago"
 msgstr "fa {months} mesos"
 
-#: js/js.js:777
+#: js/js.js:778
 msgid "months ago"
 msgstr "mesos enrere"
 
-#: js/js.js:778
+#: js/js.js:779
 msgid "last year"
 msgstr "l'any passat"
 
-#: js/js.js:779
+#: js/js.js:780
 msgid "years ago"
 msgstr "anys enrere"
 
@@ -294,7 +295,7 @@ msgstr "Comparteix amb enllaç"
 msgid "Password protect"
 msgstr "Protegir amb contrasenya"
 
-#: js/share.js:185 templates/installation.php:44 templates/login.php:35
+#: js/share.js:185 templates/installation.php:47 templates/login.php:35
 msgid "Password"
 msgstr "Contrasenya"
 
@@ -387,9 +388,9 @@ msgstr "L'actualització ha estat incorrecte. Comuniqueu aquest error a <a href=
 
 #: js/update.js:18
 msgid "The update was successful. Redirecting you to ownCloud now."
-msgstr "L'actualització ha estat correcte. Ara sou redireccionat a ownCloud."
+msgstr "L'actualització ha estat correcte. Ara us redirigim a ownCloud."
 
-#: lostpassword/controller.php:47
+#: lostpassword/controller.php:48
 msgid "ownCloud password reset"
 msgstr "estableix de nou la contrasenya Owncloud"
 
@@ -409,7 +410,7 @@ msgstr "S'ha enviat el correu reinicialització"
 msgid "Request failed!"
 msgstr "El requeriment ha fallat!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:39
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:41
 #: templates/login.php:28
 msgid "Username"
 msgstr "Nom d'usuari"
@@ -470,85 +471,86 @@ msgstr "Edita les categories"
 msgid "Add"
 msgstr "Afegeix"
 
-#: templates/installation.php:23 templates/installation.php:30
+#: templates/installation.php:24 templates/installation.php:31
 msgid "Security Warning"
 msgstr "Avís de seguretat"
 
-#: templates/installation.php:24
+#: templates/installation.php:25
 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:25
+#: templates/installation.php:26
 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:31
+#: templates/installation.php:32
 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:32
+#: templates/installation.php:33
 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:36
+#: templates/installation.php:37
 msgid "Create an <strong>admin account</strong>"
 msgstr "Crea un <strong>compte d'administrador</strong>"
 
-#: templates/installation.php:52
+#: templates/installation.php:55
 msgid "Advanced"
 msgstr "Avançat"
 
-#: templates/installation.php:54
+#: templates/installation.php:57
 msgid "Data folder"
 msgstr "Carpeta de dades"
 
-#: templates/installation.php:61
+#: templates/installation.php:66
 msgid "Configure the database"
 msgstr "Configura la base de dades"
 
-#: templates/installation.php:66 templates/installation.php:77
-#: templates/installation.php:87 templates/installation.php:97
+#: templates/installation.php:71 templates/installation.php:83
+#: templates/installation.php:94 templates/installation.php:105
+#: templates/installation.php:117
 msgid "will be used"
 msgstr "s'usarà"
 
-#: templates/installation.php:109
+#: templates/installation.php:129
 msgid "Database user"
 msgstr "Usuari de la base de dades"
 
-#: templates/installation.php:113
+#: templates/installation.php:134
 msgid "Database password"
 msgstr "Contrasenya de la base de dades"
 
-#: templates/installation.php:117
+#: templates/installation.php:139
 msgid "Database name"
 msgstr "Nom de la base de dades"
 
-#: templates/installation.php:125
+#: templates/installation.php:149
 msgid "Database tablespace"
 msgstr "Espai de taula de la base de dades"
 
-#: templates/installation.php:131
+#: templates/installation.php:156
 msgid "Database host"
 msgstr "Ordinador central de la base de dades"
 
-#: templates/installation.php:136
+#: templates/installation.php:162
 msgid "Finish setup"
 msgstr "Acaba la configuració"
 
-#: templates/layout.guest.php:33
+#: templates/layout.guest.php:35
 msgid "web services under your control"
 msgstr "controleu els vostres serveis web"
 
-#: templates/layout.user.php:48
+#: templates/layout.user.php:53
 msgid "Log out"
 msgstr "Surt"
 
diff --git a/l10n/ca/files.po b/l10n/ca/files.po
index 722be0b3c8fb351216063dd679e80686ae515d5c..688af1f9c4983aad6a2dbdb0ce8d053d716513fa 100644
--- a/l10n/ca/files.po
+++ b/l10n/ca/files.po
@@ -14,8 +14,8 @@ 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 23:05+0000\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: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -57,27 +57,27 @@ msgid ""
 "the HTML form"
 msgstr "El fitxer de pujada excedeix la directiva MAX_FILE_SIZE especificada al formulari HTML"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
 msgstr "El fitxer només s'ha pujat parcialment"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:31
 msgid "No file was uploaded"
 msgstr "El fitxer no s'ha pujat"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:32
 msgid "Missing a temporary folder"
 msgstr "S'ha perdut un fitxer temporal"
 
-#: ajax/upload.php:34
+#: ajax/upload.php:33
 msgid "Failed to write to disk"
 msgstr "Ha fallat en escriure al disc"
 
-#: ajax/upload.php:52
+#: ajax/upload.php:51
 msgid "Not enough storage available"
 msgstr "No hi ha prou espai disponible"
 
-#: ajax/upload.php:83
+#: ajax/upload.php:82
 msgid "Invalid directory."
 msgstr "Directori no vàlid."
 
@@ -89,7 +89,7 @@ msgstr "Fitxers"
 msgid "Delete permanently"
 msgstr "Esborra permanentment"
 
-#: js/fileactions.js:127 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:127 templates/index.php:92 templates/index.php:93
 msgid "Delete"
 msgstr "Suprimeix"
 
@@ -97,40 +97,36 @@ msgstr "Suprimeix"
 msgid "Rename"
 msgstr "Reanomena"
 
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
 msgid "Pending"
 msgstr "Pendents"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "{new_name} already exists"
 msgstr "{new_name} ja existeix"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "replace"
 msgstr "substitueix"
 
-#: js/filelist.js:253
+#: js/filelist.js:251
 msgid "suggest name"
 msgstr "sugereix un nom"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "cancel"
 msgstr "cancel·la"
 
-#: js/filelist.js:295
-msgid "replaced {new_name}"
-msgstr "s'ha substituït {new_name}"
+#: js/filelist.js:298
+msgid "replaced {new_name} with {old_name}"
+msgstr "s'ha substituït {old_name} per {new_name}"
 
-#: js/filelist.js:295 js/filelist.js:297
+#: js/filelist.js:298
 msgid "undo"
 msgstr "desfés"
 
-#: js/filelist.js:297
-msgid "replaced {new_name} with {old_name}"
-msgstr "s'ha substituït {old_name} per {new_name}"
-
-#: js/filelist.js:322
+#: js/filelist.js:323
 msgid "perform delete operation"
 msgstr "executa d'operació d'esborrar"
 
@@ -156,74 +152,74 @@ 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:224
+#: js/files.js:225
 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:261
+#: js/files.js:262
 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:261
+#: js/files.js:262
 msgid "Upload Error"
 msgstr "Error en la pujada"
 
-#: js/files.js:272
+#: js/files.js:273
 msgid "Close"
 msgstr "Tanca"
 
-#: js/files.js:311
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr "1 fitxer pujant"
 
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr "{count} fitxers en pujada"
 
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "La pujada s'ha cancel·lat."
 
-#: js/files.js:496
+#: js/files.js:497
 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:569
+#: js/files.js:570
 msgid "URL cannot be empty."
 msgstr "La URL no pot ser buida"
 
-#: js/files.js:574
+#: js/files.js:575
 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:948 templates/index.php:67
+#: js/files.js:953 templates/index.php:68
 msgid "Name"
 msgstr "Nom"
 
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:954 templates/index.php:79
 msgid "Size"
 msgstr "Mida"
 
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:955 templates/index.php:81
 msgid "Modified"
 msgstr "Modificat"
 
-#: js/files.js:969
+#: js/files.js:974
 msgid "1 folder"
 msgstr "1 carpeta"
 
-#: js/files.js:971
+#: js/files.js:976
 msgid "{count} folders"
 msgstr "{count} carpetes"
 
-#: js/files.js:979
+#: js/files.js:984
 msgid "1 file"
 msgstr "1 fitxer"
 
-#: js/files.js:981
+#: js/files.js:986
 msgid "{count} files"
 msgstr "{count} fitxers"
 
@@ -281,39 +277,43 @@ msgstr "Des d'enllaç"
 
 #: templates/index.php:40
 msgid "Deleted files"
-msgstr ""
+msgstr "Fitxers esborrats"
 
 #: templates/index.php:46
 msgid "Cancel upload"
 msgstr "Cancel·la la pujada"
 
-#: templates/index.php:59
+#: templates/index.php:53
+msgid "You don’t have write permissions here."
+msgstr "No teniu permisos d'escriptura aquí."
+
+#: templates/index.php:60
 msgid "Nothing in here. Upload something!"
 msgstr "Res per aquí. Pugeu alguna cosa!"
 
-#: templates/index.php:73
+#: templates/index.php:74
 msgid "Download"
 msgstr "Baixa"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:86 templates/index.php:87
 msgid "Unshare"
 msgstr "Deixa de compartir"
 
-#: templates/index.php:105
+#: templates/index.php:106
 msgid "Upload too large"
 msgstr "La pujada és massa gran"
 
-#: templates/index.php:107
+#: templates/index.php:108
 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:112
+#: templates/index.php:113
 msgid "Files are being scanned, please wait."
 msgstr "S'estan escanejant els fitxers, espereu"
 
-#: templates/index.php:115
+#: templates/index.php:116
 msgid "Current scanning"
 msgstr "Actualment escanejant"
 
diff --git a/l10n/ca/files_external.po b/l10n/ca/files_external.po
index 6d1515e0ba98f584009961805e7817b3aa11a3b8..6d6e1c8e23ada298d8c3eea5f2cf07e6c4a8ca11 100644
--- a/l10n/ca/files_external.po
+++ b/l10n/ca/files_external.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#  <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: 2012-12-14 00:16+0100\n"
-"PO-Revision-Date: 2012-12-13 09:50+0000\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"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -18,37 +19,33 @@ msgstr ""
 "Language: ca\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 "S'ha concedit l'accés"
 
-#: 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 "Error en configurar l'emmagatzemament Dropbox"
 
-#: 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 "Concedeix accés"
 
-#: js/dropbox.js:73 js/google.js:72
-msgid "Fill out all required fields"
-msgstr "Ompliu els camps requerits"
-
-#: js/dropbox.js:85
+#: js/dropbox.js:101
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr "Proporcioneu una clau d'aplicació i secret vàlids per a Dropbox"
 
-#: 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 "Error en configurar l'emmagatzemament Google Drive"
 
-#: lib/config.php:434
+#: lib/config.php:421
 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:435
+#: lib/config.php:424
 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 "
@@ -59,63 +56,63 @@ msgstr "<b>Avís:</b> El suport FTP per PHP no està activat o no està instal·
 msgid "External Storage"
 msgstr "Emmagatzemament extern"
 
-#: templates/settings.php:8 templates/settings.php:22
-msgid "Mount point"
-msgstr "Punt de muntatge"
-
-#: templates/settings.php:9
-msgid "Backend"
-msgstr "Dorsal"
+#: templates/settings.php:9 templates/settings.php:28
+msgid "Folder name"
+msgstr "Nom de la carpeta"
 
 #: templates/settings.php:10
+msgid "External storage"
+msgstr "Emmagatzemament extern"
+
+#: templates/settings.php:11
 msgid "Configuration"
 msgstr "Configuració"
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid "Options"
 msgstr "Options"
 
-#: templates/settings.php:12
+#: templates/settings.php:13
 msgid "Applicable"
 msgstr "Aplicable"
 
-#: templates/settings.php:27
-msgid "Add mount point"
-msgstr "Afegeix punt de muntatge"
+#: templates/settings.php:33
+msgid "Add storage"
+msgstr "Afegeix emmagatzemament"
 
-#: templates/settings.php:85
+#: templates/settings.php:90
 msgid "None set"
 msgstr "Cap d'establert"
 
-#: templates/settings.php:86
+#: templates/settings.php:91
 msgid "All Users"
 msgstr "Tots els usuaris"
 
-#: templates/settings.php:87
+#: templates/settings.php:92
 msgid "Groups"
 msgstr "Grups"
 
-#: templates/settings.php:95
+#: templates/settings.php:100
 msgid "Users"
 msgstr "Usuaris"
 
-#: 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 "Elimina"
 
-#: templates/settings.php:124
+#: templates/settings.php:129
 msgid "Enable User External Storage"
 msgstr "Habilita l'emmagatzemament extern d'usuari"
 
-#: templates/settings.php:125
+#: templates/settings.php:130
 msgid "Allow users to mount their own external storage"
 msgstr "Permet als usuaris muntar el seu emmagatzemament extern propi"
 
-#: templates/settings.php:139
+#: templates/settings.php:141
 msgid "SSL root certificates"
 msgstr "Certificats SSL root"
 
-#: templates/settings.php:158
+#: templates/settings.php:159
 msgid "Import Root Certificate"
 msgstr "Importa certificat root"
diff --git a/l10n/ca/files_trashbin.po b/l10n/ca/files_trashbin.po
index 7f76de9cd683f56a19948800dfa4956ce5aae566..cc147c1f7ffa0d9680bfe3ec9ef9d56749bae234 100644
--- a/l10n/ca/files_trashbin.po
+++ b/l10n/ca/files_trashbin.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-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 09:50+0000\n"
-"Last-Translator: rogerc <rcalvoi@yahoo.com>\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: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:22
+#: ajax/delete.php:40
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "No s'ha pogut esborrar permanentment %s"
@@ -28,35 +28,39 @@ msgstr "No s'ha pogut esborrar permanentment %s"
 msgid "Couldn't restore %s"
 msgstr "No s'ha pogut restaurar %s"
 
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
 msgid "perform restore operation"
 msgstr "executa l'operació de restauració"
 
-#: js/trash.js:33
+#: js/trash.js:34
 msgid "delete file permanently"
 msgstr "esborra el fitxer permanentment"
 
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr "Esborra permanentment"
+
+#: js/trash.js:174 templates/index.php:17
 msgid "Name"
 msgstr "Nom"
 
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:175 templates/index.php:27
 msgid "Deleted"
 msgstr "Eliminat"
 
-#: js/trash.js:135
+#: js/trash.js:184
 msgid "1 folder"
 msgstr "1 carpeta"
 
-#: js/trash.js:137
+#: js/trash.js:186
 msgid "{count} folders"
 msgstr "{count} carpetes"
 
-#: js/trash.js:145
+#: js/trash.js:194
 msgid "1 file"
 msgstr "1 fitxer"
 
-#: js/trash.js:147
+#: js/trash.js:196
 msgid "{count} files"
 msgstr "{count} fitxers"
 
@@ -67,3 +71,11 @@ msgstr "La paperera està buida!"
 #: templates/index.php:20 templates/index.php:22
 msgid "Restore"
 msgstr "Recupera"
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr "Esborra"
+
+#: templates/part.breadcrumb.php:9
+msgid "Deleted Files"
+msgstr ""
diff --git a/l10n/ca/files_versions.po b/l10n/ca/files_versions.po
index 43021a3304d59e3145437551a121521a8219842f..8aeff6e34cd440b4c48d685cbf63d66ca90c6a79 100644
--- a/l10n/ca/files_versions.po
+++ b/l10n/ca/files_versions.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-09 00:12+0100\n"
-"PO-Revision-Date: 2013-02-08 15:40+0000\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"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -51,18 +51,10 @@ msgstr "No hi ha versións antigues disponibles"
 msgid "No path specified"
 msgstr "No heu especificat el camí"
 
-#: js/versions.js:16
-msgid "History"
-msgstr "Historial"
+#: js/versions.js:6
+msgid "Versions"
+msgstr "Versions"
 
 #: templates/history.php:20
 msgid "Revert a file to a previous version by clicking on its revert button"
 msgstr "Reverteix un fitxer a una versió anterior fent clic en el seu botó de reverteix"
-
-#: templates/settings.php:3
-msgid "Files Versioning"
-msgstr "Fitxers de Versions"
-
-#: templates/settings.php:4
-msgid "Enable"
-msgstr "Habilita"
diff --git a/l10n/ca/lib.po b/l10n/ca/lib.po
index 1a8fcdda43d203fef7f3de2453726d93be450437..1786fbe663c1fd83fe600309110ab93a056c31a8 100644
--- a/l10n/ca/lib.po
+++ b/l10n/ca/lib.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 14:33+0000\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"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -19,27 +19,27 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:339
+#: app.php:349
 msgid "Help"
 msgstr "Ajuda"
 
-#: app.php:346
+#: app.php:362
 msgid "Personal"
 msgstr "Personal"
 
-#: app.php:351
+#: app.php:373
 msgid "Settings"
 msgstr "Configuració"
 
-#: app.php:356
+#: app.php:385
 msgid "Users"
 msgstr "Usuaris"
 
-#: app.php:363
+#: app.php:398
 msgid "Apps"
 msgstr "Aplicacions"
 
-#: app.php:365
+#: app.php:406
 msgid "Admin"
 msgstr "Administració"
 
@@ -51,15 +51,15 @@ msgstr "La baixada en ZIP està desactivada."
 msgid "Files need to be downloaded one by one."
 msgstr "Els fitxers s'han de baixar d'un en un."
 
-#: files.php:203 files.php:228
+#: files.php:204 files.php:231
 msgid "Back to Files"
 msgstr "Torna a Fitxers"
 
-#: files.php:227
+#: files.php:228
 msgid "Selected files too large to generate zip file."
 msgstr "Els fitxers seleccionats son massa grans per generar un fitxer zip."
 
-#: helper.php:226
+#: helper.php:228
 msgid "couldn't be determined"
 msgstr "no s'ha pogut determinar"
 
@@ -99,87 +99,92 @@ msgstr "Establiu una contrasenya per l'administrador."
 msgid "Specify a data folder."
 msgstr "Especifiqueu una carpeta de dades."
 
-#: setup.php:53
+#: setup.php:55
 #, php-format
 msgid "%s enter the database username."
 msgstr "%s escriviu el nom d'usuari de la base de dades."
 
-#: setup.php:56
+#: setup.php:58
 #, php-format
 msgid "%s enter the database name."
 msgstr "%s escriviu el nom de la base de dades."
 
-#: setup.php:59
+#: setup.php:61
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr "%s no podeu usar punts en el nom de la base de dades"
 
-#: setup.php:62
+#: setup.php:64
 #, php-format
 msgid "%s set the database host."
 msgstr "%s establiu l'ordinador central de la base de dades."
 
-#: setup.php:126 setup.php:291 setup.php:336
+#: setup.php:128 setup.php:320 setup.php:365
 msgid "PostgreSQL username and/or password not valid"
 msgstr "Nom d'usuari i/o contrasenya PostgreSQL no vàlids"
 
-#: setup.php:127 setup.php:150 setup.php:204
+#: setup.php:129 setup.php:152 setup.php:229
 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:149 setup.php:423 setup.php:489
+#: setup.php:151 setup.php:453 setup.php:520
 msgid "Oracle username and/or password not valid"
 msgstr "Nom d'usuari i/o contrasenya Oracle no vàlids"
 
-#: setup.php:203
+#: setup.php:228
 msgid "MySQL username and/or password not valid"
 msgstr "Nom d'usuari i/o contrasenya MySQL no vàlids"
 
-#: setup.php:255 setup.php:357 setup.php:366 setup.php:384 setup.php:394
-#: setup.php:403 setup.php:430 setup.php:496 setup.php:522 setup.php:529
-#: setup.php:540 setup.php:547 setup.php:556 setup.php:564 setup.php:573
-#: setup.php:579
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Error DB: \"%s\""
 
-#: setup.php:256 setup.php:358 setup.php:367 setup.php:385 setup.php:395
-#: setup.php:404 setup.php:431 setup.php:497 setup.php:523 setup.php:530
-#: setup.php:541 setup.php:557 setup.php:565 setup.php:574
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "L'ordre en conflicte és: \"%s\""
 
-#: setup.php:270
+#: setup.php:299
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "L'usuari MySQL '%s'@'localhost' ja existeix."
 
-#: setup.php:271
+#: setup.php:300
 msgid "Drop this user from MySQL"
 msgstr "Elimina aquest usuari de MySQL"
 
-#: setup.php:276
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "L'usuari MySQL '%s'@'%%' ja existeix"
 
-#: setup.php:277
+#: setup.php:306
 msgid "Drop this user from MySQL."
 msgstr "Elimina aquest usuari de MySQL."
 
-#: setup.php:548 setup.php:580
+#: setup.php:579 setup.php:611
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "L'ordre en conflicte és: \"%s\", nom: %s, contrasenya: %s"
 
-#: setup.php:644
+#: setup.php:631
+#, 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
 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:645
+#: setup.php:850
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Comproveu les <a href='%s'>guies d'instal·lació</a>."
@@ -236,16 +241,16 @@ msgstr "l'any passat"
 msgid "years ago"
 msgstr "fa anys"
 
-#: updater.php:75
+#: 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:77
+#: updater.php:81
 msgid "up to date"
 msgstr "actualitzat"
 
-#: updater.php:80
+#: updater.php:84
 msgid "updates check is disabled"
 msgstr "la comprovació d'actualitzacions està desactivada"
 
diff --git a/l10n/ca/settings.po b/l10n/ca/settings.po
index 2ea7c2f7f042b84303468ebfd3c345429f6700d3..6db4edeb8bb9798dc8c9035cc2a0452a46d2d684 100644
--- a/l10n/ca/settings.po
+++ b/l10n/ca/settings.po
@@ -13,9 +13,9 @@ 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:05+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "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,8 +27,8 @@ 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:15
-#: ajax/togglegroups.php:18
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr "Error d'autenticació"
 
@@ -76,12 +76,12 @@ msgstr "Sol.licitud no vàlida"
 msgid "Admins can't remove themself from the admin group"
 msgstr "Els administradors no es poden eliminar del grup admin"
 
-#: ajax/togglegroups.php:28
+#: ajax/togglegroups.php:30
 #, php-format
 msgid "Unable to add user to group %s"
 msgstr "No es pot afegir l'usuari al grup %s"
 
-#: ajax/togglegroups.php:34
+#: ajax/togglegroups.php:36
 #, php-format
 msgid "Unable to remove user from group %s"
 msgstr "No es pot eliminar l'usuari del grup %s"
@@ -122,7 +122,7 @@ msgstr "Error"
 msgid "Updated"
 msgstr "Actualitzada"
 
-#: js/personal.js:96
+#: js/personal.js:99
 msgid "Saving..."
 msgstr "S'està desant..."
 
@@ -151,23 +151,23 @@ msgstr "Grup Admin"
 msgid "Delete"
 msgstr "Suprimeix"
 
-#: js/users.js:190
+#: js/users.js:191
 msgid "add group"
 msgstr "afegeix grup"
 
-#: js/users.js:351
+#: js/users.js:352
 msgid "A valid username must be provided"
 msgstr "Heu de facilitar un nom d'usuari vàlid"
 
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
 msgid "Error creating user"
 msgstr "Error en crear l'usuari"
 
-#: js/users.js:357
+#: js/users.js:358
 msgid "A valid password must be provided"
 msgstr "Heu de facilitar una contrasenya vàlida"
 
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
 msgid "__language_name__"
 msgstr "Català"
 
@@ -213,19 +213,19 @@ msgstr "El mòdul de PHP 'fileinfo' no s'ha trobat. Us recomanem que habiliteu a
 msgid "Locale not working"
 msgstr "Locale no funciona"
 
-#: templates/admin.php:61
+#: templates/admin.php:63
+#, php-format
 msgid ""
-"This ownCloud server can't set system locale to "
-"\"en_US.UTF-8\"/\"en_US.UTF8\". 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 en_US.UTF-8/en_US.UTF8."
-msgstr "Aquest servidor ownCloud no pot establir el locale del sistema a \"en_US.UTF-8\"/\"en_US.UTF8\". Això significa que hi poden haver problemes amb alguns caràcters en el nom dels fitxers. Us recomanem instal·lar els paquets necessaris añ sistema per donar suport en_US.UTF-8/en_US.UTF8."
+"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 "Aquest servidor ownCloud no pot establir el locale del sistema a %s. Això significa que hi poden haver problemes amb alguns caràcters en el nom dels fitxers. Us recomanem instal·lar els paquets necessaris al sistema per donar suport a %s."
 
-#: templates/admin.php:72
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr "La connexió a internet no funciona"
 
-#: templates/admin.php:75
+#: 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 "
@@ -235,98 +235,98 @@ msgid ""
 " of ownCloud."
 msgstr "Aquest servidor ownCloud no té cap connexió a internet que funcioni. Això significa que algunes de les característiques com el muntatge d'emmagatzemament externs, les notificacions quant a actualitzacions o la instal·lació d'aplicacions de tercers no funcionarà. L'accés remot a fitxers i l'enviament de correus electrònics podria tampoc no funcionar. Us suggerim que habiliteu la connexió a internet per aquest servidor si voleu gaudir de totes les possibilitats d'ownCloud."
 
-#: templates/admin.php:89
+#: templates/admin.php:92
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:98
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr "Executa una tasca per cada paquet carregat"
 
-#: templates/admin.php:108
+#: 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 està registrat en un servei webcron. Feu la crida a cron.php a l'arrel d'ownCloud cada minut a través de http."
 
-#: templates/admin.php:118
+#: 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 "Usa un servei cron del sistema. Feu la crida al fitxer cron.php a través d'un cronjob del sistema cada minut."
 
-#: templates/admin.php:125
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr "Compartir"
 
-#: templates/admin.php:131
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr "Habilita l'API de compartir"
 
-#: templates/admin.php:132
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr "Permet que les aplicacions utilitzin l'API de compartir"
 
-#: templates/admin.php:139
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr "Permet enllaços"
 
-#: templates/admin.php:140
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr "Permet als usuaris compartir elements amb el públic amb enllaços"
 
-#: templates/admin.php:147
+#: templates/admin.php:150
 msgid "Allow resharing"
 msgstr "Permet compartir de nou"
 
-#: templates/admin.php:148
+#: templates/admin.php:151
 msgid "Allow users to share items shared with them again"
 msgstr "Permet als usuaris compartir de nou elements ja compartits amb ells"
 
-#: templates/admin.php:155
+#: templates/admin.php:158
 msgid "Allow users to share with anyone"
 msgstr "Permet compartir amb qualsevol"
 
-#: templates/admin.php:158
+#: templates/admin.php:161
 msgid "Allow users to only share with users in their groups"
 msgstr "Permet als usuaris compartir només amb els usuaris del seu grup"
 
-#: templates/admin.php:165
+#: templates/admin.php:168
 msgid "Security"
 msgstr "Seguretat"
 
-#: templates/admin.php:178
+#: templates/admin.php:181
 msgid "Enforce HTTPS"
 msgstr "Força HTTPS"
 
-#: templates/admin.php:179
+#: templates/admin.php:182
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr "Força als clients la connexió amb ownCloud via una connexió encriptada."
 
-#: templates/admin.php:182
+#: templates/admin.php:185
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr "Connecteu aquesta instància onwCloud via HTTPS per habilitar o deshabilitar el forçament SSL."
 
-#: templates/admin.php:192
+#: templates/admin.php:195
 msgid "Log"
 msgstr "Registre"
 
-#: templates/admin.php:193
+#: templates/admin.php:196
 msgid "Log level"
 msgstr "Nivell de registre"
 
-#: templates/admin.php:220
+#: templates/admin.php:223
 msgid "More"
 msgstr "Més"
 
-#: templates/admin.php:227 templates/personal.php:98
+#: templates/admin.php:230 templates/personal.php:102
 msgid "Version"
 msgstr "Versió"
 
-#: templates/admin.php:230 templates/personal.php:100
+#: templates/admin.php:233 templates/personal.php:105
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -336,51 +336,51 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "Desenvolupat per la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunitat ownCloud</a>, el <a href=\"https://github.com/owncloud\" target=\"_blank\">codi font</a> té llicència <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
-#: templates/apps.php:10
+#: templates/apps.php:11
 msgid "Add your App"
 msgstr "Afegiu la vostra aplicació"
 
-#: templates/apps.php:11
+#: templates/apps.php:12
 msgid "More Apps"
 msgstr "Més aplicacions"
 
-#: templates/apps.php:24
+#: templates/apps.php:28
 msgid "Select an App"
 msgstr "Seleccioneu una aplicació"
 
-#: templates/apps.php:28
+#: templates/apps.php:34
 msgid "See application page at apps.owncloud.com"
 msgstr "Mireu la pàgina d'aplicacions a apps.owncloud.com"
 
-#: templates/apps.php:29
+#: templates/apps.php:36
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-propietat de <span class=\"author\"></span>"
 
-#: templates/apps.php:31
+#: templates/apps.php:38
 msgid "Update"
 msgstr "Actualitza"
 
-#: templates/help.php:3
+#: templates/help.php:4
 msgid "User Documentation"
 msgstr "Documentació d'usuari"
 
-#: templates/help.php:4
+#: templates/help.php:6
 msgid "Administrator Documentation"
 msgstr "Documentació d'administrador"
 
-#: templates/help.php:6
+#: templates/help.php:9
 msgid "Online Documentation"
 msgstr "Documentació en línia"
 
-#: templates/help.php:7
+#: templates/help.php:11
 msgid "Forum"
 msgstr "Fòrum"
 
-#: templates/help.php:9
+#: templates/help.php:14
 msgid "Bugtracker"
 msgstr "Seguiment d'errors"
 
-#: templates/help.php:11
+#: templates/help.php:17
 msgid "Commercial Support"
 msgstr "Suport comercial"
 
@@ -389,79 +389,79 @@ msgstr "Suport comercial"
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Heu utilitzat <strong>%s</strong> d'un total disponible de <strong>%s</strong>"
 
-#: templates/personal.php:14
+#: templates/personal.php:15
 msgid "Get the apps to sync your files"
 msgstr "Obtén les aplicacions per sincronitzar fitxers"
 
-#: templates/personal.php:25
+#: templates/personal.php:26
 msgid "Show First Run Wizard again"
 msgstr "Torna a mostrar l'assistent de primera execució"
 
-#: templates/personal.php:36 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
 msgid "Password"
 msgstr "Contrasenya"
 
-#: templates/personal.php:37
+#: templates/personal.php:38
 msgid "Your password was changed"
 msgstr "La seva contrasenya s'ha canviat"
 
-#: templates/personal.php:38
+#: templates/personal.php:39
 msgid "Unable to change your password"
 msgstr "No s'ha pogut canviar la contrasenya"
 
-#: templates/personal.php:39
+#: templates/personal.php:40
 msgid "Current password"
 msgstr "Contrasenya actual"
 
-#: templates/personal.php:40
+#: templates/personal.php:42
 msgid "New password"
 msgstr "Contrasenya nova"
 
-#: templates/personal.php:42
+#: templates/personal.php:44
 msgid "Change password"
 msgstr "Canvia la contrasenya"
 
-#: templates/personal.php:54 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:78
 msgid "Display Name"
 msgstr "Nom a mostrar"
 
-#: templates/personal.php:55
+#: templates/personal.php:57
 msgid "Your display name was changed"
 msgstr "El vostre nom a mostrar ha canviat"
 
-#: templates/personal.php:56
+#: 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:59
+#: templates/personal.php:61
 msgid "Change display name"
 msgstr "Canvia el nom a mostrar"
 
-#: templates/personal.php:68
+#: templates/personal.php:70
 msgid "Email"
 msgstr "Correu electrònic"
 
-#: templates/personal.php:69
+#: templates/personal.php:72
 msgid "Your email address"
 msgstr "Correu electrònic"
 
-#: templates/personal.php:70
+#: templates/personal.php:73
 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:76 templates/personal.php:77
+#: templates/personal.php:79 templates/personal.php:80
 msgid "Language"
 msgstr "Idioma"
 
-#: templates/personal.php:82
+#: templates/personal.php:86
 msgid "Help translate"
 msgstr "Ajudeu-nos amb la traducció"
 
-#: templates/personal.php:87
+#: templates/personal.php:91
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:89
+#: templates/personal.php:93
 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"
 
diff --git a/l10n/ca/user_ldap.po b/l10n/ca/user_ldap.po
index 98ca278100a2935c8c294b5da9f8b7c745153a12..9aae404b6d88b85714d66ffa2aee018bce96c92a 100644
--- a/l10n/ca/user_ldap.po
+++ b/l10n/ca/user_ldap.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-09 00:12+0100\n"
-"PO-Revision-Date: 2013-02-08 12:20+0000\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"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -23,17 +23,17 @@ msgstr ""
 msgid "Failed to delete the server configuration"
 msgstr "Ha fallat en eliminar la configuració del servidor"
 
-#: ajax/testConfiguration.php:35
+#: ajax/testConfiguration.php:36
 msgid "The configuration is valid and the connection could be established!"
 msgstr "La configuració és vàlida i s'ha pogut establir la comunicació!"
 
-#: ajax/testConfiguration.php:37
+#: ajax/testConfiguration.php:39
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
 msgstr "La configuració és vàlida, però ha fallat el Bind. Comproveu les credencials i l'arranjament del servidor."
 
-#: ajax/testConfiguration.php:40
+#: ajax/testConfiguration.php:43
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
@@ -88,224 +88,248 @@ msgstr "<b>Avís:</b> El mòdul PHP LDAP no està instal·lat, el dorsal no func
 msgid "Server configuration"
 msgstr "Configuració del servidor"
 
-#: templates/settings.php:17
+#: templates/settings.php:18
 msgid "Add Server Configuration"
 msgstr "Afegeix la configuració del servidor"
 
-#: templates/settings.php:21
+#: templates/settings.php:23
 msgid "Host"
 msgstr "Màquina"
 
-#: templates/settings.php:21
+#: templates/settings.php:25
 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:22
+#: templates/settings.php:26
 msgid "Base DN"
 msgstr "DN Base"
 
-#: templates/settings.php:22
+#: templates/settings.php:27
 msgid "One Base DN per line"
 msgstr "Una DN Base per línia"
 
-#: templates/settings.php:22
+#: templates/settings.php:28
 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:23
+#: templates/settings.php:30
 msgid "User DN"
 msgstr "DN Usuari"
 
-#: templates/settings.php:23
+#: templates/settings.php:32
 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:24
+#: templates/settings.php:33
 msgid "Password"
 msgstr "Contrasenya"
 
-#: templates/settings.php:24
+#: templates/settings.php:36
 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:25
+#: templates/settings.php:37
 msgid "User Login Filter"
 msgstr "Filtre d'inici de sessió d'usuari"
 
-#: templates/settings.php:25
+#: templates/settings.php:40
 #, 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:25
+#: templates/settings.php:41
 #, 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:26
+#: templates/settings.php:42
 msgid "User List Filter"
 msgstr "Llista de filtres d'usuari"
 
-#: templates/settings.php:26
+#: templates/settings.php:45
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Defineix el filtre a aplicar quan es mostren usuaris"
 
-#: templates/settings.php:26
+#: templates/settings.php:46
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "sense cap paràmetre de substitució, per exemple \"objectClass=persona\""
 
-#: templates/settings.php:27
+#: templates/settings.php:47
 msgid "Group Filter"
 msgstr "Filtre de grup"
 
-#: templates/settings.php:27
+#: templates/settings.php:50
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Defineix el filtre a aplicar quan es mostren grups."
 
-#: templates/settings.php:27
+#: templates/settings.php:51
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "sense cap paràmetre de substitució, per exemple \"objectClass=grupPosix\"."
 
-#: templates/settings.php:31
+#: templates/settings.php:55
 msgid "Connection Settings"
 msgstr "Arranjaments de connexió"
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "Configuration Active"
 msgstr "Configuració activa"
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "When unchecked, this configuration will be skipped."
 msgstr "Si està desmarcat, aquesta configuració s'ometrà."
 
-#: templates/settings.php:34
+#: templates/settings.php:58
 msgid "Port"
 msgstr "Port"
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid "Backup (Replica) Host"
 msgstr "Màquina de còpia de serguretat (rèplica)"
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 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:36
+#: templates/settings.php:60
 msgid "Backup (Replica) Port"
 msgstr "Port de la còpia de seguretat (rèplica)"
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "Disable Main Server"
 msgstr "Desactiva el servidor principal"
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 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:38
+#: templates/settings.php:62
 msgid "Use TLS"
 msgstr "Usa TLS"
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 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:39
+#: templates/settings.php:63
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Servidor LDAP sense distinció entre majúscules i minúscules (Windows)"
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid "Turn off SSL certificate validation."
 msgstr "Desactiva la validació de certificat SSL."
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 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:40
+#: templates/settings.php:64
 msgid "Not recommended, use for testing only."
 msgstr "No recomanat, ús només per proves."
 
-#: templates/settings.php:41
+#: templates/settings.php:65
+msgid "Cache Time-To-Live"
+msgstr "Memòria de cau Time-To-Live"
+
+#: templates/settings.php:65
 msgid "in seconds. A change empties the cache."
 msgstr "en segons. Un canvi buidarà la memòria de cau."
 
-#: templates/settings.php:43
+#: templates/settings.php:67
 msgid "Directory Settings"
 msgstr "Arranjaments de carpetes"
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "User Display Name Field"
 msgstr "Camp per mostrar el nom d'usuari"
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 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:46
+#: templates/settings.php:70
 msgid "Base User Tree"
 msgstr "Arbre base d'usuaris"
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "One User Base DN per line"
 msgstr "Una DN Base d'Usuari per línia"
 
-#: templates/settings.php:47
+#: templates/settings.php:71
 msgid "User Search Attributes"
 msgstr "Atributs de cerca d'usuari"
 
-#: templates/settings.php:47 templates/settings.php:50
+#: templates/settings.php:71 templates/settings.php:74
 msgid "Optional; one attribute per line"
 msgstr "Opcional; Un atribut per línia"
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "Group Display Name Field"
 msgstr "Camp per mostrar el nom del grup"
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 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:49
+#: templates/settings.php:73
 msgid "Base Group Tree"
 msgstr "Arbre base de grups"
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "One Group Base DN per line"
 msgstr "Una DN Base de Grup per línia"
 
-#: templates/settings.php:50
+#: templates/settings.php:74
 msgid "Group Search Attributes"
 msgstr "Atributs de cerca de grup"
 
-#: templates/settings.php:51
+#: templates/settings.php:75
 msgid "Group-Member association"
 msgstr "Associació membres-grup"
 
-#: templates/settings.php:53
+#: templates/settings.php:77
 msgid "Special Attributes"
 msgstr "Atributs especials"
 
-#: templates/settings.php:56
+#: templates/settings.php:79
+msgid "Quota Field"
+msgstr "Camp de quota"
+
+#: templates/settings.php:80
+msgid "Quota Default"
+msgstr "Quota per defecte"
+
+#: templates/settings.php:80
 msgid "in bytes"
 msgstr "en bytes"
 
-#: templates/settings.php:58
+#: templates/settings.php:81
+msgid "Email Field"
+msgstr "Camp de correu electrònic"
+
+#: templates/settings.php:82
+msgid "User Home Folder Naming Rule"
+msgstr "Norma per anomenar la carpeta arrel d'usuari"
+
+#: templates/settings.php:82
 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:62
+#: templates/settings.php:86
+msgid "Test Configuration"
+msgstr "Comprovació de la configuració"
+
+#: templates/settings.php:86
 msgid "Help"
 msgstr "Ajuda"
diff --git a/l10n/cs_CZ/core.po b/l10n/cs_CZ/core.po
index a4e90321e7603584f0f8a889ad34308fbc3f11f7..b8c1d4424b37e0a4bdd0bb919891316613bb4534 100644
--- a/l10n/cs_CZ/core.po
+++ b/l10n/cs_CZ/core.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 14:31+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:20+0000\n"
 "Last-Translator: Tomáš Chvátal <tomas.chvatal@gmail.com>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
@@ -390,7 +390,7 @@ msgstr "Aktualizace neproběhla úspěšně. Nahlaste prosím problém do <a hre
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Aktualizace byla úspěšná. Přesměrovávám na ownCloud."
 
-#: lostpassword/controller.php:47
+#: lostpassword/controller.php:48
 msgid "ownCloud password reset"
 msgstr "Obnovení hesla pro ownCloud"
 
diff --git a/l10n/cs_CZ/files.po b/l10n/cs_CZ/files.po
index 3a948f28f9e2323aa6e7f5c33eb897a9eb1a9e34..5aaad214447a06cb81dda987aae4124e8e907d94 100644
--- a/l10n/cs_CZ/files.po
+++ b/l10n/cs_CZ/files.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-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "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"
@@ -53,27 +53,27 @@ msgid ""
 "the HTML form"
 msgstr "Odeslaný soubor přesáhl svou velikostí parametr MAX_FILE_SIZE specifikovaný v formuláři HTML"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
 msgstr "Soubor byl odeslán pouze částečně"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:31
 msgid "No file was uploaded"
 msgstr "Žádný soubor nebyl odeslán"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:32
 msgid "Missing a temporary folder"
 msgstr "Chybí adresář pro dočasné soubory"
 
-#: ajax/upload.php:34
+#: ajax/upload.php:33
 msgid "Failed to write to disk"
 msgstr "Zápis na disk selhal"
 
-#: ajax/upload.php:52
+#: ajax/upload.php:51
 msgid "Not enough storage available"
 msgstr "Nedostatek dostupného úložného prostoru"
 
-#: ajax/upload.php:83
+#: ajax/upload.php:82
 msgid "Invalid directory."
 msgstr "Neplatný adresář"
 
@@ -85,7 +85,7 @@ msgstr "Soubory"
 msgid "Delete permanently"
 msgstr "Trvale odstranit"
 
-#: js/fileactions.js:127 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:127 templates/index.php:92 templates/index.php:93
 msgid "Delete"
 msgstr "Smazat"
 
@@ -93,40 +93,36 @@ msgstr "Smazat"
 msgid "Rename"
 msgstr "Přejmenovat"
 
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
 msgid "Pending"
 msgstr "Čekající"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "{new_name} already exists"
 msgstr "{new_name} již existuje"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "replace"
 msgstr "nahradit"
 
-#: js/filelist.js:253
+#: js/filelist.js:251
 msgid "suggest name"
 msgstr "navrhnout název"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "cancel"
 msgstr "zrušit"
 
-#: js/filelist.js:295
-msgid "replaced {new_name}"
-msgstr "nahrazeno {new_name}"
+#: js/filelist.js:298
+msgid "replaced {new_name} with {old_name}"
+msgstr "nahrazeno {new_name} s {old_name}"
 
-#: js/filelist.js:295 js/filelist.js:297
+#: js/filelist.js:298
 msgid "undo"
 msgstr "zpět"
 
-#: js/filelist.js:297
-msgid "replaced {new_name} with {old_name}"
-msgstr "nahrazeno {new_name} s {old_name}"
-
-#: js/filelist.js:322
+#: js/filelist.js:323
 msgid "perform delete operation"
 msgstr "provést smazání"
 
@@ -152,74 +148,74 @@ 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:224
+#: js/files.js:225
 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:261
+#: js/files.js:262
 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ů"
 
-#: js/files.js:261
+#: js/files.js:262
 msgid "Upload Error"
 msgstr "Chyba odesílání"
 
-#: js/files.js:272
+#: js/files.js:273
 msgid "Close"
 msgstr "Zavřít"
 
-#: js/files.js:311
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr "odesílá se 1 soubor"
 
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: 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:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "Odesílání zrušeno."
 
-#: js/files.js:496
+#: js/files.js:497
 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:569
+#: js/files.js:570
 msgid "URL cannot be empty."
 msgstr "URL nemůže být prázdná"
 
-#: js/files.js:574
+#: js/files.js:575
 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:948 templates/index.php:67
+#: js/files.js:953 templates/index.php:68
 msgid "Name"
 msgstr "Název"
 
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:954 templates/index.php:79
 msgid "Size"
 msgstr "Velikost"
 
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:955 templates/index.php:81
 msgid "Modified"
 msgstr "Změněno"
 
-#: js/files.js:969
+#: js/files.js:974
 msgid "1 folder"
 msgstr "1 složka"
 
-#: js/files.js:971
+#: js/files.js:976
 msgid "{count} folders"
 msgstr "{count} složky"
 
-#: js/files.js:979
+#: js/files.js:984
 msgid "1 file"
 msgstr "1 soubor"
 
-#: js/files.js:981
+#: js/files.js:986
 msgid "{count} files"
 msgstr "{count} soubory"
 
@@ -277,39 +273,43 @@ msgstr "Z odkazu"
 
 #: templates/index.php:40
 msgid "Deleted files"
-msgstr ""
+msgstr "Odstraněné soubory"
 
 #: templates/index.php:46
 msgid "Cancel upload"
 msgstr "Zrušit odesílání"
 
-#: templates/index.php:59
+#: templates/index.php:53
+msgid "You don’t have write permissions here."
+msgstr "Nemáte zde práva zápisu."
+
+#: templates/index.php:60
 msgid "Nothing in here. Upload something!"
 msgstr "Žádný obsah. Nahrajte něco."
 
-#: templates/index.php:73
+#: templates/index.php:74
 msgid "Download"
 msgstr "Stáhnout"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:86 templates/index.php:87
 msgid "Unshare"
 msgstr "Zrušit sdílení"
 
-#: templates/index.php:105
+#: templates/index.php:106
 msgid "Upload too large"
 msgstr "Odeslaný soubor je příliš velký"
 
-#: templates/index.php:107
+#: templates/index.php:108
 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:112
+#: templates/index.php:113
 msgid "Files are being scanned, please wait."
 msgstr "Soubory se prohledávají, prosím čekejte."
 
-#: templates/index.php:115
+#: templates/index.php:116
 msgid "Current scanning"
 msgstr "Aktuální prohledávání"
 
diff --git a/l10n/cs_CZ/files_external.po b/l10n/cs_CZ/files_external.po
index 240ba178d3b5a2b0a86240f2012d272fff52793c..0ceaf20e9638d08722a81b2cfcda2c3aa504af53 100644
--- a/l10n/cs_CZ/files_external.po
+++ b/l10n/cs_CZ/files_external.po
@@ -6,13 +6,13 @@
 # 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.
+# 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: 2012-12-14 00:16+0100\n"
-"PO-Revision-Date: 2012-12-13 08:56+0000\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"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
@@ -21,37 +21,33 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\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 "Přístup povolen"
 
-#: 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 "Chyba při nastavení úložiště Dropbox"
 
-#: 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 "Povolit přístup"
 
-#: js/dropbox.js:73 js/google.js:72
-msgid "Fill out all required fields"
-msgstr "Vyplňte všechna povinná pole"
-
-#: js/dropbox.js:85
+#: js/dropbox.js:101
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr "Zadejte, prosím, platný klíč a bezpečnostní frázi aplikace Dropbox."
 
-#: 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 "Chyba při nastavení úložiště Google Drive"
 
-#: lib/config.php:434
+#: lib/config.php:421
 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:435
+#: lib/config.php:424
 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 "
@@ -62,63 +58,63 @@ msgstr "<b>Varování:</b> není nainstalována, nebo povolena, podpora FTP v PH
 msgid "External Storage"
 msgstr "Externí úložiště"
 
-#: templates/settings.php:8 templates/settings.php:22
-msgid "Mount point"
-msgstr "Přípojný bod"
-
-#: templates/settings.php:9
-msgid "Backend"
-msgstr "Podpůrná vrstva"
+#: templates/settings.php:9 templates/settings.php:28
+msgid "Folder name"
+msgstr "Název složky"
 
 #: templates/settings.php:10
+msgid "External storage"
+msgstr "Externí úložiště"
+
+#: templates/settings.php:11
 msgid "Configuration"
 msgstr "Nastavení"
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid "Options"
 msgstr "Možnosti"
 
-#: templates/settings.php:12
+#: templates/settings.php:13
 msgid "Applicable"
 msgstr "Přístupný pro"
 
-#: templates/settings.php:27
-msgid "Add mount point"
-msgstr "Přidat bod připojení"
+#: templates/settings.php:33
+msgid "Add storage"
+msgstr "Přidat úložiště"
 
-#: templates/settings.php:85
+#: templates/settings.php:90
 msgid "None set"
 msgstr "Nenastaveno"
 
-#: templates/settings.php:86
+#: templates/settings.php:91
 msgid "All Users"
 msgstr "Všichni uživatelé"
 
-#: templates/settings.php:87
+#: templates/settings.php:92
 msgid "Groups"
 msgstr "Skupiny"
 
-#: templates/settings.php:95
+#: templates/settings.php:100
 msgid "Users"
 msgstr "Uživatelé"
 
-#: 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 "Smazat"
 
-#: templates/settings.php:124
+#: templates/settings.php:129
 msgid "Enable User External Storage"
 msgstr "Zapnout externí uživatelské úložiště"
 
-#: templates/settings.php:125
+#: templates/settings.php:130
 msgid "Allow users to mount their own external storage"
 msgstr "Povolit uživatelům připojení jejich vlastních externích úložišť"
 
-#: templates/settings.php:139
+#: templates/settings.php:141
 msgid "SSL root certificates"
 msgstr "Kořenové certifikáty SSL"
 
-#: templates/settings.php:158
+#: templates/settings.php:159
 msgid "Import Root Certificate"
 msgstr "Importovat kořenového certifikátu"
diff --git a/l10n/cs_CZ/files_trashbin.po b/l10n/cs_CZ/files_trashbin.po
index 2052a1399300a8e7b44663a746f68c49b1b1e4ae..95843b88dec8d1a3e9ee2d8c784ebb321ed674f0 100644
--- a/l10n/cs_CZ/files_trashbin.po
+++ b/l10n/cs_CZ/files_trashbin.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-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 10:07+0000\n"
-"Last-Translator: Tomáš Chvátal <tomas.chvatal@gmail.com>\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: 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"
@@ -18,7 +18,7 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: ajax/delete.php:22
+#: ajax/delete.php:40
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "Nelze trvale odstranit %s"
@@ -28,35 +28,39 @@ msgstr "Nelze trvale odstranit %s"
 msgid "Couldn't restore %s"
 msgstr "Nelze obnovit %s"
 
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
 msgid "perform restore operation"
 msgstr "provést obnovu"
 
-#: js/trash.js:33
+#: js/trash.js:34
 msgid "delete file permanently"
 msgstr "trvale odstranit soubor"
 
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr "Trvale odstranit"
+
+#: js/trash.js:174 templates/index.php:17
 msgid "Name"
 msgstr "Název"
 
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:175 templates/index.php:27
 msgid "Deleted"
 msgstr "Smazáno"
 
-#: js/trash.js:135
+#: js/trash.js:184
 msgid "1 folder"
 msgstr "1 složka"
 
-#: js/trash.js:137
+#: js/trash.js:186
 msgid "{count} folders"
 msgstr "{count} složky"
 
-#: js/trash.js:145
+#: js/trash.js:194
 msgid "1 file"
 msgstr "1 soubor"
 
-#: js/trash.js:147
+#: js/trash.js:196
 msgid "{count} files"
 msgstr "{count} soubory"
 
@@ -67,3 +71,11 @@ msgstr "Žádný obsah. Váš koš je prázdný."
 #: templates/index.php:20 templates/index.php:22
 msgid "Restore"
 msgstr "Obnovit"
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr "Smazat"
+
+#: templates/part.breadcrumb.php:9
+msgid "Deleted Files"
+msgstr ""
diff --git a/l10n/cs_CZ/files_versions.po b/l10n/cs_CZ/files_versions.po
index 928ac501c8a54cf8b7082e5a484ecbbf4e6a3481..30a2abc5e8006cfab92f105ef2c81068294bd99f 100644
--- a/l10n/cs_CZ/files_versions.po
+++ b/l10n/cs_CZ/files_versions.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-09 00:12+0100\n"
-"PO-Revision-Date: 2013-02-08 06:40+0000\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"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
@@ -50,18 +50,10 @@ msgstr "Nejsou dostupné žádné starší verze"
 msgid "No path specified"
 msgstr "Nezadána cesta"
 
-#: js/versions.js:16
-msgid "History"
-msgstr "Historie"
+#: js/versions.js:6
+msgid "Versions"
+msgstr "Verze"
 
 #: templates/history.php:20
 msgid "Revert a file to a previous version by clicking on its revert button"
 msgstr "Navraťte soubor do předchozí verze kliknutím na tlačítko navrátit"
-
-#: templates/settings.php:3
-msgid "Files Versioning"
-msgstr "Verzování souborů"
-
-#: templates/settings.php:4
-msgid "Enable"
-msgstr "Povolit"
diff --git a/l10n/cs_CZ/lib.po b/l10n/cs_CZ/lib.po
index 0fac894638000fdc6e272d70ccebd7f2fae6cd04..140c9dcd5fde4c183643c1634ce474731dfb12e6 100644
--- a/l10n/cs_CZ/lib.po
+++ b/l10n/cs_CZ/lib.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 14:33+0000\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"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
@@ -19,27 +19,27 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: app.php:339
+#: app.php:349
 msgid "Help"
 msgstr "Nápověda"
 
-#: app.php:346
+#: app.php:362
 msgid "Personal"
 msgstr "Osobní"
 
-#: app.php:351
+#: app.php:373
 msgid "Settings"
 msgstr "Nastavení"
 
-#: app.php:356
+#: app.php:385
 msgid "Users"
 msgstr "Uživatelé"
 
-#: app.php:363
+#: app.php:398
 msgid "Apps"
 msgstr "Aplikace"
 
-#: app.php:365
+#: app.php:406
 msgid "Admin"
 msgstr "Administrace"
 
@@ -51,15 +51,15 @@ msgstr "Stahování ZIPu je vypnuto."
 msgid "Files need to be downloaded one by one."
 msgstr "Soubory musí být stahovány jednotlivě."
 
-#: files.php:203 files.php:228
+#: files.php:204 files.php:231
 msgid "Back to Files"
 msgstr "Zpět k souborům"
 
-#: files.php:227
+#: files.php:228
 msgid "Selected files too large to generate zip file."
 msgstr "Vybrané soubory jsou příliš velké pro vytvoření zip souboru."
 
-#: helper.php:226
+#: helper.php:228
 msgid "couldn't be determined"
 msgstr "nelze zjistit"
 
@@ -99,87 +99,92 @@ msgstr "Zadejte heslo správce."
 msgid "Specify a data folder."
 msgstr "Určete složku dat."
 
-#: setup.php:53
+#: setup.php:55
 #, php-format
 msgid "%s enter the database username."
 msgstr "Zadejte uživatelské jméno %s databáze."
 
-#: setup.php:56
+#: setup.php:58
 #, php-format
 msgid "%s enter the database name."
 msgstr "Zadejte název databáze pro %s databáze."
 
-#: setup.php:59
+#: setup.php:61
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr "V názvu databáze %s nesmíte používat tečky."
 
-#: setup.php:62
+#: setup.php:64
 #, php-format
 msgid "%s set the database host."
 msgstr "Zadejte název počítače s databází %s."
 
-#: setup.php:126 setup.php:291 setup.php:336
+#: setup.php:128 setup.php:320 setup.php:365
 msgid "PostgreSQL username and/or password not valid"
 msgstr "Uživatelské jméno, či heslo PostgreSQL není platné"
 
-#: setup.php:127 setup.php:150 setup.php:204
+#: setup.php:129 setup.php:152 setup.php:229
 msgid "You need to enter either an existing account or the administrator."
 msgstr "Musíte zadat existující účet, či správce."
 
-#: setup.php:149 setup.php:423 setup.php:489
+#: setup.php:151 setup.php:453 setup.php:520
 msgid "Oracle username and/or password not valid"
 msgstr "Uživatelské jméno, či heslo Oracle není platné"
 
-#: setup.php:203
+#: setup.php:228
 msgid "MySQL username and/or password not valid"
 msgstr "Uživatelské jméno, či heslo MySQL není platné"
 
-#: setup.php:255 setup.php:357 setup.php:366 setup.php:384 setup.php:394
-#: setup.php:403 setup.php:430 setup.php:496 setup.php:522 setup.php:529
-#: setup.php:540 setup.php:547 setup.php:556 setup.php:564 setup.php:573
-#: setup.php:579
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Chyba DB: \"%s\""
 
-#: setup.php:256 setup.php:358 setup.php:367 setup.php:385 setup.php:395
-#: setup.php:404 setup.php:431 setup.php:497 setup.php:523 setup.php:530
-#: setup.php:541 setup.php:557 setup.php:565 setup.php:574
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "Podezřelý příkaz byl: \"%s\""
 
-#: setup.php:270
+#: setup.php:299
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "Uživatel '%s'@'localhost' již v MySQL existuje."
 
-#: setup.php:271
+#: setup.php:300
 msgid "Drop this user from MySQL"
 msgstr "Zahodit uživatele z MySQL"
 
-#: setup.php:276
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "Uživatel '%s'@'%%' již v MySQL existuje"
 
-#: setup.php:277
+#: setup.php:306
 msgid "Drop this user from MySQL."
 msgstr "Zahodit uživatele z MySQL."
 
-#: setup.php:548 setup.php:580
+#: setup.php:579 setup.php:611
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Podezřelý příkaz byl: \"%s\", jméno: %s, heslo: %s"
 
-#: setup.php:644
+#: setup.php:631
+#, 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
 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:645
+#: setup.php:850
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Zkonzultujte, prosím, <a href='%s'>průvodce instalací</a>."
@@ -236,16 +241,16 @@ msgstr "loni"
 msgid "years ago"
 msgstr "před lety"
 
-#: updater.php:75
+#: 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:77
+#: updater.php:81
 msgid "up to date"
 msgstr "aktuální"
 
-#: updater.php:80
+#: updater.php:84
 msgid "updates check is disabled"
 msgstr "kontrola aktualizací je vypnuta"
 
diff --git a/l10n/cs_CZ/settings.po b/l10n/cs_CZ/settings.po
index 53e522dab199d406b39b360be849c217104156e2..83e4c17fbf72fd890cccf4797cdf46d56d5f8b91 100644
--- a/l10n/cs_CZ/settings.po
+++ b/l10n/cs_CZ/settings.po
@@ -13,9 +13,9 @@ 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:05+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "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,8 +27,8 @@ 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:15
-#: ajax/togglegroups.php:18
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr "Chyba ověření"
 
@@ -76,12 +76,12 @@ msgstr "Neplatný požadavek"
 msgid "Admins can't remove themself from the admin group"
 msgstr "Správci se nemohou odebrat sami ze skupiny správců"
 
-#: ajax/togglegroups.php:28
+#: ajax/togglegroups.php:30
 #, php-format
 msgid "Unable to add user to group %s"
 msgstr "Nelze přidat uživatele do skupiny %s"
 
-#: ajax/togglegroups.php:34
+#: ajax/togglegroups.php:36
 #, php-format
 msgid "Unable to remove user from group %s"
 msgstr "Nelze odstranit uživatele ze skupiny %s"
@@ -122,7 +122,7 @@ msgstr "Chyba"
 msgid "Updated"
 msgstr "Aktualizováno"
 
-#: js/personal.js:96
+#: js/personal.js:99
 msgid "Saving..."
 msgstr "Ukládám..."
 
@@ -151,23 +151,23 @@ msgstr "Správa skupiny"
 msgid "Delete"
 msgstr "Smazat"
 
-#: js/users.js:190
+#: js/users.js:191
 msgid "add group"
 msgstr "přidat skupinu"
 
-#: js/users.js:351
+#: js/users.js:352
 msgid "A valid username must be provided"
 msgstr "Musíte zadat platné uživatelské jméno"
 
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
 msgid "Error creating user"
 msgstr "Chyba při vytváření užiatele"
 
-#: js/users.js:357
+#: js/users.js:358
 msgid "A valid password must be provided"
 msgstr "Musíte zadat platné heslo"
 
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
 msgid "__language_name__"
 msgstr "Česky"
 
@@ -213,19 +213,19 @@ msgstr "Schází modul PHP 'fileinfo'. Doporučujeme jej povolit pro nejlepší
 msgid "Locale not working"
 msgstr "Locale nefunguje"
 
-#: templates/admin.php:61
+#: templates/admin.php:63
+#, php-format
 msgid ""
-"This ownCloud server can't set system locale to "
-"\"en_US.UTF-8\"/\"en_US.UTF8\". 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 en_US.UTF-8/en_US.UTF8."
-msgstr "Server ownCloud nemůže nastavit systémové locale na \"en_US.UTF-8\"/\"en_US.UTF8\".  Můžete tedy mít problémy s některými znaky v názvech souborů. Důrazně doporučujeme nainstalovat potřebné balíčky pro podporu en_US.UTF-8/en_US.UTF8."
+"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 "Server ownCloud nemůže nastavit locale systému na %s. Můžete tedy mít problémy s některými znaky v názvech souborů. Důrazně doporučujeme nainstalovat potřebné balíčky pro podporu %s."
 
-#: templates/admin.php:72
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr "Spojení s internetem nefujguje"
 
-#: templates/admin.php:75
+#: 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 "
@@ -235,98 +235,98 @@ msgid ""
 " of ownCloud."
 msgstr "Server ownCloud nemá funkční spojení s internetem. Některé moduly jako externí úložiště, oznámení o dostupných aktualizacích, nebo instalace aplikací třetích stran nefungují. Přístup k souborům z jiných míst a odesílání oznamovacích e-mailů také nemusí fungovat. Pokud si přejete využívat všech vlastností ownCloud, doporučujeme povolit internetové spojení pro tento server."
 
-#: templates/admin.php:89
+#: templates/admin.php:92
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:98
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr "Spustit jednu úlohu s každou načtenou stránkou"
 
-#: templates/admin.php:108
+#: 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 je registrován u služby webcron. Zavolá stránku cron.php v kořenovém adresáři owncloud každou minutu skrze http."
 
-#: templates/admin.php:118
+#: 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 "Použít systémovou službu cron. Zavolat soubor cron.php ze složky owncloud pomocí systémové úlohy cron každou minutu."
 
-#: templates/admin.php:125
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr "Sdílení"
 
-#: templates/admin.php:131
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr "Povolit API sdílení"
 
-#: templates/admin.php:132
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr "Povolit aplikacím používat API sdílení"
 
-#: templates/admin.php:139
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr "Povolit odkazy"
 
-#: templates/admin.php:140
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr "Povolit uživatelům sdílet položky s veřejností pomocí odkazů"
 
-#: templates/admin.php:147
+#: templates/admin.php:150
 msgid "Allow resharing"
 msgstr "Povolit znovu-sdílení"
 
-#: templates/admin.php:148
+#: templates/admin.php:151
 msgid "Allow users to share items shared with them again"
 msgstr "Povolit uživatelům znovu sdílet položky, které jsou pro ně sdíleny"
 
-#: templates/admin.php:155
+#: templates/admin.php:158
 msgid "Allow users to share with anyone"
 msgstr "Povolit uživatelům sdílet s kýmkoliv"
 
-#: templates/admin.php:158
+#: templates/admin.php:161
 msgid "Allow users to only share with users in their groups"
 msgstr "Povolit uživatelům sdílet pouze s uživateli v jejich skupinách"
 
-#: templates/admin.php:165
+#: templates/admin.php:168
 msgid "Security"
 msgstr "Zabezpečení"
 
-#: templates/admin.php:178
+#: templates/admin.php:181
 msgid "Enforce HTTPS"
 msgstr "Vynutit HTTPS"
 
-#: templates/admin.php:179
+#: templates/admin.php:182
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr "Vynutí připojování klientů ownCloud skrze šifrované spojení."
 
-#: templates/admin.php:182
+#: templates/admin.php:185
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr "Připojte se, prosím, k této instanci ownCloud skrze HTTPS pro povolení, nebo zakažte vynucení SSL."
 
-#: templates/admin.php:192
+#: templates/admin.php:195
 msgid "Log"
 msgstr "Záznam"
 
-#: templates/admin.php:193
+#: templates/admin.php:196
 msgid "Log level"
 msgstr "Úroveň záznamu"
 
-#: templates/admin.php:220
+#: templates/admin.php:223
 msgid "More"
 msgstr "Více"
 
-#: templates/admin.php:227 templates/personal.php:98
+#: templates/admin.php:230 templates/personal.php:102
 msgid "Version"
 msgstr "Verze"
 
-#: templates/admin.php:230 templates/personal.php:100
+#: templates/admin.php:233 templates/personal.php:105
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -336,51 +336,51 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "Vyvinuto <a href=\"http://ownCloud.org/contact\" target=\"_blank\">komunitou ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">zdrojový kód</a> je licencován pod <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
-#: templates/apps.php:10
+#: templates/apps.php:11
 msgid "Add your App"
 msgstr "Přidat Vaší aplikaci"
 
-#: templates/apps.php:11
+#: templates/apps.php:12
 msgid "More Apps"
 msgstr "Více aplikací"
 
-#: templates/apps.php:24
+#: templates/apps.php:28
 msgid "Select an App"
 msgstr "Vyberte aplikaci"
 
-#: templates/apps.php:28
+#: templates/apps.php:34
 msgid "See application page at apps.owncloud.com"
 msgstr "Více na stránce s aplikacemi na apps.owncloud.com"
 
-#: templates/apps.php:29
+#: templates/apps.php:36
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-licencováno <span class=\"author\"></span>"
 
-#: templates/apps.php:31
+#: templates/apps.php:38
 msgid "Update"
 msgstr "Aktualizovat"
 
-#: templates/help.php:3
+#: templates/help.php:4
 msgid "User Documentation"
 msgstr "Uživatelská dokumentace"
 
-#: templates/help.php:4
+#: templates/help.php:6
 msgid "Administrator Documentation"
 msgstr "Dokumentace správce"
 
-#: templates/help.php:6
+#: templates/help.php:9
 msgid "Online Documentation"
 msgstr "Online dokumentace"
 
-#: templates/help.php:7
+#: templates/help.php:11
 msgid "Forum"
 msgstr "Fórum"
 
-#: templates/help.php:9
+#: templates/help.php:14
 msgid "Bugtracker"
 msgstr "Bugtracker"
 
-#: templates/help.php:11
+#: templates/help.php:17
 msgid "Commercial Support"
 msgstr "Placená podpora"
 
@@ -389,79 +389,79 @@ msgstr "Placená podpora"
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Používáte <strong>%s</strong> z <strong>%s</strong> dostupných"
 
-#: templates/personal.php:14
+#: templates/personal.php:15
 msgid "Get the apps to sync your files"
 msgstr "Získat aplikace pro synchronizaci vašich souborů"
 
-#: templates/personal.php:25
+#: templates/personal.php:26
 msgid "Show First Run Wizard again"
 msgstr "Znovu zobrazit průvodce prvním spuštěním"
 
-#: templates/personal.php:36 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
 msgid "Password"
 msgstr "Heslo"
 
-#: templates/personal.php:37
+#: templates/personal.php:38
 msgid "Your password was changed"
 msgstr "Vaše heslo bylo změněno"
 
-#: templates/personal.php:38
+#: templates/personal.php:39
 msgid "Unable to change your password"
 msgstr "Vaše heslo nelze změnit"
 
-#: templates/personal.php:39
+#: templates/personal.php:40
 msgid "Current password"
 msgstr "Současné heslo"
 
-#: templates/personal.php:40
+#: templates/personal.php:42
 msgid "New password"
 msgstr "Nové heslo"
 
-#: templates/personal.php:42
+#: templates/personal.php:44
 msgid "Change password"
 msgstr "Změnit heslo"
 
-#: templates/personal.php:54 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:78
 msgid "Display Name"
 msgstr "Zobrazované jméno"
 
-#: templates/personal.php:55
+#: templates/personal.php:57
 msgid "Your display name was changed"
 msgstr "Vaše zobrazované jméno bylo změněno"
 
-#: templates/personal.php:56
+#: templates/personal.php:58
 msgid "Unable to change your display name"
 msgstr "Nelze změnit vaše zobrazované jméno"
 
-#: templates/personal.php:59
+#: templates/personal.php:61
 msgid "Change display name"
 msgstr "Změnit zobrazované jméno"
 
-#: templates/personal.php:68
+#: templates/personal.php:70
 msgid "Email"
 msgstr "E-mail"
 
-#: templates/personal.php:69
+#: templates/personal.php:72
 msgid "Your email address"
 msgstr "Vaše e-mailová adresa"
 
-#: templates/personal.php:70
+#: templates/personal.php:73
 msgid "Fill in an email address to enable password recovery"
 msgstr "Pro povolení změny hesla vyplňte adresu e-mailu"
 
-#: templates/personal.php:76 templates/personal.php:77
+#: templates/personal.php:79 templates/personal.php:80
 msgid "Language"
 msgstr "Jazyk"
 
-#: templates/personal.php:82
+#: templates/personal.php:86
 msgid "Help translate"
 msgstr "Pomoci s překladem"
 
-#: templates/personal.php:87
+#: templates/personal.php:91
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:89
+#: templates/personal.php:93
 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ů"
 
diff --git a/l10n/cs_CZ/user_ldap.po b/l10n/cs_CZ/user_ldap.po
index 8e0892a688bc4a38abca90d64d4fcf1e08dcf03a..cd9f8f378273f8666c84613523ecca1e73ddb7c1 100644
--- a/l10n/cs_CZ/user_ldap.po
+++ b/l10n/cs_CZ/user_ldap.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-09 00:12+0100\n"
-"PO-Revision-Date: 2013-02-08 06:40+0000\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"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
@@ -21,19 +21,19 @@ msgstr ""
 
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
-msgstr "Selhalo smazání konfigurace serveru"
+msgstr "Selhalo smazání nastavení serveru"
 
-#: ajax/testConfiguration.php:35
+#: ajax/testConfiguration.php:36
 msgid "The configuration is valid and the connection could be established!"
 msgstr "Nastavení je v pořádku a spojení bylo navázáno."
 
-#: ajax/testConfiguration.php:37
+#: ajax/testConfiguration.php:39
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
 msgstr "Konfigurace je v pořádku, ale spojení selhalo. Zkontrolujte, prosím, nastavení serveru a přihlašovací údaje."
 
-#: ajax/testConfiguration.php:40
+#: ajax/testConfiguration.php:43
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
@@ -88,224 +88,248 @@ msgstr "<b>Varování:</b> není nainstalován LDAP modul pro PHP, podpůrná vr
 msgid "Server configuration"
 msgstr "Nastavení serveru"
 
-#: templates/settings.php:17
+#: templates/settings.php:18
 msgid "Add Server Configuration"
 msgstr "Přidat nastavení serveru"
 
-#: templates/settings.php:21
+#: templates/settings.php:23
 msgid "Host"
 msgstr "Počítač"
 
-#: templates/settings.php:21
+#: templates/settings.php:25
 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:22
+#: templates/settings.php:26
 msgid "Base DN"
 msgstr "Základní DN"
 
-#: templates/settings.php:22
+#: templates/settings.php:27
 msgid "One Base DN per line"
 msgstr "Jedna základní DN na řádku"
 
-#: templates/settings.php:22
+#: templates/settings.php:28
 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:23
+#: templates/settings.php:30
 msgid "User DN"
 msgstr "Uživatelské DN"
 
-#: templates/settings.php:23
+#: templates/settings.php:32
 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:24
+#: templates/settings.php:33
 msgid "Password"
 msgstr "Heslo"
 
-#: templates/settings.php:24
+#: templates/settings.php:36
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "Pro anonymní přístup, ponechte údaje DN and heslo prázdné."
 
-#: templates/settings.php:25
+#: templates/settings.php:37
 msgid "User Login Filter"
 msgstr "Filtr přihlášení uživatelů"
 
-#: templates/settings.php:25
+#: templates/settings.php:40
 #, 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:25
+#: templates/settings.php:41
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "použijte zástupný vzor %%uid, např. \"uid=%%uid\""
 
-#: templates/settings.php:26
+#: templates/settings.php:42
 msgid "User List Filter"
 msgstr "Filtr uživatelských seznamů"
 
-#: templates/settings.php:26
+#: templates/settings.php:45
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Určuje použitý filtr, pro získávaní uživatelů."
 
-#: templates/settings.php:26
+#: templates/settings.php:46
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "bez zástupných znaků, např. \"objectClass=person\"."
 
-#: templates/settings.php:27
+#: templates/settings.php:47
 msgid "Group Filter"
 msgstr "Filtr skupin"
 
-#: templates/settings.php:27
+#: templates/settings.php:50
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Určuje použitý filtr, pro získávaní skupin."
 
-#: templates/settings.php:27
+#: templates/settings.php:51
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "bez zástupných znaků, např. \"objectClass=posixGroup\"."
 
-#: templates/settings.php:31
+#: templates/settings.php:55
 msgid "Connection Settings"
 msgstr "Nastavení spojení"
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "Configuration Active"
 msgstr "Nastavení aktivní"
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "When unchecked, this configuration will be skipped."
 msgstr "Pokud není zaškrtnuto, bude nastavení přeskočeno."
 
-#: templates/settings.php:34
+#: templates/settings.php:58
 msgid "Port"
 msgstr "Port"
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid "Backup (Replica) Host"
 msgstr "Záložní (kopie) hostitel"
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 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:36
+#: templates/settings.php:60
 msgid "Backup (Replica) Port"
 msgstr "Záložní (kopie) port"
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "Disable Main Server"
 msgstr "Zakázat hlavní serveru"
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 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:38
+#: templates/settings.php:62
 msgid "Use TLS"
 msgstr "Použít TLS"
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr "Nepoužívejte pro spojení LDAP, selže."
 
-#: templates/settings.php:39
+#: templates/settings.php:63
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "LDAP server nerozlišující velikost znaků (Windows)"
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid "Turn off SSL certificate validation."
 msgstr "Vypnout ověřování SSL certifikátu."
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 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:40
+#: templates/settings.php:64
 msgid "Not recommended, use for testing only."
 msgstr "Není doporučeno, pouze pro testovací účely."
 
-#: templates/settings.php:41
+#: templates/settings.php:65
+msgid "Cache Time-To-Live"
+msgstr "TTL vyrovnávací paměti"
+
+#: templates/settings.php:65
 msgid "in seconds. A change empties the cache."
 msgstr "ve vteřinách. Změna vyprázdní vyrovnávací paměť."
 
-#: templates/settings.php:43
+#: templates/settings.php:67
 msgid "Directory Settings"
 msgstr "Nastavení adresáře"
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "User Display Name Field"
 msgstr "Pole pro zobrazované jméno uživatele"
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 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:46
+#: templates/settings.php:70
 msgid "Base User Tree"
 msgstr "Základní uživatelský strom"
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "One User Base DN per line"
 msgstr "Jedna uživatelská základní DN na řádku"
 
-#: templates/settings.php:47
+#: templates/settings.php:71
 msgid "User Search Attributes"
 msgstr "Atributy vyhledávání uživatelů"
 
-#: templates/settings.php:47 templates/settings.php:50
+#: templates/settings.php:71 templates/settings.php:74
 msgid "Optional; one attribute per line"
 msgstr "Volitelné, atribut na řádku"
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "Group Display Name Field"
 msgstr "Pole pro zobrazení jména skupiny"
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 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:49
+#: templates/settings.php:73
 msgid "Base Group Tree"
 msgstr "Základní skupinový strom"
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "One Group Base DN per line"
 msgstr "Jedna skupinová základní DN na řádku"
 
-#: templates/settings.php:50
+#: templates/settings.php:74
 msgid "Group Search Attributes"
 msgstr "Atributy vyhledávání skupin"
 
-#: templates/settings.php:51
+#: templates/settings.php:75
 msgid "Group-Member association"
 msgstr "Asociace člena skupiny"
 
-#: templates/settings.php:53
+#: templates/settings.php:77
 msgid "Special Attributes"
 msgstr "Speciální atributy"
 
-#: templates/settings.php:56
+#: templates/settings.php:79
+msgid "Quota Field"
+msgstr "Pole pro kvótu"
+
+#: templates/settings.php:80
+msgid "Quota Default"
+msgstr "Výchozí kvóta"
+
+#: templates/settings.php:80
 msgid "in bytes"
 msgstr "v bajtech"
 
-#: templates/settings.php:58
+#: templates/settings.php:81
+msgid "Email Field"
+msgstr "Pole e-mailu"
+
+#: templates/settings.php:82
+msgid "User Home Folder Naming Rule"
+msgstr "Pravidlo pojmenování domovské složky uživatele"
+
+#: templates/settings.php:82
 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:62
+#: templates/settings.php:86
+msgid "Test Configuration"
+msgstr "Vyzkoušet nastavení"
+
+#: templates/settings.php:86
 msgid "Help"
 msgstr "Nápověda"
diff --git a/l10n/da/core.po b/l10n/da/core.po
index 47ae7bf3dd1dd4829c6af2df95f4eee47da36a64..78d2ab1b2a7c043b3734b88e580011e7591bc4f0 100644
--- a/l10n/da/core.po
+++ b/l10n/da/core.po
@@ -17,8 +17,8 @@ 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 14:32+0000\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"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
@@ -396,7 +396,7 @@ msgstr "Opdateringen blev ikke udført korrekt. Rapporter venligst problemet til
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Opdateringen blev udført korrekt. Du bliver nu viderestillet til ownCloud."
 
-#: lostpassword/controller.php:47
+#: lostpassword/controller.php:48
 msgid "ownCloud password reset"
 msgstr "Nulstil ownCloud kodeord"
 
diff --git a/l10n/da/files.po b/l10n/da/files.po
index 963b1c455782c1303ad585eb38252759369e970a..7d64d326b93d1e8788d65168ed1dafd5da0f70b0 100644
--- a/l10n/da/files.po
+++ b/l10n/da/files.po
@@ -10,15 +10,16 @@
 #   <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-02-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -59,27 +60,27 @@ msgid ""
 "the HTML form"
 msgstr "Den uploadede fil overskrider MAX_FILE_SIZE -direktivet som er specificeret i HTML-formularen"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
 msgstr "Den uploadede file blev kun delvist uploadet"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:31
 msgid "No file was uploaded"
 msgstr "Ingen fil blev uploadet"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:32
 msgid "Missing a temporary folder"
 msgstr "Mangler en midlertidig mappe"
 
-#: ajax/upload.php:34
+#: ajax/upload.php:33
 msgid "Failed to write to disk"
 msgstr "Fejl ved skrivning til disk."
 
-#: ajax/upload.php:52
+#: ajax/upload.php:51
 msgid "Not enough storage available"
 msgstr "Der er ikke nok plads til rådlighed"
 
-#: ajax/upload.php:83
+#: ajax/upload.php:82
 msgid "Invalid directory."
 msgstr "Ugyldig mappe."
 
@@ -91,7 +92,7 @@ msgstr "Filer"
 msgid "Delete permanently"
 msgstr "Slet permanent"
 
-#: js/fileactions.js:127 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:127 templates/index.php:92 templates/index.php:93
 msgid "Delete"
 msgstr "Slet"
 
@@ -99,40 +100,36 @@ msgstr "Slet"
 msgid "Rename"
 msgstr "Omdøb"
 
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
 msgid "Pending"
 msgstr "Afventer"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "{new_name} already exists"
 msgstr "{new_name} eksisterer allerede"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "replace"
 msgstr "erstat"
 
-#: js/filelist.js:253
+#: js/filelist.js:251
 msgid "suggest name"
 msgstr "foreslå navn"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "cancel"
 msgstr "fortryd"
 
-#: js/filelist.js:295
-msgid "replaced {new_name}"
-msgstr "erstattede {new_name}"
+#: js/filelist.js:298
+msgid "replaced {new_name} with {old_name}"
+msgstr "erstattede {new_name} med {old_name}"
 
-#: js/filelist.js:295 js/filelist.js:297
+#: js/filelist.js:298
 msgid "undo"
 msgstr "fortryd"
 
-#: js/filelist.js:297
-msgid "replaced {new_name} with {old_name}"
-msgstr "erstattede {new_name} med {old_name}"
-
-#: js/filelist.js:322
+#: js/filelist.js:323
 msgid "perform delete operation"
 msgstr "udfør slet operation"
 
@@ -158,74 +155,74 @@ 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:224
+#: js/files.js:225
 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:261
+#: js/files.js:262
 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"
 
-#: js/files.js:261
+#: js/files.js:262
 msgid "Upload Error"
 msgstr "Fejl ved upload"
 
-#: js/files.js:272
+#: js/files.js:273
 msgid "Close"
 msgstr "Luk"
 
-#: js/files.js:311
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr "1 fil uploades"
 
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr "{count} filer uploades"
 
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "Upload afbrudt."
 
-#: js/files.js:496
+#: js/files.js:497
 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:569
+#: js/files.js:570
 msgid "URL cannot be empty."
 msgstr "URLen kan ikke være tom."
 
-#: js/files.js:574
+#: js/files.js:575
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Ugyldigt mappenavn. Brug af \"Shared\" er forbeholdt Owncloud"
 
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:953 templates/index.php:68
 msgid "Name"
 msgstr "Navn"
 
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:954 templates/index.php:79
 msgid "Size"
 msgstr "Størrelse"
 
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:955 templates/index.php:81
 msgid "Modified"
 msgstr "Ændret"
 
-#: js/files.js:969
+#: js/files.js:974
 msgid "1 folder"
 msgstr "1 mappe"
 
-#: js/files.js:971
+#: js/files.js:976
 msgid "{count} folders"
 msgstr "{count} mapper"
 
-#: js/files.js:979
+#: js/files.js:984
 msgid "1 file"
 msgstr "1 fil"
 
-#: js/files.js:981
+#: js/files.js:986
 msgid "{count} files"
 msgstr "{count} filer"
 
@@ -283,39 +280,43 @@ msgstr "Fra link"
 
 #: templates/index.php:40
 msgid "Deleted files"
-msgstr ""
+msgstr "Slettede filer"
 
 #: templates/index.php:46
 msgid "Cancel upload"
 msgstr "Fortryd upload"
 
-#: templates/index.php:59
+#: templates/index.php:53
+msgid "You don’t have write permissions here."
+msgstr "Du har ikke skriverettigheder her."
+
+#: templates/index.php:60
 msgid "Nothing in here. Upload something!"
 msgstr "Her er tomt. Upload noget!"
 
-#: templates/index.php:73
+#: templates/index.php:74
 msgid "Download"
 msgstr "Download"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:86 templates/index.php:87
 msgid "Unshare"
 msgstr "Fjern deling"
 
-#: templates/index.php:105
+#: templates/index.php:106
 msgid "Upload too large"
 msgstr "Upload for stor"
 
-#: templates/index.php:107
+#: templates/index.php:108
 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:112
+#: templates/index.php:113
 msgid "Files are being scanned, please wait."
 msgstr "Filerne bliver indlæst, vent venligst."
 
-#: templates/index.php:115
+#: templates/index.php:116
 msgid "Current scanning"
 msgstr "Indlæser"
 
diff --git a/l10n/da/files_external.po b/l10n/da/files_external.po
index d21b07f05e633714568f4f160126506e31559630..c69d31f708be39cd979c38aac1eabb8c2ed170c4 100644
--- a/l10n/da/files_external.po
+++ b/l10n/da/files_external.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-24 00:10+0100\n"
-"PO-Revision-Date: 2012-12-23 21:47+0000\n"
-"Last-Translator: cronner <cronner@gmail.com>\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"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,37 +20,33 @@ msgstr ""
 "Language: da\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 "Adgang godkendt"
 
-#: 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 "Fejl ved konfiguration af Dropbox plads"
 
-#: 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 "Godkend adgang"
 
-#: js/dropbox.js:73 js/google.js:72
-msgid "Fill out all required fields"
-msgstr "Udfyld alle nødvendige felter"
-
-#: js/dropbox.js:85
+#: js/dropbox.js:101
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr "Angiv venligst en valid Dropbox app nøgle og hemmelighed"
 
-#: 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 "Fejl ved konfiguration af Google Drive plads"
 
-#: lib/config.php:434
+#: lib/config.php:421
 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:435
+#: lib/config.php:424
 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 "
@@ -61,63 +57,63 @@ msgstr "<b> Advarsel: </ b> FTP-understøttelse i PHP ikke er aktiveret eller in
 msgid "External Storage"
 msgstr "Ekstern opbevaring"
 
-#: templates/settings.php:8 templates/settings.php:22
-msgid "Mount point"
-msgstr "Monteringspunkt"
-
-#: templates/settings.php:9
-msgid "Backend"
-msgstr "Backend"
+#: templates/settings.php:9 templates/settings.php:28
+msgid "Folder name"
+msgstr "Mappenavn"
 
 #: templates/settings.php:10
+msgid "External storage"
+msgstr ""
+
+#: templates/settings.php:11
 msgid "Configuration"
 msgstr "Opsætning"
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid "Options"
 msgstr "Valgmuligheder"
 
-#: templates/settings.php:12
+#: templates/settings.php:13
 msgid "Applicable"
 msgstr "Kan anvendes"
 
-#: templates/settings.php:27
-msgid "Add mount point"
-msgstr "Tilføj monteringspunkt"
+#: templates/settings.php:33
+msgid "Add storage"
+msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:90
 msgid "None set"
 msgstr "Ingen sat"
 
-#: templates/settings.php:86
+#: templates/settings.php:91
 msgid "All Users"
 msgstr "Alle brugere"
 
-#: templates/settings.php:87
+#: templates/settings.php:92
 msgid "Groups"
 msgstr "Grupper"
 
-#: templates/settings.php:95
+#: templates/settings.php:100
 msgid "Users"
 msgstr "Brugere"
 
-#: templates/settings.php:108 templates/settings.php:109
-#: templates/settings.php:144 templates/settings.php:145
+#: templates/settings.php:113 templates/settings.php:114
+#: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
 msgstr "Slet"
 
-#: templates/settings.php:124
+#: templates/settings.php:129
 msgid "Enable User External Storage"
 msgstr "Aktiver ekstern opbevaring for brugere"
 
-#: templates/settings.php:125
+#: templates/settings.php:130
 msgid "Allow users to mount their own external storage"
 msgstr "Tillad brugere at montere deres egne eksterne opbevaring"
 
-#: templates/settings.php:136
+#: templates/settings.php:141
 msgid "SSL root certificates"
 msgstr "SSL-rodcertifikater"
 
-#: templates/settings.php:153
+#: templates/settings.php:159
 msgid "Import Root Certificate"
 msgstr "Importer rodcertifikat"
diff --git a/l10n/da/files_trashbin.po b/l10n/da/files_trashbin.po
index 4e37f67f5b40cd0bf6f9c468203545b156e858a3..4c32d1c2f550b552857cbb44d0f3342d2ba67dbb 100644
--- a/l10n/da/files_trashbin.po
+++ b/l10n/da/files_trashbin.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-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 10:07+0000\n"
-"Last-Translator: Frederik Lassen <frederiklassen@gmail.com>\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: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:22
+#: ajax/delete.php:40
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "Kunne ikke slette %s permanent"
@@ -28,35 +28,39 @@ msgstr "Kunne ikke slette %s permanent"
 msgid "Couldn't restore %s"
 msgstr "Kunne ikke gendanne %s"
 
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
 msgid "perform restore operation"
 msgstr "udfør gendannelsesoperation"
 
-#: js/trash.js:33
+#: js/trash.js:34
 msgid "delete file permanently"
 msgstr "slet fil permanent"
 
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr "Slet permanent"
+
+#: js/trash.js:174 templates/index.php:17
 msgid "Name"
 msgstr "Navn"
 
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:175 templates/index.php:27
 msgid "Deleted"
 msgstr "Slettet"
 
-#: js/trash.js:135
+#: js/trash.js:184
 msgid "1 folder"
 msgstr "1 mappe"
 
-#: js/trash.js:137
+#: js/trash.js:186
 msgid "{count} folders"
 msgstr "{count} mapper"
 
-#: js/trash.js:145
+#: js/trash.js:194
 msgid "1 file"
 msgstr "1 fil"
 
-#: js/trash.js:147
+#: js/trash.js:196
 msgid "{count} files"
 msgstr "{count} filer"
 
@@ -67,3 +71,11 @@ msgstr "Intet at se her. Din papirkurv er tom!"
 #: templates/index.php:20 templates/index.php:22
 msgid "Restore"
 msgstr "Gendan"
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr "Slet"
+
+#: templates/part.breadcrumb.php:9
+msgid "Deleted Files"
+msgstr ""
diff --git a/l10n/da/files_versions.po b/l10n/da/files_versions.po
index d0be28135be2ab8df458d3c976ab877525a6de8a..6b6ab2ac91f3c355a8d2171d5c7b81289c13c6f6 100644
--- a/l10n/da/files_versions.po
+++ b/l10n/da/files_versions.po
@@ -6,13 +6,14 @@
 # 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-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-03-05 00:18+0100\n"
+"PO-Revision-Date: 2013-03-04 18:20+0000\n"
+"Last-Translator: cronner <cronner@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"
@@ -43,26 +44,18 @@ msgstr "fejl"
 msgid "File %s could not be reverted to version %s"
 msgstr "Filen %s blev genskabt til version: %s"
 
-#: history.php:68
+#: history.php:69
 msgid "No old versions available"
 msgstr "Ingen gamle version tilgængelige"
 
-#: history.php:73
+#: history.php:74
 msgid "No path specified"
 msgstr "Ingen sti specificeret"
 
-#: js/versions.js:16
-msgid "History"
-msgstr "Historik"
+#: js/versions.js:6
+msgid "Versions"
+msgstr "Versioner"
 
 #: templates/history.php:20
 msgid "Revert a file to a previous version by clicking on its revert button"
 msgstr "Genskab en fil til en tidligere version ved at klikke på denne genskab knap."
-
-#: templates/settings.php:3
-msgid "Files Versioning"
-msgstr "Versionering af filer"
-
-#: templates/settings.php:4
-msgid "Enable"
-msgstr "Aktiver"
diff --git a/l10n/da/lib.po b/l10n/da/lib.po
index c998c978f42c7506df89c17e5541bc2f63e7f750..a8476f00b378838d409eea48ccd93bb432fca1e2 100644
--- a/l10n/da/lib.po
+++ b/l10n/da/lib.po
@@ -7,13 +7,14 @@
 # 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-02-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 14:33+0000\n"
-"Last-Translator: Frederik Lassen <frederiklassen@gmail.com>\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"
 "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"
@@ -21,27 +22,27 @@ msgstr ""
 "Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:339
+#: app.php:349
 msgid "Help"
 msgstr "Hjælp"
 
-#: app.php:346
+#: app.php:362
 msgid "Personal"
 msgstr "Personlig"
 
-#: app.php:351
+#: app.php:373
 msgid "Settings"
 msgstr "Indstillinger"
 
-#: app.php:356
+#: app.php:385
 msgid "Users"
 msgstr "Brugere"
 
-#: app.php:363
+#: app.php:398
 msgid "Apps"
 msgstr "Apps"
 
-#: app.php:365
+#: app.php:406
 msgid "Admin"
 msgstr "Admin"
 
@@ -53,15 +54,15 @@ msgstr "ZIP-download er slået fra."
 msgid "Files need to be downloaded one by one."
 msgstr "Filer skal downloades en for en."
 
-#: files.php:203 files.php:228
+#: files.php:204 files.php:231
 msgid "Back to Files"
 msgstr "Tilbage til Filer"
 
-#: files.php:227
+#: files.php:228
 msgid "Selected files too large to generate zip file."
 msgstr "De markerede filer er for store til at generere en ZIP-fil."
 
-#: helper.php:226
+#: helper.php:228
 msgid "couldn't be determined"
 msgstr "kunne ikke fastslås"
 
@@ -101,87 +102,92 @@ msgstr "Angiv et admin kodeord."
 msgid "Specify a data folder."
 msgstr "Specificer en data mappe."
 
-#: setup.php:53
+#: setup.php:55
 #, php-format
 msgid "%s enter the database username."
 msgstr "%s indtast database brugernavnet."
 
-#: setup.php:56
+#: setup.php:58
 #, php-format
 msgid "%s enter the database name."
 msgstr "%s indtast database navnet."
 
-#: setup.php:59
+#: setup.php:61
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr "%s du må ikke bruge punktummer i databasenavnet."
 
-#: setup.php:62
+#: setup.php:64
 #, php-format
 msgid "%s set the database host."
 msgstr "%s sæt database værten."
 
-#: setup.php:126 setup.php:291 setup.php:336
+#: setup.php:128 setup.php:320 setup.php:365
 msgid "PostgreSQL username and/or password not valid"
 msgstr "PostgreSQL brugernavn og/eller kodeord er ikke gyldigt."
 
-#: setup.php:127 setup.php:150 setup.php:204
+#: setup.php:129 setup.php:152 setup.php:229
 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:149 setup.php:423 setup.php:489
+#: setup.php:151 setup.php:453 setup.php:520
 msgid "Oracle username and/or password not valid"
 msgstr "Oracle brugernavn og/eller kodeord er ikke gyldigt."
 
-#: setup.php:203
+#: setup.php:228
 msgid "MySQL username and/or password not valid"
 msgstr "MySQL brugernavn og/eller kodeord er ikke gyldigt."
 
-#: setup.php:255 setup.php:357 setup.php:366 setup.php:384 setup.php:394
-#: setup.php:403 setup.php:430 setup.php:496 setup.php:522 setup.php:529
-#: setup.php:540 setup.php:547 setup.php:556 setup.php:564 setup.php:573
-#: setup.php:579
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Databasefejl: \"%s\""
 
-#: setup.php:256 setup.php:358 setup.php:367 setup.php:385 setup.php:395
-#: setup.php:404 setup.php:431 setup.php:497 setup.php:523 setup.php:530
-#: setup.php:541 setup.php:557 setup.php:565 setup.php:574
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "Fejlende kommando var: \"%s\""
 
-#: setup.php:270
+#: setup.php:299
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "MySQL brugeren '%s'@'localhost' eksisterer allerede."
 
-#: setup.php:271
+#: setup.php:300
 msgid "Drop this user from MySQL"
 msgstr "Slet denne bruger fra MySQL"
 
-#: setup.php:276
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "MySQL brugeren '%s'@'%%' eksisterer allerede."
 
-#: setup.php:277
+#: setup.php:306
 msgid "Drop this user from MySQL."
 msgstr "Slet denne bruger fra MySQL"
 
-#: setup.php:548 setup.php:580
+#: setup.php:579 setup.php:611
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Fejlende kommando var: \"%s\", navn: %s, password: %s"
 
-#: setup.php:644
+#: setup.php:631
+#, 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
 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:645
+#: setup.php:850
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Dobbelttjek venligst <a href='%s'>installations vejledningerne</a>."
@@ -238,16 +244,16 @@ msgstr "Sidste år"
 msgid "years ago"
 msgstr "år siden"
 
-#: updater.php:75
+#: 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:77
+#: updater.php:81
 msgid "up to date"
 msgstr "opdateret"
 
-#: updater.php:80
+#: updater.php:84
 msgid "updates check is disabled"
 msgstr "Check for opdateringer er deaktiveret"
 
diff --git a/l10n/da/settings.po b/l10n/da/settings.po
index a5284005df88c105aecab5e448985ca69fc81bf4..57f9c33b59981a105d86ccd4efd70d60c1d8640a 100644
--- a/l10n/da/settings.po
+++ b/l10n/da/settings.po
@@ -7,20 +7,21 @@
 # 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-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.
 #   <simon@rosmi.dk>, 2012.
 #   <sr@ybnet.dk>, 2012-2013.
+# 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-02-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 23:05+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "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"
@@ -32,8 +33,8 @@ 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:15
-#: ajax/togglegroups.php:18
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr "Adgangsfejl"
 
@@ -81,12 +82,12 @@ msgstr "Ugyldig forespørgsel"
 msgid "Admins can't remove themself from the admin group"
 msgstr "Administratorer kan ikke fjerne dem selv fra admin gruppen"
 
-#: ajax/togglegroups.php:28
+#: ajax/togglegroups.php:30
 #, php-format
 msgid "Unable to add user to group %s"
 msgstr "Brugeren kan ikke tilføjes til gruppen %s"
 
-#: ajax/togglegroups.php:34
+#: ajax/togglegroups.php:36
 #, php-format
 msgid "Unable to remove user from group %s"
 msgstr "Brugeren kan ikke fjernes fra gruppen %s"
@@ -127,7 +128,7 @@ msgstr "Fejl"
 msgid "Updated"
 msgstr "Opdateret"
 
-#: js/personal.js:96
+#: js/personal.js:99
 msgid "Saving..."
 msgstr "Gemmer..."
 
@@ -141,7 +142,7 @@ msgstr "fortryd"
 
 #: js/users.js:62
 msgid "Unable to remove user"
-msgstr ""
+msgstr "Kan ikke fjerne bruger"
 
 #: js/users.js:75 templates/users.php:26 templates/users.php:80
 #: templates/users.php:105
@@ -156,23 +157,23 @@ msgstr "Gruppe Administrator"
 msgid "Delete"
 msgstr "Slet"
 
-#: js/users.js:190
+#: js/users.js:191
 msgid "add group"
-msgstr ""
+msgstr "Tilføj gruppe"
 
-#: js/users.js:351
+#: js/users.js:352
 msgid "A valid username must be provided"
-msgstr ""
+msgstr "Et gyldigt brugernavn skal angives"
 
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
 msgid "Error creating user"
-msgstr ""
+msgstr "Fejl ved oprettelse af bruger"
 
-#: js/users.js:357
+#: js/users.js:358
 msgid "A valid password must be provided"
-msgstr ""
+msgstr "En gyldig adgangskode skal angives"
 
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
 msgid "__language_name__"
 msgstr "Dansk"
 
@@ -191,7 +192,7 @@ msgstr "Din data mappe og dine filer er muligvis tilgængelige fra internettet.
 
 #: templates/admin.php:29
 msgid "Setup Warning"
-msgstr ""
+msgstr "Opsætnings Advarsel"
 
 #: templates/admin.php:32
 msgid ""
@@ -206,31 +207,31 @@ msgstr "Dobbelttjek venligst <a href='%s'>installations vejledningerne</a>."
 
 #: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
-msgstr ""
+msgstr "Module '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 modulet 'fileinfo' mangler. Vi anbefaler stærkt at aktivere dette modul til at få de bedste resultater med mime-type detektion."
 
 #: templates/admin.php:58
 msgid "Locale not working"
-msgstr ""
+msgstr "Landestandard fungerer ikke"
 
-#: templates/admin.php:61
+#: templates/admin.php:63
+#, php-format
 msgid ""
-"This ownCloud server can't set system locale to "
-"\"en_US.UTF-8\"/\"en_US.UTF8\". 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 en_US.UTF-8/en_US.UTF8."
-msgstr ""
+"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 "Denne ownCloud server kan ikke indstille systemets landestandard for %s. Det betyder, at der kan være problemer med visse tegn i filnavne. Vi anbefaler kraftigt, at installere de nødvendige pakker på dit system til at understøtte %s."
 
-#: templates/admin.php:72
+#: templates/admin.php:75
 msgid "Internet connection not working"
-msgstr ""
+msgstr "Internetforbindelse fungerer ikke"
 
-#: templates/admin.php:75
+#: 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 "
@@ -238,100 +239,100 @@ 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-server har ikke en fungerende forbindelse til internettet. Det betyder, at visse funktioner som montering af eksterne drev, oplysninger om opdatering eller installation af eksterne applikationer ikke fungerer. Det vil sandsynligvis heller ikke fungere at tilgå filer fra eksterne drev eller informationsemails. Vi opfordrer til at etablere forbindelse til internettet for denne server, såfremt du ønsker alle ownClouds funktioner."
 
-#: templates/admin.php:89
+#: templates/admin.php:92
 msgid "Cron"
-msgstr ""
+msgstr "Cron"
 
-#: templates/admin.php:98
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
-msgstr ""
+msgstr "Udføre en opgave med hver side indlæst"
 
-#: templates/admin.php:108
+#: 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 registreret hos en webcron service. Kald cron.php side i owncloud rod en gang i minuttet over HTTP."
 
-#: templates/admin.php:118
+#: 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 "Brug system cron service. Kald cron.php filen i owncloud mappe via et system cronjob en gang i minuttet."
 
-#: templates/admin.php:125
+#: templates/admin.php:128
 msgid "Sharing"
-msgstr ""
+msgstr "Deling"
 
-#: templates/admin.php:131
+#: templates/admin.php:134
 msgid "Enable Share API"
-msgstr ""
+msgstr "Aktiver Share API"
 
-#: templates/admin.php:132
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
-msgstr ""
+msgstr "Tillad apps til at bruge Share API"
 
-#: templates/admin.php:139
+#: templates/admin.php:142
 msgid "Allow links"
-msgstr ""
+msgstr "Tillad links"
 
-#: templates/admin.php:140
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
-msgstr ""
+msgstr "Tillad brugere at dele elementer til offentligheden med links"
 
-#: templates/admin.php:147
+#: templates/admin.php:150
 msgid "Allow resharing"
-msgstr ""
+msgstr "Tillad videredeling"
 
-#: templates/admin.php:148
+#: templates/admin.php:151
 msgid "Allow users to share items shared with them again"
-msgstr ""
+msgstr "Tillad brugere at dele elementer delt med dem igen"
 
-#: templates/admin.php:155
+#: templates/admin.php:158
 msgid "Allow users to share with anyone"
-msgstr ""
+msgstr "Tillad brugere at dele med alle"
 
-#: templates/admin.php:158
+#: templates/admin.php:161
 msgid "Allow users to only share with users in their groups"
-msgstr ""
+msgstr "Tillad brugere at kun dele med brugerne i deres grupper"
 
-#: templates/admin.php:165
+#: templates/admin.php:168
 msgid "Security"
-msgstr ""
+msgstr "Sikkerhed"
 
-#: templates/admin.php:178
+#: templates/admin.php:181
 msgid "Enforce HTTPS"
-msgstr ""
+msgstr "Gennemtving HTTPS"
 
-#: templates/admin.php:179
+#: templates/admin.php:182
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
-msgstr ""
+msgstr "Håndhæver klienter at oprette forbindelse til ownCloud via en krypteret forbindelse."
 
-#: templates/admin.php:182
+#: templates/admin.php:185
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
-msgstr ""
+msgstr "Opret forbindelse til denne ownCloud enhed via HTTPS for at aktivere eller deaktivere SSL håndhævelse."
 
-#: templates/admin.php:192
+#: templates/admin.php:195
 msgid "Log"
-msgstr ""
+msgstr "Log"
 
-#: templates/admin.php:193
+#: templates/admin.php:196
 msgid "Log level"
-msgstr ""
+msgstr "Log niveau"
 
-#: templates/admin.php:220
+#: templates/admin.php:223
 msgid "More"
 msgstr "Mere"
 
-#: templates/admin.php:227 templates/personal.php:98
+#: templates/admin.php:230 templates/personal.php:102
 msgid "Version"
 msgstr "Version"
 
-#: templates/admin.php:230 templates/personal.php:100
+#: templates/admin.php:233 templates/personal.php:105
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -341,51 +342,51 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "Udviklet af <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownClouds community</a>, og <a href=\"https://github.com/owncloud\" target=\"_blank\">kildekoden</a> er underlagt licensen <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
-#: templates/apps.php:10
+#: templates/apps.php:11
 msgid "Add your App"
 msgstr "Tilføj din App"
 
-#: templates/apps.php:11
+#: templates/apps.php:12
 msgid "More Apps"
 msgstr "Flere Apps"
 
-#: templates/apps.php:24
+#: templates/apps.php:28
 msgid "Select an App"
 msgstr "Vælg en App"
 
-#: templates/apps.php:28
+#: templates/apps.php:34
 msgid "See application page at apps.owncloud.com"
 msgstr "Se applikationens side på apps.owncloud.com"
 
-#: templates/apps.php:29
+#: templates/apps.php:36
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-licenseret af <span class=\"author\"></span>"
 
-#: templates/apps.php:31
+#: templates/apps.php:38
 msgid "Update"
 msgstr "Opdater"
 
-#: templates/help.php:3
+#: templates/help.php:4
 msgid "User Documentation"
 msgstr "Brugerdokumentation"
 
-#: templates/help.php:4
+#: templates/help.php:6
 msgid "Administrator Documentation"
 msgstr "Administrator Dokumentation"
 
-#: templates/help.php:6
+#: templates/help.php:9
 msgid "Online Documentation"
 msgstr "Online dokumentation"
 
-#: templates/help.php:7
+#: templates/help.php:11
 msgid "Forum"
 msgstr "Forum"
 
-#: templates/help.php:9
+#: templates/help.php:14
 msgid "Bugtracker"
 msgstr "Bugtracker"
 
-#: templates/help.php:11
+#: templates/help.php:17
 msgid "Commercial Support"
 msgstr "Kommerciel support"
 
@@ -394,79 +395,79 @@ msgstr "Kommerciel support"
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Du har brugt <strong>%s</strong> af den tilgængelige <strong>%s</strong>"
 
-#: templates/personal.php:14
+#: templates/personal.php:15
 msgid "Get the apps to sync your files"
 msgstr "Hent applikationerne for at synkronisere dine filer"
 
-#: templates/personal.php:25
+#: templates/personal.php:26
 msgid "Show First Run Wizard again"
 msgstr "Vis Første Kørsel Guiden igen"
 
-#: templates/personal.php:36 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
 msgid "Password"
 msgstr "Kodeord"
 
-#: templates/personal.php:37
+#: templates/personal.php:38
 msgid "Your password was changed"
 msgstr "Din adgangskode blev ændret"
 
-#: templates/personal.php:38
+#: templates/personal.php:39
 msgid "Unable to change your password"
 msgstr "Ude af stand til at ændre dit kodeord"
 
-#: templates/personal.php:39
+#: templates/personal.php:40
 msgid "Current password"
 msgstr "Nuværende adgangskode"
 
-#: templates/personal.php:40
+#: templates/personal.php:42
 msgid "New password"
 msgstr "Ny adgangskode"
 
-#: templates/personal.php:42
+#: templates/personal.php:44
 msgid "Change password"
 msgstr "Skift kodeord"
 
-#: templates/personal.php:54 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:78
 msgid "Display Name"
 msgstr "Skærmnavn"
 
-#: templates/personal.php:55
+#: templates/personal.php:57
 msgid "Your display name was changed"
 msgstr "Dit skærmnavn blev ændret"
 
-#: templates/personal.php:56
+#: templates/personal.php:58
 msgid "Unable to change your display name"
 msgstr "Kunne ikke skifte dit skærmnavn"
 
-#: templates/personal.php:59
+#: templates/personal.php:61
 msgid "Change display name"
 msgstr "Skift skærmnavn"
 
-#: templates/personal.php:68
+#: templates/personal.php:70
 msgid "Email"
 msgstr "Email"
 
-#: templates/personal.php:69
+#: templates/personal.php:72
 msgid "Your email address"
 msgstr "Din emailadresse"
 
-#: templates/personal.php:70
+#: templates/personal.php:73
 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:76 templates/personal.php:77
+#: templates/personal.php:79 templates/personal.php:80
 msgid "Language"
 msgstr "Sprog"
 
-#: templates/personal.php:82
+#: templates/personal.php:86
 msgid "Help translate"
 msgstr "Hjælp med oversættelsen"
 
-#: templates/personal.php:87
+#: templates/personal.php:91
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:89
+#: templates/personal.php:93
 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"
 
diff --git a/l10n/da/user_ldap.po b/l10n/da/user_ldap.po
index 31ec98eaba9d59c1440dc16d9d9e77ca9fec55f7..156ff3fec5f7e0125e737ce3094532011617d6f1 100644
--- a/l10n/da/user_ldap.po
+++ b/l10n/da/user_ldap.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-08 00:10+0100\n"
-"PO-Revision-Date: 2013-02-07 23:11+0000\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: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
@@ -26,17 +26,17 @@ msgstr ""
 msgid "Failed to delete the server configuration"
 msgstr ""
 
-#: ajax/testConfiguration.php:35
+#: ajax/testConfiguration.php:36
 msgid "The configuration is valid and the connection could be established!"
 msgstr ""
 
-#: ajax/testConfiguration.php:37
+#: ajax/testConfiguration.php:39
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
 msgstr ""
 
-#: ajax/testConfiguration.php:40
+#: ajax/testConfiguration.php:43
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
@@ -91,224 +91,248 @@ msgstr ""
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:17
+#: templates/settings.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:23
 msgid "Host"
 msgstr "Host"
 
-#: templates/settings.php:21
+#: templates/settings.php:25
 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:22
+#: templates/settings.php:26
 msgid "Base DN"
 msgstr "Base DN"
 
-#: templates/settings.php:22
+#: templates/settings.php:27
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:28
 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:23
+#: templates/settings.php:30
 msgid "User DN"
 msgstr "Bruger DN"
 
-#: templates/settings.php:23
+#: templates/settings.php:32
 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:24
+#: templates/settings.php:33
 msgid "Password"
 msgstr "Kodeord"
 
-#: templates/settings.php:24
+#: templates/settings.php:36
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "For anonym adgang, skal du lade DN og Adgangskode tomme."
 
-#: templates/settings.php:25
+#: templates/settings.php:37
 msgid "User Login Filter"
 msgstr "Bruger Login Filter"
 
-#: templates/settings.php:25
+#: templates/settings.php:40
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:41
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:42
 msgid "User List Filter"
 msgstr "Brugerliste Filter"
 
-#: templates/settings.php:26
+#: templates/settings.php:45
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Definere filteret der bruges ved indlæsning af brugere."
 
-#: templates/settings.php:26
+#: templates/settings.php:46
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:47
 msgid "Group Filter"
 msgstr "Gruppe Filter"
 
-#: templates/settings.php:27
+#: templates/settings.php:50
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Definere filteret der bruges når der indlæses grupper."
 
-#: templates/settings.php:27
+#: templates/settings.php:51
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:55
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:34
+#: templates/settings.php:58
 msgid "Port"
 msgstr "Port"
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:60
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Use TLS"
 msgstr "Brug TLS"
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:39
+#: templates/settings.php:63
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid "Turn off SSL certificate validation."
 msgstr "Deaktiver SSL certifikat validering"
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid "Not recommended, use for testing only."
 msgstr "Anbefales ikke, brug kun for at teste."
 
-#: templates/settings.php:41
+#: templates/settings.php:65
+msgid "Cache Time-To-Live"
+msgstr ""
+
+#: templates/settings.php:65
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:67
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "User Display Name Field"
 msgstr "User Display Name Field"
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "Base User Tree"
 msgstr "Base Bruger Træ"
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:47
+#: templates/settings.php:71
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:47 templates/settings.php:50
+#: templates/settings.php:71 templates/settings.php:74
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "Base Group Tree"
 msgstr "Base Group Tree"
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:74
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:75
 msgid "Group-Member association"
 msgstr "Group-Member association"
 
-#: templates/settings.php:53
+#: templates/settings.php:77
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:79
+msgid "Quota Field"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Quota Default"
+msgstr ""
+
+#: templates/settings.php:80
 msgid "in bytes"
 msgstr "i bytes"
 
-#: templates/settings.php:58
+#: templates/settings.php:81
+msgid "Email Field"
+msgstr ""
+
+#: templates/settings.php:82
+msgid "User Home Folder Naming Rule"
+msgstr ""
+
+#: templates/settings.php:82
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:62
+#: templates/settings.php:86
+msgid "Test Configuration"
+msgstr ""
+
+#: templates/settings.php:86
 msgid "Help"
 msgstr "Hjælp"
diff --git a/l10n/de/core.po b/l10n/de/core.po
index 7c7862c863a9c1c276da4c06bf02ceeb8096b553..7439a612da66ed035fee8fb432abc83e76daf2cc 100644
--- a/l10n/de/core.po
+++ b/l10n/de/core.po
@@ -19,14 +19,15 @@
 # Susi  <>, 2012.
 #   <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-02-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 21:40+0000\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"
-"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"
@@ -36,26 +37,26 @@ msgstr ""
 #: ajax/share.php:85
 #, php-format
 msgid "User %s shared a file with you"
-msgstr "Der Nutzer %s hat eine Datei für Dich freigegeben"
+msgstr "Der Nutzer %s hat eine Datei mit Dir geteilt"
 
 #: ajax/share.php:87
 #, php-format
 msgid "User %s shared a folder with you"
-msgstr "%s hat ein Verzeichnis für Dich freigegeben"
+msgstr "%s hat ein Verzeichnis mit Dir geteilt"
 
 #: ajax/share.php:89
 #, php-format
 msgid ""
 "User %s shared the file \"%s\" with you. It is available for download here: "
 "%s"
-msgstr "%s hat eine Datei \"%s\" für Dich freigegeben. Sie ist zum Download hier ferfügbar: %s"
+msgstr "%s hat die Datei \"%s\" mit Dir geteilt. Sie ist hier zum Download verfügbar: %s"
 
 #: ajax/share.php:91
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
 "here: %s"
-msgstr "%s hat eine Verzeichnis \"%s\" für Dich freigegeben. Es ist zum Download hier ferfügbar: %s"
+msgstr "%s hat den Ordner \"%s\" mit Dir geteilt. Er ist hier zum Download verfügbar: %s"
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -269,19 +270,19 @@ msgstr "Die benötigte Datei {file} ist nicht installiert."
 
 #: js/share.js:29 js/share.js:43 js/share.js:90
 msgid "Shared"
-msgstr "Freigegeben"
+msgstr "Geteilt"
 
 #: js/share.js:93
 msgid "Share"
-msgstr "Freigeben"
+msgstr "Teilen"
 
 #: js/share.js:141 js/share.js:622
 msgid "Error while sharing"
-msgstr "Fehler beim Freigeben"
+msgstr "Fehler beim Teilen"
 
 #: js/share.js:152
 msgid "Error while unsharing"
-msgstr "Fehler beim Aufheben der Freigabe"
+msgstr "Fehler beim Aufheben der Teilung"
 
 #: js/share.js:159
 msgid "Error while changing permissions"
@@ -289,19 +290,19 @@ msgstr "Fehler beim Ändern der Rechte"
 
 #: js/share.js:168
 msgid "Shared with you and the group {group} by {owner}"
-msgstr "{owner} hat dies für Dich und die Gruppe {group} freigegeben"
+msgstr "{owner} hat dies mit Dir und der Gruppe {group} geteilt"
 
 #: js/share.js:170
 msgid "Shared with you by {owner}"
-msgstr "{owner} hat dies für Dich freigegeben"
+msgstr "{owner} hat dies mit Dir geteilt"
 
 #: js/share.js:175
 msgid "Share with"
-msgstr "Freigeben für"
+msgstr "Teilen mit"
 
 #: js/share.js:180
 msgid "Share with link"
-msgstr "Über einen Link freigeben"
+msgstr "Über einen Link freigegeben"
 
 #: js/share.js:183
 msgid "Password protect"
@@ -329,7 +330,7 @@ msgstr "Ablaufdatum"
 
 #: js/share.js:227
 msgid "Share via email:"
-msgstr "Über eine E-Mail freigeben:"
+msgstr "Über eine E-Mail teilen:"
 
 #: js/share.js:229
 msgid "No people found"
@@ -369,7 +370,7 @@ msgstr "löschen"
 
 #: js/share.js:339
 msgid "share"
-msgstr "freigeben"
+msgstr "teilen"
 
 #: js/share.js:373 js/share.js:569
 msgid "Password protected"
@@ -402,7 +403,7 @@ msgstr "Das Update ist fehlgeschlagen. Bitte melden Sie dieses Problem an die <a
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Das Update war erfolgreich. Sie werden nun zu ownCloud weitergeleitet."
 
-#: lostpassword/controller.php:47
+#: lostpassword/controller.php:48
 msgid "ownCloud password reset"
 msgstr "ownCloud-Passwort zurücksetzen"
 
@@ -503,7 +504,7 @@ msgstr "Ohne einen sicheren Zufallszahlengenerator sind Angreifer in der Lage di
 msgid ""
 "Your data directory and files are probably accessible from the internet "
 "because the .htaccess file does not work."
-msgstr "Dein Daten-Verzeichnis 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
 msgid ""
diff --git a/l10n/de/files.po b/l10n/de/files.po
index 0d7576ef626b96daea2cfa2af42da690eda60a94..12c0a5d450438b6ecce1b7ff686e2b0125c6bcc7 100644
--- a/l10n/de/files.po
+++ b/l10n/de/files.po
@@ -28,10 +28,10 @@ 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 23:05+0000\n"
+"POT-Creation-Date: 2013-03-05 00:18+0100\n"
+"PO-Revision-Date: 2013-03-04 13:20+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
@@ -41,16 +41,16 @@ 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 "%s konnte nicht verschoben werden - 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"
+msgstr "%s konnte nicht verschoben werden"
 
 #: ajax/rename.php:22 ajax/rename.php:25
 msgid "Unable to rename file"
-msgstr "Konnte Datei nicht umbenennen"
+msgstr "Die Datei konnte nicht umbenannt werden"
 
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
@@ -71,27 +71,27 @@ msgid ""
 "the HTML form"
 msgstr "Die Größe der hochzuladenden Datei überschreitet die MAX_FILE_SIZE-Richtlinie, die im HTML-Formular angegeben wurde"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
 msgstr "Die Datei wurde nur teilweise hochgeladen."
 
-#: ajax/upload.php:32
+#: ajax/upload.php:31
 msgid "No file was uploaded"
 msgstr "Es wurde keine Datei hochgeladen."
 
-#: ajax/upload.php:33
+#: ajax/upload.php:32
 msgid "Missing a temporary folder"
 msgstr "Temporärer Ordner fehlt."
 
-#: ajax/upload.php:34
+#: ajax/upload.php:33
 msgid "Failed to write to disk"
 msgstr "Fehler beim Schreiben auf die Festplatte"
 
-#: ajax/upload.php:52
+#: ajax/upload.php:51
 msgid "Not enough storage available"
 msgstr "Nicht genug Speicherplatz verfügbar"
 
-#: ajax/upload.php:83
+#: ajax/upload.php:82
 msgid "Invalid directory."
 msgstr "Ungültiges Verzeichnis."
 
@@ -103,7 +103,7 @@ msgstr "Dateien"
 msgid "Delete permanently"
 msgstr "Permanent löschen"
 
-#: js/fileactions.js:127 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:127 templates/index.php:92 templates/index.php:93
 msgid "Delete"
 msgstr "Löschen"
 
@@ -111,40 +111,36 @@ msgstr "Löschen"
 msgid "Rename"
 msgstr "Umbenennen"
 
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
 msgid "Pending"
 msgstr "Ausstehend"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "{new_name} already exists"
 msgstr "{new_name} existiert bereits"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "replace"
 msgstr "ersetzen"
 
-#: js/filelist.js:253
+#: js/filelist.js:251
 msgid "suggest name"
 msgstr "Name vorschlagen"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "cancel"
 msgstr "abbrechen"
 
-#: js/filelist.js:295
-msgid "replaced {new_name}"
-msgstr "{new_name} wurde ersetzt"
+#: js/filelist.js:298
+msgid "replaced {new_name} with {old_name}"
+msgstr "{old_name} ersetzt durch {new_name}"
 
-#: js/filelist.js:295 js/filelist.js:297
+#: js/filelist.js:298
 msgid "undo"
 msgstr "rückgängig machen"
 
-#: js/filelist.js:297
-msgid "replaced {new_name} with {old_name}"
-msgstr "{old_name} ersetzt durch {new_name}"
-
-#: js/filelist.js:322
+#: js/filelist.js:323
 msgid "perform delete operation"
 msgstr "Löschvorgang ausführen"
 
@@ -170,74 +166,74 @@ msgstr "Ihr Speicherplatz ist voll, Dateien können nicht mehr aktualisiert oder
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Ihr Speicherplatz ist fast aufgebraucht ({usedSpacePercent}%)"
 
-#: js/files.js:224
+#: js/files.js:225
 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:261
+#: js/files.js:262
 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:261
+#: js/files.js:262
 msgid "Upload Error"
 msgstr "Fehler beim Upload"
 
-#: js/files.js:272
+#: js/files.js:273
 msgid "Close"
 msgstr "Schließen"
 
-#: js/files.js:311
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr "Eine Datei wird hoch geladen"
 
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr "{count} Dateien werden hochgeladen"
 
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "Upload abgebrochen."
 
-#: js/files.js:496
+#: js/files.js:497
 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:569
+#: js/files.js:570
 msgid "URL cannot be empty."
 msgstr "Die URL darf nicht leer sein."
 
-#: js/files.js:574
+#: js/files.js:575
 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:948 templates/index.php:67
+#: js/files.js:953 templates/index.php:68
 msgid "Name"
 msgstr "Name"
 
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:954 templates/index.php:79
 msgid "Size"
 msgstr "Größe"
 
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:955 templates/index.php:81
 msgid "Modified"
 msgstr "Bearbeitet"
 
-#: js/files.js:969
+#: js/files.js:974
 msgid "1 folder"
 msgstr "1 Ordner"
 
-#: js/files.js:971
+#: js/files.js:976
 msgid "{count} folders"
 msgstr "{count} Ordner"
 
-#: js/files.js:979
+#: js/files.js:984
 msgid "1 file"
 msgstr "1 Datei"
 
-#: js/files.js:981
+#: js/files.js:986
 msgid "{count} files"
 msgstr "{count} Dateien"
 
@@ -295,39 +291,43 @@ msgstr "Von einem Link"
 
 #: templates/index.php:40
 msgid "Deleted files"
-msgstr ""
+msgstr "Gelöschte Dateien"
 
 #: templates/index.php:46
 msgid "Cancel upload"
 msgstr "Upload abbrechen"
 
-#: templates/index.php:59
+#: templates/index.php:53
+msgid "You don’t have write permissions here."
+msgstr "Du besitzt hier keine Schreib-Berechtigung."
+
+#: templates/index.php:60
 msgid "Nothing in here. Upload something!"
 msgstr "Alles leer. Lade etwas hoch!"
 
-#: templates/index.php:73
+#: templates/index.php:74
 msgid "Download"
 msgstr "Herunterladen"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:86 templates/index.php:87
 msgid "Unshare"
 msgstr "Nicht mehr freigeben"
 
-#: templates/index.php:105
+#: templates/index.php:106
 msgid "Upload too large"
 msgstr "Upload zu groß"
 
-#: templates/index.php:107
+#: templates/index.php:108
 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:112
+#: templates/index.php:113
 msgid "Files are being scanned, please wait."
 msgstr "Dateien werden gescannt, bitte warten."
 
-#: templates/index.php:115
+#: templates/index.php:116
 msgid "Current scanning"
 msgstr "Scanne"
 
diff --git a/l10n/de/files_encryption.po b/l10n/de/files_encryption.po
index 7c707e5f8987bad8f372be5854fe519048750c17..3cfd6711a27e2bee724937260e9138e094dcfb28 100644
--- a/l10n/de/files_encryption.po
+++ b/l10n/de/files_encryption.po
@@ -9,10 +9,10 @@ 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:10+0000\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"
-"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"
diff --git a/l10n/de/files_external.po b/l10n/de/files_external.po
index c8d7b8f8e41c5b40be46b1a0c182449e35a56690..92f1eafd18f3d72141aa0aca780fcd87c1d27e90 100644
--- a/l10n/de/files_external.po
+++ b/l10n/de/files_external.po
@@ -6,53 +6,50 @@
 #   <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.
 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 13:57+0000\n"
-"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\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"
+"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"
 "Language: de\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 "Zugriff gestattet"
 
-#: 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 "Fehler beim Einrichten von Dropbox"
 
-#: 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 "Zugriff gestatten"
 
-#: js/dropbox.js:73 js/google.js:72
-msgid "Fill out all required fields"
-msgstr "Bitte alle notwendigen Felder füllen"
-
-#: js/dropbox.js:85
+#: js/dropbox.js:101
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr "Bitte trage einen gültigen Dropbox-App-Key mit Secret ein."
 
-#: 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 "Fehler beim Einrichten von Google Drive"
 
-#: lib/config.php:434
+#: lib/config.php:421
 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:435
+#: lib/config.php:424
 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 "
@@ -63,63 +60,63 @@ msgstr "<b>Warnung::</b> Die FTP Unterstützung  von PHP ist nicht aktiviert ode
 msgid "External Storage"
 msgstr "Externer Speicher"
 
-#: templates/settings.php:8 templates/settings.php:22
-msgid "Mount point"
-msgstr "Mount-Point"
-
-#: templates/settings.php:9
-msgid "Backend"
-msgstr "Backend"
+#: templates/settings.php:9 templates/settings.php:28
+msgid "Folder name"
+msgstr "Ordnername"
 
 #: templates/settings.php:10
+msgid "External storage"
+msgstr "Externer Speicher"
+
+#: templates/settings.php:11
 msgid "Configuration"
 msgstr "Konfiguration"
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid "Options"
 msgstr "Optionen"
 
-#: templates/settings.php:12
+#: templates/settings.php:13
 msgid "Applicable"
 msgstr "Zutreffend"
 
-#: templates/settings.php:27
-msgid "Add mount point"
-msgstr "Mount-Point hinzufügen"
+#: templates/settings.php:33
+msgid "Add storage"
+msgstr "Speicher hinzufügen"
 
-#: templates/settings.php:85
+#: templates/settings.php:90
 msgid "None set"
 msgstr "Nicht definiert"
 
-#: templates/settings.php:86
+#: templates/settings.php:91
 msgid "All Users"
 msgstr "Alle Benutzer"
 
-#: templates/settings.php:87
+#: templates/settings.php:92
 msgid "Groups"
 msgstr "Gruppen"
 
-#: templates/settings.php:95
+#: templates/settings.php:100
 msgid "Users"
 msgstr "Benutzer"
 
-#: templates/settings.php:108 templates/settings.php:109
-#: templates/settings.php:144 templates/settings.php:145
+#: templates/settings.php:113 templates/settings.php:114
+#: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
 msgstr "Löschen"
 
-#: templates/settings.php:124
+#: templates/settings.php:129
 msgid "Enable User External Storage"
 msgstr "Externen Speicher für Benutzer aktivieren"
 
-#: templates/settings.php:125
+#: templates/settings.php:130
 msgid "Allow users to mount their own external storage"
 msgstr "Erlaubt Benutzern ihre eigenen externen Speicher einzubinden"
 
-#: templates/settings.php:136
+#: templates/settings.php:141
 msgid "SSL root certificates"
 msgstr "SSL-Root-Zertifikate"
 
-#: templates/settings.php:153
+#: templates/settings.php:159
 msgid "Import Root Certificate"
 msgstr "Root-Zertifikate importieren"
diff --git a/l10n/de/files_trashbin.po b/l10n/de/files_trashbin.po
index 177c56d3b8fb6d3f392536d3bbc4fbd4ec95fe3c..ceb8a6faea1a5724564edcbcc8e4e2afef538830 100644
--- a/l10n/de/files_trashbin.po
+++ b/l10n/de/files_trashbin.po
@@ -5,60 +5,65 @@
 # 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-02-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 21:50+0000\n"
-"Last-Translator: Marcel Kühlhorn <susefan93@gmx.de>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\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: German <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:22
+#: ajax/delete.php:40
 #, php-format
 msgid "Couldn't delete %s permanently"
-msgstr "Konnte %s nicht permanent löschen"
+msgstr "Konnte %s nicht dauerhaft löschen"
 
 #: ajax/undelete.php:41
 #, php-format
 msgid "Couldn't restore %s"
 msgstr "Konnte %s nicht wiederherstellen"
 
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
 msgid "perform restore operation"
 msgstr "Wiederherstellung ausführen"
 
-#: js/trash.js:33
+#: js/trash.js:34
 msgid "delete file permanently"
-msgstr "Datei permanent löschen"
+msgstr "Datei dauerhaft löschen"
 
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr "Permanent löschen"
+
+#: js/trash.js:174 templates/index.php:17
 msgid "Name"
 msgstr "Name"
 
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:175 templates/index.php:27
 msgid "Deleted"
 msgstr "gelöscht"
 
-#: js/trash.js:135
+#: js/trash.js:184
 msgid "1 folder"
 msgstr "1 Ordner"
 
-#: js/trash.js:137
+#: js/trash.js:186
 msgid "{count} folders"
 msgstr "{count} Ordner"
 
-#: js/trash.js:145
+#: js/trash.js:194
 msgid "1 file"
 msgstr "1 Datei"
 
-#: js/trash.js:147
+#: js/trash.js:196
 msgid "{count} files"
 msgstr "{count} Dateien"
 
@@ -69,3 +74,11 @@ msgstr "Nichts zu löschen, der Papierkorb ist leer!"
 #: templates/index.php:20 templates/index.php:22
 msgid "Restore"
 msgstr "Wiederherstellen"
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr "Löschen"
+
+#: templates/part.breadcrumb.php:9
+msgid "Deleted Files"
+msgstr ""
diff --git a/l10n/de/files_versions.po b/l10n/de/files_versions.po
index 5926d03cb4e62deb0918660369b6e025aedd96a4..b6bf0c7c870f5fe3cd4d3e2a8f53d94969620e59 100644
--- a/l10n/de/files_versions.po
+++ b/l10n/de/files_versions.po
@@ -8,15 +8,16 @@
 #   <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-02-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 22:10+0000\n"
-"Last-Translator: Marcel Kühlhorn <susefan93@gmx.de>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\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"
+"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"
@@ -54,18 +55,10 @@ msgstr "Keine älteren Versionen verfügbar"
 msgid "No path specified"
 msgstr "Kein Pfad angegeben"
 
-#: js/versions.js:16
-msgid "History"
-msgstr "Historie"
+#: js/versions.js:6
+msgid "Versions"
+msgstr "Versionen"
 
 #: templates/history.php:20
 msgid "Revert a file to a previous version by clicking on its revert button"
-msgstr "Setzen Sie eine Datei durch klicken auf den Zurücksetzen Button zurück"
-
-#: templates/settings.php:3
-msgid "Files Versioning"
-msgstr "Dateiversionierung"
-
-#: templates/settings.php:4
-msgid "Enable"
-msgstr "Aktivieren"
+msgstr "Setze eine Datei durch klicken auf den Zurücksetzen Button zurück"
diff --git a/l10n/de/lib.po b/l10n/de/lib.po
index c13aaaa349879c8b07d4b3714a3fc337a342b8c3..df1831ecb505a783450ca0e09cc8a34eeea48c84 100644
--- a/l10n/de/lib.po
+++ b/l10n/de/lib.po
@@ -4,47 +4,50 @@
 # 
 # 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.
 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 20:50+0000\n"
-"Last-Translator: Marcel Kühlhorn <susefan93@gmx.de>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\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"
+"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"
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:339
+#: app.php:349
 msgid "Help"
 msgstr "Hilfe"
 
-#: app.php:346
+#: app.php:362
 msgid "Personal"
 msgstr "Persönlich"
 
-#: app.php:351
+#: app.php:373
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: app.php:356
+#: app.php:385
 msgid "Users"
 msgstr "Benutzer"
 
-#: app.php:363
+#: app.php:398
 msgid "Apps"
 msgstr "Apps"
 
-#: app.php:365
+#: app.php:406
 msgid "Admin"
 msgstr "Administrator"
 
@@ -56,17 +59,17 @@ msgstr "Der ZIP-Download ist deaktiviert."
 msgid "Files need to be downloaded one by one."
 msgstr "Die Dateien müssen einzeln heruntergeladen werden."
 
-#: files.php:203 files.php:228
+#: files.php:204 files.php:231
 msgid "Back to Files"
 msgstr "Zurück zu \"Dateien\""
 
-#: files.php:227
+#: files.php:228
 msgid "Selected files too large to generate zip file."
 msgstr "Die gewählten Dateien sind zu groß, um eine ZIP-Datei zu erstellen."
 
-#: helper.php:226
+#: helper.php:228
 msgid "couldn't be determined"
-msgstr "Konnte nicht festgestellt werden"
+msgstr "konnte nicht festgestellt werden"
 
 #: json.php:28
 msgid "Application is not enabled"
@@ -102,92 +105,97 @@ msgstr "Setze Administrator Passwort"
 
 #: setup.php:40
 msgid "Specify a data folder."
-msgstr "Datei-Verzeichnis angeben"
+msgstr "Datei-Verzeichnis angeben."
 
-#: setup.php:53
+#: setup.php:55
 #, php-format
 msgid "%s enter the database username."
 msgstr "%s gib den Datenbank-Benutzernamen an."
 
-#: setup.php:56
+#: setup.php:58
 #, php-format
 msgid "%s enter the database name."
 msgstr "%s gib den Datenbank-Namen an."
 
-#: setup.php:59
+#: setup.php:61
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr "%s Der Datenbank-Name darf keine Punkte enthalten"
 
-#: setup.php:62
+#: setup.php:64
 #, php-format
 msgid "%s set the database host."
 msgstr "%s setze den Datenbank-Host"
 
-#: setup.php:126 setup.php:291 setup.php:336
+#: setup.php:128 setup.php:320 setup.php:365
 msgid "PostgreSQL username and/or password not valid"
 msgstr "PostgreSQL Benutzername und/oder Passwort ungültig"
 
-#: setup.php:127 setup.php:150 setup.php:204
+#: setup.php:129 setup.php:152 setup.php:229
 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."
+msgstr "Du musst entweder ein existierendes Benutzerkonto oder das Administratoren-Konto angeben."
 
-#: setup.php:149 setup.php:423 setup.php:489
+#: setup.php:151 setup.php:453 setup.php:520
 msgid "Oracle username and/or password not valid"
 msgstr "Oracle Benutzername und/oder Passwort ungültig"
 
-#: setup.php:203
+#: setup.php:228
 msgid "MySQL username and/or password not valid"
 msgstr "MySQL Benutzername und/oder Passwort ungültig"
 
-#: setup.php:255 setup.php:357 setup.php:366 setup.php:384 setup.php:394
-#: setup.php:403 setup.php:430 setup.php:496 setup.php:522 setup.php:529
-#: setup.php:540 setup.php:547 setup.php:556 setup.php:564 setup.php:573
-#: setup.php:579
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "DB Fehler: \"%s\""
 
-#: setup.php:256 setup.php:358 setup.php:367 setup.php:385 setup.php:395
-#: setup.php:404 setup.php:431 setup.php:497 setup.php:523 setup.php:530
-#: setup.php:541 setup.php:557 setup.php:565 setup.php:574
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "Fehlerhafter Befehl war: \"%s\""
 
-#: setup.php:270
+#: setup.php:299
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "MySQL Benutzer '%s'@'localhost' existiert bereits."
 
-#: setup.php:271
+#: setup.php:300
 msgid "Drop this user from MySQL"
 msgstr "Lösche diesen Benutzer von MySQL"
 
-#: setup.php:276
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "MySQL Benutzer '%s'@'%%' existiert bereits"
 
-#: setup.php:277
+#: setup.php:306
 msgid "Drop this user from MySQL."
-msgstr "Lösche diesen Benutzer von MySQL."
+msgstr "Lösche diesen Benutzer aus MySQL."
 
-#: setup.php:548 setup.php:580
+#: setup.php:579 setup.php:611
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Fehlerhafter Befehl war: \"%s\", Name: %s, Passwort: %s"
 
-#: setup.php:644
+#: setup.php:631
+#, 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
 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:645
+#: setup.php:850
 #, 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üfe die <a href='%s'>Instalationsanleitungen</a>."
 
 #: template.php:113
 msgid "seconds ago"
@@ -241,16 +249,16 @@ msgstr "Letztes Jahr"
 msgid "years ago"
 msgstr "Vor Jahren"
 
-#: updater.php:75
+#: 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:77
+#: updater.php:81
 msgid "up to date"
 msgstr "aktuell"
 
-#: updater.php:80
+#: updater.php:84
 msgid "updates check is disabled"
 msgstr "Die Update-Überprüfung ist ausgeschaltet"
 
diff --git a/l10n/de/settings.po b/l10n/de/settings.po
index 927cfec9c7319d6f9a46fd14d107caf609dd02da..76f41d6da2a406c2b5cb9f280f19afd5e63c5f3f 100644
--- a/l10n/de/settings.po
+++ b/l10n/de/settings.po
@@ -26,10 +26,10 @@ 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:05+0000\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"
-"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"
@@ -40,8 +40,8 @@ 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:15
-#: ajax/togglegroups.php:18
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr "Fehler bei der Anmeldung"
 
@@ -89,12 +89,12 @@ msgstr "Ungültige Anfrage"
 msgid "Admins can't remove themself from the admin group"
 msgstr "Administratoren können sich nicht selbst aus der Admin-Gruppe löschen."
 
-#: ajax/togglegroups.php:28
+#: ajax/togglegroups.php:30
 #, php-format
 msgid "Unable to add user to group %s"
 msgstr "Der Benutzer konnte nicht zur Gruppe %s hinzugefügt werden"
 
-#: ajax/togglegroups.php:34
+#: ajax/togglegroups.php:36
 #, php-format
 msgid "Unable to remove user from group %s"
 msgstr "Der Benutzer konnte nicht aus der Gruppe %s entfernt werden"
@@ -135,7 +135,7 @@ msgstr "Fehler"
 msgid "Updated"
 msgstr "Geupdated"
 
-#: js/personal.js:96
+#: js/personal.js:99
 msgid "Saving..."
 msgstr "Speichern..."
 
@@ -164,23 +164,23 @@ msgstr "Gruppenadministrator"
 msgid "Delete"
 msgstr "Löschen"
 
-#: js/users.js:190
+#: js/users.js:191
 msgid "add group"
 msgstr "Gruppe hinzufügen"
 
-#: js/users.js:351
+#: js/users.js:352
 msgid "A valid username must be provided"
 msgstr "Es muss ein gültiger Benutzername angegeben werden"
 
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
 msgid "Error creating user"
 msgstr "Beim anlegen des Benutzers ist ein Fehler aufgetreten"
 
-#: js/users.js:357
+#: js/users.js:358
 msgid "A valid password must be provided"
 msgstr "Es muss ein gültiges Passwort angegeben werden"
 
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
 msgid "__language_name__"
 msgstr "Deutsch (Persönlich)"
 
@@ -195,7 +195,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 "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."
+msgstr "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."
 
 #: templates/admin.php:29
 msgid "Setup Warning"
@@ -226,19 +226,19 @@ msgstr "Das PHP-Modul 'fileinfo' fehlt. Wir empfehlen dieses Modul zu aktivieren
 msgid "Locale not working"
 msgstr "Ländereinstellung funktioniert nicht"
 
-#: templates/admin.php:61
+#: templates/admin.php:63
+#, php-format
 msgid ""
-"This ownCloud server can't set system locale to "
-"\"en_US.UTF-8\"/\"en_US.UTF8\". 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 en_US.UTF-8/en_US.UTF8."
-msgstr "Dieser ownCloud Server kann die Ländereinstellung nicht auf \"de_DE.UTF-8\"/\"de_DE.UTF8\" ändern. Dies bedeutet dass es Probleme mit bestimmten Zeichen in Dateinamen geben könnte. Wir empfehlen die für de_DE.UTF-8/de_DE.UTF8 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."
+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:72
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr "Keine Netzwerkverbindung"
 
-#: templates/admin.php:75
+#: 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 "
@@ -246,100 +246,100 @@ 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 Sie alle Funktionen von ownCloud nutzen wollen."
+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:89
+#: templates/admin.php:92
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:98
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr "Führe eine Aufgabe mit jeder geladenen Seite aus"
 
-#: templates/admin.php:108
+#: 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 an einem Webcron-Service registriert. Die cron.php Seite wird einmal pro Minute über http abgerufen."
 
-#: templates/admin.php:118
+#: 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 "Nutze den Cron Systemdienst. Rufe die Datei cron.php im owncloud Ordner einmal pro Minute über einen Cronjob auf."
 
-#: templates/admin.php:125
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr "Teilen"
 
-#: templates/admin.php:131
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr "Aktiviere Sharing-API"
 
-#: templates/admin.php:132
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
-msgstr "Erlaube Apps die Nutzung der Sharing-API"
+msgstr "Erlaube Apps die Nutzung der Share-API"
 
-#: templates/admin.php:139
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr "Erlaube Links"
 
-#: templates/admin.php:140
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr "Erlaube Benutzern Inhalte über öffentliche Links zu teilen"
 
-#: templates/admin.php:147
+#: templates/admin.php:150
 msgid "Allow resharing"
 msgstr "Erlaube erneutes teilen"
 
-#: templates/admin.php:148
+#: templates/admin.php:151
 msgid "Allow users to share items shared with them again"
 msgstr "Erlaube Benutzern mit ihnen geteilte Inhalte erneut zu teilen"
 
-#: templates/admin.php:155
+#: templates/admin.php:158
 msgid "Allow users to share with anyone"
 msgstr "Erlaube Benutzern mit jedem zu teilen"
 
-#: templates/admin.php:158
+#: 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"
 
-#: templates/admin.php:165
+#: templates/admin.php:168
 msgid "Security"
 msgstr "Sicherheit"
 
-#: templates/admin.php:178
+#: templates/admin.php:181
 msgid "Enforce HTTPS"
 msgstr "Erzwinge HTTPS"
 
-#: templates/admin.php:179
+#: templates/admin.php:182
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr "Erzwingt die Verwendung einer verschlüsselten Verbindung"
 
-#: templates/admin.php:182
+#: templates/admin.php:185
 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"
 
-#: templates/admin.php:192
+#: templates/admin.php:195
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:193
+#: templates/admin.php:196
 msgid "Log level"
-msgstr "Logtiefe"
+msgstr "Loglevel"
 
-#: templates/admin.php:220
+#: templates/admin.php:223
 msgid "More"
 msgstr "Mehr"
 
-#: templates/admin.php:227 templates/personal.php:98
+#: templates/admin.php:230 templates/personal.php:102
 msgid "Version"
 msgstr "Version"
 
-#: templates/admin.php:230 templates/personal.php:100
+#: templates/admin.php:233 templates/personal.php:105
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -349,51 +349,51 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "Entwickelt von der <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-Community</a>, der <a href=\"https://github.com/owncloud\" target=\"_blank\">Quellcode</a> ist unter der <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> lizenziert."
 
-#: templates/apps.php:10
+#: templates/apps.php:11
 msgid "Add your App"
 msgstr "Füge Deine Anwendung hinzu"
 
-#: templates/apps.php:11
+#: templates/apps.php:12
 msgid "More Apps"
 msgstr "Weitere Anwendungen"
 
-#: templates/apps.php:24
+#: templates/apps.php:28
 msgid "Select an App"
 msgstr "Wähle eine Anwendung aus"
 
-#: templates/apps.php:28
+#: templates/apps.php:34
 msgid "See application page at apps.owncloud.com"
 msgstr "Weitere Anwendungen findest Du auf apps.owncloud.com"
 
-#: templates/apps.php:29
+#: templates/apps.php:36
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-lizenziert von <span class=\"author\"></span>"
 
-#: templates/apps.php:31
+#: templates/apps.php:38
 msgid "Update"
 msgstr "Update durchführen"
 
-#: templates/help.php:3
+#: templates/help.php:4
 msgid "User Documentation"
 msgstr "Dokumentation für Benutzer"
 
-#: templates/help.php:4
+#: templates/help.php:6
 msgid "Administrator Documentation"
 msgstr "Dokumentation für Administratoren"
 
-#: templates/help.php:6
+#: templates/help.php:9
 msgid "Online Documentation"
 msgstr "Online-Dokumentation"
 
-#: templates/help.php:7
+#: templates/help.php:11
 msgid "Forum"
 msgstr "Forum"
 
-#: templates/help.php:9
+#: templates/help.php:14
 msgid "Bugtracker"
 msgstr "Bugtracker"
 
-#: templates/help.php:11
+#: templates/help.php:17
 msgid "Commercial Support"
 msgstr "Kommerzieller Support"
 
@@ -402,79 +402,79 @@ msgstr "Kommerzieller Support"
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Du verwendest <strong>%s</strong> der verfügbaren <strong>%s<strong>"
 
-#: templates/personal.php:14
+#: templates/personal.php:15
 msgid "Get the apps to sync your files"
-msgstr "Laden Sie die Apps zur Synchronisierung ihrer Daten herunter"
+msgstr "Lade die Apps zur Synchronisierung Deiner Daten herunter"
 
-#: templates/personal.php:25
+#: templates/personal.php:26
 msgid "Show First Run Wizard again"
 msgstr "Erstinstallation erneut durchführen"
 
-#: templates/personal.php:36 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
 msgid "Password"
 msgstr "Passwort"
 
-#: templates/personal.php:37
+#: templates/personal.php:38
 msgid "Your password was changed"
 msgstr "Dein Passwort wurde geändert."
 
-#: templates/personal.php:38
+#: templates/personal.php:39
 msgid "Unable to change your password"
 msgstr "Passwort konnte nicht geändert werden"
 
-#: templates/personal.php:39
+#: templates/personal.php:40
 msgid "Current password"
 msgstr "Aktuelles Passwort"
 
-#: templates/personal.php:40
+#: templates/personal.php:42
 msgid "New password"
 msgstr "Neues Passwort"
 
-#: templates/personal.php:42
+#: templates/personal.php:44
 msgid "Change password"
 msgstr "Passwort ändern"
 
-#: templates/personal.php:54 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:78
 msgid "Display Name"
 msgstr "Anzeigename"
 
-#: templates/personal.php:55
+#: templates/personal.php:57
 msgid "Your display name was changed"
 msgstr "Dein Anzeigename wurde geändert"
 
-#: templates/personal.php:56
+#: templates/personal.php:58
 msgid "Unable to change your display name"
 msgstr "Das Ändern deines Anzeigenamens ist nicht möglich"
 
-#: templates/personal.php:59
+#: templates/personal.php:61
 msgid "Change display name"
 msgstr "Anzeigenamen ändern"
 
-#: templates/personal.php:68
+#: templates/personal.php:70
 msgid "Email"
 msgstr "E-Mail"
 
-#: templates/personal.php:69
+#: templates/personal.php:72
 msgid "Your email address"
 msgstr "Deine E-Mail-Adresse"
 
-#: templates/personal.php:70
+#: templates/personal.php:73
 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:76 templates/personal.php:77
+#: templates/personal.php:79 templates/personal.php:80
 msgid "Language"
 msgstr "Sprache"
 
-#: templates/personal.php:82
+#: templates/personal.php:86
 msgid "Help translate"
 msgstr "Hilf bei der Übersetzung"
 
-#: templates/personal.php:87
+#: templates/personal.php:91
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:89
+#: templates/personal.php:93
 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"
 
diff --git a/l10n/de/user_ldap.po b/l10n/de/user_ldap.po
index b4bd8a2d9ba78db9847df6588b834006c965cf85..f11912dee7c7ffe64805b836b91521e150772efb 100644
--- a/l10n/de/user_ldap.po
+++ b/l10n/de/user_ldap.po
@@ -12,14 +12,15 @@
 # Phi Lieb <>, 2012.
 # Susi  <>, 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-02-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 22:01+0000\n"
-"Last-Translator: Marcel Kühlhorn <susefan93@gmx.de>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\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: German <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -30,17 +31,17 @@ msgstr ""
 msgid "Failed to delete the server configuration"
 msgstr "Löschen der Serverkonfiguration fehlgeschlagen"
 
-#: ajax/testConfiguration.php:35
+#: 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!"
 
-#: ajax/testConfiguration.php:37
+#: 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."
 
-#: ajax/testConfiguration.php:40
+#: ajax/testConfiguration.php:43
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
@@ -89,230 +90,254 @@ msgstr "<b>Warnung:</b> Die Anwendungen user_ldap und user_webdavauth sind inkom
 msgid ""
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
 "work. Please ask your system administrator to install it."
-msgstr "<b>Warnung:</b> Da das PHP-Modul für LDAP nicht installiert ist, wird das Backend nicht funktionieren. Bitten Sie Ihren Systemadministrator das Modul zu installieren."
+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
 msgid "Server configuration"
 msgstr "Serverkonfiguration"
 
-#: templates/settings.php:17
+#: templates/settings.php:18
 msgid "Add Server Configuration"
 msgstr "Serverkonfiguration hinzufügen"
 
-#: templates/settings.php:21
+#: templates/settings.php:23
 msgid "Host"
 msgstr "Host"
 
-#: templates/settings.php:21
+#: templates/settings.php:25
 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:22
+#: templates/settings.php:26
 msgid "Base DN"
 msgstr "Basis-DN"
 
-#: templates/settings.php:22
+#: templates/settings.php:27
 msgid "One Base DN per line"
 msgstr "Ein Base DN pro Zeile"
 
-#: templates/settings.php:22
+#: templates/settings.php:28
 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:23
+#: templates/settings.php:30
 msgid "User DN"
 msgstr "Benutzer-DN"
 
-#: templates/settings.php:23
+#: templates/settings.php:32
 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:24
+#: templates/settings.php:33
 msgid "Password"
 msgstr "Passwort"
 
-#: templates/settings.php:24
+#: templates/settings.php:36
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "Lasse die Felder von DN und Passwort für anonymen Zugang leer."
 
-#: templates/settings.php:25
+#: templates/settings.php:37
 msgid "User Login Filter"
 msgstr "Benutzer-Login-Filter"
 
-#: templates/settings.php:25
+#: templates/settings.php:40
 #, 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."
 
-#: templates/settings.php:25
+#: templates/settings.php:41
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "verwende %%uid Platzhalter, z. B. \"uid=%%uid\""
 
-#: templates/settings.php:26
+#: templates/settings.php:42
 msgid "User List Filter"
 msgstr "Benutzer-Filter-Liste"
 
-#: templates/settings.php:26
+#: templates/settings.php:45
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Definiert den Filter für die Anfrage der Benutzer."
 
-#: templates/settings.php:26
+#: templates/settings.php:46
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "ohne Platzhalter, z.B.: \"objectClass=person\""
 
-#: templates/settings.php:27
+#: templates/settings.php:47
 msgid "Group Filter"
 msgstr "Gruppen-Filter"
 
-#: templates/settings.php:27
+#: templates/settings.php:50
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Definiert den Filter für die Anfrage der Gruppen."
 
-#: templates/settings.php:27
+#: templates/settings.php:51
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "ohne Platzhalter, z.B.: \"objectClass=posixGroup\""
 
-#: templates/settings.php:31
+#: templates/settings.php:55
 msgid "Connection Settings"
 msgstr "Verbindungseinstellungen"
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "Configuration Active"
 msgstr "Konfiguration aktiv"
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "When unchecked, this configuration will be skipped."
 msgstr "Konfiguration wird übersprungen wenn deaktiviert"
 
-#: templates/settings.php:34
+#: templates/settings.php:58
 msgid "Port"
 msgstr "Port"
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid "Backup (Replica) Host"
 msgstr "Backup Host (Kopie)"
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 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."
+msgstr "Gib einen optionalen Backup Host an. Es muss sich um eine Kopie des Haupt LDAP/AD Servers handeln."
 
-#: templates/settings.php:36
+#: templates/settings.php:60
 msgid "Backup (Replica) Port"
 msgstr "Backup Port"
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "Disable Main Server"
 msgstr "Hauptserver deaktivieren"
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "When switched on, ownCloud will only connect to the replica server."
-msgstr "Wenn aktiviert  wird ownCloud ausschließlich den Backupserver verwenden"
+msgstr "Wenn aktiviert, wird ownCloud ausschließlich den Backupserver verwenden."
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Use TLS"
 msgstr "Nutze TLS"
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Do not use it additionally for LDAPS connections, it will fail."
-msgstr "Benutze es nicht zusätzlich für LDAPS Verbindungen, es wird scheitern."
+msgstr "Benutze es nicht zusammen mit LDAPS Verbindungen, es wird fehlschlagen."
 
-#: templates/settings.php:39
+#: templates/settings.php:63
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "LDAP-Server (Windows: Groß- und Kleinschreibung bleibt unbeachtet)"
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid "Turn off SSL certificate validation."
 msgstr "Schalte die SSL-Zertifikatsprüfung aus."
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 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:40
+#: templates/settings.php:64
 msgid "Not recommended, use for testing only."
 msgstr "Nicht empfohlen, nur zu Testzwecken."
 
-#: templates/settings.php:41
+#: templates/settings.php:65
+msgid "Cache Time-To-Live"
+msgstr ""
+
+#: templates/settings.php:65
 msgid "in seconds. A change empties the cache."
 msgstr "in Sekunden. Eine Änderung leert den Cache."
 
-#: templates/settings.php:43
+#: templates/settings.php:67
 msgid "Directory Settings"
 msgstr "Ordnereinstellungen"
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "User Display Name Field"
 msgstr "Feld für den Anzeigenamen des Benutzers"
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 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:46
+#: templates/settings.php:70
 msgid "Base User Tree"
 msgstr "Basis-Benutzerbaum"
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "One User Base DN per line"
 msgstr "Ein Benutzer Base DN pro Zeile"
 
-#: templates/settings.php:47
+#: templates/settings.php:71
 msgid "User Search Attributes"
 msgstr "Benutzersucheigenschaften"
 
-#: templates/settings.php:47 templates/settings.php:50
+#: templates/settings.php:71 templates/settings.php:74
 msgid "Optional; one attribute per line"
-msgstr "Optional, eine Eigenschaft pro Zeile"
+msgstr "Optional; eine Eigenschaft pro Zeile"
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "Group Display Name Field"
 msgstr "Feld für den Anzeigenamen der Gruppe"
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 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:49
+#: templates/settings.php:73
 msgid "Base Group Tree"
 msgstr "Basis-Gruppenbaum"
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "One Group Base DN per line"
 msgstr "Ein Gruppen Base DN pro Zeile"
 
-#: templates/settings.php:50
+#: templates/settings.php:74
 msgid "Group Search Attributes"
 msgstr "Gruppensucheigenschaften"
 
-#: templates/settings.php:51
+#: templates/settings.php:75
 msgid "Group-Member association"
 msgstr "Assoziation zwischen Gruppe und Benutzer"
 
-#: templates/settings.php:53
+#: templates/settings.php:77
 msgid "Special Attributes"
 msgstr "Spezielle Eigenschaften"
 
-#: templates/settings.php:56
+#: templates/settings.php:79
+msgid "Quota Field"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Quota Default"
+msgstr ""
+
+#: templates/settings.php:80
 msgid "in bytes"
 msgstr "in Bytes"
 
-#: templates/settings.php:58
+#: templates/settings.php:81
+msgid "Email Field"
+msgstr ""
+
+#: templates/settings.php:82
+msgid "User Home Folder Naming Rule"
+msgstr ""
+
+#: templates/settings.php:82
 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:62
+#: templates/settings.php:86
+msgid "Test Configuration"
+msgstr ""
+
+#: templates/settings.php:86
 msgid "Help"
 msgstr "Hilfe"
diff --git a/l10n/de/user_webdavauth.po b/l10n/de/user_webdavauth.po
index 3bc6180a309a29f1d25279403adaaa6fa5ea83fa..d2653f16859cdda6d2cbb70cb80e18a285696976 100644
--- a/l10n/de/user_webdavauth.po
+++ b/l10n/de/user_webdavauth.po
@@ -4,16 +4,17 @@
 # 
 # Translators:
 #   <blobbyjj@ymail.com>, 2012.
+# Marcel Kühlhorn <susefan93@gmx.de>, 2013.
 #   <mibunrui@gmx.de>, 2013.
 #   <seeed@freenet.de>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-16 00:19+0100\n"
-"PO-Revision-Date: 2013-01-15 00:30+0000\n"
-"Last-Translator: AndryXY <mibunrui@gmx.de>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\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"
+"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"
@@ -28,9 +29,9 @@ msgstr "WebDAV Authentifikation"
 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 "ownCloud wird die Benutzer-Anmeldedaten an diese URL schicken. Dieses Plugin prüft die Anmeldedaten auf ihre Gültigkeit und interpretiert die HTTP Statusfehler 401 und 403 als ungültige, sowie alle Anderen als gültige Anmeldedaten."
+msgstr "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/l10n/de_DE/core.po b/l10n/de_DE/core.po
index a8ffe8861e3e36d32ea9e19ba7b35285d5859346..c0688e3ecc43d50089327468261f6412c5542a17 100644
--- a/l10n/de_DE/core.po
+++ b/l10n/de_DE/core.po
@@ -22,14 +22,15 @@
 # Susi <>, 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-02-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 14:31+0000\n"
-"Last-Translator: stefanniedermann <stefan.niedermann@googlemail.com>\n"
-"Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\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"
+"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"
@@ -39,26 +40,26 @@ msgstr ""
 #: ajax/share.php:85
 #, php-format
 msgid "User %s shared a file with you"
-msgstr "Der Nutzer %s hat eine Datei für Sie freigegeben"
+msgstr "Der Nutzer %s hat eine Datei mit Ihnen geteilt"
 
 #: ajax/share.php:87
 #, php-format
 msgid "User %s shared a folder with you"
-msgstr "%s hat ein Verzeichnis für Sie freigegeben"
+msgstr "%s hat einen Ordner mit Ihnen geteilt"
 
 #: ajax/share.php:89
 #, php-format
 msgid ""
 "User %s shared the file \"%s\" with you. It is available for download here: "
 "%s"
-msgstr "%s hat eine Datei \"%s\" für Sie freigegeben. Sie ist zum Download hier ferfügbar: %s"
+msgstr "%s hat die Datei \"%s\" mit Ihnen geteilt. Sie ist hier zum Download verfügbar: %s"
 
 #: ajax/share.php:91
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
 "here: %s"
-msgstr "%s hat eine Verzeichnis \"%s\" für Sie freigegeben. Es ist zum Download hier ferfügbar: %s"
+msgstr "%s hat den Ordner \"%s\" mit Ihnen geteilt. Er ist hier zum Download verfügbar: %s"
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -272,19 +273,19 @@ msgstr "Die benötigte Datei {file} ist nicht installiert."
 
 #: js/share.js:29 js/share.js:43 js/share.js:90
 msgid "Shared"
-msgstr "Freigegeben"
+msgstr "Geteilt"
 
 #: js/share.js:93
 msgid "Share"
-msgstr "Freigeben"
+msgstr "Teilen"
 
 #: js/share.js:141 js/share.js:622
 msgid "Error while sharing"
-msgstr "Fehler bei der Freigabe"
+msgstr "Fehler beim Teilen"
 
 #: js/share.js:152
 msgid "Error while unsharing"
-msgstr "Fehler bei der Aufhebung der Freigabe"
+msgstr "Fehler bei der Aufhebung der Teilung"
 
 #: js/share.js:159
 msgid "Error while changing permissions"
@@ -292,19 +293,19 @@ msgstr "Fehler bei der Änderung der Rechte"
 
 #: js/share.js:168
 msgid "Shared with you and the group {group} by {owner}"
-msgstr "Durch {owner} für Sie und die Gruppe {group} freigegeben."
+msgstr "Von {owner} mit Ihnen und der Gruppe {group} geteilt."
 
 #: js/share.js:170
 msgid "Shared with you by {owner}"
-msgstr "Durch {owner} für Sie freigegeben."
+msgstr "Von {owner} mit Ihnen geteilt."
 
 #: js/share.js:175
 msgid "Share with"
-msgstr "Freigeben für"
+msgstr "Teilen mit"
 
 #: js/share.js:180
 msgid "Share with link"
-msgstr "Über einen Link freigeben"
+msgstr "Über einen Link teilen"
 
 #: js/share.js:183
 msgid "Password protect"
@@ -332,7 +333,7 @@ msgstr "Ablaufdatum"
 
 #: js/share.js:227
 msgid "Share via email:"
-msgstr "Mittels einer E-Mail freigeben:"
+msgstr "Mittels einer E-Mail teilen:"
 
 #: js/share.js:229
 msgid "No people found"
@@ -372,7 +373,7 @@ msgstr "löschen"
 
 #: js/share.js:339
 msgid "share"
-msgstr "freigeben"
+msgstr "teilen"
 
 #: js/share.js:373 js/share.js:569
 msgid "Password protected"
@@ -399,13 +400,13 @@ msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
 "href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
 "community</a>."
-msgstr "Das Update ist fehlgeschlagen. Bitte melden Sie dieses Problem an die <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud Gemeinschaft</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>."
 
 #: 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."
 
-#: lostpassword/controller.php:47
+#: lostpassword/controller.php:48
 msgid "ownCloud password reset"
 msgstr "ownCloud-Passwort zurücksetzen"
 
@@ -506,14 +507,14 @@ msgstr "Ohne einen sicheren Zufallszahlengenerator sind Angreifer in der Lage, d
 msgid ""
 "Your data directory and files are probably accessible from the internet "
 "because the .htaccess file does not work."
-msgstr "Dein Daten-Verzeichnis und deine Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert."
+msgstr "Ihr Datenverzeichnis und Ihre Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert."
 
 #: templates/installation.php:32
 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 wahrscheinlich konfigurieren."
+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
 msgid "Create an <strong>admin account</strong>"
diff --git a/l10n/de_DE/files.po b/l10n/de_DE/files.po
index c62ccc02470ec012ca980ddf90e6156c1ac2321a..0b1891ce18210995cb2c72d68768b6ca9d74d8f9 100644
--- a/l10n/de_DE/files.po
+++ b/l10n/de_DE/files.po
@@ -21,20 +21,22 @@
 #   <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.
 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 23:05+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
-"Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\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"
+"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"
@@ -74,27 +76,27 @@ msgid ""
 "the HTML form"
 msgstr "Die Größe der hochzuladenden Datei überschreitet die MAX_FILE_SIZE-Richtlinie, die im HTML-Formular angegeben wurde"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
 msgstr "Die Datei wurde nur teilweise hochgeladen."
 
-#: ajax/upload.php:32
+#: ajax/upload.php:31
 msgid "No file was uploaded"
 msgstr "Es wurde keine Datei hochgeladen."
 
-#: ajax/upload.php:33
+#: ajax/upload.php:32
 msgid "Missing a temporary folder"
 msgstr "Der temporäre Ordner fehlt."
 
-#: ajax/upload.php:34
+#: ajax/upload.php:33
 msgid "Failed to write to disk"
 msgstr "Fehler beim Schreiben auf die Festplatte"
 
-#: ajax/upload.php:52
+#: ajax/upload.php:51
 msgid "Not enough storage available"
 msgstr "Nicht genug Speicher vorhanden."
 
-#: ajax/upload.php:83
+#: ajax/upload.php:82
 msgid "Invalid directory."
 msgstr "Ungültiges Verzeichnis."
 
@@ -106,7 +108,7 @@ msgstr "Dateien"
 msgid "Delete permanently"
 msgstr "Entgültig löschen"
 
-#: js/fileactions.js:127 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:127 templates/index.php:92 templates/index.php:93
 msgid "Delete"
 msgstr "Löschen"
 
@@ -114,42 +116,38 @@ msgstr "Löschen"
 msgid "Rename"
 msgstr "Umbenennen"
 
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
 msgid "Pending"
 msgstr "Ausstehend"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "{new_name} already exists"
 msgstr "{new_name} existiert bereits"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "replace"
 msgstr "ersetzen"
 
-#: js/filelist.js:253
+#: js/filelist.js:251
 msgid "suggest name"
 msgstr "Name vorschlagen"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "cancel"
 msgstr "abbrechen"
 
-#: js/filelist.js:295
-msgid "replaced {new_name}"
-msgstr "{new_name} wurde ersetzt"
+#: js/filelist.js:298
+msgid "replaced {new_name} with {old_name}"
+msgstr "{old_name} wurde ersetzt durch {new_name}"
 
-#: js/filelist.js:295 js/filelist.js:297
+#: js/filelist.js:298
 msgid "undo"
 msgstr "rückgängig machen"
 
-#: js/filelist.js:297
-msgid "replaced {new_name} with {old_name}"
-msgstr "{old_name} wurde ersetzt durch {new_name}"
-
-#: js/filelist.js:322
+#: js/filelist.js:323
 msgid "perform delete operation"
-msgstr "Führe das Löschen aus"
+msgstr "führe das Löschen aus"
 
 #: js/files.js:52
 msgid "'.' is an invalid file name."
@@ -173,74 +171,74 @@ msgstr "Ihr Speicher ist voll. Daher können keine Dateien mehr aktualisiert ode
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Ihr Speicher ist fast voll ({usedSpacePercent}%)"
 
-#: js/files.js:224
+#: js/files.js:225
 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."
 
-#: js/files.js:261
+#: js/files.js:262
 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:261
+#: js/files.js:262
 msgid "Upload Error"
 msgstr "Fehler beim Upload"
 
-#: js/files.js:272
+#: js/files.js:273
 msgid "Close"
 msgstr "Schließen"
 
-#: js/files.js:311
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr "1 Datei wird hochgeladen"
 
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr "{count} Dateien wurden hochgeladen"
 
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "Upload abgebrochen."
 
-#: js/files.js:496
+#: js/files.js:497
 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."
 
-#: js/files.js:569
+#: js/files.js:570
 msgid "URL cannot be empty."
 msgstr "Die URL darf nicht leer sein."
 
-#: js/files.js:574
+#: js/files.js:575
 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:948 templates/index.php:67
+#: js/files.js:953 templates/index.php:68
 msgid "Name"
 msgstr "Name"
 
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:954 templates/index.php:79
 msgid "Size"
 msgstr "Größe"
 
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:955 templates/index.php:81
 msgid "Modified"
 msgstr "Bearbeitet"
 
-#: js/files.js:969
+#: js/files.js:974
 msgid "1 folder"
 msgstr "1 Ordner"
 
-#: js/files.js:971
+#: js/files.js:976
 msgid "{count} folders"
 msgstr "{count} Ordner"
 
-#: js/files.js:979
+#: js/files.js:984
 msgid "1 file"
 msgstr "1 Datei"
 
-#: js/files.js:981
+#: js/files.js:986
 msgid "{count} files"
 msgstr "{count} Dateien"
 
@@ -298,42 +296,46 @@ msgstr "Von einem Link"
 
 #: templates/index.php:40
 msgid "Deleted files"
-msgstr ""
+msgstr "Gelöschte Dateien"
 
 #: templates/index.php:46
 msgid "Cancel upload"
 msgstr "Upload abbrechen"
 
-#: templates/index.php:59
+#: templates/index.php:53
+msgid "You don’t have write permissions here."
+msgstr "Sie haben hier keine Schreib-Berechtigungen."
+
+#: templates/index.php:60
 msgid "Nothing in here. Upload something!"
 msgstr "Alles leer. Bitte laden Sie etwas hoch!"
 
-#: templates/index.php:73
+#: templates/index.php:74
 msgid "Download"
 msgstr "Herunterladen"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:86 templates/index.php:87
 msgid "Unshare"
 msgstr "Nicht mehr freigeben"
 
-#: templates/index.php:105
+#: templates/index.php:106
 msgid "Upload too large"
 msgstr "Der Upload ist zu groß"
 
-#: templates/index.php:107
+#: templates/index.php:108
 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:112
+#: templates/index.php:113
 msgid "Files are being scanned, please wait."
 msgstr "Dateien werden gescannt, bitte warten."
 
-#: templates/index.php:115
+#: templates/index.php:116
 msgid "Current scanning"
 msgstr "Scanne"
 
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
-msgstr "Aktualisiere den Dateisystem-Cache"
+msgstr "Aktualisiere den Dateisystem-Cache..."
diff --git a/l10n/de_DE/files_encryption.po b/l10n/de_DE/files_encryption.po
index a4b8388e6031d6ac1ab7b93f3c11d71221c425c0..f69dc4f485301ac1d8e8e3a3634055d9fd324212 100644
--- a/l10n/de_DE/files_encryption.po
+++ b/l10n/de_DE/files_encryption.po
@@ -13,10 +13,10 @@ 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"
-"Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\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"
+"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"
@@ -33,11 +33,11 @@ msgstr "Datei-Verschlüsselung ist aktiviert"
 
 #: templates/settings-personal.php:11
 msgid "The following file types will not be encrypted:"
-msgstr "Die folgenden Datei-Typen werden nicht verschlüsselt:"
+msgstr "Die folgenden Dateitypen werden nicht verschlüsselt:"
 
 #: templates/settings.php:7
 msgid "Exclude the following file types from encryption:"
-msgstr "Die folgenden Datei-Typen von der Verschlüsselung ausnehmen:"
+msgstr "Die folgenden Dateitypen von der Verschlüsselung ausnehmen:"
 
 #: templates/settings.php:12
 msgid "None"
diff --git a/l10n/de_DE/files_external.po b/l10n/de_DE/files_external.po
index 6567207b38743332595fab2ea2dfeb11e3832ace..aaa3056fbb6dc94b4420d56d0e71003cd0500690 100644
--- a/l10n/de_DE/files_external.po
+++ b/l10n/de_DE/files_external.po
@@ -6,53 +6,50 @@
 #   <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.
 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 13: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"
+"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"
+"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"
 "Language: de_DE\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 "Zugriff gestattet"
 
-#: 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 "Fehler beim Einrichten von Dropbox"
 
-#: 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 "Zugriff gestatten"
 
-#: js/dropbox.js:73 js/google.js:72
-msgid "Fill out all required fields"
-msgstr "Bitte alle notwendigen Felder füllen"
-
-#: js/dropbox.js:85
+#: js/dropbox.js:101
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr "Bitte tragen Sie einen gültigen Dropbox-App-Key mit Secret ein."
 
-#: 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 "Fehler beim Einrichten von Google Drive"
 
-#: lib/config.php:434
+#: lib/config.php:421
 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:435
+#: lib/config.php:424
 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 "
@@ -63,63 +60,63 @@ msgstr "<b>Warnung::</b> Die FTP Unterstützung  von PHP ist nicht aktiviert ode
 msgid "External Storage"
 msgstr "Externer Speicher"
 
-#: templates/settings.php:8 templates/settings.php:22
-msgid "Mount point"
-msgstr "Mount-Point"
-
-#: templates/settings.php:9
-msgid "Backend"
-msgstr "Backend"
+#: templates/settings.php:9 templates/settings.php:28
+msgid "Folder name"
+msgstr "Ordnername"
 
 #: templates/settings.php:10
+msgid "External storage"
+msgstr "Externer Speicher"
+
+#: templates/settings.php:11
 msgid "Configuration"
 msgstr "Konfiguration"
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid "Options"
 msgstr "Optionen"
 
-#: templates/settings.php:12
+#: templates/settings.php:13
 msgid "Applicable"
 msgstr "Zutreffend"
 
-#: templates/settings.php:27
-msgid "Add mount point"
-msgstr "Mount-Point hinzufügen"
+#: templates/settings.php:33
+msgid "Add storage"
+msgstr "Speicher hinzufügen"
 
-#: templates/settings.php:85
+#: templates/settings.php:90
 msgid "None set"
 msgstr "Nicht definiert"
 
-#: templates/settings.php:86
+#: templates/settings.php:91
 msgid "All Users"
 msgstr "Alle Benutzer"
 
-#: templates/settings.php:87
+#: templates/settings.php:92
 msgid "Groups"
 msgstr "Gruppen"
 
-#: templates/settings.php:95
+#: templates/settings.php:100
 msgid "Users"
 msgstr "Benutzer"
 
-#: templates/settings.php:108 templates/settings.php:109
-#: templates/settings.php:144 templates/settings.php:145
+#: templates/settings.php:113 templates/settings.php:114
+#: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
 msgstr "Löschen"
 
-#: templates/settings.php:124
+#: templates/settings.php:129
 msgid "Enable User External Storage"
 msgstr "Externen Speicher für Benutzer aktivieren"
 
-#: templates/settings.php:125
+#: templates/settings.php:130
 msgid "Allow users to mount their own external storage"
 msgstr "Erlaubt Benutzern ihre eigenen externen Speicher einzubinden"
 
-#: templates/settings.php:136
+#: templates/settings.php:141
 msgid "SSL root certificates"
 msgstr "SSL-Root-Zertifikate"
 
-#: templates/settings.php:153
+#: templates/settings.php:159
 msgid "Import Root Certificate"
 msgstr "Root-Zertifikate importieren"
diff --git a/l10n/de_DE/files_trashbin.po b/l10n/de_DE/files_trashbin.po
index d9e42dce660f751ca28a921ad3d0e1d8a62cd49a..447c37a5ed12a3d7a3483280071fdf39044ba866 100644
--- a/l10n/de_DE/files_trashbin.po
+++ b/l10n/de_DE/files_trashbin.po
@@ -3,63 +3,70 @@
 # 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-02-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 10:43+0000\n"
-"Last-Translator: stefanniedermann <stefan.niedermann@googlemail.com>\n"
-"Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\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: German (Germany) <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: de_DE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:22
+#: ajax/delete.php:40
 #, php-format
 msgid "Couldn't delete %s permanently"
-msgstr "Konnte %s nicht permanent löschen"
+msgstr "Konnte %s nicht dauerhaft löschen"
 
 #: ajax/undelete.php:41
 #, php-format
 msgid "Couldn't restore %s"
 msgstr "Konnte %s nicht wiederherstellen"
 
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
 msgid "perform restore operation"
-msgstr "Führe die Wiederherstellung aus"
+msgstr "Wiederherstellung ausführen"
 
-#: js/trash.js:33
+#: js/trash.js:34
 msgid "delete file permanently"
-msgstr "Datei entgültig löschen"
+msgstr "Datei dauerhaft löschen"
 
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr "Endgültig löschen"
+
+#: js/trash.js:174 templates/index.php:17
 msgid "Name"
 msgstr "Name"
 
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:175 templates/index.php:27
 msgid "Deleted"
 msgstr "Gelöscht"
 
-#: js/trash.js:135
+#: js/trash.js:184
 msgid "1 folder"
 msgstr "1 Ordner"
 
-#: js/trash.js:137
+#: js/trash.js:186
 msgid "{count} folders"
 msgstr "{count} Ordner"
 
-#: js/trash.js:145
+#: js/trash.js:194
 msgid "1 file"
 msgstr "1 Datei"
 
-#: js/trash.js:147
+#: js/trash.js:196
 msgid "{count} files"
 msgstr "{count} Dateien"
 
@@ -70,3 +77,11 @@ msgstr "Nichts zu löschen, Ihr Papierkorb ist leer!"
 #: templates/index.php:20 templates/index.php:22
 msgid "Restore"
 msgstr "Wiederherstellen"
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr "Löschen"
+
+#: templates/part.breadcrumb.php:9
+msgid "Deleted Files"
+msgstr ""
diff --git a/l10n/de_DE/files_versions.po b/l10n/de_DE/files_versions.po
index 8ea9b51ed6ea06f29b5261f036ac4fa0b4861424..67694eac279c4cbd5909d1b960632af2fff8ea56 100644
--- a/l10n/de_DE/files_versions.po
+++ b/l10n/de_DE/files_versions.po
@@ -16,10 +16,10 @@ 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 10:50+0000\n"
-"Last-Translator: robN <robert.neumann01@gmail.com>\n"
-"Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
+"POT-Creation-Date: 2013-03-06 00:07+0100\n"
+"PO-Revision-Date: 2013-03-05 21:26+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"
 "Content-Transfer-Encoding: 8bit\n"
@@ -49,26 +49,18 @@ msgstr "Fehlgeschlagen"
 msgid "File %s could not be reverted to version %s"
 msgstr "Die Datei %s konnte nicht zur Version %s zurückgesetzt werden"
 
-#: history.php:68
+#: history.php:69
 msgid "No old versions available"
-msgstr "keine älteren Versionen verfügbar"
+msgstr "Keine älteren Versionen verfügbar"
 
-#: history.php:73
+#: history.php:74
 msgid "No path specified"
 msgstr "Kein Pfad angegeben"
 
-#: js/versions.js:16
-msgid "History"
-msgstr "Historie"
+#: js/versions.js:6
+msgid "Versions"
+msgstr "Versionen"
 
 #: templates/history.php:20
 msgid "Revert a file to a previous version by clicking on its revert button"
-msgstr "Setze eine Datei durch Klicken, auf den Zurücksetzen-Button, auf einer frühere Version zurück"
-
-#: templates/settings.php:3
-msgid "Files Versioning"
-msgstr "Dateiversionierung"
-
-#: templates/settings.php:4
-msgid "Enable"
-msgstr "Aktivieren"
+msgstr "Setze eine Datei durch Klicken auf den Zurücksetzen-Button auf eine frühere Version zurück"
diff --git a/l10n/de_DE/lib.po b/l10n/de_DE/lib.po
index 630cd9fa410d8fe191c8c927e81cf7c0955fb5e1..f6f092bc77e216fe7cb97affb1ffe40fa6e3a101 100644
--- a/l10n/de_DE/lib.po
+++ b/l10n/de_DE/lib.po
@@ -13,14 +13,15 @@
 #  <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-02-15 00:05+0100\n"
-"PO-Revision-Date: 2013-02-14 13:00+0000\n"
-"Last-Translator: Marcel Kühlhorn <susefan93@gmx.de>\n"
-"Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\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"
+"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"
@@ -107,87 +108,92 @@ msgstr "Setze Administrator Passwort"
 msgid "Specify a data folder."
 msgstr "Datei-Verzeichnis angeben"
 
-#: setup.php:53
+#: setup.php:55
 #, php-format
 msgid "%s enter the database username."
 msgstr "%s geben Sie den Datenbank-Benutzernamen an."
 
-#: setup.php:56
+#: setup.php:58
 #, php-format
 msgid "%s enter the database name."
 msgstr "%s geben Sie den Datenbank-Namen an."
 
-#: setup.php:59
+#: setup.php:61
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr "%s Der Datenbank-Name darf keine Punkte enthalten"
 
-#: setup.php:62
+#: setup.php:64
 #, php-format
 msgid "%s set the database host."
 msgstr "%s setze den Datenbank-Host"
 
-#: setup.php:126 setup.php:294 setup.php:339
+#: setup.php:128 setup.php:320 setup.php:365
 msgid "PostgreSQL username and/or password not valid"
 msgstr "PostgreSQL Benutzername und/oder Passwort ungültig"
 
-#: setup.php:127 setup.php:150 setup.php:204
+#: setup.php:129 setup.php:152 setup.php:229
 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:149 setup.php:427 setup.php:494
+#: setup.php:151 setup.php:453 setup.php:520
 msgid "Oracle username and/or password not valid"
 msgstr "Oracle Benutzername und/oder Passwort ungültig"
 
-#: setup.php:203
+#: setup.php:228
 msgid "MySQL username and/or password not valid"
 msgstr "MySQL Benutzername und/oder Passwort ungültig"
 
-#: setup.php:257 setup.php:360 setup.php:369 setup.php:387 setup.php:397
-#: setup.php:406 setup.php:435 setup.php:501 setup.php:527 setup.php:534
-#: setup.php:545 setup.php:552 setup.php:561 setup.php:569 setup.php:578
-#: setup.php:584
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "DB Fehler: \"%s\""
 
-#: setup.php:258 setup.php:361 setup.php:370 setup.php:388 setup.php:398
-#: setup.php:407 setup.php:436 setup.php:502 setup.php:528 setup.php:535
-#: setup.php:546 setup.php:562 setup.php:570 setup.php:579
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "Fehlerhafter Befehl war: \"%s\""
 
-#: setup.php:273
+#: setup.php:299
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "MySQL Benutzer '%s'@'localhost' existiert bereits."
 
-#: setup.php:274
+#: setup.php:300
 msgid "Drop this user from MySQL"
-msgstr "Lösche diesen Benutzer von MySQL"
+msgstr "Lösche diesen Benutzer aus MySQL"
 
-#: setup.php:279
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "MySQL Benutzer '%s'@'%%' existiert bereits"
 
-#: setup.php:280
+#: setup.php:306
 msgid "Drop this user from MySQL."
-msgstr "Lösche diesen Benutzer von MySQL."
+msgstr "Lösche diesen Benutzer aus MySQL."
 
-#: setup.php:553 setup.php:585
+#: setup.php:579 setup.php:611
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Fehlerhafter Befehl war: \"%s\", Name: %s, Passwort: %s"
 
-#: setup.php:649
+#: setup.php:631
+#, 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
 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."
 
-#: setup.php:651
+#: setup.php:850
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Bitte prüfen Sie die <a href='%s'>Instalationsanleitungen</a>."
diff --git a/l10n/de_DE/settings.po b/l10n/de_DE/settings.po
index 77ae2f776f246df8f273356b6c6dc3b6945f899a..dada42976f105607b930b4f869891350e4cbf9ae 100644
--- a/l10n/de_DE/settings.po
+++ b/l10n/de_DE/settings.po
@@ -4,6 +4,7 @@
 # 
 # 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.
@@ -13,7 +14,7 @@
 # Lukas Reschke <lukas@statuscode.ch>, 2013.
 #   <lukas@statuscode.ch>, 2012.
 #   <mail@felixmoeller.de>, 2012.
-# Marcel Kühlhorn <susefan93@gmx.de>, 2012.
+# Marcel Kühlhorn <susefan93@gmx.de>, 2012-2013.
 #   <nelsonfritsch@gmail.com>, 2012.
 #   <niko@nik-o-mat.de>, 2012.
 # Phi Lieb <>, 2012.
@@ -30,10 +31,10 @@ 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 13:00+0000\n"
-"Last-Translator: robN <robert.neumann01@gmail.com>\n"
-"Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\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"
+"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"
@@ -44,8 +45,8 @@ 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:15
-#: ajax/togglegroups.php:18
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr "Fehler bei der Anmeldung"
 
@@ -93,12 +94,12 @@ msgstr "Ungültige Anfrage"
 msgid "Admins can't remove themself from the admin group"
 msgstr "Administratoren können sich nicht selbst aus der admin-Gruppe löschen"
 
-#: ajax/togglegroups.php:28
+#: ajax/togglegroups.php:30
 #, php-format
 msgid "Unable to add user to group %s"
 msgstr "Der Benutzer konnte nicht zur Gruppe %s hinzugefügt werden"
 
-#: ajax/togglegroups.php:34
+#: ajax/togglegroups.php:36
 #, php-format
 msgid "Unable to remove user from group %s"
 msgstr "Der Benutzer konnte nicht aus der Gruppe %s entfernt werden"
@@ -137,9 +138,9 @@ msgstr "Fehler"
 
 #: js/apps.js:90
 msgid "Updated"
-msgstr "Geupdated"
+msgstr "Aktualisiert"
 
-#: js/personal.js:96
+#: js/personal.js:99
 msgid "Saving..."
 msgstr "Speichern..."
 
@@ -170,11 +171,11 @@ msgstr "Löschen"
 
 #: js/users.js:191
 msgid "add group"
-msgstr "Gruppe konnte nicht hinzugefügt werden"
+msgstr "Gruppe hinzufügen"
 
 #: js/users.js:352
 msgid "A valid username must be provided"
-msgstr ""
+msgstr "Es muss ein gültiger Benutzername angegeben werden"
 
 #: js/users.js:353 js/users.js:359 js/users.js:374
 msgid "Error creating user"
@@ -182,9 +183,9 @@ msgstr "Beim Erstellen des Benutzers ist ein Fehler aufgetreten"
 
 #: js/users.js:358
 msgid "A valid password must be provided"
-msgstr ""
+msgstr "Es muss ein gültiges Passwort angegeben werden"
 
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
 msgid "__language_name__"
 msgstr "Deutsch (Förmlich: Sie)"
 
@@ -203,13 +204,13 @@ msgstr "Ihr Datenverzeichnis und Ihre Dateien sind wahrscheinlich über das Inte
 
 #: templates/admin.php:29
 msgid "Setup Warning"
-msgstr ""
+msgstr "Einrichtungswarnung"
 
 #: 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 "Ihr Web-Server ist wahrscheinlich noch nicht konfiguriert, Datei-Synchronisation zu erlauben, weil die WebDAV-Schnittstelle vermutlich defekt ist."
+msgstr "Ihr Web-Server ist noch nicht konfiguriert noch nicht für Datei-Synchronisation bereit weil die WebDAV-Schnittstelle vermutlich defekt ist."
 
 #: templates/admin.php:33
 #, php-format
@@ -218,31 +219,31 @@ msgstr "Bitte prüfen Sie die <a href='%s'>Instalationsanleitungen</a>."
 
 #: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
-msgstr ""
+msgstr "Das Modul 'fileinfo' fehlt"
 
 #: 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 "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 ""
+msgstr "Lokalisierung funktioniert nicht"
 
-#: templates/admin.php:61
+#: templates/admin.php:63
+#, php-format
 msgid ""
-"This ownCloud server can't set system locale to "
-"\"en_US.UTF-8\"/\"en_US.UTF8\". 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 en_US.UTF-8/en_US.UTF8."
-msgstr ""
+"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."
 
-#: templates/admin.php:72
+#: templates/admin.php:75
 msgid "Internet connection not working"
-msgstr ""
+msgstr "Keine Netzwerkverbindung"
 
-#: templates/admin.php:75
+#: 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 "
@@ -250,100 +251,100 @@ 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 "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."
 
-#: templates/admin.php:89
+#: templates/admin.php:92
 msgid "Cron"
-msgstr ""
+msgstr "Cron"
 
-#: templates/admin.php:98
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr "Führe eine Aufgabe bei jedem Laden der Seite aus"
 
-#: templates/admin.php:108
+#: 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 ist bei einem Webcron-Service registriert. Die cron.php Seite im ownCloud Wurzelverzeichniss wird einmal pro Minute über http abgerufen."
 
-#: templates/admin.php:118
+#: 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 "Nutzen Sie den Cron Systemdienst. Rufen Sie die Datei cron.php im ownCloud Ordner einmal pro Minute über einen Cronjob auf."
 
-#: templates/admin.php:125
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr "Teilen"
 
-#: templates/admin.php:131
+#: templates/admin.php:134
 msgid "Enable Share API"
-msgstr "Teilen-API aktivieren"
+msgstr "Share-API aktivieren"
 
-#: templates/admin.php:132
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
-msgstr "Erlaube es Anwendungen, die Teilen-API zu benutzen"
+msgstr "Erlaube es Anwendungen, die Share-API zu benutzen"
 
-#: templates/admin.php:139
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr "Links erlauben"
 
-#: templates/admin.php:140
+#: 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"
 
-#: templates/admin.php:147
+#: templates/admin.php:150
 msgid "Allow resharing"
-msgstr "Erlaube weiterteilen"
+msgstr "Erlaube weiterverteilen"
 
-#: templates/admin.php:148
+#: templates/admin.php:151
 msgid "Allow users to share items shared with them again"
-msgstr ""
+msgstr "Erlaubt Nutzern mit ihnen geteilte Inhalte erneut zu teilen"
 
-#: templates/admin.php:155
+#: templates/admin.php:158
 msgid "Allow users to share with anyone"
-msgstr ""
+msgstr "Erlaube Nutzern mit jedem zu teilen"
 
-#: templates/admin.php:158
+#: templates/admin.php:161
 msgid "Allow users to only share with users in their groups"
-msgstr ""
+msgstr "Erlaube Nutzern nur mit Nutzern in ihrer Gruppe zu teilen"
 
-#: templates/admin.php:165
+#: templates/admin.php:168
 msgid "Security"
 msgstr "Sicherheit"
 
-#: templates/admin.php:178
+#: templates/admin.php:181
 msgid "Enforce HTTPS"
 msgstr "HTTPS erzwingen"
 
-#: templates/admin.php:179
+#: templates/admin.php:182
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr "Zwingt die Clients, sich über eine verschlüsselte Verbindung mit ownCloud zu verbinden."
 
-#: templates/admin.php:182
+#: templates/admin.php:185
 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."
 
-#: templates/admin.php:192
+#: templates/admin.php:195
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:193
+#: templates/admin.php:196
 msgid "Log level"
 msgstr "Log-Level"
 
-#: templates/admin.php:220
+#: templates/admin.php:223
 msgid "More"
 msgstr "Mehr"
 
-#: templates/admin.php:227 templates/personal.php:98
+#: templates/admin.php:230 templates/personal.php:102
 msgid "Version"
 msgstr "Version"
 
-#: templates/admin.php:230 templates/personal.php:100
+#: templates/admin.php:233 templates/personal.php:105
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -353,51 +354,51 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "Entwickelt von der <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-Community</a>. Der <a href=\"https://github.com/owncloud\" target=\"_blank\">Quellcode</a> ist unter der <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> lizenziert."
 
-#: templates/apps.php:10
+#: templates/apps.php:11
 msgid "Add your App"
 msgstr "Fügen Sie Ihre Anwendung hinzu"
 
-#: templates/apps.php:11
+#: templates/apps.php:12
 msgid "More Apps"
 msgstr "Weitere Anwendungen"
 
-#: templates/apps.php:24
+#: templates/apps.php:28
 msgid "Select an App"
 msgstr "Wählen Sie eine Anwendung aus"
 
-#: templates/apps.php:28
+#: templates/apps.php:34
 msgid "See application page at apps.owncloud.com"
 msgstr "Weitere Anwendungen finden Sie auf apps.owncloud.com"
 
-#: templates/apps.php:29
+#: templates/apps.php:36
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-lizenziert von <span class=\"author\"></span>"
 
-#: templates/apps.php:31
+#: templates/apps.php:38
 msgid "Update"
 msgstr "Update durchführen"
 
-#: templates/help.php:3
+#: templates/help.php:4
 msgid "User Documentation"
 msgstr "Dokumentation für Benutzer"
 
-#: templates/help.php:4
+#: templates/help.php:6
 msgid "Administrator Documentation"
 msgstr "Dokumentation für Administratoren"
 
-#: templates/help.php:6
+#: templates/help.php:9
 msgid "Online Documentation"
 msgstr "Online-Dokumentation"
 
-#: templates/help.php:7
+#: templates/help.php:11
 msgid "Forum"
 msgstr "Forum"
 
-#: templates/help.php:9
+#: templates/help.php:14
 msgid "Bugtracker"
 msgstr "Bugtracker"
 
-#: templates/help.php:11
+#: templates/help.php:17
 msgid "Commercial Support"
 msgstr "Kommerzieller Support"
 
@@ -406,79 +407,79 @@ msgstr "Kommerzieller Support"
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Sie verwenden <strong>%s</strong> der verfügbaren <strong>%s</strong>"
 
-#: templates/personal.php:14
+#: templates/personal.php:15
 msgid "Get the apps to sync your files"
 msgstr "Installieren Sie die Anwendungen um Ihre Dateien zu synchronisieren"
 
-#: templates/personal.php:25
+#: templates/personal.php:26
 msgid "Show First Run Wizard again"
 msgstr "Zeige den Einrichtungsassistenten erneut"
 
-#: templates/personal.php:36 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
 msgid "Password"
 msgstr "Passwort"
 
-#: templates/personal.php:37
+#: templates/personal.php:38
 msgid "Your password was changed"
 msgstr "Ihr Passwort wurde geändert."
 
-#: templates/personal.php:38
+#: templates/personal.php:39
 msgid "Unable to change your password"
 msgstr "Das Passwort konnte nicht geändert werden"
 
-#: templates/personal.php:39
+#: templates/personal.php:40
 msgid "Current password"
 msgstr "Aktuelles Passwort"
 
-#: templates/personal.php:40
+#: templates/personal.php:42
 msgid "New password"
 msgstr "Neues Passwort"
 
-#: templates/personal.php:42
+#: templates/personal.php:44
 msgid "Change password"
 msgstr "Passwort ändern"
 
-#: templates/personal.php:54 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:78
 msgid "Display Name"
 msgstr "Anzeigename"
 
-#: templates/personal.php:55
+#: templates/personal.php:57
 msgid "Your display name was changed"
 msgstr "Ihr Anzeigename wurde geändert"
 
-#: templates/personal.php:56
+#: templates/personal.php:58
 msgid "Unable to change your display name"
 msgstr "Das Ändern Ihres Anzeigenamens ist nicht möglich"
 
-#: templates/personal.php:59
+#: templates/personal.php:61
 msgid "Change display name"
 msgstr "Anzeigenamen ändern"
 
-#: templates/personal.php:68
+#: templates/personal.php:70
 msgid "Email"
 msgstr "E-Mail"
 
-#: templates/personal.php:69
+#: templates/personal.php:72
 msgid "Your email address"
 msgstr "Ihre E-Mail-Adresse"
 
-#: templates/personal.php:70
+#: templates/personal.php:73
 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:76 templates/personal.php:77
+#: templates/personal.php:79 templates/personal.php:80
 msgid "Language"
 msgstr "Sprache"
 
-#: templates/personal.php:82
+#: templates/personal.php:86
 msgid "Help translate"
 msgstr "Helfen Sie bei der Übersetzung"
 
-#: templates/personal.php:87
+#: templates/personal.php:91
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:89
+#: templates/personal.php:93
 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"
 
diff --git a/l10n/de_DE/user_ldap.po b/l10n/de_DE/user_ldap.po
index 18580dda23a717df93a1c3daa7bfd832f6388bff..c3bbb56e7172b660a0a13b807c2472a41fae3ba3 100644
--- a/l10n/de_DE/user_ldap.po
+++ b/l10n/de_DE/user_ldap.po
@@ -10,18 +10,20 @@
 # 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.
 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: stefanniedermann <stefan.niedermann@googlemail.com>\n"
-"Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
+"POT-Creation-Date: 2013-03-06 00:07+0100\n"
+"PO-Revision-Date: 2013-03-05 21:40+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"
 "Content-Transfer-Encoding: 8bit\n"
@@ -32,21 +34,21 @@ msgstr ""
 msgid "Failed to delete the server configuration"
 msgstr "Das Löschen der Server-Konfiguration schlug fehl"
 
-#: ajax/testConfiguration.php:35
+#: ajax/testConfiguration.php:36
 msgid "The configuration is valid and the connection could be established!"
-msgstr "Die Konfiguration ist valide und eine Verbindung konnte hergestellt werden!"
+msgstr "Die Konfiguration ist gültig und die Verbindung konnte hergestellt werden!"
 
-#: ajax/testConfiguration.php:37
+#: ajax/testConfiguration.php:39
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
-msgstr "Die Konfiguration ist valide, aber das Herstellen einer Verbindung schlug fehl. Bitte überprüfen Sie die Server-Einstellungen und Zertifikate."
+msgstr "Die Konfiguration ist gültig, aber das Herstellen der Verbindung schlug fehl. Bitte überprüfen Sie die Server-Einstellungen und Zertifikate."
 
-#: ajax/testConfiguration.php:40
+#: ajax/testConfiguration.php:43
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
-msgstr "Die Konfiguration ist nicht valide. Weitere Details können Sie im ownCloud-Log nachlesen."
+msgstr "Die Konfiguration ist ungültig. Weitere Details können Sie im ownCloud-Log nachlesen."
 
 #: js/settings.js:66
 msgid "Deletion failed"
@@ -54,7 +56,7 @@ msgstr "Löschen fehlgeschlagen"
 
 #: js/settings.js:82
 msgid "Take over settings from recent server configuration?"
-msgstr "Sollen die Einstellungen der letzten Server-Konfiguration übernommen werden?"
+msgstr "Sollen die Einstellungen der letzten Serverkonfiguration übernommen werden?"
 
 #: js/settings.js:83
 msgid "Keep settings?"
@@ -62,19 +64,19 @@ msgstr "Einstellungen behalten?"
 
 #: js/settings.js:97
 msgid "Cannot add server configuration"
-msgstr "Das Hinzufügen der Server-Konfiguration schlug fehl"
+msgstr "Das Hinzufügen der Serverkonfiguration schlug fehl"
 
 #: js/settings.js:121
 msgid "Connection test succeeded"
-msgstr "Verbindungs-Test erfolgreich"
+msgstr "Verbindungstest erfolgreich"
 
 #: js/settings.js:126
 msgid "Connection test failed"
-msgstr "Verbindungs-Test fehlgeschlagen"
+msgstr "Verbindungstest fehlgeschlagen"
 
 #: js/settings.js:136
 msgid "Do you really want to delete the current Server Configuration?"
-msgstr "Möchten Sie wirklich die Server-Konfiguration löschen?"
+msgstr "Möchten Sie die Serverkonfiguration wirklich löschen?"
 
 #: js/settings.js:137
 msgid "Confirm Deletion"
@@ -95,226 +97,250 @@ msgstr "<b>Warnung:</b> Da das PHP-Modul für LDAP ist nicht installiert, das Ba
 
 #: templates/settings.php:15
 msgid "Server configuration"
-msgstr "Server-Konfiguration"
+msgstr "Serverkonfiguration"
 
-#: templates/settings.php:17
+#: templates/settings.php:18
 msgid "Add Server Configuration"
-msgstr "Server-Konfiguration hinzufügen"
+msgstr "Serverkonfiguration hinzufügen"
 
-#: templates/settings.php:21
+#: templates/settings.php:23
 msgid "Host"
 msgstr "Host"
 
-#: templates/settings.php:21
+#: templates/settings.php:25
 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:22
+#: templates/settings.php:26
 msgid "Base DN"
 msgstr "Basis-DN"
 
-#: templates/settings.php:22
+#: templates/settings.php:27
 msgid "One Base DN per line"
 msgstr "Ein Base DN pro Zeile"
 
-#: templates/settings.php:22
+#: templates/settings.php:28
 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:23
+#: templates/settings.php:30
 msgid "User DN"
 msgstr "Benutzer-DN"
 
-#: templates/settings.php:23
+#: templates/settings.php:32
 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."
 
-#: templates/settings.php:24
+#: templates/settings.php:33
 msgid "Password"
 msgstr "Passwort"
 
-#: templates/settings.php:24
+#: templates/settings.php:36
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "Lassen Sie die Felder von DN und Passwort für anonymen Zugang leer."
 
-#: templates/settings.php:25
+#: templates/settings.php:37
 msgid "User Login Filter"
 msgstr "Benutzer-Login-Filter"
 
-#: templates/settings.php:25
+#: templates/settings.php:40
 #, 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."
 
-#: templates/settings.php:25
+#: templates/settings.php:41
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "verwenden Sie %%uid Platzhalter, z. B. \"uid=%%uid\""
 
-#: templates/settings.php:26
+#: templates/settings.php:42
 msgid "User List Filter"
 msgstr "Benutzer-Filter-Liste"
 
-#: templates/settings.php:26
+#: templates/settings.php:45
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Definiert den Filter für die Anfrage der Benutzer."
 
-#: templates/settings.php:26
+#: templates/settings.php:46
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "ohne Platzhalter, z.B.: \"objectClass=person\""
 
-#: templates/settings.php:27
+#: templates/settings.php:47
 msgid "Group Filter"
 msgstr "Gruppen-Filter"
 
-#: templates/settings.php:27
+#: templates/settings.php:50
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Definiert den Filter für die Anfrage der Gruppen."
 
-#: templates/settings.php:27
+#: templates/settings.php:51
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "ohne Platzhalter, z.B.: \"objectClass=posixGroup\""
 
-#: templates/settings.php:31
+#: templates/settings.php:55
 msgid "Connection Settings"
-msgstr "Verbindungs-Einstellungen"
+msgstr "Verbindungseinstellungen"
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "Configuration Active"
 msgstr "Konfiguration aktiv"
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "When unchecked, this configuration will be skipped."
 msgstr "Wenn nicht angehakt, wird diese Konfiguration übersprungen."
 
-#: templates/settings.php:34
+#: templates/settings.php:58
 msgid "Port"
 msgstr "Port"
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid "Backup (Replica) Host"
 msgstr "Back-Up (Replikation) Host"
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
-msgstr "Optionaler Backup Host. Es muss ein Replikat des eigentlichen LDAP/AD Servers sein."
+msgstr "Geben Sie einen optionalen Backup Host an. Es muss ein Replikat des Haupt- LDAP/AD Servers sein."
 
-#: templates/settings.php:36
+#: templates/settings.php:60
 msgid "Backup (Replica) Port"
 msgstr "Back-Up (Replikation) Port"
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "Disable Main Server"
 msgstr "Hauptserver deaktivieren"
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "When switched on, ownCloud will only connect to the replica server."
-msgstr "Wenn eingeschaltet wird sich ownCloud nur mit dem Replilat-Server verbinden."
+msgstr "Wenn eingeschaltet wird sich die ownCloud nur mit dem Replikat-Server verbinden."
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Use TLS"
 msgstr "Nutze TLS"
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Do not use it additionally for LDAPS connections, it will fail."
-msgstr "Benutze es nicht zusätzlich für LDAPS Verbindungen, es wird scheitern."
+msgstr "Benutzen Sie es nicht in Verbindung mit LDAPS Verbindungen, es wird fehlschlagen."
 
-#: templates/settings.php:39
+#: templates/settings.php:63
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "LDAP-Server (Windows: Groß- und Kleinschreibung bleibt unbeachtet)"
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid "Turn off SSL certificate validation."
 msgstr "Schalten Sie die SSL-Zertifikatsprüfung aus."
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 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:40
+#: templates/settings.php:64
 msgid "Not recommended, use for testing only."
 msgstr "Nicht empfohlen, nur zu Testzwecken."
 
-#: templates/settings.php:41
+#: templates/settings.php:65
+msgid "Cache Time-To-Live"
+msgstr "Speichere Time-To-Live zwischen"
+
+#: templates/settings.php:65
 msgid "in seconds. A change empties the cache."
 msgstr "in Sekunden. Eine Änderung leert den Cache."
 
-#: templates/settings.php:43
+#: templates/settings.php:67
 msgid "Directory Settings"
-msgstr "Verzeichnis-Einstellungen"
+msgstr "Verzeichniseinstellungen"
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "User Display Name Field"
 msgstr "Feld für den Anzeigenamen des Benutzers"
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 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:46
+#: templates/settings.php:70
 msgid "Base User Tree"
 msgstr "Basis-Benutzerbaum"
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "One User Base DN per line"
 msgstr "Ein Benutzer Base DN pro Zeile"
 
-#: templates/settings.php:47
+#: templates/settings.php:71
 msgid "User Search Attributes"
 msgstr "Benutzer-Suche Eigenschaften"
 
-#: templates/settings.php:47 templates/settings.php:50
+#: templates/settings.php:71 templates/settings.php:74
 msgid "Optional; one attribute per line"
-msgstr "Optional; Ein Attribut pro Zeile"
+msgstr "Optional; ein Attribut pro Zeile"
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "Group Display Name Field"
 msgstr "Feld für den Anzeigenamen der Gruppe"
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 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:49
+#: templates/settings.php:73
 msgid "Base Group Tree"
 msgstr "Basis-Gruppenbaum"
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "One Group Base DN per line"
 msgstr "Ein Gruppen Base DN pro Zeile"
 
-#: templates/settings.php:50
+#: templates/settings.php:74
 msgid "Group Search Attributes"
 msgstr "Gruppen-Suche Eigenschaften"
 
-#: templates/settings.php:51
+#: templates/settings.php:75
 msgid "Group-Member association"
 msgstr "Assoziation zwischen Gruppe und Benutzer"
 
-#: templates/settings.php:53
+#: templates/settings.php:77
 msgid "Special Attributes"
-msgstr "besondere Eigenschaften"
+msgstr "Besondere Eigenschaften"
+
+#: templates/settings.php:79
+msgid "Quota Field"
+msgstr "Kontingent Feld"
 
-#: templates/settings.php:56
+#: templates/settings.php:80
+msgid "Quota Default"
+msgstr "Kontingent Standard"
+
+#: templates/settings.php:80
 msgid "in bytes"
 msgstr "in Bytes"
 
-#: templates/settings.php:58
+#: templates/settings.php:81
+msgid "Email Field"
+msgstr "E-Mail Feld"
+
+#: templates/settings.php:82
+msgid "User Home Folder Naming Rule"
+msgstr "Benennungsregel für das Heimatverzeichnis des Benutzers"
+
+#: templates/settings.php:82
 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:62
+#: templates/settings.php:86
+msgid "Test Configuration"
+msgstr "Testkonfiguration"
+
+#: templates/settings.php:86
 msgid "Help"
 msgstr "Hilfe"
diff --git a/l10n/de_DE/user_webdavauth.po b/l10n/de_DE/user_webdavauth.po
index 2d01d1e91e15c6ebeb00418eb1bbdc399297f748..d9d63ec77e59d1bb84286bbcab9587b39a1a9231 100644
--- a/l10n/de_DE/user_webdavauth.po
+++ b/l10n/de_DE/user_webdavauth.po
@@ -4,16 +4,17 @@
 # 
 # Translators:
 #   <a.tangemann@web.de>, 2012-2013.
+# Marcel Kühlhorn <susefan93@gmx.de>, 2013.
 #   <multimill@gmail.com>, 2012.
 #   <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-01-16 00:19+0100\n"
-"PO-Revision-Date: 2013-01-15 22:23+0000\n"
-"Last-Translator: a.tangemann <a.tangemann@web.de>\n"
-"Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\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"
+"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,9 +29,9 @@ msgstr "WebDAV Authentifizierung"
 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 "ownCloud sendet die Benutzerdaten an diese URL. Dieses Plugin prüft die Antwort und wird die Statuscodes 401 und 403 als ungültige Daten interpretieren und alle anderen Antworten als gültige Daten."
+msgstr "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/l10n/el/core.po b/l10n/el/core.po
index 7752a3076e03ce82669ba8a9770c577a9d8dc123..b3849cc5963f133650a42ccd9ee3cd9cfe03934e 100644
--- a/l10n/el/core.po
+++ b/l10n/el/core.po
@@ -6,6 +6,7 @@
 # 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.
@@ -15,9 +16,9 @@ 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 14:32+0000\n"
-"Last-Translator: Dimitris M. <monopatis@gmail.com>\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"
 "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"
@@ -261,7 +262,7 @@ msgstr "Το απαιτούμενο αρχείο {file} δεν εγκαταστ
 
 #: js/share.js:29 js/share.js:43 js/share.js:90
 msgid "Shared"
-msgstr ""
+msgstr "Κοινόχρηστα"
 
 #: js/share.js:93
 msgid "Share"
@@ -388,13 +389,13 @@ msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
 "href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
 "community</a>."
-msgstr ""
+msgstr "Η ενημέρωση ήταν ανεπιτυχής. Παρακαλώ στείλτε αναφορά στην <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:47
+#: lostpassword/controller.php:48
 msgid "ownCloud password reset"
 msgstr "Επαναφορά συνθηματικού ownCloud"
 
@@ -495,14 +496,14 @@ msgstr "Χωρίς το πρόσθετο δημιουργίας τυχαίων 
 msgid ""
 "Your data directory and files are probably accessible from the internet "
 "because the .htaccess file does not work."
-msgstr ""
+msgstr "Ο κατάλογος δεδομένων και τα αρχεία σας είναι πιθανό προσβάσιμα από το internet γιατί δεν δουλεύει το αρχείο .htaccess."
 
 #: templates/installation.php:32
 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
 msgid "Create an <strong>admin account</strong>"
@@ -585,7 +586,7 @@ msgstr "Είσοδος"
 
 #: templates/login.php:49
 msgid "Alternative Logins"
-msgstr ""
+msgstr "Εναλλακτικές Συνδέσεις"
 
 #: templates/part.pagenavi.php:3
 msgid "prev"
diff --git a/l10n/el/files.po b/l10n/el/files.po
index 3f60220fd589e7b1e1b5d74c3efd79760a15d783..106ab0381c6ff190e6bb220651451dec4d56fc34 100644
--- a/l10n/el/files.po
+++ b/l10n/el/files.po
@@ -15,8 +15,8 @@ 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 23:05+0000\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: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
@@ -58,27 +58,27 @@ msgid ""
 "the HTML form"
 msgstr "Το αρχείο υπερβαίνει την οδηγία μέγιστου επιτρεπτού μεγέθους \"MAX_FILE_SIZE\" που έχει οριστεί στην HTML φόρμα"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
 msgstr "Το αρχείο εστάλει μόνο εν μέρει"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:31
 msgid "No file was uploaded"
 msgstr "Κανένα αρχείο δεν στάλθηκε"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:32
 msgid "Missing a temporary folder"
 msgstr "Λείπει ο προσωρινός φάκελος"
 
-#: ajax/upload.php:34
+#: ajax/upload.php:33
 msgid "Failed to write to disk"
 msgstr "Αποτυχία εγγραφής στο δίσκο"
 
-#: ajax/upload.php:52
+#: ajax/upload.php:51
 msgid "Not enough storage available"
 msgstr "Μη επαρκής διαθέσιμος αποθηκευτικός χώρος"
 
-#: ajax/upload.php:83
+#: ajax/upload.php:82
 msgid "Invalid directory."
 msgstr "Μη έγκυρος φάκελος."
 
@@ -90,7 +90,7 @@ msgstr "Αρχεία"
 msgid "Delete permanently"
 msgstr "Μόνιμη διαγραφή"
 
-#: js/fileactions.js:127 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:127 templates/index.php:92 templates/index.php:93
 msgid "Delete"
 msgstr "Διαγραφή"
 
@@ -98,40 +98,36 @@ msgstr "Διαγραφή"
 msgid "Rename"
 msgstr "Μετονομασία"
 
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
 msgid "Pending"
 msgstr "Εκκρεμεί"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "{new_name} already exists"
 msgstr "{new_name} υπάρχει ήδη"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "replace"
 msgstr "αντικατέστησε"
 
-#: js/filelist.js:253
+#: js/filelist.js:251
 msgid "suggest name"
 msgstr "συνιστώμενο όνομα"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "cancel"
 msgstr "ακύρωση"
 
-#: js/filelist.js:295
-msgid "replaced {new_name}"
-msgstr "{new_name} αντικαταστάθηκε"
+#: js/filelist.js:298
+msgid "replaced {new_name} with {old_name}"
+msgstr "αντικαταστάθηκε το {new_name} με {old_name}"
 
-#: js/filelist.js:295 js/filelist.js:297
+#: js/filelist.js:298
 msgid "undo"
 msgstr "αναίρεση"
 
-#: js/filelist.js:297
-msgid "replaced {new_name} with {old_name}"
-msgstr "αντικαταστάθηκε το {new_name} με {old_name}"
-
-#: js/filelist.js:322
+#: js/filelist.js:323
 msgid "perform delete operation"
 msgstr "εκτέλεση διαδικασία διαγραφής"
 
@@ -157,74 +153,74 @@ msgstr "Ο αποθηκευτικός σας χώρος είναι γεμάτο
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Ο αποθηκευτικός χώρος είναι σχεδόν γεμάτος ({usedSpacePercent}%)"
 
-#: js/files.js:224
+#: js/files.js:225
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Η λήψη προετοιμάζεται. Αυτό μπορεί να πάρει ώρα εάν τα αρχεία έχουν μεγάλο μέγεθος."
 
-#: js/files.js:261
+#: js/files.js:262
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Αδυναμία στην αποστολή του αρχείου σας αφού είναι φάκελος ή έχει 0 bytes"
 
-#: js/files.js:261
+#: js/files.js:262
 msgid "Upload Error"
 msgstr "Σφάλμα Αποστολής"
 
-#: js/files.js:272
+#: js/files.js:273
 msgid "Close"
 msgstr "Κλείσιμο"
 
-#: js/files.js:311
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr "1 αρχείο ανεβαίνει"
 
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr "{count} αρχεία ανεβαίνουν"
 
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "Η αποστολή ακυρώθηκε."
 
-#: js/files.js:496
+#: js/files.js:497
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Η αποστολή του αρχείου βρίσκεται σε εξέλιξη. Το κλείσιμο της σελίδας θα ακυρώσει την αποστολή."
 
-#: js/files.js:569
+#: js/files.js:570
 msgid "URL cannot be empty."
 msgstr "Η URL δεν πρέπει να είναι κενή."
 
-#: js/files.js:574
+#: js/files.js:575
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Μη έγκυρο όνομα φακέλου. Η χρήση του 'Κοινόχρηστος' χρησιμοποιείται από ο Owncloud"
 
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:953 templates/index.php:68
 msgid "Name"
 msgstr "Όνομα"
 
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:954 templates/index.php:79
 msgid "Size"
 msgstr "Μέγεθος"
 
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:955 templates/index.php:81
 msgid "Modified"
 msgstr "Τροποποιήθηκε"
 
-#: js/files.js:969
+#: js/files.js:974
 msgid "1 folder"
 msgstr "1 φάκελος"
 
-#: js/files.js:971
+#: js/files.js:976
 msgid "{count} folders"
 msgstr "{count} φάκελοι"
 
-#: js/files.js:979
+#: js/files.js:984
 msgid "1 file"
 msgstr "1 αρχείο"
 
-#: js/files.js:981
+#: js/files.js:986
 msgid "{count} files"
 msgstr "{count} αρχεία"
 
@@ -282,39 +278,43 @@ msgstr "Από σύνδεσμο"
 
 #: templates/index.php:40
 msgid "Deleted files"
-msgstr ""
+msgstr "Διαγραμμένα αρχεία"
 
 #: templates/index.php:46
 msgid "Cancel upload"
 msgstr "Ακύρωση αποστολής"
 
-#: templates/index.php:59
+#: templates/index.php:53
+msgid "You don’t have write permissions here."
+msgstr ""
+
+#: templates/index.php:60
 msgid "Nothing in here. Upload something!"
-msgstr "Δεν υπάρχει τίποτα εδώ. Ανέβασε κάτι!"
+msgstr "Δεν υπάρχει τίποτα εδώ. Μεταφορτώστε κάτι!"
 
-#: templates/index.php:73
+#: templates/index.php:74
 msgid "Download"
 msgstr "Λήψη"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:86 templates/index.php:87
 msgid "Unshare"
 msgstr "Διακοπή κοινής χρήσης"
 
-#: templates/index.php:105
+#: templates/index.php:106
 msgid "Upload too large"
 msgstr "Πολύ μεγάλο αρχείο προς αποστολή"
 
-#: templates/index.php:107
+#: templates/index.php:108
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Τα αρχεία που προσπαθείτε να ανεβάσετε υπερβαίνουν το μέγιστο μέγεθος αποστολής αρχείων σε αυτόν τον διακομιστή."
 
-#: templates/index.php:112
+#: templates/index.php:113
 msgid "Files are being scanned, please wait."
 msgstr "Τα αρχεία σαρώνονται, παρακαλώ περιμένετε"
 
-#: templates/index.php:115
+#: templates/index.php:116
 msgid "Current scanning"
 msgstr "Τρέχουσα αναζήτηση "
 
diff --git a/l10n/el/files_external.po b/l10n/el/files_external.po
index f72135ae53ad26279f9db284b493b6118457889a..8eeb9b108c7d7a3e12f009bbc79a1af8ff408813 100644
--- a/l10n/el/files_external.po
+++ b/l10n/el/files_external.po
@@ -13,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-22 00:24+0100\n"
-"PO-Revision-Date: 2012-12-21 13:41+0000\n"
-"Last-Translator: Efstathios Iosifidis <diamond_gr@freemail.gr>\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"
 "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"
@@ -23,37 +23,33 @@ msgstr ""
 "Language: el\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 "Σφάλμα ρυθμίζωντας αποθήκευση Dropbox "
 
-#: 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 "Παρακαλούμε δώστε έγκυρο κλειδί Dropbox και μυστικό."
 
-#: 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 "Σφάλμα ρυθμίζωντας αποθήκευση Google Drive "
 
-#: lib/config.php:434
+#: lib/config.php:421
 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:435
+#: lib/config.php:424
 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 "
@@ -64,63 +60,63 @@ msgstr "<b>Προσοχή:</b> Η υποστήριξη FTP στην PHP δεν 
 msgid "External Storage"
 msgstr "Εξωτερικό Αποθηκευτικό Μέσο"
 
-#: templates/settings.php:8 templates/settings.php:22
-msgid "Mount point"
-msgstr "Σημείο προσάρτησης"
-
-#: templates/settings.php:9
-msgid "Backend"
-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: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"
-msgstr "Προσθήκη σημείου προσάρτησης"
+#: 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 "Χρήστες"
 
-#: templates/settings.php:108 templates/settings.php:109
-#: templates/settings.php:144 templates/settings.php:145
+#: templates/settings.php:113 templates/settings.php:114
+#: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
 msgstr "Διαγραφή"
 
-#: 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:136
+#: templates/settings.php:141
 msgid "SSL root certificates"
 msgstr "Πιστοποιητικά SSL root"
 
-#: templates/settings.php:153
+#: templates/settings.php:159
 msgid "Import Root Certificate"
 msgstr "Εισαγωγή Πιστοποιητικού Root"
diff --git a/l10n/el/files_trashbin.po b/l10n/el/files_trashbin.po
index e8ac463bd2b23a3dc88f3da448767a64855dcf02..e47d9c1615725a1c3dad10770a34e0fac91cc3ae 100644
--- a/l10n/el/files_trashbin.po
+++ b/l10n/el/files_trashbin.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-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 10:07+0000\n"
-"Last-Translator: Dimitris M. <monopatis@gmail.com>\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: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:22
+#: ajax/delete.php:40
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "Αδύνατη η μόνιμη διαγραφή του %s"
@@ -28,35 +28,39 @@ msgstr "Αδύνατη η μόνιμη διαγραφή του %s"
 msgid "Couldn't restore %s"
 msgstr "Αδυναμία επαναφοράς %s"
 
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
 msgid "perform restore operation"
 msgstr "εκτέλεση λειτουργία επαναφοράς"
 
-#: js/trash.js:33
+#: js/trash.js:34
 msgid "delete file permanently"
 msgstr "μόνιμη διαγραφή αρχείου"
 
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr "Μόνιμη διαγραφή"
+
+#: js/trash.js:174 templates/index.php:17
 msgid "Name"
 msgstr "Όνομα"
 
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:175 templates/index.php:27
 msgid "Deleted"
 msgstr "Διαγράφηκε"
 
-#: js/trash.js:135
+#: js/trash.js:184
 msgid "1 folder"
 msgstr "1 φάκελος"
 
-#: js/trash.js:137
+#: js/trash.js:186
 msgid "{count} folders"
 msgstr "{count} φάκελοι"
 
-#: js/trash.js:145
+#: js/trash.js:194
 msgid "1 file"
 msgstr "1 αρχείο"
 
-#: js/trash.js:147
+#: js/trash.js:196
 msgid "{count} files"
 msgstr "{count} αρχεία"
 
@@ -67,3 +71,11 @@ 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/el/files_versions.po b/l10n/el/files_versions.po
index 0f2316b7ab764b41106c06c2774e605fa50dc9e6..bd9ae0b92a4f3e539b1864c84dd83b9ee1fab193 100644
--- a/l10n/el/files_versions.po
+++ b/l10n/el/files_versions.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-10 00:08+0100\n"
-"PO-Revision-Date: 2013-02-09 14:20+0000\n"
-"Last-Translator: Dimitris M. <monopatis@gmail.com>\n"
+"POT-Creation-Date: 2013-02-28 00:04+0100\n"
+"PO-Revision-Date: 2013-02-27 23:04+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -51,18 +51,10 @@ msgstr "Μη διαθέσιμες παλιές εκδόσεις"
 msgid "No path specified"
 msgstr "Δεν καθορίστηκε διαδρομή"
 
-#: js/versions.js:16
-msgid "History"
-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 "Επαναφορά ενός αρχείου σε προηγούμενη έκδοση πατώντας στο κουμπί επαναφοράς"
-
-#: templates/settings.php:3
-msgid "Files Versioning"
-msgstr "Εκδόσεις Αρχείων"
-
-#: templates/settings.php:4
-msgid "Enable"
-msgstr "Ενεργοποίηση"
diff --git a/l10n/el/lib.po b/l10n/el/lib.po
index 9d54c6a083be65a4d7227fe24d3b32a44aa4f374..c7a31d5a585ab51272f8f9ce00e6429189e1117c 100644
--- a/l10n/el/lib.po
+++ b/l10n/el/lib.po
@@ -3,14 +3,16 @@
 # 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-11 15:39+0100\n"
-"PO-Revision-Date: 2013-02-11 14:41+0000\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: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
@@ -19,27 +21,27 @@ msgstr ""
 "Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:339
+#: app.php:349
 msgid "Help"
 msgstr "Βοήθεια"
 
-#: app.php:346
+#: app.php:362
 msgid "Personal"
 msgstr "Προσωπικά"
 
-#: app.php:351
+#: app.php:373
 msgid "Settings"
 msgstr "Ρυθμίσεις"
 
-#: app.php:356
+#: app.php:385
 msgid "Users"
 msgstr "Χρήστες"
 
-#: app.php:363
+#: app.php:398
 msgid "Apps"
 msgstr "Εφαρμογές"
 
-#: app.php:365
+#: app.php:406
 msgid "Admin"
 msgstr "Διαχειριστής"
 
@@ -51,15 +53,15 @@ msgstr "Η λήψη ZIP απενεργοποιήθηκε."
 msgid "Files need to be downloaded one by one."
 msgstr "Τα αρχεία πρέπει να ληφθούν ένα-ένα."
 
-#: files.php:203 files.php:228
+#: files.php:204 files.php:231
 msgid "Back to Files"
 msgstr "Πίσω στα Αρχεία"
 
-#: files.php:227
+#: files.php:228
 msgid "Selected files too large to generate zip file."
 msgstr "Τα επιλεγμένα αρχεία είναι μεγάλα ώστε να δημιουργηθεί αρχείο zip."
 
-#: helper.php:226
+#: helper.php:228
 msgid "couldn't be determined"
 msgstr "δεν μπορούσε να προσδιορισθεί"
 
@@ -89,100 +91,105 @@ msgstr "Εικόνες"
 
 #: setup.php:34
 msgid "Set an admin username."
-msgstr ""
+msgstr "Εισάγετε όνομα χρήστη διαχειριστή."
 
 #: setup.php:37
 msgid "Set an admin password."
-msgstr ""
+msgstr "Εισάγετε συνθηματικό διαχειριστή."
 
 #: setup.php:40
 msgid "Specify a data folder."
-msgstr ""
+msgstr "Καθορίστε τον φάκελο δεδομένων."
 
-#: setup.php:53
+#: setup.php:55
 #, php-format
 msgid "%s enter the database username."
-msgstr ""
+msgstr "%s εισάγετε το όνομα χρήστη της βάσης δεδομένων."
 
-#: setup.php:56
+#: setup.php:58
 #, php-format
 msgid "%s enter the database name."
-msgstr ""
+msgstr "%s εισάγετε το όνομα της βάσης δεδομένων."
 
-#: setup.php:59
+#: setup.php:61
 #, php-format
 msgid "%s you may not use dots in the database name"
-msgstr ""
+msgstr "%s μάλλον δεν χρησιμοποιείτε τελείες στο όνομα της βάσης δεδομένων"
 
-#: setup.php:62
+#: setup.php:64
 #, php-format
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:126 setup.php:291 setup.php:336
+#: setup.php:128 setup.php:320 setup.php:365
 msgid "PostgreSQL username and/or password not valid"
-msgstr ""
+msgstr "Μη έγκυρος χρήστης και/ή συνθηματικό της PostgreSQL"
 
-#: setup.php:127 setup.php:150 setup.php:204
+#: setup.php:129 setup.php:152 setup.php:229
 msgid "You need to enter either an existing account or the administrator."
-msgstr ""
+msgstr "Χρειάζεται να εισάγετε είτε έναν υπάρχον λογαριασμό ή του διαχειριστή."
 
-#: setup.php:149 setup.php:423 setup.php:489
+#: setup.php:151 setup.php:453 setup.php:520
 msgid "Oracle username and/or password not valid"
-msgstr ""
+msgstr "Μη έγκυρος χρήστης και/ή συνθηματικό της Oracle"
 
-#: setup.php:203
+#: setup.php:228
 msgid "MySQL username and/or password not valid"
-msgstr ""
+msgstr "Μη έγκυρος χρήστης και/ή συνθηματικό της MySQL"
 
-#: setup.php:255 setup.php:357 setup.php:366 setup.php:384 setup.php:394
-#: setup.php:403 setup.php:430 setup.php:496 setup.php:522 setup.php:529
-#: setup.php:540 setup.php:547 setup.php:556 setup.php:564 setup.php:573
-#: setup.php:579
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
-msgstr ""
+msgstr "Σφάλμα Βάσης Δεδομένων: \"%s\""
 
-#: setup.php:256 setup.php:358 setup.php:367 setup.php:385 setup.php:395
-#: setup.php:404 setup.php:431 setup.php:497 setup.php:523 setup.php:530
-#: setup.php:541 setup.php:557 setup.php:565 setup.php:574
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:270
+#: setup.php:299
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
-msgstr ""
+msgstr "Υπάρχει ήδη ο χρήστης '%s'@'localhost' της MySQL."
 
-#: setup.php:271
+#: setup.php:300
 msgid "Drop this user from MySQL"
-msgstr ""
+msgstr "Απόρριψη αυτού του χρήστη από την MySQL"
 
-#: setup.php:276
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
-msgstr ""
+msgstr "Ο χρήστης '%s'@'%%' της MySQL υπάρχει ήδη"
 
-#: setup.php:277
+#: setup.php:306
 msgid "Drop this user from MySQL."
-msgstr ""
+msgstr "Απόρριψη αυτού του χρήστη από την MySQL"
 
-#: setup.php:548 setup.php:580
+#: setup.php:579 setup.php:611
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:644
+#: setup.php:631
+#, php-format
+msgid "MS SQL username and/or password not valid: %s"
+msgstr ""
+
+#: setup.php:849
 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:645
+#: setup.php:850
 #, 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"
@@ -236,16 +243,16 @@ msgstr "τον προηγούμενο χρόνο"
 msgid "years ago"
 msgstr "χρόνια πριν"
 
-#: updater.php:75
+#: updater.php:78
 #, php-format
 msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr "%s είναι διαθέσιμα. Δείτε <a href=\"%s\">περισσότερες πληροφορίες</a>"
+msgstr "%s είναι διαθέσιμο. Δείτε <a href=\"%s\">περισσότερες πληροφορίες</a>"
 
-#: updater.php:77
+#: updater.php:81
 msgid "up to date"
 msgstr "ενημερωμένο"
 
-#: updater.php:80
+#: updater.php:84
 msgid "updates check is disabled"
 msgstr "ο έλεγχος ενημερώσεων είναι απενεργοποιημένος"
 
diff --git a/l10n/el/settings.po b/l10n/el/settings.po
index 525b3614e7a2edfaa94df42f64d9109056ed1085..57cd5917caf6d19c39f9a56bade153365ce6d198 100644
--- a/l10n/el/settings.po
+++ b/l10n/el/settings.po
@@ -3,8 +3,9 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Dimitris M. <monopatis@gmail.com>, 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.
 # <icewind1991@gmail.com>, 2012.
 #   <icewind1991@gmail.com>, 2012.
@@ -19,8 +20,8 @@ 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:05+0000\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: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
@@ -33,14 +34,14 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "Σφάλμα στην φόρτωση της λίστας από το App Store"
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:15
-#: ajax/togglegroups.php:18
+#: ajax/changedisplayname.php:23 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"
-msgstr ""
+msgstr "Δεν είναι δυνατή η αλλαγή του ονόματος εμφάνισης"
 
 #: ajax/creategroup.php:10
 msgid "Group already exists"
@@ -82,23 +83,23 @@ 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 "Αδυναμία προσθήκη χρήστη στην ομάδα %s"
 
-#: ajax/togglegroups.php:34
+#: 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 ""
+msgstr "Αδυναμία ενημέρωσης εφαρμογής"
 
 #: js/apps.js:30
 msgid "Update to {appversion}"
-msgstr ""
+msgstr "Ενημέρωση σε {appversion}"
 
 #: js/apps.js:36 js/apps.js:76
 msgid "Disable"
@@ -110,15 +111,15 @@ msgstr "Ενεργοποίηση"
 
 #: js/apps.js:55
 msgid "Please wait...."
-msgstr ""
+msgstr "Παρακαλώ περιμένετε..."
 
 #: js/apps.js:84
 msgid "Updating...."
-msgstr ""
+msgstr "Ενημέρωση..."
 
 #: js/apps.js:87
 msgid "Error while updating app"
-msgstr ""
+msgstr "Σφάλμα κατά την ενημέρωση της εφαρμογής"
 
 #: js/apps.js:87
 msgid "Error"
@@ -126,9 +127,9 @@ msgstr "Σφάλμα"
 
 #: js/apps.js:90
 msgid "Updated"
-msgstr ""
+msgstr "Ενημερώθηκε"
 
-#: js/personal.js:96
+#: js/personal.js:99
 msgid "Saving..."
 msgstr "Αποθήκευση..."
 
@@ -142,7 +143,7 @@ msgstr "αναίρεση"
 
 #: js/users.js:62
 msgid "Unable to remove user"
-msgstr ""
+msgstr "Αδυναμία αφαίρεση χρήστη"
 
 #: js/users.js:75 templates/users.php:26 templates/users.php:80
 #: templates/users.php:105
@@ -157,23 +158,23 @@ msgstr "Ομάδα Διαχειριστών"
 msgid "Delete"
 msgstr "Διαγραφή"
 
-#: js/users.js:190
+#: js/users.js:191
 msgid "add group"
-msgstr ""
+msgstr "προσθήκη ομάδας"
 
-#: js/users.js:351
+#: js/users.js:352
 msgid "A valid username must be provided"
-msgstr ""
+msgstr "Πρέπει να δοθεί έγκυρο όνομα χρήστη"
 
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
 msgid "Error creating user"
-msgstr ""
+msgstr "Σφάλμα δημιουργίας χρήστη"
 
-#: js/users.js:357
+#: js/users.js:358
 msgid "A valid password must be provided"
-msgstr ""
+msgstr "Πρέπει να δοθεί έγκυρο συνθηματικό"
 
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
 msgid "__language_name__"
 msgstr "__όνομα_γλώσσας__"
 
@@ -192,18 +193,18 @@ msgstr "Ο κατάλογος data και τα αρχεία σας πιθανό
 
 #: 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"
@@ -217,21 +218,21 @@ msgstr ""
 
 #: templates/admin.php:58
 msgid "Locale not working"
-msgstr ""
+msgstr "Η μετάφραση δεν δουλεύει"
 
-#: templates/admin.php:61
+#: templates/admin.php:63
+#, php-format
 msgid ""
-"This ownCloud server can't set system locale to "
-"\"en_US.UTF-8\"/\"en_US.UTF8\". 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 en_US.UTF-8/en_US.UTF8."
+"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:72
+#: templates/admin.php:75
 msgid "Internet connection not working"
-msgstr ""
+msgstr "Η σύνδεση στο διαδίκτυο δεν δουλεύει"
 
-#: templates/admin.php:75
+#: 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 "
@@ -241,98 +242,98 @@ msgid ""
 " of ownCloud."
 msgstr ""
 
-#: templates/admin.php:89
+#: templates/admin.php:92
 msgid "Cron"
-msgstr ""
+msgstr "Cron"
 
-#: templates/admin.php:98
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
-msgstr ""
+msgstr "Εκτέλεση μιας διεργασίας με κάθε σελίδα που φορτώνεται"
 
-#: templates/admin.php:108
+#: 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:118
+#: 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:125
+#: templates/admin.php:128
 msgid "Sharing"
-msgstr ""
+msgstr "Διαμοιρασμός"
 
-#: templates/admin.php:131
+#: templates/admin.php:134
 msgid "Enable Share API"
-msgstr ""
+msgstr "Ενεργοποίηση API Διαμοιρασμού"
 
-#: templates/admin.php:132
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
-msgstr ""
+msgstr "Να επιτρέπεται στις εφαρμογές να χρησιμοποιούν το API Διαμοιρασμού"
 
-#: templates/admin.php:139
+#: templates/admin.php:142
 msgid "Allow links"
-msgstr ""
+msgstr "Να επιτρέπονται σύνδεσμοι"
 
-#: templates/admin.php:140
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
-msgstr ""
+msgstr "Να επιτρέπεται στους χρήστες να διαμοιράζουν δημόσια με συνδέσμους"
 
-#: templates/admin.php:147
+#: templates/admin.php:150
 msgid "Allow resharing"
-msgstr ""
+msgstr "Να επιτρέπεται ο επαναδιαμοιρασμός"
 
-#: templates/admin.php:148
+#: templates/admin.php:151
 msgid "Allow users to share items shared with them again"
-msgstr ""
+msgstr "Να επιτρέπεται στους χρήστες να διαμοιράζουν ότι τους έχει διαμοιραστεί"
 
-#: templates/admin.php:155
+#: templates/admin.php:158
 msgid "Allow users to share with anyone"
-msgstr ""
+msgstr "Να επιτρέπεται ο διαμοιρασμός με οποιονδήποτε"
 
-#: templates/admin.php:158
+#: templates/admin.php:161
 msgid "Allow users to only share with users in their groups"
-msgstr ""
+msgstr "Να επιτρέπεται στους χρήστες ο διαμοιρασμός μόνο με χρήστες της ίδιας ομάδας"
 
-#: templates/admin.php:165
+#: templates/admin.php:168
 msgid "Security"
-msgstr ""
+msgstr "Ασφάλεια"
 
-#: templates/admin.php:178
+#: templates/admin.php:181
 msgid "Enforce HTTPS"
-msgstr ""
+msgstr "Επιβολή χρήσης HTTPS"
 
-#: templates/admin.php:179
+#: templates/admin.php:182
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
-msgstr ""
+msgstr "Επιβολή στους πελάτες να συνδεθούν στο ownCloud μέσω μιας κρυπτογραφημένης σύνδεσης."
 
-#: templates/admin.php:182
+#: templates/admin.php:185
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr ""
 
-#: templates/admin.php:192
+#: templates/admin.php:195
 msgid "Log"
-msgstr ""
+msgstr "Καταγραφές"
 
-#: templates/admin.php:193
+#: templates/admin.php:196
 msgid "Log level"
-msgstr ""
+msgstr "Επίπεδο καταγραφής"
 
-#: templates/admin.php:220
+#: templates/admin.php:223
 msgid "More"
 msgstr "Περισσότερα"
 
-#: templates/admin.php:227 templates/personal.php:98
+#: templates/admin.php:230 templates/personal.php:102
 msgid "Version"
 msgstr "Έκδοση"
 
-#: templates/admin.php:230 templates/personal.php:100
+#: templates/admin.php:233 templates/personal.php:105
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -342,51 +343,51 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "Αναπτύχθηκε από την <a href=\"http://ownCloud.org/contact\" target=\"_blank\">κοινότητα ownCloud</a>, ο <a href=\"https://github.com/owncloud\" target=\"_blank\">πηγαίος κώδικας</a> είναι υπό άδεια χρήσης <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
-#: templates/apps.php:10
+#: templates/apps.php:11
 msgid "Add your App"
 msgstr "Πρόσθεστε τη Δικιά σας Εφαρμογή"
 
-#: templates/apps.php:11
+#: templates/apps.php:12
 msgid "More Apps"
 msgstr "Περισσότερες Εφαρμογές"
 
-#: templates/apps.php:24
+#: templates/apps.php:28
 msgid "Select an App"
 msgstr "Επιλέξτε μια Εφαρμογή"
 
-#: templates/apps.php:28
+#: templates/apps.php:34
 msgid "See application page at apps.owncloud.com"
 msgstr "Δείτε την σελίδα εφαρμογών στο apps.owncloud.com"
 
-#: templates/apps.php:29
+#: templates/apps.php:36
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-άδεια από <span class=\"author\"></span>"
 
-#: templates/apps.php:31
+#: templates/apps.php:38
 msgid "Update"
 msgstr "Ενημέρωση"
 
-#: templates/help.php:3
+#: 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 "Bugtracker"
 
-#: templates/help.php:11
+#: templates/help.php:17
 msgid "Commercial Support"
 msgstr "Εμπορική Υποστήριξη"
 
@@ -395,85 +396,85 @@ msgstr "Εμπορική Υποστήριξη"
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Χρησιμοποιήσατε <strong>%s</strong> από διαθέσιμα <strong>%s</strong>"
 
-#: templates/personal.php:14
+#: templates/personal.php:15
 msgid "Get the apps to sync your files"
-msgstr ""
+msgstr "Λήψη της εφαρμογής για συγχρονισμό των αρχείων σας"
 
-#: templates/personal.php:25
+#: templates/personal.php:26
 msgid "Show First Run Wizard again"
 msgstr "Προβολή Πρώτης Εκτέλεσης Οδηγού πάλι"
 
-#: templates/personal.php:36 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
 msgid "Password"
 msgstr "Συνθηματικό"
 
-#: templates/personal.php:37
+#: templates/personal.php:38
 msgid "Your password was changed"
 msgstr "Το συνθηματικό σας έχει αλλάξει"
 
-#: templates/personal.php:38
+#: templates/personal.php:39
 msgid "Unable to change your password"
 msgstr "Δεν ήταν δυνατή η αλλαγή του κωδικού πρόσβασης"
 
-#: templates/personal.php:39
+#: templates/personal.php:40
 msgid "Current password"
 msgstr "Τρέχων συνθηματικό"
 
-#: templates/personal.php:40
+#: templates/personal.php:42
 msgid "New password"
 msgstr "Νέο συνθηματικό"
 
-#: templates/personal.php:42
+#: templates/personal.php:44
 msgid "Change password"
 msgstr "Αλλαγή συνθηματικού"
 
-#: templates/personal.php:54 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:78
 msgid "Display Name"
-msgstr ""
+msgstr "Όνομα εμφάνισης"
 
-#: templates/personal.php:55
+#: templates/personal.php:57
 msgid "Your display name was changed"
-msgstr ""
+msgstr "Το όνομα εμφάνισής σας άλλαξε"
 
-#: templates/personal.php:56
+#: templates/personal.php:58
 msgid "Unable to change your display name"
-msgstr ""
+msgstr "Δεν ήταν δυνατή η αλλαγή του ονόματος εμφάνισής σας"
 
-#: templates/personal.php:59
+#: templates/personal.php:61
 msgid "Change display name"
-msgstr ""
+msgstr "Αλλαγή ονόματος εμφάνισης"
 
-#: templates/personal.php:68
+#: templates/personal.php:70
 msgid "Email"
 msgstr "Email"
 
-#: templates/personal.php:69
+#: templates/personal.php:72
 msgid "Your email address"
 msgstr "Η διεύθυνση ηλεκτρονικού ταχυδρομείου σας"
 
-#: templates/personal.php:70
+#: templates/personal.php:73
 msgid "Fill in an email address to enable password recovery"
 msgstr "Συμπληρώστε μια διεύθυνση ηλεκτρονικού ταχυδρομείου για να ενεργοποιηθεί η ανάκτηση συνθηματικού"
 
-#: templates/personal.php:76 templates/personal.php:77
+#: templates/personal.php:79 templates/personal.php:80
 msgid "Language"
 msgstr "Γλώσσα"
 
-#: templates/personal.php:82
+#: templates/personal.php:86
 msgid "Help translate"
 msgstr "Βοηθήστε στη μετάφραση"
 
-#: templates/personal.php:87
+#: templates/personal.php:91
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:89
+#: templates/personal.php:93
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "Χρήση αυτής της διεύθυνσης για σύνδεση στο ownCloud με τον διαχειριστή αρχείων σας"
 
 #: templates/users.php:21 templates/users.php:77
 msgid "Login Name"
-msgstr ""
+msgstr "Όνομα Σύνδεσης"
 
 #: templates/users.php:32
 msgid "Create"
@@ -497,11 +498,11 @@ msgstr "Αποθήκευση"
 
 #: templates/users.php:95
 msgid "change display name"
-msgstr ""
+msgstr "αλλαγή ονόματος εμφάνισης"
 
 #: templates/users.php:99
 msgid "set new password"
-msgstr ""
+msgstr "επιλογή νέου κωδικού"
 
 #: templates/users.php:134
 msgid "Default"
diff --git a/l10n/el/user_ldap.po b/l10n/el/user_ldap.po
index 972b0601dfa0167c8a6fd0fb77e9bfe48218472b..208bcb75ba6f49406db90fd255b643a2ac635363 100644
--- a/l10n/el/user_ldap.po
+++ b/l10n/el/user_ldap.po
@@ -6,14 +6,15 @@
 #   <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-02-08 00:10+0100\n"
-"PO-Revision-Date: 2013-02-07 23:11+0000\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: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
@@ -24,23 +25,23 @@ msgstr ""
 
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
-msgstr ""
+msgstr "Αποτυχία διαγραφής ρυθμίσεων διακομιστή"
 
-#: ajax/testConfiguration.php:35
+#: ajax/testConfiguration.php:36
 msgid "The configuration is valid and the connection could be established!"
-msgstr ""
+msgstr "Οι ρυθμίσεις είναι έγκυρες και η σύνδεση μπορεί να πραγματοποιηθεί!"
 
-#: ajax/testConfiguration.php:37
+#: 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:40
+#: 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"
@@ -52,27 +53,27 @@ msgstr ""
 
 #: js/settings.js:83
 msgid "Keep settings?"
-msgstr ""
+msgstr "Διατήρηση ρυθμίσεων;"
 
 #: js/settings.js:97
 msgid "Cannot add server configuration"
-msgstr ""
+msgstr "Αδυναμία προσθήκης ρυθμίσεων διακομιστή"
 
 #: js/settings.js:121
 msgid "Connection test succeeded"
-msgstr ""
+msgstr "Επιτυχημένη δοκιμαστική σύνδεση"
 
 #: js/settings.js:126
 msgid "Connection test failed"
-msgstr ""
+msgstr "Αποτυχημένη δοκιμαστική σύνδεσης."
 
 #: js/settings.js:136
 msgid "Do you really want to delete the current Server Configuration?"
-msgstr ""
+msgstr "Θέλετε να διαγράψετε τις τρέχουσες ρυθμίσεις του διακομιστή;"
 
 #: js/settings.js:137
 msgid "Confirm Deletion"
-msgstr ""
+msgstr "Επιβεβαίωση Διαγραφής"
 
 #: templates/settings.php:8
 msgid ""
@@ -85,230 +86,254 @@ msgstr "<b>Προσοχή:</b> Οι εφαρμογές user_ldap και user_web
 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
 msgid "Server configuration"
-msgstr ""
+msgstr "Ρυθμίσεις Διακομιστή"
 
-#: templates/settings.php:17
+#: templates/settings.php:18
 msgid "Add Server Configuration"
-msgstr ""
+msgstr "Προσθήκη Ρυθμίσεων Διακομιστή"
 
-#: templates/settings.php:21
+#: templates/settings.php:23
 msgid "Host"
 msgstr "Διακομιστής"
 
-#: templates/settings.php:21
+#: templates/settings.php:25
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "Μπορείτε να παραλείψετε το πρωτόκολλο, εκτός αν απαιτείται SSL. Σε αυτή την περίπτωση ξεκινήστε με ldaps://"
 
-#: templates/settings.php:22
+#: templates/settings.php:26
 msgid "Base DN"
 msgstr "Base DN"
 
-#: templates/settings.php:22
+#: templates/settings.php:27
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:28
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "Μπορείτε να καθορίσετε το Base DN για χρήστες και ομάδες από την καρτέλα Προηγμένες ρυθμίσεις"
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "User DN"
 msgstr "User DN"
 
-#: templates/settings.php:23
+#: templates/settings.php:32
 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:24
+#: templates/settings.php:33
 msgid "Password"
 msgstr "Συνθηματικό"
 
-#: templates/settings.php:24
+#: templates/settings.php:36
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "Για ανώνυμη πρόσβαση, αφήστε κενά τα πεδία DN και Pasword."
 
-#: templates/settings.php:25
+#: templates/settings.php:37
 msgid "User Login Filter"
 msgstr "User Login Filter"
 
-#: templates/settings.php:25
+#: templates/settings.php:40
 #, 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:25
+#: templates/settings.php:41
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "χρησιμοποιήστε τη μεταβλητή %%uid, π.χ. \"uid=%%uid\""
 
-#: templates/settings.php:26
+#: templates/settings.php:42
 msgid "User List Filter"
 msgstr "User List Filter"
 
-#: templates/settings.php:26
+#: templates/settings.php:45
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Καθορίζει το φίλτρο που θα ισχύει κατά την ανάκτηση επαφών."
 
-#: templates/settings.php:26
+#: templates/settings.php:46
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "χωρίς κάποια μεταβλητή, π.χ. \"objectClass=άτομο\"."
 
-#: templates/settings.php:27
+#: templates/settings.php:47
 msgid "Group Filter"
 msgstr "Group Filter"
 
-#: templates/settings.php:27
+#: templates/settings.php:50
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Καθορίζει το φίλτρο που θα ισχύει κατά την ανάκτηση ομάδων."
 
-#: templates/settings.php:27
+#: templates/settings.php:51
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "χωρίς κάποια μεταβλητή, π.χ. \"objectClass=ΟμάδαPosix\"."
 
-#: templates/settings.php:31
+#: templates/settings.php:55
 msgid "Connection Settings"
-msgstr ""
+msgstr "Ρυθμίσεις Σύνδεσης"
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:34
+#: templates/settings.php:58
 msgid "Port"
 msgstr "Θύρα"
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:60
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Use TLS"
 msgstr "Χρήση TLS"
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:39
+#: templates/settings.php:63
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "LDAP server (Windows) με διάκριση πεζών-ΚΕΦΑΛΑΙΩΝ"
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid "Turn off SSL certificate validation."
 msgstr "Απενεργοποίηση επικύρωσης πιστοποιητικού SSL."
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 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:40
+#: templates/settings.php:64
 msgid "Not recommended, use for testing only."
 msgstr "Δεν προτείνεται, χρήση μόνο για δοκιμές."
 
-#: templates/settings.php:41
+#: templates/settings.php:65
+msgid "Cache Time-To-Live"
+msgstr ""
+
+#: templates/settings.php:65
 msgid "in seconds. A change empties the cache."
 msgstr "σε δευτερόλεπτα. Μια αλλαγή αδειάζει την μνήμη cache."
 
-#: templates/settings.php:43
+#: templates/settings.php:67
 msgid "Directory Settings"
-msgstr ""
+msgstr "Ρυθμίσεις Καταλόγου"
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "User Display Name Field"
 msgstr "Πεδίο Ονόματος Χρήστη"
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "Η ιδιότητα LDAP που θα χρησιμοποιείται για τη δημιουργία του ονόματος χρήστη του ownCloud."
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "Base User Tree"
 msgstr "Base User Tree"
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:47
+#: templates/settings.php:71
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:47 templates/settings.php:50
+#: templates/settings.php:71 templates/settings.php:74
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "Group Display Name Field"
 msgstr "Group Display Name Field"
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "Η ιδιότητα LDAP που θα χρησιμοποιείται για τη δημιουργία του ονόματος ομάδας του ownCloud."
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "Base Group Tree"
 msgstr "Base Group Tree"
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:74
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:75
 msgid "Group-Member association"
 msgstr "Group-Member association"
 
-#: templates/settings.php:53
+#: templates/settings.php:77
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:79
+msgid "Quota Field"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Quota Default"
+msgstr ""
+
+#: templates/settings.php:80
 msgid "in bytes"
 msgstr "σε bytes"
 
-#: templates/settings.php:58
+#: templates/settings.php:81
+msgid "Email Field"
+msgstr ""
+
+#: templates/settings.php:82
+msgid "User Home Folder Naming Rule"
+msgstr ""
+
+#: templates/settings.php:82
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Αφήστε το κενό για το όνομα χρήστη (προεπιλογή). Διαφορετικά, συμπληρώστε μία ιδιότητα LDAP/AD."
 
-#: templates/settings.php:62
+#: templates/settings.php:86
+msgid "Test Configuration"
+msgstr ""
+
+#: templates/settings.php:86
 msgid "Help"
 msgstr "Βοήθεια"
diff --git a/l10n/eo/core.po b/l10n/eo/core.po
index d1572f084cb4aef06f8843256256ff94d38580b5..e53e6244654f75dd03e5890df6f739c8729182c0 100644
--- a/l10n/eo/core.po
+++ b/l10n/eo/core.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 14:31+0000\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"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -389,7 +389,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 "La pasvorto de ownCloud restariĝis."
 
diff --git a/l10n/eo/files.po b/l10n/eo/files.po
index 928c408fa287ead96869bff8bab36f9d56a5539f..868c5b92b7f1002c77bfe7c26825e5102f67175c 100644
--- a/l10n/eo/files.po
+++ b/l10n/eo/files.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\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: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -53,27 +53,27 @@ msgid ""
 "the HTML form"
 msgstr "La dosiero alŝutita superas la regulon MAX_FILE_SIZE, kiu estas difinita en la HTML-formularo"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
 msgstr "La alŝutita dosiero nur parte alŝutiĝis"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:31
 msgid "No file was uploaded"
 msgstr "Neniu dosiero estas alŝutita"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:32
 msgid "Missing a temporary folder"
 msgstr "Mankas tempa dosierujo"
 
-#: ajax/upload.php:34
+#: ajax/upload.php:33
 msgid "Failed to write to disk"
 msgstr "Malsukcesis skribo al disko"
 
-#: ajax/upload.php:52
+#: ajax/upload.php:51
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:83
+#: ajax/upload.php:82
 msgid "Invalid directory."
 msgstr "Nevalida dosierujo."
 
@@ -85,7 +85,7 @@ msgstr "Dosieroj"
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:127 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:127 templates/index.php:92 templates/index.php:93
 msgid "Delete"
 msgstr "Forigi"
 
@@ -93,40 +93,36 @@ msgstr "Forigi"
 msgid "Rename"
 msgstr "Alinomigi"
 
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
 msgid "Pending"
 msgstr "Traktotaj"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "{new_name} already exists"
 msgstr "{new_name} jam ekzistas"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "replace"
 msgstr "anstataŭigi"
 
-#: js/filelist.js:253
+#: js/filelist.js:251
 msgid "suggest name"
 msgstr "sugesti nomon"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "cancel"
 msgstr "nuligi"
 
-#: js/filelist.js:295
-msgid "replaced {new_name}"
-msgstr "anstataŭiĝis {new_name}"
+#: js/filelist.js:298
+msgid "replaced {new_name} with {old_name}"
+msgstr "anstataŭiĝis {new_name} per {old_name}"
 
-#: js/filelist.js:295 js/filelist.js:297
+#: js/filelist.js:298
 msgid "undo"
 msgstr "malfari"
 
-#: js/filelist.js:297
-msgid "replaced {new_name} with {old_name}"
-msgstr "anstataŭiĝis {new_name} per {old_name}"
-
-#: js/filelist.js:322
+#: js/filelist.js:323
 msgid "perform delete operation"
 msgstr ""
 
@@ -152,74 +148,74 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:224
+#: js/files.js:225
 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:261
+#: js/files.js:262
 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:261
+#: js/files.js:262
 msgid "Upload Error"
 msgstr "Alŝuta eraro"
 
-#: js/files.js:272
+#: js/files.js:273
 msgid "Close"
 msgstr "Fermi"
 
-#: js/files.js:311
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr "1 dosiero estas alŝutata"
 
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr "{count} dosieroj alŝutatas"
 
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "La alŝuto nuliĝis."
 
-#: js/files.js:496
+#: js/files.js:497
 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:569
+#: js/files.js:570
 msgid "URL cannot be empty."
 msgstr "URL ne povas esti malplena."
 
-#: js/files.js:574
+#: js/files.js:575
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Nevalida dosierujnomo. Uzo de “Shared” rezervatas de Owncloud."
 
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:953 templates/index.php:68
 msgid "Name"
 msgstr "Nomo"
 
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:954 templates/index.php:79
 msgid "Size"
 msgstr "Grando"
 
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:955 templates/index.php:81
 msgid "Modified"
 msgstr "Modifita"
 
-#: js/files.js:969
+#: js/files.js:974
 msgid "1 folder"
 msgstr "1 dosierujo"
 
-#: js/files.js:971
+#: js/files.js:976
 msgid "{count} folders"
 msgstr "{count} dosierujoj"
 
-#: js/files.js:979
+#: js/files.js:984
 msgid "1 file"
 msgstr "1 dosiero"
 
-#: js/files.js:981
+#: js/files.js:986
 msgid "{count} files"
 msgstr "{count} dosierujoj"
 
@@ -283,33 +279,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr "Nuligi alŝuton"
 
-#: templates/index.php:59
+#: templates/index.php:53
+msgid "You don’t have write permissions here."
+msgstr ""
+
+#: templates/index.php:60
 msgid "Nothing in here. Upload something!"
 msgstr "Nenio estas ĉi tie. Alŝutu ion!"
 
-#: templates/index.php:73
+#: templates/index.php:74
 msgid "Download"
 msgstr "Elŝuti"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:86 templates/index.php:87
 msgid "Unshare"
 msgstr "Malkunhavigi"
 
-#: templates/index.php:105
+#: templates/index.php:106
 msgid "Upload too large"
 msgstr "Elŝuto tro larĝa"
 
-#: templates/index.php:107
+#: templates/index.php:108
 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:112
+#: templates/index.php:113
 msgid "Files are being scanned, please wait."
 msgstr "Dosieroj estas skanataj, bonvolu atendi."
 
-#: templates/index.php:115
+#: templates/index.php:116
 msgid "Current scanning"
 msgstr "Nuna skano"
 
diff --git a/l10n/eo/files_external.po b/l10n/eo/files_external.po
index 5d494ccfa3452d5a5d3bb988309a02155ab5a46d..bf222a2f847a0877117b45ec10e1f92e37a2cb84 100644
--- a/l10n/eo/files_external.po
+++ b/l10n/eo/files_external.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-11 23:22+0000\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"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -18,37 +18,33 @@ msgstr ""
 "Language: eo\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 "Alirpermeso donita"
 
-#: 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 "Eraro dum agordado de la memorservo Dropbox"
 
-#: 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 "Doni alirpermeson"
 
-#: js/dropbox.js:73 js/google.js:72
-msgid "Fill out all required fields"
-msgstr "Plenigu ĉiujn neprajn kampojn"
-
-#: js/dropbox.js:85
+#: js/dropbox.js:101
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr "Bonvolu provizi ŝlosilon de la aplikaĵo Dropbox validan kaj sekretan."
 
-#: 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 "Eraro dum agordado de la memorservo Google Drive"
 
-#: lib/config.php:434
+#: lib/config.php:421
 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:424
 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 "
@@ -59,63 +55,63 @@ msgstr ""
 msgid "External Storage"
 msgstr "Malena memorilo"
 
-#: templates/settings.php:8 templates/settings.php:22
-msgid "Mount point"
-msgstr "Surmetingo"
-
-#: templates/settings.php:9
-msgid "Backend"
-msgstr "Motoro"
+#: templates/settings.php:9 templates/settings.php:28
+msgid "Folder name"
+msgstr "Dosierujnomo"
 
 #: templates/settings.php:10
+msgid "External storage"
+msgstr ""
+
+#: templates/settings.php:11
 msgid "Configuration"
 msgstr "Agordo"
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid "Options"
 msgstr "Malneproj"
 
-#: templates/settings.php:12
+#: templates/settings.php:13
 msgid "Applicable"
 msgstr "Aplikebla"
 
-#: templates/settings.php:27
-msgid "Add mount point"
-msgstr "Aldoni surmetingon"
+#: templates/settings.php:33
+msgid "Add storage"
+msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:90
 msgid "None set"
 msgstr "Nenio agordita"
 
-#: templates/settings.php:86
+#: templates/settings.php:91
 msgid "All Users"
 msgstr "Ĉiuj uzantoj"
 
-#: templates/settings.php:87
+#: templates/settings.php:92
 msgid "Groups"
 msgstr "Grupoj"
 
-#: templates/settings.php:95
+#: templates/settings.php:100
 msgid "Users"
 msgstr "Uzantoj"
 
-#: 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 "Forigi"
 
-#: templates/settings.php:124
+#: templates/settings.php:129
 msgid "Enable User External Storage"
 msgstr "Kapabligi malenan memorilon de uzanto"
 
-#: templates/settings.php:125
+#: templates/settings.php:130
 msgid "Allow users to mount their own external storage"
 msgstr "Permesi al uzantoj surmeti siajn proprajn malenajn memorilojn"
 
-#: templates/settings.php:139
+#: templates/settings.php:141
 msgid "SSL root certificates"
 msgstr "Radikaj SSL-atestoj"
 
-#: templates/settings.php:158
+#: templates/settings.php:159
 msgid "Import Root Certificate"
 msgstr "Enporti radikan ateston"
diff --git a/l10n/eo/files_trashbin.po b/l10n/eo/files_trashbin.po
index ba5bf42fbc6a66f572f0df2e566e7aa45a6ed2bb..783a5f733f9e15a1ddc70380aacdaaf0fecb4a74 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-02-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 10:07+0000\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: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Language: eo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:22
+#: ajax/delete.php:40
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
@@ -27,35 +27,39 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:33
+#: js/trash.js:34
 msgid "delete file permanently"
 msgstr ""
 
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr ""
+
+#: js/trash.js:174 templates/index.php:17
 msgid "Name"
 msgstr "Nomo"
 
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:175 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:135
+#: js/trash.js:184
 msgid "1 folder"
 msgstr "1 dosierujo"
 
-#: js/trash.js:137
+#: js/trash.js:186
 msgid "{count} folders"
 msgstr "{count} dosierujoj"
 
-#: js/trash.js:145
+#: js/trash.js:194
 msgid "1 file"
 msgstr "1 dosiero"
 
-#: js/trash.js:147
+#: js/trash.js:196
 msgid "{count} files"
 msgstr "{count} dosierujoj"
 
@@ -66,3 +70,11 @@ msgstr ""
 #: templates/index.php:20 templates/index.php:22
 msgid "Restore"
 msgstr "Restaŭri"
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr "Forigi"
+
+#: templates/part.breadcrumb.php:9
+msgid "Deleted Files"
+msgstr ""
diff --git a/l10n/eo/files_versions.po b/l10n/eo/files_versions.po
index 6e7f83b9ade5682a1bb026c51661a461e9883dc3..0c1c4992f5d87c74d5f4906ded478421af32d80f 100644
--- a/l10n/eo/files_versions.po
+++ b/l10n/eo/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-08 00:10+0100\n"
-"PO-Revision-Date: 2013-02-07 23:11+0000\n"
+"POT-Creation-Date: 2013-02-28 00:04+0100\n"
+"PO-Revision-Date: 2013-02-27 23:04+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -49,18 +49,10 @@ msgstr ""
 msgid "No path specified"
 msgstr ""
 
-#: js/versions.js:16
-msgid "History"
-msgstr "Historio"
+#: 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 ""
-
-#: templates/settings.php:3
-msgid "Files Versioning"
-msgstr "Dosiereldonigo"
-
-#: templates/settings.php:4
-msgid "Enable"
-msgstr "Kapabligi"
diff --git a/l10n/eo/lib.po b/l10n/eo/lib.po
index 4bdcdeb24642be14eab4bf867cc8384e2ac5599a..f996e6cedaef96cdc639b5f9245244d8d979a98b 100644
--- a/l10n/eo/lib.po
+++ b/l10n/eo/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-11 15:39+0100\n"
-"PO-Revision-Date: 2013-02-11 14:40+0000\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: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -18,27 +18,27 @@ msgstr ""
 "Language: eo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:339
+#: app.php:349
 msgid "Help"
 msgstr "Helpo"
 
-#: app.php:346
+#: app.php:362
 msgid "Personal"
 msgstr "Persona"
 
-#: app.php:351
+#: app.php:373
 msgid "Settings"
 msgstr "Agordo"
 
-#: app.php:356
+#: app.php:385
 msgid "Users"
 msgstr "Uzantoj"
 
-#: app.php:363
+#: app.php:398
 msgid "Apps"
 msgstr "Aplikaĵoj"
 
-#: app.php:365
+#: app.php:406
 msgid "Admin"
 msgstr "Administranto"
 
@@ -50,15 +50,15 @@ msgstr "ZIP-elŝuto estas malkapabligita."
 msgid "Files need to be downloaded one by one."
 msgstr "Dosieroj devas elŝutiĝi unuope."
 
-#: files.php:203 files.php:228
+#: files.php:204 files.php:231
 msgid "Back to Files"
 msgstr "Reen al la dosieroj"
 
-#: files.php:227
+#: files.php:228
 msgid "Selected files too large to generate zip file."
 msgstr "La elektitaj dosieroj tro grandas por genero de ZIP-dosiero."
 
-#: helper.php:226
+#: helper.php:228
 msgid "couldn't be determined"
 msgstr ""
 
@@ -98,87 +98,92 @@ msgstr ""
 msgid "Specify a data folder."
 msgstr ""
 
-#: setup.php:53
+#: setup.php:55
 #, php-format
 msgid "%s enter the database username."
 msgstr ""
 
-#: setup.php:56
+#: setup.php:58
 #, php-format
 msgid "%s enter the database name."
 msgstr ""
 
-#: setup.php:59
+#: setup.php:61
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr ""
 
-#: setup.php:62
+#: setup.php:64
 #, php-format
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:126 setup.php:291 setup.php:336
+#: setup.php:128 setup.php:320 setup.php:365
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:127 setup.php:150 setup.php:204
+#: setup.php:129 setup.php:152 setup.php:229
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:149 setup.php:423 setup.php:489
+#: setup.php:151 setup.php:453 setup.php:520
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:203
+#: setup.php:228
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:255 setup.php:357 setup.php:366 setup.php:384 setup.php:394
-#: setup.php:403 setup.php:430 setup.php:496 setup.php:522 setup.php:529
-#: setup.php:540 setup.php:547 setup.php:556 setup.php:564 setup.php:573
-#: setup.php:579
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:256 setup.php:358 setup.php:367 setup.php:385 setup.php:395
-#: setup.php:404 setup.php:431 setup.php:497 setup.php:523 setup.php:530
-#: setup.php:541 setup.php:557 setup.php:565 setup.php:574
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:270
+#: setup.php:299
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:271
+#: setup.php:300
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:276
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:277
+#: setup.php:306
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:548 setup.php:580
+#: setup.php:579 setup.php:611
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:644
+#: setup.php:631
+#, php-format
+msgid "MS SQL username and/or password not valid: %s"
+msgstr ""
+
+#: setup.php:849
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:645
+#: setup.php:850
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
@@ -235,16 +240,16 @@ msgstr "lasta jaro"
 msgid "years ago"
 msgstr "jarojn antaŭe"
 
-#: updater.php:75
+#: 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:77
+#: updater.php:81
 msgid "up to date"
 msgstr "ĝisdata"
 
-#: updater.php:80
+#: updater.php:84
 msgid "updates check is disabled"
 msgstr "ĝisdateckontrolo estas malkapabligita"
 
diff --git a/l10n/eo/settings.po b/l10n/eo/settings.po
index ef4116c62d66fd03ed59a1cc439fd96dce41c785..84327bf8760d4e267f38dc0bd1f61870fee53ab3 100644
--- a/l10n/eo/settings.po
+++ b/l10n/eo/settings.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 23:05+0000\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: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -24,8 +24,8 @@ 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:15
-#: ajax/togglegroups.php:18
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr "Aŭtentiga eraro"
 
@@ -73,12 +73,12 @@ msgstr "Nevalida peto"
 msgid "Admins can't remove themself from the admin group"
 msgstr "Administrantoj ne povas forigi sin mem el la administra grupo."
 
-#: ajax/togglegroups.php:28
+#: ajax/togglegroups.php:30
 #, php-format
 msgid "Unable to add user to group %s"
 msgstr "Ne eblis aldoni la uzanton al la grupo %s"
 
-#: ajax/togglegroups.php:34
+#: ajax/togglegroups.php:36
 #, php-format
 msgid "Unable to remove user from group %s"
 msgstr "Ne eblis forigi la uzantan el la grupo %s"
@@ -119,7 +119,7 @@ msgstr "Eraro"
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:96
+#: js/personal.js:99
 msgid "Saving..."
 msgstr "Konservante..."
 
@@ -148,23 +148,23 @@ msgstr "Grupadministranto"
 msgid "Delete"
 msgstr "Forigi"
 
-#: js/users.js:190
+#: js/users.js:191
 msgid "add group"
 msgstr ""
 
-#: js/users.js:351
+#: js/users.js:352
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:357
+#: js/users.js:358
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
 msgid "__language_name__"
 msgstr "Esperanto"
 
@@ -210,19 +210,19 @@ msgstr ""
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:61
+#: templates/admin.php:63
+#, php-format
 msgid ""
-"This ownCloud server can't set system locale to "
-"\"en_US.UTF-8\"/\"en_US.UTF8\". 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 en_US.UTF-8/en_US.UTF8."
+"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:72
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:75
+#: 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 "
@@ -232,98 +232,98 @@ msgid ""
 " of ownCloud."
 msgstr ""
 
-#: templates/admin.php:89
+#: templates/admin.php:92
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:98
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:108
+#: 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:118
+#: 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:125
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:131
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:132
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:140
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:147
+#: templates/admin.php:150
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:148
+#: templates/admin.php:151
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:155
+#: templates/admin.php:158
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:161
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:165
+#: templates/admin.php:168
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:181
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:179
+#: templates/admin.php:182
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:182
+#: templates/admin.php:185
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr ""
 
-#: templates/admin.php:192
+#: templates/admin.php:195
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:193
+#: templates/admin.php:196
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:220
+#: templates/admin.php:223
 msgid "More"
 msgstr "Pli"
 
-#: templates/admin.php:227 templates/personal.php:98
+#: templates/admin.php:230 templates/personal.php:102
 msgid "Version"
 msgstr "Eldono"
 
-#: templates/admin.php:230 templates/personal.php:100
+#: templates/admin.php:233 templates/personal.php:105
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -333,51 +333,51 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "Ellaborita de la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">komunumo de ownCloud</a>, la <a href=\"https://github.com/owncloud\" target=\"_blank\">fontokodo</a> publikas laŭ la permesilo <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
-#: templates/apps.php:10
+#: templates/apps.php:11
 msgid "Add your App"
 msgstr "Aldonu vian aplikaĵon"
 
-#: templates/apps.php:11
+#: templates/apps.php:12
 msgid "More Apps"
 msgstr "Pli da aplikaĵoj"
 
-#: templates/apps.php:24
+#: templates/apps.php:28
 msgid "Select an App"
 msgstr "Elekti aplikaĵon"
 
-#: templates/apps.php:28
+#: templates/apps.php:34
 msgid "See application page at apps.owncloud.com"
 msgstr "Vidu la paĝon pri aplikaĵoj ĉe apps.owncloud.com"
 
-#: templates/apps.php:29
+#: templates/apps.php:36
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"</span>-permesilhavigita de <span class=\"author\"></span>"
 
-#: templates/apps.php:31
+#: templates/apps.php:38
 msgid "Update"
 msgstr "Ĝisdatigi"
 
-#: templates/help.php:3
+#: templates/help.php:4
 msgid "User Documentation"
 msgstr "Dokumentaro por uzantoj"
 
-#: templates/help.php:4
+#: templates/help.php:6
 msgid "Administrator Documentation"
 msgstr "Dokumentaro por administrantoj"
 
-#: templates/help.php:6
+#: templates/help.php:9
 msgid "Online Documentation"
 msgstr "Reta dokumentaro"
 
-#: templates/help.php:7
+#: templates/help.php:11
 msgid "Forum"
 msgstr "Forumo"
 
-#: templates/help.php:9
+#: templates/help.php:14
 msgid "Bugtracker"
 msgstr "Cimoraportejo"
 
-#: templates/help.php:11
+#: templates/help.php:17
 msgid "Commercial Support"
 msgstr "Komerca subteno"
 
@@ -386,79 +386,79 @@ msgstr "Komerca subteno"
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Vi uzas <strong>%s</strong> el la haveblaj <strong>%s</strong>"
 
-#: templates/personal.php:14
+#: templates/personal.php:15
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:25
+#: templates/personal.php:26
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:36 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
 msgid "Password"
 msgstr "Pasvorto"
 
-#: templates/personal.php:37
+#: templates/personal.php:38
 msgid "Your password was changed"
 msgstr "Via pasvorto ŝanĝiĝis"
 
-#: templates/personal.php:38
+#: templates/personal.php:39
 msgid "Unable to change your password"
 msgstr "Ne eblis ŝanĝi vian pasvorton"
 
-#: templates/personal.php:39
+#: templates/personal.php:40
 msgid "Current password"
 msgstr "Nuna pasvorto"
 
-#: templates/personal.php:40
+#: templates/personal.php:42
 msgid "New password"
 msgstr "Nova pasvorto"
 
-#: templates/personal.php:42
+#: templates/personal.php:44
 msgid "Change password"
 msgstr "Ŝanĝi la pasvorton"
 
-#: templates/personal.php:54 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:78
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:55
+#: templates/personal.php:57
 msgid "Your display name was changed"
 msgstr ""
 
-#: templates/personal.php:56
+#: templates/personal.php:58
 msgid "Unable to change your display name"
 msgstr ""
 
-#: templates/personal.php:59
+#: templates/personal.php:61
 msgid "Change display name"
 msgstr ""
 
-#: templates/personal.php:68
+#: templates/personal.php:70
 msgid "Email"
 msgstr "Retpoŝto"
 
-#: templates/personal.php:69
+#: templates/personal.php:72
 msgid "Your email address"
 msgstr "Via retpoŝta adreso"
 
-#: templates/personal.php:70
+#: templates/personal.php:73
 msgid "Fill in an email address to enable password recovery"
 msgstr "Enigu retpoŝtadreson por kapabligi pasvortan restaŭron"
 
-#: templates/personal.php:76 templates/personal.php:77
+#: templates/personal.php:79 templates/personal.php:80
 msgid "Language"
 msgstr "Lingvo"
 
-#: templates/personal.php:82
+#: templates/personal.php:86
 msgid "Help translate"
 msgstr "Helpu traduki"
 
-#: templates/personal.php:87
+#: templates/personal.php:91
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:89
+#: templates/personal.php:93
 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"
 
diff --git a/l10n/eo/user_ldap.po b/l10n/eo/user_ldap.po
index ac325f3f01d367730bd9f5b5b60333764ea25e51..2c3704125de172ae2f11da543ca1a2c2d21e6419 100644
--- a/l10n/eo/user_ldap.po
+++ b/l10n/eo/user_ldap.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-08 00:10+0100\n"
-"PO-Revision-Date: 2013-02-07 23:11+0000\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: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -23,17 +23,17 @@ msgstr ""
 msgid "Failed to delete the server configuration"
 msgstr ""
 
-#: ajax/testConfiguration.php:35
+#: ajax/testConfiguration.php:36
 msgid "The configuration is valid and the connection could be established!"
 msgstr ""
 
-#: ajax/testConfiguration.php:37
+#: ajax/testConfiguration.php:39
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
 msgstr ""
 
-#: ajax/testConfiguration.php:40
+#: ajax/testConfiguration.php:43
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
@@ -88,224 +88,248 @@ msgstr ""
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:17
+#: templates/settings.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:23
 msgid "Host"
 msgstr "Gastigo"
 
-#: templates/settings.php:21
+#: templates/settings.php:25
 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:22
+#: templates/settings.php:26
 msgid "Base DN"
 msgstr "Bazo-DN"
 
-#: templates/settings.php:22
+#: templates/settings.php:27
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:28
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "User DN"
 msgstr "Uzanto-DN"
 
-#: templates/settings.php:23
+#: templates/settings.php:32
 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:24
+#: templates/settings.php:33
 msgid "Password"
 msgstr "Pasvorto"
 
-#: templates/settings.php:24
+#: templates/settings.php:36
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "Por sennoman aliron, lasu DN-on kaj Pasvorton malplenaj."
 
-#: templates/settings.php:25
+#: templates/settings.php:37
 msgid "User Login Filter"
 msgstr "Filtrilo de uzantensaluto"
 
-#: templates/settings.php:25
+#: templates/settings.php:40
 #, 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:25
+#: templates/settings.php:41
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "uzu la referencilon %%uid, ekz.: \"uid=%%uid\""
 
-#: templates/settings.php:26
+#: templates/settings.php:42
 msgid "User List Filter"
 msgstr "Filtrilo de uzantolisto"
 
-#: templates/settings.php:26
+#: templates/settings.php:45
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Ĝi difinas la filtrilon aplikotan, kiam veniĝas uzantoj."
 
-#: templates/settings.php:26
+#: templates/settings.php:46
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "sen ajna referencilo, ekz.: \"objectClass=person\"."
 
-#: templates/settings.php:27
+#: templates/settings.php:47
 msgid "Group Filter"
 msgstr "Filtrilo de grupo"
 
-#: templates/settings.php:27
+#: templates/settings.php:50
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Ĝi difinas la filtrilon aplikotan, kiam veniĝas grupoj."
 
-#: templates/settings.php:27
+#: templates/settings.php:51
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "sen ajna referencilo, ekz.: \"objectClass=posixGroup\"."
 
-#: templates/settings.php:31
+#: templates/settings.php:55
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:34
+#: templates/settings.php:58
 msgid "Port"
 msgstr "Pordo"
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:60
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Use TLS"
 msgstr "Uzi TLS-on"
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:39
+#: templates/settings.php:63
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "LDAP-servilo blinda je litergrandeco (Vindozo)"
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid "Turn off SSL certificate validation."
 msgstr "Malkapabligi validkontrolon de SSL-atestiloj."
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 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:40
+#: templates/settings.php:64
 msgid "Not recommended, use for testing only."
 msgstr "Ne rekomendata, uzu ĝin nur por testoj."
 
-#: templates/settings.php:41
+#: templates/settings.php:65
+msgid "Cache Time-To-Live"
+msgstr ""
+
+#: templates/settings.php:65
 msgid "in seconds. A change empties the cache."
 msgstr "sekunde. Ajna ŝanĝo malplenigas la kaŝmemoron."
 
-#: templates/settings.php:43
+#: templates/settings.php:67
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "User Display Name Field"
 msgstr "Kampo de vidignomo de uzanto"
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 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:46
+#: templates/settings.php:70
 msgid "Base User Tree"
 msgstr "Baza uzantarbo"
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:47
+#: templates/settings.php:71
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:47 templates/settings.php:50
+#: templates/settings.php:71 templates/settings.php:74
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "Group Display Name Field"
 msgstr "Kampo de vidignomo de grupo"
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 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:49
+#: templates/settings.php:73
 msgid "Base Group Tree"
 msgstr "Baza gruparbo"
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:74
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:75
 msgid "Group-Member association"
 msgstr "Asocio de grupo kaj membro"
 
-#: templates/settings.php:53
+#: templates/settings.php:77
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:79
+msgid "Quota Field"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Quota Default"
+msgstr ""
+
+#: templates/settings.php:80
 msgid "in bytes"
 msgstr "duumoke"
 
-#: templates/settings.php:58
+#: templates/settings.php:81
+msgid "Email Field"
+msgstr ""
+
+#: templates/settings.php:82
+msgid "User Home Folder Naming Rule"
+msgstr ""
+
+#: templates/settings.php:82
 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:62
+#: templates/settings.php:86
+msgid "Test Configuration"
+msgstr ""
+
+#: templates/settings.php:86
 msgid "Help"
 msgstr "Helpo"
diff --git a/l10n/es/core.po b/l10n/es/core.po
index 3796ea9a99ce9f6e90f3df43fe2ccba0c1842539..4c2b388f90ad4d6942fc88c6615e6cc4247d4a2c 100644
--- a/l10n/es/core.po
+++ b/l10n/es/core.po
@@ -21,8 +21,8 @@ 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 14:32+0000\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"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -400,7 +400,7 @@ msgstr "La actualización ha fracasado. Por favor, informe este problema a la <a
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "La actualización se ha realizado correctamente. Redireccionando a ownCloud ahora."
 
-#: lostpassword/controller.php:47
+#: lostpassword/controller.php:48
 msgid "ownCloud password reset"
 msgstr "Reiniciar contraseña de ownCloud"
 
diff --git a/l10n/es/files.po b/l10n/es/files.po
index b6eac42de367fb33078a2fae260686a23f015a6a..8de6b03bbbe245c52269e382cdcd35243b359097 100644
--- a/l10n/es/files.po
+++ b/l10n/es/files.po
@@ -10,7 +10,9 @@
 #  <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.
@@ -18,9 +20,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: 2013-02-14 23:05+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -61,27 +63,27 @@ msgid ""
 "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"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
 msgstr "El archivo que intentas subir solo se subió parcialmente"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:31
 msgid "No file was uploaded"
 msgstr "No se ha subido ningún archivo"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:32
 msgid "Missing a temporary folder"
 msgstr "Falta un directorio temporal"
 
-#: ajax/upload.php:34
+#: ajax/upload.php:33
 msgid "Failed to write to disk"
 msgstr "La escritura en disco ha fallado"
 
-#: ajax/upload.php:52
+#: ajax/upload.php:51
 msgid "Not enough storage available"
 msgstr "No hay suficiente espacio disponible"
 
-#: ajax/upload.php:83
+#: ajax/upload.php:82
 msgid "Invalid directory."
 msgstr "Directorio invalido."
 
@@ -93,7 +95,7 @@ msgstr "Archivos"
 msgid "Delete permanently"
 msgstr "Eliminar permanentemente"
 
-#: js/fileactions.js:127 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:127 templates/index.php:92 templates/index.php:93
 msgid "Delete"
 msgstr "Eliminar"
 
@@ -101,40 +103,36 @@ msgstr "Eliminar"
 msgid "Rename"
 msgstr "Renombrar"
 
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
 msgid "Pending"
 msgstr "Pendiente"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "{new_name} already exists"
 msgstr "{new_name} ya existe"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "replace"
 msgstr "reemplazar"
 
-#: js/filelist.js:253
+#: js/filelist.js:251
 msgid "suggest name"
 msgstr "sugerir nombre"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "cancel"
 msgstr "cancelar"
 
-#: js/filelist.js:295
-msgid "replaced {new_name}"
-msgstr "reemplazado {new_name}"
+#: js/filelist.js:298
+msgid "replaced {new_name} with {old_name}"
+msgstr "reemplazado {new_name} con {old_name}"
 
-#: js/filelist.js:295 js/filelist.js:297
+#: js/filelist.js:298
 msgid "undo"
 msgstr "deshacer"
 
-#: js/filelist.js:297
-msgid "replaced {new_name} with {old_name}"
-msgstr "reemplazado {new_name} con {old_name}"
-
-#: js/filelist.js:322
+#: js/filelist.js:323
 msgid "perform delete operation"
 msgstr "Eliminar"
 
@@ -160,74 +158,74 @@ msgstr "Su almacenamiento esta lleno, los archivos no pueden ser mas actualizado
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Su almacenamiento esta lleno en un  ({usedSpacePercent}%)"
 
-#: js/files.js:224
+#: js/files.js:225
 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:261
+#: js/files.js:262
 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:261
+#: js/files.js:262
 msgid "Upload Error"
 msgstr "Error al subir el archivo"
 
-#: js/files.js:272
+#: js/files.js:273
 msgid "Close"
 msgstr "cerrrar"
 
-#: js/files.js:311
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr "subiendo 1 archivo"
 
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr "Subiendo {count} archivos"
 
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "Subida cancelada."
 
-#: js/files.js:496
+#: js/files.js:497
 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."
 
-#: js/files.js:569
+#: js/files.js:570
 msgid "URL cannot be empty."
 msgstr "La URL no puede estar vacía."
 
-#: js/files.js:574
+#: js/files.js:575
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Nombre de carpeta invalido. El uso de \"Shared\" esta reservado para Owncloud"
 
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:953 templates/index.php:68
 msgid "Name"
 msgstr "Nombre"
 
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:954 templates/index.php:79
 msgid "Size"
 msgstr "Tamaño"
 
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:955 templates/index.php:81
 msgid "Modified"
 msgstr "Modificado"
 
-#: js/files.js:969
+#: js/files.js:974
 msgid "1 folder"
 msgstr "1 carpeta"
 
-#: js/files.js:971
+#: js/files.js:976
 msgid "{count} folders"
 msgstr "{count} carpetas"
 
-#: js/files.js:979
+#: js/files.js:984
 msgid "1 file"
 msgstr "1 archivo"
 
-#: js/files.js:981
+#: js/files.js:986
 msgid "{count} files"
 msgstr "{count} archivos"
 
@@ -285,39 +283,43 @@ msgstr "Desde el enlace"
 
 #: templates/index.php:40
 msgid "Deleted files"
-msgstr ""
+msgstr "Archivos eliminados"
 
 #: templates/index.php:46
 msgid "Cancel upload"
 msgstr "Cancelar subida"
 
-#: templates/index.php:59
+#: templates/index.php:53
+msgid "You don’t have write permissions here."
+msgstr "No tienes permisos para escribir aquí."
+
+#: templates/index.php:60
 msgid "Nothing in here. Upload something!"
 msgstr "Aquí no hay nada. ¡Sube algo!"
 
-#: templates/index.php:73
+#: templates/index.php:74
 msgid "Download"
 msgstr "Descargar"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:86 templates/index.php:87
 msgid "Unshare"
 msgstr "Dejar de compartir"
 
-#: templates/index.php:105
+#: templates/index.php:106
 msgid "Upload too large"
 msgstr "El archivo es demasiado grande"
 
-#: templates/index.php:107
+#: templates/index.php:108
 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:112
+#: templates/index.php:113
 msgid "Files are being scanned, please wait."
 msgstr "Se están escaneando los archivos, por favor espere."
 
-#: templates/index.php:115
+#: templates/index.php:116
 msgid "Current scanning"
 msgstr "Ahora escaneando"
 
diff --git a/l10n/es/files_external.po b/l10n/es/files_external.po
index 6d0ea098b1b5b7810ebc66c3532341a128f83ee7..ded6d20e910c08893166655cb3cd6cab5682a8d4 100644
--- a/l10n/es/files_external.po
+++ b/l10n/es/files_external.po
@@ -5,15 +5,16 @@
 # 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: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-11 23:44+0000\n"
-"Last-Translator: Agustin Ferrario <agustin.ferrario@hotmail.com.ar>\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"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,37 +22,33 @@ msgstr ""
 "Language: es\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 "Acceso garantizado"
 
-#: 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 "Error configurando el almacenamiento de Dropbox"
 
-#: 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 "Garantizar acceso"
 
-#: js/dropbox.js:73 js/google.js:72
-msgid "Fill out all required fields"
-msgstr "Rellenar todos los campos requeridos"
-
-#: js/dropbox.js:85
+#: js/dropbox.js:101
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr "Por favor , proporcione un secreto y una contraseña válida de la app Dropbox."
 
-#: 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 "Error configurando el almacenamiento de Google Drive"
 
-#: lib/config.php:434
+#: lib/config.php:421
 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:435
+#: lib/config.php:424
 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 "
@@ -62,63 +59,63 @@ msgstr "<b>Advertencia:</b> El soporte de FTP en PHP no se encuentra instalado.
 msgid "External Storage"
 msgstr "Almacenamiento externo"
 
-#: templates/settings.php:8 templates/settings.php:22
-msgid "Mount point"
-msgstr "Punto de montaje"
-
-#: templates/settings.php:9
-msgid "Backend"
-msgstr "Motor"
+#: templates/settings.php:9 templates/settings.php:28
+msgid "Folder name"
+msgstr "Nombre de la carpeta"
 
 #: templates/settings.php:10
+msgid "External storage"
+msgstr "Almacenamiento externo"
+
+#: templates/settings.php:11
 msgid "Configuration"
 msgstr "Configuración"
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid "Options"
 msgstr "Opciones"
 
-#: templates/settings.php:12
+#: templates/settings.php:13
 msgid "Applicable"
 msgstr "Aplicable"
 
-#: templates/settings.php:27
-msgid "Add mount point"
-msgstr "Añadir punto de montaje"
+#: templates/settings.php:33
+msgid "Add storage"
+msgstr "Añadir almacenamiento"
 
-#: templates/settings.php:85
+#: templates/settings.php:90
 msgid "None set"
 msgstr "No se ha configurado"
 
-#: templates/settings.php:86
+#: templates/settings.php:91
 msgid "All Users"
 msgstr "Todos los usuarios"
 
-#: templates/settings.php:87
+#: templates/settings.php:92
 msgid "Groups"
 msgstr "Grupos"
 
-#: templates/settings.php:95
+#: templates/settings.php:100
 msgid "Users"
 msgstr "Usuarios"
 
-#: 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 "Eliiminar"
 
-#: templates/settings.php:124
+#: templates/settings.php:129
 msgid "Enable User External Storage"
 msgstr "Habilitar almacenamiento de usuario externo"
 
-#: templates/settings.php:125
+#: templates/settings.php:130
 msgid "Allow users to mount their own external storage"
 msgstr "Permitir a los usuarios montar su propio almacenamiento externo"
 
-#: templates/settings.php:139
+#: templates/settings.php:141
 msgid "SSL root certificates"
 msgstr "Raíz de certificados SSL  "
 
-#: templates/settings.php:158
+#: templates/settings.php:159
 msgid "Import Root Certificate"
 msgstr "Importar certificado raíz"
diff --git a/l10n/es/files_trashbin.po b/l10n/es/files_trashbin.po
index a2db3d575eec7fdef2c8723630e4f45d871706fa..c0b5a2c7ec0347ea12677b547587519969bda8cb 100644
--- a/l10n/es/files_trashbin.po
+++ b/l10n/es/files_trashbin.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-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 10:07+0000\n"
-"Last-Translator: msvladimir <vladimirmartinezsierra@gmail.com>\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: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:22
+#: ajax/delete.php:40
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "No se puede eliminar %s permanentemente"
@@ -28,35 +28,39 @@ msgstr "No se puede eliminar %s permanentemente"
 msgid "Couldn't restore %s"
 msgstr "No se puede restaurar %s"
 
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
 msgid "perform restore operation"
 msgstr "Restaurar"
 
-#: js/trash.js:33
+#: js/trash.js:34
 msgid "delete file permanently"
 msgstr "Eliminar archivo permanentemente"
 
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr "Eliminar permanentemente"
+
+#: js/trash.js:174 templates/index.php:17
 msgid "Name"
 msgstr "Nombre"
 
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:175 templates/index.php:27
 msgid "Deleted"
 msgstr "Eliminado"
 
-#: js/trash.js:135
+#: js/trash.js:184
 msgid "1 folder"
 msgstr "1 carpeta"
 
-#: js/trash.js:137
+#: js/trash.js:186
 msgid "{count} folders"
 msgstr "{count} carpetas"
 
-#: js/trash.js:145
+#: js/trash.js:194
 msgid "1 file"
 msgstr "1 archivo"
 
-#: js/trash.js:147
+#: js/trash.js:196
 msgid "{count} files"
 msgstr "{count} archivos"
 
@@ -67,3 +71,11 @@ msgstr "Nada aqui. La papelera esta vacia!"
 #: templates/index.php:20 templates/index.php:22
 msgid "Restore"
 msgstr "Recuperar"
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr "Eliminar"
+
+#: templates/part.breadcrumb.php:9
+msgid "Deleted Files"
+msgstr ""
diff --git a/l10n/es/files_versions.po b/l10n/es/files_versions.po
index 279601b80deebcd4f8e7db6a98915b284c696cfb..214d638d330571a8fba0aa6c23a0829010fb5c00 100644
--- a/l10n/es/files_versions.po
+++ b/l10n/es/files_versions.po
@@ -7,14 +7,15 @@
 #   <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-02-09 00:12+0100\n"
-"PO-Revision-Date: 2013-02-08 00:40+0000\n"
-"Last-Translator: msvladimir <vladimirmartinezsierra@gmail.com>\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"
 "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"
@@ -53,18 +54,10 @@ msgstr "No hay versiones antiguas disponibles"
 msgid "No path specified"
 msgstr "Ruta no especificada"
 
-#: js/versions.js:16
-msgid "History"
-msgstr "Historial"
+#: js/versions.js:6
+msgid "Versions"
+msgstr "Revisiones"
 
 #: templates/history.php:20
 msgid "Revert a file to a previous version by clicking on its revert button"
 msgstr "Revertir un archivo a una versión anterior haciendo clic en el boton de revertir"
-
-#: templates/settings.php:3
-msgid "Files Versioning"
-msgstr "Versionado de archivos"
-
-#: templates/settings.php:4
-msgid "Enable"
-msgstr "Habilitar"
diff --git a/l10n/es/lib.po b/l10n/es/lib.po
index 5229db674386d08f581493e433bdf25c3b8a4cbe..ecea8f9dcec9df12893c03f9e78dc9ba325b4b41 100644
--- a/l10n/es/lib.po
+++ b/l10n/es/lib.po
@@ -6,16 +6,18 @@
 # 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-02-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 14:33+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,27 +25,27 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:339
+#: app.php:349
 msgid "Help"
 msgstr "Ayuda"
 
-#: app.php:346
+#: app.php:362
 msgid "Personal"
 msgstr "Personal"
 
-#: app.php:351
+#: app.php:373
 msgid "Settings"
 msgstr "Ajustes"
 
-#: app.php:356
+#: app.php:385
 msgid "Users"
 msgstr "Usuarios"
 
-#: app.php:363
+#: app.php:398
 msgid "Apps"
 msgstr "Aplicaciones"
 
-#: app.php:365
+#: app.php:406
 msgid "Admin"
 msgstr "Administración"
 
@@ -55,15 +57,15 @@ msgstr "La descarga en ZIP está desactivada."
 msgid "Files need to be downloaded one by one."
 msgstr "Los archivos deben ser descargados uno por uno."
 
-#: files.php:203 files.php:228
+#: files.php:204 files.php:231
 msgid "Back to Files"
 msgstr "Volver a Archivos"
 
-#: files.php:227
+#: files.php:228
 msgid "Selected files too large to generate zip file."
 msgstr "Los archivos seleccionados son demasiado grandes para generar el archivo zip."
 
-#: helper.php:226
+#: helper.php:228
 msgid "couldn't be determined"
 msgstr "no pudo ser determinado"
 
@@ -93,97 +95,102 @@ msgstr "Imágenes"
 
 #: setup.php:34
 msgid "Set an admin username."
-msgstr ""
+msgstr "Configurar un nombre de usuario del administrador"
 
 #: setup.php:37
 msgid "Set an admin password."
-msgstr ""
+msgstr "Configurar la contraseña del administrador."
 
 #: setup.php:40
 msgid "Specify a data folder."
-msgstr ""
+msgstr "Especificar la carpeta de datos."
 
-#: setup.php:53
+#: setup.php:55
 #, php-format
 msgid "%s enter the database username."
-msgstr ""
+msgstr "%s ingresar el usuario de la base de datos."
 
-#: setup.php:56
+#: setup.php:58
 #, php-format
 msgid "%s enter the database name."
-msgstr ""
+msgstr "%s ingresar el nombre de la base de datos"
 
-#: setup.php:59
+#: setup.php:61
 #, php-format
 msgid "%s you may not use dots in the database name"
-msgstr ""
+msgstr "%s no se puede utilizar puntos en el nombre de la base de datos"
 
-#: setup.php:62
+#: setup.php:64
 #, php-format
 msgid "%s set the database host."
-msgstr ""
+msgstr "%s ingresar el host de la base de datos."
 
-#: setup.php:126 setup.php:291 setup.php:336
+#: setup.php:128 setup.php:320 setup.php:365
 msgid "PostgreSQL username and/or password not valid"
-msgstr ""
+msgstr "Usuario y/o contraseña de PostgreSQL no válidos"
 
-#: setup.php:127 setup.php:150 setup.php:204
+#: setup.php:129 setup.php:152 setup.php:229
 msgid "You need to enter either an existing account or the administrator."
-msgstr ""
+msgstr "Tiene que ingresar una cuenta existente o la del administrador."
 
-#: setup.php:149 setup.php:423 setup.php:489
+#: setup.php:151 setup.php:453 setup.php:520
 msgid "Oracle username and/or password not valid"
-msgstr ""
+msgstr "Usuario y/o contraseña de Oracle no válidos"
 
-#: setup.php:203
+#: setup.php:228
 msgid "MySQL username and/or password not valid"
-msgstr ""
+msgstr "Usuario y/o contraseña de MySQL no válidos"
 
-#: setup.php:255 setup.php:357 setup.php:366 setup.php:384 setup.php:394
-#: setup.php:403 setup.php:430 setup.php:496 setup.php:522 setup.php:529
-#: setup.php:540 setup.php:547 setup.php:556 setup.php:564 setup.php:573
-#: setup.php:579
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
-msgstr ""
+msgstr "Error BD: \"%s\""
 
-#: setup.php:256 setup.php:358 setup.php:367 setup.php:385 setup.php:395
-#: setup.php:404 setup.php:431 setup.php:497 setup.php:523 setup.php:530
-#: setup.php:541 setup.php:557 setup.php:565 setup.php:574
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
-msgstr ""
+msgstr "Comando infractor: \"%s\""
 
-#: setup.php:270
+#: setup.php:299
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
-msgstr ""
+msgstr "Usuario MySQL '%s'@'localhost' ya existe."
 
-#: setup.php:271
+#: setup.php:300
 msgid "Drop this user from MySQL"
-msgstr ""
+msgstr "Eliminar este usuario de MySQL"
 
-#: setup.php:276
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
-msgstr ""
+msgstr "Usuario MySQL '%s'@'%%' ya existe"
 
-#: setup.php:277
+#: setup.php:306
 msgid "Drop this user from MySQL."
-msgstr ""
+msgstr "Eliminar este usuario de MySQL."
 
-#: setup.php:548 setup.php:580
+#: setup.php:579 setup.php:611
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
-msgstr ""
+msgstr "Comando infractor: \"%s\", nombre: %s, contraseña: %s"
+
+#: setup.php:631
+#, 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:644
+#: setup.php:849
 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:645
+#: setup.php:850
 #, 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>."
@@ -240,16 +247,16 @@ msgstr "este año"
 msgid "years ago"
 msgstr "hace años"
 
-#: updater.php:75
+#: 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:77
+#: updater.php:81
 msgid "up to date"
 msgstr "actualizado"
 
-#: updater.php:80
+#: updater.php:84
 msgid "updates check is disabled"
 msgstr "comprobar actualizaciones está desactivado"
 
diff --git a/l10n/es/settings.po b/l10n/es/settings.po
index 468cd0acfc3b070cd66ea729c12b603ae4f6979f..e4daad3709ac43c0f75d16f6b8d25681313231f8 100644
--- a/l10n/es/settings.po
+++ b/l10n/es/settings.po
@@ -4,13 +4,17 @@
 # 
 # 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.
@@ -20,9 +24,9 @@ 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:05+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -34,8 +38,8 @@ 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:15
-#: ajax/togglegroups.php:18
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr "Error de autenticación"
 
@@ -83,12 +87,12 @@ msgstr "Solicitud no válida"
 msgid "Admins can't remove themself from the admin group"
 msgstr "Los administradores no se pueden eliminar a ellos mismos del grupo de administrador"
 
-#: ajax/togglegroups.php:28
+#: ajax/togglegroups.php:30
 #, php-format
 msgid "Unable to add user to group %s"
 msgstr "Imposible añadir el usuario al grupo %s"
 
-#: ajax/togglegroups.php:34
+#: ajax/togglegroups.php:36
 #, php-format
 msgid "Unable to remove user from group %s"
 msgstr "Imposible eliminar al usuario del grupo %s"
@@ -129,7 +133,7 @@ msgstr "Error"
 msgid "Updated"
 msgstr "Actualizado"
 
-#: js/personal.js:96
+#: js/personal.js:99
 msgid "Saving..."
 msgstr "Guardando..."
 
@@ -143,7 +147,7 @@ msgstr "deshacer"
 
 #: js/users.js:62
 msgid "Unable to remove user"
-msgstr ""
+msgstr "No se puede quitar el usuario"
 
 #: js/users.js:75 templates/users.php:26 templates/users.php:80
 #: templates/users.php:105
@@ -158,23 +162,23 @@ msgstr "Grupo admin"
 msgid "Delete"
 msgstr "Eliminar"
 
-#: js/users.js:190
+#: js/users.js:191
 msgid "add group"
-msgstr ""
+msgstr "Añadir Grupo"
 
-#: js/users.js:351
+#: js/users.js:352
 msgid "A valid username must be provided"
-msgstr ""
+msgstr "Se debe usar un nombre de usuario  valido"
 
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
 msgid "Error creating user"
-msgstr ""
+msgstr "Error al crear usuario"
 
-#: js/users.js:357
+#: js/users.js:358
 msgid "A valid password must be provided"
-msgstr ""
+msgstr "Se debe usar una contraseña valida"
 
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
 msgid "__language_name__"
 msgstr "Castellano"
 
@@ -189,11 +193,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 están 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. 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."
 
 #: templates/admin.php:29
 msgid "Setup Warning"
-msgstr ""
+msgstr "Advertencia de Configuración"
 
 #: templates/admin.php:32
 msgid ""
@@ -208,31 +212,31 @@ msgstr "Por favor, vuelva a comprobar las <a href='%s'>guías de instalación</a
 
 #: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
-msgstr ""
+msgstr "Modulo 'fileinfo' perdido"
 
 #: 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 "El modulo PHP 'fileinfo' no se encuentra. Sugerimos habilitar este modulo para tener mejorres resultados con la detección mime-type"
 
 #: templates/admin.php:58
 msgid "Locale not working"
-msgstr ""
+msgstr "Configuración regional no está funcionando"
 
-#: templates/admin.php:61
+#: templates/admin.php:63
+#, php-format
 msgid ""
-"This ownCloud server can't set system locale to "
-"\"en_US.UTF-8\"/\"en_US.UTF8\". 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 en_US.UTF-8/en_US.UTF8."
-msgstr ""
+"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."
 
-#: templates/admin.php:72
+#: templates/admin.php:75
 msgid "Internet connection not working"
-msgstr ""
+msgstr "La conexion a internet no esta funcionando"
 
-#: templates/admin.php:75
+#: 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 "
@@ -240,100 +244,100 @@ 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 "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."
 
-#: templates/admin.php:89
+#: templates/admin.php:92
 msgid "Cron"
-msgstr ""
+msgstr "Cron"
 
-#: templates/admin.php:98
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
-msgstr ""
+msgstr "Ejecutar una tarea con cada página cargada"
 
-#: templates/admin.php:108
+#: 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 es un sistema webcron registrado. Llame a la página cron.php en la raíz de owncloud una vez por minuto sobre http."
 
-#: templates/admin.php:118
+#: 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 "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."
 
-#: templates/admin.php:125
+#: templates/admin.php:128
 msgid "Sharing"
-msgstr ""
+msgstr "Compartiendo"
 
-#: templates/admin.php:131
+#: templates/admin.php:134
 msgid "Enable Share API"
-msgstr ""
+msgstr "Activar API de Compartición"
 
-#: templates/admin.php:132
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
-msgstr ""
+msgstr "Permitir a las aplicaciones a que usen la API de Compartición"
 
-#: templates/admin.php:139
+#: templates/admin.php:142
 msgid "Allow links"
-msgstr ""
+msgstr "Permitir enlaces"
 
-#: templates/admin.php:140
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
-msgstr ""
+msgstr "Permitir a los usuarios compartir elementos al público con enlaces"
 
-#: templates/admin.php:147
+#: templates/admin.php:150
 msgid "Allow resharing"
-msgstr ""
+msgstr "Permitir re-compartición"
 
-#: templates/admin.php:148
+#: templates/admin.php:151
 msgid "Allow users to share items shared with them again"
-msgstr ""
+msgstr "Permitir a los usuarios compartir elementos ya compartidos con ellos mismos"
 
-#: templates/admin.php:155
+#: templates/admin.php:158
 msgid "Allow users to share with anyone"
-msgstr ""
+msgstr "Permitir a los usuarios compartir con todos"
 
-#: templates/admin.php:158
+#: templates/admin.php:161
 msgid "Allow users to only share with users in their groups"
-msgstr ""
+msgstr "Permitir a los usuarios compartir sólo con los usuarios en sus grupos"
 
-#: templates/admin.php:165
+#: templates/admin.php:168
 msgid "Security"
-msgstr ""
+msgstr "Seguridad"
 
-#: templates/admin.php:178
+#: templates/admin.php:181
 msgid "Enforce HTTPS"
-msgstr ""
+msgstr "Forzar HTTPS"
 
-#: templates/admin.php:179
+#: templates/admin.php:182
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
-msgstr ""
+msgstr "Forzar la conexión de los clientes a ownCloud con una conexión encriptada."
 
-#: templates/admin.php:182
+#: templates/admin.php:185
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
-msgstr ""
+msgstr "Por favor, conecte esta instancia de ownCloud vía HTTPS para activar o desactivar la aplicación SSL"
 
-#: templates/admin.php:192
+#: templates/admin.php:195
 msgid "Log"
-msgstr ""
+msgstr "Historial"
 
-#: templates/admin.php:193
+#: templates/admin.php:196
 msgid "Log level"
-msgstr ""
+msgstr "Nivel de Historial"
 
-#: templates/admin.php:220
+#: templates/admin.php:223
 msgid "More"
 msgstr "Más"
 
-#: templates/admin.php:227 templates/personal.php:98
+#: templates/admin.php:230 templates/personal.php:102
 msgid "Version"
 msgstr "Version"
 
-#: templates/admin.php:230 templates/personal.php:100
+#: templates/admin.php:233 templates/personal.php:105
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -343,51 +347,51 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "Desarrollado por la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidad ownCloud</a>, el <a href=\"https://github.com/owncloud\" target=\"_blank\">código fuente</a> está bajo licencia <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
-#: templates/apps.php:10
+#: templates/apps.php:11
 msgid "Add your App"
 msgstr "Añade tu aplicación"
 
-#: templates/apps.php:11
+#: templates/apps.php:12
 msgid "More Apps"
 msgstr "Más aplicaciones"
 
-#: templates/apps.php:24
+#: templates/apps.php:28
 msgid "Select an App"
 msgstr "Seleccionar una aplicación"
 
-#: templates/apps.php:28
+#: templates/apps.php:34
 msgid "See application page at apps.owncloud.com"
 msgstr "Echa un vistazo a la web de aplicaciones apps.owncloud.com"
 
-#: templates/apps.php:29
+#: templates/apps.php:36
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-licenciado por <span class=\"author\"></span>"
 
-#: templates/apps.php:31
+#: templates/apps.php:38
 msgid "Update"
 msgstr "Actualizar"
 
-#: templates/help.php:3
+#: templates/help.php:4
 msgid "User Documentation"
 msgstr "Documentación del usuario"
 
-#: templates/help.php:4
+#: templates/help.php:6
 msgid "Administrator Documentation"
 msgstr "Documentación del adminsitrador"
 
-#: templates/help.php:6
+#: templates/help.php:9
 msgid "Online Documentation"
 msgstr "Documentación en linea"
 
-#: templates/help.php:7
+#: templates/help.php:11
 msgid "Forum"
 msgstr "Foro"
 
-#: templates/help.php:9
+#: templates/help.php:14
 msgid "Bugtracker"
 msgstr "Rastreador de Bugs"
 
-#: templates/help.php:11
+#: templates/help.php:17
 msgid "Commercial Support"
 msgstr "Soporte Comercial"
 
@@ -396,79 +400,79 @@ msgstr "Soporte Comercial"
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Ha usado <strong>%s</strong> de <strong>%s</strong> disponibles"
 
-#: templates/personal.php:14
+#: templates/personal.php:15
 msgid "Get the apps to sync your files"
-msgstr ""
+msgstr "Obtener las apps para sincronizar sus archivos"
 
-#: templates/personal.php:25
+#: templates/personal.php:26
 msgid "Show First Run Wizard again"
 msgstr "Mostrar asistente para iniciar otra vez"
 
-#: templates/personal.php:36 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
 msgid "Password"
 msgstr "Contraseña"
 
-#: templates/personal.php:37
+#: templates/personal.php:38
 msgid "Your password was changed"
 msgstr "Su contraseña ha sido cambiada"
 
-#: templates/personal.php:38
+#: templates/personal.php:39
 msgid "Unable to change your password"
 msgstr "No se ha podido cambiar tu contraseña"
 
-#: templates/personal.php:39
+#: templates/personal.php:40
 msgid "Current password"
 msgstr "Contraseña actual"
 
-#: templates/personal.php:40
+#: templates/personal.php:42
 msgid "New password"
 msgstr "Nueva contraseña:"
 
-#: templates/personal.php:42
+#: templates/personal.php:44
 msgid "Change password"
 msgstr "Cambiar contraseña"
 
-#: templates/personal.php:54 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:78
 msgid "Display Name"
 msgstr "Nombre a mostrar"
 
-#: templates/personal.php:55
+#: templates/personal.php:57
 msgid "Your display name was changed"
 msgstr "Su nombre fue cambiado"
 
-#: templates/personal.php:56
+#: templates/personal.php:58
 msgid "Unable to change your display name"
 msgstr "Incapaz de cambiar su nombre"
 
-#: templates/personal.php:59
+#: templates/personal.php:61
 msgid "Change display name"
 msgstr "Cambiar nombre"
 
-#: templates/personal.php:68
+#: templates/personal.php:70
 msgid "Email"
 msgstr "Correo electrónico"
 
-#: templates/personal.php:69
+#: templates/personal.php:72
 msgid "Your email address"
 msgstr "Tu dirección de correo"
 
-#: templates/personal.php:70
+#: templates/personal.php:73
 msgid "Fill in an email address to enable password recovery"
 msgstr "Escribe una dirección de correo electrónico para restablecer la contraseña"
 
-#: templates/personal.php:76 templates/personal.php:77
+#: templates/personal.php:79 templates/personal.php:80
 msgid "Language"
 msgstr "Idioma"
 
-#: templates/personal.php:82
+#: templates/personal.php:86
 msgid "Help translate"
 msgstr "Ayúdanos a traducir"
 
-#: templates/personal.php:87
+#: templates/personal.php:91
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:89
+#: templates/personal.php:93
 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"
 
diff --git a/l10n/es/user_ldap.po b/l10n/es/user_ldap.po
index 139d0cb69b8ea8dd3ef1be1e0b915d941f033513..be0e253e524a8cb6b4468f5801adf6f6b553c19f 100644
--- a/l10n/es/user_ldap.po
+++ b/l10n/es/user_ldap.po
@@ -7,7 +7,7 @@
 # Javier Llorente <javier@opensuse.org>, 2012.
 #   <juanma@kde.org.ar>, 2012.
 #   <manudeloz86@gmail.com>, 2012.
-# Raul Fernandez Garcia <raulfg3@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.
@@ -15,9 +15,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: 2013-02-08 00:30+0000\n"
-"Last-Translator: msvladimir <vladimirmartinezsierra@gmail.com>\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"
 "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"
@@ -29,17 +29,17 @@ msgstr ""
 msgid "Failed to delete the server configuration"
 msgstr "No se pudo borrar la configuración del servidor"
 
-#: ajax/testConfiguration.php:35
+#: ajax/testConfiguration.php:36
 msgid "The configuration is valid and the connection could be established!"
 msgstr "La configuración es válida y la conexión puede establecerse!"
 
-#: ajax/testConfiguration.php:37
+#: ajax/testConfiguration.php:39
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
 msgstr "La configuración es válida, pero falló el Enlace. Por favor, compruebe la configuración del servidor y las credenciales."
 
-#: ajax/testConfiguration.php:40
+#: ajax/testConfiguration.php:43
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
@@ -94,224 +94,248 @@ msgstr "<b>Advertencia:</b> El módulo LDAP de PHP no está instalado, el sistem
 msgid "Server configuration"
 msgstr "Configuración del Servidor"
 
-#: templates/settings.php:17
+#: templates/settings.php:31
 msgid "Add Server Configuration"
 msgstr "Agregar configuracion del servidor"
 
-#: templates/settings.php:21
+#: templates/settings.php:36
 msgid "Host"
-msgstr "Máquina"
+msgstr "Servidor"
 
-#: templates/settings.php:21
+#: templates/settings.php:38
 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:22
+#: templates/settings.php:39
 msgid "Base DN"
 msgstr "DN base"
 
-#: templates/settings.php:22
+#: templates/settings.php:40
 msgid "One Base DN per line"
 msgstr "Un DN Base por línea"
 
-#: templates/settings.php:22
+#: templates/settings.php:41
 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:23
+#: templates/settings.php:43
 msgid "User DN"
 msgstr "DN usuario"
 
-#: templates/settings.php:23
+#: 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 "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:24
+#: templates/settings.php:46
 msgid "Password"
 msgstr "Contraseña"
 
-#: templates/settings.php:24
+#: templates/settings.php:49
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "Para acceso anónimo, deje DN y contraseña vacíos."
 
-#: templates/settings.php:25
+#: templates/settings.php:50
 msgid "User Login Filter"
 msgstr "Filtro de inicio de sesión de usuario"
 
-#: templates/settings.php:25
+#: 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 "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:25
+#: templates/settings.php:54
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "usar %%uid como placeholder, ej: \"uid=%%uid\""
 
-#: templates/settings.php:26
+#: templates/settings.php:55
 msgid "User List Filter"
 msgstr "Lista de filtros de usuario"
 
-#: templates/settings.php:26
+#: templates/settings.php:58
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Define el filtro a aplicar, cuando se obtienen usuarios."
 
-#: templates/settings.php:26
+#: templates/settings.php:59
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "Sin placeholder, ej: \"objectClass=person\"."
 
-#: templates/settings.php:27
+#: templates/settings.php:60
 msgid "Group Filter"
 msgstr "Filtro de grupo"
 
-#: templates/settings.php:27
+#: templates/settings.php:63
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Define el filtro a aplicar, cuando se obtienen grupos."
 
-#: templates/settings.php:27
+#: templates/settings.php:64
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "Con cualquier placeholder, ej: \"objectClass=posixGroup\"."
 
-#: templates/settings.php:31
+#: templates/settings.php:68
 msgid "Connection Settings"
 msgstr "Configuracion de coneccion"
 
-#: templates/settings.php:33
+#: templates/settings.php:70
 msgid "Configuration Active"
 msgstr "Configuracion activa"
 
-#: templates/settings.php:33
+#: templates/settings.php:70
 msgid "When unchecked, this configuration will be skipped."
 msgstr "Cuando deseleccione, esta configuracion sera omitida."
 
-#: templates/settings.php:34
+#: templates/settings.php:71
 msgid "Port"
 msgstr "Puerto"
 
-#: templates/settings.php:35
+#: templates/settings.php:72
 msgid "Backup (Replica) Host"
 msgstr "Host para backup (Replica)"
 
-#: templates/settings.php:35
+#: templates/settings.php:72
 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:36
+#: templates/settings.php:73
 msgid "Backup (Replica) Port"
 msgstr "Puerto para backup (Replica)"
 
-#: templates/settings.php:37
+#: templates/settings.php:74
 msgid "Disable Main Server"
 msgstr "Deshabilitar servidor principal"
 
-#: templates/settings.php:37
+#: templates/settings.php:74
 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:38
+#: templates/settings.php:75
 msgid "Use TLS"
 msgstr "Usar TLS"
 
-#: templates/settings.php:38
+#: templates/settings.php:75
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr "No usar adicionalmente para conecciones LDAPS, estas fallaran"
 
-#: templates/settings.php:39
+#: templates/settings.php:76
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Servidor de LDAP sensible a mayúsculas/minúsculas (Windows)"
 
-#: templates/settings.php:40
+#: templates/settings.php:77
 msgid "Turn off SSL certificate validation."
 msgstr "Apagar la validación por certificado SSL."
 
-#: templates/settings.php:40
+#: templates/settings.php:77
 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:40
+#: templates/settings.php:77
 msgid "Not recommended, use for testing only."
 msgstr "No recomendado, sólo para pruebas."
 
-#: templates/settings.php:41
+#: templates/settings.php:78
+msgid "Cache Time-To-Live"
+msgstr "Cache TTL"
+
+#: templates/settings.php:78
 msgid "in seconds. A change empties the cache."
 msgstr "en segundos. Un cambio vacía la cache."
 
-#: templates/settings.php:43
+#: templates/settings.php:80
 msgid "Directory Settings"
 msgstr "Configuracion de directorio"
 
-#: templates/settings.php:45
+#: templates/settings.php:82
 msgid "User Display Name Field"
 msgstr "Campo de nombre de usuario a mostrar"
 
-#: templates/settings.php:45
+#: templates/settings.php:82
 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:46
+#: templates/settings.php:83
 msgid "Base User Tree"
 msgstr "Árbol base de usuario"
 
-#: templates/settings.php:46
+#: templates/settings.php:83
 msgid "One User Base DN per line"
 msgstr "Un DN Base de Usuario por línea"
 
-#: templates/settings.php:47
+#: templates/settings.php:84
 msgid "User Search Attributes"
 msgstr "Atributos de la busqueda de usuario"
 
-#: templates/settings.php:47 templates/settings.php:50
+#: templates/settings.php:84 templates/settings.php:87
 msgid "Optional; one attribute per line"
 msgstr "Opcional; un atributo por linea"
 
-#: templates/settings.php:48
+#: templates/settings.php:85
 msgid "Group Display Name Field"
 msgstr "Campo de nombre de grupo a mostrar"
 
-#: templates/settings.php:48
+#: templates/settings.php:85
 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:49
+#: templates/settings.php:86
 msgid "Base Group Tree"
 msgstr "Árbol base de grupo"
 
-#: templates/settings.php:49
+#: templates/settings.php:86
 msgid "One Group Base DN per line"
 msgstr "Un DN Base de Grupo por línea"
 
-#: templates/settings.php:50
+#: templates/settings.php:87
 msgid "Group Search Attributes"
 msgstr "Atributos de busqueda de grupo"
 
-#: templates/settings.php:51
+#: templates/settings.php:88
 msgid "Group-Member association"
 msgstr "Asociación Grupo-Miembro"
 
-#: templates/settings.php:53
+#: templates/settings.php:90
 msgid "Special Attributes"
 msgstr "Atributos especiales"
 
-#: templates/settings.php:56
+#: templates/settings.php:92
+msgid "Quota Field"
+msgstr "Cuota"
+
+#: templates/settings.php:93
+msgid "Quota Default"
+msgstr "Cuota por defecto"
+
+#: templates/settings.php:93
 msgid "in bytes"
 msgstr "en bytes"
 
-#: templates/settings.php:58
+#: templates/settings.php:94
+msgid "Email Field"
+msgstr "E-mail"
+
+#: templates/settings.php:95
+msgid "User Home Folder Naming Rule"
+msgstr ""
+
+#: templates/settings.php:95
 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:62
+#: templates/settings.php:99
+msgid "Test Configuration"
+msgstr "Configuración de prueba"
+
+#: templates/settings.php:99
 msgid "Help"
 msgstr "Ayuda"
diff --git a/l10n/es_AR/core.po b/l10n/es_AR/core.po
index 0e2ac46282a7962eb2225223e057d9199a604d67..7a12fa0ee597f7ece6bdc8b03a8a4fa06c284be1 100644
--- a/l10n/es_AR/core.po
+++ b/l10n/es_AR/core.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 14:32+0000\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"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
@@ -389,7 +389,7 @@ msgstr "La actualización no pudo ser completada. Por favor, reportá el inconve
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "La actualización fue exitosa. Estás siendo redirigido a ownCloud."
 
-#: lostpassword/controller.php:47
+#: lostpassword/controller.php:48
 msgid "ownCloud password reset"
 msgstr "Restablecer contraseña de ownCloud"
 
diff --git a/l10n/es_AR/files.po b/l10n/es_AR/files.po
index 116e75e86cbe6ec78bf02d9ac3b4a73778588c41..4e357c00924a9f5e28625678a76c384104e7c2b9 100644
--- a/l10n/es_AR/files.po
+++ b/l10n/es_AR/files.po
@@ -6,12 +6,13 @@
 # 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.
 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 23:05+0000\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: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
@@ -53,27 +54,27 @@ msgid ""
 "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"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
 msgstr "El archivo que intentás subir solo se subió parcialmente"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:31
 msgid "No file was uploaded"
 msgstr "El archivo no fue subido"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:32
 msgid "Missing a temporary folder"
 msgstr "Falta un directorio temporal"
 
-#: ajax/upload.php:34
+#: ajax/upload.php:33
 msgid "Failed to write to disk"
 msgstr "Error al escribir en el disco"
 
-#: ajax/upload.php:52
+#: ajax/upload.php:51
 msgid "Not enough storage available"
 msgstr "No hay suficiente capacidad de almacenamiento"
 
-#: ajax/upload.php:83
+#: ajax/upload.php:82
 msgid "Invalid directory."
 msgstr "Directorio invalido."
 
@@ -85,7 +86,7 @@ msgstr "Archivos"
 msgid "Delete permanently"
 msgstr "Borrar de manera permanente"
 
-#: js/fileactions.js:127 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:127 templates/index.php:92 templates/index.php:93
 msgid "Delete"
 msgstr "Borrar"
 
@@ -93,40 +94,36 @@ msgstr "Borrar"
 msgid "Rename"
 msgstr "Cambiar nombre"
 
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
 msgid "Pending"
 msgstr "Pendiente"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "{new_name} already exists"
 msgstr "{new_name} ya existe"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "replace"
 msgstr "reemplazar"
 
-#: js/filelist.js:253
+#: js/filelist.js:251
 msgid "suggest name"
 msgstr "sugerir nombre"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "cancel"
 msgstr "cancelar"
 
-#: js/filelist.js:295
-msgid "replaced {new_name}"
-msgstr "reemplazado {new_name}"
+#: js/filelist.js:298
+msgid "replaced {new_name} with {old_name}"
+msgstr "reemplazado {new_name} con {old_name}"
 
-#: js/filelist.js:295 js/filelist.js:297
+#: js/filelist.js:298
 msgid "undo"
 msgstr "deshacer"
 
-#: js/filelist.js:297
-msgid "replaced {new_name} with {old_name}"
-msgstr "reemplazado {new_name} con {old_name}"
-
-#: js/filelist.js:322
+#: js/filelist.js:323
 msgid "perform delete operation"
 msgstr "Eliminar"
 
@@ -152,74 +149,74 @@ 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:224
+#: js/files.js:225
 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:261
+#: js/files.js:262
 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:261
+#: js/files.js:262
 msgid "Upload Error"
 msgstr "Error al subir el archivo"
 
-#: js/files.js:272
+#: js/files.js:273
 msgid "Close"
 msgstr "Cerrar"
 
-#: js/files.js:311
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr "Subiendo 1 archivo"
 
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr "Subiendo {count} archivos"
 
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "La subida fue cancelada"
 
-#: js/files.js:496
+#: js/files.js:497
 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:569
+#: js/files.js:570
 msgid "URL cannot be empty."
 msgstr "La URL no puede estar vacía"
 
-#: js/files.js:574
+#: js/files.js:575
 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:948 templates/index.php:67
+#: js/files.js:953 templates/index.php:68
 msgid "Name"
 msgstr "Nombre"
 
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:954 templates/index.php:79
 msgid "Size"
 msgstr "Tamaño"
 
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:955 templates/index.php:81
 msgid "Modified"
 msgstr "Modificado"
 
-#: js/files.js:969
+#: js/files.js:974
 msgid "1 folder"
 msgstr "1 directorio"
 
-#: js/files.js:971
+#: js/files.js:976
 msgid "{count} folders"
 msgstr "{count} directorios"
 
-#: js/files.js:979
+#: js/files.js:984
 msgid "1 file"
 msgstr "1 archivo"
 
-#: js/files.js:981
+#: js/files.js:986
 msgid "{count} files"
 msgstr "{count} archivos"
 
@@ -277,39 +274,43 @@ msgstr "Desde enlace"
 
 #: templates/index.php:40
 msgid "Deleted files"
-msgstr ""
+msgstr "Archivos Borrados"
 
 #: templates/index.php:46
 msgid "Cancel upload"
 msgstr "Cancelar subida"
 
-#: templates/index.php:59
+#: templates/index.php:53
+msgid "You don’t have write permissions here."
+msgstr ""
+
+#: templates/index.php:60
 msgid "Nothing in here. Upload something!"
 msgstr "No hay nada. ¡Subí contenido!"
 
-#: templates/index.php:73
+#: templates/index.php:74
 msgid "Download"
 msgstr "Descargar"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:86 templates/index.php:87
 msgid "Unshare"
 msgstr "Dejar de compartir"
 
-#: templates/index.php:105
+#: templates/index.php:106
 msgid "Upload too large"
 msgstr "El archivo es demasiado grande"
 
-#: templates/index.php:107
+#: templates/index.php:108
 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:112
+#: templates/index.php:113
 msgid "Files are being scanned, please wait."
 msgstr "Se están escaneando los archivos, por favor esperá."
 
-#: templates/index.php:115
+#: templates/index.php:116
 msgid "Current scanning"
 msgstr "Escaneo actual"
 
diff --git a/l10n/es_AR/files_external.po b/l10n/es_AR/files_external.po
index 591c481a64819f78977758c199a18df643f66e43..b7bbefe15e6671d8dd5315ec0ff64dac48144088 100644
--- a/l10n/es_AR/files_external.po
+++ b/l10n/es_AR/files_external.po
@@ -5,13 +5,14 @@
 # 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: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-11 23:47+0000\n"
-"Last-Translator: Agustin Ferrario <agustin.ferrario@hotmail.com.ar>\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"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,37 +20,33 @@ msgstr ""
 "Language: es_AR\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 "Acceso permitido"
 
-#: 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 "Error al configurar el almacenamiento de Dropbox"
 
-#: 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 "Permitir acceso"
 
-#: js/dropbox.js:73 js/google.js:72
-msgid "Fill out all required fields"
-msgstr "Rellenar todos los campos requeridos"
-
-#: js/dropbox.js:85
+#: js/dropbox.js:101
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr "Por favor, proporcioná un secreto y una contraseña válida para la aplicación Dropbox."
 
-#: 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 "Error al configurar el almacenamiento de Google Drive"
 
-#: lib/config.php:434
+#: lib/config.php:421
 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:435
+#: lib/config.php:424
 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 "
@@ -60,63 +57,63 @@ msgstr "<b>Advertencia:</b> El soporte de FTP en PHP no se encuentra instalado.
 msgid "External Storage"
 msgstr "Almacenamiento externo"
 
-#: templates/settings.php:8 templates/settings.php:22
-msgid "Mount point"
-msgstr "Punto de montaje"
-
-#: templates/settings.php:9
-msgid "Backend"
-msgstr "Motor"
+#: templates/settings.php:9 templates/settings.php:28
+msgid "Folder name"
+msgstr "Nombre de la carpeta"
 
 #: templates/settings.php:10
+msgid "External storage"
+msgstr "Almacenamiento externo"
+
+#: templates/settings.php:11
 msgid "Configuration"
 msgstr "Configuración"
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid "Options"
 msgstr "Opciones"
 
-#: templates/settings.php:12
+#: templates/settings.php:13
 msgid "Applicable"
 msgstr "Aplicable"
 
-#: templates/settings.php:27
-msgid "Add mount point"
-msgstr "Añadir punto de montaje"
+#: templates/settings.php:33
+msgid "Add storage"
+msgstr "Añadir almacenamiento"
 
-#: templates/settings.php:85
+#: templates/settings.php:90
 msgid "None set"
 msgstr "No fue configurado"
 
-#: templates/settings.php:86
+#: templates/settings.php:91
 msgid "All Users"
 msgstr "Todos los usuarios"
 
-#: templates/settings.php:87
+#: templates/settings.php:92
 msgid "Groups"
 msgstr "Grupos"
 
-#: templates/settings.php:95
+#: templates/settings.php:100
 msgid "Users"
 msgstr "Usuarios"
 
-#: 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 "Borrar"
 
-#: templates/settings.php:124
+#: templates/settings.php:129
 msgid "Enable User External Storage"
 msgstr "Habilitar almacenamiento de usuario externo"
 
-#: templates/settings.php:125
+#: templates/settings.php:130
 msgid "Allow users to mount their own external storage"
 msgstr "Permitir a los usuarios montar su propio almacenamiento externo"
 
-#: templates/settings.php:139
+#: templates/settings.php:141
 msgid "SSL root certificates"
 msgstr "certificados SSL raíz"
 
-#: templates/settings.php:158
+#: templates/settings.php:159
 msgid "Import Root Certificate"
 msgstr "Importar certificado raíz"
diff --git a/l10n/es_AR/files_trashbin.po b/l10n/es_AR/files_trashbin.po
index 138bd484b72eae4014b8b2bf63b6e854f790fecc..ad68177e2e7379626ab56160fffc6af17b5c2418 100644
--- a/l10n/es_AR/files_trashbin.po
+++ b/l10n/es_AR/files_trashbin.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-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 10:07+0000\n"
-"Last-Translator: cjtess <claudio.tessone@gmail.com>\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: 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"
@@ -18,7 +18,7 @@ msgstr ""
 "Language: es_AR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:22
+#: ajax/delete.php:40
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "No fue posible borrar %s de manera permanente"
@@ -28,35 +28,39 @@ msgstr "No fue posible borrar %s de manera permanente"
 msgid "Couldn't restore %s"
 msgstr "No se pudo restaurar %s"
 
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
 msgid "perform restore operation"
 msgstr "Restaurar"
 
-#: js/trash.js:33
+#: js/trash.js:34
 msgid "delete file permanently"
 msgstr "Borrar archivo de manera permanente"
 
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr "Borrar de manera permanente"
+
+#: js/trash.js:174 templates/index.php:17
 msgid "Name"
 msgstr "Nombre"
 
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:175 templates/index.php:27
 msgid "Deleted"
 msgstr "Borrado"
 
-#: js/trash.js:135
+#: js/trash.js:184
 msgid "1 folder"
 msgstr "1 directorio"
 
-#: js/trash.js:137
+#: js/trash.js:186
 msgid "{count} folders"
 msgstr "{count} directorios"
 
-#: js/trash.js:145
+#: js/trash.js:194
 msgid "1 file"
 msgstr "1 archivo"
 
-#: js/trash.js:147
+#: js/trash.js:196
 msgid "{count} files"
 msgstr "{count} archivos"
 
@@ -67,3 +71,11 @@ msgstr "No hay nada acá. ¡La papelera está vacía!"
 #: templates/index.php:20 templates/index.php:22
 msgid "Restore"
 msgstr "Recuperar"
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr "Borrar"
+
+#: templates/part.breadcrumb.php:9
+msgid "Deleted Files"
+msgstr ""
diff --git a/l10n/es_AR/files_versions.po b/l10n/es_AR/files_versions.po
index 849cd6a3ecad569c50580c66ffb88957f196fb2d..db63d14a041af12ef8ad5ad95450d340e97880bd 100644
--- a/l10n/es_AR/files_versions.po
+++ b/l10n/es_AR/files_versions.po
@@ -5,13 +5,14 @@
 # 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-02-12 00:20+0100\n"
-"PO-Revision-Date: 2013-02-11 15:50+0000\n"
-"Last-Translator: cjtess <claudio.tessone@gmail.com>\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"
 "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"
@@ -50,18 +51,10 @@ msgstr "No hay versiones antiguas disponibles"
 msgid "No path specified"
 msgstr "Ruta de acceso no especificada"
 
-#: js/versions.js:16
-msgid "History"
-msgstr "Historia"
+#: js/versions.js:6
+msgid "Versions"
+msgstr "Versiones"
 
 #: templates/history.php:20
 msgid "Revert a file to a previous version by clicking on its revert button"
 msgstr "Revertí un archivo a una versión anterior haciendo click en su botón de \"revertir\""
-
-#: templates/settings.php:3
-msgid "Files Versioning"
-msgstr "Versionado de archivos"
-
-#: templates/settings.php:4
-msgid "Enable"
-msgstr "Activar"
diff --git a/l10n/es_AR/lib.po b/l10n/es_AR/lib.po
index a997d69e93d98d63dcce7123fc9e50a8ad9263ef..0c99dc48fd1161fdce517b029c2ed48f08c65595 100644
--- a/l10n/es_AR/lib.po
+++ b/l10n/es_AR/lib.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-15 00:05+0100\n"
-"PO-Revision-Date: 2013-02-14 20:50+0000\n"
-"Last-Translator: deftoner <koryyyy@gmail.com>\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"
 "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"
@@ -101,87 +101,92 @@ msgstr "Configurar una palabra clave de administrador"
 msgid "Specify a data folder."
 msgstr "Especificar un directorio de datos"
 
-#: setup.php:53
+#: setup.php:55
 #, php-format
 msgid "%s enter the database username."
 msgstr "%s Entre el Usuario de la Base de Datos"
 
-#: setup.php:56
+#: setup.php:58
 #, php-format
 msgid "%s enter the database name."
 msgstr "%s Entre el Nombre de la Base de Datos"
 
-#: setup.php:59
+#: setup.php:61
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr "%s no puede usar puntos en el nombre de la Base de Datos"
 
-#: setup.php:62
+#: setup.php:64
 #, php-format
 msgid "%s set the database host."
 msgstr "%s Especifique la dirección de la Base de Datos"
 
-#: setup.php:126 setup.php:294 setup.php:339
+#: setup.php:128 setup.php:320 setup.php:365
 msgid "PostgreSQL username and/or password not valid"
 msgstr "Nombre de usuario o contraseña de PostgradeSQL no válido."
 
-#: setup.php:127 setup.php:150 setup.php:204
+#: setup.php:129 setup.php:152 setup.php:229
 msgid "You need to enter either an existing account or the administrator."
 msgstr "Debe ingresar una cuenta existente o el administrador"
 
-#: setup.php:149 setup.php:427 setup.php:494
+#: setup.php:151 setup.php:453 setup.php:520
 msgid "Oracle username and/or password not valid"
-msgstr ""
+msgstr "El nombre de usuario y contraseña no son válidos"
 
-#: setup.php:203
+#: setup.php:228
 msgid "MySQL username and/or password not valid"
 msgstr "Usuario y/o contraseña MySQL no válido"
 
-#: setup.php:257 setup.php:360 setup.php:369 setup.php:387 setup.php:397
-#: setup.php:406 setup.php:435 setup.php:501 setup.php:527 setup.php:534
-#: setup.php:545 setup.php:552 setup.php:561 setup.php:569 setup.php:578
-#: setup.php:584
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Error DB: \"%s\""
 
-#: setup.php:258 setup.php:361 setup.php:370 setup.php:388 setup.php:398
-#: setup.php:407 setup.php:436 setup.php:502 setup.php:528 setup.php:535
-#: setup.php:546 setup.php:562 setup.php:570 setup.php:579
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
-msgstr ""
+msgstr "El comando no comprendido es: \"%s\""
 
-#: setup.php:273
+#: setup.php:299
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "Usuario MySQL '%s'@'localhost' ya existente"
 
-#: setup.php:274
+#: setup.php:300
 msgid "Drop this user from MySQL"
 msgstr "Borrar este usuario de MySQL"
 
-#: setup.php:279
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "Usuario MySQL '%s'@'%%' ya existente"
 
-#: setup.php:280
+#: setup.php:306
 msgid "Drop this user from MySQL."
 msgstr "Borrar este usuario de MySQL"
 
-#: setup.php:553 setup.php:585
+#: setup.php:579 setup.php:611
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
-msgstr ""
+msgstr "El comando no comprendido es: \"%s\", nombre: \"%s\", contraseña: \"%s\""
+
+#: setup.php:631
+#, 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:649
+#: setup.php:849
 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:651
+#: setup.php:850
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Por favor, comprobá nuevamente la <a href='%s'>guía de instalación</a>."
diff --git a/l10n/es_AR/settings.po b/l10n/es_AR/settings.po
index 63f5ab1289e5ac818e2d500213cb4d8dd667f58d..3bef9b9d41e15dd12ee1299e584b46a45767c8fb 100644
--- a/l10n/es_AR/settings.po
+++ b/l10n/es_AR/settings.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:05+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\n"
-"Last-Translator: deftoner <koryyyy@gmail.com>\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"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,8 +25,8 @@ 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:15
-#: ajax/togglegroups.php:18
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr "Error al autenticar"
 
@@ -74,12 +74,12 @@ msgstr "Solicitud no válida"
 msgid "Admins can't remove themself from the admin group"
 msgstr "Los administradores no se pueden quitar a ellos mismos del grupo administrador. "
 
-#: ajax/togglegroups.php:28
+#: ajax/togglegroups.php:30
 #, php-format
 msgid "Unable to add user to group %s"
 msgstr "No fue posible añadir el usuario al grupo %s"
 
-#: ajax/togglegroups.php:34
+#: ajax/togglegroups.php:36
 #, php-format
 msgid "Unable to remove user from group %s"
 msgstr "No es posible eliminar al usuario del grupo %s"
@@ -120,7 +120,7 @@ msgstr "Error"
 msgid "Updated"
 msgstr "Actualizado"
 
-#: js/personal.js:96
+#: js/personal.js:99
 msgid "Saving..."
 msgstr "Guardando..."
 
@@ -165,7 +165,7 @@ msgstr "Error creando usuario"
 msgid "A valid password must be provided"
 msgstr "Debe ingresar una contraseña válida"
 
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
 msgid "__language_name__"
 msgstr "Castellano (Argentina)"
 
@@ -211,19 +211,19 @@ msgstr "El modulo PHP 'fileinfo' no existe. Es muy recomendable que active este
 msgid "Locale not working"
 msgstr "\"Locale\" no está funcionando"
 
-#: templates/admin.php:61
+#: templates/admin.php:63
+#, php-format
 msgid ""
-"This ownCloud server can't set system locale to "
-"\"en_US.UTF-8\"/\"en_US.UTF8\". 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 en_US.UTF-8/en_US.UTF8."
-msgstr "El servidor ownCloud no puede establecer el sistema locale a \"en_US.UTF-8\"/\"en_US.UTF8\". Esto significa que debe haber u problema con ciertos caracteres en los nombres de archivo. Le recomendamos instalar en su sitema los paquetes requeridos para soportar en_US.UTF-8/en_US.UTF8."
+"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 "El servidor ownCloud no pude asignar la localización de sistema a %s. Esto puede hacer que hayan problemas con algunos caracteres en los nombres de los archivos. Te sugerimos que instales los paquetes necesarios en tu sistema para dar soporte a %s."
 
-#: templates/admin.php:72
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr "La conexión a Internet no esta funcionando. "
 
-#: templates/admin.php:75
+#: 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 "
@@ -231,100 +231,100 @@ 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 "Este servidor ownCloud no tiene una conexión a internet que funcione. Esto significa que alguno de sus servicios como montar dispositivos externos, notificaciones de actualizaciones o instalar aplicaciones de otros desarrolladores no funcionan. Acceder a archivos remotos y mandar e-mails puede ser que tampoco funcione. Te sugerimos que actives una conexión a internet si querés estas características  de ownCloud."
 
-#: templates/admin.php:89
+#: templates/admin.php:92
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:98
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr "Ejecute una tarea con cada pagina cargada."
 
-#: templates/admin.php:108
+#: 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 está registrado como un servicio webcron. Llamar la página cron.php en la raíz de ownCloud una vez al minuto sobre http."
 
-#: templates/admin.php:118
+#: 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 "Usa el servicio de sistema cron. Llama al archivo cron.php en la carpeta de ownCloud a través del sistema cronjob cada un minuto."
 
-#: templates/admin.php:125
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr "Compartiendo"
 
-#: templates/admin.php:131
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr "Habilitar Share API"
 
-#: templates/admin.php:132
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr "Permitir a las aplicaciones usar la Share API"
 
-#: templates/admin.php:139
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr "Permitir enlaces"
 
-#: templates/admin.php:140
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr "Permitir a los usuarios compartir enlaces públicos"
 
-#: templates/admin.php:147
+#: templates/admin.php:150
 msgid "Allow resharing"
 msgstr "Permitir Re-Compartir"
 
-#: templates/admin.php:148
+#: templates/admin.php:151
 msgid "Allow users to share items shared with them again"
 msgstr "Permite a los usuarios volver a compartir items que le han compartido"
 
-#: templates/admin.php:155
+#: templates/admin.php:158
 msgid "Allow users to share with anyone"
 msgstr "Permitir a los usuarios compartir con todos."
 
-#: templates/admin.php:158
+#: templates/admin.php:161
 msgid "Allow users to only share with users in their groups"
 msgstr "Permitir a los usuarios compartir solo con los de su propio grupo"
 
-#: templates/admin.php:165
+#: templates/admin.php:168
 msgid "Security"
 msgstr "Seguridad"
 
-#: templates/admin.php:178
+#: templates/admin.php:181
 msgid "Enforce HTTPS"
 msgstr "Forzar HTTPS"
 
-#: templates/admin.php:179
+#: templates/admin.php:182
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr "Forzar a los clientes conectar a ownCloud vía conexión encriptada"
 
-#: templates/admin.php:182
+#: templates/admin.php:185
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
-msgstr ""
+msgstr "Por favor conectese a este ownCloud vía HTTPS para habilitar o des-habilitar el forzado de SSL"
 
-#: templates/admin.php:192
+#: templates/admin.php:195
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:193
+#: templates/admin.php:196
 msgid "Log level"
 msgstr "Nivel de Log"
 
-#: templates/admin.php:220
+#: templates/admin.php:223
 msgid "More"
 msgstr "Más"
 
-#: templates/admin.php:227 templates/personal.php:98
+#: templates/admin.php:230 templates/personal.php:102
 msgid "Version"
 msgstr "Versión"
 
-#: templates/admin.php:230 templates/personal.php:100
+#: templates/admin.php:233 templates/personal.php:105
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -334,51 +334,51 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "Desarrollado por la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidad ownCloud</a>, el <a href=\"https://github.com/owncloud\" target=\"_blank\">código fuente</a> está bajo licencia <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
-#: templates/apps.php:10
+#: templates/apps.php:11
 msgid "Add your App"
 msgstr "Añadí tu aplicación"
 
-#: templates/apps.php:11
+#: templates/apps.php:12
 msgid "More Apps"
 msgstr "Más aplicaciones"
 
-#: templates/apps.php:24
+#: templates/apps.php:28
 msgid "Select an App"
 msgstr "Seleccionar una aplicación"
 
-#: templates/apps.php:28
+#: templates/apps.php:34
 msgid "See application page at apps.owncloud.com"
 msgstr "Mirá la web de aplicaciones apps.owncloud.com"
 
-#: templates/apps.php:29
+#: templates/apps.php:36
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-licenciado por <span class=\"author\">"
 
-#: templates/apps.php:31
+#: templates/apps.php:38
 msgid "Update"
 msgstr "Actualizar"
 
-#: templates/help.php:3
+#: templates/help.php:4
 msgid "User Documentation"
 msgstr "Documentación de Usuario"
 
-#: templates/help.php:4
+#: templates/help.php:6
 msgid "Administrator Documentation"
 msgstr "Documentación de Administrador"
 
-#: templates/help.php:6
+#: templates/help.php:9
 msgid "Online Documentation"
 msgstr "Documentación en línea"
 
-#: templates/help.php:7
+#: templates/help.php:11
 msgid "Forum"
 msgstr "Foro"
 
-#: templates/help.php:9
+#: templates/help.php:14
 msgid "Bugtracker"
 msgstr "Informar errores"
 
-#: templates/help.php:11
+#: templates/help.php:17
 msgid "Commercial Support"
 msgstr "Soporte comercial"
 
@@ -387,79 +387,79 @@ msgstr "Soporte comercial"
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Usaste  <strong>%s</strong>  de los  <strong>%s</strong>  disponibles"
 
-#: templates/personal.php:14
+#: templates/personal.php:15
 msgid "Get the apps to sync your files"
 msgstr "Obtené aplicaciones para sincronizar tus archivos"
 
-#: templates/personal.php:25
+#: templates/personal.php:26
 msgid "Show First Run Wizard again"
 msgstr "Mostrar de nuevo el asistente de primera ejecución"
 
-#: templates/personal.php:36 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
 msgid "Password"
 msgstr "Contraseña"
 
-#: templates/personal.php:37
+#: templates/personal.php:38
 msgid "Your password was changed"
 msgstr "Tu contraseña fue cambiada"
 
-#: templates/personal.php:38
+#: templates/personal.php:39
 msgid "Unable to change your password"
 msgstr "No fue posible cambiar tu contraseña"
 
-#: templates/personal.php:39
+#: templates/personal.php:40
 msgid "Current password"
 msgstr "Contraseña actual"
 
-#: templates/personal.php:40
+#: templates/personal.php:42
 msgid "New password"
 msgstr "Nueva contraseña:"
 
-#: templates/personal.php:42
+#: templates/personal.php:44
 msgid "Change password"
 msgstr "Cambiar contraseña"
 
-#: templates/personal.php:54 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:78
 msgid "Display Name"
 msgstr "Nombre a mostrar"
 
-#: templates/personal.php:55
+#: templates/personal.php:57
 msgid "Your display name was changed"
 msgstr "El nombre mostrado fue cambiado"
 
-#: templates/personal.php:56
+#: templates/personal.php:58
 msgid "Unable to change your display name"
 msgstr "No fue posible cambiar tu nombre"
 
-#: templates/personal.php:59
+#: templates/personal.php:61
 msgid "Change display name"
 msgstr "Cambiar nombre"
 
-#: templates/personal.php:68
+#: templates/personal.php:70
 msgid "Email"
 msgstr "Correo electrónico"
 
-#: templates/personal.php:69
+#: templates/personal.php:72
 msgid "Your email address"
 msgstr "Tu dirección de e-mail"
 
-#: templates/personal.php:70
+#: templates/personal.php:73
 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:76 templates/personal.php:77
+#: templates/personal.php:79 templates/personal.php:80
 msgid "Language"
 msgstr "Idioma"
 
-#: templates/personal.php:82
+#: templates/personal.php:86
 msgid "Help translate"
 msgstr "Ayudanos a traducir"
 
-#: templates/personal.php:87
+#: templates/personal.php:91
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:89
+#: templates/personal.php:93
 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"
 
diff --git a/l10n/es_AR/user_ldap.po b/l10n/es_AR/user_ldap.po
index 83007895a3fb4388cfca657640e4d6548d50b902..6f51b5e95094fb9e4ead7ce11da6fb281efcaf9f 100644
--- a/l10n/es_AR/user_ldap.po
+++ b/l10n/es_AR/user_ldap.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 00:20+0100\n"
-"PO-Revision-Date: 2013-02-11 16:10+0000\n"
-"Last-Translator: cjtess <claudio.tessone@gmail.com>\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: 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"
@@ -24,17 +24,17 @@ msgstr ""
 msgid "Failed to delete the server configuration"
 msgstr "Fallo al borrar la configuración del servidor"
 
-#: ajax/testConfiguration.php:35
+#: ajax/testConfiguration.php:36
 msgid "The configuration is valid and the connection could be established!"
 msgstr "La configuración es valida y la conexión pudo ser establecida."
 
-#: ajax/testConfiguration.php:37
+#: ajax/testConfiguration.php:39
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
 msgstr "La configuración es válida, pero el enlace falló. Por favor, comprobá la configuración del servidor y las credenciales."
 
-#: ajax/testConfiguration.php:40
+#: ajax/testConfiguration.php:43
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
@@ -89,224 +89,248 @@ msgstr "<b>Atención:</b> El módulo PHP LDAP no está instalado, este elemento
 msgid "Server configuration"
 msgstr "Configuración del Servidor"
 
-#: templates/settings.php:17
+#: templates/settings.php:18
 msgid "Add Server Configuration"
 msgstr "Añadir Configuración del Servidor"
 
-#: templates/settings.php:21
+#: templates/settings.php:23
 msgid "Host"
 msgstr "Servidor"
 
-#: templates/settings.php:21
+#: templates/settings.php:25
 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:22
+#: templates/settings.php:26
 msgid "Base DN"
 msgstr "DN base"
 
-#: templates/settings.php:22
+#: templates/settings.php:27
 msgid "One Base DN per line"
 msgstr "Una DN base por línea"
 
-#: templates/settings.php:22
+#: templates/settings.php:28
 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:23
+#: templates/settings.php:30
 msgid "User DN"
 msgstr "DN usuario"
 
-#: templates/settings.php:23
+#: templates/settings.php:32
 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:24
+#: templates/settings.php:33
 msgid "Password"
 msgstr "Contraseña"
 
-#: templates/settings.php:24
+#: templates/settings.php:36
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "Para acceso anónimo, dejá DN y contraseña vacíos."
 
-#: templates/settings.php:25
+#: templates/settings.php:37
 msgid "User Login Filter"
 msgstr "Filtro de inicio de sesión de usuario"
 
-#: templates/settings.php:25
+#: templates/settings.php:40
 #, 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:25
+#: templates/settings.php:41
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "usar %%uid como plantilla, p. ej.: \"uid=%%uid\""
 
-#: templates/settings.php:26
+#: templates/settings.php:42
 msgid "User List Filter"
 msgstr "Lista de filtros de usuario"
 
-#: templates/settings.php:26
+#: templates/settings.php:45
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Define el filtro a aplicar, cuando se obtienen usuarios."
 
-#: templates/settings.php:26
+#: templates/settings.php:46
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "Sin plantilla, p. ej.: \"objectClass=person\"."
 
-#: templates/settings.php:27
+#: templates/settings.php:47
 msgid "Group Filter"
 msgstr "Filtro de grupo"
 
-#: templates/settings.php:27
+#: templates/settings.php:50
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Define el filtro a aplicar cuando se obtienen grupos."
 
-#: templates/settings.php:27
+#: templates/settings.php:51
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "Sin ninguna plantilla, p. ej.: \"objectClass=posixGroup\"."
 
-#: templates/settings.php:31
+#: templates/settings.php:55
 msgid "Connection Settings"
 msgstr "Configuración de Conección"
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "Configuration Active"
 msgstr "Configuración activa"
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "When unchecked, this configuration will be skipped."
 msgstr "Si no está seleccionada, esta configuración será omitida."
 
-#: templates/settings.php:34
+#: templates/settings.php:58
 msgid "Port"
 msgstr "Puerto"
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid "Backup (Replica) Host"
 msgstr "Host para copia de seguridad (réplica)"
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 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:36
+#: templates/settings.php:60
 msgid "Backup (Replica) Port"
 msgstr "Puerto para copia de seguridad (réplica)"
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "Disable Main Server"
 msgstr "Deshabilitar el Servidor Principal"
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 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:38
+#: templates/settings.php:62
 msgid "Use TLS"
 msgstr "Usar TLS"
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 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:39
+#: templates/settings.php:63
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Servidor de LDAP sensible a mayúsculas/minúsculas (Windows)"
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid "Turn off SSL certificate validation."
 msgstr "Desactivar la validación por certificado SSL."
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 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:40
+#: templates/settings.php:64
 msgid "Not recommended, use for testing only."
 msgstr "No recomendado, sólo para pruebas."
 
-#: templates/settings.php:41
+#: templates/settings.php:65
+msgid "Cache Time-To-Live"
+msgstr ""
+
+#: templates/settings.php:65
 msgid "in seconds. A change empties the cache."
 msgstr "en segundos. Cambiarlo vacía la cache."
 
-#: templates/settings.php:43
+#: templates/settings.php:67
 msgid "Directory Settings"
 msgstr "Configuración de Directorio"
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "User Display Name Field"
 msgstr "Campo de nombre de usuario a mostrar"
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 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:46
+#: templates/settings.php:70
 msgid "Base User Tree"
 msgstr "Árbol base de usuario"
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "One User Base DN per line"
 msgstr "Una DN base de usuario por línea"
 
-#: templates/settings.php:47
+#: templates/settings.php:71
 msgid "User Search Attributes"
 msgstr "Atributos de la búsqueda de usuario"
 
-#: templates/settings.php:47 templates/settings.php:50
+#: templates/settings.php:71 templates/settings.php:74
 msgid "Optional; one attribute per line"
 msgstr "Opcional; un atributo por linea"
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "Group Display Name Field"
 msgstr "Campo de nombre de grupo a mostrar"
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 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:49
+#: templates/settings.php:73
 msgid "Base Group Tree"
 msgstr "Árbol base de grupo"
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "One Group Base DN per line"
 msgstr "Una DN base de grupo por línea"
 
-#: templates/settings.php:50
+#: templates/settings.php:74
 msgid "Group Search Attributes"
 msgstr "Atributos de búsqueda de grupo"
 
-#: templates/settings.php:51
+#: templates/settings.php:75
 msgid "Group-Member association"
 msgstr "Asociación Grupo-Miembro"
 
-#: templates/settings.php:53
+#: templates/settings.php:77
 msgid "Special Attributes"
 msgstr "Atributos Especiales"
 
-#: templates/settings.php:56
+#: templates/settings.php:79
+msgid "Quota Field"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Quota Default"
+msgstr ""
+
+#: templates/settings.php:80
 msgid "in bytes"
 msgstr "en bytes"
 
-#: templates/settings.php:58
+#: templates/settings.php:81
+msgid "Email Field"
+msgstr ""
+
+#: templates/settings.php:82
+msgid "User Home Folder Naming Rule"
+msgstr ""
+
+#: templates/settings.php:82
 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:62
+#: templates/settings.php:86
+msgid "Test Configuration"
+msgstr ""
+
+#: templates/settings.php:86
 msgid "Help"
 msgstr "Ayuda"
diff --git a/l10n/et_EE/core.po b/l10n/et_EE/core.po
index 8f4f783545a75c46b4dcbb9b527b7da957fa997e..c861828727684ffab1a738769abc95e5c994c59e 100644
--- a/l10n/et_EE/core.po
+++ b/l10n/et_EE/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 18:20+0000\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"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
@@ -387,7 +387,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 "ownCloud parooli taastamine"
 
diff --git a/l10n/et_EE/files.po b/l10n/et_EE/files.po
index c87495726974619ae9068541df2144aa562f9af4..09f2d52fdb533db843f533cffd824975d8315ab8 100644
--- a/l10n/et_EE/files.po
+++ b/l10n/et_EE/files.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\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: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
@@ -52,27 +52,27 @@ msgid ""
 "the HTML form"
 msgstr "Üles laetud faili suurus ületab HTML vormis määratud upload_max_filesize suuruse"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
 msgstr "Fail laeti üles ainult osaliselt"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:31
 msgid "No file was uploaded"
 msgstr "Ühtegi faili ei laetud üles"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:32
 msgid "Missing a temporary folder"
 msgstr "Ajutiste failide kaust puudub"
 
-#: ajax/upload.php:34
+#: ajax/upload.php:33
 msgid "Failed to write to disk"
 msgstr "Kettale kirjutamine ebaõnnestus"
 
-#: ajax/upload.php:52
+#: ajax/upload.php:51
 msgid "Not enough storage available"
 msgstr "Saadaval pole piisavalt ruumi"
 
-#: ajax/upload.php:83
+#: ajax/upload.php:82
 msgid "Invalid directory."
 msgstr "Vigane kaust."
 
@@ -84,7 +84,7 @@ msgstr "Failid"
 msgid "Delete permanently"
 msgstr "Kustuta jäädavalt"
 
-#: js/fileactions.js:127 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:127 templates/index.php:92 templates/index.php:93
 msgid "Delete"
 msgstr "Kustuta"
 
@@ -92,40 +92,36 @@ msgstr "Kustuta"
 msgid "Rename"
 msgstr "ümber"
 
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
 msgid "Pending"
 msgstr "Ootel"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "{new_name} already exists"
 msgstr "{new_name} on juba olemas"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "replace"
 msgstr "asenda"
 
-#: js/filelist.js:253
+#: js/filelist.js:251
 msgid "suggest name"
 msgstr "soovita nime"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "cancel"
 msgstr "loobu"
 
-#: js/filelist.js:295
-msgid "replaced {new_name}"
-msgstr "asendatud nimega {new_name}"
+#: js/filelist.js:298
+msgid "replaced {new_name} with {old_name}"
+msgstr "asendas nime {old_name} nimega {new_name}"
 
-#: js/filelist.js:295 js/filelist.js:297
+#: js/filelist.js:298
 msgid "undo"
 msgstr "tagasi"
 
-#: js/filelist.js:297
-msgid "replaced {new_name} with {old_name}"
-msgstr "asendas nime {old_name} nimega {new_name}"
-
-#: js/filelist.js:322
+#: js/filelist.js:323
 msgid "perform delete operation"
 msgstr ""
 
@@ -151,74 +147,74 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:224
+#: js/files.js:225
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:261
+#: js/files.js:262
 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"
 
-#: js/files.js:261
+#: js/files.js:262
 msgid "Upload Error"
 msgstr "Üleslaadimise viga"
 
-#: js/files.js:272
+#: js/files.js:273
 msgid "Close"
 msgstr "Sulge"
 
-#: js/files.js:311
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr "1 faili üleslaadimisel"
 
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr "{count} faili üleslaadimist"
 
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "Üleslaadimine tühistati."
 
-#: js/files.js:496
+#: js/files.js:497
 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."
 
-#: js/files.js:569
+#: js/files.js:570
 msgid "URL cannot be empty."
 msgstr "URL ei saa olla tühi."
 
-#: js/files.js:574
+#: js/files.js:575
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:953 templates/index.php:68
 msgid "Name"
 msgstr "Nimi"
 
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:954 templates/index.php:79
 msgid "Size"
 msgstr "Suurus"
 
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:955 templates/index.php:81
 msgid "Modified"
 msgstr "Muudetud"
 
-#: js/files.js:969
+#: js/files.js:974
 msgid "1 folder"
 msgstr "1 kaust"
 
-#: js/files.js:971
+#: js/files.js:976
 msgid "{count} folders"
 msgstr "{count} kausta"
 
-#: js/files.js:979
+#: js/files.js:984
 msgid "1 file"
 msgstr "1 fail"
 
-#: js/files.js:981
+#: js/files.js:986
 msgid "{count} files"
 msgstr "{count} faili"
 
@@ -282,33 +278,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr "Tühista üleslaadimine"
 
-#: templates/index.php:59
+#: templates/index.php:53
+msgid "You don’t have write permissions here."
+msgstr ""
+
+#: templates/index.php:60
 msgid "Nothing in here. Upload something!"
 msgstr "Siin pole midagi. Lae midagi üles!"
 
-#: templates/index.php:73
+#: templates/index.php:74
 msgid "Download"
 msgstr "Lae alla"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:86 templates/index.php:87
 msgid "Unshare"
 msgstr "Lõpeta jagamine"
 
-#: templates/index.php:105
+#: templates/index.php:106
 msgid "Upload too large"
 msgstr "Üleslaadimine on liiga suur"
 
-#: templates/index.php:107
+#: templates/index.php:108
 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:112
+#: templates/index.php:113
 msgid "Files are being scanned, please wait."
 msgstr "Faile skannitakse, palun oota"
 
-#: templates/index.php:115
+#: templates/index.php:116
 msgid "Current scanning"
 msgstr "Praegune skannimine"
 
diff --git a/l10n/et_EE/files_external.po b/l10n/et_EE/files_external.po
index c290d3f9140608aef12412a8841a7d5ebdbd2ec5..867134f4d9842921e80d2aa00eb6f40eda7c6067 100644
--- a/l10n/et_EE/files_external.po
+++ b/l10n/et_EE/files_external.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-11 23:22+0000\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"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
@@ -18,37 +18,33 @@ msgstr ""
 "Language: et_EE\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 "Ligipääs on antud"
 
-#: 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 "Viga Dropboxi salvestusruumi seadistamisel"
 
-#: 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 "Anna ligipääs"
 
-#: js/dropbox.js:73 js/google.js:72
-msgid "Fill out all required fields"
-msgstr "Täida kõik kohustuslikud lahtrid"
-
-#: js/dropbox.js:85
+#: js/dropbox.js:101
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr "Palun sisesta korrektne Dropboxi rakenduse võti ja salasõna."
 
-#: 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 "Viga Google Drive'i salvestusruumi seadistamisel"
 
-#: lib/config.php:434
+#: lib/config.php:421
 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:424
 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 "
@@ -59,63 +55,63 @@ msgstr ""
 msgid "External Storage"
 msgstr "Väline salvestuskoht"
 
-#: templates/settings.php:8 templates/settings.php:22
-msgid "Mount point"
-msgstr "Ühenduspunkt"
-
-#: templates/settings.php:9
-msgid "Backend"
-msgstr "Admin"
+#: templates/settings.php:9 templates/settings.php:28
+msgid "Folder name"
+msgstr "Kausta nimi"
 
 #: templates/settings.php:10
+msgid "External storage"
+msgstr ""
+
+#: templates/settings.php:11
 msgid "Configuration"
 msgstr "Seadistamine"
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid "Options"
 msgstr "Valikud"
 
-#: templates/settings.php:12
+#: templates/settings.php:13
 msgid "Applicable"
 msgstr "Rakendatav"
 
-#: templates/settings.php:27
-msgid "Add mount point"
-msgstr "Lisa ühenduspunkt"
+#: templates/settings.php:33
+msgid "Add storage"
+msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:90
 msgid "None set"
 msgstr "Pole määratud"
 
-#: templates/settings.php:86
+#: templates/settings.php:91
 msgid "All Users"
 msgstr "Kõik kasutajad"
 
-#: templates/settings.php:87
+#: templates/settings.php:92
 msgid "Groups"
 msgstr "Grupid"
 
-#: templates/settings.php:95
+#: templates/settings.php:100
 msgid "Users"
 msgstr "Kasutajad"
 
-#: 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 "Kustuta"
 
-#: templates/settings.php:124
+#: templates/settings.php:129
 msgid "Enable User External Storage"
 msgstr "Luba kasutajatele väline salvestamine"
 
-#: templates/settings.php:125
+#: templates/settings.php:130
 msgid "Allow users to mount their own external storage"
 msgstr "Luba kasutajatel ühendada külge nende enda välised salvestusseadmed"
 
-#: templates/settings.php:139
+#: templates/settings.php:141
 msgid "SSL root certificates"
 msgstr "SSL root sertifikaadid"
 
-#: templates/settings.php:158
+#: templates/settings.php:159
 msgid "Import Root Certificate"
 msgstr "Impordi root sertifikaadid"
diff --git a/l10n/et_EE/files_trashbin.po b/l10n/et_EE/files_trashbin.po
index 72073ead874522a32ecc51c431fd0b29e389d157..33291a6ce4448ed5f78892dc6e4d0f5a46d51c65 100644
--- a/l10n/et_EE/files_trashbin.po
+++ b/l10n/et_EE/files_trashbin.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-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 18:01+0000\n"
-"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
+"POT-Creation-Date: 2013-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: 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,7 +18,7 @@ msgstr ""
 "Language: et_EE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:22
+#: ajax/delete.php:40
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "%s jäädavalt kustutamine ebaõnnestus"
@@ -28,35 +28,39 @@ msgstr "%s jäädavalt kustutamine ebaõnnestus"
 msgid "Couldn't restore %s"
 msgstr "%s ei saa taastada"
 
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
 msgid "perform restore operation"
 msgstr "soorita taastamine"
 
-#: js/trash.js:33
+#: js/trash.js:34
 msgid "delete file permanently"
 msgstr "kustuta fail jäädavalt"
 
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr "Kustuta jäädavalt"
+
+#: js/trash.js:174 templates/index.php:17
 msgid "Name"
 msgstr "Nimi"
 
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:175 templates/index.php:27
 msgid "Deleted"
 msgstr "Kustutatud"
 
-#: js/trash.js:135
+#: js/trash.js:184
 msgid "1 folder"
 msgstr "1 kaust"
 
-#: js/trash.js:137
+#: js/trash.js:186
 msgid "{count} folders"
 msgstr "{count} kausta"
 
-#: js/trash.js:145
+#: js/trash.js:194
 msgid "1 file"
 msgstr "1 fail"
 
-#: js/trash.js:147
+#: js/trash.js:196
 msgid "{count} files"
 msgstr "{count} faili"
 
@@ -67,3 +71,11 @@ msgstr "Siin pole midagi. Sinu prügikast on tühi!"
 #: templates/index.php:20 templates/index.php:22
 msgid "Restore"
 msgstr "Taasta"
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr "Kustuta"
+
+#: templates/part.breadcrumb.php:9
+msgid "Deleted Files"
+msgstr ""
diff --git a/l10n/et_EE/files_versions.po b/l10n/et_EE/files_versions.po
index 7ea31ed36145e8636087ec2ab83f76d8ef2fde78..77d1e70531ef50f71da3d940ac012af40d28a791 100644
--- a/l10n/et_EE/files_versions.po
+++ b/l10n/et_EE/files_versions.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-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 18:01+0000\n"
-"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
+"POT-Creation-Date: 2013-02-28 00:04+0100\n"
+"PO-Revision-Date: 2013-02-27 23:04+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: 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"
@@ -49,18 +49,10 @@ msgstr "Vanu versioone pole saadaval"
 msgid "No path specified"
 msgstr "Asukohta pole määratud"
 
-#: js/versions.js:16
-msgid "History"
-msgstr "Ajalugu"
+#: 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 ""
-
-#: templates/settings.php:3
-msgid "Files Versioning"
-msgstr "Failide versioonihaldus"
-
-#: templates/settings.php:4
-msgid "Enable"
-msgstr "Luba"
diff --git a/l10n/et_EE/lib.po b/l10n/et_EE/lib.po
index ff886e9b2d7b583d9445fe9073d2629c461fd2ce..7b1df98a802304f6eb9daee3be77ccf8c84bbbe0 100644
--- a/l10n/et_EE/lib.po
+++ b/l10n/et_EE/lib.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-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 18:20+0000\n"
-"Last-Translator: Rivo Zängov <eraser@eraser.ee>\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: 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,27 +18,27 @@ msgstr ""
 "Language: et_EE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:339
+#: app.php:349
 msgid "Help"
 msgstr "Abiinfo"
 
-#: app.php:346
+#: app.php:362
 msgid "Personal"
 msgstr "Isiklik"
 
-#: app.php:351
+#: app.php:373
 msgid "Settings"
 msgstr "Seaded"
 
-#: app.php:356
+#: app.php:385
 msgid "Users"
 msgstr "Kasutajad"
 
-#: app.php:363
+#: app.php:398
 msgid "Apps"
 msgstr "Rakendused"
 
-#: app.php:365
+#: app.php:406
 msgid "Admin"
 msgstr "Admin"
 
@@ -50,15 +50,15 @@ msgstr "ZIP-ina allalaadimine on välja lülitatud."
 msgid "Files need to be downloaded one by one."
 msgstr "Failid tuleb alla laadida ükshaaval."
 
-#: files.php:203 files.php:228
+#: files.php:204 files.php:231
 msgid "Back to Files"
 msgstr "Tagasi failide juurde"
 
-#: files.php:227
+#: files.php:228
 msgid "Selected files too large to generate zip file."
 msgstr "Valitud failid on ZIP-faili loomiseks liiga suured."
 
-#: helper.php:226
+#: helper.php:228
 msgid "couldn't be determined"
 msgstr ""
 
@@ -98,87 +98,92 @@ msgstr "Määra admini parool."
 msgid "Specify a data folder."
 msgstr "Määra andmete kaust."
 
-#: setup.php:53
+#: setup.php:55
 #, php-format
 msgid "%s enter the database username."
 msgstr ""
 
-#: setup.php:56
+#: setup.php:58
 #, php-format
 msgid "%s enter the database name."
 msgstr ""
 
-#: setup.php:59
+#: setup.php:61
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr ""
 
-#: setup.php:62
+#: setup.php:64
 #, php-format
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:126 setup.php:291 setup.php:336
+#: setup.php:128 setup.php:320 setup.php:365
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:127 setup.php:150 setup.php:204
+#: setup.php:129 setup.php:152 setup.php:229
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:149 setup.php:423 setup.php:489
+#: setup.php:151 setup.php:453 setup.php:520
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:203
+#: setup.php:228
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:255 setup.php:357 setup.php:366 setup.php:384 setup.php:394
-#: setup.php:403 setup.php:430 setup.php:496 setup.php:522 setup.php:529
-#: setup.php:540 setup.php:547 setup.php:556 setup.php:564 setup.php:573
-#: setup.php:579
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Andmebaasi viga: \"%s\""
 
-#: setup.php:256 setup.php:358 setup.php:367 setup.php:385 setup.php:395
-#: setup.php:404 setup.php:431 setup.php:497 setup.php:523 setup.php:530
-#: setup.php:541 setup.php:557 setup.php:565 setup.php:574
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:270
+#: setup.php:299
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:271
+#: setup.php:300
 msgid "Drop this user from MySQL"
 msgstr "Kustuta see kasutaja MySQL-ist"
 
-#: setup.php:276
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:277
+#: setup.php:306
 msgid "Drop this user from MySQL."
 msgstr "Kustuta see kasutaja MySQL-ist."
 
-#: setup.php:548 setup.php:580
+#: setup.php:579 setup.php:611
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:644
+#: setup.php:631
+#, php-format
+msgid "MS SQL username and/or password not valid: %s"
+msgstr ""
+
+#: setup.php:849
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:645
+#: setup.php:850
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
@@ -235,16 +240,16 @@ msgstr "eelmisel aastal"
 msgid "years ago"
 msgstr "aastat tagasi"
 
-#: updater.php:75
+#: 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:77
+#: updater.php:81
 msgid "up to date"
 msgstr "ajakohane"
 
-#: updater.php:80
+#: updater.php:84
 msgid "updates check is disabled"
 msgstr "uuenduste kontrollimine on välja lülitatud"
 
diff --git a/l10n/et_EE/settings.po b/l10n/et_EE/settings.po
index 03ab0d4ca7c9fb5c8133490fbd378e821387c434..a1c6aebc2d6765e27b39b7d9dde77918b59961e8 100644
--- a/l10n/et_EE/settings.po
+++ b/l10n/et_EE/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 23:05+0000\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: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
@@ -23,8 +23,8 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "App Sotre'i nimekirja laadimine ebaõnnestus"
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:15
-#: ajax/togglegroups.php:18
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr "Autentimise viga"
 
@@ -72,12 +72,12 @@ msgstr "Vigane päring"
 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 "Kasutajat ei saa lisada gruppi %s"
 
-#: ajax/togglegroups.php:34
+#: ajax/togglegroups.php:36
 #, php-format
 msgid "Unable to remove user from group %s"
 msgstr "Kasutajat ei saa eemaldada grupist %s"
@@ -118,7 +118,7 @@ msgstr "Viga"
 msgid "Updated"
 msgstr "Uuendatud"
 
-#: js/personal.js:96
+#: js/personal.js:99
 msgid "Saving..."
 msgstr "Salvestamine..."
 
@@ -147,23 +147,23 @@ msgstr "Grupi admin"
 msgid "Delete"
 msgstr "Kustuta"
 
-#: js/users.js:190
+#: js/users.js:191
 msgid "add group"
 msgstr "lisa grupp"
 
-#: js/users.js:351
+#: js/users.js:352
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
 msgid "Error creating user"
 msgstr "Viga kasutaja loomisel"
 
-#: js/users.js:357
+#: js/users.js:358
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
 msgid "__language_name__"
 msgstr "Eesti"
 
@@ -209,19 +209,19 @@ msgstr ""
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:61
+#: templates/admin.php:63
+#, php-format
 msgid ""
-"This ownCloud server can't set system locale to "
-"\"en_US.UTF-8\"/\"en_US.UTF8\". 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 en_US.UTF-8/en_US.UTF8."
+"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:72
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:75
+#: 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 "
@@ -231,98 +231,98 @@ msgid ""
 " of ownCloud."
 msgstr ""
 
-#: templates/admin.php:89
+#: templates/admin.php:92
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:98
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:108
+#: 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:118
+#: 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:125
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr "Jagamine"
 
-#: templates/admin.php:131
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:132
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:140
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:147
+#: templates/admin.php:150
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:148
+#: templates/admin.php:151
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:155
+#: templates/admin.php:158
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:161
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:165
+#: templates/admin.php:168
 msgid "Security"
 msgstr "Turvalisus"
 
-#: templates/admin.php:178
+#: templates/admin.php:181
 msgid "Enforce HTTPS"
 msgstr "Sunni peale HTTPS-i kasutamine"
 
-#: templates/admin.php:179
+#: templates/admin.php:182
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:182
+#: templates/admin.php:185
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr ""
 
-#: templates/admin.php:192
+#: templates/admin.php:195
 msgid "Log"
 msgstr "Logi"
 
-#: templates/admin.php:193
+#: templates/admin.php:196
 msgid "Log level"
 msgstr "Logi tase"
 
-#: templates/admin.php:220
+#: templates/admin.php:223
 msgid "More"
 msgstr "Rohkem"
 
-#: templates/admin.php:227 templates/personal.php:98
+#: templates/admin.php:230 templates/personal.php:102
 msgid "Version"
 msgstr "Versioon"
 
-#: templates/admin.php:230 templates/personal.php:100
+#: templates/admin.php:233 templates/personal.php:105
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -332,51 +332,51 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr ""
 
-#: templates/apps.php:10
+#: templates/apps.php:11
 msgid "Add your App"
 msgstr "Lisa oma rakendus"
 
-#: templates/apps.php:11
+#: templates/apps.php:12
 msgid "More Apps"
 msgstr "Veel rakendusi"
 
-#: templates/apps.php:24
+#: templates/apps.php:28
 msgid "Select an App"
 msgstr "Vali programm"
 
-#: templates/apps.php:28
+#: templates/apps.php:34
 msgid "See application page at apps.owncloud.com"
 msgstr "Vaata rakenduste lehte aadressil apps.owncloud.com"
 
-#: templates/apps.php:29
+#: templates/apps.php:36
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-litsenseeritud <span class=\"author\"></span>"
 
-#: templates/apps.php:31
+#: templates/apps.php:38
 msgid "Update"
 msgstr "Uuenda"
 
-#: templates/help.php:3
+#: templates/help.php:4
 msgid "User Documentation"
 msgstr "Kasutaja dokumentatsioon"
 
-#: templates/help.php:4
+#: templates/help.php:6
 msgid "Administrator Documentation"
 msgstr "Administraatori dokumentatsioon"
 
-#: templates/help.php:6
+#: templates/help.php:9
 msgid "Online Documentation"
 msgstr "Online dokumentatsioon"
 
-#: templates/help.php:7
+#: templates/help.php:11
 msgid "Forum"
 msgstr "Foorum"
 
-#: templates/help.php:9
+#: templates/help.php:14
 msgid "Bugtracker"
 msgstr "Vigade nimekiri"
 
-#: templates/help.php:11
+#: templates/help.php:17
 msgid "Commercial Support"
 msgstr "Tasuine kasutajatugi"
 
@@ -385,79 +385,79 @@ msgstr "Tasuine kasutajatugi"
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:14
+#: templates/personal.php:15
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:25
+#: templates/personal.php:26
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:36 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
 msgid "Password"
 msgstr "Parool"
 
-#: templates/personal.php:37
+#: templates/personal.php:38
 msgid "Your password was changed"
 msgstr "Sinu parooli on muudetud"
 
-#: templates/personal.php:38
+#: templates/personal.php:39
 msgid "Unable to change your password"
 msgstr "Sa ei saa oma parooli muuta"
 
-#: templates/personal.php:39
+#: templates/personal.php:40
 msgid "Current password"
 msgstr "Praegune parool"
 
-#: templates/personal.php:40
+#: templates/personal.php:42
 msgid "New password"
 msgstr "Uus parool"
 
-#: templates/personal.php:42
+#: templates/personal.php:44
 msgid "Change password"
 msgstr "Muuda parooli"
 
-#: templates/personal.php:54 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:78
 msgid "Display Name"
 msgstr "Näidatav nimi"
 
-#: templates/personal.php:55
+#: templates/personal.php:57
 msgid "Your display name was changed"
 msgstr ""
 
-#: templates/personal.php:56
+#: templates/personal.php:58
 msgid "Unable to change your display name"
 msgstr ""
 
-#: templates/personal.php:59
+#: templates/personal.php:61
 msgid "Change display name"
 msgstr "Muuda näidatavat nime"
 
-#: templates/personal.php:68
+#: templates/personal.php:70
 msgid "Email"
 msgstr "E-post"
 
-#: templates/personal.php:69
+#: templates/personal.php:72
 msgid "Your email address"
 msgstr "Sinu e-posti aadress"
 
-#: templates/personal.php:70
+#: templates/personal.php:73
 msgid "Fill in an email address to enable password recovery"
 msgstr "Parooli taastamise sisse lülitamiseks sisesta e-posti aadress"
 
-#: templates/personal.php:76 templates/personal.php:77
+#: templates/personal.php:79 templates/personal.php:80
 msgid "Language"
 msgstr "Keel"
 
-#: templates/personal.php:82
+#: templates/personal.php:86
 msgid "Help translate"
 msgstr "Aita tõlkida"
 
-#: templates/personal.php:87
+#: templates/personal.php:91
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:89
+#: templates/personal.php:93
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
diff --git a/l10n/et_EE/user_ldap.po b/l10n/et_EE/user_ldap.po
index 83400a76258e671717a2a184ba7075d44dcdf157..d16c8b3ed56ace05fd4f22c7c595b27cf4f46b8e 100644
--- a/l10n/et_EE/user_ldap.po
+++ b/l10n/et_EE/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-08 00:10+0100\n"
-"PO-Revision-Date: 2013-02-07 23:11+0000\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: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
@@ -22,17 +22,17 @@ msgstr ""
 msgid "Failed to delete the server configuration"
 msgstr ""
 
-#: ajax/testConfiguration.php:35
+#: ajax/testConfiguration.php:36
 msgid "The configuration is valid and the connection could be established!"
 msgstr ""
 
-#: ajax/testConfiguration.php:37
+#: ajax/testConfiguration.php:39
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
 msgstr ""
 
-#: ajax/testConfiguration.php:40
+#: ajax/testConfiguration.php:43
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
@@ -87,224 +87,248 @@ msgstr ""
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:17
+#: templates/settings.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:23
 msgid "Host"
 msgstr "Host"
 
-#: templates/settings.php:21
+#: templates/settings.php:25
 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:22
+#: templates/settings.php:26
 msgid "Base DN"
 msgstr "Baas DN"
 
-#: templates/settings.php:22
+#: templates/settings.php:27
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:28
 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:23
+#: templates/settings.php:30
 msgid "User DN"
 msgstr "Kasutaja DN"
 
-#: templates/settings.php:23
+#: templates/settings.php:32
 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:24
+#: templates/settings.php:33
 msgid "Password"
 msgstr "Parool"
 
-#: templates/settings.php:24
+#: templates/settings.php:36
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "Anonüümseks ligipääsuks jäta DN ja parool tühjaks."
 
-#: templates/settings.php:25
+#: templates/settings.php:37
 msgid "User Login Filter"
 msgstr "Kasutajanime filter"
 
-#: templates/settings.php:25
+#: templates/settings.php:40
 #, 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:25
+#: templates/settings.php:41
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "kasuta %%uid kohatäitjat, nt. \"uid=%%uid\""
 
-#: templates/settings.php:26
+#: templates/settings.php:42
 msgid "User List Filter"
 msgstr "Kasutajate nimekirja filter"
 
-#: templates/settings.php:26
+#: templates/settings.php:45
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Määrab kasutajaid hankides filtri, mida rakendatakse."
 
-#: templates/settings.php:26
+#: templates/settings.php:46
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "ilma ühegi kohatäitjata, nt. \"objectClass=person\"."
 
-#: templates/settings.php:27
+#: templates/settings.php:47
 msgid "Group Filter"
 msgstr "Grupi filter"
 
-#: templates/settings.php:27
+#: templates/settings.php:50
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Määrab gruppe hankides filtri, mida rakendatakse."
 
-#: templates/settings.php:27
+#: templates/settings.php:51
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "ilma ühegi kohatäitjata, nt. \"objectClass=posixGroup\"."
 
-#: templates/settings.php:31
+#: templates/settings.php:55
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:34
+#: templates/settings.php:58
 msgid "Port"
 msgstr "Port"
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:60
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Use TLS"
 msgstr "Kasutaja TLS"
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:39
+#: templates/settings.php:63
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Mittetõstutundlik LDAP server (Windows)"
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid "Turn off SSL certificate validation."
 msgstr "Lülita SSL sertifikaadi kontrollimine välja."
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 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:40
+#: templates/settings.php:64
 msgid "Not recommended, use for testing only."
 msgstr "Pole soovitatav, kasuta ainult testimiseks."
 
-#: templates/settings.php:41
+#: templates/settings.php:65
+msgid "Cache Time-To-Live"
+msgstr ""
+
+#: templates/settings.php:65
 msgid "in seconds. A change empties the cache."
 msgstr "sekundites. Muudatus tühjendab vahemälu."
 
-#: templates/settings.php:43
+#: templates/settings.php:67
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "User Display Name Field"
 msgstr "Kasutaja näidatava nime väli"
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 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:46
+#: templates/settings.php:70
 msgid "Base User Tree"
 msgstr "Baaskasutaja puu"
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:47
+#: templates/settings.php:71
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:47 templates/settings.php:50
+#: templates/settings.php:71 templates/settings.php:74
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "Group Display Name Field"
 msgstr "Grupi näidatava nime väli"
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 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:49
+#: templates/settings.php:73
 msgid "Base Group Tree"
 msgstr "Baasgrupi puu"
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:74
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:75
 msgid "Group-Member association"
 msgstr "Grupiliikme seotus"
 
-#: templates/settings.php:53
+#: templates/settings.php:77
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:79
+msgid "Quota Field"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Quota Default"
+msgstr ""
+
+#: templates/settings.php:80
 msgid "in bytes"
 msgstr "baitides"
 
-#: templates/settings.php:58
+#: templates/settings.php:81
+msgid "Email Field"
+msgstr ""
+
+#: templates/settings.php:82
+msgid "User Home Folder Naming Rule"
+msgstr ""
+
+#: templates/settings.php:82
 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:62
+#: templates/settings.php:86
+msgid "Test Configuration"
+msgstr ""
+
+#: templates/settings.php:86
 msgid "Help"
 msgstr "Abiinfo"
diff --git a/l10n/eu/core.po b/l10n/eu/core.po
index eede87d9e5a243129bf7598846503fbdcb3dccb4..5b1a990636ad97642691b811d39060cf3b59f2e5 100644
--- a/l10n/eu/core.po
+++ b/l10n/eu/core.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 21:40+0000\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"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
@@ -21,29 +21,29 @@ msgstr ""
 "Language: eu\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 erabiltzaileak zurekin fitxategi bat partekatu du "
+msgstr "%s erabiltzaileak zurekin fitxategi bat elkarbanatu du "
 
-#: ajax/share.php:87
+#: ajax/share.php:99
 #, php-format
 msgid "User %s shared a folder with you"
-msgstr "%s erabiltzaileak zurekin karpeta bat partekatu du "
+msgstr "%s erabiltzaileak zurekin karpeta bat elkarbanatu du "
 
-#: 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 erabiltzaileak \"%s\" fitxategia zurekin partekatu du. Hemen duzu eskuragarri:  %s"
+msgstr "%s erabiltzaileak \"%s\" fitxategia zurekin elkarbanatu du. Hemen duzu eskuragarri:  %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 "%s erabiltzaileak \"%s\" karpeta zurekin partekatu du. Hemen duzu eskuragarri:  %s"
+msgstr "%s erabiltzaileak \"%s\" karpeta zurekin elkarbanatu du. Hemen duzu eskuragarri:  %s"
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -84,79 +84,79 @@ msgstr "Ez da ezabatzeko kategoriarik hautatu."
 msgid "Error removing %s from favorites."
 msgstr "Errorea gertatu da %s gogokoetatik ezabatzean."
 
-#: js/config.php:32
+#: js/config.php:34
 msgid "Sunday"
 msgstr "Igandea"
 
-#: js/config.php:32
+#: js/config.php:35
 msgid "Monday"
 msgstr "Astelehena"
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Tuesday"
 msgstr "Asteartea"
 
-#: js/config.php:32
+#: js/config.php:37
 msgid "Wednesday"
 msgstr "Asteazkena"
 
-#: js/config.php:32
+#: js/config.php:38
 msgid "Thursday"
 msgstr "Osteguna"
 
-#: js/config.php:32
+#: js/config.php:39
 msgid "Friday"
 msgstr "Ostirala"
 
-#: js/config.php:32
+#: js/config.php:40
 msgid "Saturday"
 msgstr "Larunbata"
 
-#: js/config.php:33
+#: js/config.php:45
 msgid "January"
 msgstr "Urtarrila"
 
-#: js/config.php:33
+#: js/config.php:46
 msgid "February"
 msgstr "Otsaila"
 
-#: js/config.php:33
+#: js/config.php:47
 msgid "March"
 msgstr "Martxoa"
 
-#: js/config.php:33
+#: js/config.php:48
 msgid "April"
 msgstr "Apirila"
 
-#: js/config.php:33
+#: js/config.php:49
 msgid "May"
 msgstr "Maiatza"
 
-#: js/config.php:33
+#: js/config.php:50
 msgid "June"
 msgstr "Ekaina"
 
-#: js/config.php:33
+#: js/config.php:51
 msgid "July"
 msgstr "Uztaila"
 
-#: js/config.php:33
+#: js/config.php:52
 msgid "August"
 msgstr "Abuztua"
 
-#: js/config.php:33
+#: js/config.php:53
 msgid "September"
 msgstr "Iraila"
 
-#: js/config.php:33
+#: js/config.php:54
 msgid "October"
 msgstr "Urria"
 
-#: js/config.php:33
+#: js/config.php:55
 msgid "November"
 msgstr "Azaroa"
 
-#: js/config.php:33
+#: js/config.php:56
 msgid "December"
 msgstr "Abendua"
 
@@ -277,11 +277,11 @@ msgstr "Errore bat egon da baimenak aldatzean"
 
 #: js/share.js:168
 msgid "Shared with you and the group {group} by {owner}"
-msgstr "{owner}-k zu eta {group} taldearekin partekatuta"
+msgstr "{owner}-k zu eta {group} taldearekin elkarbanatuta"
 
 #: js/share.js:170
 msgid "Shared with you by {owner}"
-msgstr "{owner}-k zurekin partekatuta"
+msgstr "{owner}-k zurekin elkarbanatuta"
 
 #: js/share.js:175
 msgid "Share with"
@@ -295,7 +295,7 @@ msgstr "Elkarbanatu lotura batekin"
 msgid "Password protect"
 msgstr "Babestu pasahitzarekin"
 
-#: js/share.js:185 templates/installation.php:44 templates/login.php:35
+#: js/share.js:185 templates/installation.php:46 templates/login.php:35
 msgid "Password"
 msgstr "Pasahitza"
 
@@ -329,7 +329,7 @@ msgstr "Berriz elkarbanatzea ez dago baimendua"
 
 #: js/share.js:292
 msgid "Shared in {item} with {user}"
-msgstr "{user}ekin {item}-n partekatuta"
+msgstr "{user}ekin {item}-n elkarbanatuta"
 
 #: js/share.js:313
 msgid "Unshare"
@@ -390,7 +390,7 @@ msgstr "Eguneraketa ez da ongi egin. Mesedez egin arazoaren txosten bat <a href=
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Eguneraketa ongi egin da. Orain zure ownClouderea berbideratua izango zara."
 
-#: lostpassword/controller.php:47
+#: lostpassword/controller.php:48
 msgid "ownCloud password reset"
 msgstr "ownCloud-en pasahitza berrezarri"
 
@@ -410,7 +410,7 @@ msgstr "Berrezartzeko eposta bidali da."
 msgid "Request failed!"
 msgstr "Eskariak huts egin du!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:39
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:40
 #: templates/login.php:28
 msgid "Username"
 msgstr "Erabiltzaile izena"
@@ -504,52 +504,52 @@ msgstr "Zure zerbitzaria ongi konfiguratzeko informazioa eskuratzeko, begiratu
 msgid "Create an <strong>admin account</strong>"
 msgstr "Sortu <strong>kudeatzaile kontu<strong> bat"
 
-#: templates/installation.php:52
+#: templates/installation.php:54
 msgid "Advanced"
 msgstr "Aurreratua"
 
-#: templates/installation.php:54
+#: templates/installation.php:56
 msgid "Data folder"
 msgstr "Datuen karpeta"
 
-#: templates/installation.php:61
+#: templates/installation.php:65
 msgid "Configure the database"
 msgstr "Konfiguratu datu basea"
 
-#: templates/installation.php:66 templates/installation.php:77
-#: templates/installation.php:87 templates/installation.php:97
+#: templates/installation.php:70 templates/installation.php:82
+#: templates/installation.php:93 templates/installation.php:104
 msgid "will be used"
 msgstr "erabiliko da"
 
-#: templates/installation.php:109
+#: templates/installation.php:117
 msgid "Database user"
 msgstr "Datubasearen erabiltzailea"
 
-#: templates/installation.php:113
+#: templates/installation.php:122
 msgid "Database password"
 msgstr "Datubasearen pasahitza"
 
-#: templates/installation.php:117
+#: templates/installation.php:127
 msgid "Database name"
 msgstr "Datubasearen izena"
 
-#: templates/installation.php:125
+#: templates/installation.php:137
 msgid "Database tablespace"
 msgstr "Datu basearen taula-lekua"
 
-#: templates/installation.php:131
+#: templates/installation.php:144
 msgid "Database host"
 msgstr "Datubasearen hostalaria"
 
-#: templates/installation.php:136
+#: templates/installation.php:150
 msgid "Finish setup"
 msgstr "Bukatu konfigurazioa"
 
-#: templates/layout.guest.php:33
+#: templates/layout.guest.php:35
 msgid "web services under your control"
 msgstr "web zerbitzuak zure kontrolpean"
 
-#: templates/layout.user.php:48
+#: templates/layout.user.php:53
 msgid "Log out"
 msgstr "Saioa bukatu"
 
diff --git a/l10n/eu/files.po b/l10n/eu/files.po
index 27a31c2ac492ac0155e3b42cac5fad0ffbf703a3..96cb7e9a37ef5aa79ccdf4913fb3f4699c05128d 100644
--- a/l10n/eu/files.po
+++ b/l10n/eu/files.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\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: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
@@ -54,27 +54,27 @@ msgid ""
 "the HTML form"
 msgstr "Igotako fitxategiaren tamaina HTML inprimakiko MAX_FILESIZE direktiban adierazitakoa baino handiagoa da"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
 msgstr "Igotako fitxategiaren zati bat baino gehiago ez da igo"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:31
 msgid "No file was uploaded"
 msgstr "Ez da fitxategirik igo"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:32
 msgid "Missing a temporary folder"
 msgstr "Aldi baterako karpeta falta da"
 
-#: ajax/upload.php:34
+#: ajax/upload.php:33
 msgid "Failed to write to disk"
 msgstr "Errore bat izan da diskoan idazterakoan"
 
-#: ajax/upload.php:52
+#: ajax/upload.php:51
 msgid "Not enough storage available"
 msgstr "Ez dago behar aina leku erabilgarri,"
 
-#: ajax/upload.php:83
+#: ajax/upload.php:82
 msgid "Invalid directory."
 msgstr "Baliogabeko karpeta."
 
@@ -86,7 +86,7 @@ msgstr "Fitxategiak"
 msgid "Delete permanently"
 msgstr "Ezabatu betirako"
 
-#: js/fileactions.js:127 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:127 templates/index.php:92 templates/index.php:93
 msgid "Delete"
 msgstr "Ezabatu"
 
@@ -94,40 +94,36 @@ msgstr "Ezabatu"
 msgid "Rename"
 msgstr "Berrizendatu"
 
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
 msgid "Pending"
 msgstr "Zain"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "{new_name} already exists"
 msgstr "{new_name} dagoeneko existitzen da"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "replace"
 msgstr "ordeztu"
 
-#: js/filelist.js:253
+#: js/filelist.js:251
 msgid "suggest name"
 msgstr "aholkatu izena"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "cancel"
 msgstr "ezeztatu"
 
-#: js/filelist.js:295
-msgid "replaced {new_name}"
-msgstr "ordezkatua {new_name}"
+#: js/filelist.js:298
+msgid "replaced {new_name} with {old_name}"
+msgstr " {new_name}-k {old_name} ordezkatu du"
 
-#: js/filelist.js:295 js/filelist.js:297
+#: js/filelist.js:298
 msgid "undo"
 msgstr "desegin"
 
-#: js/filelist.js:297
-msgid "replaced {new_name} with {old_name}"
-msgstr " {new_name}-k {old_name} ordezkatu du"
-
-#: js/filelist.js:322
+#: js/filelist.js:323
 msgid "perform delete operation"
 msgstr "Ezabatu"
 
@@ -153,74 +149,74 @@ 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:224
+#: js/files.js:225
 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:261
+#: js/files.js:262
 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"
 
-#: js/files.js:261
+#: js/files.js:262
 msgid "Upload Error"
 msgstr "Igotzean errore bat suertatu da"
 
-#: js/files.js:272
+#: js/files.js:273
 msgid "Close"
 msgstr "Itxi"
 
-#: js/files.js:311
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr "fitxategi 1 igotzen"
 
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr "{count} fitxategi igotzen"
 
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "Igoera ezeztatuta"
 
-#: js/files.js:496
+#: js/files.js:497
 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:569
+#: js/files.js:570
 msgid "URL cannot be empty."
 msgstr "URLa ezin da hutsik egon."
 
-#: js/files.js:574
+#: js/files.js:575
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Baliogabeako karpeta izena. 'Shared' izena Owncloudek erreserbatzen du"
 
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:953 templates/index.php:68
 msgid "Name"
 msgstr "Izena"
 
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:954 templates/index.php:79
 msgid "Size"
 msgstr "Tamaina"
 
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:955 templates/index.php:81
 msgid "Modified"
 msgstr "Aldatuta"
 
-#: js/files.js:969
+#: js/files.js:974
 msgid "1 folder"
 msgstr "karpeta bat"
 
-#: js/files.js:971
+#: js/files.js:976
 msgid "{count} folders"
 msgstr "{count} karpeta"
 
-#: js/files.js:979
+#: js/files.js:984
 msgid "1 file"
 msgstr "fitxategi bat"
 
-#: js/files.js:981
+#: js/files.js:986
 msgid "{count} files"
 msgstr "{count} fitxategi"
 
@@ -278,39 +274,43 @@ msgstr "Estekatik"
 
 #: templates/index.php:40
 msgid "Deleted files"
-msgstr ""
+msgstr "Ezabatutako fitxategiak"
 
 #: templates/index.php:46
 msgid "Cancel upload"
 msgstr "Ezeztatu igoera"
 
-#: templates/index.php:59
+#: templates/index.php:53
+msgid "You don’t have write permissions here."
+msgstr "Ez duzu hemen idazteko baimenik."
+
+#: templates/index.php:60
 msgid "Nothing in here. Upload something!"
 msgstr "Ez dago ezer. Igo zerbait!"
 
-#: templates/index.php:73
+#: templates/index.php:74
 msgid "Download"
 msgstr "Deskargatu"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:86 templates/index.php:87
 msgid "Unshare"
 msgstr "Ez elkarbanatu"
 
-#: templates/index.php:105
+#: templates/index.php:106
 msgid "Upload too large"
 msgstr "Igotakoa handiegia da"
 
-#: templates/index.php:107
+#: templates/index.php:108
 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:112
+#: templates/index.php:113
 msgid "Files are being scanned, please wait."
 msgstr "Fitxategiak eskaneatzen ari da, itxoin mezedez."
 
-#: templates/index.php:115
+#: templates/index.php:116
 msgid "Current scanning"
 msgstr "Orain eskaneatzen ari da"
 
diff --git a/l10n/eu/files_external.po b/l10n/eu/files_external.po
index 285a6bad98dc1d51afc0b1bccd2ed5e1412f0d38..6a7867c269d9e5df7f9c3b646a41ee379b1da1de 100644
--- a/l10n/eu/files_external.po
+++ b/l10n/eu/files_external.po
@@ -3,13 +3,14 @@
 # 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: 2012-12-28 00:20+0100\n"
-"PO-Revision-Date: 2012-12-27 20:50+0000\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"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
@@ -18,37 +19,33 @@ msgstr ""
 "Language: eu\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 "Sarrera baimendua"
 
-#: 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 "Errore bat egon da Dropbox biltegiratzea konfiguratzean"
 
-#: 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 "Baimendu sarrera"
 
-#: js/dropbox.js:73 js/google.js:72
-msgid "Fill out all required fields"
-msgstr "Bete eskatutako eremu guztiak"
-
-#: js/dropbox.js:85
+#: js/dropbox.js:101
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr "Mesedez eman baliozkoa den Dropbox app giltza eta sekretua"
 
-#: 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 "Errore bat egon da Google Drive biltegiratzea konfiguratzean"
 
-#: lib/config.php:434
+#: lib/config.php:421
 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:435
+#: lib/config.php:424
 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 "
@@ -59,63 +56,63 @@ msgstr "<b>Abisua:</b> PHPren FTP modulua ez dago instalatuta edo gaitua. FTP pa
 msgid "External Storage"
 msgstr "Kanpoko Biltegiratzea"
 
-#: templates/settings.php:8 templates/settings.php:22
-msgid "Mount point"
-msgstr "Montatze puntua"
-
-#: templates/settings.php:9
-msgid "Backend"
-msgstr "Motorra"
+#: templates/settings.php:9 templates/settings.php:28
+msgid "Folder name"
+msgstr "Karpetaren izena"
 
 #: templates/settings.php:10
+msgid "External storage"
+msgstr "Kanpoko biltegiratzea"
+
+#: templates/settings.php:11
 msgid "Configuration"
 msgstr "Konfigurazioa"
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid "Options"
 msgstr "Aukerak"
 
-#: templates/settings.php:12
+#: templates/settings.php:13
 msgid "Applicable"
 msgstr "Aplikagarria"
 
-#: templates/settings.php:27
-msgid "Add mount point"
-msgstr "Gehitu muntatze puntua"
+#: templates/settings.php:33
+msgid "Add storage"
+msgstr "Gehitu biltegiratzea"
 
-#: templates/settings.php:85
+#: templates/settings.php:90
 msgid "None set"
 msgstr "Ezarri gabe"
 
-#: templates/settings.php:86
+#: templates/settings.php:91
 msgid "All Users"
 msgstr "Erabiltzaile guztiak"
 
-#: templates/settings.php:87
+#: templates/settings.php:92
 msgid "Groups"
 msgstr "Taldeak"
 
-#: templates/settings.php:95
+#: templates/settings.php:100
 msgid "Users"
 msgstr "Erabiltzaileak"
 
-#: templates/settings.php:108 templates/settings.php:109
-#: templates/settings.php:144 templates/settings.php:145
+#: templates/settings.php:113 templates/settings.php:114
+#: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
 msgstr "Ezabatu"
 
-#: templates/settings.php:124
+#: templates/settings.php:129
 msgid "Enable User External Storage"
 msgstr "Gaitu erabiltzaileentzako Kanpo Biltegiratzea"
 
-#: templates/settings.php:125
+#: templates/settings.php:130
 msgid "Allow users to mount their own external storage"
 msgstr "Baimendu erabiltzaileak bere kanpo biltegiratzeak muntatzen"
 
-#: templates/settings.php:136
+#: templates/settings.php:141
 msgid "SSL root certificates"
 msgstr "SSL erro ziurtagiriak"
 
-#: templates/settings.php:153
+#: templates/settings.php:159
 msgid "Import Root Certificate"
 msgstr "Inportatu Erro Ziurtagiria"
diff --git a/l10n/eu/files_trashbin.po b/l10n/eu/files_trashbin.po
index 405582e4205c73bb7dedfe6b0fc943bc2a9b0bf3..1e340f1ca10a76c346066738cf782ad93e180548 100644
--- a/l10n/eu/files_trashbin.po
+++ b/l10n/eu/files_trashbin.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-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-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: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Language: eu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:22
+#: ajax/delete.php:40
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "Ezin izan da %s betirako ezabatu"
@@ -28,35 +28,39 @@ msgstr "Ezin izan da %s betirako ezabatu"
 msgid "Couldn't restore %s"
 msgstr "Ezin izan da %s berreskuratu"
 
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
 msgid "perform restore operation"
 msgstr "berreskuratu"
 
-#: js/trash.js:33
+#: js/trash.js:34
 msgid "delete file permanently"
 msgstr "ezabatu fitxategia betirako"
 
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr "Ezabatu betirako"
+
+#: js/trash.js:174 templates/index.php:17
 msgid "Name"
 msgstr "Izena"
 
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:175 templates/index.php:27
 msgid "Deleted"
 msgstr "Ezabatuta"
 
-#: js/trash.js:135
+#: js/trash.js:184
 msgid "1 folder"
 msgstr "karpeta bat"
 
-#: js/trash.js:137
+#: js/trash.js:186
 msgid "{count} folders"
 msgstr "{count} karpeta"
 
-#: js/trash.js:145
+#: js/trash.js:194
 msgid "1 file"
 msgstr "fitxategi bat"
 
-#: js/trash.js:147
+#: js/trash.js:196
 msgid "{count} files"
 msgstr "{count} fitxategi"
 
@@ -67,3 +71,11 @@ msgstr "Ez dago ezer ez. Zure zakarrontzia hutsik dago!"
 #: templates/index.php:20 templates/index.php:22
 msgid "Restore"
 msgstr "Berrezarri"
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr "Ezabatu"
+
+#: templates/part.breadcrumb.php:9
+msgid "Deleted Files"
+msgstr ""
diff --git a/l10n/eu/files_versions.po b/l10n/eu/files_versions.po
index ddd2d92e947d3abbda54030738c07c5107db8dcb..867a9523a0917df667f87fb39afe8c08fff3d9a5 100644
--- a/l10n/eu/files_versions.po
+++ b/l10n/eu/files_versions.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-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 22:10+0000\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"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
@@ -42,26 +42,18 @@ msgstr "errorea"
 msgid "File %s could not be reverted to version %s"
 msgstr "%s fitxategia ezin da %s bertsiora leheneratu"
 
-#: history.php:68
+#: history.php:69
 msgid "No old versions available"
 msgstr "Ez dago bertsio zaharrik eskuragarri"
 
-#: history.php:73
+#: history.php:74
 msgid "No path specified"
 msgstr "Ez da bidea zehaztu"
 
-#: js/versions.js:16
-msgid "History"
-msgstr "Historia"
+#: js/versions.js:6
+msgid "Versions"
+msgstr "Bertsioak"
 
 #: templates/history.php:20
 msgid "Revert a file to a previous version by clicking on its revert button"
 msgstr "Itzuli fitxategi bat aurreko bertsio batera leheneratu bere leheneratu botoia sakatuz"
-
-#: templates/settings.php:3
-msgid "Files Versioning"
-msgstr "Fitxategien Bertsioak"
-
-#: templates/settings.php:4
-msgid "Enable"
-msgstr "Gaitu"
diff --git a/l10n/eu/lib.po b/l10n/eu/lib.po
index 10ce4a215257ce9801d5204df0e4eb9b18a7dbda..6febfeec2d08cafbb75c4128fbaabb406835e255 100644
--- a/l10n/eu/lib.po
+++ b/l10n/eu/lib.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 22:00+0000\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"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
@@ -19,27 +19,27 @@ msgstr ""
 "Language: eu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:339
+#: app.php:349
 msgid "Help"
 msgstr "Laguntza"
 
-#: app.php:346
+#: app.php:362
 msgid "Personal"
 msgstr "Pertsonala"
 
-#: app.php:351
+#: app.php:373
 msgid "Settings"
 msgstr "Ezarpenak"
 
-#: app.php:356
+#: app.php:385
 msgid "Users"
 msgstr "Erabiltzaileak"
 
-#: app.php:363
+#: app.php:398
 msgid "Apps"
 msgstr "Aplikazioak"
 
-#: app.php:365
+#: app.php:406
 msgid "Admin"
 msgstr "Admin"
 
@@ -51,15 +51,15 @@ msgstr "ZIP deskarga ez dago gaituta."
 msgid "Files need to be downloaded one by one."
 msgstr "Fitxategiak banan-banan deskargatu behar dira."
 
-#: files.php:203 files.php:228
+#: files.php:204 files.php:231
 msgid "Back to Files"
 msgstr "Itzuli fitxategietara"
 
-#: files.php:227
+#: files.php:228
 msgid "Selected files too large to generate zip file."
 msgstr "Hautatuko fitxategiak oso handiak dira zip fitxategia sortzeko."
 
-#: helper.php:226
+#: helper.php:228
 msgid "couldn't be determined"
 msgstr "ezin izan da zehaztu"
 
@@ -99,87 +99,92 @@ msgstr "Ezarri administraziorako pasahitza."
 msgid "Specify a data folder."
 msgstr "Zehaztu data karpeta."
 
-#: setup.php:53
+#: setup.php:55
 #, php-format
 msgid "%s enter the database username."
 msgstr "%s sartu datu basearen erabiltzaile izena."
 
-#: setup.php:56
+#: setup.php:58
 #, php-format
 msgid "%s enter the database name."
 msgstr "%s sartu datu basearen izena."
 
-#: setup.php:59
+#: setup.php:61
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr "%s ezin duzu punturik erabili datu basearen izenean."
 
-#: setup.php:62
+#: setup.php:64
 #, php-format
 msgid "%s set the database host."
 msgstr "%s sartu datu basearen hostalaria."
 
-#: setup.php:126 setup.php:291 setup.php:336
+#: setup.php:128 setup.php:320 setup.php:365
 msgid "PostgreSQL username and/or password not valid"
 msgstr "PostgreSQL erabiltzaile edota pasahitza ez dira egokiak."
 
-#: setup.php:127 setup.php:150 setup.php:204
+#: setup.php:129 setup.php:152 setup.php:229
 msgid "You need to enter either an existing account or the administrator."
 msgstr "Existitzen den kontu bat edo administradorearena jarri behar duzu."
 
-#: setup.php:149 setup.php:423 setup.php:489
+#: setup.php:151 setup.php:453 setup.php:520
 msgid "Oracle username and/or password not valid"
 msgstr "Oracle erabiltzaile edota pasahitza ez dira egokiak."
 
-#: setup.php:203
+#: setup.php:228
 msgid "MySQL username and/or password not valid"
 msgstr "MySQL erabiltzaile edota pasahitza ez dira egokiak."
 
-#: setup.php:255 setup.php:357 setup.php:366 setup.php:384 setup.php:394
-#: setup.php:403 setup.php:430 setup.php:496 setup.php:522 setup.php:529
-#: setup.php:540 setup.php:547 setup.php:556 setup.php:564 setup.php:573
-#: setup.php:579
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "DB errorea: \"%s\""
 
-#: setup.php:256 setup.php:358 setup.php:367 setup.php:385 setup.php:395
-#: setup.php:404 setup.php:431 setup.php:497 setup.php:523 setup.php:530
-#: setup.php:541 setup.php:557 setup.php:565 setup.php:574
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "Errorea komando honek sortu du: \"%s\""
 
-#: setup.php:270
+#: setup.php:299
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "MySQL '%s'@'localhost' erabiltzailea dagoeneko existitzen da."
 
-#: setup.php:271
+#: setup.php:300
 msgid "Drop this user from MySQL"
 msgstr "Ezabatu erabiltzaile hau MySQLtik"
 
-#: setup.php:276
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "MySQL '%s'@'%%' erabiltzailea dagoeneko existitzen da"
 
-#: setup.php:277
+#: setup.php:306
 msgid "Drop this user from MySQL."
 msgstr "Ezabatu erabiltzaile hau MySQLtik."
 
-#: setup.php:548 setup.php:580
+#: setup.php:579 setup.php:611
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Errorea komando honek sortu du: \"%s\", izena: %s, pasahitza: %s"
 
-#: setup.php:644
+#: setup.php:631
+#, 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
 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:645
+#: setup.php:850
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Mesedez begiratu <a href='%s'>instalazio gidak</a>."
@@ -236,16 +241,16 @@ msgstr "joan den urtea"
 msgid "years ago"
 msgstr "orain dela urte batzuk"
 
-#: updater.php:75
+#: 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:77
+#: updater.php:81
 msgid "up to date"
 msgstr "eguneratuta"
 
-#: updater.php:80
+#: updater.php:84
 msgid "updates check is disabled"
 msgstr "eguneraketen egiaztapena ez dago gaituta"
 
diff --git a/l10n/eu/settings.po b/l10n/eu/settings.po
index 7e26109a3fd7eba1cb3a18d9068bc68b336f4ac9..0f589e657ac75c2d3012138a2f2e2ad75d00d035 100644
--- a/l10n/eu/settings.po
+++ b/l10n/eu/settings.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 23:05+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "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,8 +25,8 @@ 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:15
-#: ajax/togglegroups.php:18
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr "Autentifikazio errorea"
 
@@ -74,12 +74,12 @@ msgstr "Baliogabeko eskaria"
 msgid "Admins can't remove themself from the admin group"
 msgstr "Kudeatzaileak ezin du bere burua kendu kudeatzaile taldetik"
 
-#: ajax/togglegroups.php:28
+#: ajax/togglegroups.php:30
 #, php-format
 msgid "Unable to add user to group %s"
 msgstr "Ezin izan da erabiltzailea %s taldera gehitu"
 
-#: ajax/togglegroups.php:34
+#: ajax/togglegroups.php:36
 #, php-format
 msgid "Unable to remove user from group %s"
 msgstr "Ezin izan da erabiltzailea %s taldetik ezabatu"
@@ -120,7 +120,7 @@ msgstr "Errorea"
 msgid "Updated"
 msgstr "Eguneratuta"
 
-#: js/personal.js:96
+#: js/personal.js:99
 msgid "Saving..."
 msgstr "Gordetzen..."
 
@@ -149,23 +149,23 @@ msgstr "Talde administradorea"
 msgid "Delete"
 msgstr "Ezabatu"
 
-#: js/users.js:190
+#: js/users.js:191
 msgid "add group"
 msgstr "gehitu taldea"
 
-#: js/users.js:351
+#: js/users.js:352
 msgid "A valid username must be provided"
 msgstr "Baliozko erabiltzaile izena eman behar da"
 
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
 msgid "Error creating user"
 msgstr "Errore bat egon da erabiltzailea sortzean"
 
-#: js/users.js:357
+#: js/users.js:358
 msgid "A valid password must be provided"
 msgstr "Baliozko pasahitza eman behar da"
 
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
 msgid "__language_name__"
 msgstr "Euskera"
 
@@ -211,19 +211,19 @@ msgstr "PHP 'fileinfo' modulua falta da. Modulu hau gaitzea aholkatzen dizugu mi
 msgid "Locale not working"
 msgstr "Lokala ez dabil"
 
-#: templates/admin.php:61
+#: templates/admin.php:63
+#, php-format
 msgid ""
-"This ownCloud server can't set system locale to "
-"\"en_US.UTF-8\"/\"en_US.UTF8\". 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 en_US.UTF-8/en_US.UTF8."
-msgstr ""
+"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 "OwnClud zerbitzari honek ezin du sistemaren lokala %s-ra ezarri. Honek fitxategien izenetan karaktere batzuekin arazoak egon daitekeela esan nahi du. Aholkatzen dizugu zure sistema %s lokalea onartzeko beharrezkoak diren paketeak instalatzea."
 
-#: templates/admin.php:72
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr "Interneteko konexioak ez du funtzionatzen"
 
-#: templates/admin.php:75
+#: 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 "
@@ -233,98 +233,98 @@ msgid ""
 " of ownCloud."
 msgstr "ownCloud zerbitzari honen interneteko konexioa ez dabil. Honek esan nahi du kanpoko biltegiratze zerbitzuak, eguneraketen informazioa edo bestelako aplikazioen instalazioa bezalako programek ez dutela funtzionatuko. Urrunetik fitxategiak eskuratzea eta e-postak bidaltzea ere ezinezkoa izan daiteke. onwCloud-en aukera guztiak erabili ahal izateko zerbitzari honetan interneteko konexioa gaitzea aholkatzen dizugu."
 
-#: templates/admin.php:89
+#: templates/admin.php:92
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:98
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr "Exekutatu zeregin bat orri karga bakoitzean"
 
-#: templates/admin.php:108
+#: 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 webcron zerbitzu batean erregistratua dago. Deitu cron.php orria ownclouden erroan minuturo http bidez."
 
-#: templates/admin.php:118
+#: 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 "Erabili sistemaren cron zerbitzua. Deitu cron.php fitxategia owncloud karpetan minuturo sistemaren cron lan baten bidez."
 
-#: templates/admin.php:125
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr "Partekatzea"
 
-#: templates/admin.php:131
+#: templates/admin.php:134
 msgid "Enable Share API"
-msgstr "Gaitu Partekatze APIa"
+msgstr "Gaitu Elkarbanatze APIa"
 
-#: templates/admin.php:132
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
-msgstr "Baimendu aplikazioak Partekatze APIa erabiltzeko"
+msgstr "Baimendu aplikazioak Elkarbanatze APIa erabiltzeko"
 
-#: templates/admin.php:139
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr "Baimendu loturak"
 
-#: templates/admin.php:140
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
-msgstr "Baimendu erabiltzaileak loturen bidez fitxategiak publikoki partekatzen"
+msgstr "Baimendu erabiltzaileak loturen bidez fitxategiak publikoki elkarbanatzen"
 
-#: templates/admin.php:147
+#: templates/admin.php:150
 msgid "Allow resharing"
 msgstr "Baimendu birpartekatzea"
 
-#: templates/admin.php:148
+#: templates/admin.php:151
 msgid "Allow users to share items shared with them again"
-msgstr "Baimendu erabiltzaileak haiekin partekatutako fitxategiak berriz ere partekatzen"
+msgstr "Baimendu erabiltzaileak haiekin elkarbanatutako fitxategiak berriz ere elkarbanatzen"
 
-#: templates/admin.php:155
+#: templates/admin.php:158
 msgid "Allow users to share with anyone"
-msgstr "Baimendu erabiltzaileak edonorekin partekatzen"
+msgstr "Baimendu erabiltzaileak edonorekin elkarbanatzen"
 
-#: templates/admin.php:158
+#: templates/admin.php:161
 msgid "Allow users to only share with users in their groups"
-msgstr "Baimendu erabiltzaileak bakarrik bere taldeko erabiltzaileekin partekatzen"
+msgstr "Baimendu erabiltzaileak bakarrik bere taldeko erabiltzaileekin elkarbanatzen"
 
-#: templates/admin.php:165
+#: templates/admin.php:168
 msgid "Security"
 msgstr "Segurtasuna"
 
-#: templates/admin.php:178
+#: templates/admin.php:181
 msgid "Enforce HTTPS"
 msgstr "Behartu HTTPS"
 
-#: templates/admin.php:179
+#: templates/admin.php:182
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr "Bezeroak konexio enkriptatu baten bidez ownCloud-era konektatzera behartzen du."
 
-#: templates/admin.php:182
+#: templates/admin.php:185
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr "Mesedez konektatu ownCloud honetara HTTPS bidez SSL-ren beharra gaitu edo ezgaitzeko"
 
-#: templates/admin.php:192
+#: templates/admin.php:195
 msgid "Log"
 msgstr "Egunkaria"
 
-#: templates/admin.php:193
+#: templates/admin.php:196
 msgid "Log level"
 msgstr "Erregistro maila"
 
-#: templates/admin.php:220
+#: templates/admin.php:223
 msgid "More"
 msgstr "Gehiago"
 
-#: templates/admin.php:227 templates/personal.php:98
+#: templates/admin.php:230 templates/personal.php:102
 msgid "Version"
 msgstr "Bertsioa"
 
-#: templates/admin.php:230 templates/personal.php:100
+#: templates/admin.php:233 templates/personal.php:105
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -334,51 +334,51 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud komunitateak</a> garatuta, <a href=\"https://github.com/owncloud\" target=\"_blank\">itubruru kodea</a><a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr> lizentziarekin banatzen da</a>."
 
-#: templates/apps.php:10
+#: templates/apps.php:11
 msgid "Add your App"
 msgstr "Gehitu zure aplikazioa"
 
-#: templates/apps.php:11
+#: templates/apps.php:12
 msgid "More Apps"
 msgstr "App gehiago"
 
-#: templates/apps.php:24
+#: templates/apps.php:28
 msgid "Select an App"
 msgstr "Aukeratu programa bat"
 
-#: templates/apps.php:28
+#: templates/apps.php:34
 msgid "See application page at apps.owncloud.com"
 msgstr "Ikusi programen orria apps.owncloud.com en"
 
-#: templates/apps.php:29
+#: templates/apps.php:36
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-lizentziatua <span class=\"author\"></span>"
 
-#: templates/apps.php:31
+#: templates/apps.php:38
 msgid "Update"
 msgstr "Eguneratu"
 
-#: templates/help.php:3
+#: templates/help.php:4
 msgid "User Documentation"
 msgstr "Erabiltzaile dokumentazioa"
 
-#: templates/help.php:4
+#: templates/help.php:6
 msgid "Administrator Documentation"
 msgstr "Administradore dokumentazioa"
 
-#: templates/help.php:6
+#: templates/help.php:9
 msgid "Online Documentation"
 msgstr "Online dokumentazioa"
 
-#: templates/help.php:7
+#: templates/help.php:11
 msgid "Forum"
 msgstr "Foroa"
 
-#: templates/help.php:9
+#: templates/help.php:14
 msgid "Bugtracker"
 msgstr "Bugtracker"
 
-#: templates/help.php:11
+#: templates/help.php:17
 msgid "Commercial Support"
 msgstr "Babes komertziala"
 
@@ -387,79 +387,79 @@ msgstr "Babes komertziala"
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Dagoeneko <strong>%s</strong> erabili duzu eskuragarri duzun <strong>%s</strong>etatik"
 
-#: templates/personal.php:14
+#: templates/personal.php:15
 msgid "Get the apps to sync your files"
 msgstr "Lortu aplikazioak zure fitxategiak sinkronizatzeko"
 
-#: templates/personal.php:25
+#: templates/personal.php:26
 msgid "Show First Run Wizard again"
 msgstr "Erakutsi berriz Lehenengo Aldiko Morroia"
 
-#: templates/personal.php:36 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
 msgid "Password"
 msgstr "Pasahitza"
 
-#: templates/personal.php:37
+#: templates/personal.php:38
 msgid "Your password was changed"
 msgstr "Zere pasahitza aldatu da"
 
-#: templates/personal.php:38
+#: templates/personal.php:39
 msgid "Unable to change your password"
 msgstr "Ezin izan da zure pasahitza aldatu"
 
-#: templates/personal.php:39
+#: templates/personal.php:40
 msgid "Current password"
 msgstr "Uneko pasahitza"
 
-#: templates/personal.php:40
+#: templates/personal.php:42
 msgid "New password"
 msgstr "Pasahitz berria"
 
-#: templates/personal.php:42
+#: templates/personal.php:44
 msgid "Change password"
 msgstr "Aldatu pasahitza"
 
-#: templates/personal.php:54 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:78
 msgid "Display Name"
 msgstr "Bistaratze Izena"
 
-#: templates/personal.php:55
+#: templates/personal.php:57
 msgid "Your display name was changed"
 msgstr "Zure bistaratze izena aldatu da"
 
-#: templates/personal.php:56
+#: templates/personal.php:58
 msgid "Unable to change your display name"
 msgstr "Ezin izan da zure bistaratze izena aldatu"
 
-#: templates/personal.php:59
+#: templates/personal.php:61
 msgid "Change display name"
 msgstr "Aldatu bistaratze izena"
 
-#: templates/personal.php:68
+#: templates/personal.php:70
 msgid "Email"
 msgstr "E-Posta"
 
-#: templates/personal.php:69
+#: templates/personal.php:72
 msgid "Your email address"
 msgstr "Zure e-posta"
 
-#: templates/personal.php:70
+#: templates/personal.php:73
 msgid "Fill in an email address to enable password recovery"
 msgstr "Idatz ezazu e-posta bat pasahitza berreskuratu ahal izateko"
 
-#: templates/personal.php:76 templates/personal.php:77
+#: templates/personal.php:79 templates/personal.php:80
 msgid "Language"
 msgstr "Hizkuntza"
 
-#: templates/personal.php:82
+#: templates/personal.php:86
 msgid "Help translate"
 msgstr "Lagundu itzultzen"
 
-#: templates/personal.php:87
+#: templates/personal.php:91
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:89
+#: templates/personal.php:93
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "Erabili helbide hau zure fitxategi kudeatzailean zure ownCloudera konektatzeko"
 
diff --git a/l10n/eu/user_ldap.po b/l10n/eu/user_ldap.po
index 23c282efa1a8a4b2889f1460346b618fe3637061..9eb4cb6144017a2399a207d45ed5281183fe98bd 100644
--- a/l10n/eu/user_ldap.po
+++ b/l10n/eu/user_ldap.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 22:33+0000\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"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
@@ -23,17 +23,17 @@ msgstr ""
 msgid "Failed to delete the server configuration"
 msgstr "Zerbitzariaren konfigurazioa ezabatzeak huts egin du"
 
-#: ajax/testConfiguration.php:35
+#: ajax/testConfiguration.php:36
 msgid "The configuration is valid and the connection could be established!"
 msgstr "Konfigurazioa egokia da eta konexioa ezarri daiteke!"
 
-#: ajax/testConfiguration.php:37
+#: ajax/testConfiguration.php:39
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
 msgstr "Konfigurazioa ongi dago, baina Bind-ek huts egin du. Mesedez egiaztatu zerbitzariaren ezarpenak eta kredentzialak."
 
-#: ajax/testConfiguration.php:40
+#: ajax/testConfiguration.php:43
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
@@ -45,7 +45,7 @@ msgstr "Ezabaketak huts egin du"
 
 #: js/settings.js:82
 msgid "Take over settings from recent server configuration?"
-msgstr ""
+msgstr "oraintsuko zerbitzariaren konfigurazioaren ezarpenen ardura hartu?"
 
 #: js/settings.js:83
 msgid "Keep settings?"
@@ -88,224 +88,248 @@ msgstr "<b>Abisua:</b> PHPk behar duen LDAP modulua ez dago instalaturik, motorr
 msgid "Server configuration"
 msgstr "Zerbitzariaren konfigurazioa"
 
-#: templates/settings.php:17
+#: templates/settings.php:18
 msgid "Add Server Configuration"
 msgstr "Gehitu Zerbitzariaren Konfigurazioa"
 
-#: templates/settings.php:21
+#: templates/settings.php:23
 msgid "Host"
 msgstr "Hostalaria"
 
-#: templates/settings.php:21
+#: templates/settings.php:25
 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:22
+#: templates/settings.php:26
 msgid "Base DN"
 msgstr "Oinarrizko DN"
 
-#: templates/settings.php:22
+#: templates/settings.php:27
 msgid "One Base DN per line"
 msgstr "DN Oinarri bat lerroko"
 
-#: templates/settings.php:22
+#: templates/settings.php:28
 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:23
+#: templates/settings.php:30
 msgid "User DN"
 msgstr "Erabiltzaile DN"
 
-#: templates/settings.php:23
+#: templates/settings.php:32
 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:24
+#: templates/settings.php:33
 msgid "Password"
 msgstr "Pasahitza"
 
-#: templates/settings.php:24
+#: templates/settings.php:36
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "Sarrera anonimoak gaitzeko utzi DN eta Pasahitza hutsik."
 
-#: templates/settings.php:25
+#: templates/settings.php:37
 msgid "User Login Filter"
 msgstr "Erabiltzaileen saioa hasteko iragazkia"
 
-#: templates/settings.php:25
+#: templates/settings.php:40
 #, 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:25
+#: templates/settings.php:41
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "erabili %%uid txantiloia, adb. \"uid=%%uid\""
 
-#: templates/settings.php:26
+#: templates/settings.php:42
 msgid "User List Filter"
 msgstr "Erabiltzaile zerrendaren Iragazkia"
 
-#: templates/settings.php:26
+#: templates/settings.php:45
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Erabiltzaileak jasotzen direnean ezarriko den iragazkia zehazten du."
 
-#: templates/settings.php:26
+#: templates/settings.php:46
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "txantiloirik gabe, adb. \"objectClass=person\"."
 
-#: templates/settings.php:27
+#: templates/settings.php:47
 msgid "Group Filter"
 msgstr "Taldeen iragazkia"
 
-#: templates/settings.php:27
+#: templates/settings.php:50
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Taldeak jasotzen direnean ezarriko den iragazkia zehazten du."
 
-#: templates/settings.php:27
+#: templates/settings.php:51
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "txantiloirik gabe, adb. \"objectClass=posixGroup\"."
 
-#: templates/settings.php:31
+#: templates/settings.php:55
 msgid "Connection Settings"
 msgstr "Konexio Ezarpenak"
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "Configuration Active"
 msgstr "Konfigurazio Aktiboa"
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "When unchecked, this configuration will be skipped."
 msgstr "Markatuta ez dagoenean, konfigurazio hau ez da kontutan hartuko."
 
-#: templates/settings.php:34
+#: templates/settings.php:58
 msgid "Port"
 msgstr "Portua"
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid "Backup (Replica) Host"
 msgstr "Babeskopia (Replica) Ostalaria"
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 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:36
+#: templates/settings.php:60
 msgid "Backup (Replica) Port"
 msgstr "Babeskopia (Replica) Ataka"
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "Disable Main Server"
 msgstr "Desgaitu Zerbitzari Nagusia"
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr "Markatuta dagoenean, ownCloud bakarrik replica zerbitzarira konektatuko da."
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Use TLS"
 msgstr "Erabili TLS"
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr "Ez erabili LDAPS konexioetarako, huts egingo du."
 
-#: templates/settings.php:39
+#: templates/settings.php:63
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Maiuskulak eta minuskulak ezberditzen ez dituen LDAP zerbitzaria (windows)"
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid "Turn off SSL certificate validation."
 msgstr "Ezgaitu SSL ziurtagirien egiaztapena."
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 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:40
+#: templates/settings.php:64
 msgid "Not recommended, use for testing only."
 msgstr "Ez da aholkatzen, erabili bakarrik frogak egiteko."
 
-#: templates/settings.php:41
+#: templates/settings.php:65
+msgid "Cache Time-To-Live"
+msgstr "Katxearen Bizi-Iraupena"
+
+#: templates/settings.php:65
 msgid "in seconds. A change empties the cache."
 msgstr "segundutan. Aldaketak katxea husten du."
 
-#: templates/settings.php:43
+#: templates/settings.php:67
 msgid "Directory Settings"
 msgstr "Karpetaren Ezarpenak"
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "User Display Name Field"
 msgstr "Erabiltzaileen bistaratzeko izena duen eremua"
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 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:46
+#: templates/settings.php:70
 msgid "Base User Tree"
 msgstr "Oinarrizko Erabiltzaile Zuhaitza"
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "One User Base DN per line"
 msgstr "Erabiltzaile DN Oinarri bat lerroko"
 
-#: templates/settings.php:47
+#: templates/settings.php:71
 msgid "User Search Attributes"
 msgstr "Erabili Bilaketa Atributuak "
 
-#: templates/settings.php:47 templates/settings.php:50
+#: templates/settings.php:71 templates/settings.php:74
 msgid "Optional; one attribute per line"
 msgstr "Aukerakoa; atributu bat lerro bakoitzeko"
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "Group Display Name Field"
 msgstr "Taldeen bistaratzeko izena duen eremua"
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 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:49
+#: templates/settings.php:73
 msgid "Base Group Tree"
 msgstr "Oinarrizko Talde Zuhaitza"
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "One Group Base DN per line"
 msgstr "Talde DN Oinarri bat lerroko"
 
-#: templates/settings.php:50
+#: templates/settings.php:74
 msgid "Group Search Attributes"
 msgstr "Taldekatu Bilaketa Atributuak "
 
-#: templates/settings.php:51
+#: templates/settings.php:75
 msgid "Group-Member association"
 msgstr "Talde-Kide elkarketak"
 
-#: templates/settings.php:53
+#: templates/settings.php:77
 msgid "Special Attributes"
 msgstr "Atributu Bereziak"
 
-#: templates/settings.php:56
+#: templates/settings.php:79
+msgid "Quota Field"
+msgstr "Kuota Eremua"
+
+#: templates/settings.php:80
+msgid "Quota Default"
+msgstr "Kuota Lehenetsia"
+
+#: templates/settings.php:80
 msgid "in bytes"
 msgstr "bytetan"
 
-#: templates/settings.php:58
+#: templates/settings.php:81
+msgid "Email Field"
+msgstr "Eposta eremua"
+
+#: templates/settings.php:82
+msgid "User Home Folder Naming Rule"
+msgstr "Erabiltzailearen Karpeta Nagusia Izendatzeko Patroia"
+
+#: templates/settings.php:82
 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:62
+#: templates/settings.php:86
+msgid "Test Configuration"
+msgstr "Egiaztatu Konfigurazioa"
+
+#: templates/settings.php:86
 msgid "Help"
 msgstr "Laguntza"
diff --git a/l10n/fa/core.po b/l10n/fa/core.po
index 068bba91488583839ee39ff4dff4e3df526064c4..e800192efd3e1387d62355cb5ce2b6aed548969a 100644
--- a/l10n/fa/core.po
+++ b/l10n/fa/core.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:05+0100\n"
-"PO-Revision-Date: 2013-02-14 11:00+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "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"
@@ -19,24 +19,24 @@ msgstr ""
 "Language: fa\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 "
@@ -54,7 +54,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
@@ -82,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 "دسامبر"
 
@@ -162,55 +162,55 @@ msgstr "دسامبر"
 msgid "Settings"
 msgstr "تنظیمات"
 
-#: js/js.js:767
+#: js/js.js:768
 msgid "seconds ago"
 msgstr "ثانیه‌ها پیش"
 
-#: js/js.js:768
+#: js/js.js:769
 msgid "1 minute ago"
 msgstr "1 دقیقه پیش"
 
-#: js/js.js:769
+#: js/js.js:770
 msgid "{minutes} minutes ago"
 msgstr "{دقیقه ها} دقیقه های پیش"
 
-#: js/js.js:770
+#: js/js.js:771
 msgid "1 hour ago"
 msgstr "1 ساعت پیش"
 
-#: js/js.js:771
+#: js/js.js:772
 msgid "{hours} hours ago"
 msgstr "{ساعت ها} ساعت ها پیش"
 
-#: js/js.js:772
+#: js/js.js:773
 msgid "today"
 msgstr "امروز"
 
-#: js/js.js:773
+#: js/js.js:774
 msgid "yesterday"
 msgstr "دیروز"
 
-#: js/js.js:774
+#: js/js.js:775
 msgid "{days} days ago"
 msgstr "{روزها} روزهای پیش"
 
-#: js/js.js:775
+#: js/js.js:776
 msgid "last month"
 msgstr "ماه قبل"
 
-#: js/js.js:776
+#: js/js.js:777
 msgid "{months} months ago"
 msgstr "{ماه ها} ماه ها پیش"
 
-#: js/js.js:777
+#: js/js.js:778
 msgid "months ago"
 msgstr "ماه‌های قبل"
 
-#: js/js.js:778
+#: js/js.js:779
 msgid "last year"
 msgstr "سال قبل"
 
-#: js/js.js:779
+#: js/js.js:780
 msgid "years ago"
 msgstr "سال‌های قبل"
 
@@ -255,7 +255,7 @@ msgstr "پرونده { پرونده} درخواست شده نصب نشده اس
 
 #: js/share.js:29 js/share.js:43 js/share.js:90
 msgid "Shared"
-msgstr ""
+msgstr "اشتراک گذاشته شده"
 
 #: js/share.js:93
 msgid "Share"
@@ -293,7 +293,7 @@ msgstr "به اشتراک گذاشتن با پیوند"
 msgid "Password protect"
 msgstr "نگهداری کردن رمز عبور"
 
-#: js/share.js:185 templates/installation.php:44 templates/login.php:35
+#: js/share.js:185 templates/installation.php:47 templates/login.php:35
 msgid "Password"
 msgstr "گذرواژه"
 
@@ -303,7 +303,7 @@ msgstr "پیوند ایمیل برای شخص."
 
 #: js/share.js:190
 msgid "Send"
-msgstr ""
+msgstr "ارسال"
 
 #: js/share.js:194
 msgid "Set expiration date"
@@ -371,24 +371,24 @@ msgstr "خطا در تنظیم تاریخ انقضا"
 
 #: js/share.js:609
 msgid "Sending ..."
-msgstr ""
+msgstr "درحال ارسال ..."
 
 #: js/share.js:620
 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:47
+#: lostpassword/controller.php:48
 msgid "ownCloud password reset"
 msgstr "پسورد ابرهای شما تغییرکرد"
 
@@ -408,7 +408,7 @@ msgstr "تنظیم مجدد ایمیل را بفرستید."
 msgid "Request failed!"
 msgstr "درخواست رد شده است !"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:39
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:41
 #: templates/login.php:28
 msgid "Username"
 msgstr "شناسه"
@@ -469,85 +469,86 @@ msgstr "ویرایش گروه ها"
 msgid "Add"
 msgstr "افزودن"
 
-#: templates/installation.php:23 templates/installation.php:30
+#: templates/installation.php:24 templates/installation.php:31
 msgid "Security Warning"
 msgstr "اخطار امنیتی"
 
-#: templates/installation.php:24
+#: templates/installation.php:25
 msgid ""
 "No secure random number generator is available, please enable the PHP "
 "OpenSSL extension."
 msgstr "هیچ مولد تصادفی امن در دسترس نیست، لطفا فرمت PHP OpenSSL را فعال نمایید."
 
-#: templates/installation.php:25
+#: templates/installation.php:26
 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:32
 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:33
 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:37
 msgid "Create an <strong>admin account</strong>"
 msgstr "لطفا یک <strong> شناسه برای مدیر</strong> بسازید"
 
-#: templates/installation.php:52
+#: templates/installation.php:55
 msgid "Advanced"
 msgstr "حرفه ای"
 
-#: templates/installation.php:54
+#: templates/installation.php:57
 msgid "Data folder"
 msgstr "پوشه اطلاعاتی"
 
-#: templates/installation.php:61
+#: templates/installation.php:66
 msgid "Configure the database"
 msgstr "پایگاه داده برنامه ریزی شدند"
 
-#: templates/installation.php:66 templates/installation.php:77
-#: templates/installation.php:87 templates/installation.php:97
+#: templates/installation.php:71 templates/installation.php:83
+#: templates/installation.php:94 templates/installation.php:105
+#: templates/installation.php:117
 msgid "will be used"
 msgstr "استفاده خواهد شد"
 
-#: templates/installation.php:109
+#: templates/installation.php:129
 msgid "Database user"
 msgstr "شناسه پایگاه داده"
 
-#: templates/installation.php:113
+#: templates/installation.php:134
 msgid "Database password"
 msgstr "پسورد پایگاه داده"
 
-#: templates/installation.php:117
+#: templates/installation.php:139
 msgid "Database name"
 msgstr "نام پایگاه داده"
 
-#: templates/installation.php:125
+#: templates/installation.php:149
 msgid "Database tablespace"
 msgstr "جدول پایگاه داده"
 
-#: templates/installation.php:131
+#: templates/installation.php:156
 msgid "Database host"
 msgstr "هاست پایگاه داده"
 
-#: templates/installation.php:136
+#: templates/installation.php:162
 msgid "Finish setup"
 msgstr "اتمام نصب"
 
-#: templates/layout.guest.php:33
+#: templates/layout.guest.php:35
 msgid "web services under your control"
 msgstr "سرویس وب تحت کنترل شما"
 
-#: templates/layout.user.php:48
+#: templates/layout.user.php:53
 msgid "Log out"
 msgstr "خروج"
 
@@ -592,4 +593,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/fa/files.po b/l10n/fa/files.po
index 478ca3405cb401a3f5847a8a58e838533a22c43c..a6f1b66d2f4169cd9f96dbb0c2d9b28558848ebf 100644
--- a/l10n/fa/files.po
+++ b/l10n/fa/files.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\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: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
@@ -54,27 +54,27 @@ msgid ""
 "the HTML form"
 msgstr "حداکثر حجم مجاز برای بارگذاری از طریق HTML \nMAX_FILE_SIZE"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
 msgstr "مقدار کمی از فایل بارگذاری شده"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:31
 msgid "No file was uploaded"
 msgstr "هیچ فایلی بارگذاری نشده"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:32
 msgid "Missing a temporary folder"
 msgstr "یک پوشه موقت گم شده است"
 
-#: ajax/upload.php:34
+#: ajax/upload.php:33
 msgid "Failed to write to disk"
 msgstr "نوشتن بر روی دیسک سخت ناموفق بود"
 
-#: ajax/upload.php:52
+#: ajax/upload.php:51
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:83
+#: ajax/upload.php:82
 msgid "Invalid directory."
 msgstr "فهرست راهنما نامعتبر می باشد."
 
@@ -86,7 +86,7 @@ msgstr "فایل ها"
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:127 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:127 templates/index.php:92 templates/index.php:93
 msgid "Delete"
 msgstr "پاک کردن"
 
@@ -94,40 +94,36 @@ msgstr "پاک کردن"
 msgid "Rename"
 msgstr "تغییرنام"
 
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
 msgid "Pending"
 msgstr "در انتظار"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "{new_name} already exists"
 msgstr "{نام _جدید} در حال حاضر وجود دارد."
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "replace"
 msgstr "جایگزین"
 
-#: js/filelist.js:253
+#: js/filelist.js:251
 msgid "suggest name"
 msgstr "پیشنهاد نام"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "cancel"
 msgstr "لغو"
 
-#: js/filelist.js:295
-msgid "replaced {new_name}"
-msgstr "{نام _جدید} جایگزین شد "
+#: js/filelist.js:298
+msgid "replaced {new_name} with {old_name}"
+msgstr "{نام_جدید} با { نام_قدیمی} جایگزین شد."
 
-#: js/filelist.js:295 js/filelist.js:297
+#: js/filelist.js:298
 msgid "undo"
 msgstr "بازگشت"
 
-#: js/filelist.js:297
-msgid "replaced {new_name} with {old_name}"
-msgstr "{نام_جدید} با { نام_قدیمی} جایگزین شد."
-
-#: js/filelist.js:322
+#: js/filelist.js:323
 msgid "perform delete operation"
 msgstr ""
 
@@ -153,74 +149,74 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:224
+#: js/files.js:225
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "دانلود شما در حال آماده شدن است. در صورتیکه پرونده ها بزرگ باشند ممکن است مدتی طول بکشد."
 
-#: js/files.js:261
+#: js/files.js:262
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "ناتوان در بارگذاری یا فایل یک پوشه است یا 0بایت دارد"
 
-#: js/files.js:261
+#: js/files.js:262
 msgid "Upload Error"
 msgstr "خطا در بار گذاری"
 
-#: js/files.js:272
+#: js/files.js:273
 msgid "Close"
 msgstr "بستن"
 
-#: js/files.js:311
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr "1 پرونده آپلود شد."
 
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr "{ شمار } فایل های در حال آپلود"
 
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "بار گذاری لغو شد"
 
-#: js/files.js:496
+#: js/files.js:497
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "آپلودکردن پرونده در حال پیشرفت است. در صورت خروج از صفحه آپلود لغو میگردد. "
 
-#: js/files.js:569
+#: js/files.js:570
 msgid "URL cannot be empty."
 msgstr "URL  نمی تواند خالی باشد."
 
-#: js/files.js:574
+#: js/files.js:575
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "نام پوشه نامعتبر است. استفاده از \" به اشتراک گذاشته شده \" متعلق به سایت Owncloud است."
 
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:953 templates/index.php:68
 msgid "Name"
 msgstr "نام"
 
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:954 templates/index.php:79
 msgid "Size"
 msgstr "اندازه"
 
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:955 templates/index.php:81
 msgid "Modified"
 msgstr "تغییر یافته"
 
-#: js/files.js:969
+#: js/files.js:974
 msgid "1 folder"
 msgstr "1 پوشه"
 
-#: js/files.js:971
+#: js/files.js:976
 msgid "{count} folders"
 msgstr "{ شمار} پوشه ها"
 
-#: js/files.js:979
+#: js/files.js:984
 msgid "1 file"
 msgstr "1 پرونده"
 
-#: js/files.js:981
+#: js/files.js:986
 msgid "{count} files"
 msgstr "{ شمار } فایل ها"
 
@@ -284,33 +280,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr "متوقف کردن بار گذاری"
 
-#: templates/index.php:59
+#: templates/index.php:53
+msgid "You don’t have write permissions here."
+msgstr ""
+
+#: templates/index.php:60
 msgid "Nothing in here. Upload something!"
 msgstr "اینجا هیچ چیز نیست."
 
-#: templates/index.php:73
+#: templates/index.php:74
 msgid "Download"
 msgstr "بارگیری"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:86 templates/index.php:87
 msgid "Unshare"
 msgstr "لغو اشتراک"
 
-#: templates/index.php:105
+#: templates/index.php:106
 msgid "Upload too large"
 msgstr "حجم بارگذاری بسیار زیاد است"
 
-#: templates/index.php:107
+#: templates/index.php:108
 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:112
+#: templates/index.php:113
 msgid "Files are being scanned, please wait."
 msgstr "پرونده ها در حال بازرسی هستند لطفا صبر کنید"
 
-#: templates/index.php:115
+#: templates/index.php:116
 msgid "Current scanning"
 msgstr "بازرسی کنونی"
 
diff --git a/l10n/fa/files_external.po b/l10n/fa/files_external.po
index 075c47b4356a52d7f41111cb6b3cc788acc779d1..f100628f3130179e025cb5fdb21aeac53b293fc5 100644
--- a/l10n/fa/files_external.po
+++ b/l10n/fa/files_external.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-04 00:04+0100\n"
-"PO-Revision-Date: 2013-02-03 05:40+0000\n"
-"Last-Translator: miki_mika1362 <miki_mika1362@yahoo.com>\n"
+"POT-Creation-Date: 2013-02-28 00:04+0100\n"
+"PO-Revision-Date: 2013-02-27 23:04+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,37 +18,33 @@ msgstr ""
 "Language: fa\n"
 "Plural-Forms: nplurals=1; plural=0;\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:41
+#: js/dropbox.js:65 js/google.js:66
 msgid "Grant access"
 msgstr ""
 
-#: js/dropbox.js:73 js/google.js:73
-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:74 js/google.js:79
+#: js/google.js:36 js/google.js:93
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: lib/config.php:405
+#: lib/config.php:421
 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:406
+#: lib/config.php:424
 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 "
@@ -59,63 +55,63 @@ msgstr ""
 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 ""
+msgstr "تمام کاربران"
 
-#: templates/settings.php:87
+#: templates/settings.php:92
 msgid "Groups"
 msgstr "گروه ها"
 
-#: templates/settings.php:95
+#: templates/settings.php:100
 msgid "Users"
 msgstr "کاربران"
 
-#: templates/settings.php:108 templates/settings.php:109
-#: templates/settings.php:144 templates/settings.php:145
+#: templates/settings.php:113 templates/settings.php:114
+#: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
 msgstr "حذف"
 
-#: 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:136
+#: templates/settings.php:141
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:153
+#: templates/settings.php:159
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/fa/files_trashbin.po b/l10n/fa/files_trashbin.po
index 435d45e463f2d669965c377fd6c83619045cd2d9..8a62df4a881051a7c19e3b5e2a21860f90ba359d 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-02-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 10:07+0000\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: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Language: fa\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/delete.php:22
+#: ajax/delete.php:40
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
@@ -27,35 +27,39 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:33
+#: js/trash.js:34
 msgid "delete file permanently"
 msgstr ""
 
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr ""
+
+#: js/trash.js:174 templates/index.php:17
 msgid "Name"
 msgstr "نام"
 
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:175 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:135
+#: js/trash.js:184
 msgid "1 folder"
 msgstr "1 پوشه"
 
-#: js/trash.js:137
+#: js/trash.js:186
 msgid "{count} folders"
 msgstr "{ شمار} پوشه ها"
 
-#: js/trash.js:145
+#: js/trash.js:194
 msgid "1 file"
 msgstr "1 پرونده"
 
-#: js/trash.js:147
+#: js/trash.js:196
 msgid "{count} files"
 msgstr "{ شمار } فایل ها"
 
@@ -66,3 +70,11 @@ 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/fa/files_versions.po b/l10n/fa/files_versions.po
index a2a96bc6ec1d50178372f0394b37b96ba91d50f5..325fdb2a87fb69edeff7af7b8667ed709a401a6f 100644
--- a/l10n/fa/files_versions.po
+++ b/l10n/fa/files_versions.po
@@ -3,14 +3,15 @@
 # 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-08 00:10+0100\n"
-"PO-Revision-Date: 2013-02-07 23:11+0000\n"
+"POT-Creation-Date: 2013-02-28 00:04+0100\n"
+"PO-Revision-Date: 2013-02-27 23:04+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
@@ -22,11 +23,11 @@ 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
@@ -35,7 +36,7 @@ msgstr ""
 
 #: history.php:49
 msgid "failure"
-msgstr ""
+msgstr "شکست"
 
 #: history.php:51
 #, php-format
@@ -44,24 +45,16 @@ msgstr ""
 
 #: history.php:68
 msgid "No old versions available"
-msgstr ""
+msgstr "هیچ نسخه قدیمی در دسترس نیست"
 
 #: history.php:73
 msgid "No path specified"
-msgstr ""
+msgstr "هیچ مسیری مشخص نشده است"
 
-#: js/versions.js:16
-msgid "History"
-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 ""
-
-#: templates/settings.php:3
-msgid "Files Versioning"
-msgstr ""
-
-#: templates/settings.php:4
-msgid "Enable"
-msgstr "فعال"
+msgstr "بازگردانی یک پرورنده به نسخه قدیمی اش از  طریق دکمه بازگردانی امکان پذیر است"
diff --git a/l10n/fa/lib.po b/l10n/fa/lib.po
index 5454ea40b1e048f64475f6352b32d5b19c602ec3..d28ceaba3e755caa2364ad11481207c8b71e431e 100644
--- a/l10n/fa/lib.po
+++ b/l10n/fa/lib.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-11 15:39+0100\n"
-"PO-Revision-Date: 2013-02-11 14:40+0000\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: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
@@ -19,27 +19,27 @@ msgstr ""
 "Language: fa\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: app.php:339
+#: app.php:349
 msgid "Help"
 msgstr "راه‌نما"
 
-#: app.php:346
+#: app.php:362
 msgid "Personal"
 msgstr "شخصی"
 
-#: app.php:351
+#: app.php:373
 msgid "Settings"
 msgstr "تنظیمات"
 
-#: app.php:356
+#: app.php:385
 msgid "Users"
 msgstr "کاربران"
 
-#: app.php:363
+#: app.php:398
 msgid "Apps"
 msgstr "  برنامه ها"
 
-#: app.php:365
+#: app.php:406
 msgid "Admin"
 msgstr "مدیر"
 
@@ -51,15 +51,15 @@ msgstr "دانلود به صورت فشرده غیر فعال است"
 msgid "Files need to be downloaded one by one."
 msgstr "فایل ها باید به صورت یکی یکی دانلود شوند"
 
-#: files.php:203 files.php:228
+#: files.php:204 files.php:231
 msgid "Back to Files"
 msgstr "بازگشت به فایل ها"
 
-#: files.php:227
+#: files.php:228
 msgid "Selected files too large to generate zip file."
 msgstr "فایل های انتخاب شده بزرگتر از آن هستند که بتوان یک فایل فشرده تولید کرد"
 
-#: helper.php:226
+#: helper.php:228
 msgid "couldn't be determined"
 msgstr ""
 
@@ -99,87 +99,92 @@ msgstr ""
 msgid "Specify a data folder."
 msgstr ""
 
-#: setup.php:53
+#: setup.php:55
 #, php-format
 msgid "%s enter the database username."
 msgstr ""
 
-#: setup.php:56
+#: setup.php:58
 #, php-format
 msgid "%s enter the database name."
 msgstr ""
 
-#: setup.php:59
+#: setup.php:61
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr ""
 
-#: setup.php:62
+#: setup.php:64
 #, php-format
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:126 setup.php:291 setup.php:336
+#: setup.php:128 setup.php:320 setup.php:365
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:127 setup.php:150 setup.php:204
+#: setup.php:129 setup.php:152 setup.php:229
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:149 setup.php:423 setup.php:489
+#: setup.php:151 setup.php:453 setup.php:520
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:203
+#: setup.php:228
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:255 setup.php:357 setup.php:366 setup.php:384 setup.php:394
-#: setup.php:403 setup.php:430 setup.php:496 setup.php:522 setup.php:529
-#: setup.php:540 setup.php:547 setup.php:556 setup.php:564 setup.php:573
-#: setup.php:579
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:256 setup.php:358 setup.php:367 setup.php:385 setup.php:395
-#: setup.php:404 setup.php:431 setup.php:497 setup.php:523 setup.php:530
-#: setup.php:541 setup.php:557 setup.php:565 setup.php:574
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:270
+#: setup.php:299
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:271
+#: setup.php:300
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:276
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:277
+#: setup.php:306
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:548 setup.php:580
+#: setup.php:579 setup.php:611
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:644
+#: setup.php:631
+#, php-format
+msgid "MS SQL username and/or password not valid: %s"
+msgstr ""
+
+#: setup.php:849
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:645
+#: setup.php:850
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
@@ -236,16 +241,16 @@ msgstr "سال قبل"
 msgid "years ago"
 msgstr "سال‌های قبل"
 
-#: updater.php:75
+#: updater.php:78
 #, php-format
 msgid "%s is available. Get <a href=\"%s\">more information</a>"
 msgstr ""
 
-#: updater.php:77
+#: updater.php:81
 msgid "up to date"
 msgstr ""
 
-#: updater.php:80
+#: updater.php:84
 msgid "updates check is disabled"
 msgstr ""
 
diff --git a/l10n/fa/settings.po b/l10n/fa/settings.po
index 9f1935684b78de8deddaf1d503792515b192bf7c..269b36235008fa99f90d63c6d2ec2dc626cdb732 100644
--- a/l10n/fa/settings.po
+++ b/l10n/fa/settings.po
@@ -3,6 +3,7 @@
 # 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.
@@ -12,9 +13,9 @@ 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:05+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "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"
@@ -26,8 +27,8 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "قادر به بارگذاری لیست از فروشگاه اپ نیستم"
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:15
-#: ajax/togglegroups.php:18
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr "خطا در اعتبار سنجی"
 
@@ -75,12 +76,12 @@ 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 ""
@@ -121,7 +122,7 @@ msgstr "خطا"
 msgid "Updated"
 msgstr "بروز رسانی انجام شد"
 
-#: js/personal.js:96
+#: js/personal.js:99
 msgid "Saving..."
 msgstr "درحال ذخیره ..."
 
@@ -150,23 +151,23 @@ msgstr ""
 msgid "Delete"
 msgstr "پاک کردن"
 
-#: js/users.js:190
+#: js/users.js:191
 msgid "add group"
-msgstr ""
+msgstr "افزودن گروه"
 
-#: js/users.js:351
+#: js/users.js:352
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
 msgid "Error creating user"
-msgstr ""
+msgstr "خطا در ایجاد کاربر"
 
-#: js/users.js:357
+#: js/users.js:358
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -185,7 +186,7 @@ msgstr ""
 
 #: templates/admin.php:29
 msgid "Setup Warning"
-msgstr ""
+msgstr "هشدار راه اندازی"
 
 #: templates/admin.php:32
 msgid ""
@@ -212,19 +213,19 @@ msgstr ""
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:61
+#: templates/admin.php:63
+#, php-format
 msgid ""
-"This ownCloud server can't set system locale to "
-"\"en_US.UTF-8\"/\"en_US.UTF8\". 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 en_US.UTF-8/en_US.UTF8."
+"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:72
+#: templates/admin.php:75
 msgid "Internet connection not working"
-msgstr ""
+msgstr "اتصال اینترنت کار نمی کند"
 
-#: templates/admin.php:75
+#: 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 "
@@ -234,98 +235,98 @@ msgid ""
 " of ownCloud."
 msgstr ""
 
-#: templates/admin.php:89
+#: templates/admin.php:92
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:98
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:108
+#: 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:118
+#: 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:125
+#: templates/admin.php:128
 msgid "Sharing"
-msgstr ""
+msgstr "اشتراک گذاری"
 
-#: templates/admin.php:131
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:132
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:140
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
-msgstr ""
+msgstr "اجازه دادن به کاربران برای اشتراک گذاری آیتم ها با عموم از طریق پیوند ها"
 
-#: templates/admin.php:147
+#: templates/admin.php:150
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:148
+#: templates/admin.php:151
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:155
+#: templates/admin.php:158
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:161
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:165
+#: templates/admin.php:168
 msgid "Security"
-msgstr ""
+msgstr "امنیت"
 
-#: templates/admin.php:178
+#: templates/admin.php:181
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:179
+#: templates/admin.php:182
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:182
+#: templates/admin.php:185
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr ""
 
-#: templates/admin.php:192
+#: templates/admin.php:195
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:193
+#: templates/admin.php:196
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:220
+#: templates/admin.php:223
 msgid "More"
 msgstr "بیش‌تر"
 
-#: templates/admin.php:227 templates/personal.php:98
+#: templates/admin.php:230 templates/personal.php:102
 msgid "Version"
 msgstr "نسخه"
 
-#: templates/admin.php:230 templates/personal.php:100
+#: templates/admin.php:233 templates/personal.php:105
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -335,51 +336,51 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr ""
 
-#: templates/apps.php:10
+#: templates/apps.php:11
 msgid "Add your App"
 msgstr "برنامه خود را بیافزایید"
 
-#: templates/apps.php:11
+#: templates/apps.php:12
 msgid "More Apps"
 msgstr "برنامه های بیشتر"
 
-#: templates/apps.php:24
+#: templates/apps.php:28
 msgid "Select an App"
 msgstr "یک برنامه انتخاب کنید"
 
-#: templates/apps.php:28
+#: templates/apps.php:34
 msgid "See application page at apps.owncloud.com"
 msgstr "صفحه این اٌپ را در apps.owncloud.com ببینید"
 
-#: templates/apps.php:29
+#: templates/apps.php:36
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
-#: templates/apps.php:31
+#: templates/apps.php:38
 msgid "Update"
 msgstr "به روز رسانی"
 
-#: templates/help.php:3
+#: 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 ""
+msgstr "مستندات آنلاین"
 
-#: templates/help.php:7
+#: templates/help.php:11
 msgid "Forum"
 msgstr "انجمن"
 
-#: templates/help.php:9
+#: templates/help.php:14
 msgid "Bugtracker"
-msgstr ""
+msgstr "ردیاب باگ "
 
-#: templates/help.php:11
+#: templates/help.php:17
 msgid "Commercial Support"
 msgstr "پشتیبانی تجاری"
 
@@ -388,79 +389,79 @@ msgstr "پشتیبانی تجاری"
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:14
+#: templates/personal.php:15
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:25
+#: templates/personal.php:26
 msgid "Show First Run Wizard again"
 msgstr "راهبری کمکی اجرای اول را دوباره نمایش بده"
 
-#: templates/personal.php:36 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
 msgid "Password"
 msgstr "گذرواژه"
 
-#: templates/personal.php:37
+#: templates/personal.php:38
 msgid "Your password was changed"
 msgstr "رمز عبور شما تغییر یافت"
 
-#: templates/personal.php:38
+#: templates/personal.php:39
 msgid "Unable to change your password"
 msgstr "ناتوان در تغییر گذرواژه"
 
-#: templates/personal.php:39
+#: templates/personal.php:40
 msgid "Current password"
 msgstr "گذرواژه کنونی"
 
-#: templates/personal.php:40
+#: templates/personal.php:42
 msgid "New password"
 msgstr "گذرواژه جدید"
 
-#: templates/personal.php:42
+#: templates/personal.php:44
 msgid "Change password"
 msgstr "تغییر گذر واژه"
 
-#: templates/personal.php:54 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:78
 msgid "Display Name"
 msgstr "نام نمایشی"
 
-#: templates/personal.php:55
+#: templates/personal.php:57
 msgid "Your display name was changed"
 msgstr "نام نمایشی شما تغییر یافت"
 
-#: templates/personal.php:56
+#: templates/personal.php:58
 msgid "Unable to change your display name"
 msgstr "امکان تغییر نام نمایشی شما وجود ندارد"
 
-#: templates/personal.php:59
+#: templates/personal.php:61
 msgid "Change display name"
 msgstr "تغییر نام نمایشی"
 
-#: templates/personal.php:68
+#: templates/personal.php:70
 msgid "Email"
 msgstr "پست الکترونیکی"
 
-#: templates/personal.php:69
+#: templates/personal.php:72
 msgid "Your email address"
 msgstr "پست الکترونیکی شما"
 
-#: templates/personal.php:70
+#: templates/personal.php:73
 msgid "Fill in an email address to enable password recovery"
 msgstr "پست الکترونیکی را پرکنید  تا بازیابی گذرواژه فعال شود"
 
-#: templates/personal.php:76 templates/personal.php:77
+#: templates/personal.php:79 templates/personal.php:80
 msgid "Language"
 msgstr "زبان"
 
-#: templates/personal.php:82
+#: templates/personal.php:86
 msgid "Help translate"
 msgstr "به ترجمه آن کمک کنید"
 
-#: templates/personal.php:87
+#: templates/personal.php:91
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:89
+#: templates/personal.php:93
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
diff --git a/l10n/fa/user_ldap.po b/l10n/fa/user_ldap.po
index 029b1993ac9c49f4243dc450983f98af75a2b2ed..90cac5e66415ac922447adb753be89ac1db87ef5 100644
--- a/l10n/fa/user_ldap.po
+++ b/l10n/fa/user_ldap.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-15 00:05+0100\n"
-"PO-Revision-Date: 2013-02-14 10:50+0000\n"
-"Last-Translator: Amir Reza Asadi <amirreza.asadi@live.com>\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: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,17 +24,17 @@ msgstr ""
 msgid "Failed to delete the server configuration"
 msgstr "عملیات حذف پیکربندی سرور ناموفق ماند"
 
-#: ajax/testConfiguration.php:35
+#: ajax/testConfiguration.php:36
 msgid "The configuration is valid and the connection could be established!"
 msgstr "پیکربندی معتبر است و ارتباط می تواند برقرار شود"
 
-#: ajax/testConfiguration.php:37
+#: ajax/testConfiguration.php:39
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
 msgstr ""
 
-#: ajax/testConfiguration.php:40
+#: ajax/testConfiguration.php:43
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
@@ -89,224 +89,248 @@ msgstr ""
 msgid "Server configuration"
 msgstr "پیکربندی سرور"
 
-#: templates/settings.php:17
+#: templates/settings.php:18
 msgid "Add Server Configuration"
 msgstr "افزودن پیکربندی سرور"
 
-#: templates/settings.php:21
+#: templates/settings.php:23
 msgid "Host"
 msgstr "میزبانی"
 
-#: templates/settings.php:21
+#: templates/settings.php:25
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:26
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:27
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:28
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:32
 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:24
+#: templates/settings.php:33
 msgid "Password"
 msgstr "رمز عبور"
 
-#: templates/settings.php:24
+#: templates/settings.php:36
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:37
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:40
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:41
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:42
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:45
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:46
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:47
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:50
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:51
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:55
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:34
+#: templates/settings.php:58
 msgid "Port"
 msgstr "درگاه"
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:60
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:39
+#: templates/settings.php:63
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:65
+msgid "Cache Time-To-Live"
+msgstr ""
+
+#: templates/settings.php:65
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:67
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:47
+#: templates/settings.php:71
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:47 templates/settings.php:50
+#: templates/settings.php:71 templates/settings.php:74
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:74
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:75
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:77
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:79
+msgid "Quota Field"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Quota Default"
+msgstr ""
+
+#: templates/settings.php:80
 msgid "in bytes"
 msgstr "در بایت"
 
-#: templates/settings.php:58
+#: templates/settings.php:81
+msgid "Email Field"
+msgstr ""
+
+#: templates/settings.php:82
+msgid "User Home Folder Naming Rule"
+msgstr ""
+
+#: templates/settings.php:82
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:62
+#: templates/settings.php:86
+msgid "Test Configuration"
+msgstr ""
+
+#: templates/settings.php:86
 msgid "Help"
 msgstr "راه‌نما"
diff --git a/l10n/fi_FI/core.po b/l10n/fi_FI/core.po
index 80e0cb1870dfe500607ad989c315cb47259f3089..24d915c35e79c20ba5b81a341e792a37edc26831 100644
--- a/l10n/fi_FI/core.po
+++ b/l10n/fi_FI/core.po
@@ -14,8 +14,8 @@ 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"
+"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"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
@@ -393,7 +393,7 @@ msgstr "Päivitys epäonnistui. Ilmoita ongelmasta <a href=\"https://github.com/
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Päivitys onnistui. Selain ohjautuu nyt ownCloudiisi."
 
-#: lostpassword/controller.php:47
+#: lostpassword/controller.php:48
 msgid "ownCloud password reset"
 msgstr "ownCloud-salasanan nollaus"
 
diff --git a/l10n/fi_FI/files.po b/l10n/fi_FI/files.po
index e42625a78a7c8d0efef54af9fcb4a000727deb55..3af5904ef80a1861b3cbe0d534e7be8aaa01a920 100644
--- a/l10n/fi_FI/files.po
+++ b/l10n/fi_FI/files.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\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: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
@@ -55,27 +55,27 @@ msgid ""
 "the HTML form"
 msgstr "Lähetetty tiedosto ylittää HTML-lomakkeessa määritetyn MAX_FILE_SIZE-arvon ylärajan"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
 msgstr "Tiedoston lähetys onnistui vain osittain"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:31
 msgid "No file was uploaded"
 msgstr "Yhtäkään tiedostoa ei lähetetty"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:32
 msgid "Missing a temporary folder"
 msgstr "Väliaikaiskansiota ei ole olemassa"
 
-#: ajax/upload.php:34
+#: ajax/upload.php:33
 msgid "Failed to write to disk"
 msgstr "Levylle kirjoitus epäonnistui"
 
-#: ajax/upload.php:52
+#: ajax/upload.php:51
 msgid "Not enough storage available"
 msgstr "Tallennustilaa ei ole riittävästi käytettävissä"
 
-#: ajax/upload.php:83
+#: ajax/upload.php:82
 msgid "Invalid directory."
 msgstr "Virheellinen kansio."
 
@@ -87,7 +87,7 @@ msgstr "Tiedostot"
 msgid "Delete permanently"
 msgstr "Poista pysyvästi"
 
-#: js/fileactions.js:127 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:127 templates/index.php:92 templates/index.php:93
 msgid "Delete"
 msgstr "Poista"
 
@@ -95,40 +95,36 @@ msgstr "Poista"
 msgid "Rename"
 msgstr "Nimeä uudelleen"
 
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
 msgid "Pending"
 msgstr "Odottaa"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "{new_name} already exists"
 msgstr "{new_name} on jo olemassa"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "replace"
 msgstr "korvaa"
 
-#: js/filelist.js:253
+#: js/filelist.js:251
 msgid "suggest name"
 msgstr "ehdota nimeä"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "cancel"
 msgstr "peru"
 
-#: js/filelist.js:295
-msgid "replaced {new_name}"
+#: js/filelist.js:298
+msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:295 js/filelist.js:297
+#: js/filelist.js:298
 msgid "undo"
 msgstr "kumoa"
 
-#: js/filelist.js:297
-msgid "replaced {new_name} with {old_name}"
-msgstr ""
-
-#: js/filelist.js:322
+#: js/filelist.js:323
 msgid "perform delete operation"
 msgstr "suorita poistotoiminto"
 
@@ -154,74 +150,74 @@ 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:224
+#: js/files.js:225
 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:261
+#: js/files.js:262
 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:261
+#: js/files.js:262
 msgid "Upload Error"
 msgstr "Lähetysvirhe."
 
-#: js/files.js:272
+#: js/files.js:273
 msgid "Close"
 msgstr "Sulje"
 
-#: js/files.js:311
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr ""
 
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr ""
 
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "Lähetys peruttu."
 
-#: js/files.js:496
+#: js/files.js:497
 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:569
+#: js/files.js:570
 msgid "URL cannot be empty."
 msgstr "Verkko-osoite ei voi olla tyhjä"
 
-#: js/files.js:574
+#: js/files.js:575
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:953 templates/index.php:68
 msgid "Name"
 msgstr "Nimi"
 
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:954 templates/index.php:79
 msgid "Size"
 msgstr "Koko"
 
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:955 templates/index.php:81
 msgid "Modified"
 msgstr "Muutettu"
 
-#: js/files.js:969
+#: js/files.js:974
 msgid "1 folder"
 msgstr "1 kansio"
 
-#: js/files.js:971
+#: js/files.js:976
 msgid "{count} folders"
 msgstr "{count} kansiota"
 
-#: js/files.js:979
+#: js/files.js:984
 msgid "1 file"
 msgstr "1 tiedosto"
 
-#: js/files.js:981
+#: js/files.js:986
 msgid "{count} files"
 msgstr "{count} tiedostoa"
 
@@ -279,39 +275,43 @@ msgstr "Linkistä"
 
 #: templates/index.php:40
 msgid "Deleted files"
-msgstr ""
+msgstr "Poistetut tiedostot"
 
 #: templates/index.php:46
 msgid "Cancel upload"
 msgstr "Peru lähetys"
 
-#: templates/index.php:59
+#: templates/index.php:53
+msgid "You don’t have write permissions here."
+msgstr "Tunnuksellasi ei ole kirjoitusoikeuksia tänne."
+
+#: templates/index.php:60
 msgid "Nothing in here. Upload something!"
 msgstr "Täällä ei ole mitään. Lähetä tänne jotakin!"
 
-#: templates/index.php:73
+#: templates/index.php:74
 msgid "Download"
 msgstr "Lataa"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:86 templates/index.php:87
 msgid "Unshare"
 msgstr "Peru jakaminen"
 
-#: templates/index.php:105
+#: templates/index.php:106
 msgid "Upload too large"
 msgstr "Lähetettävä tiedosto on liian suuri"
 
-#: templates/index.php:107
+#: templates/index.php:108
 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:112
+#: templates/index.php:113
 msgid "Files are being scanned, please wait."
 msgstr "Tiedostoja tarkistetaan, odota hetki."
 
-#: templates/index.php:115
+#: templates/index.php:116
 msgid "Current scanning"
 msgstr "Tämänhetkinen tutkinta"
 
diff --git a/l10n/fi_FI/files_external.po b/l10n/fi_FI/files_external.po
index 1ccd529b50fbd75c59811e3427f630bd4101ead4..8daeeb1bbff959ee3c791baee427fb21193c5f15 100644
--- a/l10n/fi_FI/files_external.po
+++ b/l10n/fi_FI/files_external.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-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 13:50+0000\n"
-"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\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"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,37 +20,33 @@ msgstr ""
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/dropbox.js:7 js/dropbox.js:25 js/google.js:7 js/google.js:23
+#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:16 js/google.js:34
 msgid "Access granted"
 msgstr "Pääsy sallittu"
 
-#: 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 "Virhe Dropbox levyn asetuksia tehtäessä"
 
-#: 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 "Salli pääsy"
 
-#: js/dropbox.js:73 js/google.js:72
-msgid "Fill out all required fields"
-msgstr "Täytä kaikki vaaditut kentät"
-
-#: js/dropbox.js:85
+#: js/dropbox.js:101
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr "Anna kelvollinen Dropbox-sovellusavain ja salainen vastaus."
 
-#: 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 "Virhe Google Drive levyn asetuksia tehtäessä"
 
-#: lib/config.php:413
+#: lib/config.php:421
 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:414
+#: lib/config.php:424
 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 "
@@ -61,63 +57,63 @@ msgstr "<b>Varoitus:</b> PHP:n FTP-tuki ei ole käytössä tai sitä ei ole asen
 msgid "External Storage"
 msgstr "Erillinen tallennusväline"
 
-#: templates/settings.php:8 templates/settings.php:22
-msgid "Mount point"
-msgstr "Liitospiste"
-
-#: templates/settings.php:9
-msgid "Backend"
-msgstr "Taustaosa"
+#: templates/settings.php:9 templates/settings.php:28
+msgid "Folder name"
+msgstr "Kansion nimi"
 
 #: templates/settings.php:10
+msgid "External storage"
+msgstr ""
+
+#: templates/settings.php:11
 msgid "Configuration"
 msgstr "Asetukset"
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid "Options"
 msgstr "Valinnat"
 
-#: templates/settings.php:12
+#: templates/settings.php:13
 msgid "Applicable"
 msgstr "Sovellettavissa"
 
-#: templates/settings.php:27
-msgid "Add mount point"
-msgstr "Lisää liitospiste"
+#: templates/settings.php:33
+msgid "Add storage"
+msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:90
 msgid "None set"
 msgstr "Ei asetettu"
 
-#: templates/settings.php:86
+#: templates/settings.php:91
 msgid "All Users"
 msgstr "Kaikki käyttäjät"
 
-#: templates/settings.php:87
+#: templates/settings.php:92
 msgid "Groups"
 msgstr "Ryhmät"
 
-#: templates/settings.php:95
+#: templates/settings.php:100
 msgid "Users"
 msgstr "Käyttäjät"
 
-#: templates/settings.php:108 templates/settings.php:109
-#: templates/settings.php:144 templates/settings.php:145
+#: templates/settings.php:113 templates/settings.php:114
+#: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
 msgstr "Poista"
 
-#: templates/settings.php:124
+#: templates/settings.php:129
 msgid "Enable User External Storage"
 msgstr "Ota käyttöön ulkopuoliset tallennuspaikat"
 
-#: templates/settings.php:125
+#: templates/settings.php:130
 msgid "Allow users to mount their own external storage"
 msgstr "Salli käyttäjien liittää omia erillisiä tallennusvälineitä"
 
-#: templates/settings.php:136
+#: templates/settings.php:141
 msgid "SSL root certificates"
 msgstr "SSL-juurivarmenteet"
 
-#: templates/settings.php:153
+#: templates/settings.php:159
 msgid "Import Root Certificate"
 msgstr "Tuo juurivarmenne"
diff --git a/l10n/fi_FI/files_trashbin.po b/l10n/fi_FI/files_trashbin.po
index e64f9fdafb62a3f45760f74063b841a6a80ac90a..482678d9c7152448cdb7708e8932e8890e1251b5 100644
--- a/l10n/fi_FI/files_trashbin.po
+++ b/l10n/fi_FI/files_trashbin.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 07:40+0000\n"
-"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\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: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:22
+#: ajax/delete.php:40
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "Kohdetta %s ei voitu poistaa pysyvästi"
@@ -28,35 +28,39 @@ msgstr "Kohdetta %s ei voitu poistaa pysyvästi"
 msgid "Couldn't restore %s"
 msgstr "Kohteen %s palautus epäonnistui"
 
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
 msgid "perform restore operation"
 msgstr "suorita palautustoiminto"
 
-#: js/trash.js:33
+#: js/trash.js:34
 msgid "delete file permanently"
 msgstr "poista tiedosto pysyvästi"
 
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr "Poista pysyvästi"
+
+#: js/trash.js:174 templates/index.php:17
 msgid "Name"
 msgstr "Nimi"
 
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:175 templates/index.php:27
 msgid "Deleted"
 msgstr "Poistettu"
 
-#: js/trash.js:135
+#: js/trash.js:184
 msgid "1 folder"
 msgstr "1 kansio"
 
-#: js/trash.js:137
+#: js/trash.js:186
 msgid "{count} folders"
 msgstr "{count} kansiota"
 
-#: js/trash.js:145
+#: js/trash.js:194
 msgid "1 file"
 msgstr "1 tiedosto"
 
-#: js/trash.js:147
+#: js/trash.js:196
 msgid "{count} files"
 msgstr "{count} tiedostoa"
 
@@ -67,3 +71,11 @@ msgstr "Tyhjää täynnä! Roskakorissa ei ole mitään."
 #: templates/index.php:20 templates/index.php:22
 msgid "Restore"
 msgstr "Palauta"
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr "Poista"
+
+#: templates/part.breadcrumb.php:9
+msgid "Deleted Files"
+msgstr ""
diff --git a/l10n/fi_FI/files_versions.po b/l10n/fi_FI/files_versions.po
index 5cd06f949b2f27ee9a28a27fb0845b5be8245f3e..d6e7f7b3f873ce6565b43566e01960b4e10989fe 100644
--- a/l10n/fi_FI/files_versions.po
+++ b/l10n/fi_FI/files_versions.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 07:30+0000\n"
-"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
+"POT-Creation-Date: 2013-02-28 00:04+0100\n"
+"PO-Revision-Date: 2013-02-27 23:04+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: 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"
@@ -49,18 +49,10 @@ msgstr "Vanhoja ei ole saatavilla"
 msgid "No path specified"
 msgstr "Polkua ei ole määritetty"
 
-#: js/versions.js:16
-msgid "History"
-msgstr "Historia"
+#: 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 "Palauta tiedoston edellinen versio napsauttamalla palautuspainiketta"
-
-#: templates/settings.php:3
-msgid "Files Versioning"
-msgstr "Tiedostojen versiointi"
-
-#: templates/settings.php:4
-msgid "Enable"
-msgstr "Käytä"
diff --git a/l10n/fi_FI/lib.po b/l10n/fi_FI/lib.po
index dd0f5e0fad598f5fe957d775a1d8f957668a9486..7d15295cc376f23556bc80da5140e28f6bb25450 100644
--- a/l10n/fi_FI/lib.po
+++ b/l10n/fi_FI/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:05+0100\n"
-"PO-Revision-Date: 2013-02-14 07:30+0000\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"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
@@ -98,87 +98,92 @@ msgstr "Aseta ylläpitäjän salasana."
 msgid "Specify a data folder."
 msgstr "Määritä datakansio."
 
-#: setup.php:53
+#: setup.php:55
 #, php-format
 msgid "%s enter the database username."
-msgstr ""
+msgstr "%s anna tietokannan käyttäjätunnus."
 
-#: setup.php:56
+#: setup.php:58
 #, php-format
 msgid "%s enter the database name."
-msgstr ""
+msgstr "%s anna tietokannan nimi."
 
-#: setup.php:59
+#: setup.php:61
 #, php-format
 msgid "%s you may not use dots in the database name"
-msgstr ""
+msgstr "%s et voi käyttää pisteitä tietokannan nimessä"
 
-#: setup.php:62
+#: setup.php:64
 #, php-format
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:126 setup.php:294 setup.php:339
+#: setup.php:128 setup.php:320 setup.php:365
 msgid "PostgreSQL username and/or password not valid"
 msgstr "PostgreSQL:n käyttäjätunnus ja/tai salasana on väärin"
 
-#: setup.php:127 setup.php:150 setup.php:204
+#: setup.php:129 setup.php:152 setup.php:229
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:149 setup.php:427 setup.php:494
+#: setup.php:151 setup.php:453 setup.php:520
 msgid "Oracle username and/or password not valid"
 msgstr "Oraclen käyttäjätunnus ja/tai salasana on väärin"
 
-#: setup.php:203
+#: setup.php:228
 msgid "MySQL username and/or password not valid"
 msgstr "MySQL:n käyttäjätunnus ja/tai salasana on väärin"
 
-#: setup.php:257 setup.php:360 setup.php:369 setup.php:387 setup.php:397
-#: setup.php:406 setup.php:435 setup.php:501 setup.php:527 setup.php:534
-#: setup.php:545 setup.php:552 setup.php:561 setup.php:569 setup.php:578
-#: setup.php:584
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Tietokantavirhe: \"%s\""
 
-#: setup.php:258 setup.php:361 setup.php:370 setup.php:388 setup.php:398
-#: setup.php:407 setup.php:436 setup.php:502 setup.php:528 setup.php:535
-#: setup.php:546 setup.php:562 setup.php:570 setup.php:579
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:273
+#: setup.php:299
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "MySQL-käyttäjä '%s'@'localhost' on jo olemassa."
 
-#: setup.php:274
+#: setup.php:300
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:279
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "MySQL-käyttäjä '%s'@'%%' on jo olemassa"
 
-#: setup.php:280
+#: setup.php:306
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:553 setup.php:585
+#: setup.php:579 setup.php:611
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:649
+#: setup.php:631
+#, 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
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:651
+#: setup.php:850
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Lue tarkasti <a href='%s'>asennusohjeet</a>."
diff --git a/l10n/fi_FI/settings.po b/l10n/fi_FI/settings.po
index e1db381273401b57ee61986e07bd8a0f56f6a75f..a5c6c1ed5b24de6afddefea5a865b77fcf702c8e 100644
--- a/l10n/fi_FI/settings.po
+++ b/l10n/fi_FI/settings.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:05+0100\n"
-"PO-Revision-Date: 2013-02-14 07:30+0000\n"
-"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\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: 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,8 +24,8 @@ 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:15
-#: ajax/togglegroups.php:18
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr "Todennusvirhe"
 
@@ -73,12 +73,12 @@ msgstr "Virheellinen pyyntö"
 msgid "Admins can't remove themself from the admin group"
 msgstr "Ylläpitäjät eivät poistaa omia tunnuksiaan ylläpitäjien ryhmästä"
 
-#: ajax/togglegroups.php:28
+#: ajax/togglegroups.php:30
 #, php-format
 msgid "Unable to add user to group %s"
 msgstr "Käyttäjän tai ryhmän %s lisääminen ei onnistu"
 
-#: ajax/togglegroups.php:34
+#: ajax/togglegroups.php:36
 #, php-format
 msgid "Unable to remove user from group %s"
 msgstr "Käyttäjän poistaminen ryhmästä %s ei onnistu"
@@ -119,7 +119,7 @@ msgstr "Virhe"
 msgid "Updated"
 msgstr "Päivitetty"
 
-#: js/personal.js:96
+#: js/personal.js:99
 msgid "Saving..."
 msgstr "Tallennetaan..."
 
@@ -164,7 +164,7 @@ msgstr "Virhe käyttäjää luotaessa"
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
 msgid "__language_name__"
 msgstr "_kielen_nimi_"
 
@@ -210,19 +210,19 @@ msgstr ""
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:61
+#: templates/admin.php:63
+#, php-format
 msgid ""
-"This ownCloud server can't set system locale to "
-"\"en_US.UTF-8\"/\"en_US.UTF8\". 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 en_US.UTF-8/en_US.UTF8."
+"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:72
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr "Internet-yhteys ei toimi"
 
-#: templates/admin.php:75
+#: 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 "
@@ -232,98 +232,98 @@ msgid ""
 " of ownCloud."
 msgstr ""
 
-#: templates/admin.php:89
+#: templates/admin.php:92
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:98
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:108
+#: 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:118
+#: 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:125
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr "Jakaminen"
 
-#: templates/admin.php:131
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr "Käytä jakamisen ohjelmointirajapintaa"
 
-#: templates/admin.php:132
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr "Salli sovellusten käyttää jakamisen ohjelmointirajapintaa"
 
-#: templates/admin.php:139
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr "Salli linkit"
 
-#: templates/admin.php:140
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr "Salli käyttäjien jakaa kohteita käyttäen linkkejä"
 
-#: templates/admin.php:147
+#: templates/admin.php:150
 msgid "Allow resharing"
 msgstr "Salli uudelleenjakaminen"
 
-#: templates/admin.php:148
+#: templates/admin.php:151
 msgid "Allow users to share items shared with them again"
 msgstr "Mahdollistaa käyttäjien jakavan uudelleen heidän kanssaan jaettuja kohteita"
 
-#: templates/admin.php:155
+#: templates/admin.php:158
 msgid "Allow users to share with anyone"
 msgstr "Salli käyttäjien jakaa kenen tahansa kanssa"
 
-#: templates/admin.php:158
+#: templates/admin.php:161
 msgid "Allow users to only share with users in their groups"
 msgstr "Salli jakaminen vain samoissa ryhmissä olevien käyttäjien kesken"
 
-#: templates/admin.php:165
+#: templates/admin.php:168
 msgid "Security"
 msgstr "Tietoturva"
 
-#: templates/admin.php:178
+#: templates/admin.php:181
 msgid "Enforce HTTPS"
 msgstr "Pakota HTTPS"
 
-#: templates/admin.php:179
+#: templates/admin.php:182
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr "Pakottaa salaamaan ownCloudiin kohdistuvat yhteydet."
 
-#: templates/admin.php:182
+#: templates/admin.php:185
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr ""
 
-#: templates/admin.php:192
+#: templates/admin.php:195
 msgid "Log"
 msgstr "Loki"
 
-#: templates/admin.php:193
+#: templates/admin.php:196
 msgid "Log level"
 msgstr "Lokitaso"
 
-#: templates/admin.php:220
+#: templates/admin.php:223
 msgid "More"
 msgstr "Enemmän"
 
-#: templates/admin.php:227 templates/personal.php:98
+#: templates/admin.php:230 templates/personal.php:102
 msgid "Version"
 msgstr "Versio"
 
-#: templates/admin.php:230 templates/personal.php:100
+#: templates/admin.php:233 templates/personal.php:105
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -333,51 +333,51 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "Kehityksestä on vastannut <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-yhteisö</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">lähdekoodi</a> on julkaistu lisenssin <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> alaisena."
 
-#: templates/apps.php:10
+#: templates/apps.php:11
 msgid "Add your App"
 msgstr "Lisää sovelluksesi"
 
-#: templates/apps.php:11
+#: templates/apps.php:12
 msgid "More Apps"
 msgstr "Lisää sovelluksia"
 
-#: templates/apps.php:24
+#: templates/apps.php:28
 msgid "Select an App"
 msgstr "Valitse sovellus"
 
-#: templates/apps.php:28
+#: templates/apps.php:34
 msgid "See application page at apps.owncloud.com"
 msgstr "Katso sovellussivu osoitteessa apps.owncloud.com"
 
-#: templates/apps.php:29
+#: templates/apps.php:36
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-lisensoija <span class=\"author\"></span>"
 
-#: templates/apps.php:31
+#: templates/apps.php:38
 msgid "Update"
 msgstr "Päivitä"
 
-#: templates/help.php:3
+#: templates/help.php:4
 msgid "User Documentation"
 msgstr "Käyttäjäohjeistus"
 
-#: templates/help.php:4
+#: templates/help.php:6
 msgid "Administrator Documentation"
 msgstr "Ylläpito-ohjeistus"
 
-#: templates/help.php:6
+#: templates/help.php:9
 msgid "Online Documentation"
 msgstr "Verkko-ohjeistus"
 
-#: templates/help.php:7
+#: templates/help.php:11
 msgid "Forum"
 msgstr "Keskustelupalsta"
 
-#: templates/help.php:9
+#: templates/help.php:14
 msgid "Bugtracker"
 msgstr "Ohjelmistovirheiden jäljitys"
 
-#: templates/help.php:11
+#: templates/help.php:17
 msgid "Commercial Support"
 msgstr "Kaupallinen tuki"
 
@@ -386,79 +386,79 @@ msgstr "Kaupallinen tuki"
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Käytössäsi on <strong>%s</strong>/<strong>%s</strong>"
 
-#: templates/personal.php:14
+#: templates/personal.php:15
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:25
+#: templates/personal.php:26
 msgid "Show First Run Wizard again"
 msgstr "Näytä ensimmäisen käyttökerran avustaja uudelleen"
 
-#: templates/personal.php:36 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
 msgid "Password"
 msgstr "Salasana"
 
-#: templates/personal.php:37
+#: templates/personal.php:38
 msgid "Your password was changed"
 msgstr "Salasanasi vaihdettiin"
 
-#: templates/personal.php:38
+#: templates/personal.php:39
 msgid "Unable to change your password"
 msgstr "Salasanaasi ei voitu vaihtaa"
 
-#: templates/personal.php:39
+#: templates/personal.php:40
 msgid "Current password"
 msgstr "Nykyinen salasana"
 
-#: templates/personal.php:40
+#: templates/personal.php:42
 msgid "New password"
 msgstr "Uusi salasana"
 
-#: templates/personal.php:42
+#: templates/personal.php:44
 msgid "Change password"
 msgstr "Vaihda salasana"
 
-#: templates/personal.php:54 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:78
 msgid "Display Name"
 msgstr "Näyttönimi"
 
-#: templates/personal.php:55
+#: templates/personal.php:57
 msgid "Your display name was changed"
 msgstr "Näyttönimesi muutettiin"
 
-#: templates/personal.php:56
+#: templates/personal.php:58
 msgid "Unable to change your display name"
 msgstr "Näyttönimen muuttaminen epäonnistui"
 
-#: templates/personal.php:59
+#: templates/personal.php:61
 msgid "Change display name"
 msgstr "Muuta näyttönimeä"
 
-#: templates/personal.php:68
+#: templates/personal.php:70
 msgid "Email"
 msgstr "Sähköposti"
 
-#: templates/personal.php:69
+#: templates/personal.php:72
 msgid "Your email address"
 msgstr "Sähköpostiosoitteesi"
 
-#: templates/personal.php:70
+#: templates/personal.php:73
 msgid "Fill in an email address to enable password recovery"
 msgstr "Anna sähköpostiosoitteesi, jotta unohdettu salasana on mahdollista palauttaa"
 
-#: templates/personal.php:76 templates/personal.php:77
+#: templates/personal.php:79 templates/personal.php:80
 msgid "Language"
 msgstr "Kieli"
 
-#: templates/personal.php:82
+#: templates/personal.php:86
 msgid "Help translate"
 msgstr "Auta kääntämisessä"
 
-#: templates/personal.php:87
+#: templates/personal.php:91
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:89
+#: templates/personal.php:93
 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"
 
diff --git a/l10n/fi_FI/user_ldap.po b/l10n/fi_FI/user_ldap.po
index 3a56d21654cccf225b1502e136be6e04be9a137f..c41a2c1ac1ede0978e4361eab275eb6728f7bab1 100644
--- a/l10n/fi_FI/user_ldap.po
+++ b/l10n/fi_FI/user_ldap.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-15 00:05+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-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: 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,17 +24,17 @@ msgstr ""
 msgid "Failed to delete the server configuration"
 msgstr ""
 
-#: ajax/testConfiguration.php:35
+#: ajax/testConfiguration.php:36
 msgid "The configuration is valid and the connection could be established!"
 msgstr ""
 
-#: ajax/testConfiguration.php:37
+#: ajax/testConfiguration.php:39
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
 msgstr ""
 
-#: ajax/testConfiguration.php:40
+#: ajax/testConfiguration.php:43
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
@@ -89,224 +89,248 @@ msgstr ""
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:17
+#: templates/settings.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:23
 msgid "Host"
 msgstr "Isäntä"
 
-#: templates/settings.php:21
+#: templates/settings.php:25
 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:22
+#: templates/settings.php:26
 msgid "Base DN"
 msgstr "Oletus DN"
 
-#: templates/settings.php:22
+#: templates/settings.php:27
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:28
 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:23
+#: templates/settings.php:30
 msgid "User DN"
 msgstr "Käyttäjän DN"
 
-#: templates/settings.php:23
+#: templates/settings.php:32
 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:24
+#: templates/settings.php:33
 msgid "Password"
 msgstr "Salasana"
 
-#: templates/settings.php:24
+#: templates/settings.php:36
 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:25
+#: templates/settings.php:37
 msgid "User Login Filter"
 msgstr "Login suodatus"
 
-#: templates/settings.php:25
+#: templates/settings.php:40
 #, 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:25
+#: templates/settings.php:41
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "käytä %%uid paikanvaraajaa, ts. \"uid=%%uid\""
 
-#: templates/settings.php:26
+#: templates/settings.php:42
 msgid "User List Filter"
 msgstr "Käyttäjien suodatus"
 
-#: templates/settings.php:26
+#: templates/settings.php:45
 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:26
+#: templates/settings.php:46
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "ilman paikanvaraustermiä, ts. \"objectClass=person\"."
 
-#: templates/settings.php:27
+#: templates/settings.php:47
 msgid "Group Filter"
 msgstr "Ryhmien suodatus"
 
-#: templates/settings.php:27
+#: templates/settings.php:50
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Määrittelee käytettävän suodattimen, kun ryhmiä haetaan.  "
 
-#: templates/settings.php:27
+#: templates/settings.php:51
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "ilman paikanvaraustermiä, ts. \"objectClass=posixGroup\"."
 
-#: templates/settings.php:31
+#: templates/settings.php:55
 msgid "Connection Settings"
 msgstr "Yhteysasetukset"
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:34
+#: templates/settings.php:58
 msgid "Port"
 msgstr "Portti"
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:60
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "Disable Main Server"
 msgstr "Poista pääpalvelin käytöstä"
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Use TLS"
 msgstr "Käytä TLS:ää"
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:39
+#: templates/settings.php:63
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Kirjainkoosta piittamaton LDAP-palvelin (Windows)"
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid "Turn off SSL certificate validation."
 msgstr "Poista käytöstä SSL-varmenteen vahvistus"
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 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:40
+#: templates/settings.php:64
 msgid "Not recommended, use for testing only."
 msgstr "Ei suositella, käytä vain testausta varten."
 
-#: templates/settings.php:41
+#: templates/settings.php:65
+msgid "Cache Time-To-Live"
+msgstr ""
+
+#: templates/settings.php:65
 msgid "in seconds. A change empties the cache."
 msgstr "sekunneissa. Muutos tyhjentää välimuistin."
 
-#: templates/settings.php:43
+#: templates/settings.php:67
 msgid "Directory Settings"
 msgstr "Hakemistoasetukset"
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "User Display Name Field"
 msgstr "Käyttäjän näytettävän nimen kenttä"
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 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:46
+#: templates/settings.php:70
 msgid "Base User Tree"
 msgstr "Oletuskäyttäjäpuu"
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:47
+#: templates/settings.php:71
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:47 templates/settings.php:50
+#: templates/settings.php:71 templates/settings.php:74
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "Group Display Name Field"
 msgstr "Ryhmän \"näytettävä nimi\"-kenttä"
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 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:49
+#: templates/settings.php:73
 msgid "Base Group Tree"
 msgstr "Ryhmien juuri"
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:74
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:75
 msgid "Group-Member association"
 msgstr "Ryhmän ja jäsenen assosiaatio (yhteys)"
 
-#: templates/settings.php:53
+#: templates/settings.php:77
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:79
+msgid "Quota Field"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Quota Default"
+msgstr ""
+
+#: templates/settings.php:80
 msgid "in bytes"
 msgstr "tavuissa"
 
-#: templates/settings.php:58
+#: templates/settings.php:81
+msgid "Email Field"
+msgstr ""
+
+#: templates/settings.php:82
+msgid "User Home Folder Naming Rule"
+msgstr ""
+
+#: templates/settings.php:82
 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:62
+#: templates/settings.php:86
+msgid "Test Configuration"
+msgstr ""
+
+#: templates/settings.php:86
 msgid "Help"
 msgstr "Ohje"
diff --git a/l10n/fr/core.po b/l10n/fr/core.po
index ab6b14e83961d945d01ab500ed68dc5c3250ea34..bb1f9dc5fe7939006a4c9582997189c3674a46dc 100644
--- a/l10n/fr/core.po
+++ b/l10n/fr/core.po
@@ -21,8 +21,8 @@ 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 14:32+0000\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"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -400,7 +400,7 @@ msgstr "La mise à jour a échoué. Veuillez signaler ce problème à la <a href
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "La mise à jour a réussi. Vous êtes redirigé maintenant vers ownCloud."
 
-#: lostpassword/controller.php:47
+#: lostpassword/controller.php:48
 msgid "ownCloud password reset"
 msgstr "Réinitialisation de votre mot de passe Owncloud"
 
diff --git a/l10n/fr/files.po b/l10n/fr/files.po
index 9e0b0e3a7ae53cc36fd1b8588879bc3a156ed67a..f7ba7a03081444ba4da46dd08232d6c6676f6151 100644
--- a/l10n/fr/files.po
+++ b/l10n/fr/files.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Adalberto Rodrigues <rodrigues_adalberto@yahoo.fr>, 2013.
 # Cédric MARTIN <sid50.martin@gmail.com>, 2013.
 # Christophe Lherieau <skimpax@gmail.com>, 2012-2013.
 # Cyril Glapa <kyriog@gmail.com>, 2012.
@@ -21,8 +22,8 @@ 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 23:05+0000\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: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -64,27 +65,27 @@ msgid ""
 "the HTML form"
 msgstr "Le fichier téléversé excède la valeur de MAX_FILE_SIZE spécifiée dans le formulaire HTML"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
 msgstr "Le fichier n'a été que partiellement téléversé"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:31
 msgid "No file was uploaded"
 msgstr "Aucun fichier n'a été téléversé"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:32
 msgid "Missing a temporary folder"
 msgstr "Il manque un répertoire temporaire"
 
-#: ajax/upload.php:34
+#: ajax/upload.php:33
 msgid "Failed to write to disk"
 msgstr "Erreur d'écriture sur le disque"
 
-#: ajax/upload.php:52
+#: ajax/upload.php:51
 msgid "Not enough storage available"
 msgstr "Plus assez d'espace de stockage disponible"
 
-#: ajax/upload.php:83
+#: ajax/upload.php:82
 msgid "Invalid directory."
 msgstr "Dossier invalide."
 
@@ -96,7 +97,7 @@ msgstr "Fichiers"
 msgid "Delete permanently"
 msgstr "Supprimer de façon définitive"
 
-#: js/fileactions.js:127 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:127 templates/index.php:92 templates/index.php:93
 msgid "Delete"
 msgstr "Supprimer"
 
@@ -104,40 +105,36 @@ msgstr "Supprimer"
 msgid "Rename"
 msgstr "Renommer"
 
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
 msgid "Pending"
 msgstr "En cours"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "{new_name} already exists"
 msgstr "{new_name} existe déjà"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "replace"
 msgstr "remplacer"
 
-#: js/filelist.js:253
+#: js/filelist.js:251
 msgid "suggest name"
 msgstr "Suggérer un nom"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "cancel"
 msgstr "annuler"
 
-#: js/filelist.js:295
-msgid "replaced {new_name}"
-msgstr "{new_name} a été remplacé"
+#: js/filelist.js:298
+msgid "replaced {new_name} with {old_name}"
+msgstr "{new_name} a été remplacé par {old_name}"
 
-#: js/filelist.js:295 js/filelist.js:297
+#: js/filelist.js:298
 msgid "undo"
 msgstr "annuler"
 
-#: js/filelist.js:297
-msgid "replaced {new_name} with {old_name}"
-msgstr "{new_name} a été remplacé par {old_name}"
-
-#: js/filelist.js:322
+#: js/filelist.js:323
 msgid "perform delete operation"
 msgstr "effectuer l'opération de suppression"
 
@@ -163,74 +160,74 @@ 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:224
+#: js/files.js:225
 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:261
+#: js/files.js:262
 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:261
+#: js/files.js:262
 msgid "Upload Error"
 msgstr "Erreur de chargement"
 
-#: js/files.js:272
+#: js/files.js:273
 msgid "Close"
 msgstr "Fermer"
 
-#: js/files.js:311
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr "1 fichier en cours de téléchargement"
 
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: 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:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "Chargement annulé."
 
-#: js/files.js:496
+#: js/files.js:497
 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:569
+#: js/files.js:570
 msgid "URL cannot be empty."
 msgstr "L'URL ne peut-être vide"
 
-#: js/files.js:574
+#: js/files.js:575
 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:948 templates/index.php:67
+#: js/files.js:953 templates/index.php:68
 msgid "Name"
 msgstr "Nom"
 
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:954 templates/index.php:79
 msgid "Size"
 msgstr "Taille"
 
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:955 templates/index.php:81
 msgid "Modified"
 msgstr "Modifié"
 
-#: js/files.js:969
+#: js/files.js:974
 msgid "1 folder"
 msgstr "1 dossier"
 
-#: js/files.js:971
+#: js/files.js:976
 msgid "{count} folders"
 msgstr "{count} dossiers"
 
-#: js/files.js:979
+#: js/files.js:984
 msgid "1 file"
 msgstr "1 fichier"
 
-#: js/files.js:981
+#: js/files.js:986
 msgid "{count} files"
 msgstr "{count} fichiers"
 
@@ -288,39 +285,43 @@ msgstr "Depuis le lien"
 
 #: templates/index.php:40
 msgid "Deleted files"
-msgstr ""
+msgstr "Fichiers supprimés"
 
 #: templates/index.php:46
 msgid "Cancel upload"
 msgstr "Annuler l'envoi"
 
-#: templates/index.php:59
+#: templates/index.php:53
+msgid "You don’t have write permissions here."
+msgstr ""
+
+#: templates/index.php:60
 msgid "Nothing in here. Upload something!"
 msgstr "Il n'y a rien ici ! Envoyez donc quelque chose :)"
 
-#: templates/index.php:73
+#: templates/index.php:74
 msgid "Download"
 msgstr "Télécharger"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:86 templates/index.php:87
 msgid "Unshare"
 msgstr "Ne plus partager"
 
-#: templates/index.php:105
+#: templates/index.php:106
 msgid "Upload too large"
 msgstr "Fichier trop volumineux"
 
-#: templates/index.php:107
+#: templates/index.php:108
 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:112
+#: templates/index.php:113
 msgid "Files are being scanned, please wait."
 msgstr "Les fichiers sont en cours d'analyse, veuillez patienter."
 
-#: templates/index.php:115
+#: templates/index.php:116
 msgid "Current scanning"
 msgstr "Analyse en cours"
 
diff --git a/l10n/fr/files_external.po b/l10n/fr/files_external.po
index 02af3bd71fbdbc98eaf21d8b631f466f24c7be38..fd92856f84ade2b716435129441f47a40c6efae6 100644
--- a/l10n/fr/files_external.po
+++ b/l10n/fr/files_external.po
@@ -9,9 +9,9 @@ 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 10:41+0000\n"
-"Last-Translator: Romain DEP. <rom1dep@gmail.com>\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"
 "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"
@@ -19,37 +19,33 @@ msgstr ""
 "Language: fr\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 "Accès autorisé"
 
-#: 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 "Erreur lors de la configuration du support de stockage Dropbox"
 
-#: 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 "Autoriser l'accès"
 
-#: js/dropbox.js:73 js/google.js:72
-msgid "Fill out all required fields"
-msgstr "Veuillez remplir tous les champs requis"
-
-#: js/dropbox.js:85
+#: js/dropbox.js:101
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr "Veuillez fournir une clé d'application (app key) ainsi qu'un mot de passe valides."
 
-#: 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 "Erreur lors de la configuration du support de stockage Google Drive"
 
-#: lib/config.php:434
+#: lib/config.php:421
 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:435
+#: lib/config.php:424
 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 "
@@ -60,63 +56,63 @@ msgstr "<b>Attention : </b> Le support FTP de PHP n'est pas activé ou installé
 msgid "External Storage"
 msgstr "Stockage externe"
 
-#: templates/settings.php:8 templates/settings.php:22
-msgid "Mount point"
-msgstr "Point de montage"
-
-#: templates/settings.php:9
-msgid "Backend"
-msgstr "Infrastructure"
+#: templates/settings.php:9 templates/settings.php:28
+msgid "Folder name"
+msgstr "Nom du dossier"
 
 #: templates/settings.php:10
+msgid "External storage"
+msgstr ""
+
+#: templates/settings.php:11
 msgid "Configuration"
 msgstr "Configuration"
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid "Options"
 msgstr "Options"
 
-#: templates/settings.php:12
+#: templates/settings.php:13
 msgid "Applicable"
 msgstr "Disponible"
 
-#: templates/settings.php:27
-msgid "Add mount point"
-msgstr "Ajouter un point de montage"
+#: templates/settings.php:33
+msgid "Add storage"
+msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:90
 msgid "None set"
 msgstr "Aucun spécifié"
 
-#: templates/settings.php:86
+#: templates/settings.php:91
 msgid "All Users"
 msgstr "Tous les utilisateurs"
 
-#: templates/settings.php:87
+#: templates/settings.php:92
 msgid "Groups"
 msgstr "Groupes"
 
-#: templates/settings.php:95
+#: templates/settings.php:100
 msgid "Users"
 msgstr "Utilisateurs"
 
-#: templates/settings.php:108 templates/settings.php:109
-#: templates/settings.php:144 templates/settings.php:145
+#: templates/settings.php:113 templates/settings.php:114
+#: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
 msgstr "Supprimer"
 
-#: templates/settings.php:124
+#: templates/settings.php:129
 msgid "Enable User External Storage"
 msgstr "Activer le stockage externe pour les utilisateurs"
 
-#: templates/settings.php:125
+#: templates/settings.php:130
 msgid "Allow users to mount their own external storage"
 msgstr "Autoriser les utilisateurs à monter leur propre stockage externe"
 
-#: templates/settings.php:136
+#: templates/settings.php:141
 msgid "SSL root certificates"
 msgstr "Certificats racine SSL"
 
-#: templates/settings.php:153
+#: templates/settings.php:159
 msgid "Import Root Certificate"
 msgstr "Importer un certificat racine"
diff --git a/l10n/fr/files_trashbin.po b/l10n/fr/files_trashbin.po
index 7f4f4cbbf7da9e29ab6808ae7e6f1860c820a783..4b183165c73c00114ce0a1430201b186c9b7114f 100644
--- a/l10n/fr/files_trashbin.po
+++ b/l10n/fr/files_trashbin.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-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 09:50+0000\n"
-"Last-Translator: Romain DEP. <rom1dep@gmail.com>\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: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,7 +19,7 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ajax/delete.php:22
+#: ajax/delete.php:40
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "Impossible d'effacer %s de façon permanente"
@@ -29,35 +29,39 @@ msgstr "Impossible d'effacer %s de façon permanente"
 msgid "Couldn't restore %s"
 msgstr "Impossible de restaurer %s"
 
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
 msgid "perform restore operation"
 msgstr "effectuer l'opération de restauration"
 
-#: js/trash.js:33
+#: js/trash.js:34
 msgid "delete file permanently"
 msgstr "effacer définitivement le fichier"
 
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr "Supprimer de façon définitive"
+
+#: js/trash.js:174 templates/index.php:17
 msgid "Name"
 msgstr "Nom"
 
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:175 templates/index.php:27
 msgid "Deleted"
 msgstr "Effacé"
 
-#: js/trash.js:135
+#: js/trash.js:184
 msgid "1 folder"
 msgstr "1 dossier"
 
-#: js/trash.js:137
+#: js/trash.js:186
 msgid "{count} folders"
 msgstr "{count} dossiers"
 
-#: js/trash.js:145
+#: js/trash.js:194
 msgid "1 file"
 msgstr "1 fichier"
 
-#: js/trash.js:147
+#: js/trash.js:196
 msgid "{count} files"
 msgstr "{count} fichiers"
 
@@ -68,3 +72,11 @@ msgstr "Il n'y a rien ici. Votre corbeille est vide !"
 #: templates/index.php:20 templates/index.php:22
 msgid "Restore"
 msgstr "Restaurer"
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr "Supprimer"
+
+#: templates/part.breadcrumb.php:9
+msgid "Deleted Files"
+msgstr ""
diff --git a/l10n/fr/files_versions.po b/l10n/fr/files_versions.po
index 0bfce6ee9bc44f1252776c6566f7c66c5788b84e..7b7b6fa9a66ed0d37da82f04891409174d87c8b7 100644
--- a/l10n/fr/files_versions.po
+++ b/l10n/fr/files_versions.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-09 00:12+0100\n"
-"PO-Revision-Date: 2013-02-08 14:02+0000\n"
-"Last-Translator: Romain DEP. <rom1dep@gmail.com>\n"
+"POT-Creation-Date: 2013-02-28 00:04+0100\n"
+"PO-Revision-Date: 2013-02-27 23:04+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -49,18 +49,10 @@ msgstr "Aucune ancienne version n'est disponible"
 msgid "No path specified"
 msgstr "Aucun chemin spécifié"
 
-#: js/versions.js:16
-msgid "History"
-msgstr "Historique"
+#: 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 "Restaurez un fichier dans une version antérieure en cliquant sur son bouton de restauration"
-
-#: templates/settings.php:3
-msgid "Files Versioning"
-msgstr "Versionnage des fichiers"
-
-#: templates/settings.php:4
-msgid "Enable"
-msgstr "Activer"
diff --git a/l10n/fr/lib.po b/l10n/fr/lib.po
index 25508c784b07922b266ebff43a96ab83e625f522..2403f65f66c1b3a261886abe33c712347bd5526e 100644
--- a/l10n/fr/lib.po
+++ b/l10n/fr/lib.po
@@ -3,6 +3,7 @@
 # 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.
@@ -10,9 +11,9 @@ 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 14:33+0000\n"
-"Last-Translator: Romain DEP. <rom1dep@gmail.com>\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"
 "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"
@@ -20,27 +21,27 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: app.php:339
+#: app.php:349
 msgid "Help"
 msgstr "Aide"
 
-#: app.php:346
+#: app.php:362
 msgid "Personal"
 msgstr "Personnel"
 
-#: app.php:351
+#: app.php:373
 msgid "Settings"
 msgstr "Paramètres"
 
-#: app.php:356
+#: app.php:385
 msgid "Users"
 msgstr "Utilisateurs"
 
-#: app.php:363
+#: app.php:398
 msgid "Apps"
 msgstr "Applications"
 
-#: app.php:365
+#: app.php:406
 msgid "Admin"
 msgstr "Administration"
 
@@ -52,15 +53,15 @@ msgstr "Téléchargement ZIP désactivé."
 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:203 files.php:228
+#: files.php:204 files.php:231
 msgid "Back to Files"
 msgstr "Retour aux Fichiers"
 
-#: files.php:227
+#: files.php:228
 msgid "Selected files too large to generate zip file."
 msgstr "Les fichiers sélectionnés sont trop volumineux pour être compressés."
 
-#: helper.php:226
+#: helper.php:228
 msgid "couldn't be determined"
 msgstr "impossible à déterminer"
 
@@ -100,87 +101,92 @@ msgstr "Spécifiez un mot de passe administrateur."
 msgid "Specify a data folder."
 msgstr "Spécifiez un répertoire pour les données."
 
-#: setup.php:53
+#: setup.php:55
 #, php-format
 msgid "%s enter the database username."
 msgstr "%s entrez le nom d'utilisateur de la base de données."
 
-#: setup.php:56
+#: setup.php:58
 #, php-format
 msgid "%s enter the database name."
 msgstr "%s entrez le nom de la base de données."
 
-#: setup.php:59
+#: setup.php:61
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr "%s vous nez pouvez pas utiliser de points dans le nom de la base de données"
 
-#: setup.php:62
+#: setup.php:64
 #, php-format
 msgid "%s set the database host."
 msgstr "%s spécifiez l'hôte de la base de données."
 
-#: setup.php:126 setup.php:291 setup.php:336
+#: setup.php:128 setup.php:320 setup.php:365
 msgid "PostgreSQL username and/or password not valid"
 msgstr "Nom d'utilisateur et/ou mot de passe de la base PostgreSQL invalide"
 
-#: setup.php:127 setup.php:150 setup.php:204
+#: setup.php:129 setup.php:152 setup.php:229
 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:149 setup.php:423 setup.php:489
+#: setup.php:151 setup.php:453 setup.php:520
 msgid "Oracle username and/or password not valid"
 msgstr "Nom d'utilisateur et/ou mot de passe de la base Oracle invalide"
 
-#: setup.php:203
+#: setup.php:228
 msgid "MySQL username and/or password not valid"
 msgstr "Nom d'utilisateur et/ou mot de passe de la base MySQL invalide"
 
-#: setup.php:255 setup.php:357 setup.php:366 setup.php:384 setup.php:394
-#: setup.php:403 setup.php:430 setup.php:496 setup.php:522 setup.php:529
-#: setup.php:540 setup.php:547 setup.php:556 setup.php:564 setup.php:573
-#: setup.php:579
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Erreur de la base de données : \"%s\""
 
-#: setup.php:256 setup.php:358 setup.php:367 setup.php:385 setup.php:395
-#: setup.php:404 setup.php:431 setup.php:497 setup.php:523 setup.php:530
-#: setup.php:541 setup.php:557 setup.php:565 setup.php:574
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "La requête en cause est : \"%s\""
 
-#: setup.php:270
+#: setup.php:299
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "L'utilisateur MySQL '%s'@'localhost' existe déjà."
 
-#: setup.php:271
+#: setup.php:300
 msgid "Drop this user from MySQL"
 msgstr "Retirer cet utilisateur de la base MySQL"
 
-#: setup.php:276
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "L'utilisateur MySQL '%s'@'%%' existe déjà"
 
-#: setup.php:277
+#: setup.php:306
 msgid "Drop this user from MySQL."
 msgstr "Retirer cet utilisateur de la base MySQL."
 
-#: setup.php:548 setup.php:580
+#: setup.php:579 setup.php:611
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "La requête en cause est : \"%s\", nom : %s, mot de passe : %s"
 
-#: setup.php:644
+#: setup.php:631
+#, 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
 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:645
+#: setup.php:850
 #, 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>."
@@ -237,16 +243,16 @@ msgstr "l'année dernière"
 msgid "years ago"
 msgstr "il y a plusieurs années"
 
-#: updater.php:75
+#: 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:77
+#: updater.php:81
 msgid "up to date"
 msgstr "À jour"
 
-#: updater.php:80
+#: updater.php:84
 msgid "updates check is disabled"
 msgstr "la vérification des mises à jour est désactivée"
 
diff --git a/l10n/fr/settings.po b/l10n/fr/settings.po
index b165922be018ae5c1e4a384c43e99be1fcb7b913..51796243567b9700f6a2046cdff86b1e28dd6e09 100644
--- a/l10n/fr/settings.po
+++ b/l10n/fr/settings.po
@@ -3,8 +3,10 @@
 # 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.
@@ -14,7 +16,7 @@
 # Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011.
 #   <life_0n_mars@live.fr>, 2012.
 #   <mishka.lazzlo@gmail.com>, 2012.
-# Nahir Mohamed <nahirmoha@gmail.com>, 2012.
+# Nahir Mohamed <nahirmoha@gmail.com>, 2012-2013.
 #   <pierreamiel.giraud@gmail.com>, 2012.
 # Robert Di Rosa <>, 2012.
 #   <rom1dep@gmail.com>, 2011, 2012.
@@ -24,9 +26,9 @@ 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:05+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-02-28 00:04+0100\n"
+"PO-Revision-Date: 2013-02-27 16:51+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"
@@ -38,8 +40,8 @@ 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:15
-#: ajax/togglegroups.php:18
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr "Erreur d'authentification"
 
@@ -87,12 +89,12 @@ msgstr "Requête invalide"
 msgid "Admins can't remove themself from the admin group"
 msgstr "Les administrateurs ne peuvent pas se retirer eux-mêmes du groupe admin"
 
-#: ajax/togglegroups.php:28
+#: ajax/togglegroups.php:30
 #, php-format
 msgid "Unable to add user to group %s"
 msgstr "Impossible d'ajouter l'utilisateur au groupe %s"
 
-#: ajax/togglegroups.php:34
+#: ajax/togglegroups.php:36
 #, php-format
 msgid "Unable to remove user from group %s"
 msgstr "Impossible de supprimer l'utilisateur du groupe %s"
@@ -133,7 +135,7 @@ msgstr "Erreur"
 msgid "Updated"
 msgstr "Mise à jour effectuée avec succès"
 
-#: js/personal.js:96
+#: js/personal.js:99
 msgid "Saving..."
 msgstr "Sauvegarde..."
 
@@ -162,23 +164,23 @@ msgstr "Groupe Admin"
 msgid "Delete"
 msgstr "Supprimer"
 
-#: js/users.js:190
+#: js/users.js:191
 msgid "add group"
 msgstr "ajouter un groupe"
 
-#: js/users.js:351
+#: js/users.js:352
 msgid "A valid username must be provided"
 msgstr "Un nom d'utilisateur valide doit être saisi"
 
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
 msgid "Error creating user"
 msgstr "Erreur lors de la création de l'utilisateur"
 
-#: js/users.js:357
+#: js/users.js:358
 msgid "A valid password must be provided"
 msgstr "Un mot de passe valide doit être saisi"
 
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
 msgid "__language_name__"
 msgstr "Français"
 
@@ -197,7 +199,7 @@ msgstr "Votre dossier data et vos fichiers sont probablement accessibles depuis
 
 #: templates/admin.php:29
 msgid "Setup Warning"
-msgstr ""
+msgstr "Avertissement, problème de configuration"
 
 #: templates/admin.php:32
 msgid ""
@@ -224,19 +226,19 @@ msgstr "Le module PHP 'fileinfo' est manquant. Il est vivement recommandé de l'
 msgid "Locale not working"
 msgstr "Localisation non fonctionnelle"
 
-#: templates/admin.php:61
+#: templates/admin.php:63
+#, php-format
 msgid ""
-"This ownCloud server can't set system locale to "
-"\"en_US.UTF-8\"/\"en_US.UTF8\". 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 en_US.UTF-8/en_US.UTF8."
-msgstr "Ce serveur ownCloud ne peut pas ajuster la localisation du système en tant que \"en_US.UTF-8\"/\"en_US.UTF8\". Cela signifie qu'il pourra y avoir des problèmes avec certains caractères dans les noms de fichiers. Il est vivement recommandé d'installer les paquets requis pour le support de en_US.UTF-8/en_US.UTF8."
+"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 "Ce serveur ownCloud ne peut pas ajuster la localisation du système en %s. Cela signifie qu'il pourra y avoir des problèmes avec certains caractères dans les noms de fichiers. Il est vivement recommandé d'installer les paquets requis pour le support de %s."
 
-#: templates/admin.php:72
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr "La connexion internet ne fonctionne pas"
 
-#: templates/admin.php:75
+#: 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 "
@@ -246,98 +248,98 @@ msgid ""
 " of ownCloud."
 msgstr "Ce serveur ownCloud ne peut pas se connecter à internet. Cela signifie que certaines fonctionnalités, telles que l'utilisation de supports de stockage distants, les notifications de mises à jour, ou l'installation d'applications tierces ne fonctionneront pas. L'accès aux fichiers à distance, ainsi que les notifications par mails ne marcheront pas non plus. Il est recommandé d'activer la connexion internet pour ce serveur si vous souhaitez utiliser toutes les fonctionnalités offertes par ownCloud."
 
-#: templates/admin.php:89
+#: templates/admin.php:92
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:98
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr "Exécute une tâche à chaque chargement de page"
 
-#: templates/admin.php:108
+#: 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 est enregistré en tant que service webcron. Veuillez appeler la page cron.php située à la racine du serveur ownCoud via http toute les minutes."
 
-#: templates/admin.php:118
+#: 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 "Utilise le service cron du système. Appelle le fichier cron.php du répertoire owncloud toutes les minutes grâce à une tâche cron du système."
 
-#: templates/admin.php:125
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr "Partage"
 
-#: templates/admin.php:131
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr "Activer l'API de partage"
 
-#: templates/admin.php:132
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
-msgstr ""
+msgstr "Autoriser les applications à utiliser l'API de partage"
 
-#: templates/admin.php:139
+#: templates/admin.php:142
 msgid "Allow links"
-msgstr ""
+msgstr "Autoriser les liens"
 
-#: templates/admin.php:140
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
-msgstr ""
+msgstr "Autoriser les utilisateurs à partager des éléments publiquement à l'aide de liens"
 
-#: templates/admin.php:147
+#: templates/admin.php:150
 msgid "Allow resharing"
-msgstr ""
+msgstr "Autoriser le repartage"
 
-#: templates/admin.php:148
+#: templates/admin.php:151
 msgid "Allow users to share items shared with them again"
-msgstr ""
+msgstr "Autoriser les utilisateurs à partager des éléments qui ont été partagés avec eux"
 
-#: templates/admin.php:155
+#: templates/admin.php:158
 msgid "Allow users to share with anyone"
-msgstr ""
+msgstr "Autoriser les utilisateurs à partager avec tout le monde"
 
-#: templates/admin.php:158
+#: templates/admin.php:161
 msgid "Allow users to only share with users in their groups"
-msgstr ""
+msgstr "Autoriser les utilisateurs à partager avec des utilisateurs de leur groupe uniquement"
 
-#: templates/admin.php:165
+#: templates/admin.php:168
 msgid "Security"
-msgstr ""
+msgstr "Sécurité"
 
-#: templates/admin.php:178
+#: templates/admin.php:181
 msgid "Enforce HTTPS"
-msgstr ""
+msgstr "Forcer HTTPS"
 
-#: templates/admin.php:179
+#: templates/admin.php:182
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
-msgstr ""
+msgstr "Forcer les clients à se connecter à Owncloud via une connexion chiffrée."
 
-#: templates/admin.php:182
+#: templates/admin.php:185
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
-msgstr ""
+msgstr "Merci de vous connecter à cette instance Owncloud en HTTPS pour activer ou désactiver SSL."
 
-#: templates/admin.php:192
+#: templates/admin.php:195
 msgid "Log"
-msgstr ""
+msgstr "Log"
 
-#: templates/admin.php:193
+#: templates/admin.php:196
 msgid "Log level"
-msgstr ""
+msgstr "Niveau de log"
 
-#: templates/admin.php:220
+#: templates/admin.php:223
 msgid "More"
 msgstr "Plus"
 
-#: templates/admin.php:227 templates/personal.php:98
+#: templates/admin.php:230 templates/personal.php:102
 msgid "Version"
 msgstr "Version"
 
-#: templates/admin.php:230 templates/personal.php:100
+#: templates/admin.php:233 templates/personal.php:105
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -347,51 +349,51 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "Développé par la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">communauté ownCloud</a>, le <a href=\"https://github.com/owncloud\" target=\"_blank\">code source</a> est publié sous license <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
-#: templates/apps.php:10
+#: templates/apps.php:11
 msgid "Add your App"
 msgstr "Ajoutez votre application"
 
-#: templates/apps.php:11
+#: templates/apps.php:12
 msgid "More Apps"
 msgstr "Plus d'applications…"
 
-#: templates/apps.php:24
+#: templates/apps.php:28
 msgid "Select an App"
 msgstr "Sélectionner une Application"
 
-#: templates/apps.php:28
+#: templates/apps.php:34
 msgid "See application page at apps.owncloud.com"
 msgstr "Voir la page des applications à l'url apps.owncloud.com"
 
-#: templates/apps.php:29
+#: templates/apps.php:36
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "Distribué sous licence <span class=\"licence\"></span>, par <span class=\"author\"></span>"
 
-#: templates/apps.php:31
+#: templates/apps.php:38
 msgid "Update"
 msgstr "Mettre à jour"
 
-#: templates/help.php:3
+#: templates/help.php:4
 msgid "User Documentation"
 msgstr "Documentation utilisateur"
 
-#: templates/help.php:4
+#: templates/help.php:6
 msgid "Administrator Documentation"
 msgstr "Documentation administrateur"
 
-#: templates/help.php:6
+#: templates/help.php:9
 msgid "Online Documentation"
 msgstr "Documentation en ligne"
 
-#: templates/help.php:7
+#: templates/help.php:11
 msgid "Forum"
 msgstr "Forum"
 
-#: templates/help.php:9
+#: templates/help.php:14
 msgid "Bugtracker"
 msgstr "Suivi de bugs"
 
-#: templates/help.php:11
+#: templates/help.php:17
 msgid "Commercial Support"
 msgstr "Support commercial"
 
@@ -400,79 +402,79 @@ msgstr "Support commercial"
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Vous avez utilisé <strong>%s</strong> des <strong>%s<strong> disponibles"
 
-#: templates/personal.php:14
+#: templates/personal.php:15
 msgid "Get the apps to sync your files"
 msgstr "Obtenez les applications de synchronisation de vos fichiers"
 
-#: templates/personal.php:25
+#: templates/personal.php:26
 msgid "Show First Run Wizard again"
 msgstr "Revoir le premier lancement de l'installeur"
 
-#: templates/personal.php:36 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
 msgid "Password"
 msgstr "Mot de passe"
 
-#: templates/personal.php:37
+#: templates/personal.php:38
 msgid "Your password was changed"
 msgstr "Votre mot de passe a été changé"
 
-#: templates/personal.php:38
+#: templates/personal.php:39
 msgid "Unable to change your password"
 msgstr "Impossible de changer votre mot de passe"
 
-#: templates/personal.php:39
+#: templates/personal.php:40
 msgid "Current password"
 msgstr "Mot de passe actuel"
 
-#: templates/personal.php:40
+#: templates/personal.php:42
 msgid "New password"
 msgstr "Nouveau mot de passe"
 
-#: templates/personal.php:42
+#: templates/personal.php:44
 msgid "Change password"
 msgstr "Changer de mot de passe"
 
-#: templates/personal.php:54 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:78
 msgid "Display Name"
 msgstr "Nom affiché"
 
-#: templates/personal.php:55
+#: templates/personal.php:57
 msgid "Your display name was changed"
 msgstr "Votre nom d'affichage a bien été modifié"
 
-#: templates/personal.php:56
+#: templates/personal.php:58
 msgid "Unable to change your display name"
 msgstr "Impossible de modifier votre nom d'affichage"
 
-#: templates/personal.php:59
+#: templates/personal.php:61
 msgid "Change display name"
 msgstr "Changer le nom affiché"
 
-#: templates/personal.php:68
+#: templates/personal.php:70
 msgid "Email"
 msgstr "E-mail"
 
-#: templates/personal.php:69
+#: templates/personal.php:72
 msgid "Your email address"
 msgstr "Votre adresse e-mail"
 
-#: templates/personal.php:70
+#: templates/personal.php:73
 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:76 templates/personal.php:77
+#: templates/personal.php:79 templates/personal.php:80
 msgid "Language"
 msgstr "Langue"
 
-#: templates/personal.php:82
+#: templates/personal.php:86
 msgid "Help translate"
 msgstr "Aidez à traduire"
 
-#: templates/personal.php:87
+#: templates/personal.php:91
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:89
+#: templates/personal.php:93
 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"
 
diff --git a/l10n/fr/user_ldap.po b/l10n/fr/user_ldap.po
index 61d51d61cab2c179bf320738c8618efc57e4f95b..177014bd976e14d6a17b36aa564cf904c56c8785 100644
--- a/l10n/fr/user_ldap.po
+++ b/l10n/fr/user_ldap.po
@@ -14,9 +14,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: 2013-02-08 14:02+0000\n"
-"Last-Translator: Romain DEP. <rom1dep@gmail.com>\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: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -28,17 +28,17 @@ msgstr ""
 msgid "Failed to delete the server configuration"
 msgstr "Échec de la suppression de la configuration du serveur"
 
-#: ajax/testConfiguration.php:35
+#: 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 !"
 
-#: ajax/testConfiguration.php:37
+#: ajax/testConfiguration.php:39
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
 msgstr "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."
 
-#: ajax/testConfiguration.php:40
+#: ajax/testConfiguration.php:43
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
@@ -93,224 +93,248 @@ msgstr "<b>Attention :</b> Le module php LDAP n'est pas installé, par conséque
 msgid "Server configuration"
 msgstr "Configuration du serveur"
 
-#: templates/settings.php:17
+#: templates/settings.php:18
 msgid "Add Server Configuration"
 msgstr "Ajouter une configuration du serveur"
 
-#: templates/settings.php:21
+#: templates/settings.php:23
 msgid "Host"
 msgstr "Hôte"
 
-#: templates/settings.php:21
+#: templates/settings.php:25
 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:22
+#: templates/settings.php:26
 msgid "Base DN"
 msgstr "DN Racine"
 
-#: templates/settings.php:22
+#: templates/settings.php:27
 msgid "One Base DN per line"
 msgstr "Un DN racine par ligne"
 
-#: templates/settings.php:22
+#: templates/settings.php:28
 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:23
+#: templates/settings.php:30
 msgid "User DN"
 msgstr "DN Utilisateur (Autorisé à consulter l'annuaire)"
 
-#: templates/settings.php:23
+#: templates/settings.php:32
 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:24
+#: templates/settings.php:33
 msgid "Password"
 msgstr "Mot de passe"
 
-#: templates/settings.php:24
+#: templates/settings.php:36
 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."
 
-#: templates/settings.php:25
+#: templates/settings.php:37
 msgid "User Login Filter"
 msgstr "Modèle d'authentification utilisateurs"
 
-#: templates/settings.php:25
+#: templates/settings.php:40
 #, 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:25
+#: templates/settings.php:41
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "veuillez utiliser le champ %%uid , ex.: \"uid=%%uid\""
 
-#: templates/settings.php:26
+#: templates/settings.php:42
 msgid "User List Filter"
 msgstr "Filtre d'utilisateurs"
 
-#: templates/settings.php:26
+#: templates/settings.php:45
 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:26
+#: templates/settings.php:46
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "sans élément de substitution, par exemple \"objectClass=person\"."
 
-#: templates/settings.php:27
+#: templates/settings.php:47
 msgid "Group Filter"
 msgstr "Filtre de groupes"
 
-#: templates/settings.php:27
+#: templates/settings.php:50
 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:27
+#: templates/settings.php:51
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "sans élément de substitution, par exemple \"objectClass=posixGroup\"."
 
-#: templates/settings.php:31
+#: templates/settings.php:55
 msgid "Connection Settings"
 msgstr "Paramètres de connexion"
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "Configuration Active"
 msgstr "Configuration active"
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "When unchecked, this configuration will be skipped."
 msgstr "Lorsque non cochée, la configuration sera ignorée."
 
-#: templates/settings.php:34
+#: templates/settings.php:58
 msgid "Port"
 msgstr "Port"
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid "Backup (Replica) Host"
 msgstr "Serveur de backup (réplique)"
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 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:36
+#: templates/settings.php:60
 msgid "Backup (Replica) Port"
 msgstr "Port du serveur de backup (réplique)"
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "Disable Main Server"
 msgstr "Désactiver le serveur principal"
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 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:38
+#: templates/settings.php:62
 msgid "Use TLS"
 msgstr "Utiliser TLS"
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 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:39
+#: templates/settings.php:63
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Serveur LDAP insensible à la casse (Windows)"
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid "Turn off SSL certificate validation."
 msgstr "Désactiver la validation du certificat SSL."
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 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:40
+#: templates/settings.php:64
 msgid "Not recommended, use for testing only."
 msgstr "Non recommandé, utilisation pour tests uniquement."
 
-#: templates/settings.php:41
+#: templates/settings.php:65
+msgid "Cache Time-To-Live"
+msgstr ""
+
+#: templates/settings.php:65
 msgid "in seconds. A change empties the cache."
 msgstr "en secondes. Tout changement vide le cache."
 
-#: templates/settings.php:43
+#: templates/settings.php:67
 msgid "Directory Settings"
 msgstr "Paramètres du répertoire"
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "User Display Name Field"
 msgstr "Champ \"nom d'affichage\" de l'utilisateur"
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 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:46
+#: templates/settings.php:70
 msgid "Base User Tree"
 msgstr "DN racine de l'arbre utilisateurs"
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "One User Base DN per line"
 msgstr "Un DN racine utilisateur par ligne"
 
-#: templates/settings.php:47
+#: templates/settings.php:71
 msgid "User Search Attributes"
 msgstr "Recherche des attributs utilisateur"
 
-#: templates/settings.php:47 templates/settings.php:50
+#: templates/settings.php:71 templates/settings.php:74
 msgid "Optional; one attribute per line"
 msgstr "Optionnel, un attribut par ligne"
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "Group Display Name Field"
 msgstr "Champ \"nom d'affichage\" du groupe"
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 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:49
+#: templates/settings.php:73
 msgid "Base Group Tree"
 msgstr "DN racine de l'arbre groupes"
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "One Group Base DN per line"
 msgstr "Un DN racine groupe par ligne"
 
-#: templates/settings.php:50
+#: templates/settings.php:74
 msgid "Group Search Attributes"
 msgstr "Recherche des attributs du groupe"
 
-#: templates/settings.php:51
+#: templates/settings.php:75
 msgid "Group-Member association"
 msgstr "Association groupe-membre"
 
-#: templates/settings.php:53
+#: templates/settings.php:77
 msgid "Special Attributes"
 msgstr "Attributs spéciaux"
 
-#: templates/settings.php:56
+#: templates/settings.php:79
+msgid "Quota Field"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Quota Default"
+msgstr ""
+
+#: templates/settings.php:80
 msgid "in bytes"
 msgstr "en octets"
 
-#: templates/settings.php:58
+#: templates/settings.php:81
+msgid "Email Field"
+msgstr ""
+
+#: templates/settings.php:82
+msgid "User Home Folder Naming Rule"
+msgstr ""
+
+#: templates/settings.php:82
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Laisser vide "
 
-#: templates/settings.php:62
+#: templates/settings.php:86
+msgid "Test Configuration"
+msgstr ""
+
+#: templates/settings.php:86
 msgid "Help"
 msgstr "Aide"
diff --git a/l10n/gl/core.po b/l10n/gl/core.po
index 15c7556ce015281390f4cc48403b7771abeb68cb..20bf7af29eed21fd6261ec6e4a4b199eeb0fde9f 100644
--- a/l10n/gl/core.po
+++ b/l10n/gl/core.po
@@ -4,15 +4,16 @@
 # 
 # Translators:
 # antiparvos  <marcoslansgarza@gmail.com>, 2012.
+#  <mbouzada@gmail.com>, 2013.
 #   <mbouzada@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-02-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 14:32+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:20+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"
@@ -55,7 +56,7 @@ msgstr "Sen categoría que engadir?"
 #: ajax/vcategories/add.php:37
 #, php-format
 msgid "This category already exists: %s"
-msgstr ""
+msgstr "Esta categoría xa existe: %s"
 
 #: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
 #: ajax/vcategories/favorites.php:24
@@ -256,7 +257,7 @@ msgstr "Non está instalado o ficheiro {file} que se precisa"
 
 #: js/share.js:29 js/share.js:43 js/share.js:90
 msgid "Shared"
-msgstr ""
+msgstr "Compartir"
 
 #: js/share.js:93
 msgid "Share"
@@ -383,13 +384,13 @@ msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
 "href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
 "community</a>."
-msgstr ""
+msgstr "A actualización non foi satisfactoria, informe deste problema á  <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">comunidade de ownCloud</a>."
 
 #: js/update.js:18
 msgid "The update was successful. Redirecting you to ownCloud now."
-msgstr ""
+msgstr "A actualización realizouse correctamente. Redirixíndoo agora á ownCloud."
 
-#: lostpassword/controller.php:47
+#: lostpassword/controller.php:48
 msgid "ownCloud password reset"
 msgstr "Restabelecer o contrasinal de ownCloud"
 
@@ -490,14 +491,14 @@ msgstr "Sen un xerador seguro de números ao chou podería acontecer que predici
 msgid ""
 "Your data directory and files are probably accessible from the internet "
 "because the .htaccess file does not work."
-msgstr ""
+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
 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 "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
 msgid "Create an <strong>admin account</strong>"
@@ -580,7 +581,7 @@ msgstr "Conectar"
 
 #: templates/login.php:49
 msgid "Alternative Logins"
-msgstr ""
+msgstr "Accesos alternativos"
 
 #: templates/part.pagenavi.php:3
 msgid "prev"
diff --git a/l10n/gl/files.po b/l10n/gl/files.po
index e00e1c1134e2df8b19354d6487980d56d1e41b43..49b778b128480d7df3959ec8a4e49f119716cc24 100644
--- a/l10n/gl/files.po
+++ b/l10n/gl/files.po
@@ -4,14 +4,16 @@
 # 
 # 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.
 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 23:05+0000\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: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
@@ -53,27 +55,27 @@ msgid ""
 "the HTML form"
 msgstr "O ficheiro enviado excede a directiva MAX_FILE_SIZE que foi indicada no formulario HTML"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
 msgstr "O ficheiro enviado foi só parcialmente enviado"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:31
 msgid "No file was uploaded"
 msgstr "Non se enviou ningún ficheiro"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:32
 msgid "Missing a temporary folder"
 msgstr "Falta un cartafol temporal"
 
-#: ajax/upload.php:34
+#: ajax/upload.php:33
 msgid "Failed to write to disk"
 msgstr "Produciuse un erro ao escribir no disco"
 
-#: ajax/upload.php:52
+#: ajax/upload.php:51
 msgid "Not enough storage available"
 msgstr "Non hai espazo de almacenamento abondo"
 
-#: ajax/upload.php:83
+#: ajax/upload.php:82
 msgid "Invalid directory."
 msgstr "O directorio é incorrecto."
 
@@ -85,7 +87,7 @@ msgstr "Ficheiros"
 msgid "Delete permanently"
 msgstr "Eliminar permanentemente"
 
-#: js/fileactions.js:127 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:127 templates/index.php:92 templates/index.php:93
 msgid "Delete"
 msgstr "Eliminar"
 
@@ -93,40 +95,36 @@ msgstr "Eliminar"
 msgid "Rename"
 msgstr "Renomear"
 
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
 msgid "Pending"
 msgstr "Pendentes"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "{new_name} already exists"
-msgstr "xa existe un {new_name}"
+msgstr "Xa existe un {new_name}"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "replace"
 msgstr "substituír"
 
-#: js/filelist.js:253
+#: js/filelist.js:251
 msgid "suggest name"
 msgstr "suxerir nome"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "cancel"
 msgstr "cancelar"
 
-#: js/filelist.js:295
-msgid "replaced {new_name}"
-msgstr "substituír {new_name}"
+#: js/filelist.js:298
+msgid "replaced {new_name} with {old_name}"
+msgstr "substituír {new_name} por {old_name}"
 
-#: js/filelist.js:295 js/filelist.js:297
+#: js/filelist.js:298
 msgid "undo"
 msgstr "desfacer"
 
-#: js/filelist.js:297
-msgid "replaced {new_name} with {old_name}"
-msgstr "substituír {new_name} por {old_name}"
-
-#: js/filelist.js:322
+#: js/filelist.js:323
 msgid "perform delete operation"
 msgstr "realizar a operación de eliminación"
 
@@ -152,74 +150,74 @@ 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:224
+#: js/files.js:225
 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:261
+#: js/files.js:262
 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:261
+#: js/files.js:262
 msgid "Upload Error"
 msgstr "Produciuse un erro no envío"
 
-#: js/files.js:272
+#: js/files.js:273
 msgid "Close"
 msgstr "Pechar"
 
-#: js/files.js:311
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr "Enviándose 1 ficheiro"
 
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr "Enviandose {count} ficheiros"
 
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "Envío cancelado."
 
-#: js/files.js:496
+#: js/files.js:497
 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:569
+#: js/files.js:570
 msgid "URL cannot be empty."
 msgstr "O URL non pode quedar baleiro."
 
-#: js/files.js:574
+#: js/files.js:575
 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:948 templates/index.php:67
+#: js/files.js:953 templates/index.php:68
 msgid "Name"
 msgstr "Nome"
 
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:954 templates/index.php:79
 msgid "Size"
 msgstr "Tamaño"
 
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:955 templates/index.php:81
 msgid "Modified"
 msgstr "Modificado"
 
-#: js/files.js:969
+#: js/files.js:974
 msgid "1 folder"
 msgstr "1 cartafol"
 
-#: js/files.js:971
+#: js/files.js:976
 msgid "{count} folders"
 msgstr "{count} cartafoles"
 
-#: js/files.js:979
+#: js/files.js:984
 msgid "1 file"
 msgstr "1 ficheiro"
 
-#: js/files.js:981
+#: js/files.js:986
 msgid "{count} files"
 msgstr "{count} ficheiros"
 
@@ -277,39 +275,43 @@ msgstr "Desde a ligazón"
 
 #: templates/index.php:40
 msgid "Deleted files"
-msgstr ""
+msgstr "Ficheiros eliminados"
 
 #: templates/index.php:46
 msgid "Cancel upload"
 msgstr "Cancelar o envío"
 
-#: templates/index.php:59
+#: templates/index.php:53
+msgid "You don’t have write permissions here."
+msgstr "Non ten permisos para escribir aquí."
+
+#: templates/index.php:60
 msgid "Nothing in here. Upload something!"
-msgstr "Aquí non hai nada por aquí. Envíe algo."
+msgstr "Aquí non hai nada. Envíe algo."
 
-#: templates/index.php:73
+#: templates/index.php:74
 msgid "Download"
 msgstr "Descargar"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:86 templates/index.php:87
 msgid "Unshare"
 msgstr "Deixar de compartir"
 
-#: templates/index.php:105
+#: templates/index.php:106
 msgid "Upload too large"
 msgstr "Envío demasiado grande"
 
-#: templates/index.php:107
+#: templates/index.php:108
 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:112
+#: templates/index.php:113
 msgid "Files are being scanned, please wait."
 msgstr "Estanse analizando os ficheiros. Agarde."
 
-#: templates/index.php:115
+#: templates/index.php:116
 msgid "Current scanning"
 msgstr "Análise actual"
 
diff --git a/l10n/gl/files_external.po b/l10n/gl/files_external.po
index c16b5b97935bfa496fb75141a6d5e4d467c955f7..eb74d6d40a1d9dddf0bbf1912129568676fb8404 100644
--- a/l10n/gl/files_external.po
+++ b/l10n/gl/files_external.po
@@ -3,14 +3,15 @@
 # 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-02-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 12:31+0000\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"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
@@ -19,37 +20,33 @@ msgstr ""
 "Language: gl\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 "Concedeuse acceso"
 
-#: 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 "Produciuse un erro ao configurar o almacenamento en Dropbox"
 
-#: 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 "Permitir o acceso"
 
-#: js/dropbox.js:73 js/google.js:72
-msgid "Fill out all required fields"
-msgstr "Cubrir todos os campos obrigatorios"
-
-#: js/dropbox.js:85
+#: js/dropbox.js:101
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr "Forneza unha chave correcta e segreda do Dropbox."
 
-#: 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 "Produciuse un erro ao configurar o almacenamento en Google Drive"
 
-#: lib/config.php:413
+#: lib/config.php:421
 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:414
+#: lib/config.php:424
 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 "
@@ -60,63 +57,63 @@ msgstr "<b>Aviso:</b> A compatibilidade de FTP en PHP non está activada ou inst
 msgid "External Storage"
 msgstr "Almacenamento externo"
 
-#: templates/settings.php:8 templates/settings.php:22
-msgid "Mount point"
-msgstr "Punto de montaxe"
-
-#: templates/settings.php:9
-msgid "Backend"
-msgstr "Infraestrutura"
+#: templates/settings.php:9 templates/settings.php:28
+msgid "Folder name"
+msgstr "Nome do cartafol"
 
 #: templates/settings.php:10
+msgid "External storage"
+msgstr "Almacenamento externo"
+
+#: templates/settings.php:11
 msgid "Configuration"
 msgstr "Configuración"
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid "Options"
 msgstr "Opcións"
 
-#: templates/settings.php:12
+#: templates/settings.php:13
 msgid "Applicable"
 msgstr "Aplicábel"
 
-#: templates/settings.php:27
-msgid "Add mount point"
-msgstr "Engadir un punto de montaxe"
+#: templates/settings.php:33
+msgid "Add storage"
+msgstr "Engadir almacenamento"
 
-#: templates/settings.php:85
+#: templates/settings.php:90
 msgid "None set"
 msgstr "Ningún definido"
 
-#: templates/settings.php:86
+#: templates/settings.php:91
 msgid "All Users"
 msgstr "Todos os usuarios"
 
-#: templates/settings.php:87
+#: templates/settings.php:92
 msgid "Groups"
 msgstr "Grupos"
 
-#: templates/settings.php:95
+#: templates/settings.php:100
 msgid "Users"
 msgstr "Usuarios"
 
-#: templates/settings.php:108 templates/settings.php:109
-#: templates/settings.php:144 templates/settings.php:145
+#: templates/settings.php:113 templates/settings.php:114
+#: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
 msgstr "Eliminar"
 
-#: templates/settings.php:124
+#: templates/settings.php:129
 msgid "Enable User External Storage"
 msgstr "Activar o almacenamento externo do usuario"
 
-#: templates/settings.php:125
+#: templates/settings.php:130
 msgid "Allow users to mount their own external storage"
 msgstr "Permitir aos usuarios montar os seus propios almacenamentos externos"
 
-#: templates/settings.php:136
+#: templates/settings.php:141
 msgid "SSL root certificates"
 msgstr "Certificados SSL root"
 
-#: templates/settings.php:153
+#: templates/settings.php:159
 msgid "Import Root Certificate"
 msgstr "Importar o certificado root"
diff --git a/l10n/gl/files_trashbin.po b/l10n/gl/files_trashbin.po
index 2f1e3e6d86c0eafe5e90f685f4f2a5b40509cc73..6f1595820d3a3c90db68942c48e8692e5fabdb51 100644
--- a/l10n/gl/files_trashbin.po
+++ b/l10n/gl/files_trashbin.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-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 10:07+0000\n"
-"Last-Translator: mbouzada <mbouzada@gmail.com>\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: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Language: gl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:22
+#: ajax/delete.php:40
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "Non foi posíbel eliminar %s permanente"
@@ -28,35 +28,39 @@ msgstr "Non foi posíbel eliminar %s permanente"
 msgid "Couldn't restore %s"
 msgstr "Non foi posíbel restaurar %s"
 
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
 msgid "perform restore operation"
 msgstr "realizar a operación de restauración"
 
-#: js/trash.js:33
+#: js/trash.js:34
 msgid "delete file permanently"
 msgstr "eliminar o ficheiro permanentemente"
 
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr "Eliminar permanentemente"
+
+#: js/trash.js:174 templates/index.php:17
 msgid "Name"
 msgstr "Nome"
 
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:175 templates/index.php:27
 msgid "Deleted"
 msgstr "Eliminado"
 
-#: js/trash.js:135
+#: js/trash.js:184
 msgid "1 folder"
 msgstr "1 cartafol"
 
-#: js/trash.js:137
+#: js/trash.js:186
 msgid "{count} folders"
 msgstr "{count} cartafoles"
 
-#: js/trash.js:145
+#: js/trash.js:194
 msgid "1 file"
 msgstr "1 ficheiro"
 
-#: js/trash.js:147
+#: js/trash.js:196
 msgid "{count} files"
 msgstr "{count} ficheiros"
 
@@ -67,3 +71,11 @@ msgstr "Aquí non hai nada. O cesto do lixo está baleiro!"
 #: templates/index.php:20 templates/index.php:22
 msgid "Restore"
 msgstr "Restablecer"
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr "Eliminar"
+
+#: templates/part.breadcrumb.php:9
+msgid "Deleted Files"
+msgstr ""
diff --git a/l10n/gl/files_versions.po b/l10n/gl/files_versions.po
index a468b7082b8bbdd7767de2e2a246deeb4f23a133..6c5d2ee8b43d7694a5bc57419d479ba57127026c 100644
--- a/l10n/gl/files_versions.po
+++ b/l10n/gl/files_versions.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:05+0100\n"
-"PO-Revision-Date: 2013-02-14 09:30+0000\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"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
@@ -52,18 +52,10 @@ msgstr "Non hai versións antigas dispoñíbeis"
 msgid "No path specified"
 msgstr "Non foi indicada a ruta"
 
-#: js/versions.js:16
-msgid "History"
-msgstr "Historial"
+#: js/versions.js:6
+msgid "Versions"
+msgstr "Versións"
 
 #: templates/history.php:20
 msgid "Revert a file to a previous version by clicking on its revert button"
 msgstr "Reverta un ficheiro a unha versión anterior premendo no botón reversión"
-
-#: templates/settings.php:3
-msgid "Files Versioning"
-msgstr "Sistema de versión de ficheiros"
-
-#: templates/settings.php:4
-msgid "Enable"
-msgstr "Activar"
diff --git a/l10n/gl/lib.po b/l10n/gl/lib.po
index e41f414f4e89ff5214e17b56a0595ab795ef4e24..6458c4cbfd39a9283a32986bc9af1a523bb82852 100644
--- a/l10n/gl/lib.po
+++ b/l10n/gl/lib.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-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 14:33+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "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"
@@ -21,27 +21,27 @@ msgstr ""
 "Language: gl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:339
+#: app.php:349
 msgid "Help"
 msgstr "Axuda"
 
-#: app.php:346
+#: app.php:362
 msgid "Personal"
 msgstr "Persoal"
 
-#: app.php:351
+#: app.php:373
 msgid "Settings"
 msgstr "Configuracións"
 
-#: app.php:356
+#: app.php:385
 msgid "Users"
 msgstr "Usuarios"
 
-#: app.php:363
+#: app.php:398
 msgid "Apps"
 msgstr "Aplicativos"
 
-#: app.php:365
+#: app.php:406
 msgid "Admin"
 msgstr "Administración"
 
@@ -51,17 +51,17 @@ msgstr "As descargas ZIP están desactivadas."
 
 #: files.php:203
 msgid "Files need to be downloaded one by one."
-msgstr "Os ficheiros necesitan seren descargados de un en un."
+msgstr "Os ficheiros necesitan seren descargados dun en un."
 
-#: files.php:203 files.php:228
+#: files.php:204 files.php:231
 msgid "Back to Files"
 msgstr "Volver aos ficheiros"
 
-#: files.php:227
+#: files.php:228
 msgid "Selected files too large to generate zip file."
 msgstr "Os ficheiros seleccionados son demasiado grandes como para xerar un ficheiro zip."
 
-#: helper.php:226
+#: helper.php:228
 msgid "couldn't be determined"
 msgstr "non foi posíbel determinalo"
 
@@ -91,97 +91,102 @@ msgstr "Imaxes"
 
 #: setup.php:34
 msgid "Set an admin username."
-msgstr ""
+msgstr "Estabeleza un nome de usuario administrador"
 
 #: setup.php:37
 msgid "Set an admin password."
-msgstr ""
+msgstr "Estabeleza un contrasinal de administrador"
 
 #: setup.php:40
 msgid "Specify a data folder."
-msgstr ""
+msgstr "Especifique un cartafol de datos."
 
-#: setup.php:53
+#: setup.php:55
 #, php-format
 msgid "%s enter the database username."
-msgstr ""
+msgstr "%s introduza o nome de usuario da base de datos"
 
-#: setup.php:56
+#: setup.php:58
 #, php-format
 msgid "%s enter the database name."
-msgstr ""
+msgstr "%s introduza o nome da base de datos"
 
-#: setup.php:59
+#: setup.php:61
 #, php-format
 msgid "%s you may not use dots in the database name"
-msgstr ""
+msgstr "%s non se poden empregar puntos na base de datos"
 
-#: setup.php:62
+#: setup.php:64
 #, php-format
 msgid "%s set the database host."
-msgstr ""
+msgstr "%s estabeleza o servidor da base de datos"
 
-#: setup.php:126 setup.php:291 setup.php:336
+#: setup.php:128 setup.php:320 setup.php:365
 msgid "PostgreSQL username and/or password not valid"
-msgstr ""
+msgstr "Nome de usuario e/ou contrasinal de PostgreSQL incorrecto"
 
-#: setup.php:127 setup.php:150 setup.php:204
+#: setup.php:129 setup.php:152 setup.php:229
 msgid "You need to enter either an existing account or the administrator."
-msgstr ""
+msgstr "Deberá introducir unha conta existente ou o administrador."
 
-#: setup.php:149 setup.php:423 setup.php:489
+#: setup.php:151 setup.php:453 setup.php:520
 msgid "Oracle username and/or password not valid"
-msgstr ""
+msgstr "Nome de usuario e/ou contrasinal de Oracle incorrecto"
 
-#: setup.php:203
+#: setup.php:228
 msgid "MySQL username and/or password not valid"
-msgstr ""
+msgstr "Nome de usuario e/ou contrasinal de MySQL incorrecto"
 
-#: setup.php:255 setup.php:357 setup.php:366 setup.php:384 setup.php:394
-#: setup.php:403 setup.php:430 setup.php:496 setup.php:522 setup.php:529
-#: setup.php:540 setup.php:547 setup.php:556 setup.php:564 setup.php:573
-#: setup.php:579
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
-msgstr ""
+msgstr "Produciuse un erro na base de datos: «%s»"
 
-#: setup.php:256 setup.php:358 setup.php:367 setup.php:385 setup.php:395
-#: setup.php:404 setup.php:431 setup.php:497 setup.php:523 setup.php:530
-#: setup.php:541 setup.php:557 setup.php:565 setup.php:574
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
-msgstr ""
+msgstr "A orde ofensiva foi: «%s»"
 
-#: setup.php:270
+#: setup.php:299
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
-msgstr ""
+msgstr "O usuario MySQL  '%s'@'localhost' xa existe."
 
-#: setup.php:271
+#: setup.php:300
 msgid "Drop this user from MySQL"
-msgstr ""
+msgstr "Omitir este usuario de MySQL"
 
-#: setup.php:276
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
-msgstr ""
+msgstr "O usuario MySQL «%s»@«%%» xa existe."
 
-#: setup.php:277
+#: setup.php:306
 msgid "Drop this user from MySQL."
-msgstr ""
+msgstr "Omitir este usuario de MySQL."
 
-#: setup.php:548 setup.php:580
+#: setup.php:579 setup.php:611
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
-msgstr ""
+msgstr "A orde ofensiva foi: «%s», nome: %s, contrasinal: %s"
+
+#: setup.php:631
+#, 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:644
+#: setup.php:849
 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:645
+#: setup.php:850
 #, 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>"
@@ -238,16 +243,16 @@ msgstr "último ano"
 msgid "years ago"
 msgstr "anos atrás"
 
-#: updater.php:75
+#: 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:77
+#: updater.php:81
 msgid "up to date"
-msgstr "ao día"
+msgstr "actualizado"
 
-#: updater.php:80
+#: updater.php:84
 msgid "updates check is disabled"
 msgstr "a comprobación de actualizacións está desactivada"
 
diff --git a/l10n/gl/settings.po b/l10n/gl/settings.po
index 0cfda9825141f01e07247e214c8575589f041402..f0b08fe277e338c5d533460c47632f0f719e67e4 100644
--- a/l10n/gl/settings.po
+++ b/l10n/gl/settings.po
@@ -4,15 +4,17 @@
 # 
 # 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.
 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 09:10+0000\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"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
@@ -25,14 +27,14 @@ 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:15
-#: ajax/togglegroups.php:18
+#: ajax/changedisplayname.php:23 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
 msgid "Unable to change display name"
-msgstr ""
+msgstr "Non é posíbel cambiar o nome visíbel"
 
 #: ajax/creategroup.php:10
 msgid "Group already exists"
@@ -74,12 +76,12 @@ msgstr "Petición incorrecta"
 msgid "Admins can't remove themself from the admin group"
 msgstr "Os administradores non poden eliminarse a si mesmos do grupo admin"
 
-#: ajax/togglegroups.php:28
+#: ajax/togglegroups.php:30
 #, php-format
 msgid "Unable to add user to group %s"
 msgstr "Non é posíbel engadir o usuario ao grupo %s"
 
-#: ajax/togglegroups.php:34
+#: ajax/togglegroups.php:36
 #, php-format
 msgid "Unable to remove user from group %s"
 msgstr "Non é posíbel eliminar o usuario do grupo %s"
@@ -120,7 +122,7 @@ msgstr "Erro"
 msgid "Updated"
 msgstr "Actualizado"
 
-#: js/personal.js:96
+#: js/personal.js:99
 msgid "Saving..."
 msgstr "Gardando..."
 
@@ -165,7 +167,7 @@ msgstr "Produciuse un erro ao crear o usuario"
 msgid "A valid password must be provided"
 msgstr "Debe fornecer un contrasinal"
 
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
 msgid "__language_name__"
 msgstr "Galego"
 
@@ -209,21 +211,21 @@ msgstr "Non se atopou o módulo de PHP «fileinfo». É recomendábel activar es
 
 #: templates/admin.php:58
 msgid "Locale not working"
-msgstr ""
+msgstr "A configuración rexional non funciona"
 
-#: templates/admin.php:61
+#: templates/admin.php:63
+#, php-format
 msgid ""
-"This ownCloud server can't set system locale to "
-"\"en_US.UTF-8\"/\"en_US.UTF8\". 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 en_US.UTF-8/en_US.UTF8."
-msgstr ""
+"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 non pode estabelecer a configuración rexional do sistema a %s. Isto significa que pode haber problemas con certos caracteres nos nomes de ficheiro. Recomendámoslle que inste os paquetes necesarios no sistema para aceptar o %s."
 
-#: templates/admin.php:72
+#: templates/admin.php:75
 msgid "Internet connection not working"
-msgstr ""
+msgstr "A conexión á Internet non funciona"
 
-#: templates/admin.php:75
+#: 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 "
@@ -231,100 +233,100 @@ 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 "Este servidor ownCloud non ten conexión a Internet. Isto significa que algunhas das funcionalidades como a montaxe de almacenamento externo, as notificacións sobre actualizacións ou instalación de aplicativos de terceiros non funcionan. O acceso aos ficheiros de forma remota e o envío de mensaxes de notificación poderían non funcionar. Suxerímoslle que active a conexión a Internet deste servidor se quere dispor de todas as funcionalidades de ownCloud."
 
-#: templates/admin.php:89
+#: templates/admin.php:92
 msgid "Cron"
-msgstr ""
+msgstr "Cron"
 
-#: templates/admin.php:98
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr "Executar unha tarefa con cada páxina cargada"
 
-#: templates/admin.php:108
+#: 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 está rexistrado nun servizo de WebCron. Chame á página cron.php na raíz ownCloud unha vez por minuto a través de HTTP."
 
-#: templates/admin.php:118
+#: 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 "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."
 
-#: templates/admin.php:125
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr "Compartindo"
 
-#: templates/admin.php:131
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr "Activar o API para compartir"
 
-#: templates/admin.php:132
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr "Permitir que os aplicativos empreguen o API para compartir"
 
-#: templates/admin.php:139
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr "Permitir ligazóns"
 
-#: templates/admin.php:140
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr "Permitir que os usuarios compartan elementos ao público con ligazóns"
 
-#: templates/admin.php:147
+#: templates/admin.php:150
 msgid "Allow resharing"
 msgstr "Permitir compartir"
 
-#: templates/admin.php:148
+#: templates/admin.php:151
 msgid "Allow users to share items shared with them again"
 msgstr "Permitir que os usuarios compartan de novo os elementos compartidos con eles"
 
-#: templates/admin.php:155
+#: templates/admin.php:158
 msgid "Allow users to share with anyone"
 msgstr "Permitir que os usuarios compartan con calquera"
 
-#: templates/admin.php:158
+#: templates/admin.php:161
 msgid "Allow users to only share with users in their groups"
 msgstr "Permitir que os usuarios compartan só cos usuarios dos seus grupos"
 
-#: templates/admin.php:165
+#: templates/admin.php:168
 msgid "Security"
 msgstr "Seguranza"
 
-#: templates/admin.php:178
+#: templates/admin.php:181
 msgid "Enforce HTTPS"
 msgstr "Forzar HTTPS"
 
-#: templates/admin.php:179
+#: templates/admin.php:182
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr "Forzar que os clientes se conecten a ownCloud empregando unha conexión cifrada"
 
-#: templates/admin.php:182
+#: templates/admin.php:185
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr "Conectese a esta instancia ownCloud empregando HTTPS para activar ou desactivar o forzado de SSL."
 
-#: templates/admin.php:192
+#: templates/admin.php:195
 msgid "Log"
 msgstr "Rexistro"
 
-#: templates/admin.php:193
+#: templates/admin.php:196
 msgid "Log level"
 msgstr "Nivel de rexistro"
 
-#: templates/admin.php:220
+#: templates/admin.php:223
 msgid "More"
 msgstr "Máis"
 
-#: templates/admin.php:227 templates/personal.php:98
+#: templates/admin.php:230 templates/personal.php:102
 msgid "Version"
 msgstr "Versión"
 
-#: templates/admin.php:230 templates/personal.php:100
+#: templates/admin.php:233 templates/personal.php:105
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -334,51 +336,51 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "Desenvolvido pola <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidade ownCloud</a>, o <a href=\"https://github.com/owncloud\" target=\"_blank\">código fonte</a> está baixo a licenza <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
-#: templates/apps.php:10
+#: templates/apps.php:11
 msgid "Add your App"
 msgstr "Engada o seu aplicativo"
 
-#: templates/apps.php:11
+#: templates/apps.php:12
 msgid "More Apps"
 msgstr "Máis aplicativos"
 
-#: templates/apps.php:24
+#: templates/apps.php:28
 msgid "Select an App"
 msgstr "Escolla un aplicativo"
 
-#: templates/apps.php:28
+#: templates/apps.php:34
 msgid "See application page at apps.owncloud.com"
 msgstr "Consulte a páxina do aplicativo en apps.owncloud.com"
 
-#: templates/apps.php:29
+#: templates/apps.php:36
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-licenciado por<span class=\"author\"></span>"
 
-#: templates/apps.php:31
+#: templates/apps.php:38
 msgid "Update"
 msgstr "Actualizar"
 
-#: templates/help.php:3
+#: templates/help.php:4
 msgid "User Documentation"
 msgstr "Documentación do usuario"
 
-#: templates/help.php:4
+#: templates/help.php:6
 msgid "Administrator Documentation"
 msgstr "Documentación do administrador"
 
-#: templates/help.php:6
+#: templates/help.php:9
 msgid "Online Documentation"
 msgstr "Documentación na Rede"
 
-#: templates/help.php:7
+#: templates/help.php:11
 msgid "Forum"
 msgstr "Foro"
 
-#: templates/help.php:9
+#: templates/help.php:14
 msgid "Bugtracker"
 msgstr "Seguemento de fallos"
 
-#: templates/help.php:11
+#: templates/help.php:17
 msgid "Commercial Support"
 msgstr "Asistencia comercial"
 
@@ -387,79 +389,79 @@ msgstr "Asistencia comercial"
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Ten en uso <strong>%s</strong> do total dispoñíbel de <strong>%s</strong>"
 
-#: templates/personal.php:14
+#: templates/personal.php:15
 msgid "Get the apps to sync your files"
 msgstr "Obteña os aplicativos para sincronizar os seus ficheiros"
 
-#: templates/personal.php:25
+#: templates/personal.php:26
 msgid "Show First Run Wizard again"
 msgstr "Amosar o axudante da primeira execución outra vez"
 
-#: templates/personal.php:36 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
 msgid "Password"
 msgstr "Contrasinal"
 
-#: templates/personal.php:37
+#: templates/personal.php:38
 msgid "Your password was changed"
 msgstr "O seu contrasinal foi cambiado"
 
-#: templates/personal.php:38
+#: templates/personal.php:39
 msgid "Unable to change your password"
 msgstr "Non é posíbel cambiar o seu contrasinal"
 
-#: templates/personal.php:39
+#: templates/personal.php:40
 msgid "Current password"
 msgstr "Contrasinal actual"
 
-#: templates/personal.php:40
+#: templates/personal.php:42
 msgid "New password"
 msgstr "Novo contrasinal"
 
-#: templates/personal.php:42
+#: templates/personal.php:44
 msgid "Change password"
 msgstr "Cambiar o contrasinal"
 
-#: templates/personal.php:54 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:78
 msgid "Display Name"
 msgstr "Amosar o nome"
 
-#: templates/personal.php:55
+#: templates/personal.php:57
 msgid "Your display name was changed"
-msgstr ""
+msgstr "O seu nome visíbel foi cambiado"
 
-#: templates/personal.php:56
+#: templates/personal.php:58
 msgid "Unable to change your display name"
-msgstr ""
+msgstr "Non é posíbel cambiar o seu nome visíbel"
 
-#: templates/personal.php:59
+#: templates/personal.php:61
 msgid "Change display name"
-msgstr ""
+msgstr "Cambiar o nome visíbel"
 
-#: templates/personal.php:68
+#: templates/personal.php:70
 msgid "Email"
 msgstr "Correo"
 
-#: templates/personal.php:69
+#: templates/personal.php:72
 msgid "Your email address"
 msgstr "O seu enderezo de correo"
 
-#: templates/personal.php:70
+#: templates/personal.php:73
 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:76 templates/personal.php:77
+#: templates/personal.php:79 templates/personal.php:80
 msgid "Language"
 msgstr "Idioma"
 
-#: templates/personal.php:82
+#: templates/personal.php:86
 msgid "Help translate"
 msgstr "Axude na tradución"
 
-#: templates/personal.php:87
+#: templates/personal.php:91
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:89
+#: templates/personal.php:93
 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"
 
@@ -489,7 +491,7 @@ msgstr "Almacenamento"
 
 #: templates/users.php:95
 msgid "change display name"
-msgstr ""
+msgstr "cambiar o nome visíbel"
 
 #: templates/users.php:99
 msgid "set new password"
diff --git a/l10n/gl/user_ldap.po b/l10n/gl/user_ldap.po
index 62e23bcad3c185c5429bf6cb218a274b8a40c472..d47dc01f9f8698c461a743aec4424f0bd6df49e3 100644
--- a/l10n/gl/user_ldap.po
+++ b/l10n/gl/user_ldap.po
@@ -3,15 +3,18 @@
 # 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.
 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 12:47+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-03-03 00:05+0100\n"
+"PO-Revision-Date: 2013-03-02 08:50+0000\n"
+"Last-Translator: mbouzada <mbouzada@gmail.com>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,23 +24,23 @@ msgstr ""
 
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
-msgstr ""
+msgstr "Non foi posíbel eliminar a configuración do servidor"
 
-#: ajax/testConfiguration.php:35
+#: ajax/testConfiguration.php:36
 msgid "The configuration is valid and the connection could be established!"
-msgstr ""
+msgstr "A configuración é correcta e pode estabelecerse a conexión."
 
-#: ajax/testConfiguration.php:37
+#: ajax/testConfiguration.php:39
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
-msgstr ""
+msgstr "A configuración é correcta, mais a ligazón non. Comprobe a configuración do servidor e as credenciais."
 
-#: ajax/testConfiguration.php:40
+#: ajax/testConfiguration.php:43
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
-msgstr ""
+msgstr "A configuración non é correcta. Vexa o rexistro de ownCloud para máis detalles"
 
 #: js/settings.js:66
 msgid "Deletion failed"
@@ -45,31 +48,31 @@ msgstr "Fallou o borrado"
 
 #: js/settings.js:82
 msgid "Take over settings from recent server configuration?"
-msgstr ""
+msgstr "Tomar os recentes axustes de configuración do servidor?"
 
 #: js/settings.js:83
 msgid "Keep settings?"
-msgstr ""
+msgstr "Manter os axustes?"
 
 #: js/settings.js:97
 msgid "Cannot add server configuration"
-msgstr ""
+msgstr "Non é posíbel engadir a configuración do servidor"
 
 #: js/settings.js:121
 msgid "Connection test succeeded"
-msgstr ""
+msgstr "A proba de conexión foi satisfactoria"
 
 #: js/settings.js:126
 msgid "Connection test failed"
-msgstr ""
+msgstr "A proba de conexión fracasou"
 
 #: js/settings.js:136
 msgid "Do you really want to delete the current Server Configuration?"
-msgstr ""
+msgstr "Confirma que quere eliminar a configuración actual do servidor?"
 
 #: js/settings.js:137
 msgid "Confirm Deletion"
-msgstr ""
+msgstr "Confirmar a eliminación"
 
 #: templates/settings.php:8
 msgid ""
@@ -82,230 +85,254 @@ msgstr "<b>Aviso:</b> Os aplicativos user_ldap e user_webdavauth son incompatíb
 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>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
 msgid "Server configuration"
-msgstr ""
+msgstr "Configuración do servidor"
 
-#: templates/settings.php:17
+#: templates/settings.php:18
 msgid "Add Server Configuration"
-msgstr ""
+msgstr "Engadir a configuración do servidor"
 
-#: templates/settings.php:21
+#: templates/settings.php:23
 msgid "Host"
 msgstr "Servidor"
 
-#: templates/settings.php:21
+#: templates/settings.php:25
 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:22
+#: templates/settings.php:26
 msgid "Base DN"
 msgstr "DN base"
 
-#: templates/settings.php:22
+#: templates/settings.php:27
 msgid "One Base DN per line"
-msgstr ""
+msgstr "Un DN base por liña"
 
-#: templates/settings.php:22
+#: templates/settings.php:28
 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:23
+#: templates/settings.php:30
 msgid "User DN"
 msgstr "DN do usuario"
 
-#: templates/settings.php:23
+#: templates/settings.php:32
 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:24
+#: templates/settings.php:33
 msgid "Password"
 msgstr "Contrasinal"
 
-#: templates/settings.php:24
+#: templates/settings.php:36
 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:25
+#: templates/settings.php:37
 msgid "User Login Filter"
 msgstr "Filtro de acceso de usuarios"
 
-#: templates/settings.php:25
+#: templates/settings.php:40
 #, 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:25
+#: templates/settings.php:41
 #, 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:26
+#: templates/settings.php:42
 msgid "User List Filter"
 msgstr "Filtro da lista de usuarios"
 
-#: templates/settings.php:26
+#: templates/settings.php:45
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Define o filtro a aplicar cando se recompilan os usuarios."
 
-#: templates/settings.php:26
+#: templates/settings.php:46
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "sen ningunha marca de posición, como p.ex «objectClass=persoa»."
 
-#: templates/settings.php:27
+#: templates/settings.php:47
 msgid "Group Filter"
 msgstr "Filtro de grupo"
 
-#: templates/settings.php:27
+#: templates/settings.php:50
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Define o filtro a aplicar cando se recompilan os grupos."
 
-#: templates/settings.php:27
+#: templates/settings.php:51
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "sen ningunha marca de posición, como p.ex «objectClass=grupoPosix»."
 
-#: templates/settings.php:31
+#: templates/settings.php:55
 msgid "Connection Settings"
-msgstr ""
+msgstr "Axustes da conexión"
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "Configuration Active"
-msgstr ""
+msgstr "Configuración activa"
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "When unchecked, this configuration will be skipped."
-msgstr ""
+msgstr "Se está sen marcar, omítese esta configuración."
 
-#: templates/settings.php:34
+#: templates/settings.php:58
 msgid "Port"
 msgstr "Porto"
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid "Backup (Replica) Host"
-msgstr ""
+msgstr "Servidor da copia de seguranza (Réplica)"
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
-msgstr ""
+msgstr "Indicar un servidor de copia de seguranza opcional. Debe ser unha réplica do servidor principal LDAP/AD."
 
-#: templates/settings.php:36
+#: templates/settings.php:60
 msgid "Backup (Replica) Port"
-msgstr ""
+msgstr "Porto da copia de seguranza (Réplica)"
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "Disable Main Server"
-msgstr ""
+msgstr "Desactivar o servidor principal"
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "When switched on, ownCloud will only connect to the replica server."
-msgstr ""
+msgstr "Cando está activado, ownCloud só se conectará ao servidor de réplica."
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Use TLS"
 msgstr "Usar TLS"
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Do not use it additionally for LDAPS connections, it will fail."
-msgstr ""
+msgstr "Non utilizalo ademais para conexións LDAPS xa que fallará."
 
-#: templates/settings.php:39
+#: templates/settings.php:63
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Servidor LDAP que non distingue entre maiúsculas e minúsculas (Windows)"
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid "Turn off SSL certificate validation."
 msgstr "Desactiva a validación do certificado SSL."
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 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 importa o certificado SSL do servidor LDAP no seu servidor ownCloud."
+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:40
+#: templates/settings.php:64
 msgid "Not recommended, use for testing only."
 msgstr "Non se recomenda. Só para probas."
 
-#: templates/settings.php:41
+#: templates/settings.php:65
+msgid "Cache Time-To-Live"
+msgstr "Tempo de persistencia da caché"
+
+#: templates/settings.php:65
 msgid "in seconds. A change empties the cache."
 msgstr "en segundos. Calquera cambio baleira a caché."
 
-#: templates/settings.php:43
+#: templates/settings.php:67
 msgid "Directory Settings"
-msgstr ""
+msgstr "Axustes do directorio"
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "User Display Name Field"
 msgstr "Campo de mostra do nome de usuario"
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 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:46
+#: templates/settings.php:70
 msgid "Base User Tree"
 msgstr "Base da árbore de usuarios"
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "One User Base DN per line"
-msgstr ""
+msgstr "Un DN base de usuario por liña"
 
-#: templates/settings.php:47
+#: templates/settings.php:71
 msgid "User Search Attributes"
-msgstr ""
+msgstr "Atributos de busca do usuario"
 
-#: templates/settings.php:47 templates/settings.php:50
+#: templates/settings.php:71 templates/settings.php:74
 msgid "Optional; one attribute per line"
-msgstr ""
+msgstr "Opcional; un atributo por liña"
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "Group Display Name Field"
 msgstr "Campo de mostra do nome de grupo"
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 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:49
+#: templates/settings.php:73
 msgid "Base Group Tree"
 msgstr "Base da árbore de grupo"
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "One Group Base DN per line"
-msgstr ""
+msgstr "Un DN base de grupo por liña"
 
-#: templates/settings.php:50
+#: templates/settings.php:74
 msgid "Group Search Attributes"
-msgstr ""
+msgstr "Atributos de busca do grupo"
 
-#: templates/settings.php:51
+#: templates/settings.php:75
 msgid "Group-Member association"
 msgstr "Asociación de grupos e membros"
 
-#: templates/settings.php:53
+#: templates/settings.php:77
 msgid "Special Attributes"
-msgstr ""
+msgstr "Atributos especiais"
+
+#: templates/settings.php:79
+msgid "Quota Field"
+msgstr "Campo de cota"
+
+#: templates/settings.php:80
+msgid "Quota Default"
+msgstr "Cota predeterminada"
 
-#: templates/settings.php:56
+#: templates/settings.php:80
 msgid "in bytes"
 msgstr "en bytes"
 
-#: templates/settings.php:58
+#: templates/settings.php:81
+msgid "Email Field"
+msgstr "Campo do correo"
+
+#: templates/settings.php:82
+msgid "User Home Folder Naming Rule"
+msgstr "Regra de nomeado do cartafol do usuario"
+
+#: templates/settings.php:82
 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:62
+#: templates/settings.php:86
+msgid "Test Configuration"
+msgstr "Probar a configuración"
+
+#: templates/settings.php:86
 msgid "Help"
 msgstr "Axuda"
diff --git a/l10n/he/core.po b/l10n/he/core.po
index a1478aafdaf9096db6b7b6478611bc2bf452701b..612d193348fdc3838fa007a2acff48613bc10430 100644
--- a/l10n/he/core.po
+++ b/l10n/he/core.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-02-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 14:31+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "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"
@@ -22,24 +22,24 @@ msgstr ""
 "Language: he\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 "
@@ -57,7 +57,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
@@ -85,79 +85,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 "דצמבר"
 
@@ -258,7 +258,7 @@ msgstr "הקובץ הנדרש {file} אינו מותקן!"
 
 #: js/share.js:29 js/share.js:43 js/share.js:90
 msgid "Shared"
-msgstr ""
+msgstr "שותף"
 
 #: js/share.js:93
 msgid "Share"
@@ -296,7 +296,7 @@ msgstr "שיתוף עם קישור"
 msgid "Password protect"
 msgstr "הגנה בססמה"
 
-#: js/share.js:185 templates/installation.php:44 templates/login.php:35
+#: js/share.js:185 templates/installation.php:46 templates/login.php:35
 msgid "Password"
 msgstr "ססמה"
 
@@ -385,13 +385,13 @@ msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
 "href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
 "community</a>."
-msgstr ""
+msgstr "תהליך העדכון לא הושלם בהצלחה. נא דווח את הבעיה ב<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:47
+#: lostpassword/controller.php:48
 msgid "ownCloud password reset"
 msgstr "איפוס הססמה של ownCloud"
 
@@ -411,7 +411,7 @@ msgstr "איפוס שליחת דוא״ל."
 msgid "Request failed!"
 msgstr "הבקשה נכשלה!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:39
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:40
 #: templates/login.php:28
 msgid "Username"
 msgstr "שם משתמש"
@@ -492,65 +492,65 @@ msgstr "ללא מחולל מספרים אקראיים מאובטח תוקף יכ
 msgid ""
 "Your data directory and files are probably accessible from the internet "
 "because the .htaccess file does not work."
-msgstr ""
+msgstr "תיקיית וקבצי המידע שלך כנראה נגישים מהאינטרנט מכיוון שקובץ ה.htaccess לא עובד."
 
 #: templates/installation.php:32
 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
 msgid "Create an <strong>admin account</strong>"
 msgstr "יצירת <strong>חשבון מנהל</strong>"
 
-#: templates/installation.php:52
+#: templates/installation.php:54
 msgid "Advanced"
 msgstr "מתקדם"
 
-#: templates/installation.php:54
+#: templates/installation.php:56
 msgid "Data folder"
 msgstr "תיקיית נתונים"
 
-#: templates/installation.php:61
+#: templates/installation.php:65
 msgid "Configure the database"
 msgstr "הגדרת מסד הנתונים"
 
-#: templates/installation.php:66 templates/installation.php:77
-#: templates/installation.php:87 templates/installation.php:97
+#: templates/installation.php:70 templates/installation.php:82
+#: templates/installation.php:93 templates/installation.php:104
 msgid "will be used"
 msgstr "ינוצלו"
 
-#: templates/installation.php:109
+#: templates/installation.php:117
 msgid "Database user"
 msgstr "שם משתמש במסד הנתונים"
 
-#: templates/installation.php:113
+#: templates/installation.php:122
 msgid "Database password"
 msgstr "ססמת מסד הנתונים"
 
-#: templates/installation.php:117
+#: templates/installation.php:127
 msgid "Database name"
 msgstr "שם מסד הנתונים"
 
-#: templates/installation.php:125
+#: templates/installation.php:137
 msgid "Database tablespace"
 msgstr "מרחב הכתובות של מסד הנתונים"
 
-#: templates/installation.php:131
+#: templates/installation.php:144
 msgid "Database host"
 msgstr "שרת בסיס נתונים"
 
-#: templates/installation.php:136
+#: templates/installation.php:150
 msgid "Finish setup"
 msgstr "סיום התקנה"
 
-#: templates/layout.guest.php:33
+#: templates/layout.guest.php:35
 msgid "web services under your control"
 msgstr "שירותי רשת בשליטתך"
 
-#: templates/layout.user.php:48
+#: templates/layout.user.php:53
 msgid "Log out"
 msgstr "התנתקות"
 
@@ -582,7 +582,7 @@ msgstr "כניסה"
 
 #: templates/login.php:49
 msgid "Alternative Logins"
-msgstr ""
+msgstr "כניסות אלטרנטיביות"
 
 #: templates/part.pagenavi.php:3
 msgid "prev"
diff --git a/l10n/he/files.po b/l10n/he/files.po
index 9b9bb1c34f5d19d61f09ba9073b3e4b99f6e39df..16161d70681019e42c26e61a947e7c535af43d05 100644
--- a/l10n/he/files.po
+++ b/l10n/he/files.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\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: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -54,27 +54,27 @@ msgid ""
 "the HTML form"
 msgstr "הקובץ שהועלה חרג מההנחיה MAX_FILE_SIZE שצוינה בטופס ה־HTML"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
 msgstr "הקובץ שהועלה הועלה בצורה חלקית"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:31
 msgid "No file was uploaded"
 msgstr "לא הועלו קבצים"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:32
 msgid "Missing a temporary folder"
 msgstr "תיקייה זמנית חסרה"
 
-#: ajax/upload.php:34
+#: ajax/upload.php:33
 msgid "Failed to write to disk"
 msgstr "הכתיבה לכונן נכשלה"
 
-#: ajax/upload.php:52
+#: ajax/upload.php:51
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:83
+#: ajax/upload.php:82
 msgid "Invalid directory."
 msgstr ""
 
@@ -84,9 +84,9 @@ msgstr "קבצים"
 
 #: js/fileactions.js:125
 msgid "Delete permanently"
-msgstr ""
+msgstr "מחק לצמיתות"
 
-#: js/fileactions.js:127 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:127 templates/index.php:92 templates/index.php:93
 msgid "Delete"
 msgstr "מחיקה"
 
@@ -94,40 +94,36 @@ msgstr "מחיקה"
 msgid "Rename"
 msgstr "שינוי שם"
 
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
 msgid "Pending"
 msgstr "ממתין"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "{new_name} already exists"
 msgstr "{new_name} כבר קיים"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "replace"
 msgstr "החלפה"
 
-#: js/filelist.js:253
+#: js/filelist.js:251
 msgid "suggest name"
 msgstr "הצעת שם"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "cancel"
 msgstr "ביטול"
 
-#: js/filelist.js:295
-msgid "replaced {new_name}"
-msgstr "{new_name} הוחלף"
+#: js/filelist.js:298
+msgid "replaced {new_name} with {old_name}"
+msgstr "{new_name} הוחלף ב־{old_name}"
 
-#: js/filelist.js:295 js/filelist.js:297
+#: js/filelist.js:298
 msgid "undo"
 msgstr "ביטול"
 
-#: js/filelist.js:297
-msgid "replaced {new_name} with {old_name}"
-msgstr "{new_name} הוחלף ב־{old_name}"
-
-#: js/filelist.js:322
+#: js/filelist.js:323
 msgid "perform delete operation"
 msgstr ""
 
@@ -153,74 +149,74 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:224
+#: js/files.js:225
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:261
+#: js/files.js:262
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "לא יכול להעלות את הקובץ מכיוון שזו תקיה או שמשקל הקובץ 0 בתים"
 
-#: js/files.js:261
+#: js/files.js:262
 msgid "Upload Error"
 msgstr "שגיאת העלאה"
 
-#: js/files.js:272
+#: js/files.js:273
 msgid "Close"
 msgstr "סגירה"
 
-#: js/files.js:311
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr "קובץ אחד נשלח"
 
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr "{count} קבצים נשלחים"
 
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "ההעלאה בוטלה."
 
-#: js/files.js:496
+#: js/files.js:497
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "מתבצעת כעת העלאת קבצים. עזיבה של העמוד תבטל את ההעלאה."
 
-#: js/files.js:569
+#: js/files.js:570
 msgid "URL cannot be empty."
 msgstr "קישור אינו יכול להיות ריק."
 
-#: js/files.js:574
+#: js/files.js:575
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:953 templates/index.php:68
 msgid "Name"
 msgstr "שם"
 
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:954 templates/index.php:79
 msgid "Size"
 msgstr "גודל"
 
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:955 templates/index.php:81
 msgid "Modified"
 msgstr "זמן שינוי"
 
-#: js/files.js:969
+#: js/files.js:974
 msgid "1 folder"
 msgstr "תיקייה אחת"
 
-#: js/files.js:971
+#: js/files.js:976
 msgid "{count} folders"
 msgstr "{count} תיקיות"
 
-#: js/files.js:979
+#: js/files.js:984
 msgid "1 file"
 msgstr "קובץ אחד"
 
-#: js/files.js:981
+#: js/files.js:986
 msgid "{count} files"
 msgstr "{count} קבצים"
 
@@ -284,33 +280,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr "ביטול ההעלאה"
 
-#: templates/index.php:59
+#: templates/index.php:53
+msgid "You don’t have write permissions here."
+msgstr ""
+
+#: templates/index.php:60
 msgid "Nothing in here. Upload something!"
 msgstr "אין כאן שום דבר. אולי ברצונך להעלות משהו?"
 
-#: templates/index.php:73
+#: templates/index.php:74
 msgid "Download"
 msgstr "הורדה"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:86 templates/index.php:87
 msgid "Unshare"
 msgstr "הסר שיתוף"
 
-#: templates/index.php:105
+#: templates/index.php:106
 msgid "Upload too large"
 msgstr "העלאה גדולה מידי"
 
-#: templates/index.php:107
+#: templates/index.php:108
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "הקבצים שניסית להעלות חרגו מהגודל המקסימלי להעלאת קבצים על שרת זה."
 
-#: templates/index.php:112
+#: templates/index.php:113
 msgid "Files are being scanned, please wait."
 msgstr "הקבצים נסרקים, נא להמתין."
 
-#: templates/index.php:115
+#: templates/index.php:116
 msgid "Current scanning"
 msgstr "הסריקה הנוכחית"
 
diff --git a/l10n/he/files_external.po b/l10n/he/files_external.po
index 091bf8989260aa24a060205147f5cb44119ef6f3..ae9da0cff3937cc6b7ffe2651f50de000e473d88 100644
--- a/l10n/he/files_external.po
+++ b/l10n/he/files_external.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-11 23:22+0000\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"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -19,37 +19,33 @@ msgstr ""
 "Language: he\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 "אירעה שגיאה בעת הגדרת אחסון ב־Dropbox"
 
-#: 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 "נא לספק קוד יישום וסוד תקניים של Dropbox."
 
-#: 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 "אירעה שגיאה בעת הגדרת אחסון ב־Google Drive"
 
-#: lib/config.php:434
+#: lib/config.php:421
 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:424
 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 "
@@ -60,63 +56,63 @@ msgstr ""
 msgid "External Storage"
 msgstr "אחסון חיצוני"
 
-#: templates/settings.php:8 templates/settings.php:22
-msgid "Mount point"
-msgstr "נקודת עגינה"
-
-#: templates/settings.php:9
-msgid "Backend"
-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: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"
-msgstr "הוספת נקודת עגינה"
+#: 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 "משתמשים"
 
-#: 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 "מחיקה"
 
-#: 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 "שורש אישורי אבטחת SSL "
 
-#: templates/settings.php:158
+#: templates/settings.php:159
 msgid "Import Root Certificate"
 msgstr "ייבוא אישור אבטחת שורש"
diff --git a/l10n/he/files_trashbin.po b/l10n/he/files_trashbin.po
index 3ce0051e74e56d3c81e7ade222b68bbee47993dd..b60aec2b9c29f890c4346a31ddb220cd96060994 100644
--- a/l10n/he/files_trashbin.po
+++ b/l10n/he/files_trashbin.po
@@ -3,12 +3,13 @@
 # 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-02-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 10:07+0000\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: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -17,52 +18,64 @@ msgstr ""
 "Language: he\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:22
+#: ajax/delete.php:40
 #, php-format
 msgid "Couldn't delete %s permanently"
-msgstr ""
+msgstr "בלתי אפשרי למחוק את %s לצמיתות"
 
 #: ajax/undelete.php:41
 #, php-format
 msgid "Couldn't restore %s"
-msgstr ""
+msgstr "בלתי אפשרי לשחזר את %s"
 
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
 msgid "perform restore operation"
-msgstr ""
+msgstr "בצע פעולת שחזור"
 
-#: js/trash.js:33
+#: js/trash.js:34
 msgid "delete file permanently"
-msgstr ""
+msgstr "מחק קובץ לצמיתות"
+
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr "מחק לצמיתות"
 
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:174 templates/index.php:17
 msgid "Name"
 msgstr "שם"
 
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:175 templates/index.php:27
 msgid "Deleted"
-msgstr ""
+msgstr "נמחק"
 
-#: js/trash.js:135
+#: js/trash.js:184
 msgid "1 folder"
 msgstr "תיקייה אחת"
 
-#: js/trash.js:137
+#: js/trash.js:186
 msgid "{count} folders"
 msgstr "{count} תיקיות"
 
-#: js/trash.js:145
+#: js/trash.js:194
 msgid "1 file"
 msgstr "קובץ אחד"
 
-#: js/trash.js:147
+#: js/trash.js:196
 msgid "{count} files"
 msgstr "{count} קבצים"
 
 #: templates/index.php:9
 msgid "Nothing in here. Your trash bin is empty!"
-msgstr ""
+msgstr "שום דבר כאן. סל המחזור שלך ריק!"
 
 #: templates/index.php:20 templates/index.php:22
 msgid "Restore"
+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/he/files_versions.po b/l10n/he/files_versions.po
index 4d1caaf1149da10aca5f11de69ff5c2edd76ba16..171a23cbc9ee79526a1ec40d9aafc08e0ec099f8 100644
--- a/l10n/he/files_versions.po
+++ b/l10n/he/files_versions.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-08 00:10+0100\n"
-"PO-Revision-Date: 2013-02-07 23:11+0000\n"
+"POT-Creation-Date: 2013-02-28 00:04+0100\n"
+"PO-Revision-Date: 2013-02-27 23:04+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -50,18 +50,10 @@ msgstr ""
 msgid "No path specified"
 msgstr ""
 
-#: js/versions.js:16
-msgid "History"
-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 ""
-
-#: templates/settings.php:3
-msgid "Files Versioning"
-msgstr "שמירת הבדלי גרסאות של קבצים"
-
-#: templates/settings.php:4
-msgid "Enable"
-msgstr "הפעלה"
diff --git a/l10n/he/lib.po b/l10n/he/lib.po
index 499a5bf35a6fea9c89c0ef807c7a2392a1aca2ba..743ad9d6d4bc684e31d53d25f88c009d7a1e1d35 100644
--- a/l10n/he/lib.po
+++ b/l10n/he/lib.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-11 15:39+0100\n"
-"PO-Revision-Date: 2013-02-11 14:40+0000\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: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -19,27 +19,27 @@ msgstr ""
 "Language: he\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:339
+#: app.php:349
 msgid "Help"
 msgstr "עזרה"
 
-#: app.php:346
+#: app.php:362
 msgid "Personal"
 msgstr "אישי"
 
-#: app.php:351
+#: app.php:373
 msgid "Settings"
 msgstr "הגדרות"
 
-#: app.php:356
+#: app.php:385
 msgid "Users"
 msgstr "משתמשים"
 
-#: app.php:363
+#: app.php:398
 msgid "Apps"
 msgstr "יישומים"
 
-#: app.php:365
+#: app.php:406
 msgid "Admin"
 msgstr "מנהל"
 
@@ -51,15 +51,15 @@ msgstr "הורדת ZIP כבויה"
 msgid "Files need to be downloaded one by one."
 msgstr "יש להוריד את הקבצים אחד אחרי השני."
 
-#: files.php:203 files.php:228
+#: files.php:204 files.php:231
 msgid "Back to Files"
 msgstr "חזרה לקבצים"
 
-#: files.php:227
+#: files.php:228
 msgid "Selected files too large to generate zip file."
 msgstr "הקבצים הנבחרים גדולים מידי ליצירת קובץ zip."
 
-#: helper.php:226
+#: helper.php:228
 msgid "couldn't be determined"
 msgstr ""
 
@@ -99,87 +99,92 @@ msgstr ""
 msgid "Specify a data folder."
 msgstr ""
 
-#: setup.php:53
+#: setup.php:55
 #, php-format
 msgid "%s enter the database username."
 msgstr ""
 
-#: setup.php:56
+#: setup.php:58
 #, php-format
 msgid "%s enter the database name."
 msgstr ""
 
-#: setup.php:59
+#: setup.php:61
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr ""
 
-#: setup.php:62
+#: setup.php:64
 #, php-format
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:126 setup.php:291 setup.php:336
+#: setup.php:128 setup.php:320 setup.php:365
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:127 setup.php:150 setup.php:204
+#: setup.php:129 setup.php:152 setup.php:229
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:149 setup.php:423 setup.php:489
+#: setup.php:151 setup.php:453 setup.php:520
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:203
+#: setup.php:228
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:255 setup.php:357 setup.php:366 setup.php:384 setup.php:394
-#: setup.php:403 setup.php:430 setup.php:496 setup.php:522 setup.php:529
-#: setup.php:540 setup.php:547 setup.php:556 setup.php:564 setup.php:573
-#: setup.php:579
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:256 setup.php:358 setup.php:367 setup.php:385 setup.php:395
-#: setup.php:404 setup.php:431 setup.php:497 setup.php:523 setup.php:530
-#: setup.php:541 setup.php:557 setup.php:565 setup.php:574
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:270
+#: setup.php:299
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:271
+#: setup.php:300
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:276
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:277
+#: setup.php:306
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:548 setup.php:580
+#: setup.php:579 setup.php:611
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:644
+#: setup.php:631
+#, php-format
+msgid "MS SQL username and/or password not valid: %s"
+msgstr ""
+
+#: setup.php:849
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:645
+#: setup.php:850
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
@@ -236,16 +241,16 @@ msgstr "שנה שעברה"
 msgid "years ago"
 msgstr "שנים"
 
-#: updater.php:75
+#: updater.php:78
 #, php-format
 msgid "%s is available. Get <a href=\"%s\">more information</a>"
 msgstr "%s זמין. קבלת <a href=\"%s\">מידע נוסף</a>"
 
-#: updater.php:77
+#: updater.php:81
 msgid "up to date"
 msgstr "עדכני"
 
-#: updater.php:80
+#: updater.php:84
 msgid "updates check is disabled"
 msgstr "בדיקת עדכונים מנוטרלת"
 
diff --git a/l10n/he/settings.po b/l10n/he/settings.po
index a208a7134468959d5f1f4c412f0b0cfe4c493248..97fff33879b667c0ef71bfbd13e8348de033e30f 100644
--- a/l10n/he/settings.po
+++ b/l10n/he/settings.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 23:05+0000\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: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -25,8 +25,8 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "לא ניתן לטעון רשימה מה־App Store"
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:15
-#: ajax/togglegroups.php:18
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr "שגיאת הזדהות"
 
@@ -74,12 +74,12 @@ 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 "לא ניתן להוסיף משתמש לקבוצה %s"
 
-#: ajax/togglegroups.php:34
+#: ajax/togglegroups.php:36
 #, php-format
 msgid "Unable to remove user from group %s"
 msgstr "לא ניתן להסיר משתמש מהקבוצה %s"
@@ -120,7 +120,7 @@ msgstr "שגיאה"
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:96
+#: js/personal.js:99
 msgid "Saving..."
 msgstr "שומר.."
 
@@ -149,23 +149,23 @@ msgstr "מנהל הקבוצה"
 msgid "Delete"
 msgstr "מחיקה"
 
-#: js/users.js:190
+#: js/users.js:191
 msgid "add group"
 msgstr ""
 
-#: js/users.js:351
+#: js/users.js:352
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:357
+#: js/users.js:358
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
 msgid "__language_name__"
 msgstr "עברית"
 
@@ -211,19 +211,19 @@ msgstr ""
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:61
+#: templates/admin.php:63
+#, php-format
 msgid ""
-"This ownCloud server can't set system locale to "
-"\"en_US.UTF-8\"/\"en_US.UTF8\". 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 en_US.UTF-8/en_US.UTF8."
+"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:72
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:75
+#: 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 "
@@ -233,98 +233,98 @@ msgid ""
 " of ownCloud."
 msgstr ""
 
-#: templates/admin.php:89
+#: templates/admin.php:92
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:98
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:108
+#: 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:118
+#: 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:125
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:131
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:132
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:140
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:147
+#: templates/admin.php:150
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:148
+#: templates/admin.php:151
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:155
+#: templates/admin.php:158
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:161
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:165
+#: templates/admin.php:168
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:181
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:179
+#: templates/admin.php:182
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:182
+#: templates/admin.php:185
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr ""
 
-#: templates/admin.php:192
+#: templates/admin.php:195
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:193
+#: templates/admin.php:196
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:220
+#: templates/admin.php:223
 msgid "More"
 msgstr "יותר"
 
-#: templates/admin.php:227 templates/personal.php:98
+#: templates/admin.php:230 templates/personal.php:102
 msgid "Version"
 msgstr "גרסא"
 
-#: templates/admin.php:230 templates/personal.php:100
+#: templates/admin.php:233 templates/personal.php:105
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -334,51 +334,51 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "פותח על די <a href=\"http://ownCloud.org/contact\" target=\"_blank\">קהילתownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">קוד המקור</a> מוגן ברישיון <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
-#: templates/apps.php:10
+#: templates/apps.php:11
 msgid "Add your App"
 msgstr "הוספת היישום שלך"
 
-#: templates/apps.php:11
+#: templates/apps.php:12
 msgid "More Apps"
 msgstr "יישומים נוספים"
 
-#: templates/apps.php:24
+#: templates/apps.php:28
 msgid "Select an App"
 msgstr "בחירת יישום"
 
-#: templates/apps.php:28
+#: templates/apps.php:34
 msgid "See application page at apps.owncloud.com"
 msgstr "צפה בעמוד הישום ב apps.owncloud.com"
 
-#: templates/apps.php:29
+#: templates/apps.php:36
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "ברישיון <span class=\"licence\"></span>לטובת <span class=\"author\"></span>"
 
-#: templates/apps.php:31
+#: templates/apps.php:38
 msgid "Update"
 msgstr "עדכון"
 
-#: templates/help.php:3
+#: 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 "תמיכה בתשלום"
 
@@ -387,79 +387,79 @@ msgstr "תמיכה בתשלום"
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "השתמשת ב־<strong>%s</strong> מתוך <strong>%s</strong> הזמינים לך"
 
-#: templates/personal.php:14
+#: templates/personal.php:15
 msgid "Get the apps to sync your files"
-msgstr ""
+msgstr "השג את האפליקציות על מנת לסנכרן את הקבצים שלך"
 
-#: templates/personal.php:25
+#: templates/personal.php:26
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:36 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
 msgid "Password"
 msgstr "ססמה"
 
-#: templates/personal.php:37
+#: templates/personal.php:38
 msgid "Your password was changed"
 msgstr "הססמה שלך הוחלפה"
 
-#: templates/personal.php:38
+#: templates/personal.php:39
 msgid "Unable to change your password"
 msgstr "לא ניתן לשנות את הססמה שלך"
 
-#: templates/personal.php:39
+#: templates/personal.php:40
 msgid "Current password"
 msgstr "ססמה נוכחית"
 
-#: templates/personal.php:40
+#: templates/personal.php:42
 msgid "New password"
 msgstr "ססמה חדשה"
 
-#: templates/personal.php:42
+#: templates/personal.php:44
 msgid "Change password"
 msgstr "שינוי ססמה"
 
-#: templates/personal.php:54 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:78
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:55
+#: templates/personal.php:57
 msgid "Your display name was changed"
 msgstr ""
 
-#: templates/personal.php:56
+#: templates/personal.php:58
 msgid "Unable to change your display name"
 msgstr ""
 
-#: templates/personal.php:59
+#: templates/personal.php:61
 msgid "Change display name"
 msgstr ""
 
-#: templates/personal.php:68
+#: templates/personal.php:70
 msgid "Email"
 msgstr "דוא״ל"
 
-#: templates/personal.php:69
+#: templates/personal.php:72
 msgid "Your email address"
 msgstr "כתובת הדוא״ל שלך"
 
-#: templates/personal.php:70
+#: templates/personal.php:73
 msgid "Fill in an email address to enable password recovery"
 msgstr "נא למלא את כתובת הדוא״ל שלך כדי לאפשר שחזור ססמה"
 
-#: templates/personal.php:76 templates/personal.php:77
+#: templates/personal.php:79 templates/personal.php:80
 msgid "Language"
 msgstr "פה"
 
-#: templates/personal.php:82
+#: templates/personal.php:86
 msgid "Help translate"
 msgstr "עזרה בתרגום"
 
-#: templates/personal.php:87
+#: templates/personal.php:91
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:89
+#: templates/personal.php:93
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "השתמש בכתובת זאת על מנת להתחבר אל ownCloud דרך סייר קבצים."
 
diff --git a/l10n/he/user_ldap.po b/l10n/he/user_ldap.po
index cd67250d8671249a217e51d767810616bb6ae9cb..e4f8afeb9296c1b61131488b05b3f717c1e7bd13 100644
--- a/l10n/he/user_ldap.po
+++ b/l10n/he/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-08 00:10+0100\n"
-"PO-Revision-Date: 2013-02-07 23:11+0000\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: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -22,17 +22,17 @@ msgstr ""
 msgid "Failed to delete the server configuration"
 msgstr ""
 
-#: ajax/testConfiguration.php:35
+#: ajax/testConfiguration.php:36
 msgid "The configuration is valid and the connection could be established!"
 msgstr ""
 
-#: ajax/testConfiguration.php:37
+#: ajax/testConfiguration.php:39
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
 msgstr ""
 
-#: ajax/testConfiguration.php:40
+#: ajax/testConfiguration.php:43
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
@@ -87,224 +87,248 @@ msgstr ""
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:17
+#: templates/settings.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:23
 msgid "Host"
 msgstr "מארח"
 
-#: templates/settings.php:21
+#: templates/settings.php:25
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:26
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:27
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:28
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "User DN"
 msgstr "DN משתמש"
 
-#: templates/settings.php:23
+#: templates/settings.php:32
 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:24
+#: templates/settings.php:33
 msgid "Password"
 msgstr "סיסמא"
 
-#: templates/settings.php:24
+#: templates/settings.php:36
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "לגישה אנונימית, השאר את הDM והסיסמא ריקים."
 
-#: templates/settings.php:25
+#: templates/settings.php:37
 msgid "User Login Filter"
 msgstr "סנן כניסת משתמש"
 
-#: templates/settings.php:25
+#: templates/settings.php:40
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:41
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:42
 msgid "User List Filter"
 msgstr "סנן רשימת משתמשים"
 
-#: templates/settings.php:26
+#: templates/settings.php:45
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:46
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:47
 msgid "Group Filter"
 msgstr "סנן קבוצה"
 
-#: templates/settings.php:27
+#: templates/settings.php:50
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:51
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:55
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:34
+#: templates/settings.php:58
 msgid "Port"
-msgstr ""
+msgstr "פורט"
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:60
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:39
+#: templates/settings.php:63
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:65
+msgid "Cache Time-To-Live"
+msgstr ""
+
+#: templates/settings.php:65
 msgid "in seconds. A change empties the cache."
 msgstr "בשניות. שינוי מרוקן את המטמון."
 
-#: templates/settings.php:43
+#: templates/settings.php:67
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:47
+#: templates/settings.php:71
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:47 templates/settings.php:50
+#: templates/settings.php:71 templates/settings.php:74
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:74
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:75
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:77
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:79
+msgid "Quota Field"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Quota Default"
+msgstr ""
+
+#: templates/settings.php:80
 msgid "in bytes"
 msgstr "בבתים"
 
-#: templates/settings.php:58
+#: templates/settings.php:81
+msgid "Email Field"
+msgstr ""
+
+#: templates/settings.php:82
+msgid "User Home Folder Naming Rule"
+msgstr ""
+
+#: templates/settings.php:82
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:62
+#: templates/settings.php:86
+msgid "Test Configuration"
+msgstr ""
+
+#: templates/settings.php:86
 msgid "Help"
 msgstr "עזרה"
diff --git a/l10n/hi/files.po b/l10n/hi/files.po
index 7469b9e6c3f9be6f5e8ffa26c49ae3df35b3e211..40ec6e1b41664c2cc19d63fcb9064ca17622bd55 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-02-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\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: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
 "MIME-Version: 1.0\n"
@@ -50,27 +50,27 @@ msgid ""
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:31
+#: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:32
+#: ajax/upload.php:31
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:33
+#: ajax/upload.php:32
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:34
+#: ajax/upload.php:33
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:52
+#: ajax/upload.php:51
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:83
+#: ajax/upload.php:82
 msgid "Invalid directory."
 msgstr ""
 
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:127 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:127 templates/index.php:92 templates/index.php:93
 msgid "Delete"
 msgstr ""
 
@@ -90,40 +90,36 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:253
+#: js/filelist.js:251
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:295
-msgid "replaced {new_name}"
+#: js/filelist.js:298
+msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:295 js/filelist.js:297
+#: js/filelist.js:298
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:297
-msgid "replaced {new_name} with {old_name}"
-msgstr ""
-
-#: js/filelist.js:322
+#: js/filelist.js:323
 msgid "perform delete operation"
 msgstr ""
 
@@ -149,74 +145,74 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:224
+#: js/files.js:225
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:261
+#: js/files.js:262
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:261
+#: js/files.js:262
 msgid "Upload Error"
 msgstr ""
 
-#: js/files.js:272
+#: js/files.js:273
 msgid "Close"
 msgstr ""
 
-#: js/files.js:311
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr ""
 
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr ""
 
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:496
+#: js/files.js:497
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:569
+#: js/files.js:570
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:574
+#: js/files.js:575
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:953 templates/index.php:68
 msgid "Name"
 msgstr ""
 
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:954 templates/index.php:79
 msgid "Size"
 msgstr ""
 
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:955 templates/index.php:81
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:969
+#: js/files.js:974
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:971
+#: js/files.js:976
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:979
+#: js/files.js:984
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:981
+#: js/files.js:986
 msgid "{count} files"
 msgstr ""
 
@@ -280,33 +276,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:53
+msgid "You don’t have write permissions here."
+msgstr ""
+
+#: templates/index.php:60
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:73
+#: templates/index.php:74
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:86 templates/index.php:87
 msgid "Unshare"
 msgstr ""
 
-#: templates/index.php:105
+#: templates/index.php:106
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:107
+#: templates/index.php:108
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:112
+#: templates/index.php:113
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:115
+#: templates/index.php:116
 msgid "Current scanning"
 msgstr ""
 
diff --git a/l10n/hi/files_external.po b/l10n/hi/files_external.po
index e5c058cbf9db278031e1412934f482d2af67bd7a..b4d9abc7e762eb9a1d0fc085da820612283ffd6c 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-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 09:54+0000\n"
+"POT-Creation-Date: 2013-02-28 00:04+0100\n"
+"PO-Revision-Date: 2013-02-27 23:04+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
 "MIME-Version: 1.0\n"
@@ -17,37 +17,33 @@ msgstr ""
 "Language: hi\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:413
+#: lib/config.php:421
 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:414
+#: lib/config.php:424
 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 "
@@ -58,63 +54,63 @@ msgstr ""
 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 "उपयोगकर्ता"
 
-#: templates/settings.php:108 templates/settings.php:109
-#: templates/settings.php:144 templates/settings.php:145
+#: templates/settings.php:113 templates/settings.php:114
+#: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
 msgstr ""
 
-#: 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:136
+#: templates/settings.php:141
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:153
+#: templates/settings.php:159
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/hi/files_trashbin.po b/l10n/hi/files_trashbin.po
index a0b6e4cede08764bf4565acff6f71082d2d7d42c..e0e86d2f8e1db36253a0521913063778663141dc 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-02-08 00:10+0100\n"
-"PO-Revision-Date: 2013-02-07 23:11+0000\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: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
 "MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Language: hi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:22
+#: ajax/delete.php:40
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
@@ -27,35 +27,39 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:33
+#: js/trash.js:34
 msgid "delete file permanently"
 msgstr ""
 
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr ""
+
+#: js/trash.js:174 templates/index.php:17
 msgid "Name"
 msgstr ""
 
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:175 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:135
+#: js/trash.js:184
 msgid "1 folder"
 msgstr ""
 
-#: js/trash.js:137
+#: js/trash.js:186
 msgid "{count} folders"
 msgstr ""
 
-#: js/trash.js:145
+#: js/trash.js:194
 msgid "1 file"
 msgstr ""
 
-#: js/trash.js:147
+#: js/trash.js:196
 msgid "{count} files"
 msgstr ""
 
@@ -66,3 +70,11 @@ 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/hi/files_versions.po b/l10n/hi/files_versions.po
index 65790b4d6ba44649b41bd3439632030c98cb04e4..c58f10c16c61adcf67ab9cf5f5efa5e5af9c6094 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-08 00:10+0100\n"
-"PO-Revision-Date: 2013-02-07 23:11+0000\n"
+"POT-Creation-Date: 2013-02-28 00:04+0100\n"
+"PO-Revision-Date: 2013-02-27 23:04+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
 "MIME-Version: 1.0\n"
@@ -48,18 +48,10 @@ msgstr ""
 msgid "No path specified"
 msgstr ""
 
-#: js/versions.js:16
-msgid "History"
+#: 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 ""
-
-#: templates/settings.php:3
-msgid "Files Versioning"
-msgstr ""
-
-#: templates/settings.php:4
-msgid "Enable"
-msgstr ""
diff --git a/l10n/hi/lib.po b/l10n/hi/lib.po
index 12d4fd2dd35f31d95ec97c9a3cae21ade0eb7445..a2be65c48546fb2f56182826947a4cbf5f237273 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-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 09:54+0000\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: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
 "MIME-Version: 1.0\n"
@@ -17,27 +17,27 @@ msgstr ""
 "Language: hi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:339
+#: app.php:349
 msgid "Help"
 msgstr "सहयोग"
 
-#: app.php:346
+#: app.php:362
 msgid "Personal"
 msgstr "यक्तिगत"
 
-#: app.php:351
+#: app.php:373
 msgid "Settings"
 msgstr "सेटिंग्स"
 
-#: app.php:356
+#: app.php:385
 msgid "Users"
 msgstr "उपयोगकर्ता"
 
-#: app.php:363
+#: app.php:398
 msgid "Apps"
 msgstr "Apps"
 
-#: app.php:365
+#: app.php:406
 msgid "Admin"
 msgstr ""
 
@@ -49,15 +49,15 @@ msgstr ""
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:203 files.php:228
+#: files.php:204 files.php:231
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:227
+#: files.php:228
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: helper.php:226
+#: helper.php:228
 msgid "couldn't be determined"
 msgstr ""
 
@@ -97,87 +97,92 @@ msgstr ""
 msgid "Specify a data folder."
 msgstr ""
 
-#: setup.php:53
+#: setup.php:55
 #, php-format
 msgid "%s enter the database username."
 msgstr ""
 
-#: setup.php:56
+#: setup.php:58
 #, php-format
 msgid "%s enter the database name."
 msgstr ""
 
-#: setup.php:59
+#: setup.php:61
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr ""
 
-#: setup.php:62
+#: setup.php:64
 #, php-format
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:126 setup.php:291 setup.php:336
+#: setup.php:128 setup.php:320 setup.php:365
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:127 setup.php:150 setup.php:204
+#: setup.php:129 setup.php:152 setup.php:229
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:149 setup.php:423 setup.php:489
+#: setup.php:151 setup.php:453 setup.php:520
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:203
+#: setup.php:228
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:255 setup.php:357 setup.php:366 setup.php:384 setup.php:394
-#: setup.php:403 setup.php:430 setup.php:496 setup.php:522 setup.php:529
-#: setup.php:540 setup.php:547 setup.php:556 setup.php:564 setup.php:573
-#: setup.php:579
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:256 setup.php:358 setup.php:367 setup.php:385 setup.php:395
-#: setup.php:404 setup.php:431 setup.php:497 setup.php:523 setup.php:530
-#: setup.php:541 setup.php:557 setup.php:565 setup.php:574
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:270
+#: setup.php:299
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:271
+#: setup.php:300
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:276
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:277
+#: setup.php:306
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:548 setup.php:580
+#: setup.php:579 setup.php:611
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:644
+#: setup.php:631
+#, php-format
+msgid "MS SQL username and/or password not valid: %s"
+msgstr ""
+
+#: setup.php:849
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:645
+#: setup.php:850
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
@@ -234,16 +239,16 @@ msgstr ""
 msgid "years ago"
 msgstr ""
 
-#: updater.php:75
+#: updater.php:78
 #, php-format
 msgid "%s is available. Get <a href=\"%s\">more information</a>"
 msgstr ""
 
-#: updater.php:77
+#: updater.php:81
 msgid "up to date"
 msgstr ""
 
-#: updater.php:80
+#: updater.php:84
 msgid "updates check is disabled"
 msgstr ""
 
diff --git a/l10n/hi/settings.po b/l10n/hi/settings.po
index 4667d519cc307d2473c6e280d4c91f16be469d6d..6598846cc3316d904fd6c36ffcae4375e3c04483 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-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 23:05+0000\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: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
 "MIME-Version: 1.0\n"
@@ -21,8 +21,8 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr ""
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:15
-#: ajax/togglegroups.php:18
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr ""
 
@@ -70,12 +70,12 @@ 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 ""
@@ -116,7 +116,7 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:96
+#: js/personal.js:99
 msgid "Saving..."
 msgstr ""
 
@@ -145,23 +145,23 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
-#: js/users.js:190
+#: js/users.js:191
 msgid "add group"
 msgstr ""
 
-#: js/users.js:351
+#: js/users.js:352
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:357
+#: js/users.js:358
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
 msgid "__language_name__"
 msgstr ""
 
@@ -207,19 +207,19 @@ msgstr ""
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:61
+#: templates/admin.php:63
+#, php-format
 msgid ""
-"This ownCloud server can't set system locale to "
-"\"en_US.UTF-8\"/\"en_US.UTF8\". 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 en_US.UTF-8/en_US.UTF8."
+"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:72
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:75
+#: 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 "
@@ -229,98 +229,98 @@ msgid ""
 " of ownCloud."
 msgstr ""
 
-#: templates/admin.php:89
+#: templates/admin.php:92
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:98
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:108
+#: 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:118
+#: 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:125
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:131
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:132
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:140
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:147
+#: templates/admin.php:150
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:148
+#: templates/admin.php:151
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:155
+#: templates/admin.php:158
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:161
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:165
+#: templates/admin.php:168
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:181
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:179
+#: templates/admin.php:182
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:182
+#: templates/admin.php:185
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr ""
 
-#: templates/admin.php:192
+#: templates/admin.php:195
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:193
+#: templates/admin.php:196
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:220
+#: templates/admin.php:223
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:227 templates/personal.php:98
+#: templates/admin.php:230 templates/personal.php:102
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:230 templates/personal.php:100
+#: templates/admin.php:233 templates/personal.php:105
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -330,51 +330,51 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr ""
 
-#: templates/apps.php:10
+#: templates/apps.php:11
 msgid "Add your App"
 msgstr ""
 
-#: templates/apps.php:11
+#: templates/apps.php:12
 msgid "More Apps"
 msgstr ""
 
-#: templates/apps.php:24
+#: templates/apps.php:28
 msgid "Select an App"
 msgstr ""
 
-#: templates/apps.php:28
+#: templates/apps.php:34
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:29
+#: templates/apps.php:36
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
-#: templates/apps.php:31
+#: templates/apps.php:38
 msgid "Update"
 msgstr ""
 
-#: templates/help.php:3
+#: 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 ""
 
@@ -383,79 +383,79 @@ msgstr ""
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:14
+#: templates/personal.php:15
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:25
+#: templates/personal.php:26
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:36 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
 msgid "Password"
 msgstr "पासवर्ड"
 
-#: templates/personal.php:37
+#: templates/personal.php:38
 msgid "Your password was changed"
 msgstr ""
 
-#: templates/personal.php:38
+#: templates/personal.php:39
 msgid "Unable to change your password"
 msgstr ""
 
-#: templates/personal.php:39
+#: templates/personal.php:40
 msgid "Current password"
 msgstr ""
 
-#: templates/personal.php:40
+#: templates/personal.php:42
 msgid "New password"
 msgstr "नया पासवर्ड"
 
-#: templates/personal.php:42
+#: templates/personal.php:44
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:54 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:78
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:55
+#: templates/personal.php:57
 msgid "Your display name was changed"
 msgstr ""
 
-#: templates/personal.php:56
+#: templates/personal.php:58
 msgid "Unable to change your display name"
 msgstr ""
 
-#: templates/personal.php:59
+#: templates/personal.php:61
 msgid "Change display name"
 msgstr ""
 
-#: templates/personal.php:68
+#: templates/personal.php:70
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:69
+#: templates/personal.php:72
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:70
+#: templates/personal.php:73
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:76 templates/personal.php:77
+#: templates/personal.php:79 templates/personal.php:80
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:82
+#: templates/personal.php:86
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:87
+#: templates/personal.php:91
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:89
+#: templates/personal.php:93
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
diff --git a/l10n/hi/user_ldap.po b/l10n/hi/user_ldap.po
index 8010b1bb74bafdba8de8dd8f5780eaf95d3df40f..b2f6a9761a59b3882ce94e2a43039315ea9825a9 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-02-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 09:54+0000\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: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
 "MIME-Version: 1.0\n"
@@ -21,17 +21,17 @@ msgstr ""
 msgid "Failed to delete the server configuration"
 msgstr ""
 
-#: ajax/testConfiguration.php:35
+#: ajax/testConfiguration.php:36
 msgid "The configuration is valid and the connection could be established!"
 msgstr ""
 
-#: ajax/testConfiguration.php:37
+#: ajax/testConfiguration.php:39
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
 msgstr ""
 
-#: ajax/testConfiguration.php:40
+#: ajax/testConfiguration.php:43
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
@@ -86,224 +86,248 @@ msgstr ""
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:17
+#: templates/settings.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:23
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:25
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:26
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:27
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:28
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:32
 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:24
+#: templates/settings.php:33
 msgid "Password"
 msgstr ""
 
-#: templates/settings.php:24
+#: templates/settings.php:36
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:37
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:40
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:41
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:42
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:45
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:46
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:47
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:50
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:51
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:55
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:34
+#: templates/settings.php:58
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:60
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:39
+#: templates/settings.php:63
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:65
+msgid "Cache Time-To-Live"
+msgstr ""
+
+#: templates/settings.php:65
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:67
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:47
+#: templates/settings.php:71
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:47 templates/settings.php:50
+#: templates/settings.php:71 templates/settings.php:74
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:74
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:75
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:77
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:79
+msgid "Quota Field"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Quota Default"
+msgstr ""
+
+#: templates/settings.php:80
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:81
+msgid "Email Field"
+msgstr ""
+
+#: templates/settings.php:82
+msgid "User Home Folder Naming Rule"
+msgstr ""
+
+#: templates/settings.php:82
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:62
+#: templates/settings.php:86
+msgid "Test Configuration"
+msgstr ""
+
+#: templates/settings.php:86
 msgid "Help"
 msgstr "सहयोग"
diff --git a/l10n/hr/core.po b/l10n/hr/core.po
index ebbeae5639d11a2e241b29e74f5bffb4c0dc5df1..2c13cde4da86b29ac96174e12e8b13ad8933fad4 100644
--- a/l10n/hr/core.po
+++ b/l10n/hr/core.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-09 00:12+0100\n"
-"PO-Revision-Date: 2013-02-08 23:12+0000\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"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -160,59 +160,59 @@ msgstr "Studeni"
 msgid "December"
 msgstr "Prosinac"
 
-#: js/js.js:284
+#: js/js.js:286
 msgid "Settings"
 msgstr "Postavke"
 
-#: js/js.js:764
+#: js/js.js:767
 msgid "seconds ago"
 msgstr "sekundi prije"
 
-#: js/js.js:765
+#: js/js.js:768
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:766
+#: js/js.js:769
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:767
+#: js/js.js:770
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:768
+#: js/js.js:771
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:769
+#: js/js.js:772
 msgid "today"
 msgstr "danas"
 
-#: js/js.js:770
+#: js/js.js:773
 msgid "yesterday"
 msgstr "jučer"
 
-#: js/js.js:771
+#: js/js.js:774
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:772
+#: js/js.js:775
 msgid "last month"
 msgstr "prošli mjesec"
 
-#: js/js.js:773
+#: js/js.js:776
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:774
+#: js/js.js:777
 msgid "months ago"
 msgstr "mjeseci"
 
-#: js/js.js:775
+#: js/js.js:778
 msgid "last year"
 msgstr "prošlu godinu"
 
-#: js/js.js:776
+#: js/js.js:779
 msgid "years ago"
 msgstr "godina"
 
@@ -242,8 +242,8 @@ 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:195 js/share.js:152 js/share.js:159 js/share.js:582
+#: js/share.js:594
 msgid "Error"
 msgstr "Pogreška"
 
@@ -255,15 +255,15 @@ 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 "Podijeli"
-
-#: js/share.js:29 js/share.js:43 js/share.js:90 js/share.js:93
+#: js/share.js:29 js/share.js:43 js/share.js:90
 msgid "Shared"
 msgstr ""
 
-#: js/share.js:141 js/share.js:611
+#: js/share.js:93
+msgid "Share"
+msgstr "Podijeli"
+
+#: js/share.js:141 js/share.js:622
 msgid "Error while sharing"
 msgstr "Greška prilikom djeljenja"
 
@@ -359,23 +359,23 @@ msgstr "izbriši"
 msgid "share"
 msgstr "djeli"
 
-#: js/share.js:373 js/share.js:558
+#: js/share.js:373 js/share.js:569
 msgid "Password protected"
 msgstr "Zaštita lozinkom"
 
-#: js/share.js:571
+#: js/share.js:582
 msgid "Error unsetting expiration date"
 msgstr "Greška prilikom brisanja datuma isteka"
 
-#: js/share.js:583
+#: js/share.js:594
 msgid "Error setting expiration date"
 msgstr "Greška prilikom postavljanja datuma isteka"
 
-#: js/share.js:598
+#: js/share.js:609
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:609
+#: js/share.js:620
 msgid "Email sent"
 msgstr ""
 
@@ -390,7 +390,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 "ownCloud resetiranje lozinke"
 
diff --git a/l10n/hr/files.po b/l10n/hr/files.po
index b04b656f0f501adf0d9ca96bd1eca0b9bf7aba92..c59404f0df3b64e3e3728537b6d74daad6807a0a 100644
--- a/l10n/hr/files.po
+++ b/l10n/hr/files.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\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: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -53,27 +53,27 @@ msgid ""
 "the HTML form"
 msgstr "Poslana datoteka izlazi iz okvira MAX_FILE_SIZE direktive postavljene u HTML obrascu"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
 msgstr "Datoteka je poslana samo djelomično"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:31
 msgid "No file was uploaded"
 msgstr "Ni jedna datoteka nije poslana"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:32
 msgid "Missing a temporary folder"
 msgstr "Nedostaje privremena mapa"
 
-#: ajax/upload.php:34
+#: ajax/upload.php:33
 msgid "Failed to write to disk"
 msgstr "Neuspjelo pisanje na disk"
 
-#: ajax/upload.php:52
+#: ajax/upload.php:51
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:83
+#: ajax/upload.php:82
 msgid "Invalid directory."
 msgstr ""
 
@@ -85,7 +85,7 @@ msgstr "Datoteke"
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:127 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:127 templates/index.php:92 templates/index.php:93
 msgid "Delete"
 msgstr "Briši"
 
@@ -93,40 +93,36 @@ msgstr "Briši"
 msgid "Rename"
 msgstr "Promjeni ime"
 
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
 msgid "Pending"
 msgstr "U tijeku"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "replace"
 msgstr "zamjeni"
 
-#: js/filelist.js:253
+#: js/filelist.js:251
 msgid "suggest name"
 msgstr "predloži ime"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "cancel"
 msgstr "odustani"
 
-#: js/filelist.js:295
-msgid "replaced {new_name}"
+#: js/filelist.js:298
+msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:295 js/filelist.js:297
+#: js/filelist.js:298
 msgid "undo"
 msgstr "vrati"
 
-#: js/filelist.js:297
-msgid "replaced {new_name} with {old_name}"
-msgstr ""
-
-#: js/filelist.js:322
+#: js/filelist.js:323
 msgid "perform delete operation"
 msgstr ""
 
@@ -152,74 +148,74 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:224
+#: js/files.js:225
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:261
+#: js/files.js:262
 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:261
+#: js/files.js:262
 msgid "Upload Error"
 msgstr "Pogreška pri slanju"
 
-#: js/files.js:272
+#: js/files.js:273
 msgid "Close"
 msgstr "Zatvori"
 
-#: js/files.js:311
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr "1 datoteka se učitava"
 
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr ""
 
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "Slanje poništeno."
 
-#: js/files.js:496
+#: js/files.js:497
 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:569
+#: js/files.js:570
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:574
+#: js/files.js:575
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:953 templates/index.php:68
 msgid "Name"
 msgstr "Naziv"
 
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:954 templates/index.php:79
 msgid "Size"
 msgstr "Veličina"
 
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:955 templates/index.php:81
 msgid "Modified"
 msgstr "Zadnja promjena"
 
-#: js/files.js:969
+#: js/files.js:974
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:971
+#: js/files.js:976
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:979
+#: js/files.js:984
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:981
+#: js/files.js:986
 msgid "{count} files"
 msgstr ""
 
@@ -283,33 +279,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr "Prekini upload"
 
-#: templates/index.php:59
+#: templates/index.php:53
+msgid "You don’t have write permissions here."
+msgstr ""
+
+#: templates/index.php:60
 msgid "Nothing in here. Upload something!"
 msgstr "Nema ničega u ovoj mapi. Pošalji nešto!"
 
-#: templates/index.php:73
+#: templates/index.php:74
 msgid "Download"
 msgstr "Preuzmi"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:86 templates/index.php:87
 msgid "Unshare"
 msgstr "Prekini djeljenje"
 
-#: templates/index.php:105
+#: templates/index.php:106
 msgid "Upload too large"
 msgstr "Prijenos je preobiman"
 
-#: templates/index.php:107
+#: templates/index.php:108
 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:112
+#: templates/index.php:113
 msgid "Files are being scanned, please wait."
 msgstr "Datoteke se skeniraju, molimo pričekajte."
 
-#: templates/index.php:115
+#: templates/index.php:116
 msgid "Current scanning"
 msgstr "Trenutno skeniranje"
 
diff --git a/l10n/hr/files_external.po b/l10n/hr/files_external.po
index c221796fa033ad271a7a6f58261bed6a23add70c..ff1ac7f575f1c012224152486feb04cab39e4bc2 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: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-11 23:22+0000\n"
+"POT-Creation-Date: 2013-02-28 00:04+0100\n"
+"PO-Revision-Date: 2013-02-27 23:04+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -17,37 +17,33 @@ 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"
 
-#: 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:421
 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:424
 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 "
@@ -58,63 +54,63 @@ msgstr ""
 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 "Grupe"
 
-#: templates/settings.php:95
+#: templates/settings.php:100
 msgid "Users"
 msgstr "Korisnici"
 
-#: 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 "Obriši"
 
-#: 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/hr/files_trashbin.po b/l10n/hr/files_trashbin.po
index f7162d5dc4f2a52ade9784cc2e9b0b77f0a8483d..4be5c7a6f5a3387b85f86df790467ae43fefa2fc 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-02-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 10:07+0000\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: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@ 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:22
+#: ajax/delete.php:40
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
@@ -27,35 +27,39 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:33
+#: js/trash.js:34
 msgid "delete file permanently"
 msgstr ""
 
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr ""
+
+#: js/trash.js:174 templates/index.php:17
 msgid "Name"
 msgstr "Ime"
 
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:175 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:135
+#: js/trash.js:184
 msgid "1 folder"
 msgstr ""
 
-#: js/trash.js:137
+#: js/trash.js:186
 msgid "{count} folders"
 msgstr ""
 
-#: js/trash.js:145
+#: js/trash.js:194
 msgid "1 file"
 msgstr ""
 
-#: js/trash.js:147
+#: js/trash.js:196
 msgid "{count} files"
 msgstr ""
 
@@ -66,3 +70,11 @@ msgstr ""
 #: templates/index.php:20 templates/index.php:22
 msgid "Restore"
 msgstr ""
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr "Obriši"
+
+#: templates/part.breadcrumb.php:9
+msgid "Deleted Files"
+msgstr ""
diff --git a/l10n/hr/files_versions.po b/l10n/hr/files_versions.po
index a1fb9209e3b22a309d0d364e0594368f0e3468d0..95d4715bd686ac82c9c1c1076e7dfcedc1988c42 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-08 00:10+0100\n"
-"PO-Revision-Date: 2013-02-07 23:11+0000\n"
+"POT-Creation-Date: 2013-02-28 00:04+0100\n"
+"PO-Revision-Date: 2013-02-27 23:04+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -48,18 +48,10 @@ msgstr ""
 msgid "No path specified"
 msgstr ""
 
-#: js/versions.js:16
-msgid "History"
+#: 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 ""
-
-#: templates/settings.php:3
-msgid "Files Versioning"
-msgstr ""
-
-#: templates/settings.php:4
-msgid "Enable"
-msgstr ""
diff --git a/l10n/hr/lib.po b/l10n/hr/lib.po
index 33cacb70eeb144ee10e23fc3a0e666bac19ee803..247fd49ed9e857c249420b6a3ea86b5233178e8c 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-11 15:39+0100\n"
-"PO-Revision-Date: 2013-02-11 14:41+0000\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: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -17,27 +17,27 @@ msgstr ""
 "Language: hr\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
-#: app.php:339
+#: app.php:349
 msgid "Help"
 msgstr "Pomoć"
 
-#: app.php:346
+#: app.php:362
 msgid "Personal"
 msgstr "Osobno"
 
-#: app.php:351
+#: app.php:373
 msgid "Settings"
 msgstr "Postavke"
 
-#: app.php:356
+#: app.php:385
 msgid "Users"
 msgstr "Korisnici"
 
-#: app.php:363
+#: app.php:398
 msgid "Apps"
 msgstr ""
 
-#: app.php:365
+#: app.php:406
 msgid "Admin"
 msgstr ""
 
@@ -49,15 +49,15 @@ msgstr ""
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:203 files.php:228
+#: files.php:204 files.php:231
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:227
+#: files.php:228
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: helper.php:226
+#: helper.php:228
 msgid "couldn't be determined"
 msgstr ""
 
@@ -97,87 +97,92 @@ msgstr ""
 msgid "Specify a data folder."
 msgstr ""
 
-#: setup.php:53
+#: setup.php:55
 #, php-format
 msgid "%s enter the database username."
 msgstr ""
 
-#: setup.php:56
+#: setup.php:58
 #, php-format
 msgid "%s enter the database name."
 msgstr ""
 
-#: setup.php:59
+#: setup.php:61
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr ""
 
-#: setup.php:62
+#: setup.php:64
 #, php-format
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:126 setup.php:291 setup.php:336
+#: setup.php:128 setup.php:320 setup.php:365
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:127 setup.php:150 setup.php:204
+#: setup.php:129 setup.php:152 setup.php:229
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:149 setup.php:423 setup.php:489
+#: setup.php:151 setup.php:453 setup.php:520
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:203
+#: setup.php:228
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:255 setup.php:357 setup.php:366 setup.php:384 setup.php:394
-#: setup.php:403 setup.php:430 setup.php:496 setup.php:522 setup.php:529
-#: setup.php:540 setup.php:547 setup.php:556 setup.php:564 setup.php:573
-#: setup.php:579
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:256 setup.php:358 setup.php:367 setup.php:385 setup.php:395
-#: setup.php:404 setup.php:431 setup.php:497 setup.php:523 setup.php:530
-#: setup.php:541 setup.php:557 setup.php:565 setup.php:574
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:270
+#: setup.php:299
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:271
+#: setup.php:300
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:276
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:277
+#: setup.php:306
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:548 setup.php:580
+#: setup.php:579 setup.php:611
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:644
+#: setup.php:631
+#, php-format
+msgid "MS SQL username and/or password not valid: %s"
+msgstr ""
+
+#: setup.php:849
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:645
+#: setup.php:850
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
@@ -234,16 +239,16 @@ msgstr "prošlu godinu"
 msgid "years ago"
 msgstr "godina"
 
-#: updater.php:75
+#: updater.php:78
 #, php-format
 msgid "%s is available. Get <a href=\"%s\">more information</a>"
 msgstr ""
 
-#: updater.php:77
+#: updater.php:81
 msgid "up to date"
 msgstr ""
 
-#: updater.php:80
+#: updater.php:84
 msgid "updates check is disabled"
 msgstr ""
 
diff --git a/l10n/hr/settings.po b/l10n/hr/settings.po
index 5d8097e959a481c40512ed2d62bfadd84c72c8ee..c0d9d336801bf30f040ebc03a187cb5e550a1798 100644
--- a/l10n/hr/settings.po
+++ b/l10n/hr/settings.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 23:05+0000\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: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -24,8 +24,8 @@ 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:15
-#: ajax/togglegroups.php:18
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr "Greška kod autorizacije"
 
@@ -73,12 +73,12 @@ msgstr "Neispravan zahtjev"
 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 ""
@@ -119,7 +119,7 @@ msgstr "Greška"
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:96
+#: js/personal.js:99
 msgid "Saving..."
 msgstr "Spremanje..."
 
@@ -148,23 +148,23 @@ msgstr "Grupa Admin"
 msgid "Delete"
 msgstr "Obriši"
 
-#: js/users.js:190
+#: js/users.js:191
 msgid "add group"
 msgstr ""
 
-#: js/users.js:351
+#: js/users.js:352
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:357
+#: js/users.js:358
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
 msgid "__language_name__"
 msgstr "__ime_jezika__"
 
@@ -210,19 +210,19 @@ msgstr ""
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:61
+#: templates/admin.php:63
+#, php-format
 msgid ""
-"This ownCloud server can't set system locale to "
-"\"en_US.UTF-8\"/\"en_US.UTF8\". 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 en_US.UTF-8/en_US.UTF8."
+"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:72
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:75
+#: 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 "
@@ -232,98 +232,98 @@ msgid ""
 " of ownCloud."
 msgstr ""
 
-#: templates/admin.php:89
+#: templates/admin.php:92
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:98
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:108
+#: 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:118
+#: 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:125
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:131
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:132
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:140
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:147
+#: templates/admin.php:150
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:148
+#: templates/admin.php:151
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:155
+#: templates/admin.php:158
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:161
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:165
+#: templates/admin.php:168
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:181
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:179
+#: templates/admin.php:182
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:182
+#: templates/admin.php:185
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr ""
 
-#: templates/admin.php:192
+#: templates/admin.php:195
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:193
+#: templates/admin.php:196
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:220
+#: templates/admin.php:223
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:227 templates/personal.php:98
+#: templates/admin.php:230 templates/personal.php:102
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:230 templates/personal.php:100
+#: templates/admin.php:233 templates/personal.php:105
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -333,51 +333,51 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr ""
 
-#: templates/apps.php:10
+#: templates/apps.php:11
 msgid "Add your App"
 msgstr "Dodajte vašu aplikaciju"
 
-#: templates/apps.php:11
+#: templates/apps.php:12
 msgid "More Apps"
 msgstr ""
 
-#: templates/apps.php:24
+#: templates/apps.php:28
 msgid "Select an App"
 msgstr "Odaberite Aplikaciju"
 
-#: templates/apps.php:28
+#: templates/apps.php:34
 msgid "See application page at apps.owncloud.com"
 msgstr "Pogledajte stranicu s aplikacijama na apps.owncloud.com"
 
-#: templates/apps.php:29
+#: templates/apps.php:36
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
-#: templates/apps.php:31
+#: templates/apps.php:38
 msgid "Update"
 msgstr ""
 
-#: templates/help.php:3
+#: 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 ""
 
@@ -386,79 +386,79 @@ msgstr ""
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:14
+#: templates/personal.php:15
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:25
+#: templates/personal.php:26
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:36 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
 msgid "Password"
 msgstr "Lozinka"
 
-#: templates/personal.php:37
+#: templates/personal.php:38
 msgid "Your password was changed"
 msgstr ""
 
-#: templates/personal.php:38
+#: templates/personal.php:39
 msgid "Unable to change your password"
 msgstr "Nemoguće promijeniti lozinku"
 
-#: templates/personal.php:39
+#: templates/personal.php:40
 msgid "Current password"
 msgstr "Trenutna lozinka"
 
-#: templates/personal.php:40
+#: templates/personal.php:42
 msgid "New password"
 msgstr "Nova lozinka"
 
-#: templates/personal.php:42
+#: templates/personal.php:44
 msgid "Change password"
 msgstr "Izmjena lozinke"
 
-#: templates/personal.php:54 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:78
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:55
+#: templates/personal.php:57
 msgid "Your display name was changed"
 msgstr ""
 
-#: templates/personal.php:56
+#: templates/personal.php:58
 msgid "Unable to change your display name"
 msgstr ""
 
-#: templates/personal.php:59
+#: templates/personal.php:61
 msgid "Change display name"
 msgstr ""
 
-#: templates/personal.php:68
+#: templates/personal.php:70
 msgid "Email"
 msgstr "e-mail adresa"
 
-#: templates/personal.php:69
+#: templates/personal.php:72
 msgid "Your email address"
 msgstr "Vaša e-mail adresa"
 
-#: templates/personal.php:70
+#: templates/personal.php:73
 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:76 templates/personal.php:77
+#: templates/personal.php:79 templates/personal.php:80
 msgid "Language"
 msgstr "Jezik"
 
-#: templates/personal.php:82
+#: templates/personal.php:86
 msgid "Help translate"
 msgstr "Pomoć prevesti"
 
-#: templates/personal.php:87
+#: templates/personal.php:91
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:89
+#: templates/personal.php:93
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
diff --git a/l10n/hr/user_ldap.po b/l10n/hr/user_ldap.po
index eb75fed54a87e06e4915be4abfed7c50f2b667a2..fbc304add5da3d691768fb480edaf432acb7ac2c 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-02-08 00:10+0100\n"
-"PO-Revision-Date: 2013-02-07 23:11+0000\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: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -21,17 +21,17 @@ msgstr ""
 msgid "Failed to delete the server configuration"
 msgstr ""
 
-#: ajax/testConfiguration.php:35
+#: ajax/testConfiguration.php:36
 msgid "The configuration is valid and the connection could be established!"
 msgstr ""
 
-#: ajax/testConfiguration.php:37
+#: ajax/testConfiguration.php:39
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
 msgstr ""
 
-#: ajax/testConfiguration.php:40
+#: ajax/testConfiguration.php:43
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
@@ -86,224 +86,248 @@ msgstr ""
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:17
+#: templates/settings.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:23
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:25
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:26
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:27
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:28
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:32
 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:24
+#: templates/settings.php:33
 msgid "Password"
 msgstr ""
 
-#: templates/settings.php:24
+#: templates/settings.php:36
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:37
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:40
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:41
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:42
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:45
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:46
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:47
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:50
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:51
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:55
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:34
+#: templates/settings.php:58
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:60
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:39
+#: templates/settings.php:63
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:65
+msgid "Cache Time-To-Live"
+msgstr ""
+
+#: templates/settings.php:65
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:67
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:47
+#: templates/settings.php:71
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:47 templates/settings.php:50
+#: templates/settings.php:71 templates/settings.php:74
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:74
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:75
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:77
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:79
+msgid "Quota Field"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Quota Default"
+msgstr ""
+
+#: templates/settings.php:80
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:81
+msgid "Email Field"
+msgstr ""
+
+#: templates/settings.php:82
+msgid "User Home Folder Naming Rule"
+msgstr ""
+
+#: templates/settings.php:82
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:62
+#: templates/settings.php:86
+msgid "Test Configuration"
+msgstr ""
+
+#: templates/settings.php:86
 msgid "Help"
 msgstr "Pomoć"
diff --git a/l10n/hu_HU/core.po b/l10n/hu_HU/core.po
index 244db459496454ab45fe492f4a1d7a5cbf2741d5..c82ad716faffad271a6abfa0a888f5a22c06b0b2 100644
--- a/l10n/hu_HU/core.po
+++ b/l10n/hu_HU/core.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 14:00+0000\n"
+"POT-Creation-Date: 2013-02-27 14:35+0100\n"
+"PO-Revision-Date: 2013-02-27 09:21+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"
@@ -22,24 +22,24 @@ msgstr ""
 "Language: hu_HU\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 felhasználó megosztott Önnel egy fájlt"
 
-#: ajax/share.php:87
+#: ajax/share.php:99
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr "%s felhasználó megosztott Önnel egy mappát"
 
-#: ajax/share.php: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 felhasználó megosztotta ezt az állományt Önnel: %s. A fájl innen tölthető le: %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 +85,79 @@ msgstr "Nincs törlésre jelölt kategória"
 msgid "Error removing %s from favorites."
 msgstr "Nem sikerült a kedvencekből törölni ezt: %s"
 
-#: js/config.php:32
+#: js/config.php:34
 msgid "Sunday"
 msgstr "vasárnap"
 
-#: js/config.php:32
+#: js/config.php:35
 msgid "Monday"
 msgstr "hétfő"
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Tuesday"
 msgstr "kedd"
 
-#: js/config.php:32
+#: js/config.php:37
 msgid "Wednesday"
 msgstr "szerda"
 
-#: js/config.php:32
+#: js/config.php:38
 msgid "Thursday"
 msgstr "csütörtök"
 
-#: js/config.php:32
+#: js/config.php:39
 msgid "Friday"
 msgstr "péntek"
 
-#: js/config.php:32
+#: js/config.php:40
 msgid "Saturday"
 msgstr "szombat"
 
-#: js/config.php:33
+#: js/config.php:45
 msgid "January"
 msgstr "január"
 
-#: js/config.php:33
+#: js/config.php:46
 msgid "February"
 msgstr "február"
 
-#: js/config.php:33
+#: js/config.php:47
 msgid "March"
 msgstr "március"
 
-#: js/config.php:33
+#: js/config.php:48
 msgid "April"
 msgstr "április"
 
-#: js/config.php:33
+#: js/config.php:49
 msgid "May"
 msgstr "május"
 
-#: js/config.php:33
+#: js/config.php:50
 msgid "June"
 msgstr "június"
 
-#: js/config.php:33
+#: js/config.php:51
 msgid "July"
 msgstr "július"
 
-#: js/config.php:33
+#: js/config.php:52
 msgid "August"
 msgstr "augusztus"
 
-#: js/config.php:33
+#: js/config.php:53
 msgid "September"
 msgstr "szeptember"
 
-#: js/config.php:33
+#: js/config.php:54
 msgid "October"
 msgstr "október"
 
-#: js/config.php:33
+#: js/config.php:55
 msgid "November"
 msgstr "november"
 
-#: js/config.php:33
+#: js/config.php:56
 msgid "December"
 msgstr "december"
 
@@ -165,55 +165,55 @@ msgstr "december"
 msgid "Settings"
 msgstr "Beállítások"
 
-#: js/js.js:767
+#: js/js.js:768
 msgid "seconds ago"
 msgstr "pár másodperce"
 
-#: js/js.js:768
+#: js/js.js:769
 msgid "1 minute ago"
 msgstr "1 perce"
 
-#: js/js.js:769
+#: js/js.js:770
 msgid "{minutes} minutes ago"
 msgstr "{minutes} perce"
 
-#: js/js.js:770
+#: js/js.js:771
 msgid "1 hour ago"
 msgstr "1 órája"
 
-#: js/js.js:771
+#: js/js.js:772
 msgid "{hours} hours ago"
 msgstr "{hours} órája"
 
-#: js/js.js:772
+#: js/js.js:773
 msgid "today"
 msgstr "ma"
 
-#: js/js.js:773
+#: js/js.js:774
 msgid "yesterday"
 msgstr "tegnap"
 
-#: js/js.js:774
+#: js/js.js:775
 msgid "{days} days ago"
 msgstr "{days} napja"
 
-#: js/js.js:775
+#: js/js.js:776
 msgid "last month"
 msgstr "múlt hónapban"
 
-#: js/js.js:776
+#: js/js.js:777
 msgid "{months} months ago"
 msgstr "{months} hónapja"
 
-#: js/js.js:777
+#: js/js.js:778
 msgid "months ago"
 msgstr "több hónapja"
 
-#: js/js.js:778
+#: js/js.js:779
 msgid "last year"
 msgstr "tavaly"
 
-#: js/js.js:779
+#: js/js.js:780
 msgid "years ago"
 msgstr "több éve"
 
@@ -296,7 +296,7 @@ msgstr "Link megadásával osztom meg"
 msgid "Password protect"
 msgstr "Jelszóval is védem"
 
-#: js/share.js:185 templates/installation.php:44 templates/login.php:35
+#: js/share.js:185 templates/installation.php:47 templates/login.php:35
 msgid "Password"
 msgstr "Jelszó"
 
@@ -391,7 +391,7 @@ msgstr "A frissítés nem sikerült. Kérem értesítse erről a problémáról
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "A frissítés sikeres volt. Visszairányítjuk az ownCloud szolgáltatáshoz."
 
-#: lostpassword/controller.php:47
+#: lostpassword/controller.php:48
 msgid "ownCloud password reset"
 msgstr "ownCloud jelszó-visszaállítás"
 
@@ -411,7 +411,7 @@ msgstr "Elküldtük az emailt a jelszó ismételt beállításához."
 msgid "Request failed!"
 msgstr "Nem sikerült a kérést teljesíteni!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:39
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:41
 #: templates/login.php:28
 msgid "Username"
 msgstr "Felhasználónév"
@@ -472,85 +472,86 @@ msgstr "Kategóriák szerkesztése"
 msgid "Add"
 msgstr "Hozzáadás"
 
-#: templates/installation.php:23 templates/installation.php:30
+#: templates/installation.php:24 templates/installation.php:31
 msgid "Security Warning"
 msgstr "Biztonsági figyelmeztetés"
 
-#: templates/installation.php:24
+#: templates/installation.php:25
 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:25
+#: templates/installation.php:26
 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:31
+#: templates/installation.php:32
 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:32
+#: templates/installation.php:33
 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:36
+#: templates/installation.php:37
 msgid "Create an <strong>admin account</strong>"
 msgstr "<strong>Rendszergazdai belépés</strong> létrehozása"
 
-#: templates/installation.php:52
+#: templates/installation.php:55
 msgid "Advanced"
 msgstr "Haladó"
 
-#: templates/installation.php:54
+#: templates/installation.php:57
 msgid "Data folder"
 msgstr "Adatkönyvtár"
 
-#: templates/installation.php:61
+#: templates/installation.php:66
 msgid "Configure the database"
 msgstr "Adatbázis konfigurálása"
 
-#: templates/installation.php:66 templates/installation.php:77
-#: templates/installation.php:87 templates/installation.php:97
+#: templates/installation.php:71 templates/installation.php:83
+#: templates/installation.php:94 templates/installation.php:105
+#: templates/installation.php:117
 msgid "will be used"
 msgstr "adatbázist fogunk használni"
 
-#: templates/installation.php:109
+#: templates/installation.php:129
 msgid "Database user"
 msgstr "Adatbázis felhasználónév"
 
-#: templates/installation.php:113
+#: templates/installation.php:134
 msgid "Database password"
 msgstr "Adatbázis jelszó"
 
-#: templates/installation.php:117
+#: templates/installation.php:139
 msgid "Database name"
 msgstr "Az adatbázis neve"
 
-#: templates/installation.php:125
+#: templates/installation.php:149
 msgid "Database tablespace"
 msgstr "Az adatbázis táblázattér (tablespace)"
 
-#: templates/installation.php:131
+#: templates/installation.php:156
 msgid "Database host"
 msgstr "Adatbázis szerver"
 
-#: templates/installation.php:136
+#: templates/installation.php:162
 msgid "Finish setup"
 msgstr "A beállítások befejezése"
 
-#: templates/layout.guest.php:33
+#: templates/layout.guest.php:35
 msgid "web services under your control"
 msgstr "webszolgáltatások saját kézben"
 
-#: templates/layout.user.php:48
+#: templates/layout.user.php:53
 msgid "Log out"
 msgstr "Kilépés"
 
diff --git a/l10n/hu_HU/files.po b/l10n/hu_HU/files.po
index ea2e55fc372c68ec3959bf44e196dde6be69ba09..c28ba061869455133f08c8ea1095d96c4e68887c 100644
--- a/l10n/hu_HU/files.po
+++ b/l10n/hu_HU/files.po
@@ -14,8 +14,8 @@ 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 23:05+0000\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: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
@@ -57,27 +57,27 @@ msgid ""
 "the HTML form"
 msgstr "A feltöltött fájl mérete meghaladja a MAX_FILE_SIZE paramétert, ami a HTML  formban került megadásra."
 
-#: ajax/upload.php:31
+#: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
 msgstr "Az eredeti fájlt csak részben sikerült feltölteni."
 
-#: ajax/upload.php:32
+#: ajax/upload.php:31
 msgid "No file was uploaded"
 msgstr "Nem töltődött fel semmi"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:32
 msgid "Missing a temporary folder"
 msgstr "Hiányzik egy ideiglenes mappa"
 
-#: ajax/upload.php:34
+#: ajax/upload.php:33
 msgid "Failed to write to disk"
 msgstr "Nem sikerült a lemezre történő írás"
 
-#: ajax/upload.php:52
+#: ajax/upload.php:51
 msgid "Not enough storage available"
 msgstr "Nincs elég szabad hely."
 
-#: ajax/upload.php:83
+#: ajax/upload.php:82
 msgid "Invalid directory."
 msgstr "Érvénytelen mappa."
 
@@ -89,7 +89,7 @@ msgstr "Fájlok"
 msgid "Delete permanently"
 msgstr "Végleges törlés"
 
-#: js/fileactions.js:127 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:127 templates/index.php:92 templates/index.php:93
 msgid "Delete"
 msgstr "Törlés"
 
@@ -97,40 +97,36 @@ msgstr "Törlés"
 msgid "Rename"
 msgstr "Átnevezés"
 
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
 msgid "Pending"
 msgstr "Folyamatban"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "{new_name} already exists"
 msgstr "{new_name} már létezik"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "replace"
 msgstr "írjuk fölül"
 
-#: js/filelist.js:253
+#: js/filelist.js:251
 msgid "suggest name"
 msgstr "legyen más neve"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "cancel"
 msgstr "mégse"
 
-#: js/filelist.js:295
-msgid "replaced {new_name}"
-msgstr "a(z) {new_name} állományt kicseréltük"
+#: js/filelist.js:298
+msgid "replaced {new_name} with {old_name}"
+msgstr "{new_name} fájlt kicseréltük ezzel:  {old_name}"
 
-#: js/filelist.js:295 js/filelist.js:297
+#: js/filelist.js:298
 msgid "undo"
 msgstr "visszavonás"
 
-#: js/filelist.js:297
-msgid "replaced {new_name} with {old_name}"
-msgstr "{new_name} fájlt kicseréltük ezzel:  {old_name}"
-
-#: js/filelist.js:322
+#: js/filelist.js:323
 msgid "perform delete operation"
 msgstr "a törlés végrehajtása"
 
@@ -156,74 +152,74 @@ 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:224
+#: js/files.js:225
 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:261
+#: js/files.js:262
 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:261
+#: js/files.js:262
 msgid "Upload Error"
 msgstr "Feltöltési hiba"
 
-#: js/files.js:272
+#: js/files.js:273
 msgid "Close"
 msgstr "Bezárás"
 
-#: js/files.js:311
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr "1 fájl töltődik föl"
 
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: 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:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "A feltöltést megszakítottuk."
 
-#: js/files.js:496
+#: js/files.js:497
 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:569
+#: js/files.js:570
 msgid "URL cannot be empty."
 msgstr "Az URL nem lehet semmi."
 
-#: js/files.js:574
+#: js/files.js:575
 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:948 templates/index.php:67
+#: js/files.js:953 templates/index.php:68
 msgid "Name"
 msgstr "Név"
 
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:954 templates/index.php:79
 msgid "Size"
 msgstr "Méret"
 
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:955 templates/index.php:81
 msgid "Modified"
 msgstr "Módosítva"
 
-#: js/files.js:969
+#: js/files.js:974
 msgid "1 folder"
 msgstr "1 mappa"
 
-#: js/files.js:971
+#: js/files.js:976
 msgid "{count} folders"
 msgstr "{count} mappa"
 
-#: js/files.js:979
+#: js/files.js:984
 msgid "1 file"
 msgstr "1 fájl"
 
-#: js/files.js:981
+#: js/files.js:986
 msgid "{count} files"
 msgstr "{count} fájl"
 
@@ -281,39 +277,43 @@ msgstr "Feltöltés linkről"
 
 #: templates/index.php:40
 msgid "Deleted files"
-msgstr ""
+msgstr "Törölt fájlok"
 
 #: templates/index.php:46
 msgid "Cancel upload"
 msgstr "A feltöltés megszakítása"
 
-#: templates/index.php:59
+#: templates/index.php:53
+msgid "You don’t have write permissions here."
+msgstr "Itt nincs írásjoga."
+
+#: templates/index.php:60
 msgid "Nothing in here. Upload something!"
 msgstr "Itt nincs semmi. Töltsön fel valamit!"
 
-#: templates/index.php:73
+#: templates/index.php:74
 msgid "Download"
 msgstr "Letöltés"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:86 templates/index.php:87
 msgid "Unshare"
 msgstr "Megosztás visszavonása"
 
-#: templates/index.php:105
+#: templates/index.php:106
 msgid "Upload too large"
 msgstr "A feltöltés túl nagy"
 
-#: templates/index.php:107
+#: templates/index.php:108
 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:112
+#: templates/index.php:113
 msgid "Files are being scanned, please wait."
 msgstr "A fájllista ellenőrzése zajlik, kis türelmet!"
 
-#: templates/index.php:115
+#: templates/index.php:116
 msgid "Current scanning"
 msgstr "Ellenőrzés alatt"
 
diff --git a/l10n/hu_HU/files_external.po b/l10n/hu_HU/files_external.po
index 450c7e0561698c013be40cc46fc457bcc8211830..e5618fc11721cf84a70f1035c4df659cd5f5570c 100644
--- a/l10n/hu_HU/files_external.po
+++ b/l10n/hu_HU/files_external.po
@@ -3,12 +3,13 @@
 # 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: 2012-12-31 00:04+0100\n"
-"PO-Revision-Date: 2012-12-30 19:20+0000\n"
+"POT-Creation-Date: 2013-03-01 00:05+0100\n"
+"PO-Revision-Date: 2013-02-28 13: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"
@@ -17,37 +18,33 @@ msgstr ""
 "Language: hu_HU\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 "Érvényes hozzáférés"
 
-#: 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 "A Dropbox tárolót nem sikerült beállítani"
 
-#: 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 "Megadom a hozzáférést"
 
-#: js/dropbox.js:73 js/google.js:72
-msgid "Fill out all required fields"
-msgstr "Töltse ki az összes szükséges mezőt"
-
-#: js/dropbox.js:85
+#: js/dropbox.js:101
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr "Adjon meg egy érvényes Dropbox app key-t és secretet!"
 
-#: 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 "A Google Drive tárolót nem sikerült beállítani"
 
-#: lib/config.php:434
+#: lib/config.php:421
 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:435
+#: lib/config.php:424
 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 "
@@ -58,63 +55,63 @@ msgstr "<b>Figyelem:</b> a PHP FTP támogatása vagy nincs telepítve, vagy ninc
 msgid "External Storage"
 msgstr "Külső tárolási szolgáltatások becsatolása"
 
-#: templates/settings.php:8 templates/settings.php:22
-msgid "Mount point"
-msgstr "Hova csatoljuk"
-
-#: templates/settings.php:9
-msgid "Backend"
-msgstr "Külső tárolórendszer"
+#: templates/settings.php:9 templates/settings.php:28
+msgid "Folder name"
+msgstr "Mappanév"
 
 #: templates/settings.php:10
+msgid "External storage"
+msgstr "Külső tárolók"
+
+#: templates/settings.php:11
 msgid "Configuration"
 msgstr "Beállítások"
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid "Options"
 msgstr "Opciók"
 
-#: templates/settings.php:12
+#: templates/settings.php:13
 msgid "Applicable"
 msgstr "Érvényességi kör"
 
-#: templates/settings.php:27
-msgid "Add mount point"
-msgstr "Új csatolás létrehozása"
+#: templates/settings.php:33
+msgid "Add storage"
+msgstr "Tároló becsatolása"
 
-#: templates/settings.php:85
+#: templates/settings.php:90
 msgid "None set"
 msgstr "Nincs beállítva"
 
-#: templates/settings.php:86
+#: templates/settings.php:91
 msgid "All Users"
 msgstr "Az összes felhasználó"
 
-#: templates/settings.php:87
+#: templates/settings.php:92
 msgid "Groups"
 msgstr "Csoportok"
 
-#: templates/settings.php:95
+#: templates/settings.php:100
 msgid "Users"
 msgstr "Felhasználók"
 
-#: templates/settings.php:108 templates/settings.php:109
-#: templates/settings.php:144 templates/settings.php:145
+#: templates/settings.php:113 templates/settings.php:114
+#: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
 msgstr "Törlés"
 
-#: templates/settings.php:124
+#: templates/settings.php:129
 msgid "Enable User External Storage"
 msgstr "Külső tárolók engedélyezése a felhasználók részére"
 
-#: templates/settings.php:125
+#: templates/settings.php:130
 msgid "Allow users to mount their own external storage"
 msgstr "Lehetővé teszi, hogy a felhasználók külső tárolási szolgáltatásokat csatoljanak be a saját területükre"
 
-#: templates/settings.php:136
+#: templates/settings.php:141
 msgid "SSL root certificates"
 msgstr "SSL tanúsítványok"
 
-#: templates/settings.php:153
+#: templates/settings.php:159
 msgid "Import Root Certificate"
 msgstr "SSL tanúsítványok importálása"
diff --git a/l10n/hu_HU/files_trashbin.po b/l10n/hu_HU/files_trashbin.po
index 45b1df8c92abca1ca3f571ccac1313a111713eed..3496d44486bd6a1aceaee45ce6152ced1e60a85e 100644
--- a/l10n/hu_HU/files_trashbin.po
+++ b/l10n/hu_HU/files_trashbin.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-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 13:30+0000\n"
-"Last-Translator: Laszlo Tornoci <torlasz@gmail.com>\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: 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"
@@ -18,7 +18,7 @@ msgstr ""
 "Language: hu_HU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:22
+#: ajax/delete.php:40
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "Nem sikerült %s végleges törlése"
@@ -28,35 +28,39 @@ msgstr "Nem sikerült %s végleges törlése"
 msgid "Couldn't restore %s"
 msgstr "Nem sikerült %s visszaállítása"
 
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
 msgid "perform restore operation"
 msgstr "a visszaállítás végrehajtása"
 
-#: js/trash.js:33
+#: js/trash.js:34
 msgid "delete file permanently"
 msgstr "az állomány végleges törlése"
 
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr "Végleges törlés"
+
+#: js/trash.js:174 templates/index.php:17
 msgid "Name"
 msgstr "Név"
 
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:175 templates/index.php:27
 msgid "Deleted"
 msgstr "Törölve"
 
-#: js/trash.js:135
+#: js/trash.js:184
 msgid "1 folder"
 msgstr "1 mappa"
 
-#: js/trash.js:137
+#: js/trash.js:186
 msgid "{count} folders"
 msgstr "{count} mappa"
 
-#: js/trash.js:145
+#: js/trash.js:194
 msgid "1 file"
 msgstr "1 fájl"
 
-#: js/trash.js:147
+#: js/trash.js:196
 msgid "{count} files"
 msgstr "{count} fájl"
 
@@ -67,3 +71,11 @@ msgstr "Itt nincs semmi. Az Ön szemetes mappája üres!"
 #: templates/index.php:20 templates/index.php:22
 msgid "Restore"
 msgstr "Visszaállítás"
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr "Törlés"
+
+#: templates/part.breadcrumb.php:9
+msgid "Deleted Files"
+msgstr ""
diff --git a/l10n/hu_HU/files_versions.po b/l10n/hu_HU/files_versions.po
index e128811260c0218a5931a33212bdbf99f3af8a82..f166ccc2e3591f9e45106545d2381474ba713c90 100644
--- a/l10n/hu_HU/files_versions.po
+++ b/l10n/hu_HU/files_versions.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-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 10:43+0000\n"
-"Last-Translator: Laszlo Tornoci <torlasz@gmail.com>\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"
 "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"
@@ -49,18 +49,10 @@ msgstr "Nincs régebbi változat"
 msgid "No path specified"
 msgstr "Nincs megadva az útvonal"
 
-#: js/versions.js:16
-msgid "History"
-msgstr "Korábbi változatok"
+#: js/versions.js:6
+msgid "Versions"
+msgstr "Az állományok korábbi változatai"
 
 #: templates/history.php:20
 msgid "Revert a file to a previous version by clicking on its revert button"
 msgstr "Az állomány átállítható egy régebbi változatra, ha a gombra kattint"
-
-#: templates/settings.php:3
-msgid "Files Versioning"
-msgstr "Az állományok verzionálása"
-
-#: templates/settings.php:4
-msgid "Enable"
-msgstr "engedélyezve"
diff --git a/l10n/hu_HU/lib.po b/l10n/hu_HU/lib.po
index 25b3c98b19c2e883dac5ba28c989df0c77583f98..94453c1b3514fb3fb5840dda978a0f7966aea97c 100644
--- a/l10n/hu_HU/lib.po
+++ b/l10n/hu_HU/lib.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 14:31+0000\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"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
@@ -20,27 +20,27 @@ msgstr ""
 "Language: hu_HU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:339
+#: app.php:349
 msgid "Help"
 msgstr "Súgó"
 
-#: app.php:346
+#: app.php:362
 msgid "Personal"
 msgstr "Személyes"
 
-#: app.php:351
+#: app.php:373
 msgid "Settings"
 msgstr "Beállítások"
 
-#: app.php:356
+#: app.php:385
 msgid "Users"
 msgstr "Felhasználók"
 
-#: app.php:363
+#: app.php:398
 msgid "Apps"
 msgstr "Alkalmazások"
 
-#: app.php:365
+#: app.php:406
 msgid "Admin"
 msgstr "Adminsztráció"
 
@@ -52,15 +52,15 @@ msgstr "A ZIP-letöltés nincs engedélyezve."
 msgid "Files need to be downloaded one by one."
 msgstr "A fájlokat egyenként kell letölteni."
 
-#: files.php:203 files.php:228
+#: files.php:204 files.php:231
 msgid "Back to Files"
 msgstr "Vissza a Fájlokhoz"
 
-#: files.php:227
+#: files.php:228
 msgid "Selected files too large to generate zip file."
 msgstr "A kiválasztott fájlok túl nagyok a zip tömörítéshez."
 
-#: helper.php:226
+#: helper.php:228
 msgid "couldn't be determined"
 msgstr "nem határozható meg"
 
@@ -100,87 +100,92 @@ msgstr "Állítson be egy jelszót az adminisztrációhoz."
 msgid "Specify a data folder."
 msgstr "Adja meg az adatokat tartalmazó könyvtár nevét."
 
-#: setup.php:53
+#: setup.php:55
 #, php-format
 msgid "%s enter the database username."
 msgstr "%s adja meg az adatbázist elérő felhasználó login nevét."
 
-#: setup.php:56
+#: setup.php:58
 #, php-format
 msgid "%s enter the database name."
 msgstr "%s adja meg az adatbázis nevét."
 
-#: setup.php:59
+#: setup.php:61
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr "%s az adatbázis neve nem tartalmazhat pontot"
 
-#: setup.php:62
+#: setup.php:64
 #, php-format
 msgid "%s set the database host."
 msgstr "%s adja meg az adatbázist szolgáltató számítógép nevét."
 
-#: setup.php:126 setup.php:291 setup.php:336
+#: setup.php:128 setup.php:320 setup.php:365
 msgid "PostgreSQL username and/or password not valid"
 msgstr "A PostgreSQL felhasználói név és/vagy jelszó érvénytelen"
 
-#: setup.php:127 setup.php:150 setup.php:204
+#: setup.php:129 setup.php:152 setup.php:229
 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:149 setup.php:423 setup.php:489
+#: setup.php:151 setup.php:453 setup.php:520
 msgid "Oracle username and/or password not valid"
 msgstr "Az Oracle felhasználói név és/vagy jelszó érvénytelen"
 
-#: setup.php:203
+#: setup.php:228
 msgid "MySQL username and/or password not valid"
 msgstr "A MySQL felhasználói név és/vagy jelszó érvénytelen"
 
-#: setup.php:255 setup.php:357 setup.php:366 setup.php:384 setup.php:394
-#: setup.php:403 setup.php:430 setup.php:496 setup.php:522 setup.php:529
-#: setup.php:540 setup.php:547 setup.php:556 setup.php:564 setup.php:573
-#: setup.php:579
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Adatbázis hiba: \"%s\""
 
-#: setup.php:256 setup.php:358 setup.php:367 setup.php:385 setup.php:395
-#: setup.php:404 setup.php:431 setup.php:497 setup.php:523 setup.php:530
-#: setup.php:541 setup.php:557 setup.php:565 setup.php:574
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "A hibát ez a parancs okozta: \"%s\""
 
-#: setup.php:270
+#: setup.php:299
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "A '%s'@'localhost' MySQL felhasználó már létezik."
 
-#: setup.php:271
+#: setup.php:300
 msgid "Drop this user from MySQL"
 msgstr "Törölje ezt a felhasználót a MySQL-ből"
 
-#: setup.php:276
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "A '%s'@'%%' MySQL felhasználó már létezik"
 
-#: setup.php:277
+#: setup.php:306
 msgid "Drop this user from MySQL."
 msgstr "Törölje ezt a felhasználót a MySQL-ből."
 
-#: setup.php:548 setup.php:580
+#: setup.php:579 setup.php:611
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "A hibát okozó parancs ez volt: \"%s\", login név: %s, jelszó: %s"
 
-#: setup.php:644
+#: setup.php:631
+#, 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
 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:645
+#: setup.php:850
 #, 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>."
@@ -237,16 +242,16 @@ msgstr "tavaly"
 msgid "years ago"
 msgstr "éve"
 
-#: updater.php:75
+#: 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:77
+#: updater.php:81
 msgid "up to date"
 msgstr "a legfrissebb változat"
 
-#: updater.php:80
+#: updater.php:84
 msgid "updates check is disabled"
 msgstr "A frissitések ellenőrzése nincs engedélyezve."
 
diff --git a/l10n/hu_HU/settings.po b/l10n/hu_HU/settings.po
index 54b93c6397a5143e36d9ef53c5067d04f7ec189a..d274313816968c8097155db82b429a05032e9e95 100644
--- a/l10n/hu_HU/settings.po
+++ b/l10n/hu_HU/settings.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 23:05+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,8 +25,8 @@ 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:15
-#: ajax/togglegroups.php:18
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr "Azonosítási hiba"
 
@@ -74,12 +74,12 @@ msgstr "Érvénytelen kérés"
 msgid "Admins can't remove themself from the admin group"
 msgstr "Adminisztrátorok nem távolíthatják el magukat az admin csoportból."
 
-#: ajax/togglegroups.php:28
+#: ajax/togglegroups.php:30
 #, php-format
 msgid "Unable to add user to group %s"
 msgstr "A felhasználó nem adható hozzá ehhez a csoporthoz: %s"
 
-#: ajax/togglegroups.php:34
+#: ajax/togglegroups.php:36
 #, php-format
 msgid "Unable to remove user from group %s"
 msgstr "A felhasználó nem távolítható el ebből a csoportból: %s"
@@ -120,7 +120,7 @@ msgstr "Hiba"
 msgid "Updated"
 msgstr "Frissítve"
 
-#: js/personal.js:96
+#: js/personal.js:99
 msgid "Saving..."
 msgstr "Mentés..."
 
@@ -149,23 +149,23 @@ msgstr "Csoportadminisztrátor"
 msgid "Delete"
 msgstr "Törlés"
 
-#: js/users.js:190
+#: js/users.js:191
 msgid "add group"
 msgstr "csoport hozzáadása"
 
-#: js/users.js:351
+#: js/users.js:352
 msgid "A valid username must be provided"
 msgstr "Érvényes felhasználónevet kell megadnia"
 
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
 msgid "Error creating user"
 msgstr "A felhasználó nem hozható létre"
 
-#: js/users.js:357
+#: js/users.js:358
 msgid "A valid password must be provided"
 msgstr "Érvényes jelszót kell megadnia"
 
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -211,19 +211,19 @@ msgstr "A 'fileinfo' PHP modul hiányzik. Erősen javasolt ennek a modulnak az t
 msgid "Locale not working"
 msgstr "A nyelvi lokalizáció nem működik"
 
-#: templates/admin.php:61
+#: templates/admin.php:63
+#, php-format
 msgid ""
-"This ownCloud server can't set system locale to "
-"\"en_US.UTF-8\"/\"en_US.UTF8\". 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 en_US.UTF-8/en_US.UTF8."
-msgstr "Az ownCloud kiszolgáló nem tudja beállítani a rendszer lokalizációját \"en_US.UTF-8\"/\"en_US.UTF8\"-re.  Emiatt bizonyos karakterek problémákat okozhatnak a fájlnevekben. Erősen javasolt, hogy telepítse az en_US.UTF-8/en_US.UTF8 támogatásához szükséges csomagokat."
+"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 "Ezen az ownCloud kiszolgálón nem használható a %s nyelvi beállítás. Ez azt jelenti, hogy a fájlnevekben gond lehet bizonyos karakterekkel. Nyomatékosan ajánlott, hogy telepítse a szükséges csomagokat annak érdekében, hogy a rendszer támogassa a %s beállítást."
 
-#: templates/admin.php:72
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr "Az internet kapcsolat nem működik"
 
-#: templates/admin.php:75
+#: 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 "
@@ -233,98 +233,98 @@ msgid ""
 " of ownCloud."
 msgstr "Az ownCloud kiszolgálónak nincs internet kapcsolata. Ez azt jelenti, hogy bizonyos dolgok nem fognak működni, pl. külső tárolók csatolása, programfrissítésekről való értesítések, vagy külső fejlesztői modulok telepítése. Lehet, hogy az állományok távolról történő elérése, ill. az email értesítések sem fog működni. Javasoljuk, hogy engedélyezze az internet kapcsolatot a kiszolgáló számára, ha az ownCloud összes szolgáltatását szeretné használni."
 
-#: templates/admin.php:89
+#: templates/admin.php:92
 msgid "Cron"
 msgstr "Ütemezett feladatok"
 
-#: templates/admin.php:98
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr "Egy-egy feladat végrehajtása minden alkalommal, amikor egy weboldalt letöltenek"
 
-#: templates/admin.php:108
+#: 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 "A cron.php webcron szolgáltatásként van regisztrálva. Hívja meg az owncloud könyvtárban levő cron.php állományt http-n keresztül percenként egyszer."
 
-#: templates/admin.php:118
+#: 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 "A rendszer cron szolgáltatásának használata. Hívja meg az owncloud könyvtárban levő  cron.php állományt percenként egyszer a rendszer cron szolgáltatásának segítségével."
 
-#: templates/admin.php:125
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr "Megosztás"
 
-#: templates/admin.php:131
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr "A megosztás API-jának engedélyezése"
 
-#: templates/admin.php:132
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr "Lehetővé teszi, hogy a programmodulok is használhassák a megosztást"
 
-#: templates/admin.php:139
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr "Linkek engedélyezése"
 
-#: templates/admin.php:140
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr "Lehetővé teszi, hogy a felhasználók linkek segítségével külsősökkel is megoszthassák az adataikat"
 
-#: templates/admin.php:147
+#: templates/admin.php:150
 msgid "Allow resharing"
 msgstr "A továbbosztás engedélyezése"
 
-#: templates/admin.php:148
+#: templates/admin.php:151
 msgid "Allow users to share items shared with them again"
 msgstr "Lehetővé teszi, hogy a felhasználók a velük megosztott állományokat megosszák egy további, harmadik féllel"
 
-#: templates/admin.php:155
+#: templates/admin.php:158
 msgid "Allow users to share with anyone"
 msgstr "A felhasználók bárkivel megoszthatják állományaikat"
 
-#: templates/admin.php:158
+#: templates/admin.php:161
 msgid "Allow users to only share with users in their groups"
 msgstr "A felhasználók csak olyanokkal oszthatják meg állományaikat, akikkel közös csoportban vannak"
 
-#: templates/admin.php:165
+#: templates/admin.php:168
 msgid "Security"
 msgstr "Biztonság"
 
-#: templates/admin.php:178
+#: templates/admin.php:181
 msgid "Enforce HTTPS"
 msgstr "Kötelező HTTPS"
 
-#: templates/admin.php:179
+#: templates/admin.php:182
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr "Kötelezővé teszi, hogy a böngészőprogramok titkosított csatornán kapcsolódjanak az ownCloud szolgáltatáshoz."
 
-#: templates/admin.php:182
+#: templates/admin.php:185
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr "Kérjük, hogy HTTPS protokollt használjon, ha be vagy ki  akarja kapcsolni a kötelező SSL beállítást."
 
-#: templates/admin.php:192
+#: templates/admin.php:195
 msgid "Log"
 msgstr "Naplózás"
 
-#: templates/admin.php:193
+#: templates/admin.php:196
 msgid "Log level"
 msgstr "Naplózási szint"
 
-#: templates/admin.php:220
+#: templates/admin.php:223
 msgid "More"
 msgstr "Több"
 
-#: templates/admin.php:227 templates/personal.php:98
+#: templates/admin.php:230 templates/personal.php:102
 msgid "Version"
 msgstr "Verzió"
 
-#: templates/admin.php:230 templates/personal.php:100
+#: templates/admin.php:233 templates/personal.php:105
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -334,51 +334,51 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "A programot az <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud közösség</a> fejleszti. A <a href=\"https://github.com/owncloud\" target=\"_blank\">forráskód</a> az <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> feltételei mellett használható föl."
 
-#: templates/apps.php:10
+#: templates/apps.php:11
 msgid "Add your App"
 msgstr "Az alkalmazás hozzáadása"
 
-#: templates/apps.php:11
+#: templates/apps.php:12
 msgid "More Apps"
 msgstr "További alkalmazások"
 
-#: templates/apps.php:24
+#: templates/apps.php:28
 msgid "Select an App"
 msgstr "Válasszon egy alkalmazást"
 
-#: templates/apps.php:28
+#: templates/apps.php:34
 msgid "See application page at apps.owncloud.com"
 msgstr "Lásd apps.owncloud.com, alkalmazások oldal"
 
-#: templates/apps.php:29
+#: templates/apps.php:36
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-a jogtuladonos <span class=\"author\"></span>"
 
-#: templates/apps.php:31
+#: templates/apps.php:38
 msgid "Update"
 msgstr "Frissítés"
 
-#: templates/help.php:3
+#: templates/help.php:4
 msgid "User Documentation"
 msgstr "Felhasználói leírás"
 
-#: templates/help.php:4
+#: templates/help.php:6
 msgid "Administrator Documentation"
 msgstr "Üzemeltetői leírás"
 
-#: templates/help.php:6
+#: templates/help.php:9
 msgid "Online Documentation"
 msgstr "Online leírás"
 
-#: templates/help.php:7
+#: templates/help.php:11
 msgid "Forum"
 msgstr "Fórum"
 
-#: templates/help.php:9
+#: templates/help.php:14
 msgid "Bugtracker"
 msgstr "Hibabejelentések"
 
-#: templates/help.php:11
+#: templates/help.php:17
 msgid "Commercial Support"
 msgstr "Megvásárolható támogatás"
 
@@ -387,79 +387,79 @@ msgstr "Megvásárolható támogatás"
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Az Ön tárterület-felhasználása jelenleg: <strong>%s</strong>. Maximálisan ennyi áll rendelkezésére: <strong>%s</strong>"
 
-#: templates/personal.php:14
+#: templates/personal.php:15
 msgid "Get the apps to sync your files"
 msgstr "Töltse le az állományok szinkronizációjához szükséges programokat"
 
-#: templates/personal.php:25
+#: templates/personal.php:26
 msgid "Show First Run Wizard again"
 msgstr "Nézzük meg újra az első bejelentkezéskori segítséget!"
 
-#: templates/personal.php:36 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
 msgid "Password"
 msgstr "Jelszó"
 
-#: templates/personal.php:37
+#: templates/personal.php:38
 msgid "Your password was changed"
 msgstr "A jelszava megváltozott"
 
-#: templates/personal.php:38
+#: templates/personal.php:39
 msgid "Unable to change your password"
 msgstr "A jelszó nem változtatható meg"
 
-#: templates/personal.php:39
+#: templates/personal.php:40
 msgid "Current password"
 msgstr "A jelenlegi jelszó"
 
-#: templates/personal.php:40
+#: templates/personal.php:42
 msgid "New password"
 msgstr "Az új jelszó"
 
-#: templates/personal.php:42
+#: templates/personal.php:44
 msgid "Change password"
 msgstr "A jelszó megváltoztatása"
 
-#: templates/personal.php:54 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:78
 msgid "Display Name"
 msgstr "A megjelenített név"
 
-#: templates/personal.php:55
+#: templates/personal.php:57
 msgid "Your display name was changed"
 msgstr "Az Ön megjelenítési neve megváltozott"
 
-#: templates/personal.php:56
+#: 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:59
+#: templates/personal.php:61
 msgid "Change display name"
 msgstr "A megjelenítési név módosítása"
 
-#: templates/personal.php:68
+#: templates/personal.php:70
 msgid "Email"
 msgstr "Email"
 
-#: templates/personal.php:69
+#: templates/personal.php:72
 msgid "Your email address"
 msgstr "Az Ön email címe"
 
-#: templates/personal.php:70
+#: templates/personal.php:73
 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:76 templates/personal.php:77
+#: templates/personal.php:79 templates/personal.php:80
 msgid "Language"
 msgstr "Nyelv"
 
-#: templates/personal.php:82
+#: templates/personal.php:86
 msgid "Help translate"
 msgstr "Segítsen a fordításban!"
 
-#: templates/personal.php:87
+#: templates/personal.php:91
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:89
+#: templates/personal.php:93
 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."
 
diff --git a/l10n/hu_HU/user_ldap.po b/l10n/hu_HU/user_ldap.po
index b4d5350a18c24d122347e46efd87745ae65b9dc3..3ad1f562736a341f27c99bb62e5eeeff136a83a8 100644
--- a/l10n/hu_HU/user_ldap.po
+++ b/l10n/hu_HU/user_ldap.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 17:20+0000\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"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
@@ -23,17 +23,17 @@ msgstr ""
 msgid "Failed to delete the server configuration"
 msgstr "Nem sikerült törölni a kiszolgáló konfigurációját"
 
-#: ajax/testConfiguration.php:35
+#: ajax/testConfiguration.php:36
 msgid "The configuration is valid and the connection could be established!"
 msgstr "A konfiguráció érvényes, és a kapcsolat létrehozható!"
 
-#: ajax/testConfiguration.php:37
+#: ajax/testConfiguration.php:39
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
 msgstr "A konfiguráció érvényes, de a kapcsolat nem hozható létre. Kérem ellenőrizze a kiszolgáló beállításait, és az elérési adatokat."
 
-#: ajax/testConfiguration.php:40
+#: ajax/testConfiguration.php:43
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
@@ -88,224 +88,248 @@ msgstr "<b>Figyelmeztetés:</b> Az LDAP PHP modul nincs telepítve, ezért ez az
 msgid "Server configuration"
 msgstr "A kiszolgálók beállításai"
 
-#: templates/settings.php:17
+#: templates/settings.php:18
 msgid "Add Server Configuration"
 msgstr "Új kiszolgáló beállításának hozzáadása"
 
-#: templates/settings.php:21
+#: templates/settings.php:23
 msgid "Host"
 msgstr "Kiszolgáló"
 
-#: templates/settings.php:21
+#: templates/settings.php:25
 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:22
+#: templates/settings.php:26
 msgid "Base DN"
 msgstr "DN-gyökér"
 
-#: templates/settings.php:22
+#: templates/settings.php:27
 msgid "One Base DN per line"
 msgstr "Soronként egy DN-gyökér"
 
-#: templates/settings.php:22
+#: templates/settings.php:28
 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:23
+#: templates/settings.php:30
 msgid "User DN"
 msgstr "A kapcsolódó felhasználó DN-je"
 
-#: templates/settings.php:23
+#: templates/settings.php:32
 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:24
+#: templates/settings.php:33
 msgid "Password"
 msgstr "Jelszó"
 
-#: templates/settings.php:24
+#: templates/settings.php:36
 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:25
+#: templates/settings.php:37
 msgid "User Login Filter"
 msgstr "Szűrő a bejelentkezéshez"
 
-#: templates/settings.php:25
+#: templates/settings.php:40
 #, 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:25
+#: templates/settings.php:41
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "használja az %%uid változót, pl. \"uid=%%uid\""
 
-#: templates/settings.php:26
+#: templates/settings.php:42
 msgid "User List Filter"
 msgstr "A felhasználók szűrője"
 
-#: templates/settings.php:26
+#: templates/settings.php:45
 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:26
+#: templates/settings.php:46
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "itt ne használjon változót, pl. \"objectClass=person\"."
 
-#: templates/settings.php:27
+#: templates/settings.php:47
 msgid "Group Filter"
 msgstr "A csoportok szűrője"
 
-#: templates/settings.php:27
+#: templates/settings.php:50
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Ez a szűrő érvényes a csoportok listázásakor."
 
-#: templates/settings.php:27
+#: templates/settings.php:51
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "itt ne használjunk változót, pl. \"objectClass=posixGroup\"."
 
-#: templates/settings.php:31
+#: templates/settings.php:55
 msgid "Connection Settings"
 msgstr "Kapcsolati beállítások"
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "Configuration Active"
 msgstr "A beállítás aktív"
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "When unchecked, this configuration will be skipped."
 msgstr "Ha nincs kipipálva, ez a beállítás kihagyódik."
 
-#: templates/settings.php:34
+#: templates/settings.php:58
 msgid "Port"
 msgstr "Port"
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid "Backup (Replica) Host"
 msgstr "Másodkiszolgáló (replika)"
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 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:36
+#: templates/settings.php:60
 msgid "Backup (Replica) Port"
 msgstr "A másodkiszolgáló (replika) portszáma"
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "Disable Main Server"
 msgstr "A fő szerver kihagyása"
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 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:38
+#: templates/settings.php:62
 msgid "Use TLS"
 msgstr "Használjunk TLS-t"
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 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:39
+#: templates/settings.php:63
 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:40
+#: templates/settings.php:64
 msgid "Turn off SSL certificate validation."
 msgstr "Ne ellenőrizzük az SSL-tanúsítvány érvényességét"
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 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:40
+#: templates/settings.php:64
 msgid "Not recommended, use for testing only."
 msgstr "Nem javasolt, csak tesztelésre érdemes használni."
 
-#: templates/settings.php:41
+#: templates/settings.php:65
+msgid "Cache Time-To-Live"
+msgstr "A gyorsítótár tárolási időtartama"
+
+#: templates/settings.php:65
 msgid "in seconds. A change empties the cache."
 msgstr "másodpercben. A változtatás törli a cache tartalmát."
 
-#: templates/settings.php:43
+#: templates/settings.php:67
 msgid "Directory Settings"
 msgstr "Címtár beállítások"
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "User Display Name Field"
 msgstr "A felhasználónév mezője"
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 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:46
+#: templates/settings.php:70
 msgid "Base User Tree"
 msgstr "A felhasználói fa gyökere"
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "One User Base DN per line"
 msgstr "Soronként egy felhasználói fa gyökerét adhatjuk meg"
 
-#: templates/settings.php:47
+#: templates/settings.php:71
 msgid "User Search Attributes"
 msgstr "A felhasználók lekérdezett attribútumai"
 
-#: templates/settings.php:47 templates/settings.php:50
+#: templates/settings.php:71 templates/settings.php:74
 msgid "Optional; one attribute per line"
 msgstr "Nem kötelező megadni, soronként egy attribútum"
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "Group Display Name Field"
 msgstr "A csoport nevének mezője"
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 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:49
+#: templates/settings.php:73
 msgid "Base Group Tree"
 msgstr "A csoportfa gyökere"
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "One Group Base DN per line"
 msgstr "Soronként egy csoportfa gyökerét adhatjuk meg"
 
-#: templates/settings.php:50
+#: templates/settings.php:74
 msgid "Group Search Attributes"
 msgstr "A csoportok lekérdezett attribútumai"
 
-#: templates/settings.php:51
+#: templates/settings.php:75
 msgid "Group-Member association"
 msgstr "A csoporttagság attribútuma"
 
-#: templates/settings.php:53
+#: templates/settings.php:77
 msgid "Special Attributes"
 msgstr "Különleges attribútumok"
 
-#: templates/settings.php:56
+#: templates/settings.php:79
+msgid "Quota Field"
+msgstr "Kvóta mező"
+
+#: templates/settings.php:80
+msgid "Quota Default"
+msgstr "Alapértelmezett kvóta"
+
+#: templates/settings.php:80
 msgid "in bytes"
 msgstr "bájtban"
 
-#: templates/settings.php:58
+#: templates/settings.php:81
+msgid "Email Field"
+msgstr "Email mező"
+
+#: templates/settings.php:82
+msgid "User Home Folder Naming Rule"
+msgstr "A home könyvtár elérési útvonala"
+
+#: templates/settings.php:82
 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:62
+#: templates/settings.php:86
+msgid "Test Configuration"
+msgstr "A beállítások tesztelése"
+
+#: templates/settings.php:86
 msgid "Help"
 msgstr "Súgó"
diff --git a/l10n/hy/files.po b/l10n/hy/files.po
index 57f0d5ce5f88bce2835e13999c40ec96754c572c..3e3e9ee87c6d0744ec48ad0d49cb88ff2b4a8731 100644
--- a/l10n/hy/files.po
+++ b/l10n/hy/files.po
@@ -7,209 +7,217 @@ 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: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\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: 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/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/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 ""
 
-#: 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:82
+msgid "Invalid directory."
+msgstr ""
+
+#: appinfo/app.php:10
 msgid "Files"
 msgstr ""
 
-#: js/fileactions.js:108 templates/index.php:62
-msgid "Unshare"
+#: js/fileactions.js:125
+msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:110 templates/index.php:64
+#: js/fileactions.js:127 templates/index.php:92 templates/index.php:93
 msgid "Delete"
-msgstr ""
+msgstr "Ջնջել"
 
-#: js/fileactions.js:182
+#: js/fileactions.js:193
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:194 js/filelist.js:196
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
+msgid "Pending"
+msgstr ""
+
+#: js/filelist.js:251 js/filelist.js:253
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:194 js/filelist.js:196
+#: js/filelist.js:251 js/filelist.js:253
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:194
+#: js/filelist.js:251
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:194 js/filelist.js:196
+#: js/filelist.js:251 js/filelist.js:253
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:243
-msgid "replaced {new_name}"
+#: js/filelist.js:298
+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:298
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:245
-msgid "replaced {new_name} with {old_name}"
+#: js/filelist.js:323
+msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:277
-msgid "unshared {files}"
+#: js/files.js:52
+msgid "'.' is an invalid file name."
 msgstr ""
 
-#: js/filelist.js:279
-msgid "deleted {files}"
+#: js/files.js:56
+msgid "File name cannot be empty."
 msgstr ""
 
-#: js/files.js:179
-msgid "generating ZIP-file, it may take some time."
+#: js/files.js:64
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
 msgstr ""
 
-#: js/files.js:214
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
+#: js/files.js:78
+msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:214
-msgid "Upload Error"
+#: js/files.js:82
+msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:242 js/files.js:347 js/files.js:377
-msgid "Pending"
+#: js/files.js:225
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
 msgstr ""
 
 #: js/files.js:262
+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:265 js/files.js:310 js/files.js:325
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr ""
 
-#: js/files.js:328 js/files.js:361
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:430
+#: js/files.js:497
 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:570
+msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:681
-msgid "{count} files scanned"
+#: js/files.js:575
+msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:689
-msgid "error while scanning"
-msgstr ""
-
-#: js/files.js:762 templates/index.php:48
+#: js/files.js:953 templates/index.php:68
 msgid "Name"
 msgstr ""
 
-#: js/files.js:763 templates/index.php:56
+#: js/files.js:954 templates/index.php:79
 msgid "Size"
 msgstr ""
 
-#: js/files.js:764 templates/index.php:58
+#: js/files.js:955 templates/index.php:81
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:791
+#: js/files.js:974
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:793
+#: js/files.js:976
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:801
+#: js/files.js:984
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:803
+#: js/files.js:986
 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"
-msgstr ""
-
-#: js/files.js:857
-msgid "last year"
-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 +228,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 "Պահպանել"
 
 #: 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:40
+msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:27
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:40
-msgid "Nothing in here. Upload something!"
+#: templates/index.php:53
+msgid "You don’t have write permissions here."
 msgstr ""
 
-#: templates/index.php:50
-msgid "Share"
+#: templates/index.php:60
+msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:52
+#: templates/index.php:74
 msgid "Download"
+msgstr "Բեռնել"
+
+#: templates/index.php:86 templates/index.php:87
+msgid "Unshare"
 msgstr ""
 
-#: templates/index.php:75
+#: templates/index.php:106
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:77
+#: templates/index.php:108
 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:113
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:85
+#: templates/index.php:116
 msgid "Current scanning"
 msgstr ""
+
+#: templates/upgrade.php:2
+msgid "Upgrading filesystem cache..."
+msgstr ""
diff --git a/l10n/hy/files_external.po b/l10n/hy/files_external.po
index 3ad25c76e79258193d97f562644c7b2602aa4a82..6563d686916bf5dc7f221e5cfc54fb5ad9844200 100644
--- a/l10n/hy/files_external.po
+++ b/l10n/hy/files_external.po
@@ -7,100 +7,110 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-02 23:16+0200\n"
-"PO-Revision-Date: 2012-10-02 21:17+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
-"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
+"POT-Creation-Date: 2013-02-28 00:04+0100\n"
+"PO-Revision-Date: 2013-02-27 23:04+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
 "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"
 
-#: 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:421
+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
+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 ""
+
 #: templates/settings.php:3
 msgid "External Storage"
 msgstr ""
 
-#: templates/settings.php:7 templates/settings.php:19
-msgid "Mount point"
+#: templates/settings.php:9 templates/settings.php:28
+msgid "Folder name"
 msgstr ""
 
-#: templates/settings.php:8
-msgid "Backend"
+#: templates/settings.php:10
+msgid "External storage"
 msgstr ""
 
-#: templates/settings.php:9
+#: templates/settings.php:11
 msgid "Configuration"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:12
 msgid "Options"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:13
 msgid "Applicable"
 msgstr ""
 
-#: templates/settings.php:23
-msgid "Add mount point"
+#: templates/settings.php:33
+msgid "Add storage"
 msgstr ""
 
-#: templates/settings.php:54 templates/settings.php:62
+#: templates/settings.php:90
 msgid "None set"
 msgstr ""
 
-#: templates/settings.php:63
+#: templates/settings.php:91
 msgid "All Users"
 msgstr ""
 
-#: templates/settings.php:64
+#: templates/settings.php:92
 msgid "Groups"
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:100
 msgid "Users"
 msgstr ""
 
-#: templates/settings.php:77 templates/settings.php:107
+#: templates/settings.php:113 templates/settings.php:114
+#: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
-msgstr ""
+msgstr "Ջնջել"
 
-#: templates/settings.php:87
+#: templates/settings.php:129
 msgid "Enable User External Storage"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:130
 msgid "Allow users to mount their own external storage"
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:141
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:113
+#: templates/settings.php:159
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/hy/files_trashbin.po b/l10n/hy/files_trashbin.po
new file mode 100644
index 0000000000000000000000000000000000000000..b04c3cb98c48dd76cfe7fe62eec1417ec51fc8cd
--- /dev/null
+++ b/l10n/hy/files_trashbin.po
@@ -0,0 +1,80 @@
+# 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-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: 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/delete.php:40
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:41
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/trash.js:7 js/trash.js:96
+msgid "perform restore operation"
+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/hy/settings.po b/l10n/hy/settings.po
index ce1f8ccb809056f9e89be319948364d0c135cbe1..da0084348d80ca4684079ba6f27019115fdb3e5f 100644
--- a/l10n/hy/settings.po
+++ b/l10n/hy/settings.po
@@ -7,96 +7,169 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-09 02:03+0200\n"
-"PO-Revision-Date: 2012-10-09 00:04+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
-"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\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: 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/apps/ocs.php:23
+#: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr ""
 
-#: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
-#: ajax/togglegroups.php:15
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr ""
 
-#: ajax/creategroup.php:19
+#: ajax/changedisplayname.php:32
+msgid "Unable to change display name"
+msgstr ""
+
+#: ajax/creategroup.php:10
 msgid "Group already exists"
 msgstr ""
 
-#: ajax/creategroup.php:28
+#: ajax/creategroup.php:19
 msgid "Unable to add group"
 msgstr ""
 
-#: ajax/enableapp.php:14
+#: ajax/enableapp.php:11
 msgid "Could not enable app. "
 msgstr ""
 
-#: ajax/lostpassword.php:14
+#: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr ""
 
-#: ajax/lostpassword.php:16
+#: ajax/lostpassword.php:14
 msgid "Invalid email"
 msgstr ""
 
-#: ajax/openid.php:16
-msgid "OpenID Changed"
+#: ajax/removegroup.php:13
+msgid "Unable to delete group"
 msgstr ""
 
-#: ajax/openid.php:18 ajax/setlanguage.php:20 ajax/setlanguage.php:23
-msgid "Invalid request"
+#: ajax/removeuser.php:24
+msgid "Unable to delete user"
 msgstr ""
 
-#: ajax/removegroup.php:16
-msgid "Unable to delete group"
+#: ajax/setlanguage.php:15
+msgid "Language changed"
 msgstr ""
 
-#: ajax/removeuser.php:22
-msgid "Unable to delete user"
+#: ajax/setlanguage.php:17 ajax/setlanguage.php:20
+msgid "Invalid request"
 msgstr ""
 
-#: ajax/setlanguage.php:18
-msgid "Language changed"
+#: ajax/togglegroups.php:12
+msgid "Admins can't remove themself from the admin group"
 msgstr ""
 
-#: ajax/togglegroups.php:25
+#: ajax/togglegroups.php:30
 #, php-format
 msgid "Unable to add user to group %s"
 msgstr ""
 
-#: ajax/togglegroups.php:31
+#: ajax/togglegroups.php:36
 #, php-format
 msgid "Unable to remove user from group %s"
 msgstr ""
 
-#: js/apps.js:28 js/apps.js:65
+#: ajax/updateapp.php:14
+msgid "Couldn't update app."
+msgstr ""
+
+#: js/apps.js:30
+msgid "Update to {appversion}"
+msgstr ""
+
+#: js/apps.js:36 js/apps.js:76
 msgid "Disable"
 msgstr ""
 
-#: js/apps.js:28 js/apps.js:54
+#: js/apps.js:36 js/apps.js:64
 msgid "Enable"
 msgstr ""
 
-#: js/personal.js:69
+#: js/apps.js:55
+msgid "Please wait...."
+msgstr ""
+
+#: js/apps.js:84
+msgid "Updating...."
+msgstr ""
+
+#: js/apps.js:87
+msgid "Error while updating app"
+msgstr ""
+
+#: js/apps.js:87
+msgid "Error"
+msgstr ""
+
+#: js/apps.js:90
+msgid "Updated"
+msgstr ""
+
+#: js/personal.js:99
 msgid "Saving..."
 msgstr ""
 
-#: personal.php:47 personal.php:48
+#: js/users.js:30
+msgid "deleted"
+msgstr ""
+
+#: js/users.js:30
+msgid "undo"
+msgstr ""
+
+#: js/users.js:62
+msgid "Unable to remove user"
+msgstr ""
+
+#: js/users.js:75 templates/users.php:26 templates/users.php:80
+#: templates/users.php:105
+msgid "Groups"
+msgstr ""
+
+#: js/users.js:78 templates/users.php:82 templates/users.php:119
+msgid "Group Admin"
+msgstr ""
+
+#: js/users.js:99 templates/users.php:161
+msgid "Delete"
+msgstr "Ջնջել"
+
+#: js/users.js:191
+msgid "add group"
+msgstr ""
+
+#: js/users.js:352
+msgid "A valid username must be provided"
+msgstr ""
+
+#: js/users.js:353 js/users.js:359 js/users.js:374
+msgid "Error creating user"
+msgstr ""
+
+#: js/users.js:358
+msgid "A valid password must be provided"
+msgstr ""
+
+#: personal.php:29 personal.php:30
 msgid "__language_name__"
 msgstr ""
 
-#: templates/admin.php:14
+#: templates/admin.php:15
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:17
+#: templates/admin.php:18
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file that ownCloud provides is not working. We "
@@ -105,71 +178,149 @@ msgid ""
 " webserver document root."
 msgstr ""
 
-#: templates/admin.php:31
+#: templates/admin.php:29
+msgid "Setup Warning"
+msgstr ""
+
+#: templates/admin.php:32
+msgid ""
+"Your web server is not yet properly setup to allow files synchronization "
+"because the WebDAV interface seems to be broken."
+msgstr ""
+
+#: templates/admin.php:33
+#, php-format
+msgid "Please double check the <a href='%s'>installation guides</a>."
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Module 'fileinfo' missing"
+msgstr ""
+
+#: templates/admin.php:47
+msgid ""
+"The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
+"module to get best results with mime-type detection."
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Locale not working"
+msgstr ""
+
+#: templates/admin.php:63
+#, php-format
+msgid ""
+"This ownCloud server can't set system locale to %s. This means that there "
+"might be problems with certain characters in file names. We strongly suggest"
+" to install the required packages on your system to support %s."
+msgstr ""
+
+#: templates/admin.php:75
+msgid "Internet connection not working"
+msgstr ""
+
+#: templates/admin.php:78
+msgid ""
+"This ownCloud server has no working internet connection. This means that "
+"some of the features like mounting of external storage, notifications about "
+"updates or installation of 3rd party apps don´t work. Accessing files from "
+"remote and sending of notification emails might also not work. We suggest to"
+" enable internet connection for this server if you want to have all features"
+" of ownCloud."
+msgstr ""
+
+#: templates/admin.php:92
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:37
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:43
+#: templates/admin.php:111
 msgid ""
 "cron.php is registered at a webcron service. Call the cron.php page in the "
 "owncloud root once a minute over http."
 msgstr ""
 
-#: templates/admin.php:49
+#: templates/admin.php:121
 msgid ""
 "Use systems cron service. Call the cron.php file in the owncloud folder via "
 "a system cronjob once a minute."
 msgstr ""
 
-#: templates/admin.php:56
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:61
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:62
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:67
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:68
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:73
+#: templates/admin.php:150
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:74
+#: templates/admin.php:151
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:79
+#: templates/admin.php:158
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:81
+#: templates/admin.php:161
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:88
+#: templates/admin.php:168
+msgid "Security"
+msgstr ""
+
+#: templates/admin.php:181
+msgid "Enforce HTTPS"
+msgstr ""
+
+#: templates/admin.php:182
+msgid ""
+"Enforces the clients to connect to ownCloud via an encrypted connection."
+msgstr ""
+
+#: templates/admin.php:185
+msgid ""
+"Please connect to this ownCloud instance via HTTPS to enable or disable the "
+"SSL enforcement."
+msgstr ""
+
+#: templates/admin.php:195
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:116
+#: templates/admin.php:196
+msgid "Log level"
+msgstr ""
+
+#: templates/admin.php:223
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:124
+#: templates/admin.php:230 templates/personal.php:102
+msgid "Version"
+msgstr ""
+
+#: templates/admin.php:233 templates/personal.php:105
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -179,121 +330,137 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr ""
 
-#: templates/apps.php:10
+#: templates/apps.php:11
 msgid "Add your App"
 msgstr ""
 
-#: templates/apps.php:11
+#: templates/apps.php:12
 msgid "More Apps"
 msgstr ""
 
-#: templates/apps.php:27
+#: templates/apps.php:28
 msgid "Select an App"
 msgstr ""
 
-#: templates/apps.php:31
+#: templates/apps.php:34
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:32
+#: templates/apps.php:36
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
-#: templates/help.php:9
-msgid "Documentation"
+#: templates/apps.php:38
+msgid "Update"
 msgstr ""
 
-#: templates/help.php:10
-msgid "Managing Big Files"
+#: templates/help.php:4
+msgid "User Documentation"
 msgstr ""
 
-#: templates/help.php:11
-msgid "Ask a question"
+#: templates/help.php:6
+msgid "Administrator Documentation"
+msgstr ""
+
+#: templates/help.php:9
+msgid "Online Documentation"
 msgstr ""
 
-#: templates/help.php:23
-msgid "Problems connecting to help database."
+#: templates/help.php:11
+msgid "Forum"
 msgstr ""
 
-#: templates/help.php:24
-msgid "Go there manually."
+#: templates/help.php:14
+msgid "Bugtracker"
 msgstr ""
 
-#: templates/help.php:32
-msgid "Answer"
+#: templates/help.php:17
+msgid "Commercial Support"
 msgstr ""
 
 #: templates/personal.php:8
 #, php-format
-msgid "You have used <strong>%s</strong> of the available <strong>%s<strong>"
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:12
-msgid "Desktop and Mobile Syncing Clients"
+#: templates/personal.php:15
+msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:13
-msgid "Download"
+#: templates/personal.php:26
+msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:19
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
+msgid "Password"
+msgstr ""
+
+#: templates/personal.php:38
 msgid "Your password was changed"
 msgstr ""
 
-#: templates/personal.php:20
+#: templates/personal.php:39
 msgid "Unable to change your password"
 msgstr ""
 
-#: templates/personal.php:21
+#: templates/personal.php:40
 msgid "Current password"
 msgstr ""
 
-#: templates/personal.php:22
+#: templates/personal.php:42
 msgid "New password"
 msgstr ""
 
-#: templates/personal.php:23
-msgid "show"
+#: templates/personal.php:44
+msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:24
-msgid "Change password"
+#: templates/personal.php:56 templates/users.php:78
+msgid "Display Name"
+msgstr ""
+
+#: templates/personal.php:57
+msgid "Your display name was changed"
 msgstr ""
 
-#: templates/personal.php:30
+#: 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
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:31
+#: templates/personal.php:72
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:32
+#: templates/personal.php:73
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:38 templates/personal.php:39
+#: templates/personal.php:79 templates/personal.php:80
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:44
+#: templates/personal.php:86
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:51
-msgid "use this address to connect to your ownCloud in your file manager"
-msgstr ""
-
-#: templates/users.php:21 templates/users.php:76
-msgid "Name"
+#: templates/personal.php:91
+msgid "WebDAV"
 msgstr ""
 
-#: templates/users.php:23 templates/users.php:77
-msgid "Password"
+#: templates/personal.php:93
+msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
-#: templates/users.php:26 templates/users.php:78 templates/users.php:98
-msgid "Groups"
+#: templates/users.php:21 templates/users.php:77
+msgid "Login Name"
 msgstr ""
 
 #: templates/users.php:32
@@ -301,21 +468,29 @@ msgid "Create"
 msgstr ""
 
 #: templates/users.php:35
-msgid "Default Quota"
+msgid "Default Storage"
+msgstr ""
+
+#: templates/users.php:41 templates/users.php:139
+msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:55 templates/users.php:138
+#: templates/users.php:59 templates/users.php:154
 msgid "Other"
+msgstr "Այլ"
+
+#: templates/users.php:84
+msgid "Storage"
 msgstr ""
 
-#: templates/users.php:80 templates/users.php:112
-msgid "Group Admin"
+#: templates/users.php:95
+msgid "change display name"
 msgstr ""
 
-#: templates/users.php:82
-msgid "Quota"
+#: templates/users.php:99
+msgid "set new password"
 msgstr ""
 
-#: templates/users.php:146
-msgid "Delete"
+#: templates/users.php:134
+msgid "Default"
 msgstr ""
diff --git a/l10n/ia/core.po b/l10n/ia/core.po
index 385d32959dc1ff3ee3cb54051429244c1fe3e669..d545c83f5ee71e2836b605bd102db909e6661069 100644
--- a/l10n/ia/core.po
+++ b/l10n/ia/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-09 00:12+0100\n"
-"PO-Revision-Date: 2013-02-08 23:12+0000\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"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -157,59 +157,59 @@ msgstr "Novembre"
 msgid "December"
 msgstr "Decembre"
 
-#: js/js.js:284
+#: js/js.js:286
 msgid "Settings"
 msgstr "Configurationes"
 
-#: js/js.js:764
+#: js/js.js:767
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:765
+#: js/js.js:768
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:766
+#: js/js.js:769
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:767
+#: js/js.js:770
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:768
+#: js/js.js:771
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:769
+#: js/js.js:772
 msgid "today"
 msgstr ""
 
-#: js/js.js:770
+#: js/js.js:773
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:771
+#: js/js.js:774
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:772
+#: js/js.js:775
 msgid "last month"
 msgstr ""
 
-#: js/js.js:773
+#: js/js.js:776
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:774
+#: js/js.js:777
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:775
+#: js/js.js:778
 msgid "last year"
 msgstr ""
 
-#: js/js.js:776
+#: js/js.js:779
 msgid "years ago"
 msgstr ""
 
@@ -239,8 +239,8 @@ 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:195 js/share.js:152 js/share.js:159 js/share.js:582
+#: js/share.js:594
 msgid "Error"
 msgstr ""
 
@@ -252,15 +252,15 @@ 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 "Compartir"
-
-#: js/share.js:29 js/share.js:43 js/share.js:90 js/share.js:93
+#: js/share.js:29 js/share.js:43 js/share.js:90
 msgid "Shared"
 msgstr ""
 
-#: js/share.js:141 js/share.js:611
+#: js/share.js:93
+msgid "Share"
+msgstr "Compartir"
+
+#: js/share.js:141 js/share.js:622
 msgid "Error while sharing"
 msgstr ""
 
@@ -356,23 +356,23 @@ msgstr ""
 msgid "share"
 msgstr ""
 
-#: js/share.js:373 js/share.js:558
+#: js/share.js:373 js/share.js:569
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:571
+#: js/share.js:582
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:583
+#: js/share.js:594
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:598
+#: js/share.js:609
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:609
+#: js/share.js:620
 msgid "Email sent"
 msgstr ""
 
@@ -387,7 +387,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 "Reinitialisation del contrasigno de ownCLoud"
 
diff --git a/l10n/ia/files.po b/l10n/ia/files.po
index 633ccdec7d22f5b487171e3d34da2d273e5c9174..0494da5e957c21d72159cf0fd859c62194ad372c 100644
--- a/l10n/ia/files.po
+++ b/l10n/ia/files.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\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: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -52,27 +52,27 @@ msgid ""
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:31
+#: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
 msgstr "Le file incargate solmente esseva incargate partialmente"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:31
 msgid "No file was uploaded"
 msgstr "Nulle file esseva incargate"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:32
 msgid "Missing a temporary folder"
 msgstr "Manca un dossier temporari"
 
-#: ajax/upload.php:34
+#: ajax/upload.php:33
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:52
+#: ajax/upload.php:51
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:83
+#: ajax/upload.php:82
 msgid "Invalid directory."
 msgstr ""
 
@@ -84,7 +84,7 @@ msgstr "Files"
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:127 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:127 templates/index.php:92 templates/index.php:93
 msgid "Delete"
 msgstr "Deler"
 
@@ -92,40 +92,36 @@ msgstr "Deler"
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:253
+#: js/filelist.js:251
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:295
-msgid "replaced {new_name}"
+#: js/filelist.js:298
+msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:295 js/filelist.js:297
+#: js/filelist.js:298
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:297
-msgid "replaced {new_name} with {old_name}"
-msgstr ""
-
-#: js/filelist.js:322
+#: js/filelist.js:323
 msgid "perform delete operation"
 msgstr ""
 
@@ -151,74 +147,74 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:224
+#: js/files.js:225
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:261
+#: js/files.js:262
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:261
+#: js/files.js:262
 msgid "Upload Error"
 msgstr ""
 
-#: js/files.js:272
+#: js/files.js:273
 msgid "Close"
 msgstr "Clauder"
 
-#: js/files.js:311
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr ""
 
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr ""
 
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:496
+#: js/files.js:497
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:569
+#: js/files.js:570
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:574
+#: js/files.js:575
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:953 templates/index.php:68
 msgid "Name"
 msgstr "Nomine"
 
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:954 templates/index.php:79
 msgid "Size"
 msgstr "Dimension"
 
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:955 templates/index.php:81
 msgid "Modified"
 msgstr "Modificate"
 
-#: js/files.js:969
+#: js/files.js:974
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:971
+#: js/files.js:976
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:979
+#: js/files.js:984
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:981
+#: js/files.js:986
 msgid "{count} files"
 msgstr ""
 
@@ -282,33 +278,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:53
+msgid "You don’t have write permissions here."
+msgstr ""
+
+#: templates/index.php:60
 msgid "Nothing in here. Upload something!"
 msgstr "Nihil hic. Incarga alcun cosa!"
 
-#: templates/index.php:73
+#: templates/index.php:74
 msgid "Download"
 msgstr "Discargar"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:86 templates/index.php:87
 msgid "Unshare"
 msgstr ""
 
-#: templates/index.php:105
+#: templates/index.php:106
 msgid "Upload too large"
 msgstr "Incargamento troppo longe"
 
-#: templates/index.php:107
+#: templates/index.php:108
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:112
+#: templates/index.php:113
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:115
+#: templates/index.php:116
 msgid "Current scanning"
 msgstr ""
 
diff --git a/l10n/ia/files_external.po b/l10n/ia/files_external.po
index 7fa22302eb44bbd2661cf5e63dd62ed52036ce81..e79169bb213912f7531c2dc92ba30332fa479c4c 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: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-11 23:22+0000\n"
+"POT-Creation-Date: 2013-02-28 00:04+0100\n"
+"PO-Revision-Date: 2013-02-27 23:04+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -17,37 +17,33 @@ msgstr ""
 "Language: ia\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:421
 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:424
 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 "
@@ -58,63 +54,63 @@ msgstr ""
 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 "Gruppos"
 
-#: templates/settings.php:95
+#: templates/settings.php:100
 msgid "Users"
 msgstr "Usatores"
 
-#: 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 "Deler"
 
-#: 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/ia/files_trashbin.po b/l10n/ia/files_trashbin.po
index adba7ebd96f21f352c9961953700f6b8e101c414..8f143679d149fdde995b4b087eef6c4add5de10b 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-02-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 10:07+0000\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: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Language: ia\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:22
+#: ajax/delete.php:40
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
@@ -27,35 +27,39 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:33
+#: js/trash.js:34
 msgid "delete file permanently"
 msgstr ""
 
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr ""
+
+#: js/trash.js:174 templates/index.php:17
 msgid "Name"
 msgstr "Nomine"
 
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:175 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:135
+#: js/trash.js:184
 msgid "1 folder"
 msgstr ""
 
-#: js/trash.js:137
+#: js/trash.js:186
 msgid "{count} folders"
 msgstr ""
 
-#: js/trash.js:145
+#: js/trash.js:194
 msgid "1 file"
 msgstr ""
 
-#: js/trash.js:147
+#: js/trash.js:196
 msgid "{count} files"
 msgstr ""
 
@@ -66,3 +70,11 @@ msgstr ""
 #: templates/index.php:20 templates/index.php:22
 msgid "Restore"
 msgstr ""
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr "Deler"
+
+#: templates/part.breadcrumb.php:9
+msgid "Deleted Files"
+msgstr ""
diff --git a/l10n/ia/files_versions.po b/l10n/ia/files_versions.po
index f3b805ad9322a235f4a3733aaf16188284f987d3..400157adb8f57fcc68a26bbac5377d214bc9fbd8 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-08 00:10+0100\n"
-"PO-Revision-Date: 2013-02-07 23:11+0000\n"
+"POT-Creation-Date: 2013-02-28 00:04+0100\n"
+"PO-Revision-Date: 2013-02-27 23:04+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -48,18 +48,10 @@ msgstr ""
 msgid "No path specified"
 msgstr ""
 
-#: js/versions.js:16
-msgid "History"
+#: 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 ""
-
-#: templates/settings.php:3
-msgid "Files Versioning"
-msgstr ""
-
-#: templates/settings.php:4
-msgid "Enable"
-msgstr ""
diff --git a/l10n/ia/lib.po b/l10n/ia/lib.po
index bcd34dae7d36873706704c4d37482eb6b284a7ec..2bb101b7e714032c72387c42386a600c413f126c 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-11 15:39+0100\n"
-"PO-Revision-Date: 2013-02-11 14:40+0000\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: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -17,27 +17,27 @@ msgstr ""
 "Language: ia\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:339
+#: app.php:349
 msgid "Help"
 msgstr "Adjuta"
 
-#: app.php:346
+#: app.php:362
 msgid "Personal"
 msgstr "Personal"
 
-#: app.php:351
+#: app.php:373
 msgid "Settings"
 msgstr "Configurationes"
 
-#: app.php:356
+#: app.php:385
 msgid "Users"
 msgstr "Usatores"
 
-#: app.php:363
+#: app.php:398
 msgid "Apps"
 msgstr ""
 
-#: app.php:365
+#: app.php:406
 msgid "Admin"
 msgstr ""
 
@@ -49,15 +49,15 @@ msgstr ""
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:203 files.php:228
+#: files.php:204 files.php:231
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:227
+#: files.php:228
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: helper.php:226
+#: helper.php:228
 msgid "couldn't be determined"
 msgstr ""
 
@@ -97,87 +97,92 @@ msgstr ""
 msgid "Specify a data folder."
 msgstr ""
 
-#: setup.php:53
+#: setup.php:55
 #, php-format
 msgid "%s enter the database username."
 msgstr ""
 
-#: setup.php:56
+#: setup.php:58
 #, php-format
 msgid "%s enter the database name."
 msgstr ""
 
-#: setup.php:59
+#: setup.php:61
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr ""
 
-#: setup.php:62
+#: setup.php:64
 #, php-format
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:126 setup.php:291 setup.php:336
+#: setup.php:128 setup.php:320 setup.php:365
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:127 setup.php:150 setup.php:204
+#: setup.php:129 setup.php:152 setup.php:229
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:149 setup.php:423 setup.php:489
+#: setup.php:151 setup.php:453 setup.php:520
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:203
+#: setup.php:228
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:255 setup.php:357 setup.php:366 setup.php:384 setup.php:394
-#: setup.php:403 setup.php:430 setup.php:496 setup.php:522 setup.php:529
-#: setup.php:540 setup.php:547 setup.php:556 setup.php:564 setup.php:573
-#: setup.php:579
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:256 setup.php:358 setup.php:367 setup.php:385 setup.php:395
-#: setup.php:404 setup.php:431 setup.php:497 setup.php:523 setup.php:530
-#: setup.php:541 setup.php:557 setup.php:565 setup.php:574
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:270
+#: setup.php:299
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:271
+#: setup.php:300
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:276
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:277
+#: setup.php:306
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:548 setup.php:580
+#: setup.php:579 setup.php:611
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:644
+#: setup.php:631
+#, php-format
+msgid "MS SQL username and/or password not valid: %s"
+msgstr ""
+
+#: setup.php:849
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:645
+#: setup.php:850
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
@@ -234,16 +239,16 @@ msgstr ""
 msgid "years ago"
 msgstr ""
 
-#: updater.php:75
+#: updater.php:78
 #, php-format
 msgid "%s is available. Get <a href=\"%s\">more information</a>"
 msgstr ""
 
-#: updater.php:77
+#: updater.php:81
 msgid "up to date"
 msgstr ""
 
-#: updater.php:80
+#: updater.php:84
 msgid "updates check is disabled"
 msgstr ""
 
diff --git a/l10n/ia/settings.po b/l10n/ia/settings.po
index 774eb8a094722b30fcf8478f243c6cc419fc01a7..3be4a6973418f4ba3ffbff5d8f0e7c6b3999a38d 100644
--- a/l10n/ia/settings.po
+++ b/l10n/ia/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 23:05+0000\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: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -23,8 +23,8 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr ""
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:15
-#: ajax/togglegroups.php:18
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr ""
 
@@ -72,12 +72,12 @@ msgstr "Requesta invalide"
 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 ""
@@ -118,7 +118,7 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:96
+#: js/personal.js:99
 msgid "Saving..."
 msgstr ""
 
@@ -147,23 +147,23 @@ msgstr ""
 msgid "Delete"
 msgstr "Deler"
 
-#: js/users.js:190
+#: js/users.js:191
 msgid "add group"
 msgstr ""
 
-#: js/users.js:351
+#: js/users.js:352
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:357
+#: js/users.js:358
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
 msgid "__language_name__"
 msgstr "Interlingua"
 
@@ -209,19 +209,19 @@ msgstr ""
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:61
+#: templates/admin.php:63
+#, php-format
 msgid ""
-"This ownCloud server can't set system locale to "
-"\"en_US.UTF-8\"/\"en_US.UTF8\". 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 en_US.UTF-8/en_US.UTF8."
+"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:72
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:75
+#: 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 "
@@ -231,98 +231,98 @@ msgid ""
 " of ownCloud."
 msgstr ""
 
-#: templates/admin.php:89
+#: templates/admin.php:92
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:98
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:108
+#: 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:118
+#: 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:125
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:131
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:132
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:140
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:147
+#: templates/admin.php:150
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:148
+#: templates/admin.php:151
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:155
+#: templates/admin.php:158
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:161
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:165
+#: templates/admin.php:168
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:181
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:179
+#: templates/admin.php:182
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:182
+#: templates/admin.php:185
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr ""
 
-#: templates/admin.php:192
+#: templates/admin.php:195
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:193
+#: templates/admin.php:196
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:220
+#: templates/admin.php:223
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:227 templates/personal.php:98
+#: templates/admin.php:230 templates/personal.php:102
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:230 templates/personal.php:100
+#: templates/admin.php:233 templates/personal.php:105
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -332,51 +332,51 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr ""
 
-#: templates/apps.php:10
+#: templates/apps.php:11
 msgid "Add your App"
 msgstr "Adder tu application"
 
-#: templates/apps.php:11
+#: templates/apps.php:12
 msgid "More Apps"
 msgstr ""
 
-#: templates/apps.php:24
+#: templates/apps.php:28
 msgid "Select an App"
 msgstr "Selectionar un app"
 
-#: templates/apps.php:28
+#: templates/apps.php:34
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:29
+#: templates/apps.php:36
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
-#: templates/apps.php:31
+#: templates/apps.php:38
 msgid "Update"
 msgstr "Actualisar"
 
-#: templates/help.php:3
+#: 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 ""
 
@@ -385,79 +385,79 @@ msgstr ""
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:14
+#: templates/personal.php:15
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:25
+#: templates/personal.php:26
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:36 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
 msgid "Password"
 msgstr "Contrasigno"
 
-#: templates/personal.php:37
+#: templates/personal.php:38
 msgid "Your password was changed"
 msgstr ""
 
-#: templates/personal.php:38
+#: templates/personal.php:39
 msgid "Unable to change your password"
 msgstr "Non pote cambiar tu contrasigno"
 
-#: templates/personal.php:39
+#: templates/personal.php:40
 msgid "Current password"
 msgstr "Contrasigno currente"
 
-#: templates/personal.php:40
+#: templates/personal.php:42
 msgid "New password"
 msgstr "Nove contrasigno"
 
-#: templates/personal.php:42
+#: templates/personal.php:44
 msgid "Change password"
 msgstr "Cambiar contrasigno"
 
-#: templates/personal.php:54 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:78
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:55
+#: templates/personal.php:57
 msgid "Your display name was changed"
 msgstr ""
 
-#: templates/personal.php:56
+#: templates/personal.php:58
 msgid "Unable to change your display name"
 msgstr ""
 
-#: templates/personal.php:59
+#: templates/personal.php:61
 msgid "Change display name"
 msgstr ""
 
-#: templates/personal.php:68
+#: templates/personal.php:70
 msgid "Email"
 msgstr "E-posta"
 
-#: templates/personal.php:69
+#: templates/personal.php:72
 msgid "Your email address"
 msgstr "Tu adresse de e-posta"
 
-#: templates/personal.php:70
+#: templates/personal.php:73
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:76 templates/personal.php:77
+#: templates/personal.php:79 templates/personal.php:80
 msgid "Language"
 msgstr "Linguage"
 
-#: templates/personal.php:82
+#: templates/personal.php:86
 msgid "Help translate"
 msgstr "Adjuta a traducer"
 
-#: templates/personal.php:87
+#: templates/personal.php:91
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:89
+#: templates/personal.php:93
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
diff --git a/l10n/ia/user_ldap.po b/l10n/ia/user_ldap.po
index 4c35ec082991ebdc605647d0cf19eb283430baa3..602cde8f9a6ae544b591aa8b8d911182c86ca937 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-02-08 00:10+0100\n"
-"PO-Revision-Date: 2013-02-07 23:11+0000\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: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -21,17 +21,17 @@ msgstr ""
 msgid "Failed to delete the server configuration"
 msgstr ""
 
-#: ajax/testConfiguration.php:35
+#: ajax/testConfiguration.php:36
 msgid "The configuration is valid and the connection could be established!"
 msgstr ""
 
-#: ajax/testConfiguration.php:37
+#: ajax/testConfiguration.php:39
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
 msgstr ""
 
-#: ajax/testConfiguration.php:40
+#: ajax/testConfiguration.php:43
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
@@ -86,224 +86,248 @@ msgstr ""
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:17
+#: templates/settings.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:23
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:25
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:26
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:27
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:28
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:32
 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:24
+#: templates/settings.php:33
 msgid "Password"
 msgstr ""
 
-#: templates/settings.php:24
+#: templates/settings.php:36
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:37
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:40
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:41
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:42
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:45
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:46
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:47
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:50
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:51
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:55
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:34
+#: templates/settings.php:58
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:60
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:39
+#: templates/settings.php:63
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:65
+msgid "Cache Time-To-Live"
+msgstr ""
+
+#: templates/settings.php:65
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:67
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:47
+#: templates/settings.php:71
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:47 templates/settings.php:50
+#: templates/settings.php:71 templates/settings.php:74
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:74
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:75
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:77
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:79
+msgid "Quota Field"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Quota Default"
+msgstr ""
+
+#: templates/settings.php:80
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:81
+msgid "Email Field"
+msgstr ""
+
+#: templates/settings.php:82
+msgid "User Home Folder Naming Rule"
+msgstr ""
+
+#: templates/settings.php:82
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:62
+#: templates/settings.php:86
+msgid "Test Configuration"
+msgstr ""
+
+#: templates/settings.php:86
 msgid "Help"
 msgstr "Adjuta"
diff --git a/l10n/id/core.po b/l10n/id/core.po
index 3ddaac2d1324ff4e688261e0070d9e19c33330bb..181a4aff126287f349ab23334cdc2727aca12a3d 100644
--- a/l10n/id/core.po
+++ b/l10n/id/core.po
@@ -3,6 +3,7 @@
 # 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.
@@ -11,9 +12,9 @@ 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 14:32+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "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"
@@ -21,24 +22,24 @@ msgstr ""
 "Language: id\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 "
@@ -47,7 +48,7 @@ msgstr ""
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
-msgstr ""
+msgstr "Tipe kategori tidak diberikan."
 
 #: ajax/vcategories/add.php:30
 msgid "No category to add?"
@@ -56,24 +57,24 @@ msgstr "Tidak ada kategori yang akan ditambahkan?"
 #: ajax/vcategories/add.php:37
 #, php-format
 msgid "This category already exists: %s"
-msgstr ""
+msgstr "Kategori ini sudah ada: %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 "Tipe obyek tidak diberikan."
 
 #: ajax/vcategories/addToFavorites.php:30
 #: ajax/vcategories/removeFromFavorites.php:30
 #, php-format
 msgid "%s ID not provided."
-msgstr ""
+msgstr "%s ID tidak diberikan."
 
 #: ajax/vcategories/addToFavorites.php:35
 #, php-format
 msgid "Error adding %s to favorites."
-msgstr ""
+msgstr "Kesalahan menambah %s ke favorit"
 
 #: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
 msgid "No categories selected for deletion."
@@ -82,81 +83,81 @@ msgstr "Tidak ada kategori terpilih untuk penghapusan."
 #: ajax/vcategories/removeFromFavorites.php:35
 #, php-format
 msgid "Error removing %s from favorites."
-msgstr ""
+msgstr "Kesalahan menghapus %s dari favorit"
 
-#: js/config.php:32
+#: js/config.php:34
 msgid "Sunday"
 msgstr "minggu"
 
-#: js/config.php:32
+#: js/config.php:35
 msgid "Monday"
 msgstr "senin"
 
-#: 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 "kamis"
 
-#: js/config.php:32
+#: js/config.php:39
 msgid "Friday"
 msgstr "jumat"
 
-#: 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 "Maret"
 
-#: 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 "Agustus"
 
-#: 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 "Nopember"
 
-#: js/config.php:33
+#: js/config.php:56
 msgid "December"
 msgstr "Desember"
 
@@ -164,55 +165,55 @@ msgstr "Desember"
 msgid "Settings"
 msgstr "Setelan"
 
-#: js/js.js:767
+#: js/js.js:777
 msgid "seconds ago"
 msgstr "beberapa detik yang lalu"
 
-#: js/js.js:768
+#: js/js.js:778
 msgid "1 minute ago"
 msgstr "1 menit lalu"
 
-#: js/js.js:769
+#: js/js.js:779
 msgid "{minutes} minutes ago"
-msgstr ""
+msgstr "{minutes} menit yang lalu"
 
-#: js/js.js:770
+#: js/js.js:780
 msgid "1 hour ago"
-msgstr ""
+msgstr "1 jam yang lalu"
 
-#: js/js.js:771
+#: js/js.js:781
 msgid "{hours} hours ago"
-msgstr ""
+msgstr "{hours} jam yang lalu"
 
-#: js/js.js:772
+#: js/js.js:782
 msgid "today"
 msgstr "hari ini"
 
-#: js/js.js:773
+#: js/js.js:783
 msgid "yesterday"
 msgstr "kemarin"
 
-#: js/js.js:774
+#: js/js.js:784
 msgid "{days} days ago"
-msgstr ""
+msgstr "{days} hari yang lalu"
 
-#: js/js.js:775
+#: js/js.js:785
 msgid "last month"
 msgstr "bulan kemarin"
 
-#: js/js.js:776
+#: js/js.js:786
 msgid "{months} months ago"
-msgstr ""
+msgstr "{months} bulan yang lalu"
 
-#: js/js.js:777
+#: js/js.js:787
 msgid "months ago"
 msgstr "beberapa bulan lalu"
 
-#: js/js.js:778
+#: js/js.js:788
 msgid "last year"
 msgstr "tahun kemarin"
 
-#: js/js.js:779
+#: js/js.js:789
 msgid "years ago"
 msgstr "beberapa tahun lalu"
 
@@ -257,11 +258,11 @@ msgstr ""
 
 #: js/share.js:29 js/share.js:43 js/share.js:90
 msgid "Shared"
-msgstr ""
+msgstr "Terbagi"
 
 #: js/share.js:93
 msgid "Share"
-msgstr "berbagi"
+msgstr "Bagi"
 
 #: js/share.js:141 js/share.js:622
 msgid "Error while sharing"
@@ -295,17 +296,17 @@ msgstr "bagikan dengan tautan"
 msgid "Password protect"
 msgstr "lindungi dengan kata kunci"
 
-#: js/share.js:185 templates/installation.php:44 templates/login.php:35
+#: js/share.js:185 templates/installation.php:47 templates/login.php:35
 msgid "Password"
 msgstr "Password"
 
 #: js/share.js:189
 msgid "Email link to person"
-msgstr ""
+msgstr "Email link ini ke orang"
 
 #: js/share.js:190
 msgid "Send"
-msgstr ""
+msgstr "Kirim"
 
 #: js/share.js:194
 msgid "Set expiration date"
@@ -373,11 +374,11 @@ msgstr "gagal memasang tanggal kadaluarsa"
 
 #: js/share.js:609
 msgid "Sending ..."
-msgstr ""
+msgstr "Sedang mengirim ..."
 
 #: js/share.js:620
 msgid "Email sent"
-msgstr ""
+msgstr "Email terkirim"
 
 #: js/update.js:14
 msgid ""
@@ -388,9 +389,9 @@ msgstr ""
 
 #: js/update.js:18
 msgid "The update was successful. Redirecting you to ownCloud now."
-msgstr ""
+msgstr "Update sukses. Membawa anda ke ownCloud sekarang."
 
-#: lostpassword/controller.php:47
+#: lostpassword/controller.php:48
 msgid "ownCloud password reset"
 msgstr "reset password ownCloud"
 
@@ -408,9 +409,9 @@ msgstr ""
 
 #: lostpassword/templates/lostpassword.php:8
 msgid "Request failed!"
-msgstr ""
+msgstr "Permintaan gagal!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:39
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:41
 #: templates/login.php:28
 msgid "Username"
 msgstr "Username"
@@ -471,85 +472,86 @@ msgstr "Edit kategori"
 msgid "Add"
 msgstr "Tambahkan"
 
-#: templates/installation.php:23 templates/installation.php:30
+#: templates/installation.php:24 templates/installation.php:31
 msgid "Security Warning"
 msgstr "peringatan keamanan"
 
-#: templates/installation.php:24
+#: templates/installation.php:25
 msgid ""
 "No secure random number generator is available, please enable the PHP "
 "OpenSSL extension."
 msgstr ""
 
-#: templates/installation.php:25
+#: templates/installation.php:26
 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."
 
-#: templates/installation.php:31
+#: templates/installation.php:32
 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:33
 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:37
 msgid "Create an <strong>admin account</strong>"
 msgstr "Buat sebuah <strong>akun admin</strong>"
 
-#: templates/installation.php:52
+#: templates/installation.php:55
 msgid "Advanced"
 msgstr "Tingkat Lanjut"
 
-#: templates/installation.php:54
+#: templates/installation.php:57
 msgid "Data folder"
 msgstr "Folder data"
 
-#: templates/installation.php:61
+#: templates/installation.php:66
 msgid "Configure the database"
 msgstr "Konfigurasi database"
 
-#: templates/installation.php:66 templates/installation.php:77
-#: templates/installation.php:87 templates/installation.php:97
+#: templates/installation.php:71 templates/installation.php:83
+#: templates/installation.php:94 templates/installation.php:105
+#: templates/installation.php:117
 msgid "will be used"
 msgstr "akan digunakan"
 
-#: templates/installation.php:109
+#: templates/installation.php:129
 msgid "Database user"
 msgstr "Pengguna database"
 
-#: templates/installation.php:113
+#: templates/installation.php:134
 msgid "Database password"
 msgstr "Password database"
 
-#: templates/installation.php:117
+#: templates/installation.php:139
 msgid "Database name"
 msgstr "Nama database"
 
-#: templates/installation.php:125
+#: templates/installation.php:149
 msgid "Database tablespace"
 msgstr "tablespace basis data"
 
-#: templates/installation.php:131
+#: templates/installation.php:156
 msgid "Database host"
 msgstr "Host database"
 
-#: templates/installation.php:136
+#: templates/installation.php:162
 msgid "Finish setup"
 msgstr "Selesaikan instalasi"
 
-#: templates/layout.guest.php:33
+#: templates/layout.guest.php:40
 msgid "web services under your control"
 msgstr "web service dibawah kontrol anda"
 
-#: templates/layout.user.php:48
+#: templates/layout.user.php:58
 msgid "Log out"
 msgstr "Keluar"
 
@@ -581,7 +583,7 @@ msgstr "Masuk"
 
 #: templates/login.php:49
 msgid "Alternative Logins"
-msgstr ""
+msgstr "Login dengan cara lain"
 
 #: templates/part.pagenavi.php:3
 msgid "prev"
diff --git a/l10n/id/files.po b/l10n/id/files.po
index 8acd0447cffbb92035c7eeb1393f3f738e9333f9..174bfa27e28a584e5dd41328b00c63b514290ef1 100644
--- a/l10n/id/files.po
+++ b/l10n/id/files.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\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: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -53,27 +53,27 @@ msgid ""
 "the HTML form"
 msgstr "File yang diunggah melampaui directive MAX_FILE_SIZE yang disebutan dalam form HTML."
 
-#: ajax/upload.php:31
+#: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
 msgstr "Berkas hanya diunggah sebagian"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:31
 msgid "No file was uploaded"
 msgstr "Tidak ada berkas yang diunggah"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:32
 msgid "Missing a temporary folder"
 msgstr "Kehilangan folder temporer"
 
-#: ajax/upload.php:34
+#: ajax/upload.php:33
 msgid "Failed to write to disk"
 msgstr "Gagal menulis ke disk"
 
-#: ajax/upload.php:52
+#: ajax/upload.php:51
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:83
+#: ajax/upload.php:82
 msgid "Invalid directory."
 msgstr ""
 
@@ -85,7 +85,7 @@ msgstr "Berkas"
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:127 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:127 templates/index.php:92 templates/index.php:93
 msgid "Delete"
 msgstr "Hapus"
 
@@ -93,40 +93,36 @@ msgstr "Hapus"
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
 msgid "Pending"
 msgstr "Menunggu"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "replace"
 msgstr "mengganti"
 
-#: js/filelist.js:253
+#: js/filelist.js:251
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "cancel"
 msgstr "batalkan"
 
-#: js/filelist.js:295
-msgid "replaced {new_name}"
+#: js/filelist.js:298
+msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:295 js/filelist.js:297
+#: js/filelist.js:298
 msgid "undo"
 msgstr "batal dikerjakan"
 
-#: js/filelist.js:297
-msgid "replaced {new_name} with {old_name}"
-msgstr ""
-
-#: js/filelist.js:322
+#: js/filelist.js:323
 msgid "perform delete operation"
 msgstr ""
 
@@ -152,76 +148,76 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:224
+#: js/files.js:225
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:261
+#: js/files.js:262
 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:261
+#: js/files.js:262
 msgid "Upload Error"
 msgstr "Terjadi Galat Pengunggahan"
 
-#: js/files.js:272
+#: js/files.js:273
 msgid "Close"
 msgstr "tutup"
 
-#: js/files.js:311
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr ""
 
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr ""
 
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "Pengunggahan dibatalkan."
 
-#: js/files.js:496
+#: js/files.js:497
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:569
+#: js/files.js:570
 msgid "URL cannot be empty."
 msgstr "tautan tidak boleh kosong"
 
-#: js/files.js:574
+#: js/files.js:575
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:953 templates/index.php:68
 msgid "Name"
 msgstr "Nama"
 
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:954 templates/index.php:79
 msgid "Size"
 msgstr "Ukuran"
 
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:955 templates/index.php:81
 msgid "Modified"
 msgstr "Dimodifikasi"
 
-#: js/files.js:969
+#: js/files.js:974
 msgid "1 folder"
-msgstr ""
+msgstr "1 map"
 
-#: js/files.js:971
+#: js/files.js:976
 msgid "{count} folders"
-msgstr ""
+msgstr "{count} map"
 
-#: js/files.js:979
+#: js/files.js:984
 msgid "1 file"
-msgstr ""
+msgstr "1 berkas"
 
-#: js/files.js:981
+#: js/files.js:986
 msgid "{count} files"
-msgstr ""
+msgstr "{count} berkas"
 
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
@@ -283,33 +279,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr "Batal mengunggah"
 
-#: templates/index.php:59
+#: templates/index.php:53
+msgid "You don’t have write permissions here."
+msgstr ""
+
+#: templates/index.php:60
 msgid "Nothing in here. Upload something!"
 msgstr "Tidak ada apa-apa di sini. Unggah sesuatu!"
 
-#: templates/index.php:73
+#: templates/index.php:74
 msgid "Download"
 msgstr "Unduh"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:86 templates/index.php:87
 msgid "Unshare"
 msgstr "batalkan berbagi"
 
-#: templates/index.php:105
+#: templates/index.php:106
 msgid "Upload too large"
 msgstr "Unggahan terlalu besar"
 
-#: templates/index.php:107
+#: templates/index.php:108
 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."
 
-#: templates/index.php:112
+#: templates/index.php:113
 msgid "Files are being scanned, please wait."
 msgstr "Berkas sedang dipindai, silahkan tunggu."
 
-#: templates/index.php:115
+#: templates/index.php:116
 msgid "Current scanning"
 msgstr "Sedang memindai"
 
diff --git a/l10n/id/files_encryption.po b/l10n/id/files_encryption.po
index 28191e4f23cfffe8142422b4d16ca4dde3ab2ce8..7a7d4d5211df5e0a202e980284398103444cbf08 100644
--- a/l10n/id/files_encryption.po
+++ b/l10n/id/files_encryption.po
@@ -4,13 +4,14 @@
 # 
 # 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-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-02-21 00:14+0100\n"
+"PO-Revision-Date: 2013-02-20 03:12+0000\n"
+"Last-Translator: w41l <walecha99@gmail.com>\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,20 +21,20 @@ msgstr ""
 
 #: templates/settings-personal.php:4 templates/settings.php:5
 msgid "Encryption"
-msgstr "enkripsi"
+msgstr "Enkripsi"
 
 #: templates/settings-personal.php:7
 msgid "File encryption is enabled."
-msgstr ""
+msgstr "Enkripsi berkas aktif."
 
 #: templates/settings-personal.php:11
 msgid "The following file types will not be encrypted:"
-msgstr ""
+msgstr "Tipe berkas berikut tidak akan dienkripsi:"
 
 #: templates/settings.php:7
 msgid "Exclude the following file types from encryption:"
-msgstr ""
+msgstr "Kecualikan tipe berkas berikut dari enkripsi:"
 
 #: templates/settings.php:12
 msgid "None"
-msgstr "tidak ada"
+msgstr "Tidak ada"
diff --git a/l10n/id/files_external.po b/l10n/id/files_external.po
index cdec2730ac7a6c33007a1af706a9a7d490c6f0b9..0e4f7fdfbf5e8c6dfbcb5e6da7c43bc402fffcb9 100644
--- a/l10n/id/files_external.po
+++ b/l10n/id/files_external.po
@@ -4,12 +4,13 @@
 # 
 # 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: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-11 23:22+0000\n"
+"POT-Creation-Date: 2013-02-28 00:04+0100\n"
+"PO-Revision-Date: 2013-02-27 23:04+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -18,104 +19,100 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\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 "akses diberikan"
+msgstr "Akses diberikan"
 
-#: 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 ""
+msgstr "Kesalahan dalam mengkonfigurasi penyimpanan Dropbox"
 
-#: 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 "berikan hak akses"
-
-#: js/dropbox.js:73 js/google.js:72
-msgid "Fill out all required fields"
-msgstr "isi semua field yang dibutuhkan"
+msgstr "Berikan hak akses"
 
-#: js/dropbox.js:85
+#: js/dropbox.js:101
 msgid "Please provide a valid Dropbox app key and secret."
-msgstr ""
+msgstr "Masukkan kunci dan sandi aplikasi Dropbox yang benar."
 
-#: 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 ""
+msgstr "Kesalahan dalam mengkonfigurasi penyimpanan Google Drive"
 
-#: lib/config.php:434
+#: lib/config.php:421
 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>Peringatan:</b> \"smbclient\" tidak terpasang. Mount direktori CIFS/SMB tidak dapat dilakukan. Silakan minta administrator sistem untuk memasangnya."
 
-#: lib/config.php:435
+#: lib/config.php:424
 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>Peringatan:</b> Dukungan FTP di PHP tidak aktif atau tidak terpasang. Mount direktori FTP tidak dapat dilakukan. Silakan minta administrator sistem untuk memasangnya."
 
 #: templates/settings.php:3
 msgid "External Storage"
-msgstr "penyimpanan eksternal"
+msgstr "Penyimpanan Eksternal"
 
-#: 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 "konfigurasi"
+msgstr "Konfigurasi"
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid "Options"
-msgstr "pilihan"
+msgstr "Pilihan"
 
-#: templates/settings.php:12
+#: templates/settings.php:13
 msgid "Applicable"
-msgstr "berlaku"
+msgstr "Berlaku"
 
-#: 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 "tidak satupun di set"
+msgstr "Tidak satupun di set"
 
-#: templates/settings.php:86
+#: templates/settings.php:91
 msgid "All Users"
-msgstr "semua pengguna"
+msgstr "Semua Pengguna"
 
-#: templates/settings.php:87
+#: templates/settings.php:92
 msgid "Groups"
-msgstr "grup"
+msgstr "Grup"
 
-#: templates/settings.php:95
+#: templates/settings.php:100
 msgid "Users"
-msgstr "pengguna"
+msgstr "Pengguna"
 
-#: 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 "hapus"
+msgstr "Hapus"
 
-#: templates/settings.php:124
+#: templates/settings.php:129
 msgid "Enable User External Storage"
-msgstr ""
+msgstr "Aktifkan Penyimpanan Eksternal Pengguna"
 
-#: templates/settings.php:125
+#: templates/settings.php:130
 msgid "Allow users to mount their own external storage"
-msgstr ""
+msgstr "Ijinkan pengguna untuk me-mount penyimpanan eksternal mereka"
 
-#: templates/settings.php:139
+#: templates/settings.php:141
 msgid "SSL root certificates"
-msgstr ""
+msgstr "Sertifikat root SSL"
 
-#: templates/settings.php:158
+#: templates/settings.php:159
 msgid "Import Root Certificate"
-msgstr ""
+msgstr "Impor Sertifikat Root"
diff --git a/l10n/id/files_trashbin.po b/l10n/id/files_trashbin.po
index 15be1a566a34ab641d211a4349543dc354827af6..01538027a14ee6ee01e82f9fafca66d596783447 100644
--- a/l10n/id/files_trashbin.po
+++ b/l10n/id/files_trashbin.po
@@ -3,12 +3,13 @@
 # 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-02-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 10:07+0000\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: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -17,52 +18,64 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/delete.php:22
+#: ajax/delete.php:40
 #, php-format
 msgid "Couldn't delete %s permanently"
-msgstr ""
+msgstr "Tidak dapat menghapus permanen %s"
 
 #: ajax/undelete.php:41
 #, php-format
 msgid "Couldn't restore %s"
-msgstr ""
+msgstr "Tidak dapat memulihkan %s"
 
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
 msgid "perform restore operation"
-msgstr ""
+msgstr "jalankan operasi pemulihan"
 
-#: js/trash.js:33
+#: js/trash.js:34
 msgid "delete file permanently"
+msgstr "hapus berkas secara permanen"
+
+#: js/trash.js:121
+msgid "Delete permanently"
 msgstr ""
 
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:174 templates/index.php:17
 msgid "Name"
-msgstr "nama"
+msgstr "Nama"
 
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:175 templates/index.php:27
 msgid "Deleted"
-msgstr ""
+msgstr "Dihapus"
 
-#: js/trash.js:135
+#: js/trash.js:184
 msgid "1 folder"
-msgstr ""
+msgstr "1 map"
 
-#: js/trash.js:137
+#: js/trash.js:186
 msgid "{count} folders"
-msgstr ""
+msgstr "{count} map"
 
-#: js/trash.js:145
+#: js/trash.js:194
 msgid "1 file"
-msgstr ""
+msgstr "1 berkas"
 
-#: js/trash.js:147
+#: js/trash.js:196
 msgid "{count} files"
-msgstr ""
+msgstr "{count} berkas"
 
 #: templates/index.php:9
 msgid "Nothing in here. Your trash bin is empty!"
-msgstr ""
+msgstr "Tempat sampah anda kosong!"
 
 #: templates/index.php:20 templates/index.php:22
 msgid "Restore"
+msgstr "Pulihkan"
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr "Hapus"
+
+#: templates/part.breadcrumb.php:9
+msgid "Deleted Files"
 msgstr ""
diff --git a/l10n/id/files_versions.po b/l10n/id/files_versions.po
index 490e0fc81636e753cfd624db621cd690fb49510a..395a75c2fba1ba818a28f8179a462968d02f6389 100644
--- a/l10n/id/files_versions.po
+++ b/l10n/id/files_versions.po
@@ -4,12 +4,13 @@
 # 
 # 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-08 00:10+0100\n"
-"PO-Revision-Date: 2013-02-07 23:11+0000\n"
+"POT-Creation-Date: 2013-02-28 00:04+0100\n"
+"PO-Revision-Date: 2013-02-27 23:04+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -21,46 +22,38 @@ msgstr ""
 #: ajax/rollbackVersion.php:15
 #, php-format
 msgid "Could not revert: %s"
-msgstr ""
+msgstr "Tidak dapat mengembalikan: %s"
 
 #: history.php:40
 msgid "success"
-msgstr ""
+msgstr "sukses"
 
 #: history.php:42
 #, php-format
 msgid "File %s was reverted to version %s"
-msgstr ""
+msgstr "Berkas %s telah dikembalikan ke versi %s"
 
 #: history.php:49
 msgid "failure"
-msgstr ""
+msgstr "gagal"
 
 #: history.php:51
 #, php-format
 msgid "File %s could not be reverted to version %s"
-msgstr ""
+msgstr "Berkas %s gagal dikembalikan ke versi %s"
 
 #: history.php:68
 msgid "No old versions available"
-msgstr ""
+msgstr "Versi lama tidak tersedia"
 
 #: history.php:73
 msgid "No path specified"
-msgstr ""
+msgstr "Lokasi tidak ditentukan"
 
-#: js/versions.js:16
-msgid "History"
-msgstr "riwayat"
+#: 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 ""
-
-#: templates/settings.php:3
-msgid "Files Versioning"
-msgstr "pembuatan versi file"
-
-#: templates/settings.php:4
-msgid "Enable"
-msgstr "aktifkan"
+msgstr "Kembalikan berkas ke versi sebelumnya dengan mengklik tombol kembalikan"
diff --git a/l10n/id/lib.po b/l10n/id/lib.po
index 32d4cfd14ee264338de21cc1964dbe05e47628cf..6ef9f41ad6999629dfdd883caff6bfc37d7bf046 100644
--- a/l10n/id/lib.po
+++ b/l10n/id/lib.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-11 15:39+0100\n"
-"PO-Revision-Date: 2013-02-11 14:40+0000\n"
+"POT-Creation-Date: 2013-03-06 00:07+0100\n"
+"PO-Revision-Date: 2013-03-05 14:00+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -19,27 +19,27 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: app.php:339
+#: app.php:349
 msgid "Help"
 msgstr "bantu"
 
-#: app.php:346
+#: app.php:362
 msgid "Personal"
 msgstr "perseorangan"
 
-#: app.php:351
+#: app.php:373
 msgid "Settings"
 msgstr "pengaturan"
 
-#: app.php:356
+#: app.php:385
 msgid "Users"
 msgstr "pengguna"
 
-#: app.php:363
+#: app.php:398
 msgid "Apps"
 msgstr "aplikasi"
 
-#: app.php:365
+#: app.php:406
 msgid "Admin"
 msgstr "admin"
 
@@ -51,15 +51,15 @@ msgstr "download ZIP sedang dimatikan"
 msgid "Files need to be downloaded one by one."
 msgstr "file harus di unduh satu persatu"
 
-#: files.php:203 files.php:228
+#: files.php:204 files.php:231
 msgid "Back to Files"
 msgstr "kembali ke daftar file"
 
-#: files.php:227
+#: files.php:228
 msgid "Selected files too large to generate zip file."
 msgstr "file yang dipilih terlalu besar untuk membuat file zip"
 
-#: helper.php:226
+#: helper.php:228
 msgid "couldn't be determined"
 msgstr ""
 
@@ -99,87 +99,92 @@ msgstr ""
 msgid "Specify a data folder."
 msgstr ""
 
-#: setup.php:53
+#: setup.php:55
 #, php-format
 msgid "%s enter the database username."
 msgstr ""
 
-#: setup.php:56
+#: setup.php:58
 #, php-format
 msgid "%s enter the database name."
 msgstr ""
 
-#: setup.php:59
+#: setup.php:61
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr ""
 
-#: setup.php:62
+#: setup.php:64
 #, php-format
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:126 setup.php:291 setup.php:336
+#: setup.php:128 setup.php:320 setup.php:365
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:127 setup.php:150 setup.php:204
+#: setup.php:129 setup.php:152 setup.php:229
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:149 setup.php:423 setup.php:489
+#: setup.php:151 setup.php:453 setup.php:520
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:203
+#: setup.php:228
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:255 setup.php:357 setup.php:366 setup.php:384 setup.php:394
-#: setup.php:403 setup.php:430 setup.php:496 setup.php:522 setup.php:529
-#: setup.php:540 setup.php:547 setup.php:556 setup.php:564 setup.php:573
-#: setup.php:579
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:256 setup.php:358 setup.php:367 setup.php:385 setup.php:395
-#: setup.php:404 setup.php:431 setup.php:497 setup.php:523 setup.php:530
-#: setup.php:541 setup.php:557 setup.php:565 setup.php:574
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:270
+#: setup.php:299
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:271
+#: setup.php:300
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:276
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:277
+#: setup.php:306
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:548 setup.php:580
+#: setup.php:579 setup.php:611
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:644
+#: setup.php:631
+#, php-format
+msgid "MS SQL username and/or password not valid: %s"
+msgstr ""
+
+#: setup.php:849
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:645
+#: setup.php:850
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
@@ -236,16 +241,16 @@ msgstr "tahun kemarin"
 msgid "years ago"
 msgstr "beberapa tahun lalu"
 
-#: updater.php:75
+#: 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:77
+#: updater.php:81
 msgid "up to date"
 msgstr "terbaru"
 
-#: updater.php:80
+#: updater.php:84
 msgid "updates check is disabled"
 msgstr "pengecekan pembaharuan sedang non-aktifkan"
 
diff --git a/l10n/id/settings.po b/l10n/id/settings.po
index 56cc39cb356a69ce6279f2581944d889db7402c1..620961e598f03c85c0a841fe767ca483e82d1d08 100644
--- a/l10n/id/settings.po
+++ b/l10n/id/settings.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 23:05+0000\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: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -25,8 +25,8 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr ""
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:15
-#: ajax/togglegroups.php:18
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr "autentikasi bermasalah"
 
@@ -74,12 +74,12 @@ msgstr "Permintaan tidak valid"
 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 ""
@@ -120,7 +120,7 @@ msgstr "kesalahan"
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:96
+#: js/personal.js:99
 msgid "Saving..."
 msgstr "Menyimpan..."
 
@@ -149,23 +149,23 @@ msgstr "Admin Grup"
 msgid "Delete"
 msgstr "Hapus"
 
-#: js/users.js:190
+#: js/users.js:191
 msgid "add group"
 msgstr ""
 
-#: js/users.js:351
+#: js/users.js:352
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:357
+#: js/users.js:358
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -211,19 +211,19 @@ msgstr ""
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:61
+#: templates/admin.php:63
+#, php-format
 msgid ""
-"This ownCloud server can't set system locale to "
-"\"en_US.UTF-8\"/\"en_US.UTF8\". 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 en_US.UTF-8/en_US.UTF8."
+"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:72
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:75
+#: 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 "
@@ -233,98 +233,98 @@ msgid ""
 " of ownCloud."
 msgstr ""
 
-#: templates/admin.php:89
+#: templates/admin.php:92
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:98
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:108
+#: 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:118
+#: 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:125
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:131
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:132
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:140
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:147
+#: templates/admin.php:150
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:148
+#: templates/admin.php:151
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:155
+#: templates/admin.php:158
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:161
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:165
+#: templates/admin.php:168
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:181
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:179
+#: templates/admin.php:182
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:182
+#: templates/admin.php:185
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr ""
 
-#: templates/admin.php:192
+#: templates/admin.php:195
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:193
+#: templates/admin.php:196
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:220
+#: templates/admin.php:223
 msgid "More"
 msgstr "lagi"
 
-#: templates/admin.php:227 templates/personal.php:98
+#: templates/admin.php:230 templates/personal.php:102
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:230 templates/personal.php:100
+#: templates/admin.php:233 templates/personal.php:105
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -334,51 +334,51 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr ""
 
-#: templates/apps.php:10
+#: templates/apps.php:11
 msgid "Add your App"
 msgstr "Tambahkan App anda"
 
-#: templates/apps.php:11
+#: templates/apps.php:12
 msgid "More Apps"
 msgstr ""
 
-#: templates/apps.php:24
+#: templates/apps.php:28
 msgid "Select an App"
 msgstr "Pilih satu aplikasi"
 
-#: templates/apps.php:28
+#: templates/apps.php:34
 msgid "See application page at apps.owncloud.com"
 msgstr "Lihat halaman aplikasi di apps.owncloud.com"
 
-#: templates/apps.php:29
+#: templates/apps.php:36
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
-#: templates/apps.php:31
+#: templates/apps.php:38
 msgid "Update"
 msgstr "Pembaruan"
 
-#: templates/help.php:3
+#: 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 ""
 
@@ -387,79 +387,79 @@ msgstr ""
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:14
+#: templates/personal.php:15
 msgid "Get the apps to sync your files"
-msgstr ""
+msgstr "Dapatkan aplikasi untuk sinkronisasi berkas anda"
 
-#: templates/personal.php:25
+#: templates/personal.php:26
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:36 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
 msgid "Password"
 msgstr "Password"
 
-#: templates/personal.php:37
+#: templates/personal.php:38
 msgid "Your password was changed"
 msgstr ""
 
-#: templates/personal.php:38
+#: templates/personal.php:39
 msgid "Unable to change your password"
 msgstr "Tidak dapat merubah password anda"
 
-#: templates/personal.php:39
+#: templates/personal.php:40
 msgid "Current password"
 msgstr "Password saat ini"
 
-#: templates/personal.php:40
+#: templates/personal.php:42
 msgid "New password"
 msgstr "kata kunci baru"
 
-#: templates/personal.php:42
+#: templates/personal.php:44
 msgid "Change password"
 msgstr "Rubah password"
 
-#: templates/personal.php:54 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:78
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:55
+#: templates/personal.php:57
 msgid "Your display name was changed"
 msgstr ""
 
-#: templates/personal.php:56
+#: templates/personal.php:58
 msgid "Unable to change your display name"
 msgstr ""
 
-#: templates/personal.php:59
+#: templates/personal.php:61
 msgid "Change display name"
 msgstr ""
 
-#: templates/personal.php:68
+#: templates/personal.php:70
 msgid "Email"
 msgstr "Email"
 
-#: templates/personal.php:69
+#: templates/personal.php:72
 msgid "Your email address"
 msgstr "Alamat email anda"
 
-#: templates/personal.php:70
+#: templates/personal.php:73
 msgid "Fill in an email address to enable password recovery"
 msgstr "Masukkan alamat email untuk mengaktifkan pemulihan password"
 
-#: templates/personal.php:76 templates/personal.php:77
+#: templates/personal.php:79 templates/personal.php:80
 msgid "Language"
 msgstr "Bahasa"
 
-#: templates/personal.php:82
+#: templates/personal.php:86
 msgid "Help translate"
 msgstr "Bantu menerjemahkan"
 
-#: templates/personal.php:87
+#: templates/personal.php:91
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:89
+#: templates/personal.php:93
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
diff --git a/l10n/id/user_ldap.po b/l10n/id/user_ldap.po
index c105afaa81b2d8d4a84d9625c13fa3aa3bd75142..b90a1e9ab08ac3432516c56fc6ffaf8656fd1a4e 100644
--- a/l10n/id/user_ldap.po
+++ b/l10n/id/user_ldap.po
@@ -4,12 +4,13 @@
 # 
 # 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-08 00:10+0100\n"
-"PO-Revision-Date: 2013-02-07 23:11+0000\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: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -20,23 +21,23 @@ msgstr ""
 
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
-msgstr ""
+msgstr "Gagal menghapus konfigurasi server"
 
-#: ajax/testConfiguration.php:35
+#: ajax/testConfiguration.php:36
 msgid "The configuration is valid and the connection could be established!"
-msgstr ""
+msgstr "Konfigurasi valid dan koneksi dapat dilakukan!"
 
-#: ajax/testConfiguration.php:37
+#: ajax/testConfiguration.php:39
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
-msgstr ""
+msgstr "Konfigurasi valid, tetapi Bind gagal. Silakan cek pengaturan server dan keamanan."
 
-#: ajax/testConfiguration.php:40
+#: ajax/testConfiguration.php:43
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
-msgstr ""
+msgstr "Konfigurasi salah. Silakan lihat log ownCloud untuk lengkapnya."
 
 #: js/settings.js:66
 msgid "Deletion failed"
@@ -44,267 +45,291 @@ msgstr "penghapusan gagal"
 
 #: js/settings.js:82
 msgid "Take over settings from recent server configuration?"
-msgstr ""
+msgstr "Ambil alih pengaturan dari konfigurasi server saat ini?"
 
 #: js/settings.js:83
 msgid "Keep settings?"
-msgstr ""
+msgstr "Biarkan pengaturan?"
 
 #: js/settings.js:97
 msgid "Cannot add server configuration"
-msgstr ""
+msgstr "Gagal menambah konfigurasi server"
 
 #: js/settings.js:121
 msgid "Connection test succeeded"
-msgstr ""
+msgstr "Tes koneksi sukses"
 
 #: js/settings.js:126
 msgid "Connection test failed"
-msgstr ""
+msgstr "Tes koneksi gagal"
 
 #: js/settings.js:136
 msgid "Do you really want to delete the current Server Configuration?"
-msgstr ""
+msgstr "Anda ingin menghapus Konfigurasi Server saat ini?"
 
 #: js/settings.js:137
 msgid "Confirm Deletion"
-msgstr ""
+msgstr "Konfirmasi Penghapusan"
 
 #: templates/settings.php:8
 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>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
 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>Peringatan:</b> Modul LDAP PHP tidak terpasang, perangkat tidak akan bekerja. Silakan minta administrator sistem untuk memasangnya."
 
 #: templates/settings.php:15
 msgid "Server configuration"
-msgstr ""
+msgstr "Konfigurasi server"
 
-#: templates/settings.php:17
+#: templates/settings.php:18
 msgid "Add Server Configuration"
-msgstr ""
+msgstr "Tambah Konfigurasi Server"
 
-#: templates/settings.php:21
+#: templates/settings.php:23
 msgid "Host"
 msgstr "host"
 
-#: templates/settings.php:21
+#: templates/settings.php:25
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
-msgstr ""
+msgstr "Protokol dapat tidak ditulis, kecuali anda menggunakan SSL. Lalu jalankan dengan ldaps://"
 
-#: templates/settings.php:22
+#: templates/settings.php:26
 msgid "Base DN"
-msgstr ""
+msgstr "Base DN"
 
-#: templates/settings.php:22
+#: templates/settings.php:27
 msgid "One Base DN per line"
-msgstr ""
+msgstr "Satu Base DN per baris"
 
-#: templates/settings.php:22
+#: templates/settings.php:28
 msgid "You can specify Base DN for users and groups in the Advanced tab"
-msgstr ""
+msgstr "Anda dapat menetapkan Base DN untuk pengguna dan grup dalam tab Lanjutan"
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "User DN"
-msgstr ""
+msgstr "User DN"
 
-#: templates/settings.php:23
+#: templates/settings.php:32
 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 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:24
+#: templates/settings.php:33
 msgid "Password"
 msgstr "kata kunci"
 
-#: templates/settings.php:24
+#: templates/settings.php:36
 msgid "For anonymous access, leave DN and Password empty."
-msgstr ""
+msgstr "Untuk akses anonim, biarkan DN dan Kata sandi kosong."
 
-#: templates/settings.php:25
+#: templates/settings.php:37
 msgid "User Login Filter"
 msgstr "gunakan saringan login"
 
-#: templates/settings.php:25
+#: templates/settings.php:40
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
-msgstr ""
+msgstr "Definisikan filter untuk diterapkan, saat login dilakukan. %%uid menggantikan username saat login."
 
-#: templates/settings.php:25
+#: templates/settings.php:41
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
+msgstr "gunakan pengganti %%uid, mis. \"uid=%%uid\""
 
-#: templates/settings.php:26
+#: templates/settings.php:42
 msgid "User List Filter"
-msgstr ""
+msgstr "Daftar Filter Pengguna"
 
-#: templates/settings.php:26
+#: templates/settings.php:45
 msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
+msgstr "Definisikan filter untuk diterapkan saat menerima pengguna."
 
-#: templates/settings.php:26
+#: templates/settings.php:46
 msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr ""
+msgstr "tanpa pengganti apapun, mis. \"objectClass=seseorang\"."
 
-#: templates/settings.php:27
+#: templates/settings.php:47
 msgid "Group Filter"
 msgstr "saringan grup"
 
-#: templates/settings.php:27
+#: templates/settings.php:50
 msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
+msgstr "Definisikan filter untuk diterapkan saat menerima grup."
 
-#: templates/settings.php:27
+#: templates/settings.php:51
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr ""
+msgstr "tanpa pengganti apapaun, mis. \"objectClass=posixGroup\"."
 
-#: templates/settings.php:31
+#: templates/settings.php:55
 msgid "Connection Settings"
-msgstr ""
+msgstr "Pengaturan Koneksi"
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "Configuration Active"
-msgstr ""
+msgstr "Konfigurasi Aktif"
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "When unchecked, this configuration will be skipped."
-msgstr ""
+msgstr "Jika tidak dicentang, konfigurasi ini dilewati."
 
-#: templates/settings.php:34
+#: templates/settings.php:58
 msgid "Port"
 msgstr "port"
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid "Backup (Replica) Host"
-msgstr ""
+msgstr "Host Cadangan (Replika)"
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
-msgstr ""
+msgstr "Berikan pilihan host cadangan. Harus merupakan replika dari server LDAP/AD utama."
 
-#: templates/settings.php:36
+#: templates/settings.php:60
 msgid "Backup (Replica) Port"
-msgstr ""
+msgstr "Port Cadangan (Replika)"
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "Disable Main Server"
-msgstr ""
+msgstr "Nonaktifkan Server Utama"
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "When switched on, ownCloud will only connect to the replica server."
-msgstr ""
+msgstr "Saat diaktifkan, ownCloud hanya akan terhubung ke server replika."
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Use TLS"
 msgstr "gunakan TLS"
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Do not use it additionally for LDAPS connections, it will fail."
-msgstr ""
+msgstr "Jangan gunakan utamanya untuk koneksi LDAPS, koneksi akan gagal."
 
-#: templates/settings.php:39
+#: templates/settings.php:63
 msgid "Case insensitve LDAP server (Windows)"
-msgstr ""
+msgstr "Server LDAP dengan kapitalisasi tidak sensitif (Windows)"
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid "Turn off SSL certificate validation."
 msgstr "matikan validasi sertivikat SSL"
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
-msgstr ""
+msgstr "Jika koneksi hanya bekerja dengan opsi ini, impor sertifikat SSL server LDAP dari server ownCloud anda."
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid "Not recommended, use for testing only."
 msgstr "tidak disarankan, gunakan hanya untuk pengujian."
 
-#: templates/settings.php:41
+#: templates/settings.php:65
+msgid "Cache Time-To-Live"
+msgstr ""
+
+#: templates/settings.php:65
 msgid "in seconds. A change empties the cache."
 msgstr "dalam detik. perubahan mengosongkan cache"
 
-#: templates/settings.php:43
+#: templates/settings.php:67
 msgid "Directory Settings"
-msgstr ""
+msgstr "Pengaturan Direktori"
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "User Display Name Field"
-msgstr ""
+msgstr "Bidang Tampilan Nama Pengguna"
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
-msgstr ""
+msgstr "Atribut LDAP yang digunakan untuk menghasilkan nama pengguna ownCloud."
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "Base User Tree"
-msgstr ""
+msgstr "Pohon Pengguna Dasar"
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "One User Base DN per line"
-msgstr ""
+msgstr "Satu Pengguna Base DN per baris"
 
-#: templates/settings.php:47
+#: templates/settings.php:71
 msgid "User Search Attributes"
-msgstr ""
+msgstr "Atribut Pencarian Pengguna"
 
-#: templates/settings.php:47 templates/settings.php:50
+#: templates/settings.php:71 templates/settings.php:74
 msgid "Optional; one attribute per line"
-msgstr ""
+msgstr "Pilihan; satu atribut per baris"
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "Group Display Name Field"
-msgstr ""
+msgstr "Bidang Tampilan Nama Grup"
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
-msgstr ""
+msgstr "Atribut LDAP yang digunakan untuk menghasilkan nama grup ownCloud."
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "Base Group Tree"
-msgstr ""
+msgstr "Pohon Grup Dasar"
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "One Group Base DN per line"
-msgstr ""
+msgstr "Satu Grup Base DN per baris"
 
-#: templates/settings.php:50
+#: templates/settings.php:74
 msgid "Group Search Attributes"
-msgstr ""
+msgstr "Atribut Pencarian Grup"
 
-#: templates/settings.php:51
+#: templates/settings.php:75
 msgid "Group-Member association"
-msgstr ""
+msgstr "asosiasi Anggota-Grup"
 
-#: templates/settings.php:53
+#: templates/settings.php:77
 msgid "Special Attributes"
+msgstr "Atribut Khusus"
+
+#: templates/settings.php:79
+msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:80
+msgid "Quota Default"
+msgstr ""
+
+#: templates/settings.php:80
 msgid "in bytes"
 msgstr "dalam bytes"
 
-#: templates/settings.php:58
+#: templates/settings.php:81
+msgid "Email Field"
+msgstr ""
+
+#: templates/settings.php:82
+msgid "User Home Folder Naming Rule"
+msgstr ""
+
+#: templates/settings.php:82
 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"
 msgstr ""
 
-#: templates/settings.php:62
+#: templates/settings.php:86
 msgid "Help"
 msgstr "bantuan"
diff --git a/l10n/is/core.po b/l10n/is/core.po
index 0a5e526535a15cef6b25d069d0c02023e23f85d6..ff58acb1af5065eba0291394dfa631f56bb5bd07 100644
--- a/l10n/is/core.po
+++ b/l10n/is/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 14:31+0000\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"
 "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
 "MIME-Version: 1.0\n"
@@ -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 "endursetja ownCloud lykilorð"
 
diff --git a/l10n/is/files.po b/l10n/is/files.po
index 0e399eecf6e45f06b64d97ca0bd603a1b1c830a5..147ec127f5ca750c8c6c9e3227cd470b776c980e 100644
--- a/l10n/is/files.po
+++ b/l10n/is/files.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\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: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
 "MIME-Version: 1.0\n"
@@ -51,27 +51,27 @@ msgid ""
 "the HTML form"
 msgstr "Innsenda skráin er stærri en MAX_FILE_SIZE sem skilgreint er í HTML sniðinu."
 
-#: ajax/upload.php:31
+#: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
 msgstr "Einungis hluti af innsendri skrá skilaði sér"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:31
 msgid "No file was uploaded"
 msgstr "Engin skrá skilaði sér"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:32
 msgid "Missing a temporary folder"
 msgstr "Vantar bráðabirgðamöppu"
 
-#: ajax/upload.php:34
+#: ajax/upload.php:33
 msgid "Failed to write to disk"
 msgstr "Tókst ekki að skrifa á disk"
 
-#: ajax/upload.php:52
+#: ajax/upload.php:51
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:83
+#: ajax/upload.php:82
 msgid "Invalid directory."
 msgstr "Ógild mappa."
 
@@ -83,7 +83,7 @@ msgstr "Skrár"
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:127 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:127 templates/index.php:92 templates/index.php:93
 msgid "Delete"
 msgstr "Eyða"
 
@@ -91,40 +91,36 @@ msgstr "Eyða"
 msgid "Rename"
 msgstr "Endurskýra"
 
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
 msgid "Pending"
 msgstr "Bíður"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "{new_name} already exists"
 msgstr "{new_name} er þegar til"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "replace"
 msgstr "yfirskrifa"
 
-#: js/filelist.js:253
+#: js/filelist.js:251
 msgid "suggest name"
 msgstr "stinga upp á nafni"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "cancel"
 msgstr "hætta við"
 
-#: js/filelist.js:295
-msgid "replaced {new_name}"
-msgstr "endurskýrði {new_name}"
+#: js/filelist.js:298
+msgid "replaced {new_name} with {old_name}"
+msgstr "yfirskrifaði {new_name} með {old_name}"
 
-#: js/filelist.js:295 js/filelist.js:297
+#: js/filelist.js:298
 msgid "undo"
 msgstr "afturkalla"
 
-#: js/filelist.js:297
-msgid "replaced {new_name} with {old_name}"
-msgstr "yfirskrifaði {new_name} með {old_name}"
-
-#: js/filelist.js:322
+#: js/filelist.js:323
 msgid "perform delete operation"
 msgstr ""
 
@@ -150,74 +146,74 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:224
+#: js/files.js:225
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:261
+#: js/files.js:262
 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:261
+#: js/files.js:262
 msgid "Upload Error"
 msgstr "Villa við innsendingu"
 
-#: js/files.js:272
+#: js/files.js:273
 msgid "Close"
 msgstr "Loka"
 
-#: js/files.js:311
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr "1 skrá innsend"
 
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr "{count} skrár innsendar"
 
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "Hætt við innsendingu."
 
-#: js/files.js:496
+#: js/files.js:497
 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:569
+#: js/files.js:570
 msgid "URL cannot be empty."
 msgstr "Vefslóð má ekki vera tóm."
 
-#: js/files.js:574
+#: js/files.js:575
 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:948 templates/index.php:67
+#: js/files.js:953 templates/index.php:68
 msgid "Name"
 msgstr "Nafn"
 
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:954 templates/index.php:79
 msgid "Size"
 msgstr "Stærð"
 
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:955 templates/index.php:81
 msgid "Modified"
 msgstr "Breytt"
 
-#: js/files.js:969
+#: js/files.js:974
 msgid "1 folder"
 msgstr "1 mappa"
 
-#: js/files.js:971
+#: js/files.js:976
 msgid "{count} folders"
 msgstr "{count} möppur"
 
-#: js/files.js:979
+#: js/files.js:984
 msgid "1 file"
 msgstr "1 skrá"
 
-#: js/files.js:981
+#: js/files.js:986
 msgid "{count} files"
 msgstr "{count} skrár"
 
@@ -281,33 +277,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr "Hætta við innsendingu"
 
-#: templates/index.php:59
+#: templates/index.php:53
+msgid "You don’t have write permissions here."
+msgstr ""
+
+#: templates/index.php:60
 msgid "Nothing in here. Upload something!"
 msgstr "Ekkert hér. Settu eitthvað inn!"
 
-#: templates/index.php:73
+#: templates/index.php:74
 msgid "Download"
 msgstr "Niðurhal"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:86 templates/index.php:87
 msgid "Unshare"
 msgstr "Hætta deilingu"
 
-#: templates/index.php:105
+#: templates/index.php:106
 msgid "Upload too large"
 msgstr "Innsend skrá er of stór"
 
-#: templates/index.php:107
+#: templates/index.php:108
 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:112
+#: templates/index.php:113
 msgid "Files are being scanned, please wait."
 msgstr "Verið er að skima skrár, vinsamlegast hinkraðu."
 
-#: templates/index.php:115
+#: templates/index.php:116
 msgid "Current scanning"
 msgstr "Er að skima"
 
diff --git a/l10n/is/files_external.po b/l10n/is/files_external.po
index 1e8fbe75517ab54442c2e456b9b7dfd3d22088b4..8f3de2de45ad3ee27309be517c09db2d480d5754 100644
--- a/l10n/is/files_external.po
+++ b/l10n/is/files_external.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-12-31 00:04+0100\n"
-"PO-Revision-Date: 2012-12-30 18:22+0000\n"
-"Last-Translator: sveinn <sveinng@gmail.com>\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"
 "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"
@@ -18,37 +18,33 @@ msgstr ""
 "Language: is\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 "Aðgengi veitt"
 
-#: 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 "Villa við að setja upp Dropbox gagnasvæði"
 
-#: 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 "Veita aðgengi"
 
-#: js/dropbox.js:73 js/google.js:72
-msgid "Fill out all required fields"
-msgstr "Fylltu út alla skilyrta reiti"
-
-#: js/dropbox.js:85
+#: js/dropbox.js:101
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr "Gefðu upp virkan Dropbox lykil og leynikóða"
 
-#: 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 "Villa kom upp við að setja upp Google Drive gagnasvæði"
 
-#: lib/config.php:434
+#: lib/config.php:421
 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:435
+#: lib/config.php:424
 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 "
@@ -59,63 +55,63 @@ msgstr "<b>Aðvörun:</b> FTP stuðningur í PHP er ekki virkur. Uppsetning á F
 msgid "External Storage"
 msgstr "Ytri gagnageymsla"
 
-#: templates/settings.php:8 templates/settings.php:22
-msgid "Mount point"
-msgstr "Mount svæði"
-
-#: templates/settings.php:9
-msgid "Backend"
-msgstr "Stjórnun"
+#: templates/settings.php:9 templates/settings.php:28
+msgid "Folder name"
+msgstr "Nafn möppu"
 
 #: templates/settings.php:10
+msgid "External storage"
+msgstr ""
+
+#: templates/settings.php:11
 msgid "Configuration"
 msgstr "Uppsetning"
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid "Options"
 msgstr "Stillingar"
 
-#: templates/settings.php:12
+#: templates/settings.php:13
 msgid "Applicable"
 msgstr "Gilt"
 
-#: templates/settings.php:27
-msgid "Add mount point"
-msgstr "Bæta við mount svæði"
+#: templates/settings.php:33
+msgid "Add storage"
+msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:90
 msgid "None set"
 msgstr "Ekkert sett"
 
-#: templates/settings.php:86
+#: templates/settings.php:91
 msgid "All Users"
 msgstr "Allir notendur"
 
-#: templates/settings.php:87
+#: templates/settings.php:92
 msgid "Groups"
 msgstr "Hópar"
 
-#: templates/settings.php:95
+#: templates/settings.php:100
 msgid "Users"
 msgstr "Notendur"
 
-#: templates/settings.php:108 templates/settings.php:109
-#: templates/settings.php:144 templates/settings.php:145
+#: templates/settings.php:113 templates/settings.php:114
+#: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
 msgstr "Eyða"
 
-#: templates/settings.php:124
+#: templates/settings.php:129
 msgid "Enable User External Storage"
 msgstr "Virkja ytra gagnasvæði notenda"
 
-#: templates/settings.php:125
+#: templates/settings.php:130
 msgid "Allow users to mount their own external storage"
 msgstr "Leyfa notendum að bæta við sínum eigin ytri gagnasvæðum"
 
-#: templates/settings.php:136
+#: templates/settings.php:141
 msgid "SSL root certificates"
 msgstr "SSL rótar skilríki"
 
-#: templates/settings.php:153
+#: templates/settings.php:159
 msgid "Import Root Certificate"
 msgstr "Flytja inn rótar skilríki"
diff --git a/l10n/is/files_trashbin.po b/l10n/is/files_trashbin.po
index 858d3ee0764823cc6a45729be28a5f989c6b5e6e..be62d3c52aaebff21f83746e94a1665ac769b8af 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-02-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 10:07+0000\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: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
 "MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Language: is\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:22
+#: ajax/delete.php:40
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
@@ -27,35 +27,39 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:33
+#: js/trash.js:34
 msgid "delete file permanently"
 msgstr ""
 
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr ""
+
+#: js/trash.js:174 templates/index.php:17
 msgid "Name"
 msgstr "Nafn"
 
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:175 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:135
+#: js/trash.js:184
 msgid "1 folder"
 msgstr "1 mappa"
 
-#: js/trash.js:137
+#: js/trash.js:186
 msgid "{count} folders"
 msgstr "{count} möppur"
 
-#: js/trash.js:145
+#: js/trash.js:194
 msgid "1 file"
 msgstr "1 skrá"
 
-#: js/trash.js:147
+#: js/trash.js:196
 msgid "{count} files"
 msgstr "{count} skrár"
 
@@ -66,3 +70,11 @@ msgstr ""
 #: templates/index.php:20 templates/index.php:22
 msgid "Restore"
 msgstr ""
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr "Eyða"
+
+#: templates/part.breadcrumb.php:9
+msgid "Deleted Files"
+msgstr ""
diff --git a/l10n/is/files_versions.po b/l10n/is/files_versions.po
index 5ee90ab20db01103296ddec66da9b1c510e8689d..4159653790a1689f5952bbeb2d01c8f8b6096a3f 100644
--- a/l10n/is/files_versions.po
+++ b/l10n/is/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-08 00:10+0100\n"
-"PO-Revision-Date: 2013-02-07 23:11+0000\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"
 "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
 "MIME-Version: 1.0\n"
@@ -49,18 +49,10 @@ msgstr ""
 msgid "No path specified"
 msgstr ""
 
-#: js/versions.js:16
-msgid "History"
-msgstr "Saga"
+#: js/versions.js:6
+msgid "Versions"
+msgstr "Útgáfur"
 
 #: templates/history.php:20
 msgid "Revert a file to a previous version by clicking on its revert button"
 msgstr ""
-
-#: templates/settings.php:3
-msgid "Files Versioning"
-msgstr "Útgáfur af skrám"
-
-#: templates/settings.php:4
-msgid "Enable"
-msgstr "Virkja"
diff --git a/l10n/is/lib.po b/l10n/is/lib.po
index 034f5b7edab6e990f8842580e4eb5953414ca3d0..83f91466f73e131c6d05be8f684f156b13c94d66 100644
--- a/l10n/is/lib.po
+++ b/l10n/is/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-11 15:39+0100\n"
-"PO-Revision-Date: 2013-02-11 14:41+0000\n"
+"POT-Creation-Date: 2013-02-27 14:35+0100\n"
+"PO-Revision-Date: 2013-02-27 13:36+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,27 +18,27 @@ msgstr ""
 "Language: is\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:339
+#: app.php:349
 msgid "Help"
 msgstr "Hjálp"
 
-#: app.php:346
+#: app.php:362
 msgid "Personal"
 msgstr "Um mig"
 
-#: app.php:351
+#: app.php:373
 msgid "Settings"
 msgstr "Stillingar"
 
-#: app.php:356
+#: app.php:385
 msgid "Users"
 msgstr "Notendur"
 
-#: app.php:363
+#: app.php:398
 msgid "Apps"
 msgstr "Forrit"
 
-#: app.php:365
+#: app.php:406
 msgid "Admin"
 msgstr "Stjórnun"
 
@@ -50,15 +50,15 @@ msgstr "Slökkt á ZIP niðurhali."
 msgid "Files need to be downloaded one by one."
 msgstr "Skrárnar verður að sækja eina og eina"
 
-#: files.php:203 files.php:228
+#: files.php:204 files.php:231
 msgid "Back to Files"
 msgstr "Aftur í skrár"
 
-#: files.php:227
+#: files.php:228
 msgid "Selected files too large to generate zip file."
 msgstr "Valdar skrár eru of stórar til að búa til ZIP skrá."
 
-#: helper.php:226
+#: helper.php:228
 msgid "couldn't be determined"
 msgstr ""
 
@@ -98,87 +98,92 @@ msgstr ""
 msgid "Specify a data folder."
 msgstr ""
 
-#: setup.php:53
+#: setup.php:55
 #, php-format
 msgid "%s enter the database username."
 msgstr ""
 
-#: setup.php:56
+#: setup.php:58
 #, php-format
 msgid "%s enter the database name."
 msgstr ""
 
-#: setup.php:59
+#: setup.php:61
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr ""
 
-#: setup.php:62
+#: setup.php:64
 #, php-format
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:126 setup.php:291 setup.php:336
+#: setup.php:128 setup.php:320 setup.php:365
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:127 setup.php:150 setup.php:204
+#: setup.php:129 setup.php:152 setup.php:229
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:149 setup.php:423 setup.php:489
+#: setup.php:151 setup.php:453 setup.php:520
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:203
+#: setup.php:228
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:255 setup.php:357 setup.php:366 setup.php:384 setup.php:394
-#: setup.php:403 setup.php:430 setup.php:496 setup.php:522 setup.php:529
-#: setup.php:540 setup.php:547 setup.php:556 setup.php:564 setup.php:573
-#: setup.php:579
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:256 setup.php:358 setup.php:367 setup.php:385 setup.php:395
-#: setup.php:404 setup.php:431 setup.php:497 setup.php:523 setup.php:530
-#: setup.php:541 setup.php:557 setup.php:565 setup.php:574
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:270
+#: setup.php:299
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:271
+#: setup.php:300
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:276
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:277
+#: setup.php:306
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:548 setup.php:580
+#: setup.php:579 setup.php:611
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:644
+#: setup.php:631
+#, php-format
+msgid "MS SQL username and/or password not valid: %s"
+msgstr ""
+
+#: setup.php:849
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:645
+#: setup.php:850
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
@@ -235,16 +240,16 @@ msgstr "síðasta ári"
 msgid "years ago"
 msgstr "einhverjum árum"
 
-#: updater.php:75
+#: 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:77
+#: updater.php:81
 msgid "up to date"
 msgstr "nýjasta útgáfa"
 
-#: updater.php:80
+#: updater.php:84
 msgid "updates check is disabled"
 msgstr "uppfærslupróf er ekki virkjað"
 
diff --git a/l10n/is/settings.po b/l10n/is/settings.po
index 23cca9ba41618b690337d8f2372e7d3eb2fa88c7..d4ff8d5ce670ba0128174844f6fd3d2e7189229e 100644
--- a/l10n/is/settings.po
+++ b/l10n/is/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 23:05+0000\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: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
 "MIME-Version: 1.0\n"
@@ -22,8 +22,8 @@ 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:15
-#: ajax/togglegroups.php:18
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr "Villa við auðkenningu"
 
@@ -71,12 +71,12 @@ msgstr "Ógild fyrirspurn"
 msgid "Admins can't remove themself from the admin group"
 msgstr "Stjórnendur geta ekki fjarlægt sjálfa sig úr stjórnendahóp"
 
-#: ajax/togglegroups.php:28
+#: ajax/togglegroups.php:30
 #, php-format
 msgid "Unable to add user to group %s"
 msgstr "Ekki tókst að bæta notenda við hópinn %s"
 
-#: ajax/togglegroups.php:34
+#: ajax/togglegroups.php:36
 #, php-format
 msgid "Unable to remove user from group %s"
 msgstr "Ekki tókst að fjarlægja notanda úr hópnum %s"
@@ -117,7 +117,7 @@ msgstr "Villa"
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:96
+#: js/personal.js:99
 msgid "Saving..."
 msgstr "Er að vista ..."
 
@@ -146,23 +146,23 @@ msgstr "Hópstjóri"
 msgid "Delete"
 msgstr "Eyða"
 
-#: js/users.js:190
+#: js/users.js:191
 msgid "add group"
 msgstr ""
 
-#: js/users.js:351
+#: js/users.js:352
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:357
+#: js/users.js:358
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
 msgid "__language_name__"
 msgstr "__nafn_tungumáls__"
 
@@ -208,19 +208,19 @@ msgstr ""
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:61
+#: templates/admin.php:63
+#, php-format
 msgid ""
-"This ownCloud server can't set system locale to "
-"\"en_US.UTF-8\"/\"en_US.UTF8\". 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 en_US.UTF-8/en_US.UTF8."
+"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:72
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:75
+#: 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 "
@@ -230,98 +230,98 @@ msgid ""
 " of ownCloud."
 msgstr ""
 
-#: templates/admin.php:89
+#: templates/admin.php:92
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:98
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:108
+#: 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:118
+#: 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:125
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:131
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:132
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:140
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:147
+#: templates/admin.php:150
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:148
+#: templates/admin.php:151
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:155
+#: templates/admin.php:158
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:161
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:165
+#: templates/admin.php:168
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:181
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:179
+#: templates/admin.php:182
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:182
+#: templates/admin.php:185
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr ""
 
-#: templates/admin.php:192
+#: templates/admin.php:195
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:193
+#: templates/admin.php:196
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:220
+#: templates/admin.php:223
 msgid "More"
 msgstr "Meira"
 
-#: templates/admin.php:227 templates/personal.php:98
+#: templates/admin.php:230 templates/personal.php:102
 msgid "Version"
 msgstr "Útgáfa"
 
-#: templates/admin.php:230 templates/personal.php:100
+#: templates/admin.php:233 templates/personal.php:105
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -331,51 +331,51 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "Þróað af <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud samfélaginu</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">forrita kóðinn</a> er skráðu með <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
-#: templates/apps.php:10
+#: templates/apps.php:11
 msgid "Add your App"
 msgstr "Bæta við forriti"
 
-#: templates/apps.php:11
+#: templates/apps.php:12
 msgid "More Apps"
 msgstr "Fleiri forrit"
 
-#: templates/apps.php:24
+#: templates/apps.php:28
 msgid "Select an App"
 msgstr "Veldu forrit"
 
-#: templates/apps.php:28
+#: templates/apps.php:34
 msgid "See application page at apps.owncloud.com"
 msgstr "Skoða síðu forrits hjá apps.owncloud.com"
 
-#: templates/apps.php:29
+#: templates/apps.php:36
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-leyfi skráð af <span class=\"author\"></span>"
 
-#: templates/apps.php:31
+#: templates/apps.php:38
 msgid "Update"
 msgstr "Uppfæra"
 
-#: templates/help.php:3
+#: templates/help.php:4
 msgid "User Documentation"
 msgstr "Notenda handbók"
 
-#: templates/help.php:4
+#: templates/help.php:6
 msgid "Administrator Documentation"
 msgstr "Stjórnenda handbók"
 
-#: templates/help.php:6
+#: templates/help.php:9
 msgid "Online Documentation"
 msgstr "Handbók á netinu"
 
-#: templates/help.php:7
+#: templates/help.php:11
 msgid "Forum"
 msgstr "Vefspjall"
 
-#: templates/help.php:9
+#: templates/help.php:14
 msgid "Bugtracker"
 msgstr "Villubókhald"
 
-#: templates/help.php:11
+#: templates/help.php:17
 msgid "Commercial Support"
 msgstr "Borgaður stuðningur"
 
@@ -384,79 +384,79 @@ msgstr "Borgaður stuðningur"
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Þú hefur notað <strong>%s</strong> af tiltæku <strong>%s</strong>"
 
-#: templates/personal.php:14
+#: templates/personal.php:15
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:25
+#: templates/personal.php:26
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:36 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
 msgid "Password"
 msgstr "Lykilorð"
 
-#: templates/personal.php:37
+#: templates/personal.php:38
 msgid "Your password was changed"
 msgstr "Lykilorði þínu hefur verið breytt"
 
-#: templates/personal.php:38
+#: templates/personal.php:39
 msgid "Unable to change your password"
 msgstr "Ekki tókst að breyta lykilorðinu þínu"
 
-#: templates/personal.php:39
+#: templates/personal.php:40
 msgid "Current password"
 msgstr "Núverandi lykilorð"
 
-#: templates/personal.php:40
+#: templates/personal.php:42
 msgid "New password"
 msgstr "Nýtt lykilorð"
 
-#: templates/personal.php:42
+#: templates/personal.php:44
 msgid "Change password"
 msgstr "Breyta lykilorði"
 
-#: templates/personal.php:54 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:78
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:55
+#: templates/personal.php:57
 msgid "Your display name was changed"
 msgstr ""
 
-#: templates/personal.php:56
+#: templates/personal.php:58
 msgid "Unable to change your display name"
 msgstr ""
 
-#: templates/personal.php:59
+#: templates/personal.php:61
 msgid "Change display name"
 msgstr ""
 
-#: templates/personal.php:68
+#: templates/personal.php:70
 msgid "Email"
 msgstr "Netfang"
 
-#: templates/personal.php:69
+#: templates/personal.php:72
 msgid "Your email address"
 msgstr "Netfangið þitt"
 
-#: templates/personal.php:70
+#: templates/personal.php:73
 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:76 templates/personal.php:77
+#: templates/personal.php:79 templates/personal.php:80
 msgid "Language"
 msgstr "Tungumál"
 
-#: templates/personal.php:82
+#: templates/personal.php:86
 msgid "Help translate"
 msgstr "Hjálpa við þýðingu"
 
-#: templates/personal.php:87
+#: templates/personal.php:91
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:89
+#: templates/personal.php:93
 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"
 
diff --git a/l10n/is/user_ldap.po b/l10n/is/user_ldap.po
index 7bc782a7b3cf300c22f9d91e7c007f39f8ab419c..7b8cfc519cd1bcb875204d5d5c5c43e67485f809 100644
--- a/l10n/is/user_ldap.po
+++ b/l10n/is/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-08 00:10+0100\n"
-"PO-Revision-Date: 2013-02-07 23:11+0000\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: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
 "MIME-Version: 1.0\n"
@@ -22,17 +22,17 @@ msgstr ""
 msgid "Failed to delete the server configuration"
 msgstr ""
 
-#: ajax/testConfiguration.php:35
+#: ajax/testConfiguration.php:36
 msgid "The configuration is valid and the connection could be established!"
 msgstr ""
 
-#: ajax/testConfiguration.php:37
+#: ajax/testConfiguration.php:39
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
 msgstr ""
 
-#: ajax/testConfiguration.php:40
+#: ajax/testConfiguration.php:43
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
@@ -87,224 +87,248 @@ msgstr ""
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:17
+#: templates/settings.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:23
 msgid "Host"
 msgstr "Netþjónn"
 
-#: templates/settings.php:21
+#: templates/settings.php:25
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:26
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:27
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:28
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:32
 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:24
+#: templates/settings.php:33
 msgid "Password"
 msgstr "Lykilorð"
 
-#: templates/settings.php:24
+#: templates/settings.php:36
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:37
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:40
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:41
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:42
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:45
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:46
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:47
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:50
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:51
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:55
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:34
+#: templates/settings.php:58
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:60
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:39
+#: templates/settings.php:63
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:65
+msgid "Cache Time-To-Live"
+msgstr ""
+
+#: templates/settings.php:65
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:67
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:47
+#: templates/settings.php:71
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:47 templates/settings.php:50
+#: templates/settings.php:71 templates/settings.php:74
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:74
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:75
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:77
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:79
+msgid "Quota Field"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Quota Default"
+msgstr ""
+
+#: templates/settings.php:80
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:81
+msgid "Email Field"
+msgstr ""
+
+#: templates/settings.php:82
+msgid "User Home Folder Naming Rule"
+msgstr ""
+
+#: templates/settings.php:82
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:62
+#: templates/settings.php:86
+msgid "Test Configuration"
+msgstr ""
+
+#: templates/settings.php:86
 msgid "Help"
 msgstr "Hjálp"
diff --git a/l10n/it/core.po b/l10n/it/core.po
index 863859a6dfb03111ae82af29b5d2fda890a66703..e1bca79ae849a921d27e28adb3406f19c19a275e 100644
--- a/l10n/it/core.po
+++ b/l10n/it/core.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 14:32+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:20+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"
@@ -392,7 +392,7 @@ msgstr "L'aggiornamento non è riuscito. Segnala il problema alla <a href=\"http
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "L'aggiornamento è stato effettuato correttamente. Stai per essere reindirizzato a ownCloud."
 
-#: lostpassword/controller.php:47
+#: lostpassword/controller.php:48
 msgid "ownCloud password reset"
 msgstr "Ripristino password di ownCloud"
 
diff --git a/l10n/it/files.po b/l10n/it/files.po
index 1a3e8db783bbbc57c45f84149b0babdab3c77cd1..ede7635d207addc25a06937d5977cc4a1a2a450b 100644
--- a/l10n/it/files.po
+++ b/l10n/it/files.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\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: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
@@ -54,27 +54,27 @@ msgid ""
 "the HTML form"
 msgstr "Il file caricato supera il valore MAX_FILE_SIZE definito nel form HTML"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
 msgstr "Il file è stato parzialmente caricato"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:31
 msgid "No file was uploaded"
 msgstr "Nessun file è stato caricato"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:32
 msgid "Missing a temporary folder"
 msgstr "Cartella temporanea mancante"
 
-#: ajax/upload.php:34
+#: ajax/upload.php:33
 msgid "Failed to write to disk"
 msgstr "Scrittura su disco non riuscita"
 
-#: ajax/upload.php:52
+#: ajax/upload.php:51
 msgid "Not enough storage available"
 msgstr "Spazio di archiviazione insufficiente"
 
-#: ajax/upload.php:83
+#: ajax/upload.php:82
 msgid "Invalid directory."
 msgstr "Cartella non valida."
 
@@ -86,7 +86,7 @@ msgstr "File"
 msgid "Delete permanently"
 msgstr "Elimina definitivamente"
 
-#: js/fileactions.js:127 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:127 templates/index.php:92 templates/index.php:93
 msgid "Delete"
 msgstr "Elimina"
 
@@ -94,40 +94,36 @@ msgstr "Elimina"
 msgid "Rename"
 msgstr "Rinomina"
 
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
 msgid "Pending"
 msgstr "In corso"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "{new_name} already exists"
 msgstr "{new_name} esiste già"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "replace"
 msgstr "sostituisci"
 
-#: js/filelist.js:253
+#: js/filelist.js:251
 msgid "suggest name"
 msgstr "suggerisci nome"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "cancel"
 msgstr "annulla"
 
-#: js/filelist.js:295
-msgid "replaced {new_name}"
-msgstr "sostituito {new_name}"
+#: js/filelist.js:298
+msgid "replaced {new_name} with {old_name}"
+msgstr "sostituito {new_name} con {old_name}"
 
-#: js/filelist.js:295 js/filelist.js:297
+#: js/filelist.js:298
 msgid "undo"
 msgstr "annulla"
 
-#: js/filelist.js:297
-msgid "replaced {new_name} with {old_name}"
-msgstr "sostituito {new_name} con {old_name}"
-
-#: js/filelist.js:322
+#: js/filelist.js:323
 msgid "perform delete operation"
 msgstr "esegui l'operazione di eliminazione"
 
@@ -153,74 +149,74 @@ 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:224
+#: js/files.js:225
 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:261
+#: js/files.js:262
 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:261
+#: js/files.js:262
 msgid "Upload Error"
 msgstr "Errore di invio"
 
-#: js/files.js:272
+#: js/files.js:273
 msgid "Close"
 msgstr "Chiudi"
 
-#: js/files.js:311
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr "1 file in fase di caricamento"
 
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: 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:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "Invio annullato"
 
-#: js/files.js:496
+#: js/files.js:497
 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:569
+#: js/files.js:570
 msgid "URL cannot be empty."
 msgstr "L'URL non può essere vuoto."
 
-#: js/files.js:574
+#: js/files.js:575
 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:948 templates/index.php:67
+#: js/files.js:953 templates/index.php:68
 msgid "Name"
 msgstr "Nome"
 
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:954 templates/index.php:79
 msgid "Size"
 msgstr "Dimensione"
 
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:955 templates/index.php:81
 msgid "Modified"
 msgstr "Modificato"
 
-#: js/files.js:969
+#: js/files.js:974
 msgid "1 folder"
 msgstr "1 cartella"
 
-#: js/files.js:971
+#: js/files.js:976
 msgid "{count} folders"
 msgstr "{count} cartelle"
 
-#: js/files.js:979
+#: js/files.js:984
 msgid "1 file"
 msgstr "1 file"
 
-#: js/files.js:981
+#: js/files.js:986
 msgid "{count} files"
 msgstr "{count} file"
 
@@ -278,39 +274,43 @@ msgstr "Da collegamento"
 
 #: templates/index.php:40
 msgid "Deleted files"
-msgstr ""
+msgstr "File eliminati"
 
 #: templates/index.php:46
 msgid "Cancel upload"
 msgstr "Annulla invio"
 
-#: templates/index.php:59
+#: templates/index.php:53
+msgid "You don’t have write permissions here."
+msgstr "Qui non hai i permessi di scrittura."
+
+#: templates/index.php:60
 msgid "Nothing in here. Upload something!"
 msgstr "Non c'è niente qui. Carica qualcosa!"
 
-#: templates/index.php:73
+#: templates/index.php:74
 msgid "Download"
 msgstr "Scarica"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:86 templates/index.php:87
 msgid "Unshare"
 msgstr "Rimuovi condivisione"
 
-#: templates/index.php:105
+#: templates/index.php:106
 msgid "Upload too large"
 msgstr "Il file caricato è troppo grande"
 
-#: templates/index.php:107
+#: templates/index.php:108
 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:112
+#: templates/index.php:113
 msgid "Files are being scanned, please wait."
 msgstr "Scansione dei file in corso, attendi"
 
-#: templates/index.php:115
+#: templates/index.php:116
 msgid "Current scanning"
 msgstr "Scansione corrente"
 
diff --git a/l10n/it/files_external.po b/l10n/it/files_external.po
index 970dad99d8e486038a7559c94bb2bd394ab257ad..496c15e1d7a314ee6f15a3135612f7e7454bd679 100644
--- a/l10n/it/files_external.po
+++ b/l10n/it/files_external.po
@@ -4,13 +4,13 @@
 # 
 # Translators:
 # Innocenzo Ventre <el.diabl09@gmail.com>, 2012.
-# Vincenzo Reale <vinx.reale@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: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-11 23:42+0000\n"
+"POT-Creation-Date: 2013-03-01 00:05+0100\n"
+"PO-Revision-Date: 2013-02-27 23:30+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,37 +19,33 @@ msgstr ""
 "Language: it\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 "Accesso consentito"
 
-#: 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 "Errore durante la configurazione dell'archivio Dropbox"
 
-#: 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 "Concedi l'accesso"
 
-#: js/dropbox.js:73 js/google.js:72
-msgid "Fill out all required fields"
-msgstr "Compila tutti i campi richiesti"
-
-#: js/dropbox.js:85
+#: js/dropbox.js:101
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr "Fornisci chiave di applicazione e segreto di Dropbox validi."
 
-#: 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 "Errore durante la configurazione dell'archivio Google Drive"
 
-#: lib/config.php:434
+#: lib/config.php:421
 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:435
+#: lib/config.php:424
 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 "
@@ -60,63 +56,63 @@ msgstr "<b>Avviso:</b> il supporto FTP di PHP non è abilitato o non è installa
 msgid "External Storage"
 msgstr "Archiviazione esterna"
 
-#: templates/settings.php:8 templates/settings.php:22
-msgid "Mount point"
-msgstr "Punto di mount"
-
-#: templates/settings.php:9
-msgid "Backend"
-msgstr "Motore"
+#: templates/settings.php:9 templates/settings.php:28
+msgid "Folder name"
+msgstr "Nome della cartella"
 
 #: templates/settings.php:10
+msgid "External storage"
+msgstr "Archiviazione esterna"
+
+#: templates/settings.php:11
 msgid "Configuration"
 msgstr "Configurazione"
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid "Options"
 msgstr "Opzioni"
 
-#: templates/settings.php:12
+#: templates/settings.php:13
 msgid "Applicable"
 msgstr "Applicabile"
 
-#: templates/settings.php:27
-msgid "Add mount point"
-msgstr "Aggiungi punto di mount"
+#: templates/settings.php:33
+msgid "Add storage"
+msgstr "Aggiungi archiviazione"
 
-#: templates/settings.php:85
+#: templates/settings.php:90
 msgid "None set"
 msgstr "Nessuna impostazione"
 
-#: templates/settings.php:86
+#: templates/settings.php:91
 msgid "All Users"
 msgstr "Tutti gli utenti"
 
-#: templates/settings.php:87
+#: templates/settings.php:92
 msgid "Groups"
 msgstr "Gruppi"
 
-#: templates/settings.php:95
+#: templates/settings.php:100
 msgid "Users"
 msgstr "Utenti"
 
-#: 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 "Elimina"
 
-#: templates/settings.php:124
+#: templates/settings.php:129
 msgid "Enable User External Storage"
 msgstr "Abilita la memoria esterna dell'utente"
 
-#: templates/settings.php:125
+#: templates/settings.php:130
 msgid "Allow users to mount their own external storage"
 msgstr "Consenti agli utenti di montare la propria memoria esterna"
 
-#: templates/settings.php:139
+#: templates/settings.php:141
 msgid "SSL root certificates"
 msgstr "Certificati SSL radice"
 
-#: templates/settings.php:158
+#: templates/settings.php:159
 msgid "Import Root Certificate"
 msgstr "Importa certificato radice"
diff --git a/l10n/it/files_trashbin.po b/l10n/it/files_trashbin.po
index f696193957dc125f7da8cc4713f92a6dfa5dae59..b2baa9ac7adf283bb92c4f18594374b8c0e0794b 100644
--- a/l10n/it/files_trashbin.po
+++ b/l10n/it/files_trashbin.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-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 09:50+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\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: 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,7 +18,7 @@ msgstr ""
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:22
+#: ajax/delete.php:40
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "Impossibile eliminare %s definitivamente"
@@ -28,35 +28,39 @@ msgstr "Impossibile eliminare %s definitivamente"
 msgid "Couldn't restore %s"
 msgstr "Impossibile ripristinare %s"
 
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
 msgid "perform restore operation"
 msgstr "esegui operazione di ripristino"
 
-#: js/trash.js:33
+#: js/trash.js:34
 msgid "delete file permanently"
 msgstr "elimina il file definitivamente"
 
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr "Elimina definitivamente"
+
+#: js/trash.js:174 templates/index.php:17
 msgid "Name"
 msgstr "Nome"
 
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:175 templates/index.php:27
 msgid "Deleted"
 msgstr "Eliminati"
 
-#: js/trash.js:135
+#: js/trash.js:184
 msgid "1 folder"
 msgstr "1 cartella"
 
-#: js/trash.js:137
+#: js/trash.js:186
 msgid "{count} folders"
 msgstr "{count} cartelle"
 
-#: js/trash.js:145
+#: js/trash.js:194
 msgid "1 file"
 msgstr "1 file"
 
-#: js/trash.js:147
+#: js/trash.js:196
 msgid "{count} files"
 msgstr "{count} file"
 
@@ -67,3 +71,11 @@ msgstr "Qui non c'è niente. Il tuo cestino è vuoto."
 #: templates/index.php:20 templates/index.php:22
 msgid "Restore"
 msgstr "Ripristina"
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr "Elimina"
+
+#: templates/part.breadcrumb.php:9
+msgid "Deleted Files"
+msgstr ""
diff --git a/l10n/it/files_versions.po b/l10n/it/files_versions.po
index 8953241ed54c324d74b19db3c42989332b441216..57ca778df641b10a395267484c54c91dc8b0b865 100644
--- a/l10n/it/files_versions.po
+++ b/l10n/it/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-09 00:12+0100\n"
-"PO-Revision-Date: 2013-02-07 23:40+0000\n"
+"POT-Creation-Date: 2013-03-01 00:05+0100\n"
+"PO-Revision-Date: 2013-02-27 23:30+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"
@@ -49,18 +49,10 @@ msgstr "Non sono disponibili versioni precedenti"
 msgid "No path specified"
 msgstr "Nessun percorso specificato"
 
-#: js/versions.js:16
-msgid "History"
-msgstr "Cronologia"
+#: js/versions.js:6
+msgid "Versions"
+msgstr "Versioni"
 
 #: templates/history.php:20
 msgid "Revert a file to a previous version by clicking on its revert button"
 msgstr "Ripristina un file a una versione precedente facendo clic sul rispettivo pulsante di ripristino"
-
-#: templates/settings.php:3
-msgid "Files Versioning"
-msgstr "Controllo di versione dei file"
-
-#: templates/settings.php:4
-msgid "Enable"
-msgstr "Abilita"
diff --git a/l10n/it/lib.po b/l10n/it/lib.po
index 983e5ae5a7cc0c10d574d596163c2d7a80e88d6c..696ca92b12132883c3e5842e0d6c0ebc6c1b4aa2 100644
--- a/l10n/it/lib.po
+++ b/l10n/it/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 14:33+0000\n"
+"POT-Creation-Date: 2013-02-28 00:04+0100\n"
+"PO-Revision-Date: 2013-02-27 13:51+0000\n"
 "Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
@@ -18,27 +18,27 @@ msgstr ""
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:339
+#: app.php:349
 msgid "Help"
 msgstr "Aiuto"
 
-#: app.php:346
+#: app.php:362
 msgid "Personal"
 msgstr "Personale"
 
-#: app.php:351
+#: app.php:373
 msgid "Settings"
 msgstr "Impostazioni"
 
-#: app.php:356
+#: app.php:385
 msgid "Users"
 msgstr "Utenti"
 
-#: app.php:363
+#: app.php:398
 msgid "Apps"
 msgstr "Applicazioni"
 
-#: app.php:365
+#: app.php:406
 msgid "Admin"
 msgstr "Admin"
 
@@ -50,15 +50,15 @@ msgstr "Lo scaricamento in formato ZIP è stato disabilitato."
 msgid "Files need to be downloaded one by one."
 msgstr "I file devono essere scaricati uno alla volta."
 
-#: files.php:203 files.php:228
+#: files.php:204 files.php:231
 msgid "Back to Files"
 msgstr "Torna ai file"
 
-#: files.php:227
+#: files.php:228
 msgid "Selected files too large to generate zip file."
 msgstr "I  file selezionati sono troppo grandi per generare un file zip."
 
-#: helper.php:226
+#: helper.php:228
 msgid "couldn't be determined"
 msgstr "non può essere determinato"
 
@@ -98,87 +98,92 @@ msgstr "Imposta una password di amministrazione."
 msgid "Specify a data folder."
 msgstr "Specifica una cartella dei dati."
 
-#: setup.php:53
+#: setup.php:55
 #, php-format
 msgid "%s enter the database username."
 msgstr "%s digita il nome utente del database."
 
-#: setup.php:56
+#: setup.php:58
 #, php-format
 msgid "%s enter the database name."
 msgstr "%s digita il nome del database."
 
-#: setup.php:59
+#: setup.php:61
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr "%s non dovresti utilizzare punti nel nome del database"
 
-#: setup.php:62
+#: setup.php:64
 #, php-format
 msgid "%s set the database host."
 msgstr "%s imposta l'host del database."
 
-#: setup.php:126 setup.php:291 setup.php:336
+#: setup.php:128 setup.php:320 setup.php:365
 msgid "PostgreSQL username and/or password not valid"
 msgstr "Nome utente e/o password di PostgreSQL non validi"
 
-#: setup.php:127 setup.php:150 setup.php:204
+#: setup.php:129 setup.php:152 setup.php:229
 msgid "You need to enter either an existing account or the administrator."
 msgstr "È necessario inserire un account esistente o l'amministratore."
 
-#: setup.php:149 setup.php:423 setup.php:489
+#: setup.php:151 setup.php:453 setup.php:520
 msgid "Oracle username and/or password not valid"
 msgstr "Nome utente e/o password di Oracle non validi"
 
-#: setup.php:203
+#: setup.php:228
 msgid "MySQL username and/or password not valid"
 msgstr "Nome utente e/o password di MySQL non validi"
 
-#: setup.php:255 setup.php:357 setup.php:366 setup.php:384 setup.php:394
-#: setup.php:403 setup.php:430 setup.php:496 setup.php:522 setup.php:529
-#: setup.php:540 setup.php:547 setup.php:556 setup.php:564 setup.php:573
-#: setup.php:579
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Errore DB: \"%s\""
 
-#: setup.php:256 setup.php:358 setup.php:367 setup.php:385 setup.php:395
-#: setup.php:404 setup.php:431 setup.php:497 setup.php:523 setup.php:530
-#: setup.php:541 setup.php:557 setup.php:565 setup.php:574
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "Il comando non consentito era: \"%s\""
 
-#: setup.php:270
+#: setup.php:299
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "L'utente MySQL '%s'@'localhost' esiste già."
 
-#: setup.php:271
+#: setup.php:300
 msgid "Drop this user from MySQL"
 msgstr "Elimina questo utente da MySQL"
 
-#: setup.php:276
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "L'utente MySQL '%s'@'%%' esiste già"
 
-#: setup.php:277
+#: setup.php:306
 msgid "Drop this user from MySQL."
 msgstr "Elimina questo utente da MySQL."
 
-#: setup.php:548 setup.php:580
+#: setup.php:579 setup.php:611
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Il comando non consentito era: \"%s\", nome: %s, password: %s"
 
-#: setup.php:644
+#: setup.php:631
+#, 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
 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:645
+#: setup.php:850
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Leggi attentamente le <a href='%s'>guide d'installazione</a>."
@@ -235,16 +240,16 @@ msgstr "l'anno scorso"
 msgid "years ago"
 msgstr "anni fa"
 
-#: updater.php:75
+#: 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:77
+#: updater.php:81
 msgid "up to date"
 msgstr "aggiornato"
 
-#: updater.php:80
+#: updater.php:84
 msgid "updates check is disabled"
 msgstr "il controllo degli aggiornamenti è disabilitato"
 
diff --git a/l10n/it/settings.po b/l10n/it/settings.po
index 590800accaa63a8eb9773d996a3cb96b5f168d59..07407feff948f1588d45945aaa58977390d23526 100644
--- a/l10n/it/settings.po
+++ b/l10n/it/settings.po
@@ -14,9 +14,9 @@ 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:05+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-02-28 00:04+0100\n"
+"PO-Revision-Date: 2013-02-27 13:51+0000\n"
+"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -28,8 +28,8 @@ 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:15
-#: ajax/togglegroups.php:18
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr "Errore di autenticazione"
 
@@ -77,12 +77,12 @@ msgstr "Richiesta non valida"
 msgid "Admins can't remove themself from the admin group"
 msgstr "Gli amministratori non possono rimuovere se stessi dal gruppo di amministrazione"
 
-#: ajax/togglegroups.php:28
+#: ajax/togglegroups.php:30
 #, php-format
 msgid "Unable to add user to group %s"
 msgstr "Impossibile aggiungere l'utente al gruppo %s"
 
-#: ajax/togglegroups.php:34
+#: ajax/togglegroups.php:36
 #, php-format
 msgid "Unable to remove user from group %s"
 msgstr "Impossibile rimuovere l'utente dal gruppo %s"
@@ -123,7 +123,7 @@ msgstr "Errore"
 msgid "Updated"
 msgstr "Aggiornato"
 
-#: js/personal.js:96
+#: js/personal.js:99
 msgid "Saving..."
 msgstr "Salvataggio in corso..."
 
@@ -152,23 +152,23 @@ msgstr "Gruppi amministrati"
 msgid "Delete"
 msgstr "Elimina"
 
-#: js/users.js:190
+#: js/users.js:191
 msgid "add group"
 msgstr "aggiungi gruppo"
 
-#: js/users.js:351
+#: js/users.js:352
 msgid "A valid username must be provided"
 msgstr "Deve essere fornito un nome utente valido"
 
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
 msgid "Error creating user"
 msgstr "Errore durante la creazione dell'utente"
 
-#: js/users.js:357
+#: js/users.js:358
 msgid "A valid password must be provided"
 msgstr "Deve essere fornita una password valida"
 
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
 msgid "__language_name__"
 msgstr "Italiano"
 
@@ -214,19 +214,19 @@ msgstr "Il modulo PHP 'fileinfo' non è presente. Consigliamo vivamente di abili
 msgid "Locale not working"
 msgstr "Locale non funzionante"
 
-#: templates/admin.php:61
+#: templates/admin.php:63
+#, php-format
 msgid ""
-"This ownCloud server can't set system locale to "
-"\"en_US.UTF-8\"/\"en_US.UTF8\". 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 en_US.UTF-8/en_US.UTF8."
-msgstr "Questo server ownCloud non può impostare la localizzazione a \"en_US.UTF-8\"/\"en_US.UTF8\". Ciò significa che potrebbero verificarsi dei problemi con alcuni caratteri nei nomi dei file. Consigliamo vivamente di installare i pacchetti necessari a supportare en_US.UTF-8/en_US.UTF8."
+"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 "Questo server ownCloud non può impostare la localizzazione a %s. Ciò significa che potrebbero esserci problemi con alcuni caratteri nei nomi dei file. Consigliamo vivamente di installare i pacchetti richiesti sul sistema per supportare %s."
 
-#: templates/admin.php:72
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr "Concessione Internet non funzionante"
 
-#: templates/admin.php:75
+#: 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 "
@@ -236,98 +236,98 @@ msgid ""
 " of ownCloud."
 msgstr "Questo server ownCloud non ha una connessione a Internet funzionante. Ciò significa che alcune delle funzionalità come il montaggio di archivi esterni, le notifiche degli aggiornamenti o l'installazione di applicazioni di terze parti non funzioneranno. Anche l'accesso remoto ai file e l'invio di email di notifica potrebbero non funzionare. Ti suggeriamo di abilitare la connessione a Internet del server se desideri disporre di tutte le funzionalità di ownCloud."
 
-#: templates/admin.php:89
+#: templates/admin.php:92
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:98
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr "Esegui un'operazione con ogni pagina caricata"
 
-#: templates/admin.php:108
+#: 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 è registrato su un sevizio webcron. Invoca la pagina cron.php nella radice di ownCloud ogni minuto, tramite http."
 
-#: templates/admin.php:118
+#: 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 "Utilizza il servizio cron di sistema. Invoca il file cron.php nella cartella di ownCloud tramite un job ogni minuto."
 
-#: templates/admin.php:125
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr "Condivisione"
 
-#: templates/admin.php:131
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr "Abilita API di condivisione"
 
-#: templates/admin.php:132
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr "Consenti alle applicazioni di utilizzare le API di condivisione"
 
-#: templates/admin.php:139
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr "Consenti collegamenti"
 
-#: templates/admin.php:140
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr "Consenti agli utenti di condividere pubblicamente elementi tramite collegamenti"
 
-#: templates/admin.php:147
+#: templates/admin.php:150
 msgid "Allow resharing"
 msgstr "Consenti la ri-condivisione"
 
-#: templates/admin.php:148
+#: templates/admin.php:151
 msgid "Allow users to share items shared with them again"
 msgstr "Consenti agli utenti di condividere a loro volta elementi condivisi da altri"
 
-#: templates/admin.php:155
+#: templates/admin.php:158
 msgid "Allow users to share with anyone"
 msgstr "Consenti agli utenti di condividere con chiunque"
 
-#: templates/admin.php:158
+#: templates/admin.php:161
 msgid "Allow users to only share with users in their groups"
 msgstr "Consenti agli utenti di condividere solo con utenti dei loro gruppi"
 
-#: templates/admin.php:165
+#: templates/admin.php:168
 msgid "Security"
 msgstr "Protezione"
 
-#: templates/admin.php:178
+#: templates/admin.php:181
 msgid "Enforce HTTPS"
 msgstr "Forza HTTPS"
 
-#: templates/admin.php:179
+#: templates/admin.php:182
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr "Obbliga i client a connettersi a ownCloud tramite una confessione cifrata."
 
-#: templates/admin.php:182
+#: templates/admin.php:185
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr "Connettiti a questa istanza di ownCloud tramite HTTPS per abilitare o disabilitare la protezione SSL."
 
-#: templates/admin.php:192
+#: templates/admin.php:195
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:193
+#: templates/admin.php:196
 msgid "Log level"
 msgstr "Livello di log"
 
-#: templates/admin.php:220
+#: templates/admin.php:223
 msgid "More"
 msgstr "Più"
 
-#: templates/admin.php:227 templates/personal.php:98
+#: templates/admin.php:230 templates/personal.php:102
 msgid "Version"
 msgstr "Versione"
 
-#: templates/admin.php:230 templates/personal.php:100
+#: templates/admin.php:233 templates/personal.php:105
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -335,53 +335,53 @@ 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 "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> è licenziato nei termini della <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
+msgstr "Sviluppato dalla <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunità di ownCloud</a>, il <a href=\"https://github.com/owncloud\" target=\"_blank\">codice sorgente</a> è rilasciato nei termini della licenza <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
-#: templates/apps.php:10
+#: templates/apps.php:11
 msgid "Add your App"
 msgstr "Aggiungi la tua applicazione"
 
-#: templates/apps.php:11
+#: templates/apps.php:12
 msgid "More Apps"
 msgstr "Altre applicazioni"
 
-#: templates/apps.php:24
+#: templates/apps.php:28
 msgid "Select an App"
 msgstr "Seleziona un'applicazione"
 
-#: templates/apps.php:28
+#: templates/apps.php:34
 msgid "See application page at apps.owncloud.com"
 msgstr "Vedere la pagina dell'applicazione su apps.owncloud.com"
 
-#: templates/apps.php:29
+#: templates/apps.php:36
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-licenziato da <span class=\"author\"></span>"
 
-#: templates/apps.php:31
+#: templates/apps.php:38
 msgid "Update"
 msgstr "Aggiorna"
 
-#: templates/help.php:3
+#: templates/help.php:4
 msgid "User Documentation"
 msgstr "Documentazione utente"
 
-#: templates/help.php:4
+#: templates/help.php:6
 msgid "Administrator Documentation"
 msgstr "Documentazione amministratore"
 
-#: templates/help.php:6
+#: templates/help.php:9
 msgid "Online Documentation"
 msgstr "Documentazione in linea"
 
-#: templates/help.php:7
+#: templates/help.php:11
 msgid "Forum"
 msgstr "Forum"
 
-#: templates/help.php:9
+#: templates/help.php:14
 msgid "Bugtracker"
 msgstr "Sistema di tracciamento bug"
 
-#: templates/help.php:11
+#: templates/help.php:17
 msgid "Commercial Support"
 msgstr "Supporto commerciale"
 
@@ -390,79 +390,79 @@ msgstr "Supporto commerciale"
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Hai utilizzato <strong>%s</strong> dei <strong>%s</strong> disponibili"
 
-#: templates/personal.php:14
+#: templates/personal.php:15
 msgid "Get the apps to sync your files"
 msgstr "Scarica le applicazioni per sincronizzare i tuoi file"
 
-#: templates/personal.php:25
+#: templates/personal.php:26
 msgid "Show First Run Wizard again"
 msgstr "Mostra nuovamente la procedura di primo avvio"
 
-#: templates/personal.php:36 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
 msgid "Password"
 msgstr "Password"
 
-#: templates/personal.php:37
+#: templates/personal.php:38
 msgid "Your password was changed"
 msgstr "La tua password è cambiata"
 
-#: templates/personal.php:38
+#: templates/personal.php:39
 msgid "Unable to change your password"
 msgstr "Modifica password non riuscita"
 
-#: templates/personal.php:39
+#: templates/personal.php:40
 msgid "Current password"
 msgstr "Password attuale"
 
-#: templates/personal.php:40
+#: templates/personal.php:42
 msgid "New password"
 msgstr "Nuova password"
 
-#: templates/personal.php:42
+#: templates/personal.php:44
 msgid "Change password"
 msgstr "Modifica password"
 
-#: templates/personal.php:54 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:78
 msgid "Display Name"
 msgstr "Nome visualizzato"
 
-#: templates/personal.php:55
+#: templates/personal.php:57
 msgid "Your display name was changed"
 msgstr "Il tuo nome visualizzato è stato cambiato"
 
-#: templates/personal.php:56
+#: templates/personal.php:58
 msgid "Unable to change your display name"
 msgstr "Impossibile cambiare il tuo nome visualizzato"
 
-#: templates/personal.php:59
+#: templates/personal.php:61
 msgid "Change display name"
 msgstr "Cambia il nome visualizzato"
 
-#: templates/personal.php:68
+#: templates/personal.php:70
 msgid "Email"
 msgstr "Email"
 
-#: templates/personal.php:69
+#: templates/personal.php:72
 msgid "Your email address"
 msgstr "Il tuo indirizzo email"
 
-#: templates/personal.php:70
+#: templates/personal.php:73
 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:76 templates/personal.php:77
+#: templates/personal.php:79 templates/personal.php:80
 msgid "Language"
 msgstr "Lingua"
 
-#: templates/personal.php:82
+#: templates/personal.php:86
 msgid "Help translate"
 msgstr "Migliora la traduzione"
 
-#: templates/personal.php:87
+#: templates/personal.php:91
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:89
+#: templates/personal.php:93
 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"
 
diff --git a/l10n/it/user_ldap.po b/l10n/it/user_ldap.po
index 9dcf0043194db6fd3727dfdef7f225beb3005f33..a03705a5cf6997f638d10e3140aca40bed8dca34 100644
--- a/l10n/it/user_ldap.po
+++ b/l10n/it/user_ldap.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-09 00:12+0100\n"
-"PO-Revision-Date: 2013-02-07 23:40+0000\n"
+"POT-Creation-Date: 2013-03-05 00:18+0100\n"
+"PO-Revision-Date: 2013-03-04 14:30+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,17 +23,17 @@ msgstr ""
 msgid "Failed to delete the server configuration"
 msgstr "Eliminazione della configurazione del server non riuscita"
 
-#: ajax/testConfiguration.php:35
+#: ajax/testConfiguration.php:36
 msgid "The configuration is valid and the connection could be established!"
 msgstr "La configurazione è valida e la connessione può essere stabilita."
 
-#: ajax/testConfiguration.php:37
+#: ajax/testConfiguration.php:39
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
 msgstr "La configurazione è valida, ma il Bind non è riuscito. Controlla le impostazioni del server e le credenziali."
 
-#: ajax/testConfiguration.php:40
+#: ajax/testConfiguration.php:43
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
@@ -88,224 +88,248 @@ msgstr "<b>Avviso:</b> il modulo PHP LDAP non è installato, il motore non funzi
 msgid "Server configuration"
 msgstr "Configurazione del server"
 
-#: templates/settings.php:17
+#: templates/settings.php:18
 msgid "Add Server Configuration"
 msgstr "Aggiungi configurazione del server"
 
-#: templates/settings.php:21
+#: templates/settings.php:23
 msgid "Host"
 msgstr "Host"
 
-#: templates/settings.php:21
+#: templates/settings.php:25
 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:22
+#: templates/settings.php:26
 msgid "Base DN"
 msgstr "DN base"
 
-#: templates/settings.php:22
+#: templates/settings.php:27
 msgid "One Base DN per line"
 msgstr "Un DN base per riga"
 
-#: templates/settings.php:22
+#: templates/settings.php:28
 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:23
+#: templates/settings.php:30
 msgid "User DN"
 msgstr "DN utente"
 
-#: templates/settings.php:23
+#: templates/settings.php:32
 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:24
+#: templates/settings.php:33
 msgid "Password"
 msgstr "Password"
 
-#: templates/settings.php:24
+#: templates/settings.php:36
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "Per l'accesso anonimo, lasciare vuoti i campi DN e Password"
 
-#: templates/settings.php:25
+#: templates/settings.php:37
 msgid "User Login Filter"
 msgstr "Filtro per l'accesso utente"
 
-#: templates/settings.php:25
+#: templates/settings.php:40
 #, 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:25
+#: templates/settings.php:41
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "utilizza il segnaposto %%uid, ad esempio \"uid=%%uid\""
 
-#: templates/settings.php:26
+#: templates/settings.php:42
 msgid "User List Filter"
 msgstr "Filtro per l'elenco utenti"
 
-#: templates/settings.php:26
+#: templates/settings.php:45
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Specifica quale filtro utilizzare durante il recupero degli utenti."
 
-#: templates/settings.php:26
+#: templates/settings.php:46
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "senza nessun segnaposto, per esempio \"objectClass=person\"."
 
-#: templates/settings.php:27
+#: templates/settings.php:47
 msgid "Group Filter"
 msgstr "Filtro per il gruppo"
 
-#: templates/settings.php:27
+#: templates/settings.php:50
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Specifica quale filtro utilizzare durante il recupero dei gruppi."
 
-#: templates/settings.php:27
+#: templates/settings.php:51
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "senza nessun segnaposto, per esempio \"objectClass=posixGroup\"."
 
-#: templates/settings.php:31
+#: templates/settings.php:55
 msgid "Connection Settings"
 msgstr "Impostazioni di connessione"
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "Configuration Active"
 msgstr "Configurazione attiva"
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "When unchecked, this configuration will be skipped."
 msgstr "Se deselezionata, questa configurazione sarà saltata."
 
-#: templates/settings.php:34
+#: templates/settings.php:58
 msgid "Port"
 msgstr "Porta"
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid "Backup (Replica) Host"
 msgstr "Host di backup (Replica)"
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 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:36
+#: templates/settings.php:60
 msgid "Backup (Replica) Port"
 msgstr "Porta di backup (Replica)"
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "Disable Main Server"
 msgstr "Disabilita server principale"
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 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:38
+#: templates/settings.php:62
 msgid "Use TLS"
 msgstr "Usa TLS"
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 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:39
+#: templates/settings.php:63
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Case insensitve LDAP server (Windows)"
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid "Turn off SSL certificate validation."
 msgstr "Disattiva il controllo del certificato SSL."
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 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:40
+#: templates/settings.php:64
 msgid "Not recommended, use for testing only."
 msgstr "Non consigliato, utilizzare solo per test."
 
-#: templates/settings.php:41
+#: templates/settings.php:65
+msgid "Cache Time-To-Live"
+msgstr "Tempo di vita della cache"
+
+#: templates/settings.php:65
 msgid "in seconds. A change empties the cache."
 msgstr "in secondi. Il cambio svuota la cache."
 
-#: templates/settings.php:43
+#: templates/settings.php:67
 msgid "Directory Settings"
 msgstr "Impostazioni delle cartelle"
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "User Display Name Field"
 msgstr "Campo per la visualizzazione del nome utente"
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 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:46
+#: templates/settings.php:70
 msgid "Base User Tree"
 msgstr "Struttura base dell'utente"
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "One User Base DN per line"
 msgstr "Un DN base utente per riga"
 
-#: templates/settings.php:47
+#: templates/settings.php:71
 msgid "User Search Attributes"
 msgstr "Attributi di ricerca utente"
 
-#: templates/settings.php:47 templates/settings.php:50
+#: templates/settings.php:71 templates/settings.php:74
 msgid "Optional; one attribute per line"
 msgstr "Opzionale; un attributo per riga"
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "Group Display Name Field"
 msgstr "Campo per la visualizzazione del nome del gruppo"
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 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:49
+#: templates/settings.php:73
 msgid "Base Group Tree"
 msgstr "Struttura base del gruppo"
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "One Group Base DN per line"
 msgstr "Un DN base gruppo per riga"
 
-#: templates/settings.php:50
+#: templates/settings.php:74
 msgid "Group Search Attributes"
 msgstr "Attributi di ricerca gruppo"
 
-#: templates/settings.php:51
+#: templates/settings.php:75
 msgid "Group-Member association"
 msgstr "Associazione gruppo-utente "
 
-#: templates/settings.php:53
+#: templates/settings.php:77
 msgid "Special Attributes"
 msgstr "Attributi speciali"
 
-#: templates/settings.php:56
+#: templates/settings.php:79
+msgid "Quota Field"
+msgstr "Campo Quota"
+
+#: templates/settings.php:80
+msgid "Quota Default"
+msgstr "Quota predefinita"
+
+#: templates/settings.php:80
 msgid "in bytes"
 msgstr "in byte"
 
-#: templates/settings.php:58
+#: templates/settings.php:81
+msgid "Email Field"
+msgstr "Campo Email"
+
+#: templates/settings.php:82
+msgid "User Home Folder Naming Rule"
+msgstr "Regola di assegnazione del nome della cartella utente"
+
+#: templates/settings.php:82
 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:62
+#: templates/settings.php:86
+msgid "Test Configuration"
+msgstr "Prova configurazione"
+
+#: templates/settings.php:86
 msgid "Help"
 msgstr "Aiuto"
diff --git a/l10n/ja_JP/core.po b/l10n/ja_JP/core.po
index c6394fa579a7b68854295bc7051b2a4fda2dbc22..c9a3092c49a6c57fcf11d27061cb168ac467a928 100644
--- a/l10n/ja_JP/core.po
+++ b/l10n/ja_JP/core.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 14:32+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:20+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"
@@ -389,7 +389,7 @@ msgstr "更新に成功しました。この問題を <a href=\"https://github.c
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "更新に成功しました。今すぐownCloudにリダイレクトします。"
 
-#: lostpassword/controller.php:47
+#: lostpassword/controller.php:48
 msgid "ownCloud password reset"
 msgstr "ownCloudのパスワードをリセットします"
 
diff --git a/l10n/ja_JP/files.po b/l10n/ja_JP/files.po
index 21ebd3c48b294bf000b761dabf0001d49b615d31..dd044d05836fbab4f24e161bd8ea011d97dd433e 100644
--- a/l10n/ja_JP/files.po
+++ b/l10n/ja_JP/files.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\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: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
@@ -55,27 +55,27 @@ msgid ""
 "the HTML form"
 msgstr "アップロードされたファイルはHTMLのフォームに設定されたMAX_FILE_SIZEに設定されたサイズを超えています"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
 msgstr "ファイルは一部分しかアップロードされませんでした"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:31
 msgid "No file was uploaded"
 msgstr "ファイルはアップロードされませんでした"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:32
 msgid "Missing a temporary folder"
 msgstr "テンポラリフォルダが見つかりません"
 
-#: ajax/upload.php:34
+#: ajax/upload.php:33
 msgid "Failed to write to disk"
 msgstr "ディスクへの書き込みに失敗しました"
 
-#: ajax/upload.php:52
+#: ajax/upload.php:51
 msgid "Not enough storage available"
 msgstr "ストレージに十分な空き容量がありません"
 
-#: ajax/upload.php:83
+#: ajax/upload.php:82
 msgid "Invalid directory."
 msgstr "無効なディレクトリです。"
 
@@ -87,7 +87,7 @@ msgstr "ファイル"
 msgid "Delete permanently"
 msgstr "完全に削除する"
 
-#: js/fileactions.js:127 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:127 templates/index.php:92 templates/index.php:93
 msgid "Delete"
 msgstr "削除"
 
@@ -95,40 +95,36 @@ msgstr "削除"
 msgid "Rename"
 msgstr "名前の変更"
 
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
 msgid "Pending"
 msgstr "保留"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "{new_name} already exists"
 msgstr "{new_name} はすでに存在しています"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "replace"
 msgstr "置き換え"
 
-#: js/filelist.js:253
+#: js/filelist.js:251
 msgid "suggest name"
 msgstr "推奨名称"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "cancel"
 msgstr "キャンセル"
 
-#: js/filelist.js:295
-msgid "replaced {new_name}"
-msgstr "{new_name} を置換"
+#: js/filelist.js:298
+msgid "replaced {new_name} with {old_name}"
+msgstr "{old_name} を {new_name} に置換"
 
-#: js/filelist.js:295 js/filelist.js:297
+#: js/filelist.js:298
 msgid "undo"
 msgstr "元に戻す"
 
-#: js/filelist.js:297
-msgid "replaced {new_name} with {old_name}"
-msgstr "{old_name} を {new_name} に置換"
-
-#: js/filelist.js:322
+#: js/filelist.js:323
 msgid "perform delete operation"
 msgstr "削除を実行"
 
@@ -154,74 +150,74 @@ msgstr "あなたのストレージは一杯です。ファイルの更新と同
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "あなたのストレージはほぼ一杯です({usedSpacePercent}%)"
 
-#: js/files.js:224
+#: js/files.js:225
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "ダウンロードの準備中です。ファイルサイズが大きい場合は少し時間がかかるかもしれません。"
 
-#: js/files.js:261
+#: js/files.js:262
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "ディレクトリもしくは0バイトのファイルはアップロードできません"
 
-#: js/files.js:261
+#: js/files.js:262
 msgid "Upload Error"
 msgstr "アップロードエラー"
 
-#: js/files.js:272
+#: js/files.js:273
 msgid "Close"
 msgstr "閉じる"
 
-#: js/files.js:311
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr "ファイルを1つアップロード中"
 
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr "{count} ファイルをアップロード中"
 
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "アップロードはキャンセルされました。"
 
-#: js/files.js:496
+#: js/files.js:497
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "ファイル転送を実行中です。今このページから移動するとアップロードが中止されます。"
 
-#: js/files.js:569
+#: js/files.js:570
 msgid "URL cannot be empty."
 msgstr "URLは空にできません。"
 
-#: js/files.js:574
+#: js/files.js:575
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "無効なフォルダ名です。'Shared' の利用は ownCloud が予約済みです。"
 
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:953 templates/index.php:68
 msgid "Name"
 msgstr "名前"
 
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:954 templates/index.php:79
 msgid "Size"
 msgstr "サイズ"
 
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:955 templates/index.php:81
 msgid "Modified"
 msgstr "更新日時"
 
-#: js/files.js:969
+#: js/files.js:974
 msgid "1 folder"
 msgstr "1 フォルダ"
 
-#: js/files.js:971
+#: js/files.js:976
 msgid "{count} folders"
 msgstr "{count} フォルダ"
 
-#: js/files.js:979
+#: js/files.js:984
 msgid "1 file"
 msgstr "1 ファイル"
 
-#: js/files.js:981
+#: js/files.js:986
 msgid "{count} files"
 msgstr "{count} ファイル"
 
@@ -279,39 +275,43 @@ msgstr "リンク"
 
 #: templates/index.php:40
 msgid "Deleted files"
-msgstr ""
+msgstr "削除ファイル"
 
 #: templates/index.php:46
 msgid "Cancel upload"
 msgstr "アップロードをキャンセル"
 
-#: templates/index.php:59
+#: templates/index.php:53
+msgid "You don’t have write permissions here."
+msgstr "あなたには書き込み権限がありません。"
+
+#: templates/index.php:60
 msgid "Nothing in here. Upload something!"
 msgstr "ここには何もありません。何かアップロードしてください。"
 
-#: templates/index.php:73
+#: templates/index.php:74
 msgid "Download"
 msgstr "ダウンロード"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:86 templates/index.php:87
 msgid "Unshare"
 msgstr "共有しない"
 
-#: templates/index.php:105
+#: templates/index.php:106
 msgid "Upload too large"
 msgstr "ファイルサイズが大きすぎます"
 
-#: templates/index.php:107
+#: templates/index.php:108
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "アップロードしようとしているファイルは、サーバで規定された最大サイズを超えています。"
 
-#: templates/index.php:112
+#: templates/index.php:113
 msgid "Files are being scanned, please wait."
 msgstr "ファイルをスキャンしています、しばらくお待ちください。"
 
-#: templates/index.php:115
+#: templates/index.php:116
 msgid "Current scanning"
 msgstr "スキャン中"
 
diff --git a/l10n/ja_JP/files_external.po b/l10n/ja_JP/files_external.po
index 6e0b94a6f3fb9491a6b2576ec1624e6087fe64fd..1c37d81d9dbfbb4548fe4db02a887d348a4688b3 100644
--- a/l10n/ja_JP/files_external.po
+++ b/l10n/ja_JP/files_external.po
@@ -5,13 +5,14 @@
 # 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: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-12 12:24+0000\n"
-"Last-Translator: Daisuke Deguchi <ddeguchi@nagoya-u.jp>\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"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,37 +20,33 @@ msgstr ""
 "Language: ja_JP\n"
 "Plural-Forms: nplurals=1; plural=0;\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 "Dropboxストレージの設定エラー"
 
-#: 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 "有効なDropboxアプリのキーとパスワードを入力して下さい。"
 
-#: 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 "Googleドライブストレージの設定エラー"
 
-#: lib/config.php:434
+#: lib/config.php:421
 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:435
+#: lib/config.php:424
 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 "
@@ -60,63 +57,63 @@ msgstr "<b>警告:</b> PHPのFTPサポートは無効もしくはインストー
 msgid "External Storage"
 msgstr "外部ストレージ"
 
-#: templates/settings.php:8 templates/settings.php:22
-msgid "Mount point"
-msgstr "マウントポイント"
-
-#: templates/settings.php:9
-msgid "Backend"
-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: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"
-msgstr "マウントポイントを追加"
+#: 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 "ユーザ"
 
-#: 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 "削除"
 
-#: 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 "SSLルート証明書"
 
-#: templates/settings.php:158
+#: templates/settings.php:159
 msgid "Import Root Certificate"
 msgstr "ルート証明書をインポート"
diff --git a/l10n/ja_JP/files_trashbin.po b/l10n/ja_JP/files_trashbin.po
index a81dae25c6e1764868469b21ff2ab63f92fa46ea..842098d5227ccf9798a797bcf1830454cc638479 100644
--- a/l10n/ja_JP/files_trashbin.po
+++ b/l10n/ja_JP/files_trashbin.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-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 09:50+0000\n"
-"Last-Translator: Daisuke Deguchi <ddeguchi@nagoya-u.jp>\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: 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"
@@ -18,7 +18,7 @@ msgstr ""
 "Language: ja_JP\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/delete.php:22
+#: ajax/delete.php:40
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "%s を完全に削除出来ませんでした"
@@ -28,35 +28,39 @@ msgstr "%s を完全に削除出来ませんでした"
 msgid "Couldn't restore %s"
 msgstr "%s を復元出来ませんでした"
 
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
 msgid "perform restore operation"
 msgstr "復元操作を実行する"
 
-#: js/trash.js:33
+#: js/trash.js:34
 msgid "delete file permanently"
 msgstr "ファイルを完全に削除する"
 
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr "完全に削除する"
+
+#: js/trash.js:174 templates/index.php:17
 msgid "Name"
 msgstr "名前"
 
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:175 templates/index.php:27
 msgid "Deleted"
 msgstr "削除済み"
 
-#: js/trash.js:135
+#: js/trash.js:184
 msgid "1 folder"
 msgstr "1 フォルダ"
 
-#: js/trash.js:137
+#: js/trash.js:186
 msgid "{count} folders"
 msgstr "{count} フォルダ"
 
-#: js/trash.js:145
+#: js/trash.js:194
 msgid "1 file"
 msgstr "1 ファイル"
 
-#: js/trash.js:147
+#: js/trash.js:196
 msgid "{count} files"
 msgstr "{count} ファイル"
 
@@ -67,3 +71,11 @@ 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/ja_JP/files_versions.po b/l10n/ja_JP/files_versions.po
index 79e1e19a4652be39b047c965377fe6e50a8cea30..7b11e7cf484e5f555a0103c0f83900c506b2cb37 100644
--- a/l10n/ja_JP/files_versions.po
+++ b/l10n/ja_JP/files_versions.po
@@ -6,13 +6,14 @@
 # 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-02-09 00:12+0100\n"
-"PO-Revision-Date: 2013-02-08 04:20+0000\n"
-"Last-Translator: Daisuke Deguchi <ddeguchi@nagoya-u.jp>\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"
 "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"
@@ -43,26 +44,18 @@ 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:16
-msgid "History"
-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 "もとに戻すボタンをクリックすると、ファイルを過去のバージョンに戻します"
-
-#: templates/settings.php:3
-msgid "Files Versioning"
-msgstr "ファイルのバージョン管理"
-
-#: templates/settings.php:4
-msgid "Enable"
-msgstr "有効化"
diff --git a/l10n/ja_JP/lib.po b/l10n/ja_JP/lib.po
index 44896775294b3693298d22d4d194e02f0bedc385..e5d0546cea3630baf2a8e6bcc3feb1d430618aaa 100644
--- a/l10n/ja_JP/lib.po
+++ b/l10n/ja_JP/lib.po
@@ -5,13 +5,14 @@
 # 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-02-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 14:33+0000\n"
-"Last-Translator: Daisuke Deguchi <ddeguchi@nagoya-u.jp>\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"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,27 +20,27 @@ msgstr ""
 "Language: ja_JP\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: app.php:339
+#: app.php:349
 msgid "Help"
 msgstr "ヘルプ"
 
-#: app.php:346
+#: app.php:362
 msgid "Personal"
 msgstr "個人設定"
 
-#: app.php:351
+#: app.php:373
 msgid "Settings"
 msgstr "設定"
 
-#: app.php:356
+#: app.php:385
 msgid "Users"
 msgstr "ユーザ"
 
-#: app.php:363
+#: app.php:398
 msgid "Apps"
 msgstr "アプリ"
 
-#: app.php:365
+#: app.php:406
 msgid "Admin"
 msgstr "管理者"
 
@@ -51,15 +52,15 @@ msgstr "ZIPダウンロードは無効です。"
 msgid "Files need to be downloaded one by one."
 msgstr "ファイルは1つずつダウンロードする必要があります。"
 
-#: files.php:203 files.php:228
+#: files.php:204 files.php:231
 msgid "Back to Files"
 msgstr "ファイルに戻る"
 
-#: files.php:227
+#: files.php:228
 msgid "Selected files too large to generate zip file."
 msgstr "選択したファイルはZIPファイルの生成には大きすぎます。"
 
-#: helper.php:226
+#: helper.php:228
 msgid "couldn't be determined"
 msgstr "測定できませんでした"
 
@@ -99,87 +100,92 @@ msgstr "管理者のパスワードを設定。"
 msgid "Specify a data folder."
 msgstr "データフォルダを指定。"
 
-#: setup.php:53
+#: setup.php:55
 #, php-format
 msgid "%s enter the database username."
 msgstr "%s のデータベースのユーザ名を入力してください。"
 
-#: setup.php:56
+#: setup.php:58
 #, php-format
 msgid "%s enter the database name."
 msgstr "%s のデータベース名を入力してください。"
 
-#: setup.php:59
+#: setup.php:61
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr "%s ではデータベース名にドットを利用できないかもしれません。"
 
-#: setup.php:62
+#: setup.php:64
 #, php-format
 msgid "%s set the database host."
 msgstr "%s にデータベースホストを設定します。"
 
-#: setup.php:126 setup.php:291 setup.php:336
+#: setup.php:128 setup.php:320 setup.php:365
 msgid "PostgreSQL username and/or password not valid"
 msgstr "PostgreSQLのユーザ名もしくはパスワードは有効ではありません"
 
-#: setup.php:127 setup.php:150 setup.php:204
+#: setup.php:129 setup.php:152 setup.php:229
 msgid "You need to enter either an existing account or the administrator."
 msgstr "既存のアカウントもしくは管理者のどちらかを入力する必要があります。"
 
-#: setup.php:149 setup.php:423 setup.php:489
+#: setup.php:151 setup.php:453 setup.php:520
 msgid "Oracle username and/or password not valid"
 msgstr "Oracleのユーザ名もしくはパスワードは有効ではありません"
 
-#: setup.php:203
+#: setup.php:228
 msgid "MySQL username and/or password not valid"
 msgstr "MySQLのユーザ名もしくはパスワードは有効ではありません"
 
-#: setup.php:255 setup.php:357 setup.php:366 setup.php:384 setup.php:394
-#: setup.php:403 setup.php:430 setup.php:496 setup.php:522 setup.php:529
-#: setup.php:540 setup.php:547 setup.php:556 setup.php:564 setup.php:573
-#: setup.php:579
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "DBエラー: \"%s\""
 
-#: setup.php:256 setup.php:358 setup.php:367 setup.php:385 setup.php:395
-#: setup.php:404 setup.php:431 setup.php:497 setup.php:523 setup.php:530
-#: setup.php:541 setup.php:557 setup.php:565 setup.php:574
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "違反コマンド: \"%s\""
 
-#: setup.php:270
+#: setup.php:299
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "MySQLのユーザ '%s'@'localhost' はすでに存在します。"
 
-#: setup.php:271
+#: setup.php:300
 msgid "Drop this user from MySQL"
 msgstr "MySQLからこのユーザを削除"
 
-#: setup.php:276
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "MySQLのユーザ '%s'@'%%' はすでに存在します。"
 
-#: setup.php:277
+#: setup.php:306
 msgid "Drop this user from MySQL."
 msgstr "MySQLからこのユーザを削除する。"
 
-#: setup.php:548 setup.php:580
+#: setup.php:579 setup.php:611
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "違反コマンド: \"%s\"、名前: %s、パスワード: %s"
 
-#: setup.php:644
+#: setup.php:631
+#, php-format
+msgid "MS SQL username and/or password not valid: %s"
+msgstr "MS SQL サーバーのユーザー名/パスワードが正しくありません: %s"
+
+#: setup.php:849
 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:645
+#: setup.php:850
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "<a href='%s'>インストールガイド</a>をよく確認してください。"
@@ -236,16 +242,16 @@ msgstr "昨年"
 msgid "years ago"
 msgstr "年前"
 
-#: updater.php:75
+#: updater.php:78
 #, php-format
 msgid "%s is available. Get <a href=\"%s\">more information</a>"
 msgstr "%s が利用可能です。<a href=\"%s\">詳細情報</a> を確認ください"
 
-#: updater.php:77
+#: updater.php:81
 msgid "up to date"
 msgstr "最新です"
 
-#: updater.php:80
+#: updater.php:84
 msgid "updates check is disabled"
 msgstr "更新チェックは無効です"
 
diff --git a/l10n/ja_JP/settings.po b/l10n/ja_JP/settings.po
index eeb11a53539cc4df7fe5b874b72f4762b833907b..8a310c531732495a10badc82d1ee4b62744e662c 100644
--- a/l10n/ja_JP/settings.po
+++ b/l10n/ja_JP/settings.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-02-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 23:05+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "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,8 +26,8 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "アプリストアからリストをロードできません"
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:15
-#: ajax/togglegroups.php:18
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr "認証エラー"
 
@@ -75,12 +75,12 @@ 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 "ユーザをグループ %s に追加できません"
 
-#: ajax/togglegroups.php:34
+#: ajax/togglegroups.php:36
 #, php-format
 msgid "Unable to remove user from group %s"
 msgstr "ユーザをグループ %s から削除できません"
@@ -121,7 +121,7 @@ msgstr "エラー"
 msgid "Updated"
 msgstr "更新済み"
 
-#: js/personal.js:96
+#: js/personal.js:99
 msgid "Saving..."
 msgstr "保存中..."
 
@@ -150,23 +150,23 @@ msgstr "グループ管理者"
 msgid "Delete"
 msgstr "削除"
 
-#: js/users.js:190
+#: js/users.js:191
 msgid "add group"
 msgstr "グループを追加"
 
-#: js/users.js:351
+#: js/users.js:352
 msgid "A valid username must be provided"
 msgstr "有効なユーザ名を指定する必要があります"
 
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
 msgid "Error creating user"
 msgstr "ユーザ作成エラー"
 
-#: js/users.js:357
+#: js/users.js:358
 msgid "A valid password must be provided"
 msgstr "有効なパスワードを指定する必要があります"
 
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
 msgid "__language_name__"
 msgstr "Japanese (日本語)"
 
@@ -212,19 +212,19 @@ msgstr "PHP のモジュール 'fileinfo' が見つかりません。mimeタイ
 msgid "Locale not working"
 msgstr "ロケールが動作していません"
 
-#: templates/admin.php:61
+#: templates/admin.php:63
+#, php-format
 msgid ""
-"This ownCloud server can't set system locale to "
-"\"en_US.UTF-8\"/\"en_US.UTF8\". 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 en_US.UTF-8/en_US.UTF8."
-msgstr "この ownCloud サーバは、システムロケールを \"en_US.UTF-8\"/\"en_US.UTF8\" に設定できません。これは、ファイル名の特定の文字で問題が発生する可能性があることを意味しています。en_US.UTF-8/en_US.UTF8 をサポートするために、システムに必要なパッケージをインストールすることを強く推奨します。"
+"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 "この ownCloud サーバは、システムロケールを %s に設定できません。これは、ファイル名の特定の文字で問題が発生する可能性があることを意味しています。%s をサポートするために、システムに必要なパッケージをインストールすることを強く推奨します。"
 
-#: templates/admin.php:72
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr "インターネット接続が動作していません"
 
-#: templates/admin.php:75
+#: 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 "
@@ -234,98 +234,98 @@ msgid ""
 " of ownCloud."
 msgstr "この ownCloud サーバには有効なインターネット接続がありません。これは、外部ストレージのマウント、更新の通知、サードパーティ製アプリのインストール、のようないくつかの機能が動作しないことを意味しています。リモートからファイルにアクセスしたり、通知メールを送信したりすることもできません。全ての機能を利用するためには、このサーバのインターネット接続を有効にすることを推奨します。"
 
-#: templates/admin.php:89
+#: templates/admin.php:92
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:98
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr "各ページの読み込み時にタスクを実行する"
 
-#: templates/admin.php:108
+#: 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 は webcron サービスに登録されています。owncloud のルートにある cron.php のページを http 経由で1分に1回呼び出して下さい。"
 
-#: templates/admin.php:118
+#: 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 "システムの cron サービスを利用する。システムの cronjob を通して1分に1回 owncloud 内の cron.php ファイルを呼び出して下さい。"
 
-#: templates/admin.php:125
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr "共有"
 
-#: templates/admin.php:131
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr "共有APIを有効にする"
 
-#: templates/admin.php:132
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr "アプリからの共有APIの利用を許可する"
 
-#: templates/admin.php:139
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr "リンクを許可する"
 
-#: templates/admin.php:140
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr "リンクによりアイテムを公開することを許可する"
 
-#: templates/admin.php:147
+#: templates/admin.php:150
 msgid "Allow resharing"
 msgstr "再共有を許可する"
 
-#: templates/admin.php:148
+#: templates/admin.php:151
 msgid "Allow users to share items shared with them again"
 msgstr "ユーザが共有しているアイテムの再共有を許可する"
 
-#: templates/admin.php:155
+#: templates/admin.php:158
 msgid "Allow users to share with anyone"
 msgstr "ユーザが誰とでも共有することを許可する"
 
-#: templates/admin.php:158
+#: templates/admin.php:161
 msgid "Allow users to only share with users in their groups"
 msgstr "ユーザにグループ内のユーザとのみ共有を許可する"
 
-#: templates/admin.php:165
+#: templates/admin.php:168
 msgid "Security"
 msgstr "セキュリティ"
 
-#: templates/admin.php:178
+#: templates/admin.php:181
 msgid "Enforce HTTPS"
 msgstr "常にHTTPSを使用する"
 
-#: templates/admin.php:179
+#: templates/admin.php:182
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr "クライアントからownCloudへの接続を常に暗号化する"
 
-#: templates/admin.php:182
+#: templates/admin.php:185
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr "常にSSL接続を有効/無効にするために、HTTPS経由でこの ownCloud に接続して下さい。"
 
-#: templates/admin.php:192
+#: templates/admin.php:195
 msgid "Log"
 msgstr "ログ"
 
-#: templates/admin.php:193
+#: templates/admin.php:196
 msgid "Log level"
 msgstr "ログレベル"
 
-#: templates/admin.php:220
+#: templates/admin.php:223
 msgid "More"
 msgstr "詳細"
 
-#: templates/admin.php:227 templates/personal.php:98
+#: templates/admin.php:230 templates/personal.php:102
 msgid "Version"
 msgstr "バージョン"
 
-#: templates/admin.php:230 templates/personal.php:100
+#: templates/admin.php:233 templates/personal.php:105
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -335,51 +335,51 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>により開発されています、<a href=\"https://github.com/owncloud\" target=\"_blank\">ソースコード</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:10
+#: templates/apps.php:11
 msgid "Add your App"
 msgstr "アプリを追加"
 
-#: templates/apps.php:11
+#: templates/apps.php:12
 msgid "More Apps"
 msgstr "さらにアプリを表示"
 
-#: templates/apps.php:24
+#: templates/apps.php:28
 msgid "Select an App"
 msgstr "アプリを選択してください"
 
-#: templates/apps.php:28
+#: templates/apps.php:34
 msgid "See application page at apps.owncloud.com"
 msgstr "apps.owncloud.com でアプリケーションのページを見てください"
 
-#: templates/apps.php:29
+#: templates/apps.php:36
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-ライセンス: <span class=\"author\"></span>"
 
-#: templates/apps.php:31
+#: templates/apps.php:38
 msgid "Update"
 msgstr "更新"
 
-#: templates/help.php:3
+#: 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 "コマーシャルサポート"
 
@@ -388,79 +388,79 @@ msgstr "コマーシャルサポート"
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "現在、<strong>%s</strong> / <strong>%s</strong> を利用しています"
 
-#: templates/personal.php:14
+#: templates/personal.php:15
 msgid "Get the apps to sync your files"
 msgstr "あなたのファイルを同期するためのアプリを取得"
 
-#: templates/personal.php:25
+#: templates/personal.php:26
 msgid "Show First Run Wizard again"
 msgstr "初回実行ウィザードを再度表示する"
 
-#: templates/personal.php:36 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
 msgid "Password"
 msgstr "パスワード"
 
-#: templates/personal.php:37
+#: templates/personal.php:38
 msgid "Your password was changed"
 msgstr "パスワードを変更しました"
 
-#: templates/personal.php:38
+#: templates/personal.php:39
 msgid "Unable to change your password"
 msgstr "パスワードを変更することができません"
 
-#: templates/personal.php:39
+#: templates/personal.php:40
 msgid "Current password"
 msgstr "現在のパスワード"
 
-#: templates/personal.php:40
+#: templates/personal.php:42
 msgid "New password"
 msgstr "新しいパスワード"
 
-#: templates/personal.php:42
+#: templates/personal.php:44
 msgid "Change password"
 msgstr "パスワードを変更"
 
-#: templates/personal.php:54 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:78
 msgid "Display Name"
 msgstr "表示名"
 
-#: templates/personal.php:55
+#: templates/personal.php:57
 msgid "Your display name was changed"
 msgstr "あなたの表示名を変更しました"
 
-#: templates/personal.php:56
+#: templates/personal.php:58
 msgid "Unable to change your display name"
 msgstr "あなたの表示名を変更できません"
 
-#: templates/personal.php:59
+#: templates/personal.php:61
 msgid "Change display name"
 msgstr "表示名を変更"
 
-#: templates/personal.php:68
+#: templates/personal.php:70
 msgid "Email"
 msgstr "Email"
 
-#: templates/personal.php:69
+#: templates/personal.php:72
 msgid "Your email address"
 msgstr "あなたのメールアドレス"
 
-#: templates/personal.php:70
+#: templates/personal.php:73
 msgid "Fill in an email address to enable password recovery"
 msgstr "※パスワード回復を有効にするにはメールアドレスの入力が必要です"
 
-#: templates/personal.php:76 templates/personal.php:77
+#: templates/personal.php:79 templates/personal.php:80
 msgid "Language"
 msgstr "言語"
 
-#: templates/personal.php:82
+#: templates/personal.php:86
 msgid "Help translate"
 msgstr "翻訳に協力する"
 
-#: templates/personal.php:87
+#: templates/personal.php:91
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:89
+#: templates/personal.php:93
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "ファイルマネージャでownCloudに接続する際はこのアドレスを利用してください"
 
diff --git a/l10n/ja_JP/user_ldap.po b/l10n/ja_JP/user_ldap.po
index 0a8dc59415329853029a974f7dad98501ca15380..a2a1882730a9a11a26fe0203a799bd45877bebcd 100644
--- a/l10n/ja_JP/user_ldap.po
+++ b/l10n/ja_JP/user_ldap.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-09 00:12+0100\n"
-"PO-Revision-Date: 2013-02-08 04:10+0000\n"
+"POT-Creation-Date: 2013-03-03 00:05+0100\n"
+"PO-Revision-Date: 2013-03-02 08:10+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"
@@ -25,17 +25,17 @@ msgstr ""
 msgid "Failed to delete the server configuration"
 msgstr "サーバ設定の削除に失敗しました"
 
-#: ajax/testConfiguration.php:35
+#: ajax/testConfiguration.php:36
 msgid "The configuration is valid and the connection could be established!"
 msgstr "設定は有効であり、接続を確立しました!"
 
-#: ajax/testConfiguration.php:37
+#: ajax/testConfiguration.php:39
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
 msgstr "設定は有効ですが、接続に失敗しました。サーバ設定と資格情報を確認して下さい。"
 
-#: ajax/testConfiguration.php:40
+#: ajax/testConfiguration.php:43
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
@@ -90,224 +90,248 @@ msgstr "<b>警告:</b> PHP LDAP モジュールがインストールされてい
 msgid "Server configuration"
 msgstr "サーバ設定"
 
-#: templates/settings.php:17
+#: templates/settings.php:18
 msgid "Add Server Configuration"
 msgstr "サーバ設定を追加"
 
-#: templates/settings.php:21
+#: templates/settings.php:23
 msgid "Host"
 msgstr "ホスト"
 
-#: templates/settings.php:21
+#: templates/settings.php:25
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "SSL通信しない場合には、プロトコル名を省略することができます。そうでない場合には、ldaps:// から始めてください。"
 
-#: templates/settings.php:22
+#: templates/settings.php:26
 msgid "Base DN"
 msgstr "ベースDN"
 
-#: templates/settings.php:22
+#: templates/settings.php:27
 msgid "One Base DN per line"
 msgstr "1行に1つのベースDN"
 
-#: templates/settings.php:22
+#: templates/settings.php:28
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "拡張タブでユーザとグループのベースDNを指定することができます。"
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "User DN"
 msgstr "ユーザDN"
 
-#: templates/settings.php:23
+#: templates/settings.php:32
 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:24
+#: templates/settings.php:33
 msgid "Password"
 msgstr "パスワード"
 
-#: templates/settings.php:24
+#: templates/settings.php:36
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "匿名アクセスの場合は、DNとパスワードを空にしてください。"
 
-#: templates/settings.php:25
+#: templates/settings.php:37
 msgid "User Login Filter"
 msgstr "ユーザログインフィルタ"
 
-#: templates/settings.php:25
+#: templates/settings.php:40
 #, 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:25
+#: templates/settings.php:41
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "%%uid プレースホルダーを利用してください。例 \"uid=%%uid\""
 
-#: templates/settings.php:26
+#: templates/settings.php:42
 msgid "User List Filter"
 msgstr "ユーザリストフィルタ"
 
-#: templates/settings.php:26
+#: templates/settings.php:45
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "ユーザーを取得するときに適用するフィルターを定義する。"
 
-#: templates/settings.php:26
+#: templates/settings.php:46
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "プレースホルダーを利用しないでください。例 \"objectClass=person\""
 
-#: templates/settings.php:27
+#: templates/settings.php:47
 msgid "Group Filter"
 msgstr "グループフィルタ"
 
-#: templates/settings.php:27
+#: templates/settings.php:50
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "グループを取得するときに適用するフィルターを定義する。"
 
-#: templates/settings.php:27
+#: templates/settings.php:51
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "プレースホルダーを利用しないでください。例 \"objectClass=posixGroup\""
 
-#: templates/settings.php:31
+#: templates/settings.php:55
 msgid "Connection Settings"
 msgstr "接続設定"
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "Configuration Active"
 msgstr "設定はアクティブです"
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "When unchecked, this configuration will be skipped."
 msgstr "チェックを外すと、この設定はスキップされます。"
 
-#: templates/settings.php:34
+#: templates/settings.php:58
 msgid "Port"
 msgstr "ポート"
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid "Backup (Replica) Host"
 msgstr "バックアップ(レプリカ)ホスト"
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr "バックアップホストをオプションで指定することができます。メインのLDAP/ADサーバのレプリカである必要があります。"
 
-#: templates/settings.php:36
+#: templates/settings.php:60
 msgid "Backup (Replica) Port"
 msgstr "バックアップ(レプリカ)ポート"
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "Disable Main Server"
 msgstr "メインサーバを無効にする"
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr "有効にすると、ownCloudはレプリカサーバにのみ接続します。"
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Use TLS"
 msgstr "TLSを利用"
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr "LDAPS接続のために追加でそれを利用しないで下さい。失敗します。"
 
-#: templates/settings.php:39
+#: templates/settings.php:63
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "大文字/小文字を区別しないLDAPサーバ(Windows)"
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid "Turn off SSL certificate validation."
 msgstr "SSL証明書の確認を無効にする。"
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 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:40
+#: templates/settings.php:64
 msgid "Not recommended, use for testing only."
 msgstr "推奨しません、テスト目的でのみ利用してください。"
 
-#: templates/settings.php:41
+#: templates/settings.php:65
+msgid "Cache Time-To-Live"
+msgstr "キャッシュのTTL"
+
+#: templates/settings.php:65
 msgid "in seconds. A change empties the cache."
 msgstr "秒。変更後にキャッシュがクリアされます。"
 
-#: templates/settings.php:43
+#: templates/settings.php:67
 msgid "Directory Settings"
 msgstr "ディレクトリ設定"
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "User Display Name Field"
 msgstr "ユーザ表示名のフィールド"
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "ユーザのownCloud名の生成に利用するLDAP属性。"
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "Base User Tree"
 msgstr "ベースユーザツリー"
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "One User Base DN per line"
 msgstr "1行に1つのユーザベースDN"
 
-#: templates/settings.php:47
+#: templates/settings.php:71
 msgid "User Search Attributes"
 msgstr "ユーザ検索属性"
 
-#: templates/settings.php:47 templates/settings.php:50
+#: templates/settings.php:71 templates/settings.php:74
 msgid "Optional; one attribute per line"
 msgstr "オプション:1行に1属性"
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "Group Display Name Field"
 msgstr "グループ表示名のフィールド"
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "グループのownCloud名の生成に利用するLDAP属性。"
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "Base Group Tree"
 msgstr "ベースグループツリー"
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "One Group Base DN per line"
 msgstr "1行に1つのグループベースDN"
 
-#: templates/settings.php:50
+#: templates/settings.php:74
 msgid "Group Search Attributes"
 msgstr "グループ検索属性"
 
-#: templates/settings.php:51
+#: templates/settings.php:75
 msgid "Group-Member association"
 msgstr "グループとメンバーの関連付け"
 
-#: templates/settings.php:53
+#: templates/settings.php:77
 msgid "Special Attributes"
 msgstr "特殊属性"
 
-#: templates/settings.php:56
+#: templates/settings.php:79
+msgid "Quota Field"
+msgstr "クォータフィールド"
+
+#: templates/settings.php:80
+msgid "Quota Default"
+msgstr "クォータのデフォルト"
+
+#: templates/settings.php:80
 msgid "in bytes"
 msgstr "バイト"
 
-#: templates/settings.php:58
+#: templates/settings.php:81
+msgid "Email Field"
+msgstr "メールフィールド"
+
+#: templates/settings.php:82
+msgid "User Home Folder Naming Rule"
+msgstr "ユーザのホームフォルダ命名規則"
+
+#: templates/settings.php:82
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "ユーザ名を空のままにしてください(デフォルト)。そうでない場合は、LDAPもしくはADの属性を指定してください。"
 
-#: templates/settings.php:62
+#: templates/settings.php:86
+msgid "Test Configuration"
+msgstr "テスト設定"
+
+#: templates/settings.php:86
 msgid "Help"
 msgstr "ヘルプ"
diff --git a/l10n/ka/core.po b/l10n/ka/core.po
new file mode 100644
index 0000000000000000000000000000000000000000..9bb57f7e7c8caeea69d09f065011f19ff8badd93
--- /dev/null
+++ b/l10n/ka/core.po
@@ -0,0 +1,594 @@
+# 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-02-27 14:35+0100\n"
+"PO-Revision-Date: 2011-07-25 16:05+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ka\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:768
+msgid "seconds ago"
+msgstr "წამის წინ"
+
+#: js/js.js:769
+msgid "1 minute ago"
+msgstr "1 წუთის წინ"
+
+#: js/js.js:770
+msgid "{minutes} minutes ago"
+msgstr ""
+
+#: js/js.js:771
+msgid "1 hour ago"
+msgstr "1 საათის წინ"
+
+#: js/js.js:772
+msgid "{hours} hours ago"
+msgstr ""
+
+#: js/js.js:773
+msgid "today"
+msgstr "დღეს"
+
+#: js/js.js:774
+msgid "yesterday"
+msgstr "გუშინ"
+
+#: js/js.js:775
+msgid "{days} days ago"
+msgstr ""
+
+#: js/js.js:776
+msgid "last month"
+msgstr ""
+
+#: js/js.js:777
+msgid "{months} months ago"
+msgstr ""
+
+#: js/js.js:778
+msgid "months ago"
+msgstr ""
+
+#: js/js.js:779
+msgid "last year"
+msgstr ""
+
+#: js/js.js:780
+msgid "years ago"
+msgstr ""
+
+#: js/oc-dialogs.js:126
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:162
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:163
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:180
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
+#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
+msgid "The object type is not specified."
+msgstr ""
+
+#: js/oc-vcategories.js: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
+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:29 js/share.js:43 js/share.js:90
+msgid "Shared"
+msgstr ""
+
+#: js/share.js:93
+msgid "Share"
+msgstr ""
+
+#: js/share.js:141 js/share.js:622
+msgid "Error while sharing"
+msgstr ""
+
+#: js/share.js:152
+msgid "Error while unsharing"
+msgstr ""
+
+#: js/share.js:159
+msgid "Error while changing permissions"
+msgstr ""
+
+#: js/share.js:168
+msgid "Shared with you and the group {group} by {owner}"
+msgstr ""
+
+#: js/share.js:170
+msgid "Shared with you by {owner}"
+msgstr ""
+
+#: js/share.js:175
+msgid "Share with"
+msgstr ""
+
+#: js/share.js:180
+msgid "Share with link"
+msgstr ""
+
+#: js/share.js:183
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:185 templates/installation.php:47 templates/login.php:35
+msgid "Password"
+msgstr "პაროლი"
+
+#: js/share.js:189
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:190
+msgid "Send"
+msgstr ""
+
+#: js/share.js:194
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:195
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:227
+msgid "Share via email:"
+msgstr ""
+
+#: js/share.js:229
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:256
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:292
+msgid "Shared in {item} with {user}"
+msgstr ""
+
+#: js/share.js:313
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:325
+msgid "can edit"
+msgstr ""
+
+#: js/share.js:327
+msgid "access control"
+msgstr ""
+
+#: js/share.js:330
+msgid "create"
+msgstr ""
+
+#: js/share.js:333
+msgid "update"
+msgstr ""
+
+#: js/share.js:336
+msgid "delete"
+msgstr ""
+
+#: js/share.js:339
+msgid "share"
+msgstr ""
+
+#: js/share.js:373 js/share.js:569
+msgid "Password protected"
+msgstr ""
+
+#: js/share.js:582
+msgid "Error unsetting expiration date"
+msgstr ""
+
+#: js/share.js:594
+msgid "Error setting expiration date"
+msgstr ""
+
+#: js/share.js:609
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:620
+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:3
+msgid "You will receive a link to reset your password via Email."
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:5
+msgid "Reset email send."
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:8
+msgid "Request failed!"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:41
+#: templates/login.php:28
+msgid "Username"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:14
+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
+msgid "Security Warning"
+msgstr ""
+
+#: templates/installation.php:25
+msgid ""
+"No secure random number generator is available, please enable the PHP "
+"OpenSSL extension."
+msgstr ""
+
+#: templates/installation.php:26
+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
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
+#: templates/installation.php:33
+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
+msgid "Create an <strong>admin account</strong>"
+msgstr ""
+
+#: templates/installation.php:55
+msgid "Advanced"
+msgstr ""
+
+#: templates/installation.php:57
+msgid "Data folder"
+msgstr ""
+
+#: templates/installation.php:66
+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
+msgid "will be used"
+msgstr ""
+
+#: templates/installation.php:129
+msgid "Database user"
+msgstr ""
+
+#: templates/installation.php:134
+msgid "Database password"
+msgstr ""
+
+#: templates/installation.php:139
+msgid "Database name"
+msgstr ""
+
+#: templates/installation.php:149
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:156
+msgid "Database host"
+msgstr ""
+
+#: templates/installation.php:162
+msgid "Finish setup"
+msgstr ""
+
+#: templates/layout.guest.php:35
+msgid "web services under your control"
+msgstr ""
+
+#: templates/layout.user.php:53
+msgid "Log out"
+msgstr ""
+
+#: templates/login.php:10
+msgid "Automatic logon rejected!"
+msgstr ""
+
+#: templates/login.php:11
+msgid ""
+"If you did not change your password recently, your account may be "
+"compromised!"
+msgstr ""
+
+#: templates/login.php:13
+msgid "Please change your password to secure your account again."
+msgstr ""
+
+#: templates/login.php:19
+msgid "Lost your password?"
+msgstr ""
+
+#: templates/login.php:41
+msgid "remember"
+msgstr ""
+
+#: templates/login.php:43
+msgid "Log in"
+msgstr ""
+
+#: templates/login.php:49
+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/ka/files.po b/l10n/ka/files.po
new file mode 100644
index 0000000000000000000000000000000000000000..a70ab61b464bcee560d47c2401d05dc113b7ba32
--- /dev/null
+++ b/l10n/ka/files.po
@@ -0,0 +1,315 @@
+# 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-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: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ka\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/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 ""
+
+#: 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:82
+msgid "Invalid directory."
+msgstr ""
+
+#: appinfo/app.php:10
+msgid "Files"
+msgstr "ფაილები"
+
+#: js/fileactions.js:125
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:127 templates/index.php:92 templates/index.php:93
+msgid "Delete"
+msgstr ""
+
+#: js/fileactions.js:193
+msgid "Rename"
+msgstr ""
+
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
+msgid "Pending"
+msgstr ""
+
+#: js/filelist.js:251 js/filelist.js:253
+msgid "{new_name} already exists"
+msgstr ""
+
+#: js/filelist.js:251 js/filelist.js:253
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:251
+msgid "suggest name"
+msgstr ""
+
+#: js/filelist.js:251 js/filelist.js:253
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:298
+msgid "replaced {new_name} with {old_name}"
+msgstr ""
+
+#: js/filelist.js:298
+msgid "undo"
+msgstr ""
+
+#: js/filelist.js:323
+msgid "perform delete operation"
+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:225
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
+
+#: js/files.js:262
+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"
+msgstr ""
+
+#: js/files.js:388 js/files.js:423
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:497
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/files.js:570
+msgid "URL cannot be empty."
+msgstr ""
+
+#: js/files.js:575
+msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
+msgstr ""
+
+#: js/files.js:953 templates/index.php:68
+msgid "Name"
+msgstr ""
+
+#: js/files.js:954 templates/index.php:79
+msgid "Size"
+msgstr ""
+
+#: js/files.js:955 templates/index.php:81
+msgid "Modified"
+msgstr ""
+
+#: js/files.js:974
+msgid "1 folder"
+msgstr ""
+
+#: js/files.js:976
+msgid "{count} folders"
+msgstr ""
+
+#: js/files.js:984
+msgid "1 file"
+msgstr ""
+
+#: js/files.js:986
+msgid "{count} files"
+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:40
+msgid "Deleted files"
+msgstr ""
+
+#: templates/index.php:46
+msgid "Cancel upload"
+msgstr ""
+
+#: templates/index.php:53
+msgid "You don’t have write permissions here."
+msgstr ""
+
+#: templates/index.php:60
+msgid "Nothing in here. Upload something!"
+msgstr ""
+
+#: templates/index.php:74
+msgid "Download"
+msgstr "გადმოწერა"
+
+#: templates/index.php:86 templates/index.php:87
+msgid "Unshare"
+msgstr ""
+
+#: templates/index.php:106
+msgid "Upload too large"
+msgstr ""
+
+#: templates/index.php:108
+msgid ""
+"The files you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: templates/index.php:113
+msgid "Files are being scanned, please wait."
+msgstr ""
+
+#: templates/index.php:116
+msgid "Current scanning"
+msgstr ""
+
+#: templates/upgrade.php:2
+msgid "Upgrading filesystem cache..."
+msgstr ""
diff --git a/l10n/ka/files_encryption.po b/l10n/ka/files_encryption.po
new file mode 100644
index 0000000000000000000000000000000000000000..5321e594c35c54b88517db4e7908682ec4767ed3
--- /dev/null
+++ b/l10n/ka/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-02-27 00:08+0100\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ka\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/ka/files_external.po b/l10n/ka/files_external.po
new file mode 100644
index 0000000000000000000000000000000000000000..ff99ab06484501bbba82776a33813f4e599eefda
--- /dev/null
+++ b/l10n/ka/files_external.po
@@ -0,0 +1,116 @@
+# 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-02-28 00:04+0100\n"
+"PO-Revision-Date: 2013-02-27 23:04+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ka\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:421
+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
+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 ""
+
+#: 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/ka/files_sharing.po b/l10n/ka/files_sharing.po
new file mode 100644
index 0000000000000000000000000000000000000000..f4c48c38cd09e9e393ad0f5fe4b0628fc8626398
--- /dev/null
+++ b/l10n/ka/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:
+# 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"
+"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"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ka\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:37
+msgid "Download"
+msgstr "გადმოწერა"
+
+#: templates/public.php:34
+msgid "No preview available for"
+msgstr ""
+
+#: templates/public.php:43
+msgid "web services under your control"
+msgstr ""
diff --git a/l10n/ka/files_trashbin.po b/l10n/ka/files_trashbin.po
new file mode 100644
index 0000000000000000000000000000000000000000..84d63cc28b6ba51deee9cc467d8a72eee3a0c6ee
--- /dev/null
+++ b/l10n/ka/files_trashbin.po
@@ -0,0 +1,80 @@
+# 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-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: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ka\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ajax/delete.php:40
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:41
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/trash.js:7 js/trash.js:96
+msgid "perform restore operation"
+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/ka/files_versions.po b/l10n/ka/files_versions.po
new file mode 100644
index 0000000000000000000000000000000000000000..4f6c948624dd79acf0811c8477c63e9a95bb9c54
--- /dev/null
+++ b/l10n/ka/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-02-28 00:04+0100\n"
+"PO-Revision-Date: 2013-02-27 23:04+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ka\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:68
+msgid "No old versions available"
+msgstr ""
+
+#: history.php:73
+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/ka/lib.po b/l10n/ka/lib.po
new file mode 100644
index 0000000000000000000000000000000000000000..70d1ab92117df8e52e7de0a60e295f3e6e326257
--- /dev/null
+++ b/l10n/ka/lib.po
@@ -0,0 +1,259 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# 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"
+"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"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ka\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:202
+msgid "ZIP download is turned off."
+msgstr "ZIP გადმოწერა გამორთულია"
+
+#: files.php:203
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: files.php:204 files.php:231
+msgid "Back to Files"
+msgstr ""
+
+#: files.php:228
+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:40
+msgid "Specify a data folder."
+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:128 setup.php:320 setup.php:365
+msgid "PostgreSQL username and/or password not valid"
+msgstr ""
+
+#: setup.php:129 setup.php:152 setup.php:229
+msgid "You need to enter either an existing account or the administrator."
+msgstr ""
+
+#: setup.php:151 setup.php:453 setup.php:520
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:228
+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
+#, 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
+#, php-format
+msgid "Offending command was: \"%s\""
+msgstr ""
+
+#: setup.php:299
+#, php-format
+msgid "MySQL user '%s'@'localhost' exists already."
+msgstr ""
+
+#: setup.php:300
+msgid "Drop this user from MySQL"
+msgstr ""
+
+#: setup.php:305
+#, php-format
+msgid "MySQL user '%s'@'%%' already exists"
+msgstr ""
+
+#: setup.php:306
+msgid "Drop this user from MySQL."
+msgstr ""
+
+#: setup.php:579 setup.php:611
+#, php-format
+msgid "Offending command was: \"%s\", name: %s, password: %s"
+msgstr ""
+
+#: setup.php:631
+#, php-format
+msgid "MS SQL username and/or password not valid: %s"
+msgstr ""
+
+#: setup.php:849
+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
+#, 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 ""
+
+#: 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 ""
+
+#: template.php:123
+msgid "last year"
+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 ""
+
+#: vcategories.php:188 vcategories.php:249
+#, php-format
+msgid "Could not find category \"%s\""
+msgstr ""
diff --git a/l10n/ka/settings.po b/l10n/ka/settings.po
new file mode 100644
index 0000000000000000000000000000000000000000..494239e38919ae623f74bf956b8047af33e88c34
--- /dev/null
+++ b/l10n/ka/settings.po
@@ -0,0 +1,496 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-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: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ka\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:23 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"
+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
+msgid "Enable"
+msgstr ""
+
+#: js/apps.js:55
+msgid "Please wait...."
+msgstr ""
+
+#: js/apps.js:84
+msgid "Updating...."
+msgstr ""
+
+#: js/apps.js:87
+msgid "Error while updating app"
+msgstr ""
+
+#: js/apps.js:87
+msgid "Error"
+msgstr ""
+
+#: js/apps.js:90
+msgid "Updated"
+msgstr ""
+
+#: js/personal.js:99
+msgid "Saving..."
+msgstr ""
+
+#: js/users.js:30
+msgid "deleted"
+msgstr ""
+
+#: js/users.js:30
+msgid "undo"
+msgstr ""
+
+#: js/users.js:62
+msgid "Unable to remove user"
+msgstr ""
+
+#: js/users.js:75 templates/users.php:26 templates/users.php:80
+#: templates/users.php:105
+msgid "Groups"
+msgstr ""
+
+#: js/users.js:78 templates/users.php:82 templates/users.php:119
+msgid "Group Admin"
+msgstr ""
+
+#: js/users.js:99 templates/users.php:161
+msgid "Delete"
+msgstr ""
+
+#: js/users.js:191
+msgid "add group"
+msgstr ""
+
+#: js/users.js:352
+msgid "A valid username must be provided"
+msgstr ""
+
+#: js/users.js:353 js/users.js:359 js/users.js:374
+msgid "Error creating user"
+msgstr ""
+
+#: js/users.js:358
+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:223
+msgid "More"
+msgstr ""
+
+#: templates/admin.php:230 templates/personal.php:102
+msgid "Version"
+msgstr ""
+
+#: templates/admin.php:233 templates/personal.php:105
+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:79
+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:78
+msgid "Display Name"
+msgstr ""
+
+#: templates/personal.php:57
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:58
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:61
+msgid "Change display name"
+msgstr ""
+
+#: templates/personal.php:70
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:72
+msgid "Your email address"
+msgstr ""
+
+#: templates/personal.php:73
+msgid "Fill in an email address to enable password recovery"
+msgstr ""
+
+#: templates/personal.php:79 templates/personal.php:80
+msgid "Language"
+msgstr ""
+
+#: templates/personal.php:86
+msgid "Help translate"
+msgstr ""
+
+#: templates/personal.php:91
+msgid "WebDAV"
+msgstr ""
+
+#: templates/personal.php:93
+msgid "Use this address to connect to your ownCloud in your file manager"
+msgstr ""
+
+#: templates/users.php:21 templates/users.php:77
+msgid "Login Name"
+msgstr ""
+
+#: templates/users.php:32
+msgid "Create"
+msgstr ""
+
+#: templates/users.php:35
+msgid "Default Storage"
+msgstr ""
+
+#: templates/users.php:41 templates/users.php:139
+msgid "Unlimited"
+msgstr ""
+
+#: templates/users.php:59 templates/users.php:154
+msgid "Other"
+msgstr ""
+
+#: templates/users.php:84
+msgid "Storage"
+msgstr ""
+
+#: templates/users.php:95
+msgid "change display name"
+msgstr ""
+
+#: templates/users.php:99
+msgid "set new password"
+msgstr ""
+
+#: templates/users.php:134
+msgid "Default"
+msgstr ""
diff --git a/l10n/ka/user_ldap.po b/l10n/ka/user_ldap.po
new file mode 100644
index 0000000000000000000000000000000000000000..a49552a01fb6627be3a6f50d8f966c09fb51fd2c
--- /dev/null
+++ b/l10n/ka/user_ldap.po
@@ -0,0 +1,333 @@
+# 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-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: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ka\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: 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:121
+msgid "Connection test succeeded"
+msgstr ""
+
+#: js/settings.js:126
+msgid "Connection test failed"
+msgstr ""
+
+#: js/settings.js:136
+msgid "Do you really want to delete the current Server Configuration?"
+msgstr ""
+
+#: js/settings.js:137
+msgid "Confirm Deletion"
+msgstr ""
+
+#: templates/settings.php:8
+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
+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
+msgid "Server configuration"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Add Server Configuration"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:25
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:27
+msgid "One Base DN per line"
+msgstr ""
+
+#: templates/settings.php:28
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:30
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:32
+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
+msgid "Password"
+msgstr "პაროლი"
+
+#: templates/settings.php:36
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:37
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:40
+#, 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
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:42
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:45
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:46
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:47
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:50
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:51
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:55
+msgid "Connection Settings"
+msgstr ""
+
+#: templates/settings.php:57
+msgid "Configuration Active"
+msgstr ""
+
+#: templates/settings.php:57
+msgid "When unchecked, this configuration will be skipped."
+msgstr ""
+
+#: templates/settings.php:58
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:59
+msgid "Backup (Replica) Host"
+msgstr ""
+
+#: templates/settings.php:59
+msgid ""
+"Give an optional backup host. It must be a replica of the main LDAP/AD "
+"server."
+msgstr ""
+
+#: templates/settings.php:60
+msgid "Backup (Replica) Port"
+msgstr ""
+
+#: templates/settings.php:61
+msgid "Disable Main Server"
+msgstr ""
+
+#: templates/settings.php:61
+msgid "When switched on, ownCloud will only connect to the replica server."
+msgstr ""
+
+#: templates/settings.php:62
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:62
+msgid "Do not use it additionally for LDAPS connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:63
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:64
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:65
+msgid "Cache Time-To-Live"
+msgstr ""
+
+#: templates/settings.php:65
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:67
+msgid "Directory Settings"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:70
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:70
+msgid "One User Base DN per line"
+msgstr ""
+
+#: templates/settings.php:71
+msgid "User Search Attributes"
+msgstr ""
+
+#: templates/settings.php:71 templates/settings.php:74
+msgid "Optional; one attribute per line"
+msgstr ""
+
+#: templates/settings.php:72
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:72
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:73
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:73
+msgid "One Group Base DN per line"
+msgstr ""
+
+#: templates/settings.php:74
+msgid "Group Search Attributes"
+msgstr ""
+
+#: templates/settings.php:75
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:77
+msgid "Special Attributes"
+msgstr ""
+
+#: templates/settings.php:79
+msgid "Quota Field"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Quota Default"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:81
+msgid "Email Field"
+msgstr ""
+
+#: templates/settings.php:82
+msgid "User Home Folder Naming Rule"
+msgstr ""
+
+#: templates/settings.php:82
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:86
+msgid "Test Configuration"
+msgstr ""
+
+#: templates/settings.php:86
+msgid "Help"
+msgstr "შველა"
diff --git a/l10n/ka/user_webdavauth.po b/l10n/ka/user_webdavauth.po
new file mode 100644
index 0000000000000000000000000000000000000000..3c15980932ecc82f6d5b7c3821f62c6566a20322
--- /dev/null
+++ b/l10n/ka/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-02-27 00:08+0100\n"
+"PO-Revision-Date: 2012-11-09 09:06+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ka\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/ka_GE/core.po b/l10n/ka_GE/core.po
index 179e1f94829d08af72b16055ffd19cca46cf49d0..bf41a76a467267688267d136fe2487d0775b3e29 100644
--- a/l10n/ka_GE/core.po
+++ b/l10n/ka_GE/core.po
@@ -4,13 +4,14 @@
 # 
 # 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-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 14:32+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,24 +19,24 @@ msgstr ""
 "Language: ka_GE\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,79 +82,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,55 +162,55 @@ msgstr "დეკემბერი"
 msgid "Settings"
 msgstr "პარამეტრები"
 
-#: js/js.js:767
+#: js/js.js:768
 msgid "seconds ago"
 msgstr "წამის წინ"
 
-#: js/js.js:768
+#: js/js.js:769
 msgid "1 minute ago"
 msgstr "1 წუთის წინ"
 
-#: js/js.js:769
+#: js/js.js:770
 msgid "{minutes} minutes ago"
 msgstr "{minutes} წუთის წინ"
 
-#: js/js.js:770
+#: js/js.js:771
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:771
+#: js/js.js:772
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:772
+#: js/js.js:773
 msgid "today"
 msgstr "დღეს"
 
-#: js/js.js:773
+#: js/js.js:774
 msgid "yesterday"
 msgstr "გუშინ"
 
-#: js/js.js:774
+#: js/js.js:775
 msgid "{days} days ago"
 msgstr "{days} დღის წინ"
 
-#: js/js.js:775
+#: js/js.js:776
 msgid "last month"
 msgstr "გასულ თვეში"
 
-#: js/js.js:776
+#: js/js.js:777
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:777
+#: js/js.js:778
 msgid "months ago"
 msgstr "თვის წინ"
 
-#: js/js.js:778
+#: js/js.js:779
 msgid "last year"
 msgstr "ბოლო წელს"
 
-#: js/js.js:779
+#: js/js.js:780
 msgid "years ago"
 msgstr "წლის წინ"
 
@@ -292,7 +293,7 @@ msgstr "გაუზიარე ლინკით"
 msgid "Password protect"
 msgstr "პაროლით დაცვა"
 
-#: js/share.js:185 templates/installation.php:44 templates/login.php:35
+#: js/share.js:185 templates/installation.php:47 templates/login.php:35
 msgid "Password"
 msgstr "პაროლი"
 
@@ -318,7 +319,7 @@ msgstr "გააზიარე მეილზე"
 
 #: js/share.js:229
 msgid "No people found"
-msgstr "გვერდი არ არის ნაპოვნი"
+msgstr "მომხმარებელი არ არის ნაპოვნი"
 
 #: js/share.js:256
 msgid "Resharing is not allowed"
@@ -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 "ownCloud პაროლის შეცვლა"
 
@@ -407,14 +408,14 @@ msgstr ""
 msgid "Request failed!"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:39
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:41
 #: templates/login.php:28
 msgid "Username"
 msgstr "მომხმარებელი"
 
 #: lostpassword/templates/lostpassword.php:14
 msgid "Request reset"
-msgstr "რესეტის მოთხოვნა"
+msgstr "პაროლის შეცვლის მოთხოვნა"
 
 #: lostpassword/templates/resetpassword.php:4
 msgid "Your password was reset"
@@ -430,7 +431,7 @@ msgstr "ახალი პაროლი"
 
 #: lostpassword/templates/resetpassword.php:11
 msgid "Reset password"
-msgstr "პაროლის რესეტი"
+msgstr "პაროლის შეცვლა"
 
 #: strings.php:5
 msgid "Personal"
@@ -468,85 +469,86 @@ msgstr "კატეგორიების რედაქტირება"
 msgid "Add"
 msgstr "დამატება"
 
-#: templates/installation.php:23 templates/installation.php:30
+#: templates/installation.php:24 templates/installation.php:31
 msgid "Security Warning"
 msgstr "უსაფრთხოების გაფრთხილება"
 
-#: templates/installation.php:24
+#: templates/installation.php:25
 msgid ""
 "No secure random number generator is available, please enable the PHP "
 "OpenSSL extension."
 msgstr "შემთხვევითი სიმბოლოების გენერატორი არ არსებობს, გთხოვთ ჩართოთ PHP OpenSSL გაფართოება."
 
-#: templates/installation.php:25
+#: templates/installation.php:26
 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:32
 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:33
 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:37
 msgid "Create an <strong>admin account</strong>"
-msgstr "შექმენი ადმინ ექაუნტი"
+msgstr "შექმენი <strong>ადმინ ექაუნტი</strong>"
 
-#: templates/installation.php:52
+#: templates/installation.php:55
 msgid "Advanced"
 msgstr "Advanced"
 
-#: templates/installation.php:54
+#: templates/installation.php:57
 msgid "Data folder"
 msgstr "მონაცემთა საქაღალდე"
 
-#: templates/installation.php:61
+#: templates/installation.php:66
 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:71 templates/installation.php:83
+#: templates/installation.php:94 templates/installation.php:105
+#: templates/installation.php:117
 msgid "will be used"
 msgstr "გამოყენებული იქნება"
 
-#: templates/installation.php:109
+#: templates/installation.php:129
 msgid "Database user"
-msgstr "ბაზის მომხმარებელი"
+msgstr "მონაცემთა ბაზის მომხმარებელი"
 
-#: templates/installation.php:113
+#: templates/installation.php:134
 msgid "Database password"
-msgstr "ბაზის პაროლი"
+msgstr "მონაცემთა ბაზის პაროლი"
 
-#: templates/installation.php:117
+#: templates/installation.php:139
 msgid "Database name"
-msgstr "ბაზის სახელი"
+msgstr "მონაცემთა ბაზის სახელი"
 
-#: templates/installation.php:125
+#: templates/installation.php:149
 msgid "Database tablespace"
 msgstr "ბაზის ცხრილის ზომა"
 
-#: templates/installation.php:131
+#: templates/installation.php:156
 msgid "Database host"
-msgstr "ბაზის ჰოსტი"
+msgstr "მონაცემთა ბაზის ჰოსტი"
 
-#: templates/installation.php:136
+#: templates/installation.php:162
 msgid "Finish setup"
 msgstr "კონფიგურაციის დასრულება"
 
-#: templates/layout.guest.php:33
+#: templates/layout.guest.php:35
 msgid "web services under your control"
 msgstr "თქვენი კონტროლის ქვეშ მყოფი ვებ სერვისები"
 
-#: templates/layout.user.php:48
+#: templates/layout.user.php:53
 msgid "Log out"
 msgstr "გამოსვლა"
 
diff --git a/l10n/ka_GE/files.po b/l10n/ka_GE/files.po
index c0cadd907041f0abb4570d7e6f91c3424082d72a..dd8bcd2633cf7ef9a1ec8a2b5d78bfac380589b8 100644
--- a/l10n/ka_GE/files.po
+++ b/l10n/ka_GE/files.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\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: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
 "MIME-Version: 1.0\n"
@@ -51,27 +51,27 @@ msgid ""
 "the HTML form"
 msgstr "ატვირთული ფაილი აჭარბებს  MAX_FILE_SIZE დირექტივას, რომელიც მითითებულია HTML ფორმაში"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
 msgstr "ატვირთული ფაილი მხოლოდ ნაწილობრივ აიტვირთა"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:31
 msgid "No file was uploaded"
 msgstr "ფაილი არ აიტვირთა"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:32
 msgid "Missing a temporary folder"
 msgstr "დროებითი საქაღალდე არ არსებობს"
 
-#: ajax/upload.php:34
+#: ajax/upload.php:33
 msgid "Failed to write to disk"
 msgstr "შეცდომა დისკზე ჩაწერისას"
 
-#: ajax/upload.php:52
+#: ajax/upload.php:51
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:83
+#: ajax/upload.php:82
 msgid "Invalid directory."
 msgstr ""
 
@@ -83,7 +83,7 @@ msgstr "ფაილები"
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:127 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:127 templates/index.php:92 templates/index.php:93
 msgid "Delete"
 msgstr "წაშლა"
 
@@ -91,40 +91,36 @@ msgstr "წაშლა"
 msgid "Rename"
 msgstr "გადარქმევა"
 
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
 msgid "Pending"
 msgstr "მოცდის რეჟიმში"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "{new_name} already exists"
 msgstr "{new_name} უკვე არსებობს"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "replace"
 msgstr "შეცვლა"
 
-#: js/filelist.js:253
+#: js/filelist.js:251
 msgid "suggest name"
 msgstr "სახელის შემოთავაზება"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "cancel"
 msgstr "უარყოფა"
 
-#: js/filelist.js:295
-msgid "replaced {new_name}"
-msgstr "{new_name} შეცვლილია"
+#: js/filelist.js:298
+msgid "replaced {new_name} with {old_name}"
+msgstr "{new_name} შეცვლილია {old_name}–ით"
 
-#: js/filelist.js:295 js/filelist.js:297
+#: js/filelist.js:298
 msgid "undo"
 msgstr "დაბრუნება"
 
-#: js/filelist.js:297
-msgid "replaced {new_name} with {old_name}"
-msgstr "{new_name} შეცვლილია {old_name}–ით"
-
-#: js/filelist.js:322
+#: js/filelist.js:323
 msgid "perform delete operation"
 msgstr ""
 
@@ -150,74 +146,74 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:224
+#: js/files.js:225
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:261
+#: js/files.js:262
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "თქვენი ფაილის ატვირთვა ვერ მოხერხდა. ის არის საქაღალდე და შეიცავს 0 ბაიტს"
 
-#: js/files.js:261
+#: js/files.js:262
 msgid "Upload Error"
 msgstr "შეცდომა ატვირთვისას"
 
-#: js/files.js:272
+#: js/files.js:273
 msgid "Close"
 msgstr "დახურვა"
 
-#: js/files.js:311
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr "1 ფაილის ატვირთვა"
 
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr "{count} ფაილი იტვირთება"
 
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "ატვირთვა შეჩერებულ იქნა."
 
-#: js/files.js:496
+#: js/files.js:497
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "მიმდინარეობს ფაილის ატვირთვა. სხვა გვერდზე გადასვლა გამოიწვევს ატვირთვის შეჩერებას"
 
-#: js/files.js:569
+#: js/files.js:570
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:574
+#: js/files.js:575
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:953 templates/index.php:68
 msgid "Name"
 msgstr "სახელი"
 
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:954 templates/index.php:79
 msgid "Size"
 msgstr "ზომა"
 
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:955 templates/index.php:81
 msgid "Modified"
 msgstr "შეცვლილია"
 
-#: js/files.js:969
+#: js/files.js:974
 msgid "1 folder"
 msgstr "1 საქაღალდე"
 
-#: js/files.js:971
+#: js/files.js:976
 msgid "{count} folders"
 msgstr "{count} საქაღალდე"
 
-#: js/files.js:979
+#: js/files.js:984
 msgid "1 file"
 msgstr "1 ფაილი"
 
-#: js/files.js:981
+#: js/files.js:986
 msgid "{count} files"
 msgstr "{count} ფაილი"
 
@@ -281,33 +277,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr "ატვირთვის გაუქმება"
 
-#: templates/index.php:59
+#: templates/index.php:53
+msgid "You don’t have write permissions here."
+msgstr ""
+
+#: templates/index.php:60
 msgid "Nothing in here. Upload something!"
 msgstr "აქ არაფერი არ არის. ატვირთე რამე!"
 
-#: templates/index.php:73
+#: templates/index.php:74
 msgid "Download"
 msgstr "ჩამოტვირთვა"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:86 templates/index.php:87
 msgid "Unshare"
 msgstr "გაზიარების მოხსნა"
 
-#: templates/index.php:105
+#: templates/index.php:106
 msgid "Upload too large"
 msgstr "ასატვირთი ფაილი ძალიან დიდია"
 
-#: templates/index.php:107
+#: templates/index.php:108
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "ფაილის ზომა რომლის ატვირთვასაც თქვენ აპირებთ, აჭარბებს სერვერზე დაშვებულ მაქსიმუმს."
 
-#: templates/index.php:112
+#: templates/index.php:113
 msgid "Files are being scanned, please wait."
 msgstr "მიმდინარეობს ფაილების სკანირება, გთხოვთ დაელოდოთ."
 
-#: templates/index.php:115
+#: templates/index.php:116
 msgid "Current scanning"
 msgstr "მიმდინარე სკანირება"
 
diff --git a/l10n/ka_GE/files_external.po b/l10n/ka_GE/files_external.po
index eb5eb8256c9a9d93318ea12f81d6d14118e2b91f..b38a37b7e55cbc9dd6953871f4b4ebcca059a9f2 100644
--- a/l10n/ka_GE/files_external.po
+++ b/l10n/ka_GE/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-11 23:22+0000\n"
+"POT-Creation-Date: 2013-02-28 00:04+0100\n"
+"PO-Revision-Date: 2013-02-27 23:04+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
 "MIME-Version: 1.0\n"
@@ -17,37 +17,33 @@ msgstr ""
 "Language: ka_GE\n"
 "Plural-Forms: nplurals=1; plural=0;\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:421
 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:424
 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 "
@@ -58,63 +54,63 @@ msgstr ""
 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 "მომხმარებელი"
 
-#: 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 "წაშლა"
 
-#: 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/ka_GE/files_trashbin.po b/l10n/ka_GE/files_trashbin.po
index 89f7efa5b696a680daa55df6b029629413876fc2..df2af0a4a7da3240272f89f29a7321b7a6537fb3 100644
--- a/l10n/ka_GE/files_trashbin.po
+++ b/l10n/ka_GE/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 10:07+0000\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: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
 "MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Language: ka_GE\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/delete.php:22
+#: ajax/delete.php:40
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
@@ -27,35 +27,39 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:33
+#: js/trash.js:34
 msgid "delete file permanently"
 msgstr ""
 
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr ""
+
+#: js/trash.js:174 templates/index.php:17
 msgid "Name"
 msgstr "სახელი"
 
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:175 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:135
+#: js/trash.js:184
 msgid "1 folder"
 msgstr "1 საქაღალდე"
 
-#: js/trash.js:137
+#: js/trash.js:186
 msgid "{count} folders"
 msgstr "{count} საქაღალდე"
 
-#: js/trash.js:145
+#: js/trash.js:194
 msgid "1 file"
 msgstr "1 ფაილი"
 
-#: js/trash.js:147
+#: js/trash.js:196
 msgid "{count} files"
 msgstr "{count} ფაილი"
 
@@ -66,3 +70,11 @@ 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/ka_GE/files_versions.po b/l10n/ka_GE/files_versions.po
index 56f77fc85270532cc4e1c5d5fa3cea964362ecf5..b37855b93c5c460cec193a83923c98cae572cf35 100644
--- a/l10n/ka_GE/files_versions.po
+++ b/l10n/ka_GE/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-08 00:10+0100\n"
-"PO-Revision-Date: 2013-02-07 23:11+0000\n"
+"POT-Creation-Date: 2013-02-28 00:04+0100\n"
+"PO-Revision-Date: 2013-02-27 23:04+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
 "MIME-Version: 1.0\n"
@@ -48,18 +48,10 @@ msgstr ""
 msgid "No path specified"
 msgstr ""
 
-#: js/versions.js:16
-msgid "History"
+#: 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 ""
-
-#: templates/settings.php:3
-msgid "Files Versioning"
-msgstr ""
-
-#: templates/settings.php:4
-msgid "Enable"
-msgstr ""
diff --git a/l10n/ka_GE/lib.po b/l10n/ka_GE/lib.po
index 8bdb5af258a5354c69422f95dc386c116535fcf3..a31bc08bf89c7ed76576e4ccf24ea04f919bddaa 100644
--- a/l10n/ka_GE/lib.po
+++ b/l10n/ka_GE/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-11 15:39+0100\n"
-"PO-Revision-Date: 2013-02-11 14:41+0000\n"
+"POT-Creation-Date: 2013-02-27 14:35+0100\n"
+"PO-Revision-Date: 2013-02-27 13:36+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"
@@ -18,27 +18,27 @@ msgstr ""
 "Language: ka_GE\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: app.php:339
+#: app.php:349
 msgid "Help"
 msgstr "დახმარება"
 
-#: app.php:346
+#: app.php:362
 msgid "Personal"
 msgstr "პირადი"
 
-#: app.php:351
+#: app.php:373
 msgid "Settings"
 msgstr "პარამეტრები"
 
-#: app.php:356
+#: app.php:385
 msgid "Users"
 msgstr "მომხმარებელი"
 
-#: app.php:363
+#: app.php:398
 msgid "Apps"
 msgstr "აპლიკაციები"
 
-#: app.php:365
+#: app.php:406
 msgid "Admin"
 msgstr "ადმინისტრატორი"
 
@@ -50,15 +50,15 @@ msgstr ""
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:203 files.php:228
+#: files.php:204 files.php:231
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:227
+#: files.php:228
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: helper.php:226
+#: helper.php:228
 msgid "couldn't be determined"
 msgstr ""
 
@@ -98,87 +98,92 @@ msgstr ""
 msgid "Specify a data folder."
 msgstr ""
 
-#: setup.php:53
+#: setup.php:55
 #, php-format
 msgid "%s enter the database username."
 msgstr ""
 
-#: setup.php:56
+#: setup.php:58
 #, php-format
 msgid "%s enter the database name."
 msgstr ""
 
-#: setup.php:59
+#: setup.php:61
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr ""
 
-#: setup.php:62
+#: setup.php:64
 #, php-format
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:126 setup.php:291 setup.php:336
+#: setup.php:128 setup.php:320 setup.php:365
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:127 setup.php:150 setup.php:204
+#: setup.php:129 setup.php:152 setup.php:229
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:149 setup.php:423 setup.php:489
+#: setup.php:151 setup.php:453 setup.php:520
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:203
+#: setup.php:228
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:255 setup.php:357 setup.php:366 setup.php:384 setup.php:394
-#: setup.php:403 setup.php:430 setup.php:496 setup.php:522 setup.php:529
-#: setup.php:540 setup.php:547 setup.php:556 setup.php:564 setup.php:573
-#: setup.php:579
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:256 setup.php:358 setup.php:367 setup.php:385 setup.php:395
-#: setup.php:404 setup.php:431 setup.php:497 setup.php:523 setup.php:530
-#: setup.php:541 setup.php:557 setup.php:565 setup.php:574
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:270
+#: setup.php:299
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:271
+#: setup.php:300
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:276
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:277
+#: setup.php:306
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:548 setup.php:580
+#: setup.php:579 setup.php:611
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:644
+#: setup.php:631
+#, php-format
+msgid "MS SQL username and/or password not valid: %s"
+msgstr ""
+
+#: setup.php:849
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:645
+#: setup.php:850
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
@@ -235,16 +240,16 @@ msgstr "ბოლო წელს"
 msgid "years ago"
 msgstr "წლის წინ"
 
-#: updater.php:75
+#: updater.php:78
 #, php-format
 msgid "%s is available. Get <a href=\"%s\">more information</a>"
 msgstr ""
 
-#: updater.php:77
+#: updater.php:81
 msgid "up to date"
 msgstr "განახლებულია"
 
-#: updater.php:80
+#: updater.php:84
 msgid "updates check is disabled"
 msgstr "განახლების ძებნა გათიშულია"
 
diff --git a/l10n/ka_GE/settings.po b/l10n/ka_GE/settings.po
index 3f628dba71f5bfe6bc82135730d43d7f1a5f9807..a2498bd7718cd1ae1e4fb0d61491920ad901ebe9 100644
--- a/l10n/ka_GE/settings.po
+++ b/l10n/ka_GE/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 23:05+0000\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: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
 "MIME-Version: 1.0\n"
@@ -22,8 +22,8 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "აპლიკაციების სია ვერ ჩამოიტვირთა App Store"
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:15
-#: ajax/togglegroups.php:18
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr "ავთენტიფიკაციის შეცდომა"
 
@@ -71,12 +71,12 @@ 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 "მომხმარებლის დამატება ვერ მოხეხდა ჯგუფში %s"
 
-#: ajax/togglegroups.php:34
+#: ajax/togglegroups.php:36
 #, php-format
 msgid "Unable to remove user from group %s"
 msgstr "მომხმარებლის წაშლა ვერ მოხეხდა ჯგუფიდან %s"
@@ -117,7 +117,7 @@ msgstr "შეცდომა"
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:96
+#: js/personal.js:99
 msgid "Saving..."
 msgstr "შენახვა..."
 
@@ -146,23 +146,23 @@ msgstr "ჯგუფის ადმინისტრატორი"
 msgid "Delete"
 msgstr "წაშლა"
 
-#: js/users.js:190
+#: js/users.js:191
 msgid "add group"
 msgstr ""
 
-#: js/users.js:351
+#: js/users.js:352
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:357
+#: js/users.js:358
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -208,19 +208,19 @@ msgstr ""
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:61
+#: templates/admin.php:63
+#, php-format
 msgid ""
-"This ownCloud server can't set system locale to "
-"\"en_US.UTF-8\"/\"en_US.UTF8\". 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 en_US.UTF-8/en_US.UTF8."
+"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:72
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:75
+#: 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 "
@@ -230,98 +230,98 @@ msgid ""
 " of ownCloud."
 msgstr ""
 
-#: templates/admin.php:89
+#: templates/admin.php:92
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:98
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:108
+#: 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:118
+#: 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:125
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:131
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:132
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:140
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:147
+#: templates/admin.php:150
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:148
+#: templates/admin.php:151
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:155
+#: templates/admin.php:158
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:161
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:165
+#: templates/admin.php:168
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:181
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:179
+#: templates/admin.php:182
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:182
+#: templates/admin.php:185
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr ""
 
-#: templates/admin.php:192
+#: templates/admin.php:195
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:193
+#: templates/admin.php:196
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:220
+#: templates/admin.php:223
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:227 templates/personal.php:98
+#: templates/admin.php:230 templates/personal.php:102
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:230 templates/personal.php:100
+#: templates/admin.php:233 templates/personal.php:105
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -331,51 +331,51 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr ""
 
-#: templates/apps.php:10
+#: templates/apps.php:11
 msgid "Add your App"
 msgstr "დაამატე შენი აპლიკაცია"
 
-#: templates/apps.php:11
+#: templates/apps.php:12
 msgid "More Apps"
 msgstr "უფრო მეტი აპლიკაციები"
 
-#: templates/apps.php:24
+#: templates/apps.php:28
 msgid "Select an App"
 msgstr "აირჩიეთ აპლიკაცია"
 
-#: templates/apps.php:28
+#: templates/apps.php:34
 msgid "See application page at apps.owncloud.com"
 msgstr "ნახეთ აპლიკაციის გვერდი apps.owncloud.com –ზე"
 
-#: templates/apps.php:29
+#: templates/apps.php:36
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-ლიცენსირებულია <span class=\"author\"></span>"
 
-#: templates/apps.php:31
+#: templates/apps.php:38
 msgid "Update"
 msgstr "განახლება"
 
-#: templates/help.php:3
+#: 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 ""
 
@@ -384,79 +384,79 @@ msgstr ""
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:14
+#: templates/personal.php:15
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:25
+#: templates/personal.php:26
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:36 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
 msgid "Password"
 msgstr "პაროლი"
 
-#: templates/personal.php:37
+#: templates/personal.php:38
 msgid "Your password was changed"
 msgstr "თქვენი პაროლი შეიცვალა"
 
-#: templates/personal.php:38
+#: templates/personal.php:39
 msgid "Unable to change your password"
 msgstr "თქვენი პაროლი არ შეიცვალა"
 
-#: templates/personal.php:39
+#: templates/personal.php:40
 msgid "Current password"
 msgstr "მიმდინარე პაროლი"
 
-#: templates/personal.php:40
+#: templates/personal.php:42
 msgid "New password"
 msgstr "ახალი პაროლი"
 
-#: templates/personal.php:42
+#: templates/personal.php:44
 msgid "Change password"
 msgstr "პაროლის შეცვლა"
 
-#: templates/personal.php:54 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:78
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:55
+#: templates/personal.php:57
 msgid "Your display name was changed"
 msgstr ""
 
-#: templates/personal.php:56
+#: templates/personal.php:58
 msgid "Unable to change your display name"
 msgstr ""
 
-#: templates/personal.php:59
+#: templates/personal.php:61
 msgid "Change display name"
 msgstr ""
 
-#: templates/personal.php:68
+#: templates/personal.php:70
 msgid "Email"
 msgstr "იმეილი"
 
-#: templates/personal.php:69
+#: templates/personal.php:72
 msgid "Your email address"
 msgstr "თქვენი იმეილ მისამართი"
 
-#: templates/personal.php:70
+#: templates/personal.php:73
 msgid "Fill in an email address to enable password recovery"
 msgstr "შეავსეთ იმეილ მისამართის ველი პაროლის აღსადგენად"
 
-#: templates/personal.php:76 templates/personal.php:77
+#: templates/personal.php:79 templates/personal.php:80
 msgid "Language"
 msgstr "ენა"
 
-#: templates/personal.php:82
+#: templates/personal.php:86
 msgid "Help translate"
 msgstr "თარგმნის დახმარება"
 
-#: templates/personal.php:87
+#: templates/personal.php:91
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:89
+#: templates/personal.php:93
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
diff --git a/l10n/ka_GE/user_ldap.po b/l10n/ka_GE/user_ldap.po
index 2e2cd16393e53fe74c2211d1bbcb4ed81d111871..33202c71fcff955f2e6bbb6caab88c73ab31ec11 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-02-08 00:10+0100\n"
-"PO-Revision-Date: 2013-02-07 23:11+0000\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: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
 "MIME-Version: 1.0\n"
@@ -21,17 +21,17 @@ msgstr ""
 msgid "Failed to delete the server configuration"
 msgstr ""
 
-#: ajax/testConfiguration.php:35
+#: ajax/testConfiguration.php:36
 msgid "The configuration is valid and the connection could be established!"
 msgstr ""
 
-#: ajax/testConfiguration.php:37
+#: ajax/testConfiguration.php:39
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
 msgstr ""
 
-#: ajax/testConfiguration.php:40
+#: ajax/testConfiguration.php:43
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
@@ -86,224 +86,248 @@ msgstr ""
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:17
+#: templates/settings.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:23
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:25
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:26
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:27
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:28
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:32
 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:24
+#: templates/settings.php:33
 msgid "Password"
 msgstr ""
 
-#: templates/settings.php:24
+#: templates/settings.php:36
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:37
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:40
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:41
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:42
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:45
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:46
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:47
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:50
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:51
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:55
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:34
+#: templates/settings.php:58
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:60
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:39
+#: templates/settings.php:63
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:65
+msgid "Cache Time-To-Live"
+msgstr ""
+
+#: templates/settings.php:65
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:67
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:47
+#: templates/settings.php:71
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:47 templates/settings.php:50
+#: templates/settings.php:71 templates/settings.php:74
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:74
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:75
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:77
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:79
+msgid "Quota Field"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Quota Default"
+msgstr ""
+
+#: templates/settings.php:80
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:81
+msgid "Email Field"
+msgstr ""
+
+#: templates/settings.php:82
+msgid "User Home Folder Naming Rule"
+msgstr ""
+
+#: templates/settings.php:82
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:62
+#: templates/settings.php:86
+msgid "Test Configuration"
+msgstr ""
+
+#: templates/settings.php:86
 msgid "Help"
 msgstr "დახმარება"
diff --git a/l10n/ko/core.po b/l10n/ko/core.po
index c3e84e4040bd3ba40fd87a9b85f0c4ee95620c93..4d5ca8bf43b0d1c5a0ef4f35de56896ba9161f93 100644
--- a/l10n/ko/core.po
+++ b/l10n/ko/core.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 14:31+0000\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"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
@@ -391,7 +391,7 @@ msgstr "업데이트가 실패하였습니다. 이 문제를 <a href=\"https://g
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "업데이트가 성공하였습니다. ownCloud로 돌아갑니다."
 
-#: lostpassword/controller.php:47
+#: lostpassword/controller.php:48
 msgid "ownCloud password reset"
 msgstr "ownCloud 암호 재설정"
 
diff --git a/l10n/ko/files.po b/l10n/ko/files.po
index 42732dd887f3ff7cf19725bf3c1a1c25522c3217..c122421e3bfb4749755bfeee8b676eb69ffae864 100644
--- a/l10n/ko/files.po
+++ b/l10n/ko/files.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\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: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
@@ -56,27 +56,27 @@ msgid ""
 "the HTML form"
 msgstr "업로드한 파일이 HTML 문서에 지정한 MAX_FILE_SIZE보다 더 큼"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
 msgstr "파일이 부분적으로 업로드됨"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:31
 msgid "No file was uploaded"
 msgstr "업로드된 파일 없음"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:32
 msgid "Missing a temporary folder"
 msgstr "임시 폴더가 사라짐"
 
-#: ajax/upload.php:34
+#: ajax/upload.php:33
 msgid "Failed to write to disk"
 msgstr "디스크에 쓰지 못했습니다"
 
-#: ajax/upload.php:52
+#: ajax/upload.php:51
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:83
+#: ajax/upload.php:82
 msgid "Invalid directory."
 msgstr "올바르지 않은 디렉터리입니다."
 
@@ -88,7 +88,7 @@ msgstr "파일"
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:127 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:127 templates/index.php:92 templates/index.php:93
 msgid "Delete"
 msgstr "삭제"
 
@@ -96,40 +96,36 @@ msgstr "삭제"
 msgid "Rename"
 msgstr "이름 바꾸기"
 
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
 msgid "Pending"
 msgstr "보류 중"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "{new_name} already exists"
 msgstr "{new_name}이(가) 이미 존재함"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "replace"
 msgstr "바꾸기"
 
-#: js/filelist.js:253
+#: js/filelist.js:251
 msgid "suggest name"
 msgstr "이름 제안"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "cancel"
 msgstr "취소"
 
-#: js/filelist.js:295
-msgid "replaced {new_name}"
-msgstr "{new_name}을(를) 대체함"
+#: js/filelist.js:298
+msgid "replaced {new_name} with {old_name}"
+msgstr "{old_name}이(가) {new_name}(으)로 대체됨"
 
-#: js/filelist.js:295 js/filelist.js:297
+#: js/filelist.js:298
 msgid "undo"
 msgstr "실행 취소"
 
-#: js/filelist.js:297
-msgid "replaced {new_name} with {old_name}"
-msgstr "{old_name}이(가) {new_name}(으)로 대체됨"
-
-#: js/filelist.js:322
+#: js/filelist.js:323
 msgid "perform delete operation"
 msgstr ""
 
@@ -155,74 +151,74 @@ msgstr "저장 공간이 가득 찼습니다. 파일을 업데이트하거나 
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "저장 공간이 거의 가득 찼습니다 ({usedSpacePercent}%)"
 
-#: js/files.js:224
+#: js/files.js:225
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "다운로드가 준비 중입니다. 파일 크기가 크다면 시간이 오래 걸릴 수도 있습니다."
 
-#: js/files.js:261
+#: js/files.js:262
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "이 파일은 디렉터리이거나 비어 있기 때문에 업로드할 수 없습니다"
 
-#: js/files.js:261
+#: js/files.js:262
 msgid "Upload Error"
 msgstr "업로드 오류"
 
-#: js/files.js:272
+#: js/files.js:273
 msgid "Close"
 msgstr "닫기"
 
-#: js/files.js:311
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr "파일 1개 업로드 중"
 
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr "파일 {count}개 업로드 중"
 
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "업로드가 취소되었습니다."
 
-#: js/files.js:496
+#: js/files.js:497
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "파일 업로드가 진행 중입니다. 이 페이지를 벗어나면 업로드가 취소됩니다."
 
-#: js/files.js:569
+#: js/files.js:570
 msgid "URL cannot be empty."
 msgstr "URL을 입력해야 합니다."
 
-#: js/files.js:574
+#: js/files.js:575
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "폴더 이름이 유효하지 않습니다. "
 
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:953 templates/index.php:68
 msgid "Name"
 msgstr "이름"
 
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:954 templates/index.php:79
 msgid "Size"
 msgstr "크기"
 
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:955 templates/index.php:81
 msgid "Modified"
 msgstr "수정됨"
 
-#: js/files.js:969
+#: js/files.js:974
 msgid "1 folder"
 msgstr "폴더 1개"
 
-#: js/files.js:971
+#: js/files.js:976
 msgid "{count} folders"
 msgstr "폴더 {count}개"
 
-#: js/files.js:979
+#: js/files.js:984
 msgid "1 file"
 msgstr "파일 1개"
 
-#: js/files.js:981
+#: js/files.js:986
 msgid "{count} files"
 msgstr "파일 {count}개"
 
@@ -286,33 +282,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr "업로드 취소"
 
-#: templates/index.php:59
+#: templates/index.php:53
+msgid "You don’t have write permissions here."
+msgstr ""
+
+#: templates/index.php:60
 msgid "Nothing in here. Upload something!"
 msgstr "내용이 없습니다. 업로드할 수 있습니다!"
 
-#: templates/index.php:73
+#: templates/index.php:74
 msgid "Download"
 msgstr "다운로드"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:86 templates/index.php:87
 msgid "Unshare"
 msgstr "공유 해제"
 
-#: templates/index.php:105
+#: templates/index.php:106
 msgid "Upload too large"
 msgstr "업로드 용량 초과"
 
-#: templates/index.php:107
+#: templates/index.php:108
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "이 파일이 서버에서 허용하는 최대 업로드 가능 용량보다 큽니다."
 
-#: templates/index.php:112
+#: templates/index.php:113
 msgid "Files are being scanned, please wait."
 msgstr "파일을 검색하고 있습니다. 기다려 주십시오."
 
-#: templates/index.php:115
+#: templates/index.php:116
 msgid "Current scanning"
 msgstr "현재 검색"
 
diff --git a/l10n/ko/files_external.po b/l10n/ko/files_external.po
index 0c7bf2da326442bdecdff46833ae07b0d6880bda..9e719652bb644bb7a96956218967c1ae3bf25060 100644
--- a/l10n/ko/files_external.po
+++ b/l10n/ko/files_external.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-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-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"
 "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"
@@ -21,37 +21,33 @@ msgstr ""
 "Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0;\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 "Dropbox 저장소 설정 오류"
 
-#: js/dropbox.js:34 js/dropbox.js:45 js/google.js:31 js/google.js:41
+#: js/dropbox.js:65 js/google.js:66
 msgid "Grant access"
 msgstr "접근 권한 부여"
 
-#: js/dropbox.js:73 js/google.js:73
-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 "올바른 Dropbox 앱 키와 암호를 입력하십시오."
 
-#: js/google.js:26 js/google.js:74 js/google.js:79
+#: js/google.js:36 js/google.js:93
 msgid "Error configuring Google Drive storage"
 msgstr "Google 드라이브 저장소 설정 오류"
 
-#: lib/config.php:405
+#: lib/config.php:421
 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:406
+#: lib/config.php:424
 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 "
@@ -62,63 +58,63 @@ msgstr "<b>경고:</b> PHP FTP 지원이 비활성화되어 있거나 설치되
 msgid "External Storage"
 msgstr "외부 저장소"
 
-#: templates/settings.php:8 templates/settings.php:22
-msgid "Mount point"
-msgstr "마운트 지점"
-
-#: templates/settings.php:9
-msgid "Backend"
-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: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"
-msgstr "마운트 지점 추가"
+#: 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 "사용자"
 
-#: templates/settings.php:108 templates/settings.php:109
-#: templates/settings.php:144 templates/settings.php:145
+#: templates/settings.php:113 templates/settings.php:114
+#: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
 msgstr "삭제"
 
-#: 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:136
+#: templates/settings.php:141
 msgid "SSL root certificates"
 msgstr "SSL 루트 인증서"
 
-#: templates/settings.php:153
+#: templates/settings.php:159
 msgid "Import Root Certificate"
 msgstr "루트 인증서 가져오기"
diff --git a/l10n/ko/files_trashbin.po b/l10n/ko/files_trashbin.po
index d03c3476b2ef03651922839dced880d14c3579df..1464b23c7c3ee40c4fa530baed434f0312deedef 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-02-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 10:07+0000\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: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/delete.php:22
+#: ajax/delete.php:40
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
@@ -27,35 +27,39 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:33
+#: js/trash.js:34
 msgid "delete file permanently"
 msgstr ""
 
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr ""
+
+#: js/trash.js:174 templates/index.php:17
 msgid "Name"
 msgstr "이름"
 
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:175 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:135
+#: js/trash.js:184
 msgid "1 folder"
 msgstr "폴더 1개"
 
-#: js/trash.js:137
+#: js/trash.js:186
 msgid "{count} folders"
 msgstr "폴더 {count}개"
 
-#: js/trash.js:145
+#: js/trash.js:194
 msgid "1 file"
 msgstr "파일 1개"
 
-#: js/trash.js:147
+#: js/trash.js:196
 msgid "{count} files"
 msgstr "파일 {count}개"
 
@@ -66,3 +70,11 @@ 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/ko/files_versions.po b/l10n/ko/files_versions.po
index 9e99e48e77159f8770015315596cb4b6027f8827..cfd2654c9c4afa9d2f796a8d8322ff47626afda7 100644
--- a/l10n/ko/files_versions.po
+++ b/l10n/ko/files_versions.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-08 00:10+0100\n"
-"PO-Revision-Date: 2013-02-07 23:11+0000\n"
+"POT-Creation-Date: 2013-02-28 00:04+0100\n"
+"PO-Revision-Date: 2013-02-27 23:04+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
@@ -50,18 +50,10 @@ msgstr ""
 msgid "No path specified"
 msgstr ""
 
-#: js/versions.js:16
-msgid "History"
-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 ""
-
-#: templates/settings.php:3
-msgid "Files Versioning"
-msgstr "파일 버전 관리"
-
-#: templates/settings.php:4
-msgid "Enable"
-msgstr "사용함"
diff --git a/l10n/ko/lib.po b/l10n/ko/lib.po
index eeaa4b93c1239ac726b9b0c7a34c459211647727..b5155c8f1d9bad5d81202757c39e66f07e843f5d 100644
--- a/l10n/ko/lib.po
+++ b/l10n/ko/lib.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-11 15:39+0100\n"
-"PO-Revision-Date: 2013-02-11 14:40+0000\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: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
@@ -20,27 +20,27 @@ msgstr ""
 "Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: app.php:339
+#: app.php:349
 msgid "Help"
 msgstr "도움말"
 
-#: app.php:346
+#: app.php:362
 msgid "Personal"
 msgstr "개인"
 
-#: app.php:351
+#: app.php:373
 msgid "Settings"
 msgstr "설정"
 
-#: app.php:356
+#: app.php:385
 msgid "Users"
 msgstr "사용자"
 
-#: app.php:363
+#: app.php:398
 msgid "Apps"
 msgstr "앱"
 
-#: app.php:365
+#: app.php:406
 msgid "Admin"
 msgstr "관리자"
 
@@ -52,15 +52,15 @@ msgstr "ZIP 다운로드가 비활성화되었습니다."
 msgid "Files need to be downloaded one by one."
 msgstr "파일을 개별적으로 다운로드해야 합니다."
 
-#: files.php:203 files.php:228
+#: files.php:204 files.php:231
 msgid "Back to Files"
 msgstr "파일로 돌아가기"
 
-#: files.php:227
+#: files.php:228
 msgid "Selected files too large to generate zip file."
 msgstr "선택한 파일들은 ZIP 파일을 생성하기에 너무 큽니다."
 
-#: helper.php:226
+#: helper.php:228
 msgid "couldn't be determined"
 msgstr "결정할 수 없음"
 
@@ -100,87 +100,92 @@ msgstr ""
 msgid "Specify a data folder."
 msgstr ""
 
-#: setup.php:53
+#: setup.php:55
 #, php-format
 msgid "%s enter the database username."
 msgstr ""
 
-#: setup.php:56
+#: setup.php:58
 #, php-format
 msgid "%s enter the database name."
 msgstr ""
 
-#: setup.php:59
+#: setup.php:61
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr ""
 
-#: setup.php:62
+#: setup.php:64
 #, php-format
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:126 setup.php:291 setup.php:336
+#: setup.php:128 setup.php:320 setup.php:365
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:127 setup.php:150 setup.php:204
+#: setup.php:129 setup.php:152 setup.php:229
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:149 setup.php:423 setup.php:489
+#: setup.php:151 setup.php:453 setup.php:520
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:203
+#: setup.php:228
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:255 setup.php:357 setup.php:366 setup.php:384 setup.php:394
-#: setup.php:403 setup.php:430 setup.php:496 setup.php:522 setup.php:529
-#: setup.php:540 setup.php:547 setup.php:556 setup.php:564 setup.php:573
-#: setup.php:579
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:256 setup.php:358 setup.php:367 setup.php:385 setup.php:395
-#: setup.php:404 setup.php:431 setup.php:497 setup.php:523 setup.php:530
-#: setup.php:541 setup.php:557 setup.php:565 setup.php:574
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:270
+#: setup.php:299
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:271
+#: setup.php:300
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:276
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:277
+#: setup.php:306
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:548 setup.php:580
+#: setup.php:579 setup.php:611
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:644
+#: setup.php:631
+#, php-format
+msgid "MS SQL username and/or password not valid: %s"
+msgstr ""
+
+#: setup.php:849
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:645
+#: setup.php:850
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
@@ -237,16 +242,16 @@ msgstr "작년"
 msgid "years ago"
 msgstr "년 전"
 
-#: updater.php:75
+#: updater.php:78
 #, php-format
 msgid "%s is available. Get <a href=\"%s\">more information</a>"
 msgstr "%s을(를) 사용할 수 있습니다. <a href=\"%s\">자세한 정보 보기</a>"
 
-#: updater.php:77
+#: updater.php:81
 msgid "up to date"
 msgstr "최신"
 
-#: updater.php:80
+#: updater.php:84
 msgid "updates check is disabled"
 msgstr "업데이트 확인이 비활성화됨"
 
diff --git a/l10n/ko/settings.po b/l10n/ko/settings.po
index d1f243a24e56f95e62dcb4e832f1ed2c6e139cd6..331f157580654483dab1c86e79619bf35580d1c5 100644
--- a/l10n/ko/settings.po
+++ b/l10n/ko/settings.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 23:05+0000\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: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
@@ -26,8 +26,8 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "앱 스토어에서 목록을 가져올 수 없습니다"
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:15
-#: ajax/togglegroups.php:18
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr "인증 오류"
 
@@ -75,12 +75,12 @@ 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 "그룹 %s에 사용자를 추가할 수 없습니다."
 
-#: ajax/togglegroups.php:34
+#: ajax/togglegroups.php:36
 #, php-format
 msgid "Unable to remove user from group %s"
 msgstr "그룹 %s에서 사용자를 삭제할 수 없습니다."
@@ -121,7 +121,7 @@ msgstr "오류"
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:96
+#: js/personal.js:99
 msgid "Saving..."
 msgstr "저장 중..."
 
@@ -150,23 +150,23 @@ msgstr "그룹 관리자"
 msgid "Delete"
 msgstr "삭제"
 
-#: js/users.js:190
+#: js/users.js:191
 msgid "add group"
 msgstr ""
 
-#: js/users.js:351
+#: js/users.js:352
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:357
+#: js/users.js:358
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
 msgid "__language_name__"
 msgstr "한국어"
 
@@ -212,19 +212,19 @@ msgstr ""
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:61
+#: templates/admin.php:63
+#, php-format
 msgid ""
-"This ownCloud server can't set system locale to "
-"\"en_US.UTF-8\"/\"en_US.UTF8\". 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 en_US.UTF-8/en_US.UTF8."
+"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:72
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:75
+#: 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 "
@@ -234,98 +234,98 @@ msgid ""
 " of ownCloud."
 msgstr ""
 
-#: templates/admin.php:89
+#: templates/admin.php:92
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:98
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:108
+#: 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:118
+#: 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:125
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:131
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:132
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:140
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:147
+#: templates/admin.php:150
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:148
+#: templates/admin.php:151
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:155
+#: templates/admin.php:158
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:161
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:165
+#: templates/admin.php:168
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:181
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:179
+#: templates/admin.php:182
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:182
+#: templates/admin.php:185
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr ""
 
-#: templates/admin.php:192
+#: templates/admin.php:195
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:193
+#: templates/admin.php:196
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:220
+#: templates/admin.php:223
 msgid "More"
 msgstr "더 중요함"
 
-#: templates/admin.php:227 templates/personal.php:98
+#: templates/admin.php:230 templates/personal.php:102
 msgid "Version"
 msgstr "버전"
 
-#: templates/admin.php:230 templates/personal.php:100
+#: templates/admin.php:233 templates/personal.php:105
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -335,51 +335,51 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud 커뮤니티</a>에 의해서 개발되었습니다. <a href=\"https://github.com/owncloud\" target=\"_blank\">원본 코드</a>는 <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>에 따라 사용이 허가됩니다."
 
-#: templates/apps.php:10
+#: templates/apps.php:11
 msgid "Add your App"
 msgstr "앱 추가"
 
-#: templates/apps.php:11
+#: templates/apps.php:12
 msgid "More Apps"
 msgstr "더 많은 앱"
 
-#: templates/apps.php:24
+#: templates/apps.php:28
 msgid "Select an App"
 msgstr "앱 선택"
 
-#: templates/apps.php:28
+#: templates/apps.php:34
 msgid "See application page at apps.owncloud.com"
 msgstr "apps.owncloud.com에 있는 앱 페이지를 참고하십시오"
 
-#: templates/apps.php:29
+#: templates/apps.php:36
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-라이선스됨: <span class=\"author\"></span>"
 
-#: templates/apps.php:31
+#: templates/apps.php:38
 msgid "Update"
 msgstr "업데이트"
 
-#: templates/help.php:3
+#: 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 "상업용 지원"
 
@@ -388,79 +388,79 @@ msgstr "상업용 지원"
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "현재 공간 <strong>%s</strong>/<strong>%s</strong>을(를) 사용 중입니다"
 
-#: templates/personal.php:14
+#: templates/personal.php:15
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:25
+#: templates/personal.php:26
 msgid "Show First Run Wizard again"
 msgstr "첫 실행 마법사 다시 보이기"
 
-#: templates/personal.php:36 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
 msgid "Password"
 msgstr "암호"
 
-#: templates/personal.php:37
+#: templates/personal.php:38
 msgid "Your password was changed"
 msgstr "암호가 변경되었습니다"
 
-#: templates/personal.php:38
+#: templates/personal.php:39
 msgid "Unable to change your password"
 msgstr "암호를 변경할 수 없음"
 
-#: templates/personal.php:39
+#: templates/personal.php:40
 msgid "Current password"
 msgstr "현재 암호"
 
-#: templates/personal.php:40
+#: templates/personal.php:42
 msgid "New password"
 msgstr "새 암호"
 
-#: templates/personal.php:42
+#: templates/personal.php:44
 msgid "Change password"
 msgstr "암호 변경"
 
-#: templates/personal.php:54 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:78
 msgid "Display Name"
 msgstr "표시 이름"
 
-#: templates/personal.php:55
+#: templates/personal.php:57
 msgid "Your display name was changed"
 msgstr ""
 
-#: templates/personal.php:56
+#: templates/personal.php:58
 msgid "Unable to change your display name"
 msgstr ""
 
-#: templates/personal.php:59
+#: templates/personal.php:61
 msgid "Change display name"
 msgstr ""
 
-#: templates/personal.php:68
+#: templates/personal.php:70
 msgid "Email"
 msgstr "이메일"
 
-#: templates/personal.php:69
+#: templates/personal.php:72
 msgid "Your email address"
 msgstr "이메일 주소"
 
-#: templates/personal.php:70
+#: templates/personal.php:73
 msgid "Fill in an email address to enable password recovery"
 msgstr "암호 찾기 기능을 사용하려면 이메일 주소를 입력하십시오."
 
-#: templates/personal.php:76 templates/personal.php:77
+#: templates/personal.php:79 templates/personal.php:80
 msgid "Language"
 msgstr "언어"
 
-#: templates/personal.php:82
+#: templates/personal.php:86
 msgid "Help translate"
 msgstr "번역 돕기"
 
-#: templates/personal.php:87
+#: templates/personal.php:91
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:89
+#: templates/personal.php:93
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "파일 관리자에서 ownCloud에 접속하려면 이 주소를 사용하십시오."
 
diff --git a/l10n/ko/user_ldap.po b/l10n/ko/user_ldap.po
index df1f2796b47c1de0ca5c880d3b343de1ca5d0181..6e20895df1fb0f019971251eeab2e9a63f5b3e6c 100644
--- a/l10n/ko/user_ldap.po
+++ b/l10n/ko/user_ldap.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-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 09:46+0000\n"
-"Last-Translator: Harim Park <fofwisdom@gmail.com>\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: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,17 +25,17 @@ msgstr ""
 msgid "Failed to delete the server configuration"
 msgstr ""
 
-#: ajax/testConfiguration.php:35
+#: ajax/testConfiguration.php:36
 msgid "The configuration is valid and the connection could be established!"
 msgstr ""
 
-#: ajax/testConfiguration.php:37
+#: ajax/testConfiguration.php:39
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
 msgstr ""
 
-#: ajax/testConfiguration.php:40
+#: ajax/testConfiguration.php:43
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
@@ -90,224 +90,248 @@ msgstr "<b>경고:</b> PHP LDAP 모듈이 비활성화되어 있거나 설치되
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:17
+#: templates/settings.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:23
 msgid "Host"
 msgstr "호스트"
 
-#: templates/settings.php:21
+#: templates/settings.php:25
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "SSL을 사용하는 경우가 아니라면 프로토콜을 입력하지 않아도 됩니다. SSL을 사용하려면 ldaps://를 입력하십시오."
 
-#: templates/settings.php:22
+#: templates/settings.php:26
 msgid "Base DN"
 msgstr "기본 DN"
 
-#: templates/settings.php:22
+#: templates/settings.php:27
 msgid "One Base DN per line"
 msgstr "기본 DN을 한 줄에 하나씩 입력하십시오"
 
-#: templates/settings.php:22
+#: templates/settings.php:28
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "고급 탭에서 사용자 및 그룹에 대한 기본 DN을 지정할 수 있습니다."
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "User DN"
 msgstr "사용자 DN"
 
-#: templates/settings.php:23
+#: templates/settings.php:32
 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:24
+#: templates/settings.php:33
 msgid "Password"
 msgstr "암호"
 
-#: templates/settings.php:24
+#: templates/settings.php:36
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "익명 접근을 허용하려면 DN과 암호를 비워 두십시오."
 
-#: templates/settings.php:25
+#: templates/settings.php:37
 msgid "User Login Filter"
 msgstr "사용자 로그인 필터"
 
-#: templates/settings.php:25
+#: templates/settings.php:40
 #, 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:25
+#: templates/settings.php:41
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "%%uid 자리 비움자를 사용하십시오. 예제: \"uid=%%uid\"\""
 
-#: templates/settings.php:26
+#: templates/settings.php:42
 msgid "User List Filter"
 msgstr "사용자 목록 필터"
 
-#: templates/settings.php:26
+#: templates/settings.php:45
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "사용자를 검색할 때 적용할 필터를 정의합니다."
 
-#: templates/settings.php:26
+#: templates/settings.php:46
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "자리 비움자를 사용할 수 없습니다. 예제: \"objectClass=person\""
 
-#: templates/settings.php:27
+#: templates/settings.php:47
 msgid "Group Filter"
 msgstr "그룹 필터"
 
-#: templates/settings.php:27
+#: templates/settings.php:50
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "그룹을 검색할 때 적용할 필터를 정의합니다."
 
-#: templates/settings.php:27
+#: templates/settings.php:51
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "자리 비움자를 사용할 수 없습니다. 예제: \"objectClass=posixGroup\""
 
-#: templates/settings.php:31
+#: templates/settings.php:55
 msgid "Connection Settings"
 msgstr "연결 설정"
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "Configuration Active"
 msgstr "구성 활성화"
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:34
+#: templates/settings.php:58
 msgid "Port"
 msgstr "포트"
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid "Backup (Replica) Host"
 msgstr "백업 (복제) 포트"
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:60
 msgid "Backup (Replica) Port"
 msgstr "백업 (복제) 포트"
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "Disable Main Server"
 msgstr "주 서버 비활성화"
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Use TLS"
 msgstr "TLS 사용"
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:39
+#: templates/settings.php:63
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "서버에서 대소문자를 구분하지 않음 (Windows)"
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid "Turn off SSL certificate validation."
 msgstr "SSL 인증서 유효성 검사를 해제합니다."
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 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:40
+#: templates/settings.php:64
 msgid "Not recommended, use for testing only."
 msgstr "추천하지 않음, 테스트로만 사용하십시오."
 
-#: templates/settings.php:41
+#: templates/settings.php:65
+msgid "Cache Time-To-Live"
+msgstr ""
+
+#: templates/settings.php:65
 msgid "in seconds. A change empties the cache."
 msgstr "초. 항목 변경 시 캐시가 갱신됩니다."
 
-#: templates/settings.php:43
+#: templates/settings.php:67
 msgid "Directory Settings"
 msgstr "디렉토리 설정"
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "User Display Name Field"
 msgstr "사용자의 표시 이름 필드"
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "LDAP 속성은 사용자의 ownCloud 이름을 생성하기 위해 사용합니다."
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "Base User Tree"
 msgstr "기본 사용자 트리"
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "One User Base DN per line"
 msgstr "사용자 DN을 한 줄에 하나씩 입력하십시오"
 
-#: templates/settings.php:47
+#: templates/settings.php:71
 msgid "User Search Attributes"
 msgstr "사용자 검색 속성"
 
-#: templates/settings.php:47 templates/settings.php:50
+#: templates/settings.php:71 templates/settings.php:74
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "Group Display Name Field"
 msgstr "그룹의 표시 이름 필드"
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "LDAP 속성은 그룹의 ownCloud 이름을 생성하기 위해 사용합니다."
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "Base Group Tree"
 msgstr "기본 그룹 트리"
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "One Group Base DN per line"
 msgstr "그룹 기본 DN을 한 줄에 하나씩 입력하십시오"
 
-#: templates/settings.php:50
+#: templates/settings.php:74
 msgid "Group Search Attributes"
 msgstr "그룹 검색 속성"
 
-#: templates/settings.php:51
+#: templates/settings.php:75
 msgid "Group-Member association"
 msgstr "그룹-회원 연결"
 
-#: templates/settings.php:53
+#: templates/settings.php:77
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:79
+msgid "Quota Field"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Quota Default"
+msgstr ""
+
+#: templates/settings.php:80
 msgid "in bytes"
 msgstr "바이트"
 
-#: templates/settings.php:58
+#: templates/settings.php:81
+msgid "Email Field"
+msgstr ""
+
+#: templates/settings.php:82
+msgid "User Home Folder Naming Rule"
+msgstr ""
+
+#: templates/settings.php:82
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "사용자 이름을 사용하려면 비워 두십시오(기본값). 기타 경우 LDAP/AD 속성을 지정하십시오."
 
-#: templates/settings.php:62
+#: templates/settings.php:86
+msgid "Test Configuration"
+msgstr ""
+
+#: templates/settings.php:86
 msgid "Help"
 msgstr "도움말"
diff --git a/l10n/ku_IQ/files.po b/l10n/ku_IQ/files.po
index ae4edcd2826017d9e4fb8eafb8c6d0e5ccdf0673..29bb55872a116ead0da359b6a373849433df67bd 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-02-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\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: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
@@ -50,27 +50,27 @@ msgid ""
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:31
+#: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:32
+#: ajax/upload.php:31
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:33
+#: ajax/upload.php:32
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:34
+#: ajax/upload.php:33
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:52
+#: ajax/upload.php:51
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:83
+#: ajax/upload.php:82
 msgid "Invalid directory."
 msgstr ""
 
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:127 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:127 templates/index.php:92 templates/index.php:93
 msgid "Delete"
 msgstr ""
 
@@ -90,40 +90,36 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:253
+#: js/filelist.js:251
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:295
-msgid "replaced {new_name}"
+#: js/filelist.js:298
+msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:295 js/filelist.js:297
+#: js/filelist.js:298
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:297
-msgid "replaced {new_name} with {old_name}"
-msgstr ""
-
-#: js/filelist.js:322
+#: js/filelist.js:323
 msgid "perform delete operation"
 msgstr ""
 
@@ -149,74 +145,74 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:224
+#: js/files.js:225
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:261
+#: js/files.js:262
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:261
+#: js/files.js:262
 msgid "Upload Error"
 msgstr ""
 
-#: js/files.js:272
+#: js/files.js:273
 msgid "Close"
 msgstr "داخستن"
 
-#: js/files.js:311
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr ""
 
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr ""
 
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:496
+#: js/files.js:497
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:569
+#: js/files.js:570
 msgid "URL cannot be empty."
 msgstr "ناونیشانی به‌سته‌ر نابێت به‌تاڵ بێت."
 
-#: js/files.js:574
+#: js/files.js:575
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:953 templates/index.php:68
 msgid "Name"
 msgstr "ناو"
 
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:954 templates/index.php:79
 msgid "Size"
 msgstr ""
 
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:955 templates/index.php:81
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:969
+#: js/files.js:974
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:971
+#: js/files.js:976
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:979
+#: js/files.js:984
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:981
+#: js/files.js:986
 msgid "{count} files"
 msgstr ""
 
@@ -280,33 +276,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:53
+msgid "You don’t have write permissions here."
+msgstr ""
+
+#: templates/index.php:60
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:73
+#: templates/index.php:74
 msgid "Download"
 msgstr "داگرتن"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:86 templates/index.php:87
 msgid "Unshare"
 msgstr ""
 
-#: templates/index.php:105
+#: templates/index.php:106
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:107
+#: templates/index.php:108
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:112
+#: templates/index.php:113
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:115
+#: templates/index.php:116
 msgid "Current scanning"
 msgstr ""
 
diff --git a/l10n/ku_IQ/files_external.po b/l10n/ku_IQ/files_external.po
index 78687b146fcc1188bba9992336e801aa35813398..0a53bb876de97b23e3cb6ccc600e689288530705 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: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-11 23:22+0000\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"
 "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
@@ -17,37 +17,33 @@ msgstr ""
 "Language: ku_IQ\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:421
 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:424
 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 "
@@ -58,63 +54,63 @@ msgstr ""
 msgid "External Storage"
 msgstr ""
 
-#: templates/settings.php:8 templates/settings.php:22
-msgid "Mount point"
-msgstr ""
+#: 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 "به‌كارهێنه‌ر"
 
-#: 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 ""
 
-#: 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/ku_IQ/files_trashbin.po b/l10n/ku_IQ/files_trashbin.po
index 03fa59c580435d2cf9bb6a63c698938649be8339..5fe9d389ebf1c9918fbbdb9f0839c09d6d8d1fed 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-02-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 10:07+0000\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: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Language: ku_IQ\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:22
+#: ajax/delete.php:40
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
@@ -27,35 +27,39 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:33
+#: js/trash.js:34
 msgid "delete file permanently"
 msgstr ""
 
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr ""
+
+#: js/trash.js:174 templates/index.php:17
 msgid "Name"
 msgstr "ناو"
 
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:175 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:135
+#: js/trash.js:184
 msgid "1 folder"
 msgstr ""
 
-#: js/trash.js:137
+#: js/trash.js:186
 msgid "{count} folders"
 msgstr ""
 
-#: js/trash.js:145
+#: js/trash.js:194
 msgid "1 file"
 msgstr ""
 
-#: js/trash.js:147
+#: js/trash.js:196
 msgid "{count} files"
 msgstr ""
 
@@ -66,3 +70,11 @@ 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/ku_IQ/files_versions.po b/l10n/ku_IQ/files_versions.po
index d241d5d28b974669b8661767e803ec2bea8a45a7..d5bfd4c337f4098fda7a9a7f7f5fd42bc71e17e7 100644
--- a/l10n/ku_IQ/files_versions.po
+++ b/l10n/ku_IQ/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-08 00:10+0100\n"
-"PO-Revision-Date: 2013-02-07 23:11+0000\n"
+"POT-Creation-Date: 2013-02-28 00:04+0100\n"
+"PO-Revision-Date: 2013-02-27 23:04+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
@@ -49,18 +49,10 @@ msgstr ""
 msgid "No path specified"
 msgstr ""
 
-#: js/versions.js:16
-msgid "History"
-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 ""
-
-#: templates/settings.php:3
-msgid "Files Versioning"
-msgstr "وه‌شانی په‌ڕگه"
-
-#: templates/settings.php:4
-msgid "Enable"
-msgstr "چالاککردن"
diff --git a/l10n/ku_IQ/lib.po b/l10n/ku_IQ/lib.po
index e53da4b59397e6783d0c385b25a5d310a2ca46b0..42b6f4b92ef673cc576257c291826a9c143955ab 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-11 15:39+0100\n"
-"PO-Revision-Date: 2013-02-11 14:41+0000\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: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
@@ -17,27 +17,27 @@ msgstr ""
 "Language: ku_IQ\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:339
+#: app.php:349
 msgid "Help"
 msgstr "یارمەتی"
 
-#: app.php:346
+#: app.php:362
 msgid "Personal"
 msgstr ""
 
-#: app.php:351
+#: app.php:373
 msgid "Settings"
 msgstr "ده‌ستكاری"
 
-#: app.php:356
+#: app.php:385
 msgid "Users"
 msgstr "به‌كارهێنه‌ر"
 
-#: app.php:363
+#: app.php:398
 msgid "Apps"
 msgstr ""
 
-#: app.php:365
+#: app.php:406
 msgid "Admin"
 msgstr ""
 
@@ -49,15 +49,15 @@ msgstr ""
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:203 files.php:228
+#: files.php:204 files.php:231
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:227
+#: files.php:228
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: helper.php:226
+#: helper.php:228
 msgid "couldn't be determined"
 msgstr ""
 
@@ -97,87 +97,92 @@ msgstr ""
 msgid "Specify a data folder."
 msgstr ""
 
-#: setup.php:53
+#: setup.php:55
 #, php-format
 msgid "%s enter the database username."
 msgstr ""
 
-#: setup.php:56
+#: setup.php:58
 #, php-format
 msgid "%s enter the database name."
 msgstr ""
 
-#: setup.php:59
+#: setup.php:61
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr ""
 
-#: setup.php:62
+#: setup.php:64
 #, php-format
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:126 setup.php:291 setup.php:336
+#: setup.php:128 setup.php:320 setup.php:365
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:127 setup.php:150 setup.php:204
+#: setup.php:129 setup.php:152 setup.php:229
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:149 setup.php:423 setup.php:489
+#: setup.php:151 setup.php:453 setup.php:520
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:203
+#: setup.php:228
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:255 setup.php:357 setup.php:366 setup.php:384 setup.php:394
-#: setup.php:403 setup.php:430 setup.php:496 setup.php:522 setup.php:529
-#: setup.php:540 setup.php:547 setup.php:556 setup.php:564 setup.php:573
-#: setup.php:579
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:256 setup.php:358 setup.php:367 setup.php:385 setup.php:395
-#: setup.php:404 setup.php:431 setup.php:497 setup.php:523 setup.php:530
-#: setup.php:541 setup.php:557 setup.php:565 setup.php:574
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:270
+#: setup.php:299
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:271
+#: setup.php:300
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:276
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:277
+#: setup.php:306
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:548 setup.php:580
+#: setup.php:579 setup.php:611
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:644
+#: setup.php:631
+#, php-format
+msgid "MS SQL username and/or password not valid: %s"
+msgstr ""
+
+#: setup.php:849
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:645
+#: setup.php:850
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
@@ -234,16 +239,16 @@ msgstr ""
 msgid "years ago"
 msgstr ""
 
-#: updater.php:75
+#: updater.php:78
 #, php-format
 msgid "%s is available. Get <a href=\"%s\">more information</a>"
 msgstr ""
 
-#: updater.php:77
+#: updater.php:81
 msgid "up to date"
 msgstr ""
 
-#: updater.php:80
+#: updater.php:84
 msgid "updates check is disabled"
 msgstr ""
 
diff --git a/l10n/ku_IQ/settings.po b/l10n/ku_IQ/settings.po
index f6150f8c1c2518d017c3cb139d46a89408806e5b..60417dfa73486be1da2ef227fd29aa47ac371022 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-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 23:05+0000\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: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
@@ -21,8 +21,8 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr ""
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:15
-#: ajax/togglegroups.php:18
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr ""
 
@@ -70,12 +70,12 @@ 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 ""
@@ -116,7 +116,7 @@ msgstr "هه‌ڵه"
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:96
+#: js/personal.js:99
 msgid "Saving..."
 msgstr "پاشکه‌وتده‌کات..."
 
@@ -145,23 +145,23 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
-#: js/users.js:190
+#: js/users.js:191
 msgid "add group"
 msgstr ""
 
-#: js/users.js:351
+#: js/users.js:352
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:357
+#: js/users.js:358
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
 msgid "__language_name__"
 msgstr ""
 
@@ -207,19 +207,19 @@ msgstr ""
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:61
+#: templates/admin.php:63
+#, php-format
 msgid ""
-"This ownCloud server can't set system locale to "
-"\"en_US.UTF-8\"/\"en_US.UTF8\". 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 en_US.UTF-8/en_US.UTF8."
+"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:72
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:75
+#: 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 "
@@ -229,98 +229,98 @@ msgid ""
 " of ownCloud."
 msgstr ""
 
-#: templates/admin.php:89
+#: templates/admin.php:92
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:98
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:108
+#: 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:118
+#: 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:125
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:131
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:132
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:140
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:147
+#: templates/admin.php:150
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:148
+#: templates/admin.php:151
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:155
+#: templates/admin.php:158
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:161
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:165
+#: templates/admin.php:168
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:181
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:179
+#: templates/admin.php:182
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:182
+#: templates/admin.php:185
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr ""
 
-#: templates/admin.php:192
+#: templates/admin.php:195
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:193
+#: templates/admin.php:196
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:220
+#: templates/admin.php:223
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:227 templates/personal.php:98
+#: templates/admin.php:230 templates/personal.php:102
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:230 templates/personal.php:100
+#: templates/admin.php:233 templates/personal.php:105
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -330,51 +330,51 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr ""
 
-#: templates/apps.php:10
+#: templates/apps.php:11
 msgid "Add your App"
 msgstr ""
 
-#: templates/apps.php:11
+#: templates/apps.php:12
 msgid "More Apps"
 msgstr ""
 
-#: templates/apps.php:24
+#: templates/apps.php:28
 msgid "Select an App"
 msgstr ""
 
-#: templates/apps.php:28
+#: templates/apps.php:34
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:29
+#: templates/apps.php:36
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
-#: templates/apps.php:31
+#: templates/apps.php:38
 msgid "Update"
 msgstr "نوێکردنه‌وه"
 
-#: templates/help.php:3
+#: 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 ""
 
@@ -383,79 +383,79 @@ msgstr ""
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:14
+#: templates/personal.php:15
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:25
+#: templates/personal.php:26
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:36 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
 msgid "Password"
 msgstr "وشەی تێپەربو"
 
-#: templates/personal.php:37
+#: templates/personal.php:38
 msgid "Your password was changed"
 msgstr ""
 
-#: templates/personal.php:38
+#: templates/personal.php:39
 msgid "Unable to change your password"
 msgstr ""
 
-#: templates/personal.php:39
+#: templates/personal.php:40
 msgid "Current password"
 msgstr ""
 
-#: templates/personal.php:40
+#: templates/personal.php:42
 msgid "New password"
 msgstr "وشەی نهێنی نوێ"
 
-#: templates/personal.php:42
+#: templates/personal.php:44
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:54 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:78
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:55
+#: templates/personal.php:57
 msgid "Your display name was changed"
 msgstr ""
 
-#: templates/personal.php:56
+#: templates/personal.php:58
 msgid "Unable to change your display name"
 msgstr ""
 
-#: templates/personal.php:59
+#: templates/personal.php:61
 msgid "Change display name"
 msgstr ""
 
-#: templates/personal.php:68
+#: templates/personal.php:70
 msgid "Email"
 msgstr "ئیمه‌یل"
 
-#: templates/personal.php:69
+#: templates/personal.php:72
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:70
+#: templates/personal.php:73
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:76 templates/personal.php:77
+#: templates/personal.php:79 templates/personal.php:80
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:82
+#: templates/personal.php:86
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:87
+#: templates/personal.php:91
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:89
+#: templates/personal.php:93
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
diff --git a/l10n/ku_IQ/user_ldap.po b/l10n/ku_IQ/user_ldap.po
index 88137f8ee4722baa41399756006bd4114d539a7f..0e3bf045fa26e14704dbcd29e8e616f93bef46c0 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-02-08 00:10+0100\n"
-"PO-Revision-Date: 2013-02-07 23:11+0000\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: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
@@ -21,17 +21,17 @@ msgstr ""
 msgid "Failed to delete the server configuration"
 msgstr ""
 
-#: ajax/testConfiguration.php:35
+#: ajax/testConfiguration.php:36
 msgid "The configuration is valid and the connection could be established!"
 msgstr ""
 
-#: ajax/testConfiguration.php:37
+#: ajax/testConfiguration.php:39
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
 msgstr ""
 
-#: ajax/testConfiguration.php:40
+#: ajax/testConfiguration.php:43
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
@@ -86,224 +86,248 @@ msgstr ""
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:17
+#: templates/settings.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:23
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:25
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:26
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:27
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:28
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:32
 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:24
+#: templates/settings.php:33
 msgid "Password"
 msgstr ""
 
-#: templates/settings.php:24
+#: templates/settings.php:36
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:37
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:40
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:41
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:42
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:45
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:46
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:47
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:50
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:51
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:55
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:34
+#: templates/settings.php:58
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:60
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:39
+#: templates/settings.php:63
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:65
+msgid "Cache Time-To-Live"
+msgstr ""
+
+#: templates/settings.php:65
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:67
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:47
+#: templates/settings.php:71
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:47 templates/settings.php:50
+#: templates/settings.php:71 templates/settings.php:74
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:74
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:75
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:77
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:79
+msgid "Quota Field"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Quota Default"
+msgstr ""
+
+#: templates/settings.php:80
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:81
+msgid "Email Field"
+msgstr ""
+
+#: templates/settings.php:82
+msgid "User Home Folder Naming Rule"
+msgstr ""
+
+#: templates/settings.php:82
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:62
+#: templates/settings.php:86
+msgid "Test Configuration"
+msgstr ""
+
+#: templates/settings.php:86
 msgid "Help"
 msgstr "یارمەتی"
diff --git a/l10n/lb/core.po b/l10n/lb/core.po
index 59316159763c1f13963a347ae33afeabcd5ce574..e15a264f1a77410f9f5bb9ef96e42bccc04c86df 100644
--- a/l10n/lb/core.po
+++ b/l10n/lb/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 14:32+0000\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"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -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 "ownCloud Passwuert reset"
 
diff --git a/l10n/lb/files.po b/l10n/lb/files.po
index 1c858d6cfa065ae10ba7c596628465bf7db1b1cf..2b34722f3e2dc382b1768d33ca466710c602d6e3 100644
--- a/l10n/lb/files.po
+++ b/l10n/lb/files.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\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: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -51,27 +51,27 @@ msgid ""
 "the HTML form"
 msgstr "Déi ropgelueden Datei ass méi grouss wei d'MAX_FILE_SIZE Eegenschaft déi an der HTML form uginn ass"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
 msgstr "Déi ropgelueden Datei ass nëmmen hallef ropgelueden ginn"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:31
 msgid "No file was uploaded"
 msgstr "Et ass keng Datei ropgelueden ginn"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:32
 msgid "Missing a temporary folder"
 msgstr "Et feelt en temporären Dossier"
 
-#: ajax/upload.php:34
+#: ajax/upload.php:33
 msgid "Failed to write to disk"
 msgstr "Konnt net op den Disk schreiwen"
 
-#: ajax/upload.php:52
+#: ajax/upload.php:51
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:83
+#: ajax/upload.php:82
 msgid "Invalid directory."
 msgstr ""
 
@@ -83,7 +83,7 @@ msgstr "Dateien"
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:127 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:127 templates/index.php:92 templates/index.php:93
 msgid "Delete"
 msgstr "Läschen"
 
@@ -91,40 +91,36 @@ msgstr "Läschen"
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "replace"
 msgstr "ersetzen"
 
-#: js/filelist.js:253
+#: js/filelist.js:251
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "cancel"
 msgstr "ofbriechen"
 
-#: js/filelist.js:295
-msgid "replaced {new_name}"
+#: js/filelist.js:298
+msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:295 js/filelist.js:297
+#: js/filelist.js:298
 msgid "undo"
 msgstr "réckgängeg man"
 
-#: js/filelist.js:297
-msgid "replaced {new_name} with {old_name}"
-msgstr ""
-
-#: js/filelist.js:322
+#: js/filelist.js:323
 msgid "perform delete operation"
 msgstr ""
 
@@ -150,74 +146,74 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:224
+#: js/files.js:225
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:261
+#: js/files.js:262
 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:261
+#: js/files.js:262
 msgid "Upload Error"
 msgstr "Fehler beim eroplueden"
 
-#: js/files.js:272
+#: js/files.js:273
 msgid "Close"
 msgstr "Zoumaachen"
 
-#: js/files.js:311
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr ""
 
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr ""
 
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "Upload ofgebrach."
 
-#: js/files.js:496
+#: js/files.js:497
 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:569
+#: js/files.js:570
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:574
+#: js/files.js:575
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:953 templates/index.php:68
 msgid "Name"
 msgstr "Numm"
 
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:954 templates/index.php:79
 msgid "Size"
 msgstr "Gréisst"
 
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:955 templates/index.php:81
 msgid "Modified"
 msgstr "Geännert"
 
-#: js/files.js:969
+#: js/files.js:974
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:971
+#: js/files.js:976
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:979
+#: js/files.js:984
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:981
+#: js/files.js:986
 msgid "{count} files"
 msgstr ""
 
@@ -281,33 +277,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr "Upload ofbriechen"
 
-#: templates/index.php:59
+#: templates/index.php:53
+msgid "You don’t have write permissions here."
+msgstr ""
+
+#: templates/index.php:60
 msgid "Nothing in here. Upload something!"
 msgstr "Hei ass näischt. Lued eppes rop!"
 
-#: templates/index.php:73
+#: templates/index.php:74
 msgid "Download"
 msgstr "Eroflueden"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:86 templates/index.php:87
 msgid "Unshare"
 msgstr "Net méi deelen"
 
-#: templates/index.php:105
+#: templates/index.php:106
 msgid "Upload too large"
 msgstr "Upload ze grouss"
 
-#: templates/index.php:107
+#: templates/index.php:108
 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:112
+#: templates/index.php:113
 msgid "Files are being scanned, please wait."
 msgstr "Fichieren gi gescannt, war weg."
 
-#: templates/index.php:115
+#: templates/index.php:116
 msgid "Current scanning"
 msgstr "Momentane Scan"
 
diff --git a/l10n/lb/files_external.po b/l10n/lb/files_external.po
index 42ed0ce33df42fa5608a5029aaa8e687043730bd..21d28336fc94fba603156c13cbae9d647709a799 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: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-11 23:22+0000\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"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -17,37 +17,33 @@ msgstr ""
 "Language: lb\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:421
 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:424
 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 "
@@ -58,63 +54,63 @@ msgstr ""
 msgid "External Storage"
 msgstr ""
 
-#: templates/settings.php:8 templates/settings.php:22
-msgid "Mount point"
-msgstr ""
+#: templates/settings.php:9 templates/settings.php:28
+msgid "Folder name"
+msgstr "Dossiers Numm:"
 
-#: 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 "Gruppen"
 
-#: templates/settings.php:95
+#: templates/settings.php:100
 msgid "Users"
 msgstr ""
 
-#: 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 "Läschen"
 
-#: 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/lb/files_trashbin.po b/l10n/lb/files_trashbin.po
index 5b1856decdf918884ad8dc3997cdbaf9a18dbe14..715eba7064d7d12ff942160c10d7eeb6eb8efcdd 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-02-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 10:07+0000\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: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Language: lb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:22
+#: ajax/delete.php:40
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
@@ -27,35 +27,39 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:33
+#: js/trash.js:34
 msgid "delete file permanently"
 msgstr ""
 
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr ""
+
+#: js/trash.js:174 templates/index.php:17
 msgid "Name"
 msgstr "Numm"
 
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:175 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:135
+#: js/trash.js:184
 msgid "1 folder"
 msgstr ""
 
-#: js/trash.js:137
+#: js/trash.js:186
 msgid "{count} folders"
 msgstr ""
 
-#: js/trash.js:145
+#: js/trash.js:194
 msgid "1 file"
 msgstr ""
 
-#: js/trash.js:147
+#: js/trash.js:196
 msgid "{count} files"
 msgstr ""
 
@@ -66,3 +70,11 @@ msgstr ""
 #: templates/index.php:20 templates/index.php:22
 msgid "Restore"
 msgstr ""
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr "Läschen"
+
+#: templates/part.breadcrumb.php:9
+msgid "Deleted Files"
+msgstr ""
diff --git a/l10n/lb/files_versions.po b/l10n/lb/files_versions.po
index 1b9a2bc1c06b8ee38d49beffd52d211d59002eb7..c820aa4669e61102e6d8eae49273f0e2c8ac3e39 100644
--- a/l10n/lb/files_versions.po
+++ b/l10n/lb/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-08 00:10+0100\n"
-"PO-Revision-Date: 2013-02-07 23:11+0000\n"
+"POT-Creation-Date: 2013-02-28 00:04+0100\n"
+"PO-Revision-Date: 2013-02-27 23:04+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -49,18 +49,10 @@ msgstr ""
 msgid "No path specified"
 msgstr ""
 
-#: js/versions.js:16
-msgid "History"
-msgstr "Historique"
+#: 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 ""
-
-#: templates/settings.php:3
-msgid "Files Versioning"
-msgstr "Fichier's Versionéierung "
-
-#: templates/settings.php:4
-msgid "Enable"
-msgstr "Aschalten"
diff --git a/l10n/lb/lib.po b/l10n/lb/lib.po
index 82f5b5434d7be07ea0077a352ed9751cf487f7a4..fff83c08b66e675d30de8df6df545bdd0f128a41 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-11 15:39+0100\n"
-"PO-Revision-Date: 2013-02-11 14:40+0000\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: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -17,27 +17,27 @@ msgstr ""
 "Language: lb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:339
+#: app.php:349
 msgid "Help"
 msgstr "Hëllef"
 
-#: app.php:346
+#: app.php:362
 msgid "Personal"
 msgstr "Perséinlech"
 
-#: app.php:351
+#: app.php:373
 msgid "Settings"
 msgstr "Astellungen"
 
-#: app.php:356
+#: app.php:385
 msgid "Users"
 msgstr ""
 
-#: app.php:363
+#: app.php:398
 msgid "Apps"
 msgstr ""
 
-#: app.php:365
+#: app.php:406
 msgid "Admin"
 msgstr ""
 
@@ -49,15 +49,15 @@ msgstr ""
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:203 files.php:228
+#: files.php:204 files.php:231
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:227
+#: files.php:228
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: helper.php:226
+#: helper.php:228
 msgid "couldn't be determined"
 msgstr ""
 
@@ -97,87 +97,92 @@ msgstr ""
 msgid "Specify a data folder."
 msgstr ""
 
-#: setup.php:53
+#: setup.php:55
 #, php-format
 msgid "%s enter the database username."
 msgstr ""
 
-#: setup.php:56
+#: setup.php:58
 #, php-format
 msgid "%s enter the database name."
 msgstr ""
 
-#: setup.php:59
+#: setup.php:61
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr ""
 
-#: setup.php:62
+#: setup.php:64
 #, php-format
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:126 setup.php:291 setup.php:336
+#: setup.php:128 setup.php:320 setup.php:365
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:127 setup.php:150 setup.php:204
+#: setup.php:129 setup.php:152 setup.php:229
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:149 setup.php:423 setup.php:489
+#: setup.php:151 setup.php:453 setup.php:520
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:203
+#: setup.php:228
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:255 setup.php:357 setup.php:366 setup.php:384 setup.php:394
-#: setup.php:403 setup.php:430 setup.php:496 setup.php:522 setup.php:529
-#: setup.php:540 setup.php:547 setup.php:556 setup.php:564 setup.php:573
-#: setup.php:579
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:256 setup.php:358 setup.php:367 setup.php:385 setup.php:395
-#: setup.php:404 setup.php:431 setup.php:497 setup.php:523 setup.php:530
-#: setup.php:541 setup.php:557 setup.php:565 setup.php:574
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:270
+#: setup.php:299
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:271
+#: setup.php:300
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:276
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:277
+#: setup.php:306
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:548 setup.php:580
+#: setup.php:579 setup.php:611
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:644
+#: setup.php:631
+#, php-format
+msgid "MS SQL username and/or password not valid: %s"
+msgstr ""
+
+#: setup.php:849
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:645
+#: setup.php:850
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
@@ -234,16 +239,16 @@ msgstr "Läscht Joer"
 msgid "years ago"
 msgstr "Joren hier"
 
-#: updater.php:75
+#: updater.php:78
 #, php-format
 msgid "%s is available. Get <a href=\"%s\">more information</a>"
 msgstr ""
 
-#: updater.php:77
+#: updater.php:81
 msgid "up to date"
 msgstr ""
 
-#: updater.php:80
+#: updater.php:84
 msgid "updates check is disabled"
 msgstr ""
 
diff --git a/l10n/lb/settings.po b/l10n/lb/settings.po
index 36096bf64bfda563446645a3ed3022881613e7a6..31ccb692123b2b312b966523c8d17501f2fa4d3d 100644
--- a/l10n/lb/settings.po
+++ b/l10n/lb/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 23:05+0000\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: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -22,8 +22,8 @@ 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:15
-#: ajax/togglegroups.php:18
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr "Authentifikatioun's Fehler"
 
@@ -71,12 +71,12 @@ msgstr "Ongülteg Requête"
 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 ""
@@ -117,7 +117,7 @@ msgstr "Fehler"
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:96
+#: js/personal.js:99
 msgid "Saving..."
 msgstr "Speicheren..."
 
@@ -146,23 +146,23 @@ msgstr "Gruppen Admin"
 msgid "Delete"
 msgstr "Läschen"
 
-#: js/users.js:190
+#: js/users.js:191
 msgid "add group"
 msgstr ""
 
-#: js/users.js:351
+#: js/users.js:352
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:357
+#: js/users.js:358
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -208,19 +208,19 @@ msgstr ""
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:61
+#: templates/admin.php:63
+#, php-format
 msgid ""
-"This ownCloud server can't set system locale to "
-"\"en_US.UTF-8\"/\"en_US.UTF8\". 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 en_US.UTF-8/en_US.UTF8."
+"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:72
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:75
+#: 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 "
@@ -230,98 +230,98 @@ msgid ""
 " of ownCloud."
 msgstr ""
 
-#: templates/admin.php:89
+#: templates/admin.php:92
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:98
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:108
+#: 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:118
+#: 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:125
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:131
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:132
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:140
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:147
+#: templates/admin.php:150
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:148
+#: templates/admin.php:151
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:155
+#: templates/admin.php:158
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:161
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:165
+#: templates/admin.php:168
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:181
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:179
+#: templates/admin.php:182
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:182
+#: templates/admin.php:185
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr ""
 
-#: templates/admin.php:192
+#: templates/admin.php:195
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:193
+#: templates/admin.php:196
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:220
+#: templates/admin.php:223
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:227 templates/personal.php:98
+#: templates/admin.php:230 templates/personal.php:102
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:230 templates/personal.php:100
+#: templates/admin.php:233 templates/personal.php:105
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -331,51 +331,51 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr ""
 
-#: templates/apps.php:10
+#: templates/apps.php:11
 msgid "Add your App"
 msgstr "Setz deng App bei"
 
-#: templates/apps.php:11
+#: templates/apps.php:12
 msgid "More Apps"
 msgstr ""
 
-#: templates/apps.php:24
+#: templates/apps.php:28
 msgid "Select an App"
 msgstr "Wiel eng Applikatioun aus"
 
-#: templates/apps.php:28
+#: templates/apps.php:34
 msgid "See application page at apps.owncloud.com"
 msgstr "Kuck dir d'Applicatioun's Säit op apps.owncloud.com un"
 
-#: templates/apps.php:29
+#: templates/apps.php:36
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
-#: templates/apps.php:31
+#: templates/apps.php:38
 msgid "Update"
 msgstr ""
 
-#: templates/help.php:3
+#: 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 ""
 
@@ -384,79 +384,79 @@ msgstr ""
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:14
+#: templates/personal.php:15
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:25
+#: templates/personal.php:26
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:36 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
 msgid "Password"
 msgstr "Passwuert"
 
-#: templates/personal.php:37
+#: templates/personal.php:38
 msgid "Your password was changed"
 msgstr ""
 
-#: templates/personal.php:38
+#: templates/personal.php:39
 msgid "Unable to change your password"
 msgstr "Konnt däin Passwuert net änneren"
 
-#: templates/personal.php:39
+#: templates/personal.php:40
 msgid "Current password"
 msgstr "Momentan 't Passwuert"
 
-#: templates/personal.php:40
+#: templates/personal.php:42
 msgid "New password"
 msgstr "Neit Passwuert"
 
-#: templates/personal.php:42
+#: templates/personal.php:44
 msgid "Change password"
 msgstr "Passwuert änneren"
 
-#: templates/personal.php:54 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:78
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:55
+#: templates/personal.php:57
 msgid "Your display name was changed"
 msgstr ""
 
-#: templates/personal.php:56
+#: templates/personal.php:58
 msgid "Unable to change your display name"
 msgstr ""
 
-#: templates/personal.php:59
+#: templates/personal.php:61
 msgid "Change display name"
 msgstr ""
 
-#: templates/personal.php:68
+#: templates/personal.php:70
 msgid "Email"
 msgstr "Email"
 
-#: templates/personal.php:69
+#: templates/personal.php:72
 msgid "Your email address"
 msgstr "Deng Email Adress"
 
-#: templates/personal.php:70
+#: templates/personal.php:73
 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:76 templates/personal.php:77
+#: templates/personal.php:79 templates/personal.php:80
 msgid "Language"
 msgstr "Sprooch"
 
-#: templates/personal.php:82
+#: templates/personal.php:86
 msgid "Help translate"
 msgstr "Hëllef iwwersetzen"
 
-#: templates/personal.php:87
+#: templates/personal.php:91
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:89
+#: templates/personal.php:93
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
diff --git a/l10n/lb/user_ldap.po b/l10n/lb/user_ldap.po
index dae69e9634d27903c5bd5d21758e18a664171c0b..8e3b5b7e3124018ab5a2512710687c1401e596b4 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-02-08 00:10+0100\n"
-"PO-Revision-Date: 2013-02-07 23:11+0000\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: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -21,17 +21,17 @@ msgstr ""
 msgid "Failed to delete the server configuration"
 msgstr ""
 
-#: ajax/testConfiguration.php:35
+#: ajax/testConfiguration.php:36
 msgid "The configuration is valid and the connection could be established!"
 msgstr ""
 
-#: ajax/testConfiguration.php:37
+#: ajax/testConfiguration.php:39
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
 msgstr ""
 
-#: ajax/testConfiguration.php:40
+#: ajax/testConfiguration.php:43
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
@@ -86,224 +86,248 @@ msgstr ""
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:17
+#: templates/settings.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:23
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:25
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:26
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:27
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:28
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:32
 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:24
+#: templates/settings.php:33
 msgid "Password"
 msgstr "Passwuert"
 
-#: templates/settings.php:24
+#: templates/settings.php:36
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:37
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:40
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:41
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:42
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:45
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:46
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:47
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:50
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:51
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:55
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:34
+#: templates/settings.php:58
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:60
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:39
+#: templates/settings.php:63
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:65
+msgid "Cache Time-To-Live"
+msgstr ""
+
+#: templates/settings.php:65
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:67
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:47
+#: templates/settings.php:71
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:47 templates/settings.php:50
+#: templates/settings.php:71 templates/settings.php:74
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:74
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:75
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:77
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:79
+msgid "Quota Field"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Quota Default"
+msgstr ""
+
+#: templates/settings.php:80
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:81
+msgid "Email Field"
+msgstr ""
+
+#: templates/settings.php:82
+msgid "User Home Folder Naming Rule"
+msgstr ""
+
+#: templates/settings.php:82
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:62
+#: templates/settings.php:86
+msgid "Test Configuration"
+msgstr ""
+
+#: templates/settings.php:86
 msgid "Help"
 msgstr "Hëllef"
diff --git a/l10n/lt_LT/core.po b/l10n/lt_LT/core.po
index 32243706c274a311a757637d26289e902aae2865..50c0876c7f7d57bafcc8aa79a832489fded654b4 100644
--- a/l10n/lt_LT/core.po
+++ b/l10n/lt_LT/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 14:32+0000\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"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -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 "ownCloud slaptažodžio atkūrimas"
 
diff --git a/l10n/lt_LT/files.po b/l10n/lt_LT/files.po
index 0f4c408d50865786423076db837efef79255a948..7336f6ef67437b9ca8be2760e5aa3f726143d251 100644
--- a/l10n/lt_LT/files.po
+++ b/l10n/lt_LT/files.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\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: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -53,27 +53,27 @@ msgid ""
 "the HTML form"
 msgstr "Įkeliamo failo dydis viršija MAX_FILE_SIZE parametrą, kuris yra nustatytas HTML formoje"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
 msgstr "Failas buvo įkeltas tik dalinai"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:31
 msgid "No file was uploaded"
 msgstr "Nebuvo įkeltas nė vienas failas"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:32
 msgid "Missing a temporary folder"
 msgstr "Nėra laikinojo katalogo"
 
-#: ajax/upload.php:34
+#: ajax/upload.php:33
 msgid "Failed to write to disk"
 msgstr "Nepavyko įrašyti į diską"
 
-#: ajax/upload.php:52
+#: ajax/upload.php:51
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:83
+#: ajax/upload.php:82
 msgid "Invalid directory."
 msgstr ""
 
@@ -85,7 +85,7 @@ msgstr "Failai"
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:127 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:127 templates/index.php:92 templates/index.php:93
 msgid "Delete"
 msgstr "Ištrinti"
 
@@ -93,40 +93,36 @@ msgstr "Ištrinti"
 msgid "Rename"
 msgstr "Pervadinti"
 
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
 msgid "Pending"
 msgstr "Laukiantis"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "{new_name} already exists"
 msgstr "{new_name} jau egzistuoja"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "replace"
 msgstr "pakeisti"
 
-#: js/filelist.js:253
+#: js/filelist.js:251
 msgid "suggest name"
 msgstr "pasiūlyti pavadinimą"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "cancel"
 msgstr "atšaukti"
 
-#: js/filelist.js:295
-msgid "replaced {new_name}"
-msgstr "pakeiskite {new_name}"
+#: js/filelist.js:298
+msgid "replaced {new_name} with {old_name}"
+msgstr "pakeiskite {new_name} į {old_name}"
 
-#: js/filelist.js:295 js/filelist.js:297
+#: js/filelist.js:298
 msgid "undo"
 msgstr "anuliuoti"
 
-#: js/filelist.js:297
-msgid "replaced {new_name} with {old_name}"
-msgstr "pakeiskite {new_name} į {old_name}"
-
-#: js/filelist.js:322
+#: js/filelist.js:323
 msgid "perform delete operation"
 msgstr ""
 
@@ -152,74 +148,74 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:224
+#: js/files.js:225
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:261
+#: js/files.js:262
 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:261
+#: js/files.js:262
 msgid "Upload Error"
 msgstr "Įkėlimo klaida"
 
-#: js/files.js:272
+#: js/files.js:273
 msgid "Close"
 msgstr "Užverti"
 
-#: js/files.js:311
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr "įkeliamas 1 failas"
 
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr "{count}  įkeliami failai"
 
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "Įkėlimas atšauktas."
 
-#: js/files.js:496
+#: js/files.js:497
 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:569
+#: js/files.js:570
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:574
+#: js/files.js:575
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:953 templates/index.php:68
 msgid "Name"
 msgstr "Pavadinimas"
 
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:954 templates/index.php:79
 msgid "Size"
 msgstr "Dydis"
 
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:955 templates/index.php:81
 msgid "Modified"
 msgstr "Pakeista"
 
-#: js/files.js:969
+#: js/files.js:974
 msgid "1 folder"
 msgstr "1 aplankalas"
 
-#: js/files.js:971
+#: js/files.js:976
 msgid "{count} folders"
 msgstr "{count} aplankalai"
 
-#: js/files.js:979
+#: js/files.js:984
 msgid "1 file"
 msgstr "1 failas"
 
-#: js/files.js:981
+#: js/files.js:986
 msgid "{count} files"
 msgstr "{count} failai"
 
@@ -283,33 +279,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr "Atšaukti siuntimą"
 
-#: templates/index.php:59
+#: templates/index.php:53
+msgid "You don’t have write permissions here."
+msgstr ""
+
+#: templates/index.php:60
 msgid "Nothing in here. Upload something!"
 msgstr "Čia tuščia. Įkelkite ką nors!"
 
-#: templates/index.php:73
+#: templates/index.php:74
 msgid "Download"
 msgstr "Atsisiųsti"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:86 templates/index.php:87
 msgid "Unshare"
 msgstr "Nebesidalinti"
 
-#: templates/index.php:105
+#: templates/index.php:106
 msgid "Upload too large"
 msgstr "Įkėlimui failas per didelis"
 
-#: templates/index.php:107
+#: templates/index.php:108
 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"
 
-#: templates/index.php:112
+#: templates/index.php:113
 msgid "Files are being scanned, please wait."
 msgstr "Skenuojami failai, prašome palaukti."
 
-#: templates/index.php:115
+#: templates/index.php:116
 msgid "Current scanning"
 msgstr "Šiuo metu skenuojama"
 
diff --git a/l10n/lt_LT/files_external.po b/l10n/lt_LT/files_external.po
index 6e6e944d5afd49cc2be12d039093f44635a62f79..c31537d0139f85cdf54b72541d28ae71796a6928 100644
--- a/l10n/lt_LT/files_external.po
+++ b/l10n/lt_LT/files_external.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-11 23:22+0000\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"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -19,37 +19,33 @@ 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"
 
-#: 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 "Priėjimas suteiktas"
 
-#: 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 "Klaida nustatinėjant Dropbox talpyklą"
 
-#: 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 "Suteikti priėjimą"
 
-#: js/dropbox.js:73 js/google.js:72
-msgid "Fill out all required fields"
-msgstr "Užpildykite visus reikalingus laukelius"
-
-#: js/dropbox.js:85
+#: js/dropbox.js:101
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr "Prašome įvesti teisingus Dropbox \"app key\" ir \"secret\"."
 
-#: 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 "Klaida nustatinėjant Google Drive talpyklą"
 
-#: lib/config.php:434
+#: lib/config.php:421
 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:424
 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 "
@@ -60,63 +56,63 @@ msgstr ""
 msgid "External Storage"
 msgstr "Išorinės saugyklos"
 
-#: templates/settings.php:8 templates/settings.php:22
-msgid "Mount point"
-msgstr "Saugyklos pavadinimas"
-
-#: templates/settings.php:9
-msgid "Backend"
-msgstr "Posistemės pavadinimas"
+#: templates/settings.php:9 templates/settings.php:28
+msgid "Folder name"
+msgstr "Katalogo pavadinimas"
 
 #: templates/settings.php:10
+msgid "External storage"
+msgstr ""
+
+#: templates/settings.php:11
 msgid "Configuration"
 msgstr "Konfigūracija"
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid "Options"
 msgstr "Nustatymai"
 
-#: templates/settings.php:12
+#: templates/settings.php:13
 msgid "Applicable"
 msgstr "Pritaikyti"
 
-#: templates/settings.php:27
-msgid "Add mount point"
-msgstr "Pridėti išorinę saugyklą"
+#: templates/settings.php:33
+msgid "Add storage"
+msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:90
 msgid "None set"
 msgstr "Nieko nepasirinkta"
 
-#: templates/settings.php:86
+#: templates/settings.php:91
 msgid "All Users"
 msgstr "Visi vartotojai"
 
-#: templates/settings.php:87
+#: templates/settings.php:92
 msgid "Groups"
 msgstr "Grupės"
 
-#: templates/settings.php:95
+#: templates/settings.php:100
 msgid "Users"
 msgstr "Vartotojai"
 
-#: 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 "Ištrinti"
 
-#: templates/settings.php:124
+#: templates/settings.php:129
 msgid "Enable User External Storage"
 msgstr "Įjungti vartotojų išorines saugyklas"
 
-#: templates/settings.php:125
+#: templates/settings.php:130
 msgid "Allow users to mount their own external storage"
 msgstr "Leisti vartotojams pridėti savo išorines saugyklas"
 
-#: templates/settings.php:139
+#: templates/settings.php:141
 msgid "SSL root certificates"
 msgstr "SSL sertifikatas"
 
-#: templates/settings.php:158
+#: templates/settings.php:159
 msgid "Import Root Certificate"
 msgstr "Įkelti pagrindinį sertifikatą"
diff --git a/l10n/lt_LT/files_trashbin.po b/l10n/lt_LT/files_trashbin.po
index 928d63096ca1688684654e5dd32996eb5c543b5a..de4d898a2c69cc64bc48c8d5bc26828e6e71c77c 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-02-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 10:07+0000\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: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@ 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:22
+#: ajax/delete.php:40
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
@@ -27,35 +27,39 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:33
+#: js/trash.js:34
 msgid "delete file permanently"
 msgstr ""
 
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr ""
+
+#: js/trash.js:174 templates/index.php:17
 msgid "Name"
 msgstr "Pavadinimas"
 
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:175 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:135
+#: js/trash.js:184
 msgid "1 folder"
 msgstr "1 aplankalas"
 
-#: js/trash.js:137
+#: js/trash.js:186
 msgid "{count} folders"
 msgstr "{count} aplankalai"
 
-#: js/trash.js:145
+#: js/trash.js:194
 msgid "1 file"
 msgstr "1 failas"
 
-#: js/trash.js:147
+#: js/trash.js:196
 msgid "{count} files"
 msgstr "{count} failai"
 
@@ -66,3 +70,11 @@ msgstr ""
 #: templates/index.php:20 templates/index.php:22
 msgid "Restore"
 msgstr ""
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr "Ištrinti"
+
+#: templates/part.breadcrumb.php:9
+msgid "Deleted Files"
+msgstr ""
diff --git a/l10n/lt_LT/files_versions.po b/l10n/lt_LT/files_versions.po
index 42087e7e323cd27d948e99443f08876777d0e2a3..8ad43f0ec2441730f0a8e5aafdbe461784f4386e 100644
--- a/l10n/lt_LT/files_versions.po
+++ b/l10n/lt_LT/files_versions.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-08 00:10+0100\n"
-"PO-Revision-Date: 2013-02-07 23:11+0000\n"
+"POT-Creation-Date: 2013-02-28 00:04+0100\n"
+"PO-Revision-Date: 2013-02-27 23:04+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -50,18 +50,10 @@ msgstr ""
 msgid "No path specified"
 msgstr ""
 
-#: js/versions.js:16
-msgid "History"
-msgstr "Istorija"
+#: 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 ""
-
-#: templates/settings.php:3
-msgid "Files Versioning"
-msgstr "Failų versijos"
-
-#: templates/settings.php:4
-msgid "Enable"
-msgstr "Įjungti"
diff --git a/l10n/lt_LT/lib.po b/l10n/lt_LT/lib.po
index f27b3d7a45dc8d257e9ab55a655b9c8eaf073604..ef437a287d4bd0fabf501c2c31a0e9fe9ea1f610 100644
--- a/l10n/lt_LT/lib.po
+++ b/l10n/lt_LT/lib.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-11 15:39+0100\n"
-"PO-Revision-Date: 2013-02-11 14:40+0000\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: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -19,27 +19,27 @@ msgstr ""
 "Language: lt_LT\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: app.php:339
+#: app.php:349
 msgid "Help"
 msgstr "Pagalba"
 
-#: app.php:346
+#: app.php:362
 msgid "Personal"
 msgstr "Asmeniniai"
 
-#: app.php:351
+#: app.php:373
 msgid "Settings"
 msgstr "Nustatymai"
 
-#: app.php:356
+#: app.php:385
 msgid "Users"
 msgstr "Vartotojai"
 
-#: app.php:363
+#: app.php:398
 msgid "Apps"
 msgstr "Programos"
 
-#: app.php:365
+#: app.php:406
 msgid "Admin"
 msgstr "Administravimas"
 
@@ -51,15 +51,15 @@ msgstr "ZIP atsisiuntimo galimybė yra išjungta."
 msgid "Files need to be downloaded one by one."
 msgstr "Failai turi būti parsiunčiami vienas po kito."
 
-#: files.php:203 files.php:228
+#: files.php:204 files.php:231
 msgid "Back to Files"
 msgstr "Atgal į Failus"
 
-#: files.php:227
+#: files.php:228
 msgid "Selected files too large to generate zip file."
 msgstr "Pasirinkti failai per dideli archyvavimui į ZIP."
 
-#: helper.php:226
+#: helper.php:228
 msgid "couldn't be determined"
 msgstr ""
 
@@ -99,87 +99,92 @@ msgstr ""
 msgid "Specify a data folder."
 msgstr ""
 
-#: setup.php:53
+#: setup.php:55
 #, php-format
 msgid "%s enter the database username."
 msgstr ""
 
-#: setup.php:56
+#: setup.php:58
 #, php-format
 msgid "%s enter the database name."
 msgstr ""
 
-#: setup.php:59
+#: setup.php:61
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr ""
 
-#: setup.php:62
+#: setup.php:64
 #, php-format
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:126 setup.php:291 setup.php:336
+#: setup.php:128 setup.php:320 setup.php:365
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:127 setup.php:150 setup.php:204
+#: setup.php:129 setup.php:152 setup.php:229
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:149 setup.php:423 setup.php:489
+#: setup.php:151 setup.php:453 setup.php:520
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:203
+#: setup.php:228
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:255 setup.php:357 setup.php:366 setup.php:384 setup.php:394
-#: setup.php:403 setup.php:430 setup.php:496 setup.php:522 setup.php:529
-#: setup.php:540 setup.php:547 setup.php:556 setup.php:564 setup.php:573
-#: setup.php:579
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:256 setup.php:358 setup.php:367 setup.php:385 setup.php:395
-#: setup.php:404 setup.php:431 setup.php:497 setup.php:523 setup.php:530
-#: setup.php:541 setup.php:557 setup.php:565 setup.php:574
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:270
+#: setup.php:299
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:271
+#: setup.php:300
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:276
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:277
+#: setup.php:306
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:548 setup.php:580
+#: setup.php:579 setup.php:611
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:644
+#: setup.php:631
+#, php-format
+msgid "MS SQL username and/or password not valid: %s"
+msgstr ""
+
+#: setup.php:849
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:645
+#: setup.php:850
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
@@ -236,16 +241,16 @@ msgstr "pereitais metais"
 msgid "years ago"
 msgstr "prieš metus"
 
-#: updater.php:75
+#: 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:77
+#: updater.php:81
 msgid "up to date"
 msgstr "pilnai atnaujinta"
 
-#: updater.php:80
+#: updater.php:84
 msgid "updates check is disabled"
 msgstr "atnaujinimų tikrinimas išjungtas"
 
diff --git a/l10n/lt_LT/settings.po b/l10n/lt_LT/settings.po
index 9eacd04fb643216f66ee54d151d5f6a6d5c211b8..f6bfa41c0813f72f557e99a499c5bb36c96bd8cc 100644
--- a/l10n/lt_LT/settings.po
+++ b/l10n/lt_LT/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 23:05+0000\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: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -23,8 +23,8 @@ 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:15
-#: ajax/togglegroups.php:18
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr "Autentikacijos klaida"
 
@@ -72,12 +72,12 @@ msgstr "Klaidinga užklausa"
 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 ""
@@ -118,7 +118,7 @@ msgstr "Klaida"
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:96
+#: js/personal.js:99
 msgid "Saving..."
 msgstr "Saugoma.."
 
@@ -147,23 +147,23 @@ msgstr ""
 msgid "Delete"
 msgstr "Ištrinti"
 
-#: js/users.js:190
+#: js/users.js:191
 msgid "add group"
 msgstr ""
 
-#: js/users.js:351
+#: js/users.js:352
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:357
+#: js/users.js:358
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
 msgid "__language_name__"
 msgstr "Kalba"
 
@@ -209,19 +209,19 @@ msgstr ""
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:61
+#: templates/admin.php:63
+#, php-format
 msgid ""
-"This ownCloud server can't set system locale to "
-"\"en_US.UTF-8\"/\"en_US.UTF8\". 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 en_US.UTF-8/en_US.UTF8."
+"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:72
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:75
+#: 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 "
@@ -231,98 +231,98 @@ msgid ""
 " of ownCloud."
 msgstr ""
 
-#: templates/admin.php:89
+#: templates/admin.php:92
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:98
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:108
+#: 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:118
+#: 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:125
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:131
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:132
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:140
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:147
+#: templates/admin.php:150
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:148
+#: templates/admin.php:151
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:155
+#: templates/admin.php:158
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:161
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:165
+#: templates/admin.php:168
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:181
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:179
+#: templates/admin.php:182
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:182
+#: templates/admin.php:185
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr ""
 
-#: templates/admin.php:192
+#: templates/admin.php:195
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:193
+#: templates/admin.php:196
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:220
+#: templates/admin.php:223
 msgid "More"
 msgstr "Daugiau"
 
-#: templates/admin.php:227 templates/personal.php:98
+#: templates/admin.php:230 templates/personal.php:102
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:230 templates/personal.php:100
+#: templates/admin.php:233 templates/personal.php:105
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -332,51 +332,51 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr ""
 
-#: templates/apps.php:10
+#: templates/apps.php:11
 msgid "Add your App"
 msgstr "Pridėti programėlę"
 
-#: templates/apps.php:11
+#: templates/apps.php:12
 msgid "More Apps"
 msgstr "Daugiau aplikacijų"
 
-#: templates/apps.php:24
+#: templates/apps.php:28
 msgid "Select an App"
 msgstr "Pasirinkite programą"
 
-#: templates/apps.php:28
+#: templates/apps.php:34
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:29
+#: templates/apps.php:36
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>- autorius<span class=\"author\"></span>"
 
-#: templates/apps.php:31
+#: templates/apps.php:38
 msgid "Update"
 msgstr "Atnaujinti"
 
-#: templates/help.php:3
+#: 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 ""
 
@@ -385,79 +385,79 @@ msgstr ""
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:14
+#: templates/personal.php:15
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:25
+#: templates/personal.php:26
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:36 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
 msgid "Password"
 msgstr "Slaptažodis"
 
-#: templates/personal.php:37
+#: templates/personal.php:38
 msgid "Your password was changed"
 msgstr "Jūsų slaptažodis buvo pakeistas"
 
-#: templates/personal.php:38
+#: templates/personal.php:39
 msgid "Unable to change your password"
 msgstr "Neįmanoma pakeisti slaptažodžio"
 
-#: templates/personal.php:39
+#: templates/personal.php:40
 msgid "Current password"
 msgstr "Dabartinis slaptažodis"
 
-#: templates/personal.php:40
+#: templates/personal.php:42
 msgid "New password"
 msgstr "Naujas slaptažodis"
 
-#: templates/personal.php:42
+#: templates/personal.php:44
 msgid "Change password"
 msgstr "Pakeisti slaptažodį"
 
-#: templates/personal.php:54 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:78
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:55
+#: templates/personal.php:57
 msgid "Your display name was changed"
 msgstr ""
 
-#: templates/personal.php:56
+#: templates/personal.php:58
 msgid "Unable to change your display name"
 msgstr ""
 
-#: templates/personal.php:59
+#: templates/personal.php:61
 msgid "Change display name"
 msgstr ""
 
-#: templates/personal.php:68
+#: templates/personal.php:70
 msgid "Email"
 msgstr "El. paštas"
 
-#: templates/personal.php:69
+#: templates/personal.php:72
 msgid "Your email address"
 msgstr "Jūsų el. pašto adresas"
 
-#: templates/personal.php:70
+#: templates/personal.php:73
 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:76 templates/personal.php:77
+#: templates/personal.php:79 templates/personal.php:80
 msgid "Language"
 msgstr "Kalba"
 
-#: templates/personal.php:82
+#: templates/personal.php:86
 msgid "Help translate"
 msgstr "Padėkite išversti"
 
-#: templates/personal.php:87
+#: templates/personal.php:91
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:89
+#: templates/personal.php:93
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
diff --git a/l10n/lt_LT/user_ldap.po b/l10n/lt_LT/user_ldap.po
index a0eca3ff0fc86a28e15cfe1981edea365e3f9388..28684ff33e67f4a648a304edad45d4bac24105a9 100644
--- a/l10n/lt_LT/user_ldap.po
+++ b/l10n/lt_LT/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-08 00:10+0100\n"
-"PO-Revision-Date: 2013-02-07 23:11+0000\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: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -22,17 +22,17 @@ msgstr ""
 msgid "Failed to delete the server configuration"
 msgstr ""
 
-#: ajax/testConfiguration.php:35
+#: ajax/testConfiguration.php:36
 msgid "The configuration is valid and the connection could be established!"
 msgstr ""
 
-#: ajax/testConfiguration.php:37
+#: ajax/testConfiguration.php:39
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
 msgstr ""
 
-#: ajax/testConfiguration.php:40
+#: ajax/testConfiguration.php:43
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
@@ -87,224 +87,248 @@ msgstr ""
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:17
+#: templates/settings.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:23
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:25
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:26
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:27
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:28
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:32
 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:24
+#: templates/settings.php:33
 msgid "Password"
 msgstr "Slaptažodis"
 
-#: templates/settings.php:24
+#: templates/settings.php:36
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:37
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:40
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:41
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:42
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:45
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:46
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:47
 msgid "Group Filter"
 msgstr "Grupės filtras"
 
-#: templates/settings.php:27
+#: templates/settings.php:50
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:51
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:55
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:34
+#: templates/settings.php:58
 msgid "Port"
 msgstr "Prievadas"
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:60
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Use TLS"
 msgstr "Naudoti TLS"
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:39
+#: templates/settings.php:63
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid "Turn off SSL certificate validation."
 msgstr "Išjungti SSL sertifikato tikrinimą."
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid "Not recommended, use for testing only."
 msgstr "Nerekomenduojama, naudokite tik testavimui."
 
-#: templates/settings.php:41
+#: templates/settings.php:65
+msgid "Cache Time-To-Live"
+msgstr ""
+
+#: templates/settings.php:65
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:67
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:47
+#: templates/settings.php:71
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:47 templates/settings.php:50
+#: templates/settings.php:71 templates/settings.php:74
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:74
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:75
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:77
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:79
+msgid "Quota Field"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Quota Default"
+msgstr ""
+
+#: templates/settings.php:80
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:81
+msgid "Email Field"
+msgstr ""
+
+#: templates/settings.php:82
+msgid "User Home Folder Naming Rule"
+msgstr ""
+
+#: templates/settings.php:82
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:62
+#: templates/settings.php:86
+msgid "Test Configuration"
+msgstr ""
+
+#: templates/settings.php:86
 msgid "Help"
 msgstr "Pagalba"
diff --git a/l10n/lv/core.po b/l10n/lv/core.po
index 868fa31a2bbb39e212faec3433a229ebb4ffcd01..55f705bdd4778b2add527f083b1f7b3651d76724 100644
--- a/l10n/lv/core.po
+++ b/l10n/lv/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 14:32+0000\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"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -388,7 +388,7 @@ msgstr "Atjaunināšana beidzās nesekmīgi. Lūdzu, ziņojiet par šo problēmu
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Atjaunināšana beidzās sekmīgi. Tagad pārsūta jūs uz ownCloud."
 
-#: lostpassword/controller.php:47
+#: lostpassword/controller.php:48
 msgid "ownCloud password reset"
 msgstr "ownCloud paroles maiņa"
 
diff --git a/l10n/lv/files.po b/l10n/lv/files.po
index e17afcc1853adb5efed2349b7b5a7edf8e76ca6e..afbd5a9846334cc8132ce23f7e9a6543661e940b 100644
--- a/l10n/lv/files.po
+++ b/l10n/lv/files.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-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "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"
@@ -53,27 +53,27 @@ msgid ""
 "the HTML form"
 msgstr "Augšupielādētā datne pārsniedz MAX_FILE_SIZE norādi, kas ir norādīta HTML formā"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
 msgstr "Augšupielādētā datne ir tikai daļēji augšupielādēta"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:31
 msgid "No file was uploaded"
 msgstr "Neviena datne netika augšupielādēta"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:32
 msgid "Missing a temporary folder"
 msgstr "Trūkst pagaidu mapes"
 
-#: ajax/upload.php:34
+#: ajax/upload.php:33
 msgid "Failed to write to disk"
 msgstr "Neizdevās saglabāt diskā"
 
-#: ajax/upload.php:52
+#: ajax/upload.php:51
 msgid "Not enough storage available"
 msgstr "Nav pietiekami daudz vietas"
 
-#: ajax/upload.php:83
+#: ajax/upload.php:82
 msgid "Invalid directory."
 msgstr "Nederīga direktorija."
 
@@ -85,7 +85,7 @@ msgstr "Datnes"
 msgid "Delete permanently"
 msgstr "Dzēst pavisam"
 
-#: js/fileactions.js:127 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:127 templates/index.php:92 templates/index.php:93
 msgid "Delete"
 msgstr "Dzēst"
 
@@ -93,40 +93,36 @@ msgstr "Dzēst"
 msgid "Rename"
 msgstr "Pārsaukt"
 
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
 msgid "Pending"
 msgstr "Gaida savu kārtu"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "{new_name} already exists"
 msgstr "{new_name} jau eksistē"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "replace"
 msgstr "aizvietot"
 
-#: js/filelist.js:253
+#: js/filelist.js:251
 msgid "suggest name"
 msgstr "ieteiktais nosaukums"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "cancel"
 msgstr "atcelt"
 
-#: js/filelist.js:295
-msgid "replaced {new_name}"
-msgstr "aizvietots {new_name}"
+#: js/filelist.js:298
+msgid "replaced {new_name} with {old_name}"
+msgstr "aizvietoja {new_name} ar {old_name}"
 
-#: js/filelist.js:295 js/filelist.js:297
+#: js/filelist.js:298
 msgid "undo"
 msgstr "atsaukt"
 
-#: js/filelist.js:297
-msgid "replaced {new_name} with {old_name}"
-msgstr "aizvietoja {new_name} ar {old_name}"
-
-#: js/filelist.js:322
+#: js/filelist.js:323
 msgid "perform delete operation"
 msgstr "veikt dzēšanas darbību"
 
@@ -152,74 +148,74 @@ 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:224
+#: js/files.js:225
 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:261
+#: js/files.js:262
 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:261
+#: js/files.js:262
 msgid "Upload Error"
 msgstr "Kļūda augšupielādējot"
 
-#: js/files.js:272
+#: js/files.js:273
 msgid "Close"
 msgstr "Aizvērt"
 
-#: js/files.js:311
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr "Augšupielādē 1 datni"
 
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: 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:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "Augšupielāde ir atcelta."
 
-#: js/files.js:496
+#: js/files.js:497
 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:569
+#: js/files.js:570
 msgid "URL cannot be empty."
 msgstr "URL nevar būt tukšs."
 
-#: js/files.js:574
+#: js/files.js:575
 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:948 templates/index.php:67
+#: js/files.js:953 templates/index.php:68
 msgid "Name"
 msgstr "Nosaukums"
 
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:954 templates/index.php:79
 msgid "Size"
 msgstr "Izmērs"
 
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:955 templates/index.php:81
 msgid "Modified"
 msgstr "Mainīts"
 
-#: js/files.js:969
+#: js/files.js:974
 msgid "1 folder"
 msgstr "1 mape"
 
-#: js/files.js:971
+#: js/files.js:976
 msgid "{count} folders"
 msgstr "{count} mapes"
 
-#: js/files.js:979
+#: js/files.js:984
 msgid "1 file"
 msgstr "1 datne"
 
-#: js/files.js:981
+#: js/files.js:986
 msgid "{count} files"
 msgstr "{count} datnes"
 
@@ -277,39 +273,43 @@ msgstr "No saites"
 
 #: templates/index.php:40
 msgid "Deleted files"
-msgstr ""
+msgstr "Dzēstās datnes"
 
 #: templates/index.php:46
 msgid "Cancel upload"
 msgstr "Atcelt augšupielādi"
 
-#: templates/index.php:59
+#: templates/index.php:53
+msgid "You don’t have write permissions here."
+msgstr "Jums nav tiesību šeit rakstīt."
+
+#: templates/index.php:60
 msgid "Nothing in here. Upload something!"
 msgstr "Te vēl nekas nav. Rīkojies, sāc augšupielādēt!"
 
-#: templates/index.php:73
+#: templates/index.php:74
 msgid "Download"
 msgstr "Lejupielādēt"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:86 templates/index.php:87
 msgid "Unshare"
 msgstr "Pārtraukt dalīšanos"
 
-#: templates/index.php:105
+#: templates/index.php:106
 msgid "Upload too large"
 msgstr "Datne ir par lielu, lai to augšupielādētu"
 
-#: templates/index.php:107
+#: templates/index.php:108
 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:112
+#: templates/index.php:113
 msgid "Files are being scanned, please wait."
 msgstr "Datnes šobrīd tiek caurskatītas, lūdzu, uzgaidiet."
 
-#: templates/index.php:115
+#: templates/index.php:116
 msgid "Current scanning"
 msgstr "Šobrīd tiek caurskatīts"
 
diff --git a/l10n/lv/files_external.po b/l10n/lv/files_external.po
index c4fdcae07443fcbc69c6b632d188c57dce7c7eb4..d701675703ae6ed13fe76dc6dcaf3192be172fde 100644
--- a/l10n/lv/files_external.po
+++ b/l10n/lv/files_external.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-05 00:19+0100\n"
-"PO-Revision-Date: 2013-02-04 18:30+0000\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"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -18,37 +18,33 @@ msgstr ""
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\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 "Piešķirta pieeja"
 
-#: 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 "Kļūda, konfigurējot Dropbox krātuvi"
 
-#: 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 "Piešķirt pieeju"
 
-#: js/dropbox.js:73 js/google.js:72
-msgid "Fill out all required fields"
-msgstr "Aizpildīt visus pieprasītos laukus"
-
-#: js/dropbox.js:85
+#: js/dropbox.js:101
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr "Lūdzu, norādiet derīgu Dropbox lietotnes atslēgu un noslēpumu."
 
-#: 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 "Kļūda, konfigurējot Google Drive krātuvi"
 
-#: lib/config.php:405
+#: lib/config.php:421
 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:406
+#: lib/config.php:424
 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 "
@@ -59,63 +55,63 @@ msgstr "<b>Brīdinājums: </b> uz PHP nav aktivēts vai instalēts FTP atbalsts.
 msgid "External Storage"
 msgstr "Ārējā krātuve"
 
-#: templates/settings.php:8 templates/settings.php:22
-msgid "Mount point"
-msgstr "Montēšanas punkts"
-
-#: templates/settings.php:9
-msgid "Backend"
-msgstr "Aizmugure"
+#: templates/settings.php:9 templates/settings.php:28
+msgid "Folder name"
+msgstr "Mapes nosaukums"
 
 #: templates/settings.php:10
+msgid "External storage"
+msgstr "Ārējā krātuve"
+
+#: templates/settings.php:11
 msgid "Configuration"
 msgstr "Konfigurācija"
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid "Options"
 msgstr "Opcijas"
 
-#: templates/settings.php:12
+#: templates/settings.php:13
 msgid "Applicable"
 msgstr "Piemērojams"
 
-#: templates/settings.php:27
-msgid "Add mount point"
-msgstr "Pievienot montēšanas punktu"
+#: templates/settings.php:33
+msgid "Add storage"
+msgstr "Pievienot krātuvi"
 
-#: templates/settings.php:85
+#: templates/settings.php:90
 msgid "None set"
 msgstr "Neviens nav iestatīts"
 
-#: templates/settings.php:86
+#: templates/settings.php:91
 msgid "All Users"
 msgstr "Visi lietotāji"
 
-#: templates/settings.php:87
+#: templates/settings.php:92
 msgid "Groups"
 msgstr "Grupas"
 
-#: templates/settings.php:95
+#: templates/settings.php:100
 msgid "Users"
 msgstr "Lietotāji"
 
-#: templates/settings.php:108 templates/settings.php:109
-#: templates/settings.php:144 templates/settings.php:145
+#: templates/settings.php:113 templates/settings.php:114
+#: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
 msgstr "Dzēst"
 
-#: templates/settings.php:124
+#: templates/settings.php:129
 msgid "Enable User External Storage"
 msgstr "Aktivēt lietotāja ārējo krātuvi"
 
-#: templates/settings.php:125
+#: templates/settings.php:130
 msgid "Allow users to mount their own external storage"
 msgstr "Ļaut lietotājiem montēt pašiem savu ārējo krātuvi"
 
-#: templates/settings.php:136
+#: templates/settings.php:141
 msgid "SSL root certificates"
 msgstr "SSL saknes sertifikāti"
 
-#: templates/settings.php:153
+#: templates/settings.php:159
 msgid "Import Root Certificate"
 msgstr "Importēt saknes sertifikātus"
diff --git a/l10n/lv/files_trashbin.po b/l10n/lv/files_trashbin.po
index 71b39e763bcc20a2adeec3576a725313de656d05..14de7d18f6249aa4f1c4c0c006356c7b8be54c51 100644
--- a/l10n/lv/files_trashbin.po
+++ b/l10n/lv/files_trashbin.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-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 10:07+0000\n"
-"Last-Translator: Rūdolfs Mazurs <rudolfs.mazurs@gmail.com>\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: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
-#: ajax/delete.php:22
+#: ajax/delete.php:40
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "Nevarēja pilnībā izdzēst %s"
@@ -28,35 +28,39 @@ msgstr "Nevarēja pilnībā izdzēst %s"
 msgid "Couldn't restore %s"
 msgstr "Nevarēja atjaunot %s"
 
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
 msgid "perform restore operation"
 msgstr "veikt atjaunošanu"
 
-#: js/trash.js:33
+#: js/trash.js:34
 msgid "delete file permanently"
 msgstr "dzēst datni pavisam"
 
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr "Dzēst pavisam"
+
+#: js/trash.js:174 templates/index.php:17
 msgid "Name"
 msgstr "Nosaukums"
 
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:175 templates/index.php:27
 msgid "Deleted"
 msgstr "Dzēsts"
 
-#: js/trash.js:135
+#: js/trash.js:184
 msgid "1 folder"
 msgstr "1 mape"
 
-#: js/trash.js:137
+#: js/trash.js:186
 msgid "{count} folders"
 msgstr "{count} mapes"
 
-#: js/trash.js:145
+#: js/trash.js:194
 msgid "1 file"
 msgstr "1 datne"
 
-#: js/trash.js:147
+#: js/trash.js:196
 msgid "{count} files"
 msgstr "{count} datnes"
 
@@ -67,3 +71,11 @@ msgstr "Šeit nekā nav. Jūsu miskaste ir tukša!"
 #: templates/index.php:20 templates/index.php:22
 msgid "Restore"
 msgstr "Atjaunot"
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr "Dzēst"
+
+#: templates/part.breadcrumb.php:9
+msgid "Deleted Files"
+msgstr ""
diff --git a/l10n/lv/files_versions.po b/l10n/lv/files_versions.po
index 7d9e6940598b477656c5bce1246427c16e39838e..cfbdfa3db8fb28efb46f01c5e7065e4505504e9b 100644
--- a/l10n/lv/files_versions.po
+++ b/l10n/lv/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-09 00:12+0100\n"
-"PO-Revision-Date: 2013-02-08 12:20+0000\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"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -49,18 +49,10 @@ msgstr "Nav pieejamu vecāku versiju"
 msgid "No path specified"
 msgstr "Nav norādīts ceļš"
 
-#: js/versions.js:16
-msgid "History"
-msgstr "Vēsture"
+#: js/versions.js:6
+msgid "Versions"
+msgstr "Versijas"
 
 #: templates/history.php:20
 msgid "Revert a file to a previous version by clicking on its revert button"
 msgstr "Atgriez datni uz iepriekšēju versiju, spiežot uz tās atgriešanas pogu"
-
-#: templates/settings.php:3
-msgid "Files Versioning"
-msgstr "Datņu versiju izskošana"
-
-#: templates/settings.php:4
-msgid "Enable"
-msgstr "Aktivēt"
diff --git a/l10n/lv/lib.po b/l10n/lv/lib.po
index f36cb16af2d1947450464a0d0dedb20593e48790..e84ed8d84ecb926f132427f0f45a9d53c399c920 100644
--- a/l10n/lv/lib.po
+++ b/l10n/lv/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 14:33+0000\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"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -18,27 +18,27 @@ msgstr ""
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
-#: app.php:339
+#: app.php:349
 msgid "Help"
 msgstr "Palīdzība"
 
-#: app.php:346
+#: app.php:362
 msgid "Personal"
 msgstr "Personīgi"
 
-#: app.php:351
+#: app.php:373
 msgid "Settings"
 msgstr "Iestatījumi"
 
-#: app.php:356
+#: app.php:385
 msgid "Users"
 msgstr "Lietotāji"
 
-#: app.php:363
+#: app.php:398
 msgid "Apps"
 msgstr "Lietotnes"
 
-#: app.php:365
+#: app.php:406
 msgid "Admin"
 msgstr "Administratori"
 
@@ -50,15 +50,15 @@ msgstr "ZIP lejupielādēšana ir izslēgta."
 msgid "Files need to be downloaded one by one."
 msgstr "Datnes var lejupielādēt tikai katru atsevišķi."
 
-#: files.php:203 files.php:228
+#: files.php:204 files.php:231
 msgid "Back to Files"
 msgstr "Atpakaļ pie datnēm"
 
-#: files.php:227
+#: files.php:228
 msgid "Selected files too large to generate zip file."
 msgstr "Izvēlētās datnes ir pārāk lielas, lai izveidotu zip datni."
 
-#: helper.php:226
+#: helper.php:228
 msgid "couldn't be determined"
 msgstr "nevarēja noteikt"
 
@@ -98,87 +98,92 @@ msgstr "Iestatiet administratora paroli."
 msgid "Specify a data folder."
 msgstr "Norādiet datu mapi."
 
-#: setup.php:53
+#: setup.php:55
 #, php-format
 msgid "%s enter the database username."
 msgstr "%s ievadiet datubāzes lietotājvārdu."
 
-#: setup.php:56
+#: setup.php:58
 #, php-format
 msgid "%s enter the database name."
 msgstr "%s ievadiet datubāzes nosaukumu."
 
-#: setup.php:59
+#: setup.php:61
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr "%s datubāžu nosaukumos nedrīkst izmantot punktus"
 
-#: setup.php:62
+#: setup.php:64
 #, php-format
 msgid "%s set the database host."
 msgstr "%s iestatiet datubāžu serveri."
 
-#: setup.php:126 setup.php:291 setup.php:336
+#: setup.php:128 setup.php:320 setup.php:365
 msgid "PostgreSQL username and/or password not valid"
 msgstr "Nav derīga PostgreSQL parole un/vai lietotājvārds"
 
-#: setup.php:127 setup.php:150 setup.php:204
+#: setup.php:129 setup.php:152 setup.php:229
 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:149 setup.php:423 setup.php:489
+#: setup.php:151 setup.php:453 setup.php:520
 msgid "Oracle username and/or password not valid"
 msgstr "Nav derīga Oracle parole un/vai lietotājvārds"
 
-#: setup.php:203
+#: setup.php:228
 msgid "MySQL username and/or password not valid"
 msgstr "Nav derīga MySQL parole un/vai lietotājvārds"
 
-#: setup.php:255 setup.php:357 setup.php:366 setup.php:384 setup.php:394
-#: setup.php:403 setup.php:430 setup.php:496 setup.php:522 setup.php:529
-#: setup.php:540 setup.php:547 setup.php:556 setup.php:564 setup.php:573
-#: setup.php:579
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "DB kļūda — “%s”"
 
-#: setup.php:256 setup.php:358 setup.php:367 setup.php:385 setup.php:395
-#: setup.php:404 setup.php:431 setup.php:497 setup.php:523 setup.php:530
-#: setup.php:541 setup.php:557 setup.php:565 setup.php:574
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "Vainīgā komanda bija “%s”"
 
-#: setup.php:270
+#: setup.php:299
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "MySQL lietotājs %s'@'localhost' jau eksistē."
 
-#: setup.php:271
+#: setup.php:300
 msgid "Drop this user from MySQL"
 msgstr "Izmest šo lietotāju no MySQL"
 
-#: setup.php:276
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "MySQL lietotājs '%s'@'%%' jau eksistē"
 
-#: setup.php:277
+#: setup.php:306
 msgid "Drop this user from MySQL."
 msgstr "Izmest šo lietotāju no MySQL."
 
-#: setup.php:548 setup.php:580
+#: setup.php:579 setup.php:611
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Vainīgā komanda bija \"%s\", vārds: %s, parole: %s"
 
-#: setup.php:644
+#: setup.php:631
+#, 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
 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:645
+#: setup.php:850
 #, 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>."
@@ -235,16 +240,16 @@ msgstr "gājušajā gadā"
 msgid "years ago"
 msgstr "gadus atpakaļ"
 
-#: updater.php:75
+#: 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:77
+#: updater.php:81
 msgid "up to date"
 msgstr "ir aktuāls"
 
-#: updater.php:80
+#: updater.php:84
 msgid "updates check is disabled"
 msgstr "atjauninājumu pārbaude ir deaktivēta"
 
diff --git a/l10n/lv/settings.po b/l10n/lv/settings.po
index d674a9d9a10b77811f4466963a6d5156e35d7278..69f10760294f1130f8e8a0dc5789c410d3e97991 100644
--- a/l10n/lv/settings.po
+++ b/l10n/lv/settings.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 23:05+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "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,8 +24,8 @@ 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:15
-#: ajax/togglegroups.php:18
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr "Autentifikācijas kļūda"
 
@@ -73,12 +73,12 @@ msgstr "Nederīgs pieprasījums"
 msgid "Admins can't remove themself from the admin group"
 msgstr "Administratori nevar izņemt paši sevi no administratoru grupas"
 
-#: ajax/togglegroups.php:28
+#: ajax/togglegroups.php:30
 #, php-format
 msgid "Unable to add user to group %s"
 msgstr "Nevar pievienot lietotāju grupai %s"
 
-#: ajax/togglegroups.php:34
+#: ajax/togglegroups.php:36
 #, php-format
 msgid "Unable to remove user from group %s"
 msgstr "Nevar izņemt lietotāju no grupas %s"
@@ -119,7 +119,7 @@ msgstr "Kļūda"
 msgid "Updated"
 msgstr "Atjaunināta"
 
-#: js/personal.js:96
+#: js/personal.js:99
 msgid "Saving..."
 msgstr "Saglabā..."
 
@@ -148,23 +148,23 @@ msgstr "Grupas administrators"
 msgid "Delete"
 msgstr "Dzēst"
 
-#: js/users.js:190
+#: js/users.js:191
 msgid "add group"
 msgstr "pievienot grupu"
 
-#: js/users.js:351
+#: js/users.js:352
 msgid "A valid username must be provided"
 msgstr "Jānorāda derīgs lietotājvārds"
 
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
 msgid "Error creating user"
 msgstr "Kļūda, veidojot lietotāju"
 
-#: js/users.js:357
+#: js/users.js:358
 msgid "A valid password must be provided"
 msgstr "Jānorāda derīga parole"
 
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
 msgid "__language_name__"
 msgstr "__valodas_nosaukums__"
 
@@ -210,19 +210,19 @@ msgstr "Trūkst PHP modulis “fileinfo”. Mēs iesakām to aktivēt, lai pēc
 msgid "Locale not working"
 msgstr "Lokāle nestrādā"
 
-#: templates/admin.php:61
+#: templates/admin.php:63
+#, php-format
 msgid ""
-"This ownCloud server can't set system locale to "
-"\"en_US.UTF-8\"/\"en_US.UTF8\". 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 en_US.UTF-8/en_US.UTF8."
-msgstr "Šis ownCloud serveris nevar iestatīt sistēmas lokāli uz \"en_US.UTF-8\"/\"en_US.UTF8\". Tas nozīmē, ka varētu būt problēmas ar noteiktām rakstzīmēm datņu nosaukumos. Mēs iesakām instalēt vajadzīgās pakotnes savā sistēmā en_US.UTF-8/en_US.UTF8 atbalstam."
+"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 "Šis ownCloud serveris nevar iestatīt sistēmas lokāli uz %s. Tas nozīmē, ka varētu būt problēmas ar noteiktām rakstzīmēm datņu nosaukumos. Mēs iesakām instalēt vajadzīgās pakotnes savā sistēmā %s atbalstam."
 
-#: templates/admin.php:72
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr "Interneta savienojums nedarbojas"
 
-#: templates/admin.php:75
+#: 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 "
@@ -232,98 +232,98 @@ msgid ""
 " of ownCloud."
 msgstr "Šim ownCloud serverim nav strādājoša interneta savienojuma. Tas nozīmē, ka dažas no šīm iespējām, piemēram, ārējas krātuves montēšana, paziņošana par atjauninājumiem vai trešās puses programmatūras instalēšana nestrādā. Varētu nestrādāt attālināta piekļuve pie datnēm un paziņojumu e-pasta vēstuļu sūtīšana. Mēs iesakām aktivēt interneta savienojumu šim serverim, ja vēlaties visas ownCloud iespējas."
 
-#: templates/admin.php:89
+#: templates/admin.php:92
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:98
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr "Izpildīt vienu uzdevumu ar katru ielādēto lapu"
 
-#: templates/admin.php:108
+#: 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 ir reģistrēts webcron servisā. Izsauciet cron.php lapu ownCloud saknē caur http reizi sekundē."
 
-#: templates/admin.php:118
+#: 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 "Izmantot sistēmas cron servisu. Izsauciet cron.php datni ownCloud mapē caur sistēmas cornjob reizi minūtē."
 
-#: templates/admin.php:125
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr "Dalīšanās"
 
-#: templates/admin.php:131
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr "Aktivēt koplietošanas API"
 
-#: templates/admin.php:132
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr "Ļauj lietotnēm izmantot koplietošanas API"
 
-#: templates/admin.php:139
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr "Atļaut saites"
 
-#: templates/admin.php:140
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr "Ļaut lietotājiem publiski dalīties ar vienumiem, izmantojot saites"
 
-#: templates/admin.php:147
+#: templates/admin.php:150
 msgid "Allow resharing"
 msgstr "Atļaut atkārtotu koplietošanu"
 
-#: templates/admin.php:148
+#: templates/admin.php:151
 msgid "Allow users to share items shared with them again"
 msgstr "Ļaut lietotājiem dalīties ar vienumiem atkārtoti"
 
-#: templates/admin.php:155
+#: templates/admin.php:158
 msgid "Allow users to share with anyone"
 msgstr "Ļaut lietotājiem dalīties ar visiem"
 
-#: templates/admin.php:158
+#: templates/admin.php:161
 msgid "Allow users to only share with users in their groups"
 msgstr "Ļaut lietotājiem dalīties ar lietotājiem to grupās"
 
-#: templates/admin.php:165
+#: templates/admin.php:168
 msgid "Security"
 msgstr "Drošība"
 
-#: templates/admin.php:178
+#: templates/admin.php:181
 msgid "Enforce HTTPS"
 msgstr "Uzspiest HTTPS"
 
-#: templates/admin.php:179
+#: templates/admin.php:182
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr "Piespiež klientus savienoties ar ownCloud caur šifrētu savienojumu."
 
-#: templates/admin.php:182
+#: templates/admin.php:185
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr "Lūdzu, savienojieties ar šo ownCloud pakalpojumu caur HTTPS, lai aktivētu vai deaktivētu SSL piemērošanu."
 
-#: templates/admin.php:192
+#: templates/admin.php:195
 msgid "Log"
 msgstr "Žurnāls"
 
-#: templates/admin.php:193
+#: templates/admin.php:196
 msgid "Log level"
 msgstr "Žurnāla līmenis"
 
-#: templates/admin.php:220
+#: templates/admin.php:223
 msgid "More"
 msgstr "Vairāk"
 
-#: templates/admin.php:227 templates/personal.php:98
+#: templates/admin.php:230 templates/personal.php:102
 msgid "Version"
 msgstr "Versija"
 
-#: templates/admin.php:230 templates/personal.php:100
+#: templates/admin.php:233 templates/personal.php:105
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -333,51 +333,51 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "Izstrādājusi<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud kopiena</a>,<a href=\"https://github.com/owncloud\" target=\"_blank\">pirmkodu</a>kurš ir licencēts zem <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
-#: templates/apps.php:10
+#: templates/apps.php:11
 msgid "Add your App"
 msgstr "Pievieno savu lietotni"
 
-#: templates/apps.php:11
+#: templates/apps.php:12
 msgid "More Apps"
 msgstr "Vairāk lietotņu"
 
-#: templates/apps.php:24
+#: templates/apps.php:28
 msgid "Select an App"
 msgstr "Izvēlies lietotni"
 
-#: templates/apps.php:28
+#: templates/apps.php:34
 msgid "See application page at apps.owncloud.com"
 msgstr "Apskati lietotņu lapu — apps.owncloud.com"
 
-#: templates/apps.php:29
+#: templates/apps.php:36
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-licencēts no <span class=\"author\"></span>"
 
-#: templates/apps.php:31
+#: templates/apps.php:38
 msgid "Update"
 msgstr "Atjaunināt"
 
-#: templates/help.php:3
+#: templates/help.php:4
 msgid "User Documentation"
 msgstr "Lietotāja dokumentācija"
 
-#: templates/help.php:4
+#: templates/help.php:6
 msgid "Administrator Documentation"
 msgstr "Administratora dokumentācija"
 
-#: templates/help.php:6
+#: templates/help.php:9
 msgid "Online Documentation"
 msgstr "Tiešsaistes dokumentācija"
 
-#: templates/help.php:7
+#: templates/help.php:11
 msgid "Forum"
 msgstr "Forums"
 
-#: templates/help.php:9
+#: templates/help.php:14
 msgid "Bugtracker"
 msgstr "Kļūdu sekotājs"
 
-#: templates/help.php:11
+#: templates/help.php:17
 msgid "Commercial Support"
 msgstr "Komerciālais atbalsts"
 
@@ -386,79 +386,79 @@ msgstr "Komerciālais atbalsts"
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Jūs lietojat <strong>%s</strong> no pieejamajiem <strong>%s</strong>"
 
-#: templates/personal.php:14
+#: templates/personal.php:15
 msgid "Get the apps to sync your files"
 msgstr "Saņem lietotnes, lai sinhronizētu savas datnes"
 
-#: templates/personal.php:25
+#: templates/personal.php:26
 msgid "Show First Run Wizard again"
 msgstr "Vēlreiz rādīt pirmās palaišanas vedni"
 
-#: templates/personal.php:36 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
 msgid "Password"
 msgstr "Parole"
 
-#: templates/personal.php:37
+#: templates/personal.php:38
 msgid "Your password was changed"
 msgstr "Jūru parole tika nomainīta"
 
-#: templates/personal.php:38
+#: templates/personal.php:39
 msgid "Unable to change your password"
 msgstr "Nevar nomainīt jūsu paroli"
 
-#: templates/personal.php:39
+#: templates/personal.php:40
 msgid "Current password"
 msgstr "Pašreizējā parole"
 
-#: templates/personal.php:40
+#: templates/personal.php:42
 msgid "New password"
 msgstr "Jauna parole"
 
-#: templates/personal.php:42
+#: templates/personal.php:44
 msgid "Change password"
 msgstr "Mainīt paroli"
 
-#: templates/personal.php:54 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:78
 msgid "Display Name"
 msgstr "Redzamais vārds"
 
-#: templates/personal.php:55
+#: templates/personal.php:57
 msgid "Your display name was changed"
 msgstr "Jūsu redzamais vārds tika mainīts"
 
-#: templates/personal.php:56
+#: templates/personal.php:58
 msgid "Unable to change your display name"
 msgstr "Nevarēja mainīt jūsu redzamo vārdu"
 
-#: templates/personal.php:59
+#: templates/personal.php:61
 msgid "Change display name"
 msgstr "Mainīt redzamo vārdu"
 
-#: templates/personal.php:68
+#: templates/personal.php:70
 msgid "Email"
 msgstr "E-pasts"
 
-#: templates/personal.php:69
+#: templates/personal.php:72
 msgid "Your email address"
 msgstr "Jūsu e-pasta adrese"
 
-#: templates/personal.php:70
+#: templates/personal.php:73
 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"
 
-#: templates/personal.php:76 templates/personal.php:77
+#: templates/personal.php:79 templates/personal.php:80
 msgid "Language"
 msgstr "Valoda"
 
-#: templates/personal.php:82
+#: templates/personal.php:86
 msgid "Help translate"
 msgstr "Palīdzi tulkot"
 
-#: templates/personal.php:87
+#: templates/personal.php:91
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:89
+#: templates/personal.php:93
 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"
 
diff --git a/l10n/lv/user_ldap.po b/l10n/lv/user_ldap.po
index 3635e7a278705669c244830272c38a072ebe907b..9a1c7c56faec59060a21e4db7bca62aaee9a5b30 100644
--- a/l10n/lv/user_ldap.po
+++ b/l10n/lv/user_ldap.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-09 00:12+0100\n"
-"PO-Revision-Date: 2013-02-08 12:20+0000\n"
-"Last-Translator: Rūdolfs Mazurs <rudolfs.mazurs@gmail.com>\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: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,17 +22,17 @@ msgstr ""
 msgid "Failed to delete the server configuration"
 msgstr "Neizdevās izdzēst servera konfigurāciju"
 
-#: ajax/testConfiguration.php:35
+#: ajax/testConfiguration.php:36
 msgid "The configuration is valid and the connection could be established!"
 msgstr "Konfigurācija ir derīga un varēja izveidot savienojumu!"
 
-#: ajax/testConfiguration.php:37
+#: ajax/testConfiguration.php:39
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
 msgstr "Konfigurācija ir derīga, bet sasaiste neizdevās. Lūdzu, pārbaudiet servera iestatījumus un akreditācijas datus."
 
-#: ajax/testConfiguration.php:40
+#: ajax/testConfiguration.php:43
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
@@ -87,224 +87,248 @@ msgstr "<b>Brīdinājums:</b> PHP LDAP modulis nav uzinstalēts, aizmugure nedar
 msgid "Server configuration"
 msgstr "Servera konfigurācija"
 
-#: templates/settings.php:17
+#: templates/settings.php:18
 msgid "Add Server Configuration"
 msgstr "Pievienot servera konfigurāciju"
 
-#: templates/settings.php:21
+#: templates/settings.php:23
 msgid "Host"
 msgstr "Resursdators"
 
-#: templates/settings.php:21
+#: templates/settings.php:25
 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:22
+#: templates/settings.php:26
 msgid "Base DN"
 msgstr "Bāzes DN"
 
-#: templates/settings.php:22
+#: templates/settings.php:27
 msgid "One Base DN per line"
 msgstr "Viena bāzes DN rindā"
 
-#: templates/settings.php:22
+#: templates/settings.php:28
 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:23
+#: templates/settings.php:30
 msgid "User DN"
 msgstr "Lietotāja DN"
 
-#: templates/settings.php:23
+#: templates/settings.php:32
 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:24
+#: templates/settings.php:33
 msgid "Password"
 msgstr "Parole"
 
-#: templates/settings.php:24
+#: templates/settings.php:36
 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:25
+#: templates/settings.php:37
 msgid "User Login Filter"
 msgstr "Lietotāja ierakstīšanās filtrs"
 
-#: templates/settings.php:25
+#: templates/settings.php:40
 #, 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:25
+#: templates/settings.php:41
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "lieto %%uid vietturi, piemēram, \"uid=%%uid\""
 
-#: templates/settings.php:26
+#: templates/settings.php:42
 msgid "User List Filter"
 msgstr "Lietotāju saraksta filtrs"
 
-#: templates/settings.php:26
+#: templates/settings.php:45
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Definē filtru, ko izmantot, kad saņem lietotāju sarakstu."
 
-#: templates/settings.php:26
+#: templates/settings.php:46
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "bez jebkādiem vietturiem, piemēram, \"objectClass=person\"."
 
-#: templates/settings.php:27
+#: templates/settings.php:47
 msgid "Group Filter"
 msgstr "Grupu filtrs"
 
-#: templates/settings.php:27
+#: templates/settings.php:50
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Definē filtru, ko izmantot, kad saņem grupu sarakstu."
 
-#: templates/settings.php:27
+#: templates/settings.php:51
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "bez jebkādiem vietturiem, piemēram, \"objectClass=posixGroup\"."
 
-#: templates/settings.php:31
+#: templates/settings.php:55
 msgid "Connection Settings"
 msgstr "Savienojuma iestatījumi"
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "Configuration Active"
 msgstr "Konfigurācija ir aktīva"
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "When unchecked, this configuration will be skipped."
 msgstr "Ja nav atzīmēts, šī konfigurācija tiks izlaista."
 
-#: templates/settings.php:34
+#: templates/settings.php:58
 msgid "Port"
 msgstr "Ports"
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid "Backup (Replica) Host"
 msgstr "Rezerves (kopija) serveris"
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 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:36
+#: templates/settings.php:60
 msgid "Backup (Replica) Port"
 msgstr "Rezerves (kopijas) ports"
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "Disable Main Server"
 msgstr "Deaktivēt galveno serveri"
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 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:38
+#: templates/settings.php:62
 msgid "Use TLS"
 msgstr "Lietot TLS"
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr "Neizmanto papildu LDAPS savienojumus! Tas nestrādās."
 
-#: templates/settings.php:39
+#: templates/settings.php:63
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Reģistrnejutīgs LDAP serveris (Windows)"
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid "Turn off SSL certificate validation."
 msgstr "Izslēgt SSL sertifikātu validēšanu."
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 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:40
+#: templates/settings.php:64
 msgid "Not recommended, use for testing only."
 msgstr "Nav ieteicams, izmanto tikai testēšanai!"
 
-#: templates/settings.php:41
+#: templates/settings.php:65
+msgid "Cache Time-To-Live"
+msgstr ""
+
+#: templates/settings.php:65
 msgid "in seconds. A change empties the cache."
 msgstr "sekundēs. Izmaiņas iztukšos kešatmiņu."
 
-#: templates/settings.php:43
+#: templates/settings.php:67
 msgid "Directory Settings"
 msgstr "Direktorijas iestatījumi"
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "User Display Name Field"
 msgstr "Lietotāja redzamā vārda lauks"
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 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:46
+#: templates/settings.php:70
 msgid "Base User Tree"
 msgstr "Bāzes lietotāju koks"
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "One User Base DN per line"
 msgstr "Viena lietotāju bāzes DN rindā"
 
-#: templates/settings.php:47
+#: templates/settings.php:71
 msgid "User Search Attributes"
 msgstr "Lietotāju meklēšanas atribūts"
 
-#: templates/settings.php:47 templates/settings.php:50
+#: templates/settings.php:71 templates/settings.php:74
 msgid "Optional; one attribute per line"
 msgstr "Neobligāti; viens atribūts rindā"
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "Group Display Name Field"
 msgstr "Grupas redzamā nosaukuma lauks"
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 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:49
+#: templates/settings.php:73
 msgid "Base Group Tree"
 msgstr "Bāzes grupu koks"
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "One Group Base DN per line"
 msgstr "Viena grupu bāzes DN rindā"
 
-#: templates/settings.php:50
+#: templates/settings.php:74
 msgid "Group Search Attributes"
 msgstr "Grupu meklēšanas atribūts"
 
-#: templates/settings.php:51
+#: templates/settings.php:75
 msgid "Group-Member association"
 msgstr "Grupu piederības asociācija"
 
-#: templates/settings.php:53
+#: templates/settings.php:77
 msgid "Special Attributes"
 msgstr "Īpašie atribūti"
 
-#: templates/settings.php:56
+#: templates/settings.php:79
+msgid "Quota Field"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Quota Default"
+msgstr ""
+
+#: templates/settings.php:80
 msgid "in bytes"
 msgstr "baitos"
 
-#: templates/settings.php:58
+#: templates/settings.php:81
+msgid "Email Field"
+msgstr ""
+
+#: templates/settings.php:82
+msgid "User Home Folder Naming Rule"
+msgstr ""
+
+#: templates/settings.php:82
 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:62
+#: templates/settings.php:86
+msgid "Test Configuration"
+msgstr ""
+
+#: templates/settings.php:86
 msgid "Help"
 msgstr "Palīdzība"
diff --git a/l10n/mk/core.po b/l10n/mk/core.po
index ee5062dcb099febd16f47be49e7e9cec5043d15e..297237da8c72d8c2d06816c8fe85f138d955a37f 100644
--- a/l10n/mk/core.po
+++ b/l10n/mk/core.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 14:31+0000\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"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
@@ -389,7 +389,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 "ресетирање на лозинка за ownCloud"
 
diff --git a/l10n/mk/files.po b/l10n/mk/files.po
index 03d2c9c8940fc0362ba5eac7ba60a3862bbde9f7..e0fa96592072c235f95789417c9eea68022b2b58 100644
--- a/l10n/mk/files.po
+++ b/l10n/mk/files.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\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: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
@@ -53,27 +53,27 @@ msgid ""
 "the HTML form"
 msgstr "Подигнатата датотеката ја надминува MAX_FILE_SIZE директивата која беше поставена во HTML формата"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
 msgstr "Датотеката беше само делумно подигната."
 
-#: ajax/upload.php:32
+#: ajax/upload.php:31
 msgid "No file was uploaded"
 msgstr "Не беше подигната датотека"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:32
 msgid "Missing a temporary folder"
 msgstr "Не постои привремена папка"
 
-#: ajax/upload.php:34
+#: ajax/upload.php:33
 msgid "Failed to write to disk"
 msgstr "Неуспеав да запишам на диск"
 
-#: ajax/upload.php:52
+#: ajax/upload.php:51
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:83
+#: ajax/upload.php:82
 msgid "Invalid directory."
 msgstr ""
 
@@ -85,7 +85,7 @@ msgstr "Датотеки"
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:127 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:127 templates/index.php:92 templates/index.php:93
 msgid "Delete"
 msgstr "Избриши"
 
@@ -93,40 +93,36 @@ msgstr "Избриши"
 msgid "Rename"
 msgstr "Преименувај"
 
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
 msgid "Pending"
 msgstr "Чека"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "{new_name} already exists"
 msgstr "{new_name} веќе постои"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "replace"
 msgstr "замени"
 
-#: js/filelist.js:253
+#: js/filelist.js:251
 msgid "suggest name"
 msgstr "предложи име"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "cancel"
 msgstr "откажи"
 
-#: js/filelist.js:295
-msgid "replaced {new_name}"
-msgstr "земенета {new_name}"
+#: js/filelist.js:298
+msgid "replaced {new_name} with {old_name}"
+msgstr "заменета {new_name} со {old_name}"
 
-#: js/filelist.js:295 js/filelist.js:297
+#: js/filelist.js:298
 msgid "undo"
 msgstr "врати"
 
-#: js/filelist.js:297
-msgid "replaced {new_name} with {old_name}"
-msgstr "заменета {new_name} со {old_name}"
-
-#: js/filelist.js:322
+#: js/filelist.js:323
 msgid "perform delete operation"
 msgstr ""
 
@@ -152,74 +148,74 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:224
+#: js/files.js:225
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:261
+#: js/files.js:262
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Не може да се преземе вашата датотека бидејќи фолдерот во кој се наоѓа фајлот има големина од 0 бајти"
 
-#: js/files.js:261
+#: js/files.js:262
 msgid "Upload Error"
 msgstr "Грешка при преземање"
 
-#: js/files.js:272
+#: js/files.js:273
 msgid "Close"
 msgstr "Затвои"
 
-#: js/files.js:311
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr "1 датотека се подига"
 
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr "{count} датотеки се подигаат"
 
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "Преземањето е прекинато."
 
-#: js/files.js:496
+#: js/files.js:497
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Подигање на датотека е во тек. Напуштење на страницата ќе го прекине."
 
-#: js/files.js:569
+#: js/files.js:570
 msgid "URL cannot be empty."
 msgstr "Адресата неможе да биде празна."
 
-#: js/files.js:574
+#: js/files.js:575
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:953 templates/index.php:68
 msgid "Name"
 msgstr "Име"
 
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:954 templates/index.php:79
 msgid "Size"
 msgstr "Големина"
 
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:955 templates/index.php:81
 msgid "Modified"
 msgstr "Променето"
 
-#: js/files.js:969
+#: js/files.js:974
 msgid "1 folder"
 msgstr "1 папка"
 
-#: js/files.js:971
+#: js/files.js:976
 msgid "{count} folders"
 msgstr "{count} папки"
 
-#: js/files.js:979
+#: js/files.js:984
 msgid "1 file"
 msgstr "1 датотека"
 
-#: js/files.js:981
+#: js/files.js:986
 msgid "{count} files"
 msgstr "{count} датотеки"
 
@@ -283,33 +279,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr "Откажи прикачување"
 
-#: templates/index.php:59
+#: templates/index.php:53
+msgid "You don’t have write permissions here."
+msgstr ""
+
+#: templates/index.php:60
 msgid "Nothing in here. Upload something!"
 msgstr "Тука нема ништо. Снимете нешто!"
 
-#: templates/index.php:73
+#: templates/index.php:74
 msgid "Download"
 msgstr "Преземи"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:86 templates/index.php:87
 msgid "Unshare"
 msgstr "Не споделувај"
 
-#: templates/index.php:105
+#: templates/index.php:106
 msgid "Upload too large"
 msgstr "Датотеката е премногу голема"
 
-#: templates/index.php:107
+#: templates/index.php:108
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Датотеките кои се обидувате да ги подигнете ја надминуваат максималната големина за подигнување датотеки на овој сервер."
 
-#: templates/index.php:112
+#: templates/index.php:113
 msgid "Files are being scanned, please wait."
 msgstr "Се скенираат датотеки, ве молам почекајте."
 
-#: templates/index.php:115
+#: templates/index.php:116
 msgid "Current scanning"
 msgstr "Моментално скенирам"
 
diff --git a/l10n/mk/files_external.po b/l10n/mk/files_external.po
index 586863c6b166002a6580a6eceec0793893bdc61b..031ea736aa0968061f10d11aeaa83a8a25dc91bb 100644
--- a/l10n/mk/files_external.po
+++ b/l10n/mk/files_external.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-12-29 00:07+0100\n"
-"PO-Revision-Date: 2012-12-28 09:20+0000\n"
-"Last-Translator: Georgi Stanojevski <glisha@gmail.com>\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"
 "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"
@@ -18,37 +18,33 @@ msgstr ""
 "Language: mk\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 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 "Грешка при конфигурација на Dropbox"
 
-#: 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 "Ве молам доставите валиден Dropbox клуч и тајна лозинка."
 
-#: 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 "Грешка при конфигурација на Google Drive"
 
-#: lib/config.php:434
+#: lib/config.php:421
 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:435
+#: lib/config.php:424
 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 "
@@ -59,63 +55,63 @@ msgstr "<b>Внимание:</b> Не е овозможена или инста
 msgid "External Storage"
 msgstr "Надворешно складиште"
 
-#: templates/settings.php:8 templates/settings.php:22
-msgid "Mount point"
-msgstr "Точка на монтирање"
-
-#: templates/settings.php:9
-msgid "Backend"
-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: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"
-msgstr "Додади точка на монтирање"
+#: 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 "Корисници"
 
-#: templates/settings.php:108 templates/settings.php:109
-#: templates/settings.php:144 templates/settings.php:145
+#: templates/settings.php:113 templates/settings.php:114
+#: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
 msgstr "Избриши"
 
-#: 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:136
+#: templates/settings.php:141
 msgid "SSL root certificates"
 msgstr "SSL root сертификати"
 
-#: templates/settings.php:153
+#: templates/settings.php:159
 msgid "Import Root Certificate"
 msgstr "Увези"
diff --git a/l10n/mk/files_trashbin.po b/l10n/mk/files_trashbin.po
index 173bc01b4e977a1d157a492727d59ac880189b4c..7910b81dd0a6a8333dfcc9393620c64299ca2896 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-02-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 10:07+0000\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: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Language: mk\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
 
-#: ajax/delete.php:22
+#: ajax/delete.php:40
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
@@ -27,35 +27,39 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:33
+#: js/trash.js:34
 msgid "delete file permanently"
 msgstr ""
 
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr ""
+
+#: js/trash.js:174 templates/index.php:17
 msgid "Name"
 msgstr "Име"
 
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:175 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:135
+#: js/trash.js:184
 msgid "1 folder"
 msgstr "1 папка"
 
-#: js/trash.js:137
+#: js/trash.js:186
 msgid "{count} folders"
 msgstr "{count} папки"
 
-#: js/trash.js:145
+#: js/trash.js:194
 msgid "1 file"
 msgstr "1 датотека"
 
-#: js/trash.js:147
+#: js/trash.js:196
 msgid "{count} files"
 msgstr "{count} датотеки"
 
@@ -66,3 +70,11 @@ 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/mk/files_versions.po b/l10n/mk/files_versions.po
index 3ea9e4d20c3aa84693391653346c2c90333285f0..f79838b9c078c01798d14116ce501958209dc44e 100644
--- a/l10n/mk/files_versions.po
+++ b/l10n/mk/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-08 00:10+0100\n"
-"PO-Revision-Date: 2013-02-07 23:11+0000\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"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
@@ -49,18 +49,10 @@ msgstr ""
 msgid "No path specified"
 msgstr ""
 
-#: js/versions.js:16
-msgid "History"
-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 ""
-
-#: templates/settings.php:3
-msgid "Files Versioning"
-msgstr "Верзии на датотеки"
-
-#: templates/settings.php:4
-msgid "Enable"
-msgstr "Овозможи"
diff --git a/l10n/mk/lib.po b/l10n/mk/lib.po
index ca43b14fecd00d8f14bbf6ca66e150b0aec7fe3e..f78cd8ab7676e4f0f7eb432ef01fc4b35a645ce1 100644
--- a/l10n/mk/lib.po
+++ b/l10n/mk/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-11 15:39+0100\n"
-"PO-Revision-Date: 2013-02-11 14:40+0000\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: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
@@ -18,27 +18,27 @@ msgstr ""
 "Language: mk\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
 
-#: app.php:339
+#: app.php:349
 msgid "Help"
 msgstr "Помош"
 
-#: app.php:346
+#: app.php:362
 msgid "Personal"
 msgstr "Лично"
 
-#: app.php:351
+#: app.php:373
 msgid "Settings"
 msgstr "Параметри"
 
-#: app.php:356
+#: app.php:385
 msgid "Users"
 msgstr "Корисници"
 
-#: app.php:363
+#: app.php:398
 msgid "Apps"
 msgstr "Аппликации"
 
-#: app.php:365
+#: app.php:406
 msgid "Admin"
 msgstr "Админ"
 
@@ -50,15 +50,15 @@ msgstr "Преземање во ZIP е исклучено"
 msgid "Files need to be downloaded one by one."
 msgstr "Датотеките треба да се симнат една по една."
 
-#: files.php:203 files.php:228
+#: files.php:204 files.php:231
 msgid "Back to Files"
 msgstr "Назад кон датотеки"
 
-#: files.php:227
+#: files.php:228
 msgid "Selected files too large to generate zip file."
 msgstr "Избраните датотеки се преголеми за да се генерира zip."
 
-#: helper.php:226
+#: helper.php:228
 msgid "couldn't be determined"
 msgstr ""
 
@@ -98,87 +98,92 @@ msgstr ""
 msgid "Specify a data folder."
 msgstr ""
 
-#: setup.php:53
+#: setup.php:55
 #, php-format
 msgid "%s enter the database username."
 msgstr ""
 
-#: setup.php:56
+#: setup.php:58
 #, php-format
 msgid "%s enter the database name."
 msgstr ""
 
-#: setup.php:59
+#: setup.php:61
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr ""
 
-#: setup.php:62
+#: setup.php:64
 #, php-format
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:126 setup.php:291 setup.php:336
+#: setup.php:128 setup.php:320 setup.php:365
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:127 setup.php:150 setup.php:204
+#: setup.php:129 setup.php:152 setup.php:229
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:149 setup.php:423 setup.php:489
+#: setup.php:151 setup.php:453 setup.php:520
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:203
+#: setup.php:228
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:255 setup.php:357 setup.php:366 setup.php:384 setup.php:394
-#: setup.php:403 setup.php:430 setup.php:496 setup.php:522 setup.php:529
-#: setup.php:540 setup.php:547 setup.php:556 setup.php:564 setup.php:573
-#: setup.php:579
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:256 setup.php:358 setup.php:367 setup.php:385 setup.php:395
-#: setup.php:404 setup.php:431 setup.php:497 setup.php:523 setup.php:530
-#: setup.php:541 setup.php:557 setup.php:565 setup.php:574
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:270
+#: setup.php:299
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:271
+#: setup.php:300
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:276
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:277
+#: setup.php:306
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:548 setup.php:580
+#: setup.php:579 setup.php:611
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:644
+#: setup.php:631
+#, php-format
+msgid "MS SQL username and/or password not valid: %s"
+msgstr ""
+
+#: setup.php:849
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:645
+#: setup.php:850
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
@@ -235,16 +240,16 @@ msgstr "минатата година"
 msgid "years ago"
 msgstr "пред години"
 
-#: updater.php:75
+#: updater.php:78
 #, php-format
 msgid "%s is available. Get <a href=\"%s\">more information</a>"
 msgstr "%s е достапно. Земи <a href=\"%s\">повеќе информации</a>"
 
-#: updater.php:77
+#: updater.php:81
 msgid "up to date"
 msgstr "ажурно"
 
-#: updater.php:80
+#: updater.php:84
 msgid "updates check is disabled"
 msgstr "проверката за ажурирања е оневозможена"
 
diff --git a/l10n/mk/settings.po b/l10n/mk/settings.po
index 13fa26c20b6d12d3a6eba34fc739e1db82a37ca7..907f9576c1778b892aad8c94f1845557beb2821d 100644
--- a/l10n/mk/settings.po
+++ b/l10n/mk/settings.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 23:05+0000\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: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
@@ -24,8 +24,8 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "Неможам да вчитам листа од App Store"
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:15
-#: ajax/togglegroups.php:18
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr "Грешка во автентикација"
 
@@ -73,12 +73,12 @@ 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 "Неможе да додадам корисник во група %s"
 
-#: ajax/togglegroups.php:34
+#: ajax/togglegroups.php:36
 #, php-format
 msgid "Unable to remove user from group %s"
 msgstr "Неможе да избришам корисник од група %s"
@@ -119,7 +119,7 @@ msgstr "Грешка"
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:96
+#: js/personal.js:99
 msgid "Saving..."
 msgstr "Снимам..."
 
@@ -148,23 +148,23 @@ msgstr "Администратор на група"
 msgid "Delete"
 msgstr "Избриши"
 
-#: js/users.js:190
+#: js/users.js:191
 msgid "add group"
 msgstr ""
 
-#: js/users.js:351
+#: js/users.js:352
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:357
+#: js/users.js:358
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -210,19 +210,19 @@ msgstr ""
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:61
+#: templates/admin.php:63
+#, php-format
 msgid ""
-"This ownCloud server can't set system locale to "
-"\"en_US.UTF-8\"/\"en_US.UTF8\". 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 en_US.UTF-8/en_US.UTF8."
+"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:72
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:75
+#: 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 "
@@ -232,98 +232,98 @@ msgid ""
 " of ownCloud."
 msgstr ""
 
-#: templates/admin.php:89
+#: templates/admin.php:92
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:98
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:108
+#: 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:118
+#: 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:125
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:131
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:132
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:140
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:147
+#: templates/admin.php:150
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:148
+#: templates/admin.php:151
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:155
+#: templates/admin.php:158
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:161
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:165
+#: templates/admin.php:168
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:181
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:179
+#: templates/admin.php:182
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:182
+#: templates/admin.php:185
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr ""
 
-#: templates/admin.php:192
+#: templates/admin.php:195
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:193
+#: templates/admin.php:196
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:220
+#: templates/admin.php:223
 msgid "More"
 msgstr "Повеќе"
 
-#: templates/admin.php:227 templates/personal.php:98
+#: templates/admin.php:230 templates/personal.php:102
 msgid "Version"
 msgstr "Верзија"
 
-#: templates/admin.php:230 templates/personal.php:100
+#: templates/admin.php:233 templates/personal.php:105
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -333,51 +333,51 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "Развој од <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud заедницата</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">изворниот код</a> е лиценциран со<a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
-#: templates/apps.php:10
+#: templates/apps.php:11
 msgid "Add your App"
 msgstr "Додадете ја Вашата апликација"
 
-#: templates/apps.php:11
+#: templates/apps.php:12
 msgid "More Apps"
 msgstr "Повеќе аппликации"
 
-#: templates/apps.php:24
+#: templates/apps.php:28
 msgid "Select an App"
 msgstr "Избери аппликација"
 
-#: templates/apps.php:28
+#: templates/apps.php:34
 msgid "See application page at apps.owncloud.com"
 msgstr "Види ја страницата со апликации на apps.owncloud.com"
 
-#: templates/apps.php:29
+#: templates/apps.php:36
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-лиценцирано од <span class=\"author\"></span>"
 
-#: templates/apps.php:31
+#: templates/apps.php:38
 msgid "Update"
 msgstr "Ажурирај"
 
-#: templates/help.php:3
+#: 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 "Комерцијална подршка"
 
@@ -386,79 +386,79 @@ msgstr "Комерцијална подршка"
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Имате искористено <strong>%s</strong> од достапните <strong>%s</strong>"
 
-#: templates/personal.php:14
+#: templates/personal.php:15
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:25
+#: templates/personal.php:26
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:36 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
 msgid "Password"
 msgstr "Лозинка"
 
-#: templates/personal.php:37
+#: templates/personal.php:38
 msgid "Your password was changed"
 msgstr "Вашата лозинка беше променета."
 
-#: templates/personal.php:38
+#: templates/personal.php:39
 msgid "Unable to change your password"
 msgstr "Вашата лозинка неможе да се смени"
 
-#: templates/personal.php:39
+#: templates/personal.php:40
 msgid "Current password"
 msgstr "Моментална лозинка"
 
-#: templates/personal.php:40
+#: templates/personal.php:42
 msgid "New password"
 msgstr "Нова лозинка"
 
-#: templates/personal.php:42
+#: templates/personal.php:44
 msgid "Change password"
 msgstr "Смени лозинка"
 
-#: templates/personal.php:54 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:78
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:55
+#: templates/personal.php:57
 msgid "Your display name was changed"
 msgstr ""
 
-#: templates/personal.php:56
+#: templates/personal.php:58
 msgid "Unable to change your display name"
 msgstr ""
 
-#: templates/personal.php:59
+#: templates/personal.php:61
 msgid "Change display name"
 msgstr ""
 
-#: templates/personal.php:68
+#: templates/personal.php:70
 msgid "Email"
 msgstr "Е-пошта"
 
-#: templates/personal.php:69
+#: templates/personal.php:72
 msgid "Your email address"
 msgstr "Вашата адреса за е-пошта"
 
-#: templates/personal.php:70
+#: templates/personal.php:73
 msgid "Fill in an email address to enable password recovery"
 msgstr "Пополни ја адресата за е-пошта за да може да ја обновуваш лозинката"
 
-#: templates/personal.php:76 templates/personal.php:77
+#: templates/personal.php:79 templates/personal.php:80
 msgid "Language"
 msgstr "Јазик"
 
-#: templates/personal.php:82
+#: templates/personal.php:86
 msgid "Help translate"
 msgstr "Помогни во преводот"
 
-#: templates/personal.php:87
+#: templates/personal.php:91
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:89
+#: templates/personal.php:93
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "Користете ја оваа адреса да "
 
diff --git a/l10n/mk/user_ldap.po b/l10n/mk/user_ldap.po
index 78d3ca3305f8d324ca83f4b3d104423b4da80204..d3688a731b490c3a475bcbcbe077bef02dfebca8 100644
--- a/l10n/mk/user_ldap.po
+++ b/l10n/mk/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-08 00:10+0100\n"
-"PO-Revision-Date: 2013-02-07 23:11+0000\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: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
@@ -22,17 +22,17 @@ msgstr ""
 msgid "Failed to delete the server configuration"
 msgstr ""
 
-#: ajax/testConfiguration.php:35
+#: ajax/testConfiguration.php:36
 msgid "The configuration is valid and the connection could be established!"
 msgstr ""
 
-#: ajax/testConfiguration.php:37
+#: ajax/testConfiguration.php:39
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
 msgstr ""
 
-#: ajax/testConfiguration.php:40
+#: ajax/testConfiguration.php:43
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
@@ -87,224 +87,248 @@ msgstr ""
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:17
+#: templates/settings.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:23
 msgid "Host"
 msgstr "Домаќин"
 
-#: templates/settings.php:21
+#: templates/settings.php:25
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "Може да го скокнете протколот освен ако не ви треба SSL. Тогаш ставете ldaps://"
 
-#: templates/settings.php:22
+#: templates/settings.php:26
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:27
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:28
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:32
 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:24
+#: templates/settings.php:33
 msgid "Password"
 msgstr "Лозинка"
 
-#: templates/settings.php:24
+#: templates/settings.php:36
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:37
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:40
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:41
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:42
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:45
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:46
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:47
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:50
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:51
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:55
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:34
+#: templates/settings.php:58
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:60
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:39
+#: templates/settings.php:63
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:65
+msgid "Cache Time-To-Live"
+msgstr ""
+
+#: templates/settings.php:65
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:67
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:47
+#: templates/settings.php:71
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:47 templates/settings.php:50
+#: templates/settings.php:71 templates/settings.php:74
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:74
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:75
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:77
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:79
+msgid "Quota Field"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Quota Default"
+msgstr ""
+
+#: templates/settings.php:80
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:81
+msgid "Email Field"
+msgstr ""
+
+#: templates/settings.php:82
+msgid "User Home Folder Naming Rule"
+msgstr ""
+
+#: templates/settings.php:82
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:62
+#: templates/settings.php:86
+msgid "Test Configuration"
+msgstr ""
+
+#: templates/settings.php:86
 msgid "Help"
 msgstr "Помош"
diff --git a/l10n/ms_MY/core.po b/l10n/ms_MY/core.po
index b1280033038fb5c37f560e2873fcf9996aca51f4..61b35a09fc77041b1b46c173d88ecf88aeb6c8ae 100644
--- a/l10n/ms_MY/core.po
+++ b/l10n/ms_MY/core.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 14:32+0000\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"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -389,7 +389,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 "Set semula kata lalaun ownCloud"
 
diff --git a/l10n/ms_MY/files.po b/l10n/ms_MY/files.po
index 50e095c4980631758c79941ce31b4f82424b507e..476a84415f0723bbb2c354b13db434c155e1fdb8 100644
--- a/l10n/ms_MY/files.po
+++ b/l10n/ms_MY/files.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\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: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -54,27 +54,27 @@ msgid ""
 "the HTML form"
 msgstr "Fail yang dimuat naik melebihi MAX_FILE_SIZE yang dinyatakan dalam form HTML "
 
-#: ajax/upload.php:31
+#: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
 msgstr "Sebahagian daripada fail telah dimuat naik. "
 
-#: ajax/upload.php:32
+#: ajax/upload.php:31
 msgid "No file was uploaded"
 msgstr "Tiada fail yang dimuat naik"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:32
 msgid "Missing a temporary folder"
 msgstr "Folder sementara hilang"
 
-#: ajax/upload.php:34
+#: ajax/upload.php:33
 msgid "Failed to write to disk"
 msgstr "Gagal untuk disimpan"
 
-#: ajax/upload.php:52
+#: ajax/upload.php:51
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:83
+#: ajax/upload.php:82
 msgid "Invalid directory."
 msgstr ""
 
@@ -86,7 +86,7 @@ msgstr "fail"
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:127 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:127 templates/index.php:92 templates/index.php:93
 msgid "Delete"
 msgstr "Padam"
 
@@ -94,40 +94,36 @@ msgstr "Padam"
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
 msgid "Pending"
 msgstr "Dalam proses"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "replace"
 msgstr "ganti"
 
-#: js/filelist.js:253
+#: js/filelist.js:251
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "cancel"
 msgstr "Batal"
 
-#: js/filelist.js:295
-msgid "replaced {new_name}"
+#: js/filelist.js:298
+msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:295 js/filelist.js:297
+#: js/filelist.js:298
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:297
-msgid "replaced {new_name} with {old_name}"
-msgstr ""
-
-#: js/filelist.js:322
+#: js/filelist.js:323
 msgid "perform delete operation"
 msgstr ""
 
@@ -153,74 +149,74 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:224
+#: js/files.js:225
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:261
+#: js/files.js:262
 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:261
+#: js/files.js:262
 msgid "Upload Error"
 msgstr "Muat naik ralat"
 
-#: js/files.js:272
+#: js/files.js:273
 msgid "Close"
 msgstr "Tutup"
 
-#: js/files.js:311
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr ""
 
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr ""
 
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "Muatnaik dibatalkan."
 
-#: js/files.js:496
+#: js/files.js:497
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:569
+#: js/files.js:570
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:574
+#: js/files.js:575
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:953 templates/index.php:68
 msgid "Name"
 msgstr "Nama "
 
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:954 templates/index.php:79
 msgid "Size"
 msgstr "Saiz"
 
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:955 templates/index.php:81
 msgid "Modified"
 msgstr "Dimodifikasi"
 
-#: js/files.js:969
+#: js/files.js:974
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:971
+#: js/files.js:976
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:979
+#: js/files.js:984
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:981
+#: js/files.js:986
 msgid "{count} files"
 msgstr ""
 
@@ -284,33 +280,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr "Batal muat naik"
 
-#: templates/index.php:59
+#: templates/index.php:53
+msgid "You don’t have write permissions here."
+msgstr ""
+
+#: templates/index.php:60
 msgid "Nothing in here. Upload something!"
 msgstr "Tiada apa-apa di sini. Muat naik sesuatu!"
 
-#: templates/index.php:73
+#: templates/index.php:74
 msgid "Download"
 msgstr "Muat turun"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:86 templates/index.php:87
 msgid "Unshare"
 msgstr ""
 
-#: templates/index.php:105
+#: templates/index.php:106
 msgid "Upload too large"
 msgstr "Muat naik terlalu besar"
 
-#: templates/index.php:107
+#: templates/index.php:108
 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:112
+#: templates/index.php:113
 msgid "Files are being scanned, please wait."
 msgstr "Fail sedang diimbas, harap bersabar."
 
-#: templates/index.php:115
+#: templates/index.php:116
 msgid "Current scanning"
 msgstr "Imbasan semasa"
 
diff --git a/l10n/ms_MY/files_external.po b/l10n/ms_MY/files_external.po
index 5e943b19f64c6878cd5de52a766e728fc0320e93..898cd9062a2a31e1db32a164be33b7491bac7c67 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: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-11 23:22+0000\n"
+"POT-Creation-Date: 2013-02-28 00:04+0100\n"
+"PO-Revision-Date: 2013-02-27 23:04+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -17,37 +17,33 @@ msgstr ""
 "Language: ms_MY\n"
 "Plural-Forms: nplurals=1; plural=0;\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:421
 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:424
 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 "
@@ -58,63 +54,63 @@ msgstr ""
 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 "Kumpulan"
 
-#: templates/settings.php:95
+#: templates/settings.php:100
 msgid "Users"
 msgstr "Pengguna"
 
-#: 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 "Padam"
 
-#: 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/ms_MY/files_trashbin.po b/l10n/ms_MY/files_trashbin.po
index 7924d440e3cc2cdfc4088dfd28d7a4f2063f687d..ca5700f5ff4d07845e630aade9375de498e2a493 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-02-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 10:07+0000\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: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Language: ms_MY\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/delete.php:22
+#: ajax/delete.php:40
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
@@ -27,35 +27,39 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:33
+#: js/trash.js:34
 msgid "delete file permanently"
 msgstr ""
 
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr ""
+
+#: js/trash.js:174 templates/index.php:17
 msgid "Name"
 msgstr "Nama"
 
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:175 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:135
+#: js/trash.js:184
 msgid "1 folder"
 msgstr ""
 
-#: js/trash.js:137
+#: js/trash.js:186
 msgid "{count} folders"
 msgstr ""
 
-#: js/trash.js:145
+#: js/trash.js:194
 msgid "1 file"
 msgstr ""
 
-#: js/trash.js:147
+#: js/trash.js:196
 msgid "{count} files"
 msgstr ""
 
@@ -66,3 +70,11 @@ msgstr ""
 #: templates/index.php:20 templates/index.php:22
 msgid "Restore"
 msgstr ""
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr "Padam"
+
+#: templates/part.breadcrumb.php:9
+msgid "Deleted Files"
+msgstr ""
diff --git a/l10n/ms_MY/files_versions.po b/l10n/ms_MY/files_versions.po
index c6fa87619d2eff5deca0304c1636eb3dfdb67367..5694a0b699af629cfe2b5cfd89be5d7dbd16648a 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-08 00:10+0100\n"
-"PO-Revision-Date: 2013-02-07 23:11+0000\n"
+"POT-Creation-Date: 2013-02-28 00:04+0100\n"
+"PO-Revision-Date: 2013-02-27 23:04+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -48,18 +48,10 @@ msgstr ""
 msgid "No path specified"
 msgstr ""
 
-#: js/versions.js:16
-msgid "History"
+#: 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 ""
-
-#: templates/settings.php:3
-msgid "Files Versioning"
-msgstr ""
-
-#: templates/settings.php:4
-msgid "Enable"
-msgstr ""
diff --git a/l10n/ms_MY/lib.po b/l10n/ms_MY/lib.po
index ff74402b4cf8d676a15bfa4257c5606b2ddae6c0..398f8ce8d92097cbec486ba347f43d41a53f5097 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-11 15:39+0100\n"
-"PO-Revision-Date: 2013-02-11 14:40+0000\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: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -17,27 +17,27 @@ msgstr ""
 "Language: ms_MY\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: app.php:339
+#: app.php:349
 msgid "Help"
 msgstr "Bantuan"
 
-#: app.php:346
+#: app.php:362
 msgid "Personal"
 msgstr "Peribadi"
 
-#: app.php:351
+#: app.php:373
 msgid "Settings"
 msgstr "Tetapan"
 
-#: app.php:356
+#: app.php:385
 msgid "Users"
 msgstr "Pengguna"
 
-#: app.php:363
+#: app.php:398
 msgid "Apps"
 msgstr ""
 
-#: app.php:365
+#: app.php:406
 msgid "Admin"
 msgstr ""
 
@@ -49,15 +49,15 @@ msgstr ""
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:203 files.php:228
+#: files.php:204 files.php:231
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:227
+#: files.php:228
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: helper.php:226
+#: helper.php:228
 msgid "couldn't be determined"
 msgstr ""
 
@@ -97,87 +97,92 @@ msgstr ""
 msgid "Specify a data folder."
 msgstr ""
 
-#: setup.php:53
+#: setup.php:55
 #, php-format
 msgid "%s enter the database username."
 msgstr ""
 
-#: setup.php:56
+#: setup.php:58
 #, php-format
 msgid "%s enter the database name."
 msgstr ""
 
-#: setup.php:59
+#: setup.php:61
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr ""
 
-#: setup.php:62
+#: setup.php:64
 #, php-format
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:126 setup.php:291 setup.php:336
+#: setup.php:128 setup.php:320 setup.php:365
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:127 setup.php:150 setup.php:204
+#: setup.php:129 setup.php:152 setup.php:229
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:149 setup.php:423 setup.php:489
+#: setup.php:151 setup.php:453 setup.php:520
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:203
+#: setup.php:228
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:255 setup.php:357 setup.php:366 setup.php:384 setup.php:394
-#: setup.php:403 setup.php:430 setup.php:496 setup.php:522 setup.php:529
-#: setup.php:540 setup.php:547 setup.php:556 setup.php:564 setup.php:573
-#: setup.php:579
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:256 setup.php:358 setup.php:367 setup.php:385 setup.php:395
-#: setup.php:404 setup.php:431 setup.php:497 setup.php:523 setup.php:530
-#: setup.php:541 setup.php:557 setup.php:565 setup.php:574
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:270
+#: setup.php:299
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:271
+#: setup.php:300
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:276
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:277
+#: setup.php:306
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:548 setup.php:580
+#: setup.php:579 setup.php:611
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:644
+#: setup.php:631
+#, php-format
+msgid "MS SQL username and/or password not valid: %s"
+msgstr ""
+
+#: setup.php:849
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:645
+#: setup.php:850
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
@@ -234,16 +239,16 @@ msgstr ""
 msgid "years ago"
 msgstr ""
 
-#: updater.php:75
+#: updater.php:78
 #, php-format
 msgid "%s is available. Get <a href=\"%s\">more information</a>"
 msgstr ""
 
-#: updater.php:77
+#: updater.php:81
 msgid "up to date"
 msgstr ""
 
-#: updater.php:80
+#: updater.php:84
 msgid "updates check is disabled"
 msgstr ""
 
diff --git a/l10n/ms_MY/settings.po b/l10n/ms_MY/settings.po
index 78eea9c6d7ca5006cfbdbdf350132ff62b10deb4..ead0af974b426f96a7eafa94a050eb9c6d9e8581 100644
--- a/l10n/ms_MY/settings.po
+++ b/l10n/ms_MY/settings.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 23:05+0000\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: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -25,8 +25,8 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr ""
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:15
-#: ajax/togglegroups.php:18
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr "Ralat pengesahan"
 
@@ -74,12 +74,12 @@ msgstr "Permintaan tidak sah"
 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 ""
@@ -120,7 +120,7 @@ msgstr "Ralat"
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:96
+#: js/personal.js:99
 msgid "Saving..."
 msgstr "Simpan..."
 
@@ -149,23 +149,23 @@ msgstr ""
 msgid "Delete"
 msgstr "Padam"
 
-#: js/users.js:190
+#: js/users.js:191
 msgid "add group"
 msgstr ""
 
-#: js/users.js:351
+#: js/users.js:352
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:357
+#: js/users.js:358
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
 msgid "__language_name__"
 msgstr "_nama_bahasa_"
 
@@ -211,19 +211,19 @@ msgstr ""
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:61
+#: templates/admin.php:63
+#, php-format
 msgid ""
-"This ownCloud server can't set system locale to "
-"\"en_US.UTF-8\"/\"en_US.UTF8\". 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 en_US.UTF-8/en_US.UTF8."
+"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:72
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:75
+#: 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 "
@@ -233,98 +233,98 @@ msgid ""
 " of ownCloud."
 msgstr ""
 
-#: templates/admin.php:89
+#: templates/admin.php:92
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:98
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:108
+#: 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:118
+#: 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:125
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:131
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:132
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:140
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:147
+#: templates/admin.php:150
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:148
+#: templates/admin.php:151
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:155
+#: templates/admin.php:158
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:161
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:165
+#: templates/admin.php:168
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:181
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:179
+#: templates/admin.php:182
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:182
+#: templates/admin.php:185
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr ""
 
-#: templates/admin.php:192
+#: templates/admin.php:195
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:193
+#: templates/admin.php:196
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:220
+#: templates/admin.php:223
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:227 templates/personal.php:98
+#: templates/admin.php:230 templates/personal.php:102
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:230 templates/personal.php:100
+#: templates/admin.php:233 templates/personal.php:105
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -334,51 +334,51 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr ""
 
-#: templates/apps.php:10
+#: templates/apps.php:11
 msgid "Add your App"
 msgstr "Tambah apps anda"
 
-#: templates/apps.php:11
+#: templates/apps.php:12
 msgid "More Apps"
 msgstr ""
 
-#: templates/apps.php:24
+#: templates/apps.php:28
 msgid "Select an App"
 msgstr "Pilih aplikasi"
 
-#: templates/apps.php:28
+#: templates/apps.php:34
 msgid "See application page at apps.owncloud.com"
 msgstr "Lihat halaman applikasi di apps.owncloud.com"
 
-#: templates/apps.php:29
+#: templates/apps.php:36
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
-#: templates/apps.php:31
+#: templates/apps.php:38
 msgid "Update"
 msgstr "Kemaskini"
 
-#: templates/help.php:3
+#: 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 ""
 
@@ -387,79 +387,79 @@ msgstr ""
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:14
+#: templates/personal.php:15
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:25
+#: templates/personal.php:26
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:36 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
 msgid "Password"
 msgstr "Kata laluan "
 
-#: templates/personal.php:37
+#: templates/personal.php:38
 msgid "Your password was changed"
 msgstr ""
 
-#: templates/personal.php:38
+#: templates/personal.php:39
 msgid "Unable to change your password"
 msgstr "Gagal mengubah kata laluan anda "
 
-#: templates/personal.php:39
+#: templates/personal.php:40
 msgid "Current password"
 msgstr "Kata laluan semasa"
 
-#: templates/personal.php:40
+#: templates/personal.php:42
 msgid "New password"
 msgstr "Kata laluan baru"
 
-#: templates/personal.php:42
+#: templates/personal.php:44
 msgid "Change password"
 msgstr "Ubah kata laluan"
 
-#: templates/personal.php:54 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:78
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:55
+#: templates/personal.php:57
 msgid "Your display name was changed"
 msgstr ""
 
-#: templates/personal.php:56
+#: templates/personal.php:58
 msgid "Unable to change your display name"
 msgstr ""
 
-#: templates/personal.php:59
+#: templates/personal.php:61
 msgid "Change display name"
 msgstr ""
 
-#: templates/personal.php:68
+#: templates/personal.php:70
 msgid "Email"
 msgstr "Emel"
 
-#: templates/personal.php:69
+#: templates/personal.php:72
 msgid "Your email address"
 msgstr "Alamat emel anda"
 
-#: templates/personal.php:70
+#: templates/personal.php:73
 msgid "Fill in an email address to enable password recovery"
 msgstr "Isi alamat emel anda untuk membolehkan pemulihan kata laluan"
 
-#: templates/personal.php:76 templates/personal.php:77
+#: templates/personal.php:79 templates/personal.php:80
 msgid "Language"
 msgstr "Bahasa"
 
-#: templates/personal.php:82
+#: templates/personal.php:86
 msgid "Help translate"
 msgstr "Bantu terjemah"
 
-#: templates/personal.php:87
+#: templates/personal.php:91
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:89
+#: templates/personal.php:93
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
diff --git a/l10n/ms_MY/user_ldap.po b/l10n/ms_MY/user_ldap.po
index 5d5fac287389f26d2191b2964870341ef60103d1..1fea18548a7ba79dfa3c6422022b2696192fb114 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-02-08 00:10+0100\n"
-"PO-Revision-Date: 2013-02-07 23:11+0000\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: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -21,17 +21,17 @@ msgstr ""
 msgid "Failed to delete the server configuration"
 msgstr ""
 
-#: ajax/testConfiguration.php:35
+#: ajax/testConfiguration.php:36
 msgid "The configuration is valid and the connection could be established!"
 msgstr ""
 
-#: ajax/testConfiguration.php:37
+#: ajax/testConfiguration.php:39
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
 msgstr ""
 
-#: ajax/testConfiguration.php:40
+#: ajax/testConfiguration.php:43
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
@@ -86,224 +86,248 @@ msgstr ""
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:17
+#: templates/settings.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:23
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:25
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:26
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:27
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:28
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:32
 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:24
+#: templates/settings.php:33
 msgid "Password"
 msgstr ""
 
-#: templates/settings.php:24
+#: templates/settings.php:36
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:37
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:40
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:41
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:42
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:45
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:46
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:47
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:50
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:51
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:55
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:34
+#: templates/settings.php:58
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:60
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:39
+#: templates/settings.php:63
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:65
+msgid "Cache Time-To-Live"
+msgstr ""
+
+#: templates/settings.php:65
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:67
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:47
+#: templates/settings.php:71
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:47 templates/settings.php:50
+#: templates/settings.php:71 templates/settings.php:74
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:74
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:75
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:77
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:79
+msgid "Quota Field"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Quota Default"
+msgstr ""
+
+#: templates/settings.php:80
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:81
+msgid "Email Field"
+msgstr ""
+
+#: templates/settings.php:82
+msgid "User Home Folder Naming Rule"
+msgstr ""
+
+#: templates/settings.php:82
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:62
+#: templates/settings.php:86
+msgid "Test Configuration"
+msgstr ""
+
+#: templates/settings.php:86
 msgid "Help"
 msgstr "Bantuan"
diff --git a/l10n/my_MM/core.po b/l10n/my_MM/core.po
new file mode 100644
index 0000000000000000000000000000000000000000..f7b5644106dfa0b8972e250ddd3f3f4cd263fbb6
--- /dev/null
+++ b/l10n/my_MM/core.po
@@ -0,0 +1,594 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# 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"
+"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"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: my_MM\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:767
+msgid "seconds ago"
+msgstr "စက္ကန့်အနည်းငယ်က"
+
+#: js/js.js:768
+msgid "1 minute ago"
+msgstr "၁ မိနစ်အရင်က"
+
+#: js/js.js:769
+msgid "{minutes} minutes ago"
+msgstr ""
+
+#: js/js.js:770
+msgid "1 hour ago"
+msgstr "၁ နာရီ အရင်က"
+
+#: js/js.js:771
+msgid "{hours} hours ago"
+msgstr ""
+
+#: js/js.js:772
+msgid "today"
+msgstr "ယနေ့"
+
+#: js/js.js:773
+msgid "yesterday"
+msgstr "မနေ့က"
+
+#: js/js.js:774
+msgid "{days} days ago"
+msgstr ""
+
+#: js/js.js:775
+msgid "last month"
+msgstr "ပြီးခဲ့သောလ"
+
+#: js/js.js:776
+msgid "{months} months ago"
+msgstr ""
+
+#: js/js.js:777
+msgid "months ago"
+msgstr ""
+
+#: js/js.js:778
+msgid "last year"
+msgstr "မနှစ်က"
+
+#: js/js.js:779
+msgid "years ago"
+msgstr "နှစ် အရင်က"
+
+#: js/oc-dialogs.js:126
+msgid "Choose"
+msgstr "ရွေးချယ်"
+
+#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+msgid "Cancel"
+msgstr "ပယ်ဖျက်မည်"
+
+#: js/oc-dialogs.js:162
+msgid "No"
+msgstr "မဟုတ်ဘူး"
+
+#: js/oc-dialogs.js:163
+msgid "Yes"
+msgstr "ဟုတ်"
+
+#: js/oc-dialogs.js:180
+msgid "Ok"
+msgstr "အိုကေ"
+
+#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
+#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
+msgid "The object type is not specified."
+msgstr ""
+
+#: js/oc-vcategories.js: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
+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:29 js/share.js:43 js/share.js:90
+msgid "Shared"
+msgstr ""
+
+#: js/share.js:93
+msgid "Share"
+msgstr ""
+
+#: js/share.js:141 js/share.js:622
+msgid "Error while sharing"
+msgstr ""
+
+#: js/share.js:152
+msgid "Error while unsharing"
+msgstr ""
+
+#: js/share.js:159
+msgid "Error while changing permissions"
+msgstr ""
+
+#: js/share.js:168
+msgid "Shared with you and the group {group} by {owner}"
+msgstr ""
+
+#: js/share.js:170
+msgid "Shared with you by {owner}"
+msgstr ""
+
+#: js/share.js:175
+msgid "Share with"
+msgstr ""
+
+#: js/share.js:180
+msgid "Share with link"
+msgstr ""
+
+#: js/share.js:183
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:185 templates/installation.php:46 templates/login.php:35
+msgid "Password"
+msgstr "စကားဝှက်"
+
+#: js/share.js:189
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:190
+msgid "Send"
+msgstr ""
+
+#: js/share.js:194
+msgid "Set expiration date"
+msgstr "သက်တမ်းကုန်ဆုံးမည့်ရက်သတ်မှတ်မည်"
+
+#: js/share.js:195
+msgid "Expiration date"
+msgstr "သက်တမ်းကုန်ဆုံးမည့်ရက်"
+
+#: js/share.js:227
+msgid "Share via email:"
+msgstr "အီးမေးလ်ဖြင့်ဝေမျှမည် -"
+
+#: js/share.js:229
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:256
+msgid "Resharing is not allowed"
+msgstr "ပြန်လည်ဝေမျှခြင်းခွင့်မပြုပါ"
+
+#: js/share.js:292
+msgid "Shared in {item} with {user}"
+msgstr ""
+
+#: js/share.js:313
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:325
+msgid "can edit"
+msgstr "ပြင်ဆင်နိုင်"
+
+#: js/share.js:327
+msgid "access control"
+msgstr ""
+
+#: js/share.js:330
+msgid "create"
+msgstr "ဖန်တီးမည်"
+
+#: js/share.js:333
+msgid "update"
+msgstr ""
+
+#: js/share.js:336
+msgid "delete"
+msgstr "ဖျက်မည်"
+
+#: js/share.js:339
+msgid "share"
+msgstr "ဝေမျှမည်"
+
+#: js/share.js:373 js/share.js:569
+msgid "Password protected"
+msgstr "စကားဝှက်ဖြင့်ကာကွယ်ထားသည်"
+
+#: js/share.js:582
+msgid "Error unsetting expiration date"
+msgstr ""
+
+#: js/share.js:594
+msgid "Error setting expiration date"
+msgstr ""
+
+#: js/share.js:609
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:620
+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:3
+msgid "You will receive a link to reset your password via Email."
+msgstr "အီးမေးလ်မှတစ်ဆင့် သင်၏စကားဝှက်ကို ပြန်ဖော်ရန်အတွက် Link တစ်ခုလက်ခံရရှိပါလိမ့်မယ်။"
+
+#: lostpassword/templates/lostpassword.php:5
+msgid "Reset email send."
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:8
+msgid "Request failed!"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:40
+#: templates/login.php:28
+msgid "Username"
+msgstr "သုံးစွဲသူအမည်"
+
+#: lostpassword/templates/lostpassword.php:14
+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 "Apps"
+
+#: 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:23 templates/installation.php:30
+msgid "Security Warning"
+msgstr "လုံခြုံရေးသတိပေးချက်"
+
+#: templates/installation.php:24
+msgid ""
+"No secure random number generator is available, please enable the PHP "
+"OpenSSL extension."
+msgstr ""
+
+#: templates/installation.php:25
+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
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
+#: templates/installation.php:32
+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
+msgid "Create an <strong>admin account</strong>"
+msgstr "<strong>အက်ဒမင်အကောင့်</strong>တစ်ခုဖန်တီးမည်"
+
+#: templates/installation.php:54
+msgid "Advanced"
+msgstr "အဆင့်မြင့်"
+
+#: templates/installation.php:56
+msgid "Data folder"
+msgstr "အချက်အလက်ဖိုလ်ဒါလ်"
+
+#: templates/installation.php:65
+msgid "Configure the database"
+msgstr ""
+
+#: templates/installation.php:70 templates/installation.php:82
+#: templates/installation.php:93 templates/installation.php:104
+msgid "will be used"
+msgstr ""
+
+#: templates/installation.php:117
+msgid "Database user"
+msgstr "Database သုံးစွဲသူ"
+
+#: templates/installation.php:122
+msgid "Database password"
+msgstr "Database စကားဝှက်"
+
+#: templates/installation.php:127
+msgid "Database name"
+msgstr "Database အမည်"
+
+#: templates/installation.php:137
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:144
+msgid "Database host"
+msgstr ""
+
+#: templates/installation.php:150
+msgid "Finish setup"
+msgstr "တပ်ဆင်ခြင်းပြီးပါပြီ။"
+
+#: templates/layout.guest.php:35
+msgid "web services under your control"
+msgstr "သင်၏ထိန်းချုပ်မှု့အောက်တွင်ရှိသော Web services"
+
+#: templates/layout.user.php:53
+msgid "Log out"
+msgstr ""
+
+#: templates/login.php:10
+msgid "Automatic logon rejected!"
+msgstr ""
+
+#: templates/login.php:11
+msgid ""
+"If you did not change your password recently, your account may be "
+"compromised!"
+msgstr ""
+
+#: templates/login.php:13
+msgid "Please change your password to secure your account again."
+msgstr ""
+
+#: templates/login.php:19
+msgid "Lost your password?"
+msgstr "သင်၏စကားဝှက်ပျောက်သွားပြီလား။"
+
+#: templates/login.php:41
+msgid "remember"
+msgstr "မှတ်မိစေသည်"
+
+#: templates/login.php:43
+msgid "Log in"
+msgstr "ဝင်ရောက်ရန်"
+
+#: templates/login.php:49
+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/my_MM/files.po b/l10n/my_MM/files.po
new file mode 100644
index 0000000000000000000000000000000000000000..81075d343ca4f0308b38d6aaf95b29bf0d686da5
--- /dev/null
+++ b/l10n/my_MM/files.po
@@ -0,0 +1,315 @@
+# 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-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: 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"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: my_MM\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/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 ""
+
+#: 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:82
+msgid "Invalid directory."
+msgstr ""
+
+#: appinfo/app.php:10
+msgid "Files"
+msgstr "ဖိုင်များ"
+
+#: js/fileactions.js:125
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:127 templates/index.php:92 templates/index.php:93
+msgid "Delete"
+msgstr ""
+
+#: js/fileactions.js:193
+msgid "Rename"
+msgstr ""
+
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
+msgid "Pending"
+msgstr ""
+
+#: js/filelist.js:251 js/filelist.js:253
+msgid "{new_name} already exists"
+msgstr ""
+
+#: js/filelist.js:251 js/filelist.js:253
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:251
+msgid "suggest name"
+msgstr ""
+
+#: js/filelist.js:251 js/filelist.js:253
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:298
+msgid "replaced {new_name} with {old_name}"
+msgstr ""
+
+#: js/filelist.js:298
+msgid "undo"
+msgstr ""
+
+#: js/filelist.js:323
+msgid "perform delete operation"
+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:225
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
+
+#: js/files.js:262
+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"
+msgstr ""
+
+#: js/files.js:388 js/files.js:423
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:497
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/files.js:570
+msgid "URL cannot be empty."
+msgstr ""
+
+#: js/files.js:575
+msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
+msgstr ""
+
+#: js/files.js:953 templates/index.php:68
+msgid "Name"
+msgstr ""
+
+#: js/files.js:954 templates/index.php:79
+msgid "Size"
+msgstr ""
+
+#: js/files.js:955 templates/index.php:81
+msgid "Modified"
+msgstr ""
+
+#: js/files.js:974
+msgid "1 folder"
+msgstr ""
+
+#: js/files.js:976
+msgid "{count} folders"
+msgstr ""
+
+#: js/files.js:984
+msgid "1 file"
+msgstr ""
+
+#: js/files.js:986
+msgid "{count} files"
+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:40
+msgid "Deleted files"
+msgstr ""
+
+#: templates/index.php:46
+msgid "Cancel upload"
+msgstr ""
+
+#: templates/index.php:53
+msgid "You don’t have write permissions here."
+msgstr ""
+
+#: templates/index.php:60
+msgid "Nothing in here. Upload something!"
+msgstr ""
+
+#: templates/index.php:74
+msgid "Download"
+msgstr "ဒေါင်းလုတ်"
+
+#: templates/index.php:86 templates/index.php:87
+msgid "Unshare"
+msgstr ""
+
+#: templates/index.php:106
+msgid "Upload too large"
+msgstr ""
+
+#: templates/index.php:108
+msgid ""
+"The files you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: templates/index.php:113
+msgid "Files are being scanned, please wait."
+msgstr ""
+
+#: templates/index.php:116
+msgid "Current scanning"
+msgstr ""
+
+#: templates/upgrade.php:2
+msgid "Upgrading filesystem cache..."
+msgstr ""
diff --git a/l10n/my_MM/files_encryption.po b/l10n/my_MM/files_encryption.po
new file mode 100644
index 0000000000000000000000000000000000000000..e6b714b2cb460fbd85c758c882e31530d92ae51b
--- /dev/null
+++ b/l10n/my_MM/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-02-21 00:14+0100\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: my_MM\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/my_MM/files_external.po b/l10n/my_MM/files_external.po
new file mode 100644
index 0000000000000000000000000000000000000000..9d597dfe54579944d0c0377b7021337955c3e156
--- /dev/null
+++ b/l10n/my_MM/files_external.po
@@ -0,0 +1,116 @@
+# 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-02-28 00:04+0100\n"
+"PO-Revision-Date: 2013-02-27 23:04+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: 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"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: my_MM\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:421
+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
+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 ""
+
+#: 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/my_MM/files_sharing.po b/l10n/my_MM/files_sharing.po
new file mode 100644
index 0000000000000000000000000000000000000000..b960c995af19b0114235c3ac8feb258fceff3f68
--- /dev/null
+++ b/l10n/my_MM/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-02-27 14:34+0100\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: my_MM\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:37
+msgid "Download"
+msgstr "ဒေါင်းလုတ်"
+
+#: templates/public.php:34
+msgid "No preview available for"
+msgstr ""
+
+#: templates/public.php:43
+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
new file mode 100644
index 0000000000000000000000000000000000000000..f0875b29e8568b60956b174f2e6ee2b9fe032b06
--- /dev/null
+++ b/l10n/my_MM/files_trashbin.po
@@ -0,0 +1,80 @@
+# 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-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: 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"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: my_MM\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ajax/delete.php:40
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:41
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/trash.js:7 js/trash.js:96
+msgid "perform restore operation"
+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/my_MM/files_versions.po b/l10n/my_MM/files_versions.po
new file mode 100644
index 0000000000000000000000000000000000000000..1bb8d9af22056ce56755ffeb0b6259f52943fb98
--- /dev/null
+++ b/l10n/my_MM/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-02-28 00:04+0100\n"
+"PO-Revision-Date: 2013-02-27 23:04+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: 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"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: my_MM\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:68
+msgid "No old versions available"
+msgstr ""
+
+#: history.php:73
+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/my_MM/lib.po b/l10n/my_MM/lib.po
new file mode 100644
index 0000000000000000000000000000000000000000..eae78215aa05cc19ac33b4ae7691bd9c3ca41964
--- /dev/null
+++ b/l10n/my_MM/lib.po
@@ -0,0 +1,259 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# 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"
+"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"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: my_MM\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 "Apps"
+
+#: app.php:406
+msgid "Admin"
+msgstr "အက်ဒမင်"
+
+#: files.php:202
+msgid "ZIP download is turned off."
+msgstr "ZIP ဒေါင်းလုတ်ကိုပိတ်ထားသည်"
+
+#: files.php:203
+msgid "Files need to be downloaded one by one."
+msgstr "ဖိုင်များသည် တစ်ခုပြီး တစ်ခုဒေါင်းလုတ်ချရန်လိုအပ်သည်"
+
+#: files.php:204 files.php:231
+msgid "Back to Files"
+msgstr "ဖိုင်သို့ပြန်သွားမည်"
+
+#: files.php:228
+msgid "Selected files too large to generate zip file."
+msgstr "zip ဖိုင်အဖြစ်ပြုလုပ်ရန် ရွေးချယ်ထားသောဖိုင်များသည် အရမ်းကြီးလွန်းသည်"
+
+#: 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:40
+msgid "Specify a data folder."
+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:128 setup.php:320 setup.php:365
+msgid "PostgreSQL username and/or password not valid"
+msgstr ""
+
+#: setup.php:129 setup.php:152 setup.php:229
+msgid "You need to enter either an existing account or the administrator."
+msgstr ""
+
+#: setup.php:151 setup.php:453 setup.php:520
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:228
+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
+#, 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
+#, php-format
+msgid "Offending command was: \"%s\""
+msgstr ""
+
+#: setup.php:299
+#, php-format
+msgid "MySQL user '%s'@'localhost' exists already."
+msgstr ""
+
+#: setup.php:300
+msgid "Drop this user from MySQL"
+msgstr ""
+
+#: setup.php:305
+#, php-format
+msgid "MySQL user '%s'@'%%' already exists"
+msgstr ""
+
+#: setup.php:306
+msgid "Drop this user from MySQL."
+msgstr ""
+
+#: setup.php:579 setup.php:611
+#, php-format
+msgid "Offending command was: \"%s\", name: %s, password: %s"
+msgstr ""
+
+#: setup.php:631
+#, php-format
+msgid "MS SQL username and/or password not valid: %s"
+msgstr ""
+
+#: setup.php:849
+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
+#, 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 "%d မိနစ်အရင်က"
+
+#: template.php:116
+msgid "1 hour ago"
+msgstr "၁ နာရီ အရင်က"
+
+#: 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 "နှစ် အရင်က"
+
+#: 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\""
+msgstr "\"%s\"ခေါင်းစဉ်ကို ရှာမတွေ့ပါ"
diff --git a/l10n/my_MM/settings.po b/l10n/my_MM/settings.po
new file mode 100644
index 0000000000000000000000000000000000000000..4e5175098a3ce1b6847ceddcbe1426e4e6f7eac7
--- /dev/null
+++ b/l10n/my_MM/settings.po
@@ -0,0 +1,496 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-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: 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"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: my_MM\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:23 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"
+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
+msgid "Enable"
+msgstr ""
+
+#: js/apps.js:55
+msgid "Please wait...."
+msgstr ""
+
+#: js/apps.js:84
+msgid "Updating...."
+msgstr ""
+
+#: js/apps.js:87
+msgid "Error while updating app"
+msgstr ""
+
+#: js/apps.js:87
+msgid "Error"
+msgstr ""
+
+#: js/apps.js:90
+msgid "Updated"
+msgstr ""
+
+#: js/personal.js:99
+msgid "Saving..."
+msgstr ""
+
+#: js/users.js:30
+msgid "deleted"
+msgstr ""
+
+#: js/users.js:30
+msgid "undo"
+msgstr ""
+
+#: js/users.js:62
+msgid "Unable to remove user"
+msgstr ""
+
+#: js/users.js:75 templates/users.php:26 templates/users.php:80
+#: templates/users.php:105
+msgid "Groups"
+msgstr ""
+
+#: js/users.js:78 templates/users.php:82 templates/users.php:119
+msgid "Group Admin"
+msgstr ""
+
+#: js/users.js:99 templates/users.php:161
+msgid "Delete"
+msgstr ""
+
+#: js/users.js:191
+msgid "add group"
+msgstr ""
+
+#: js/users.js:352
+msgid "A valid username must be provided"
+msgstr ""
+
+#: js/users.js:353 js/users.js:359 js/users.js:374
+msgid "Error creating user"
+msgstr ""
+
+#: js/users.js:358
+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:223
+msgid "More"
+msgstr ""
+
+#: templates/admin.php:230 templates/personal.php:102
+msgid "Version"
+msgstr ""
+
+#: templates/admin.php:233 templates/personal.php:105
+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:79
+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:78
+msgid "Display Name"
+msgstr ""
+
+#: templates/personal.php:57
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:58
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:61
+msgid "Change display name"
+msgstr ""
+
+#: templates/personal.php:70
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:72
+msgid "Your email address"
+msgstr ""
+
+#: templates/personal.php:73
+msgid "Fill in an email address to enable password recovery"
+msgstr ""
+
+#: templates/personal.php:79 templates/personal.php:80
+msgid "Language"
+msgstr ""
+
+#: templates/personal.php:86
+msgid "Help translate"
+msgstr ""
+
+#: templates/personal.php:91
+msgid "WebDAV"
+msgstr ""
+
+#: templates/personal.php:93
+msgid "Use this address to connect to your ownCloud in your file manager"
+msgstr ""
+
+#: templates/users.php:21 templates/users.php:77
+msgid "Login Name"
+msgstr ""
+
+#: templates/users.php:32
+msgid "Create"
+msgstr ""
+
+#: templates/users.php:35
+msgid "Default Storage"
+msgstr ""
+
+#: templates/users.php:41 templates/users.php:139
+msgid "Unlimited"
+msgstr ""
+
+#: templates/users.php:59 templates/users.php:154
+msgid "Other"
+msgstr ""
+
+#: templates/users.php:84
+msgid "Storage"
+msgstr ""
+
+#: templates/users.php:95
+msgid "change display name"
+msgstr ""
+
+#: templates/users.php:99
+msgid "set new password"
+msgstr ""
+
+#: templates/users.php:134
+msgid "Default"
+msgstr ""
diff --git a/l10n/my_MM/user_ldap.po b/l10n/my_MM/user_ldap.po
new file mode 100644
index 0000000000000000000000000000000000000000..14b74ed4d5cb327e6b1ef8edf2f2759bf5227296
--- /dev/null
+++ b/l10n/my_MM/user_ldap.po
@@ -0,0 +1,333 @@
+# 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-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: 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"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: my_MM\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: 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:121
+msgid "Connection test succeeded"
+msgstr ""
+
+#: js/settings.js:126
+msgid "Connection test failed"
+msgstr ""
+
+#: js/settings.js:136
+msgid "Do you really want to delete the current Server Configuration?"
+msgstr ""
+
+#: js/settings.js:137
+msgid "Confirm Deletion"
+msgstr ""
+
+#: templates/settings.php:8
+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
+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
+msgid "Server configuration"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Add Server Configuration"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:25
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:27
+msgid "One Base DN per line"
+msgstr ""
+
+#: templates/settings.php:28
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:30
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:32
+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
+msgid "Password"
+msgstr "စကားဝှက်"
+
+#: templates/settings.php:36
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:37
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:40
+#, 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
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:42
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:45
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:46
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:47
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:50
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:51
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:55
+msgid "Connection Settings"
+msgstr ""
+
+#: templates/settings.php:57
+msgid "Configuration Active"
+msgstr ""
+
+#: templates/settings.php:57
+msgid "When unchecked, this configuration will be skipped."
+msgstr ""
+
+#: templates/settings.php:58
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:59
+msgid "Backup (Replica) Host"
+msgstr ""
+
+#: templates/settings.php:59
+msgid ""
+"Give an optional backup host. It must be a replica of the main LDAP/AD "
+"server."
+msgstr ""
+
+#: templates/settings.php:60
+msgid "Backup (Replica) Port"
+msgstr ""
+
+#: templates/settings.php:61
+msgid "Disable Main Server"
+msgstr ""
+
+#: templates/settings.php:61
+msgid "When switched on, ownCloud will only connect to the replica server."
+msgstr ""
+
+#: templates/settings.php:62
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:62
+msgid "Do not use it additionally for LDAPS connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:63
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:64
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:65
+msgid "Cache Time-To-Live"
+msgstr ""
+
+#: templates/settings.php:65
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:67
+msgid "Directory Settings"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:70
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:70
+msgid "One User Base DN per line"
+msgstr ""
+
+#: templates/settings.php:71
+msgid "User Search Attributes"
+msgstr ""
+
+#: templates/settings.php:71 templates/settings.php:74
+msgid "Optional; one attribute per line"
+msgstr ""
+
+#: templates/settings.php:72
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:72
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:73
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:73
+msgid "One Group Base DN per line"
+msgstr ""
+
+#: templates/settings.php:74
+msgid "Group Search Attributes"
+msgstr ""
+
+#: templates/settings.php:75
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:77
+msgid "Special Attributes"
+msgstr ""
+
+#: templates/settings.php:79
+msgid "Quota Field"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Quota Default"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:81
+msgid "Email Field"
+msgstr ""
+
+#: templates/settings.php:82
+msgid "User Home Folder Naming Rule"
+msgstr ""
+
+#: templates/settings.php:82
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:86
+msgid "Test Configuration"
+msgstr ""
+
+#: templates/settings.php:86
+msgid "Help"
+msgstr "အကူအညီ"
diff --git a/l10n/my_MM/user_webdavauth.po b/l10n/my_MM/user_webdavauth.po
new file mode 100644
index 0000000000000000000000000000000000000000..45d8ff660d388dd101717e231cf7dd418558d14f
--- /dev/null
+++ b/l10n/my_MM/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-02-21 00:14+0100\n"
+"PO-Revision-Date: 2012-11-09 09:06+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: my_MM\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/nb_NO/core.po b/l10n/nb_NO/core.po
index 4890e17c6142f9d3d596c2e432771c4e93ec009b..2f2ef834aacea5743d1d6ebd6a04a9cedc3a52f7 100644
--- a/l10n/nb_NO/core.po
+++ b/l10n/nb_NO/core.po
@@ -14,8 +14,8 @@ 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 14:32+0000\n"
+"POT-Creation-Date: 2013-03-07 00:16+0100\n"
+"PO-Revision-Date: 2013-03-06 10: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"
@@ -24,24 +24,24 @@ msgstr ""
 "Language: nb_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 ""
 
-#: 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 "
@@ -87,79 +87,79 @@ msgstr "Ingen kategorier merket for sletting."
 msgid "Error removing %s from favorites."
 msgstr ""
 
-#: 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 "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"
 
@@ -167,55 +167,55 @@ msgstr "Desember"
 msgid "Settings"
 msgstr "Innstillinger"
 
-#: js/js.js:767
+#: js/js.js:777
 msgid "seconds ago"
 msgstr "sekunder siden"
 
-#: js/js.js:768
+#: js/js.js:778
 msgid "1 minute ago"
 msgstr "1 minutt siden"
 
-#: js/js.js:769
+#: js/js.js:779
 msgid "{minutes} minutes ago"
 msgstr "{minutes} minutter siden"
 
-#: js/js.js:770
+#: js/js.js:780
 msgid "1 hour ago"
 msgstr "1 time siden"
 
-#: js/js.js:771
+#: js/js.js:781
 msgid "{hours} hours ago"
 msgstr "{hours} timer siden"
 
-#: js/js.js:772
+#: js/js.js:782
 msgid "today"
 msgstr "i dag"
 
-#: js/js.js:773
+#: js/js.js:783
 msgid "yesterday"
 msgstr "i går"
 
-#: js/js.js:774
+#: js/js.js:784
 msgid "{days} days ago"
 msgstr "{days} dager siden"
 
-#: js/js.js:775
+#: js/js.js:785
 msgid "last month"
 msgstr "forrige måned"
 
-#: js/js.js:776
+#: js/js.js:786
 msgid "{months} months ago"
 msgstr "{months} måneder siden"
 
-#: js/js.js:777
+#: js/js.js:787
 msgid "months ago"
 msgstr "måneder siden"
 
-#: js/js.js:778
+#: js/js.js:788
 msgid "last year"
 msgstr "forrige år"
 
-#: js/js.js:779
+#: js/js.js:789
 msgid "years ago"
 msgstr "år siden"
 
@@ -298,7 +298,7 @@ msgstr "Del med link"
 msgid "Password protect"
 msgstr "Passordbeskyttet"
 
-#: js/share.js:185 templates/installation.php:44 templates/login.php:35
+#: js/share.js:185 templates/installation.php:47 templates/login.php:35
 msgid "Password"
 msgstr "Passord"
 
@@ -393,7 +393,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 "Tilbakestill ownCloud passord"
 
@@ -413,7 +413,7 @@ msgstr ""
 msgid "Request failed!"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:39
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:41
 #: templates/login.php:28
 msgid "Username"
 msgstr "Brukernavn"
@@ -474,85 +474,86 @@ msgstr "Rediger kategorier"
 msgid "Add"
 msgstr "Legg til"
 
-#: templates/installation.php:23 templates/installation.php:30
+#: templates/installation.php:24 templates/installation.php:31
 msgid "Security Warning"
 msgstr "Sikkerhetsadvarsel"
 
-#: templates/installation.php:24
+#: templates/installation.php:25
 msgid ""
 "No secure random number generator is available, please enable the PHP "
 "OpenSSL extension."
 msgstr ""
 
-#: templates/installation.php:25
+#: templates/installation.php:26
 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:32
 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:33
 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:37
 msgid "Create an <strong>admin account</strong>"
 msgstr "opprett en <strong>administrator-konto</strong>"
 
-#: templates/installation.php:52
+#: templates/installation.php:55
 msgid "Advanced"
 msgstr "Avansert"
 
-#: templates/installation.php:54
+#: templates/installation.php:57
 msgid "Data folder"
 msgstr "Datamappe"
 
-#: templates/installation.php:61
+#: templates/installation.php:66
 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:71 templates/installation.php:83
+#: templates/installation.php:94 templates/installation.php:105
+#: templates/installation.php:117
 msgid "will be used"
 msgstr "vil bli brukt"
 
-#: templates/installation.php:109
+#: templates/installation.php:129
 msgid "Database user"
 msgstr "Databasebruker"
 
-#: templates/installation.php:113
+#: templates/installation.php:134
 msgid "Database password"
 msgstr "Databasepassord"
 
-#: templates/installation.php:117
+#: templates/installation.php:139
 msgid "Database name"
 msgstr "Databasenavn"
 
-#: templates/installation.php:125
+#: templates/installation.php:149
 msgid "Database tablespace"
 msgstr "Database tabellområde"
 
-#: templates/installation.php:131
+#: templates/installation.php:156
 msgid "Database host"
 msgstr "Databasevert"
 
-#: templates/installation.php:136
+#: templates/installation.php:162
 msgid "Finish setup"
 msgstr "Fullfør oppsetting"
 
-#: templates/layout.guest.php:33
+#: templates/layout.guest.php:40
 msgid "web services under your control"
 msgstr "nettjenester under din kontroll"
 
-#: templates/layout.user.php:48
+#: templates/layout.user.php:58
 msgid "Log out"
 msgstr "Logg ut"
 
diff --git a/l10n/nb_NO/files.po b/l10n/nb_NO/files.po
index 7669736496065c372dc6222d31a1e873950fdde0..eb634477210f945367a6103b29387493471367c7 100644
--- a/l10n/nb_NO/files.po
+++ b/l10n/nb_NO/files.po
@@ -16,8 +16,8 @@ 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 23:05+0000\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"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -59,27 +59,27 @@ msgid ""
 "the HTML form"
 msgstr "Filstørrelsen overskrider maksgrensen på MAX_FILE_SIZE som ble oppgitt i HTML-skjemaet"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
 msgstr "Filopplastningen ble bare delvis gjennomført"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:31
 msgid "No file was uploaded"
 msgstr "Ingen fil ble lastet opp"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:32
 msgid "Missing a temporary folder"
 msgstr "Mangler en midlertidig mappe"
 
-#: ajax/upload.php:34
+#: ajax/upload.php:33
 msgid "Failed to write to disk"
 msgstr "Klarte ikke å skrive til disk"
 
-#: ajax/upload.php:52
+#: ajax/upload.php:51
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:83
+#: ajax/upload.php:82
 msgid "Invalid directory."
 msgstr ""
 
@@ -89,9 +89,9 @@ msgstr "Filer"
 
 #: js/fileactions.js:125
 msgid "Delete permanently"
-msgstr ""
+msgstr "Slett permanent"
 
-#: js/fileactions.js:127 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:127 templates/index.php:92 templates/index.php:93
 msgid "Delete"
 msgstr "Slett"
 
@@ -99,40 +99,36 @@ msgstr "Slett"
 msgid "Rename"
 msgstr "Omdøp"
 
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:293 js/files.js:409
+#: js/files.js:440
 msgid "Pending"
 msgstr "Ventende"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "{new_name} already exists"
 msgstr "{new_name} finnes allerede"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "replace"
 msgstr "erstatt"
 
-#: js/filelist.js:253
+#: js/filelist.js:251
 msgid "suggest name"
 msgstr "foreslå navn"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "cancel"
 msgstr "avbryt"
 
-#: js/filelist.js:295
-msgid "replaced {new_name}"
-msgstr "erstatt {new_name}"
+#: js/filelist.js:298
+msgid "replaced {new_name} with {old_name}"
+msgstr "erstatt {new_name} med {old_name}"
 
-#: js/filelist.js:295 js/filelist.js:297
+#: js/filelist.js:298
 msgid "undo"
 msgstr "angre"
 
-#: js/filelist.js:297
-msgid "replaced {new_name} with {old_name}"
-msgstr "erstatt {new_name} med {old_name}"
-
-#: js/filelist.js:322
+#: js/filelist.js:323
 msgid "perform delete operation"
 msgstr ""
 
@@ -158,74 +154,74 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:224
+#: js/files.js:226
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:261
+#: js/files.js:263
 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:261
+#: js/files.js:263
 msgid "Upload Error"
 msgstr "Opplasting feilet"
 
-#: js/files.js:272
+#: js/files.js:274
 msgid "Close"
 msgstr "Lukk"
 
-#: js/files.js:311
+#: js/files.js:313
 msgid "1 file uploading"
 msgstr "1 fil lastes opp"
 
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:316 js/files.js:371 js/files.js:386
 msgid "{count} files uploading"
 msgstr "{count} filer laster opp"
 
-#: js/files.js:387 js/files.js:422
+#: js/files.js:389 js/files.js:424
 msgid "Upload cancelled."
 msgstr "Opplasting avbrutt."
 
-#: js/files.js:496
+#: js/files.js:498
 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:569
+#: js/files.js:571
 msgid "URL cannot be empty."
 msgstr "URL-en kan ikke være tom."
 
-#: js/files.js:574
+#: js/files.js:576
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:954 templates/index.php:68
 msgid "Name"
 msgstr "Navn"
 
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:955 templates/index.php:79
 msgid "Size"
 msgstr "Størrelse"
 
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:956 templates/index.php:81
 msgid "Modified"
 msgstr "Endret"
 
-#: js/files.js:969
+#: js/files.js:975
 msgid "1 folder"
 msgstr "1 mappe"
 
-#: js/files.js:971
+#: js/files.js:977
 msgid "{count} folders"
 msgstr "{count} mapper"
 
-#: js/files.js:979
+#: js/files.js:985
 msgid "1 file"
 msgstr "1 fil"
 
-#: js/files.js:981
+#: js/files.js:987
 msgid "{count} files"
 msgstr "{count} filer"
 
@@ -289,33 +285,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr "Avbryt opplasting"
 
-#: templates/index.php:59
+#: templates/index.php:53
+msgid "You don’t have write permissions here."
+msgstr ""
+
+#: templates/index.php:60
 msgid "Nothing in here. Upload something!"
 msgstr "Ingenting her. Last opp noe!"
 
-#: templates/index.php:73
+#: templates/index.php:74
 msgid "Download"
 msgstr "Last ned"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:86 templates/index.php:87
 msgid "Unshare"
 msgstr "Avslutt deling"
 
-#: templates/index.php:105
+#: templates/index.php:106
 msgid "Upload too large"
 msgstr "Opplasting for stor"
 
-#: templates/index.php:107
+#: templates/index.php:108
 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:112
+#: templates/index.php:113
 msgid "Files are being scanned, please wait."
 msgstr "Skanner etter filer, vennligst vent."
 
-#: templates/index.php:115
+#: templates/index.php:116
 msgid "Current scanning"
 msgstr "Pågående skanning"
 
diff --git a/l10n/nb_NO/files_encryption.po b/l10n/nb_NO/files_encryption.po
index 7be43b41df8fbfb3b0096b8c82578194cf320a7d..50026411075873ff84c3d091eea8778129e4e87f 100644
--- a/l10n/nb_NO/files_encryption.po
+++ b/l10n/nb_NO/files_encryption.po
@@ -4,13 +4,14 @@
 # 
 # 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-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-03-07 00:16+0100\n"
+"PO-Revision-Date: 2013-03-06 15:13+0000\n"
+"Last-Translator: troll <oyvind.hojem@gmail.com>\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"
@@ -24,15 +25,15 @@ msgstr "Kryptering"
 
 #: templates/settings-personal.php:7
 msgid "File encryption is enabled."
-msgstr ""
+msgstr "Fil-kryptering er aktivert."
 
 #: templates/settings-personal.php:11
 msgid "The following file types will not be encrypted:"
-msgstr ""
+msgstr "Følgende filtyper vil ikke bli kryptert:"
 
 #: templates/settings.php:7
 msgid "Exclude the following file types from encryption:"
-msgstr ""
+msgstr "Ekskluder følgende filtyper fra kryptering:"
 
 #: templates/settings.php:12
 msgid "None"
diff --git a/l10n/nb_NO/files_external.po b/l10n/nb_NO/files_external.po
index 1888463488e7af817f6988e9b6401f47704fafa4..5ce4c85c3bcfcad036e47763e2d152aa862ed66a 100644
--- a/l10n/nb_NO/files_external.po
+++ b/l10n/nb_NO/files_external.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 #   <ajarmund@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: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-11 23:22+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "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,37 +19,33 @@ msgstr ""
 "Language: nb_NO\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 ""
+msgstr "Tilgang innvilget"
 
-#: 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 ""
+msgstr "Feil ved konfigurering av Dropbox-lagring"
 
-#: 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 ""
+msgstr "Gi tilgang"
 
-#: 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:421
 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:424
 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 "
@@ -57,65 +54,65 @@ msgstr ""
 
 #: templates/settings.php:3
 msgid "External Storage"
-msgstr ""
+msgstr "Ekstern lagring"
 
-#: templates/settings.php:8 templates/settings.php:22
-msgid "Mount point"
-msgstr ""
-
-#: templates/settings.php:9
-msgid "Backend"
-msgstr ""
+#: templates/settings.php:9 templates/settings.php:28
+msgid "Folder name"
+msgstr "Mappenavn"
 
 #: templates/settings.php:10
+msgid "External storage"
+msgstr "Ekstern lagringsplass"
+
+#: templates/settings.php:11
 msgid "Configuration"
 msgstr "Konfigurasjon"
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid "Options"
 msgstr "Innstillinger"
 
-#: templates/settings.php:12
+#: templates/settings.php:13
 msgid "Applicable"
-msgstr ""
+msgstr "Anvendelig"
 
-#: templates/settings.php:27
-msgid "Add mount point"
-msgstr ""
+#: templates/settings.php:33
+msgid "Add storage"
+msgstr "Legg til lagringsplass"
 
-#: templates/settings.php:85
+#: templates/settings.php:90
 msgid "None set"
-msgstr ""
+msgstr "Ingen valgt"
 
-#: templates/settings.php:86
+#: templates/settings.php:91
 msgid "All Users"
 msgstr "Alle brukere"
 
-#: templates/settings.php:87
+#: templates/settings.php:92
 msgid "Groups"
 msgstr "Grupper"
 
-#: templates/settings.php:95
+#: templates/settings.php:100
 msgid "Users"
 msgstr "Brukere"
 
-#: 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 "Slett"
 
-#: templates/settings.php:124
+#: templates/settings.php:129
 msgid "Enable User External Storage"
-msgstr ""
+msgstr "Aktiver ekstern lagring for bruker"
 
-#: templates/settings.php:125
+#: templates/settings.php:130
 msgid "Allow users to mount their own external storage"
-msgstr ""
+msgstr "Tillat brukere å koble til egne eksterne lagringsmedium"
 
-#: templates/settings.php:139
+#: templates/settings.php:141
 msgid "SSL root certificates"
-msgstr ""
+msgstr "SSL root-sertifikater"
 
-#: templates/settings.php:158
+#: templates/settings.php:159
 msgid "Import Root Certificate"
-msgstr ""
+msgstr "Importer root-sertifikat"
diff --git a/l10n/nb_NO/files_trashbin.po b/l10n/nb_NO/files_trashbin.po
index d745e9794017b98a11651bbd53e44978cdbb1653..19998898cf628034a8419dadb421d44f8527cd6e 100644
--- a/l10n/nb_NO/files_trashbin.po
+++ b/l10n/nb_NO/files_trashbin.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# 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-02-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 10:07+0000\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: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -17,52 +18,64 @@ msgstr ""
 "Language: nb_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:22
+#: ajax/delete.php:40
 #, php-format
 msgid "Couldn't delete %s permanently"
-msgstr ""
+msgstr "Kunne ikke slette %s fullstendig"
 
 #: ajax/undelete.php:41
 #, php-format
 msgid "Couldn't restore %s"
-msgstr ""
+msgstr "Kunne ikke gjenopprette %s"
 
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
 msgid "perform restore operation"
-msgstr ""
+msgstr "utfør gjenopprettings operasjon"
 
-#: js/trash.js:33
+#: js/trash.js:34
 msgid "delete file permanently"
-msgstr ""
+msgstr "slett filer permanent"
+
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr "Slett permanent"
 
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:174 templates/index.php:17
 msgid "Name"
 msgstr "Navn"
 
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:175 templates/index.php:27
 msgid "Deleted"
-msgstr ""
+msgstr "Slettet"
 
-#: js/trash.js:135
+#: js/trash.js:184
 msgid "1 folder"
 msgstr "1 mappe"
 
-#: js/trash.js:137
+#: js/trash.js:186
 msgid "{count} folders"
 msgstr "{count} mapper"
 
-#: js/trash.js:145
+#: js/trash.js:194
 msgid "1 file"
 msgstr "1 fil"
 
-#: js/trash.js:147
+#: js/trash.js:196
 msgid "{count} files"
 msgstr "{count} filer"
 
 #: templates/index.php:9
 msgid "Nothing in here. Your trash bin is empty!"
-msgstr ""
+msgstr "Ingenting her. Søppelkassen din er tom!"
 
 #: templates/index.php:20 templates/index.php:22
 msgid "Restore"
+msgstr "Gjenopprett"
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr "Slett"
+
+#: templates/part.breadcrumb.php:9
+msgid "Deleted Files"
 msgstr ""
diff --git a/l10n/nb_NO/files_versions.po b/l10n/nb_NO/files_versions.po
index 4441ba7870d81331942d0e6a81f55cc362271571..b918fa61b6b4e013e2b6d164d1e52c1299228182 100644
--- a/l10n/nb_NO/files_versions.po
+++ b/l10n/nb_NO/files_versions.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-08 00:10+0100\n"
-"PO-Revision-Date: 2013-02-07 23:11+0000\n"
+"POT-Creation-Date: 2013-02-28 00:04+0100\n"
+"PO-Revision-Date: 2013-02-27 23:04+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -50,18 +50,10 @@ msgstr ""
 msgid "No path specified"
 msgstr ""
 
-#: js/versions.js:16
-msgid "History"
-msgstr "Historie"
+#: 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 ""
-
-#: templates/settings.php:3
-msgid "Files Versioning"
-msgstr "Fil versjonering"
-
-#: templates/settings.php:4
-msgid "Enable"
-msgstr "Aktiver"
diff --git a/l10n/nb_NO/lib.po b/l10n/nb_NO/lib.po
index 440e6fdc2866b039544582f40b4a418b05591e2a..37a6960c9820962bf9ee97ca2622720c8628c173 100644
--- a/l10n/nb_NO/lib.po
+++ b/l10n/nb_NO/lib.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-11 15:39+0100\n"
-"PO-Revision-Date: 2013-02-11 14:41+0000\n"
+"POT-Creation-Date: 2013-03-07 00:16+0100\n"
+"PO-Revision-Date: 2013-03-06 10: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"
@@ -22,27 +22,27 @@ msgstr ""
 "Language: nb_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:339
+#: app.php:349
 msgid "Help"
 msgstr "Hjelp"
 
-#: app.php:346
+#: app.php:362
 msgid "Personal"
 msgstr "Personlig"
 
-#: app.php:351
+#: app.php:373
 msgid "Settings"
 msgstr "Innstillinger"
 
-#: app.php:356
+#: app.php:385
 msgid "Users"
 msgstr "Brukere"
 
-#: app.php:363
+#: app.php:398
 msgid "Apps"
 msgstr "Apper"
 
-#: app.php:365
+#: app.php:406
 msgid "Admin"
 msgstr "Admin"
 
@@ -54,15 +54,15 @@ msgstr "ZIP-nedlasting av avslått"
 msgid "Files need to be downloaded one by one."
 msgstr "Filene må lastes ned en om gangen"
 
-#: files.php:203 files.php:228
+#: files.php:204 files.php:231
 msgid "Back to Files"
 msgstr "Tilbake til filer"
 
-#: files.php:227
+#: files.php:228
 msgid "Selected files too large to generate zip file."
 msgstr "De valgte filene er for store til å kunne generere ZIP-fil"
 
-#: helper.php:226
+#: helper.php:228
 msgid "couldn't be determined"
 msgstr ""
 
@@ -102,87 +102,92 @@ msgstr ""
 msgid "Specify a data folder."
 msgstr ""
 
-#: setup.php:53
+#: setup.php:55
 #, php-format
 msgid "%s enter the database username."
 msgstr ""
 
-#: setup.php:56
+#: setup.php:58
 #, php-format
 msgid "%s enter the database name."
 msgstr ""
 
-#: setup.php:59
+#: setup.php:61
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr ""
 
-#: setup.php:62
+#: setup.php:64
 #, php-format
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:126 setup.php:291 setup.php:336
+#: setup.php:128 setup.php:320 setup.php:365
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:127 setup.php:150 setup.php:204
+#: setup.php:129 setup.php:152 setup.php:229
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:149 setup.php:423 setup.php:489
+#: setup.php:151 setup.php:453 setup.php:520
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:203
+#: setup.php:228
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:255 setup.php:357 setup.php:366 setup.php:384 setup.php:394
-#: setup.php:403 setup.php:430 setup.php:496 setup.php:522 setup.php:529
-#: setup.php:540 setup.php:547 setup.php:556 setup.php:564 setup.php:573
-#: setup.php:579
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:256 setup.php:358 setup.php:367 setup.php:385 setup.php:395
-#: setup.php:404 setup.php:431 setup.php:497 setup.php:523 setup.php:530
-#: setup.php:541 setup.php:557 setup.php:565 setup.php:574
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:270
+#: setup.php:299
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:271
+#: setup.php:300
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:276
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:277
+#: setup.php:306
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:548 setup.php:580
+#: setup.php:579 setup.php:611
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:644
+#: setup.php:631
+#, php-format
+msgid "MS SQL username and/or password not valid: %s"
+msgstr ""
+
+#: setup.php:849
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:645
+#: setup.php:850
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
@@ -239,16 +244,16 @@ msgstr "i fjor"
 msgid "years ago"
 msgstr "år siden"
 
-#: updater.php:75
+#: 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:77
+#: updater.php:81
 msgid "up to date"
 msgstr "oppdatert"
 
-#: updater.php:80
+#: updater.php:84
 msgid "updates check is disabled"
 msgstr "versjonssjekk er avslått"
 
diff --git a/l10n/nb_NO/settings.po b/l10n/nb_NO/settings.po
index 39c78949743df54107a421343a4286283795c899..840084f1dab9bf23f751a544a187ee44972b751d 100644
--- a/l10n/nb_NO/settings.po
+++ b/l10n/nb_NO/settings.po
@@ -15,8 +15,8 @@ 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:05+0000\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"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -29,8 +29,8 @@ 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:15
-#: ajax/togglegroups.php:18
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr "Autentikasjonsfeil"
 
@@ -78,12 +78,12 @@ msgstr "Ugyldig forespørsel"
 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 "Kan ikke legge bruker til gruppen %s"
 
-#: ajax/togglegroups.php:34
+#: ajax/togglegroups.php:36
 #, php-format
 msgid "Unable to remove user from group %s"
 msgstr "Kan ikke slette bruker fra gruppen %s"
@@ -124,7 +124,7 @@ msgstr "Feil"
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:96
+#: js/personal.js:99
 msgid "Saving..."
 msgstr "Lagrer..."
 
@@ -153,23 +153,23 @@ msgstr "Gruppeadministrator"
 msgid "Delete"
 msgstr "Slett"
 
-#: js/users.js:190
+#: js/users.js:191
 msgid "add group"
 msgstr ""
 
-#: js/users.js:351
+#: js/users.js:352
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:357
+#: js/users.js:358
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -215,19 +215,19 @@ msgstr ""
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:61
+#: templates/admin.php:63
+#, php-format
 msgid ""
-"This ownCloud server can't set system locale to "
-"\"en_US.UTF-8\"/\"en_US.UTF8\". 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 en_US.UTF-8/en_US.UTF8."
+"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:72
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:75
+#: 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 "
@@ -237,98 +237,98 @@ msgid ""
 " of ownCloud."
 msgstr ""
 
-#: templates/admin.php:89
+#: templates/admin.php:92
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:98
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:108
+#: 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:118
+#: 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:125
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:131
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:132
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:140
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:147
+#: templates/admin.php:150
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:148
+#: templates/admin.php:151
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:155
+#: templates/admin.php:158
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:161
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:165
+#: templates/admin.php:168
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:181
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:179
+#: templates/admin.php:182
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:182
+#: templates/admin.php:185
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr ""
 
-#: templates/admin.php:192
+#: templates/admin.php:195
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:193
+#: templates/admin.php:196
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:220
+#: templates/admin.php:223
 msgid "More"
 msgstr "Mer"
 
-#: templates/admin.php:227 templates/personal.php:98
+#: templates/admin.php:230 templates/personal.php:102
 msgid "Version"
 msgstr "Versjon"
 
-#: templates/admin.php:230 templates/personal.php:100
+#: templates/admin.php:233 templates/personal.php:105
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -338,51 +338,51 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr ""
 
-#: templates/apps.php:10
+#: templates/apps.php:11
 msgid "Add your App"
 msgstr "Legg til din App"
 
-#: templates/apps.php:11
+#: templates/apps.php:12
 msgid "More Apps"
 msgstr "Flere Apps"
 
-#: templates/apps.php:24
+#: templates/apps.php:28
 msgid "Select an App"
 msgstr "Velg en app"
 
-#: templates/apps.php:28
+#: templates/apps.php:34
 msgid "See application page at apps.owncloud.com"
 msgstr "Se applikasjonens side på apps.owncloud.org"
 
-#: templates/apps.php:29
+#: templates/apps.php:36
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
-#: templates/apps.php:31
+#: templates/apps.php:38
 msgid "Update"
 msgstr "Oppdater"
 
-#: templates/help.php:3
+#: templates/help.php:4
 msgid "User Documentation"
 msgstr "Brukerdokumentasjon"
 
-#: templates/help.php:4
+#: templates/help.php:6
 msgid "Administrator Documentation"
 msgstr "Administratordokumentasjon"
 
-#: 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 "Kommersiell støtte"
 
@@ -391,79 +391,79 @@ msgstr "Kommersiell støtte"
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Du har brukt <strong>%s</strong> av tilgjengelig <strong>%s</strong>"
 
-#: templates/personal.php:14
+#: templates/personal.php:15
 msgid "Get the apps to sync your files"
-msgstr ""
+msgstr "Få dine apps til å synkronisere dine filer"
 
-#: templates/personal.php:25
+#: templates/personal.php:26
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:36 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
 msgid "Password"
 msgstr "Passord"
 
-#: templates/personal.php:37
+#: templates/personal.php:38
 msgid "Your password was changed"
 msgstr "Passord har blitt endret"
 
-#: templates/personal.php:38
+#: templates/personal.php:39
 msgid "Unable to change your password"
 msgstr "Kunne ikke endre passordet ditt"
 
-#: templates/personal.php:39
+#: templates/personal.php:40
 msgid "Current password"
 msgstr "Nåværende passord"
 
-#: templates/personal.php:40
+#: templates/personal.php:42
 msgid "New password"
 msgstr "Nytt passord"
 
-#: templates/personal.php:42
+#: templates/personal.php:44
 msgid "Change password"
 msgstr "Endre passord"
 
-#: templates/personal.php:54 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:78
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:55
+#: templates/personal.php:57
 msgid "Your display name was changed"
 msgstr ""
 
-#: templates/personal.php:56
+#: templates/personal.php:58
 msgid "Unable to change your display name"
 msgstr ""
 
-#: templates/personal.php:59
+#: templates/personal.php:61
 msgid "Change display name"
 msgstr ""
 
-#: templates/personal.php:68
+#: templates/personal.php:70
 msgid "Email"
 msgstr "E-post"
 
-#: templates/personal.php:69
+#: templates/personal.php:72
 msgid "Your email address"
 msgstr "Din e-postadresse"
 
-#: templates/personal.php:70
+#: templates/personal.php:73
 msgid "Fill in an email address to enable password recovery"
 msgstr "Oppi epostadressen du vil tilbakestille passordet for"
 
-#: templates/personal.php:76 templates/personal.php:77
+#: templates/personal.php:79 templates/personal.php:80
 msgid "Language"
 msgstr "Språk"
 
-#: templates/personal.php:82
+#: templates/personal.php:86
 msgid "Help translate"
 msgstr "Bidra til oversettelsen"
 
-#: templates/personal.php:87
+#: templates/personal.php:91
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:89
+#: templates/personal.php:93
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
diff --git a/l10n/nb_NO/user_ldap.po b/l10n/nb_NO/user_ldap.po
index 6b6fa98ff04a97992385efd8c2afecfebe4398f5..ba8a8273f6b6eba96fd103990fa2b1a6d8cc54b9 100644
--- a/l10n/nb_NO/user_ldap.po
+++ b/l10n/nb_NO/user_ldap.po
@@ -4,13 +4,14 @@
 # 
 # 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-02-08 00:10+0100\n"
-"PO-Revision-Date: 2013-02-07 23:11+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "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"
@@ -20,291 +21,315 @@ msgstr ""
 
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
-msgstr ""
+msgstr "Klarte ikke å slette tjener-konfigurasjonen."
 
-#: ajax/testConfiguration.php:35
+#: ajax/testConfiguration.php:36
 msgid "The configuration is valid and the connection could be established!"
-msgstr ""
+msgstr "Konfigurasjonen er i orden og tilkoblingen skal være etablert!"
 
-#: ajax/testConfiguration.php:37
+#: ajax/testConfiguration.php:39
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
-msgstr ""
+msgstr "Konfigurasjonen er i orden, men Bind mislyktes. Vennligst sjekk tjener-konfigurasjonen og påloggingsinformasjonen."
 
-#: ajax/testConfiguration.php:40
+#: ajax/testConfiguration.php:43
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
-msgstr ""
+msgstr "Konfigurasjonen er ikke i orden. Vennligst se ownClouds logfil for flere detaljer."
 
 #: js/settings.js:66
 msgid "Deletion failed"
-msgstr "Sletting feilet"
+msgstr "Sletting mislyktes"
 
 #: js/settings.js:82
 msgid "Take over settings from recent server configuration?"
-msgstr ""
+msgstr "Hent innstillinger fra tidligere tjener-konfigurasjon?"
 
 #: js/settings.js:83
 msgid "Keep settings?"
-msgstr ""
+msgstr "Behold innstillinger?"
 
 #: js/settings.js:97
 msgid "Cannot add server configuration"
-msgstr ""
+msgstr "Kan ikke legge til tjener-konfigurasjon"
 
 #: js/settings.js:121
 msgid "Connection test succeeded"
-msgstr ""
+msgstr "Tilkoblingstest lyktes"
 
 #: js/settings.js:126
 msgid "Connection test failed"
-msgstr ""
+msgstr "Tilkoblingstest mislyktes"
 
 #: js/settings.js:136
 msgid "Do you really want to delete the current Server Configuration?"
-msgstr ""
+msgstr "Er du sikker på at du vil slette aktiv tjener-konfigurasjon?"
 
 #: js/settings.js:137
 msgid "Confirm Deletion"
-msgstr ""
+msgstr "Bekreft sletting"
 
 #: templates/settings.php:8
 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>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
 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>Warning:</b> PHP LDAP modulen er ikke installert, hjelperen vil ikke virke. Vennligst be din system-administrator om å installere den."
 
 #: templates/settings.php:15
 msgid "Server configuration"
-msgstr ""
+msgstr "Tjener-konfigurasjon"
 
-#: templates/settings.php:17
+#: templates/settings.php:31
 msgid "Add Server Configuration"
-msgstr ""
+msgstr "Legg til tjener-konfigurasjon"
 
-#: templates/settings.php:21
+#: templates/settings.php:36
 msgid "Host"
-msgstr ""
+msgstr "Tjener"
 
-#: templates/settings.php:21
+#: templates/settings.php:38
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
-msgstr ""
+msgstr "Du kan utelate protokollen, men du er påkrevd å bruke SSL.  Deretter starte med ldaps://"
 
-#: templates/settings.php:22
+#: templates/settings.php:39
 msgid "Base DN"
-msgstr ""
+msgstr "Base DN"
 
-#: templates/settings.php:22
+#: templates/settings.php:40
 msgid "One Base DN per line"
-msgstr ""
+msgstr "En hoved DN pr. linje"
 
-#: templates/settings.php:22
+#: templates/settings.php:41
 msgid "You can specify Base DN for users and groups in the Advanced tab"
-msgstr ""
+msgstr "Du kan spesifisere Base DN for brukere og grupper under Avansert fanen"
 
-#: templates/settings.php:23
+#: templates/settings.php:43
 msgid "User DN"
-msgstr ""
+msgstr "Bruker DN"
 
-#: templates/settings.php:23
+#: 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 ""
+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:24
+#: templates/settings.php:46
 msgid "Password"
 msgstr "Passord"
 
-#: templates/settings.php:24
+#: templates/settings.php:49
 msgid "For anonymous access, leave DN and Password empty."
-msgstr ""
+msgstr "For anonym tilgang, la DN- og passord-feltet stå tomt."
 
-#: templates/settings.php:25
+#: templates/settings.php:50
 msgid "User Login Filter"
-msgstr ""
+msgstr "Brukerpålogging filter"
 
-#: templates/settings.php:25
+#: 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 ""
+msgstr "Definerer filteret som skal brukes når et påloggingsforsøk blir utført. %%uid erstatter brukernavnet i innloggingshandlingen."
 
-#: templates/settings.php:25
+#: templates/settings.php:54
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
+msgstr "bruk %%uid plassholder, f.eks. \"uid=%%uid\""
 
-#: templates/settings.php:26
+#: templates/settings.php:55
 msgid "User List Filter"
-msgstr ""
+msgstr "Brukerliste filter"
 
-#: templates/settings.php:26
+#: templates/settings.php:58
 msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
+msgstr "Definerer filteret som skal brukes, når systemet innhenter brukere."
 
-#: templates/settings.php:26
+#: templates/settings.php:59
 msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr ""
+msgstr "uten noe plassholder, f.eks. \"objectClass=person\"."
 
-#: templates/settings.php:27
+#: templates/settings.php:60
 msgid "Group Filter"
 msgstr "Gruppefilter"
 
-#: templates/settings.php:27
+#: templates/settings.php:63
 msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
+msgstr "Definerer filteret som skal brukes, når systemet innhenter grupper."
 
-#: templates/settings.php:27
+#: templates/settings.php:64
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr ""
+msgstr "uten noe plassholder, f.eks. \"objectClass=posixGroup\"."
 
-#: templates/settings.php:31
+#: templates/settings.php:68
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:70
 msgid "Configuration Active"
-msgstr ""
+msgstr "Konfigurasjon aktiv"
 
-#: templates/settings.php:33
+#: templates/settings.php:70
 msgid "When unchecked, this configuration will be skipped."
-msgstr ""
+msgstr "Når ikke huket av så vil denne konfigurasjonen bli hoppet over."
 
-#: templates/settings.php:34
+#: templates/settings.php:71
 msgid "Port"
 msgstr "Port"
 
-#: templates/settings.php:35
+#: templates/settings.php:72
 msgid "Backup (Replica) Host"
-msgstr ""
+msgstr "Sikkerhetskopierings (Replica) vert"
 
-#: templates/settings.php:35
+#: 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:36
+#: templates/settings.php:73
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:74
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:74
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:75
 msgid "Use TLS"
 msgstr "Bruk TLS"
 
-#: templates/settings.php:38
+#: templates/settings.php:75
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:39
+#: templates/settings.php:76
 msgid "Case insensitve LDAP server (Windows)"
-msgstr ""
+msgstr "Case-insensitiv LDAP tjener (Windows)"
 
-#: templates/settings.php:40
+#: templates/settings.php:77
 msgid "Turn off SSL certificate validation."
-msgstr ""
+msgstr "Slå av SSL-sertifikat validering"
 
-#: templates/settings.php:40
+#: templates/settings.php:77
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
-msgstr ""
+msgstr "Hvis tilgang kun fungerer med dette alternativet, importer LDAP-tjenerens SSL-sertifikat til din egen ownCloud tjener."
 
-#: templates/settings.php:40
+#: templates/settings.php:77
 msgid "Not recommended, use for testing only."
 msgstr "Ikke anbefalt, bruk kun for testing"
 
-#: templates/settings.php:41
+#: templates/settings.php:78
+msgid "Cache Time-To-Live"
+msgstr ""
+
+#: templates/settings.php:78
 msgid "in seconds. A change empties the cache."
 msgstr "i sekunder. En endring tømmer bufferen."
 
-#: templates/settings.php:43
+#: templates/settings.php:80
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:82
 msgid "User Display Name Field"
-msgstr ""
+msgstr "Vis brukerens navnfelt"
 
-#: templates/settings.php:45
+#: templates/settings.php:82
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
-msgstr ""
+msgstr "LDAP-attributen å bruke for å generere brukers ownCloud navn."
 
-#: templates/settings.php:46
+#: templates/settings.php:83
 msgid "Base User Tree"
-msgstr ""
+msgstr "Hovedbruker tre"
 
-#: templates/settings.php:46
+#: templates/settings.php:83
 msgid "One User Base DN per line"
-msgstr ""
+msgstr "En Bruker Base DN pr. linje"
 
-#: templates/settings.php:47
+#: templates/settings.php:84
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:47 templates/settings.php:50
+#: templates/settings.php:84 templates/settings.php:87
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:48
+#: templates/settings.php:85
 msgid "Group Display Name Field"
-msgstr ""
+msgstr "Vis gruppens navnfelt"
 
-#: templates/settings.php:48
+#: templates/settings.php:85
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
-msgstr ""
+msgstr "LDAP-attributen å bruke for å generere gruppens ownCloud navn."
 
-#: templates/settings.php:49
+#: templates/settings.php:86
 msgid "Base Group Tree"
-msgstr ""
+msgstr "Hovedgruppe tre"
 
-#: templates/settings.php:49
+#: templates/settings.php:86
 msgid "One Group Base DN per line"
-msgstr ""
+msgstr "En gruppe hoved-DN pr. linje"
 
-#: templates/settings.php:50
+#: templates/settings.php:87
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:88
 msgid "Group-Member association"
-msgstr ""
+msgstr "gruppe-medlem assosiasjon"
 
-#: templates/settings.php:53
+#: templates/settings.php:90
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:92
+msgid "Quota Field"
+msgstr ""
+
+#: templates/settings.php:93
+msgid "Quota Default"
+msgstr ""
+
+#: templates/settings.php:93
 msgid "in bytes"
 msgstr "i bytes"
 
-#: templates/settings.php:58
+#: templates/settings.php:94
+msgid "Email Field"
+msgstr ""
+
+#: templates/settings.php:95
+msgid "User Home Folder Naming Rule"
+msgstr ""
+
+#: templates/settings.php:95
 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
+msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:62
+#: templates/settings.php:99
 msgid "Help"
 msgstr "Hjelp"
diff --git a/l10n/nl/core.po b/l10n/nl/core.po
index 6a4b1b179398622b7f4c83b752b203e7bafd8bb1..18f1551101b5c10e92ad11c12a8e5bbfd8698102 100644
--- a/l10n/nl/core.po
+++ b/l10n/nl/core.po
@@ -21,8 +21,8 @@ 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 14:32+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:20+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"
@@ -400,7 +400,7 @@ msgstr "De update is niet geslaagd. Meld dit probleem aan bij de <a href=\"https
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "De update is geslaagd. U wordt teruggeleid naar uw eigen ownCloud."
 
-#: lostpassword/controller.php:47
+#: lostpassword/controller.php:48
 msgid "ownCloud password reset"
 msgstr "ownCloud wachtwoord herstellen"
 
diff --git a/l10n/nl/files.po b/l10n/nl/files.po
index bbd8fd530f3dd9edda3725f7190a9f95b9a88b94..5443fe2eb4a425ab8789f450205a0e1b5b78bf3f 100644
--- a/l10n/nl/files.po
+++ b/l10n/nl/files.po
@@ -19,9 +19,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: 2013-02-14 23:05+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "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"
@@ -62,27 +62,27 @@ msgid ""
 "the HTML form"
 msgstr "Het geüploade bestand is groter dan de MAX_FILE_SIZE richtlijn die is opgegeven in de HTML-formulier"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
 msgstr "Het bestand is slechts gedeeltelijk geupload"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:31
 msgid "No file was uploaded"
 msgstr "Geen bestand geüpload"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:32
 msgid "Missing a temporary folder"
 msgstr "Een tijdelijke map mist"
 
-#: ajax/upload.php:34
+#: ajax/upload.php:33
 msgid "Failed to write to disk"
 msgstr "Schrijven naar schijf mislukt"
 
-#: ajax/upload.php:52
+#: ajax/upload.php:51
 msgid "Not enough storage available"
 msgstr "Niet genoeg opslagruimte beschikbaar"
 
-#: ajax/upload.php:83
+#: ajax/upload.php:82
 msgid "Invalid directory."
 msgstr "Ongeldige directory."
 
@@ -94,7 +94,7 @@ msgstr "Bestanden"
 msgid "Delete permanently"
 msgstr "Verwijder definitief"
 
-#: js/fileactions.js:127 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:127 templates/index.php:92 templates/index.php:93
 msgid "Delete"
 msgstr "Verwijder"
 
@@ -102,40 +102,36 @@ msgstr "Verwijder"
 msgid "Rename"
 msgstr "Hernoem"
 
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
 msgid "Pending"
 msgstr "Wachten"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "{new_name} already exists"
 msgstr "{new_name} bestaat al"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "replace"
 msgstr "vervang"
 
-#: js/filelist.js:253
+#: js/filelist.js:251
 msgid "suggest name"
 msgstr "Stel een naam voor"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "cancel"
 msgstr "annuleren"
 
-#: js/filelist.js:295
-msgid "replaced {new_name}"
-msgstr "verving {new_name}"
+#: js/filelist.js:298
+msgid "replaced {new_name} with {old_name}"
+msgstr "verving {new_name} met {old_name}"
 
-#: js/filelist.js:295 js/filelist.js:297
+#: js/filelist.js:298
 msgid "undo"
 msgstr "ongedaan maken"
 
-#: js/filelist.js:297
-msgid "replaced {new_name} with {old_name}"
-msgstr "verving {new_name} met {old_name}"
-
-#: js/filelist.js:322
+#: js/filelist.js:323
 msgid "perform delete operation"
 msgstr "uitvoeren verwijderactie"
 
@@ -161,74 +157,74 @@ 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:224
+#: js/files.js:225
 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:261
+#: js/files.js:262
 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:261
+#: js/files.js:262
 msgid "Upload Error"
 msgstr "Upload Fout"
 
-#: js/files.js:272
+#: js/files.js:273
 msgid "Close"
 msgstr "Sluit"
 
-#: js/files.js:311
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr "1 bestand wordt ge-upload"
 
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: 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:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "Uploaden geannuleerd."
 
-#: js/files.js:496
+#: js/files.js:497
 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:569
+#: js/files.js:570
 msgid "URL cannot be empty."
 msgstr "URL kan niet leeg zijn."
 
-#: js/files.js:574
+#: js/files.js:575
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Ongeldige mapnaam. Gebruik van'Gedeeld' is voorbehouden aan Owncloud"
 
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:953 templates/index.php:68
 msgid "Name"
 msgstr "Naam"
 
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:954 templates/index.php:79
 msgid "Size"
 msgstr "Bestandsgrootte"
 
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:955 templates/index.php:81
 msgid "Modified"
 msgstr "Laatst aangepast"
 
-#: js/files.js:969
+#: js/files.js:974
 msgid "1 folder"
 msgstr "1 map"
 
-#: js/files.js:971
+#: js/files.js:976
 msgid "{count} folders"
 msgstr "{count} mappen"
 
-#: js/files.js:979
+#: js/files.js:984
 msgid "1 file"
 msgstr "1 bestand"
 
-#: js/files.js:981
+#: js/files.js:986
 msgid "{count} files"
 msgstr "{count} bestanden"
 
@@ -286,39 +282,43 @@ msgstr "Vanaf link"
 
 #: templates/index.php:40
 msgid "Deleted files"
-msgstr ""
+msgstr "Verwijderde bestanden"
 
 #: templates/index.php:46
 msgid "Cancel upload"
 msgstr "Upload afbreken"
 
-#: templates/index.php:59
+#: templates/index.php:53
+msgid "You don’t have write permissions here."
+msgstr "U hebt hier geen schrijfpermissies."
+
+#: templates/index.php:60
 msgid "Nothing in here. Upload something!"
 msgstr "Er bevindt zich hier niets. Upload een bestand!"
 
-#: templates/index.php:73
+#: templates/index.php:74
 msgid "Download"
 msgstr "Download"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:86 templates/index.php:87
 msgid "Unshare"
 msgstr "Stop delen"
 
-#: templates/index.php:105
+#: templates/index.php:106
 msgid "Upload too large"
 msgstr "Bestanden te groot"
 
-#: templates/index.php:107
+#: templates/index.php:108
 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:112
+#: templates/index.php:113
 msgid "Files are being scanned, please wait."
 msgstr "Bestanden worden gescand, even wachten."
 
-#: templates/index.php:115
+#: templates/index.php:116
 msgid "Current scanning"
 msgstr "Er wordt gescand"
 
diff --git a/l10n/nl/files_external.po b/l10n/nl/files_external.po
index 73a37735f70aab6d69e17b4abc0fb5e63267e58e..3c135ef3441c5a2cc3cc116b33678f13ebcda74a 100644
--- a/l10n/nl/files_external.po
+++ b/l10n/nl/files_external.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# André Koot <meneer@tken.net>, 2012.
+# André Koot <meneer@tken.net>, 2012-2013.
 # Richard Bos <radoeka@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-21 00:09+0100\n"
-"PO-Revision-Date: 2012-12-20 17:34+0000\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"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -19,37 +19,33 @@ msgstr ""
 "Language: nl\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 "Toegang toegestaan"
 
-#: 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 "Fout tijdens het configureren van Dropbox opslag"
 
-#: 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 "Sta toegang toe"
 
-#: js/dropbox.js:73 js/google.js:72
-msgid "Fill out all required fields"
-msgstr "Vul alle verplichte in"
-
-#: js/dropbox.js:85
+#: js/dropbox.js:101
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr "Geef een geldige Dropbox key en secret."
 
-#: 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 "Fout tijdens het configureren van Google Drive opslag"
 
-#: lib/config.php:434
+#: lib/config.php:421
 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:435
+#: lib/config.php:424
 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 "
@@ -60,63 +56,63 @@ msgstr "<b>Waarschuwing:</b> FTP ondersteuning in PHP is niet geactiveerd of ge
 msgid "External Storage"
 msgstr "Externe opslag"
 
-#: templates/settings.php:8 templates/settings.php:22
-msgid "Mount point"
-msgstr "Aankoppelpunt"
-
-#: templates/settings.php:9
-msgid "Backend"
-msgstr "Backend"
+#: templates/settings.php:9 templates/settings.php:28
+msgid "Folder name"
+msgstr "Mapnaam"
 
 #: templates/settings.php:10
+msgid "External storage"
+msgstr "Externe opslag"
+
+#: templates/settings.php:11
 msgid "Configuration"
 msgstr "Configuratie"
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid "Options"
 msgstr "Opties"
 
-#: templates/settings.php:12
+#: templates/settings.php:13
 msgid "Applicable"
 msgstr "Van toepassing"
 
-#: templates/settings.php:27
-msgid "Add mount point"
-msgstr "Aankoppelpunt toevoegen"
+#: templates/settings.php:33
+msgid "Add storage"
+msgstr "Toevoegen opslag"
 
-#: templates/settings.php:85
+#: templates/settings.php:90
 msgid "None set"
 msgstr "Niets ingesteld"
 
-#: templates/settings.php:86
+#: templates/settings.php:91
 msgid "All Users"
 msgstr "Alle gebruikers"
 
-#: templates/settings.php:87
+#: templates/settings.php:92
 msgid "Groups"
 msgstr "Groepen"
 
-#: templates/settings.php:95
+#: templates/settings.php:100
 msgid "Users"
 msgstr "Gebruikers"
 
-#: templates/settings.php:108 templates/settings.php:109
-#: templates/settings.php:144 templates/settings.php:145
+#: templates/settings.php:113 templates/settings.php:114
+#: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
 msgstr "Verwijder"
 
-#: templates/settings.php:124
+#: templates/settings.php:129
 msgid "Enable User External Storage"
 msgstr "Externe opslag voor gebruikers activeren"
 
-#: templates/settings.php:125
+#: templates/settings.php:130
 msgid "Allow users to mount their own external storage"
 msgstr "Sta gebruikers toe om hun eigen externe opslag aan te koppelen"
 
-#: templates/settings.php:136
+#: templates/settings.php:141
 msgid "SSL root certificates"
 msgstr "SSL root certificaten"
 
-#: templates/settings.php:153
+#: templates/settings.php:159
 msgid "Import Root Certificate"
 msgstr "Importeer root certificaat"
diff --git a/l10n/nl/files_trashbin.po b/l10n/nl/files_trashbin.po
index 3798b0d11619522ef448b18c6ff5f413770ea572..a20ba8e0e4d55c1e5e23a2b71a5edf5ee76d9696 100644
--- a/l10n/nl/files_trashbin.po
+++ b/l10n/nl/files_trashbin.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-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 10:07+0000\n"
-"Last-Translator: André Koot <meneer@tken.net>\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: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:22
+#: ajax/delete.php:40
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "Kon %s niet permanent verwijderen"
@@ -28,35 +28,39 @@ msgstr "Kon %s niet permanent verwijderen"
 msgid "Couldn't restore %s"
 msgstr "Kon %s niet herstellen"
 
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
 msgid "perform restore operation"
 msgstr "uitvoeren restore operatie"
 
-#: js/trash.js:33
+#: js/trash.js:34
 msgid "delete file permanently"
 msgstr "verwijder bestanden definitief"
 
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr "Verwijder definitief"
+
+#: js/trash.js:174 templates/index.php:17
 msgid "Name"
 msgstr "Naam"
 
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:175 templates/index.php:27
 msgid "Deleted"
 msgstr "Verwijderd"
 
-#: js/trash.js:135
+#: js/trash.js:184
 msgid "1 folder"
 msgstr "1 map"
 
-#: js/trash.js:137
+#: js/trash.js:186
 msgid "{count} folders"
 msgstr "{count} mappen"
 
-#: js/trash.js:145
+#: js/trash.js:194
 msgid "1 file"
 msgstr "1 bestand"
 
-#: js/trash.js:147
+#: js/trash.js:196
 msgid "{count} files"
 msgstr "{count} bestanden"
 
@@ -67,3 +71,11 @@ msgstr "Niets te vinden. Uw prullenbak is leeg!"
 #: templates/index.php:20 templates/index.php:22
 msgid "Restore"
 msgstr "Herstellen"
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr "Verwijder"
+
+#: templates/part.breadcrumb.php:9
+msgid "Deleted Files"
+msgstr ""
diff --git a/l10n/nl/files_versions.po b/l10n/nl/files_versions.po
index 71bb6e63b1e94601424242c290f5e07ada8a4a28..87ba278235f1297e5af989dbc1490cdda272ae34 100644
--- a/l10n/nl/files_versions.po
+++ b/l10n/nl/files_versions.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-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 09:46+0000\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"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -42,26 +42,18 @@ msgstr "mislukking"
 msgid "File %s could not be reverted to version %s"
 msgstr "Bestand %s kon niet worden teruggedraaid naar versie %s"
 
-#: history.php:68
+#: history.php:69
 msgid "No old versions available"
 msgstr "Geen oudere versies beschikbaar"
 
-#: history.php:73
+#: history.php:74
 msgid "No path specified"
 msgstr "Geen pad opgegeven"
 
-#: js/versions.js:16
-msgid "History"
-msgstr "Geschiedenis"
+#: js/versions.js:6
+msgid "Versions"
+msgstr "Versies"
 
 #: templates/history.php:20
 msgid "Revert a file to a previous version by clicking on its revert button"
 msgstr "Draai een bestand terug naar een voorgaande versie door te klikken op de terugdraai knop"
-
-#: templates/settings.php:3
-msgid "Files Versioning"
-msgstr "Bestand versies"
-
-#: templates/settings.php:4
-msgid "Enable"
-msgstr "Activeer"
diff --git a/l10n/nl/lib.po b/l10n/nl/lib.po
index bd4dc8f8f9c36a169a633595189eff4ddd384e02..f226fcaff3af028727dbf47ca71ea502eb0d554b 100644
--- a/l10n/nl/lib.po
+++ b/l10n/nl/lib.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 14:33+0000\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"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -21,27 +21,27 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:339
+#: app.php:349
 msgid "Help"
 msgstr "Help"
 
-#: app.php:346
+#: app.php:362
 msgid "Personal"
 msgstr "Persoonlijk"
 
-#: app.php:351
+#: app.php:373
 msgid "Settings"
 msgstr "Instellingen"
 
-#: app.php:356
+#: app.php:385
 msgid "Users"
 msgstr "Gebruikers"
 
-#: app.php:363
+#: app.php:398
 msgid "Apps"
 msgstr "Apps"
 
-#: app.php:365
+#: app.php:406
 msgid "Admin"
 msgstr "Beheerder"
 
@@ -53,15 +53,15 @@ msgstr "ZIP download is uitgeschakeld."
 msgid "Files need to be downloaded one by one."
 msgstr "Bestanden moeten één voor één worden gedownload."
 
-#: files.php:203 files.php:228
+#: files.php:204 files.php:231
 msgid "Back to Files"
 msgstr "Terug naar bestanden"
 
-#: files.php:227
+#: files.php:228
 msgid "Selected files too large to generate zip file."
 msgstr "De geselecteerde bestanden zijn te groot om een zip bestand te maken."
 
-#: helper.php:226
+#: helper.php:228
 msgid "couldn't be determined"
 msgstr "kon niet worden vastgesteld"
 
@@ -101,87 +101,92 @@ msgstr "Stel een beheerderswachtwoord in."
 msgid "Specify a data folder."
 msgstr "Geef een datamap op."
 
-#: setup.php:53
+#: setup.php:55
 #, php-format
 msgid "%s enter the database username."
 msgstr "%s opgeven database gebruikersnaam."
 
-#: setup.php:56
+#: setup.php:58
 #, php-format
 msgid "%s enter the database name."
 msgstr "%s opgeven databasenaam."
 
-#: setup.php:59
+#: setup.php:61
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr "%s er mogen geen puntjes in de databasenaam voorkomen"
 
-#: setup.php:62
+#: setup.php:64
 #, php-format
 msgid "%s set the database host."
 msgstr "%s instellen databaseservernaam."
 
-#: setup.php:126 setup.php:291 setup.php:336
+#: setup.php:128 setup.php:320 setup.php:365
 msgid "PostgreSQL username and/or password not valid"
 msgstr "PostgreSQL gebruikersnaam en/of wachtwoord ongeldig"
 
-#: setup.php:127 setup.php:150 setup.php:204
+#: setup.php:129 setup.php:152 setup.php:229
 msgid "You need to enter either an existing account or the administrator."
 msgstr "Geef of een bestaand account op of het beheerdersaccount."
 
-#: setup.php:149 setup.php:423 setup.php:489
+#: setup.php:151 setup.php:453 setup.php:520
 msgid "Oracle username and/or password not valid"
 msgstr "Oracle gebruikersnaam en/of wachtwoord ongeldig"
 
-#: setup.php:203
+#: setup.php:228
 msgid "MySQL username and/or password not valid"
 msgstr "MySQL gebruikersnaam en/of wachtwoord ongeldig"
 
-#: setup.php:255 setup.php:357 setup.php:366 setup.php:384 setup.php:394
-#: setup.php:403 setup.php:430 setup.php:496 setup.php:522 setup.php:529
-#: setup.php:540 setup.php:547 setup.php:556 setup.php:564 setup.php:573
-#: setup.php:579
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "DB Fout: \"%s\""
 
-#: setup.php:256 setup.php:358 setup.php:367 setup.php:385 setup.php:395
-#: setup.php:404 setup.php:431 setup.php:497 setup.php:523 setup.php:530
-#: setup.php:541 setup.php:557 setup.php:565 setup.php:574
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "Onjuiste commande was: \"%s\""
 
-#: setup.php:270
+#: setup.php:299
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "MySQL gebruiker '%s'@'localhost' bestaat al."
 
-#: setup.php:271
+#: setup.php:300
 msgid "Drop this user from MySQL"
 msgstr "Verwijder deze gebruiker uit MySQL"
 
-#: setup.php:276
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "MySQL gebruiker '%s'@'%%' bestaat al"
 
-#: setup.php:277
+#: setup.php:306
 msgid "Drop this user from MySQL."
 msgstr "Verwijder deze gebruiker uit MySQL."
 
-#: setup.php:548 setup.php:580
+#: setup.php:579 setup.php:611
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Onjuiste commando was: \"%s\", naam: %s, wachtwoord: %s"
 
-#: setup.php:644
+#: setup.php:631
+#, 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
 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:645
+#: setup.php:850
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Conntroleer de <a href='%s'>installatie handleiding</a> goed."
@@ -238,16 +243,16 @@ msgstr "vorig jaar"
 msgid "years ago"
 msgstr "jaar geleden"
 
-#: updater.php:75
+#: 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:77
+#: updater.php:81
 msgid "up to date"
 msgstr "bijgewerkt"
 
-#: updater.php:80
+#: updater.php:84
 msgid "updates check is disabled"
 msgstr "Meest recente versie controle is uitgeschakeld"
 
diff --git a/l10n/nl/settings.po b/l10n/nl/settings.po
index df5d343a7dc876f5b987e57338308303b06044b1..595fce94d995fce69f9778ca632c4af753331150 100644
--- a/l10n/nl/settings.po
+++ b/l10n/nl/settings.po
@@ -14,13 +14,14 @@
 #   <lenny@weijl.org>, 2012.
 #   <pietje8501@gmail.com>, 2012.
 # Richard Bos <radoeka@gmail.com>, 2012.
+# Wilfred Dijksman <translate@wdijksman.nl>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:05+0100\n"
-"PO-Revision-Date: 2013-02-14 13:00+0000\n"
-"Last-Translator: André Koot <meneer@tken.net>\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"
 "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"
@@ -32,8 +33,8 @@ 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:15
-#: ajax/togglegroups.php:18
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr "Authenticatie fout"
 
@@ -81,12 +82,12 @@ msgstr "Ongeldig verzoek"
 msgid "Admins can't remove themself from the admin group"
 msgstr "Admins kunnen zichzelf niet uit de admin groep verwijderen"
 
-#: ajax/togglegroups.php:28
+#: ajax/togglegroups.php:30
 #, php-format
 msgid "Unable to add user to group %s"
 msgstr "Niet in staat om gebruiker toe te voegen aan groep %s"
 
-#: ajax/togglegroups.php:34
+#: ajax/togglegroups.php:36
 #, php-format
 msgid "Unable to remove user from group %s"
 msgstr "Niet in staat om gebruiker te verwijderen uit groep %s"
@@ -127,7 +128,7 @@ msgstr "Fout"
 msgid "Updated"
 msgstr "Bijgewerkt"
 
-#: js/personal.js:96
+#: js/personal.js:99
 msgid "Saving..."
 msgstr "Aan het bewaren....."
 
@@ -172,7 +173,7 @@ msgstr "Fout bij aanmaken gebruiker"
 msgid "A valid password must be provided"
 msgstr "Er moet een geldig wachtwoord worden opgegeven"
 
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
 msgid "__language_name__"
 msgstr "Nederlands"
 
@@ -218,19 +219,19 @@ msgstr "De PHP module 'fileinfo' ontbreekt. We adviseren met klem om deze module
 msgid "Locale not working"
 msgstr "Taalbestand werkt niet"
 
-#: templates/admin.php:61
+#: templates/admin.php:63
+#, php-format
 msgid ""
-"This ownCloud server can't set system locale to "
-"\"en_US.UTF-8\"/\"en_US.UTF8\". 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 en_US.UTF-8/en_US.UTF8."
-msgstr "Deze ownCloud server kan de systeemtaal niet instellen op \"en_US.UTF-8\"/\"en_US.UTF8\". Er zijn vermoedelijk problemen met bepaalde tekens in de bestandsnamen. We adviseren om de voor ondersteuning van en_US.UTF-8/en_US.UTF8 vereiste pakketten op uw systeem te installeren."
+"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."
 
-#: templates/admin.php:72
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr "Internet verbinding werkt niet"
 
-#: templates/admin.php:75
+#: 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 "
@@ -240,98 +241,98 @@ msgid ""
 " of ownCloud."
 msgstr "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."
 
-#: templates/admin.php:89
+#: templates/admin.php:92
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:98
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr "Bij laden van elke pagina één taak uitvoeren"
 
-#: templates/admin.php:108
+#: 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 is geregistreerd bij een webcron service. Roep eens per minuut de cron.php pagina aan over http in de ownCloud root."
 
-#: templates/admin.php:118
+#: 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 "Gebruik de systems cron service. Roep eens per minuut de cron.php file in de ownCloud map via een systeem cronjob."
 
-#: templates/admin.php:125
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr "Delen"
 
-#: templates/admin.php:131
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr "Activeren Share API"
 
-#: templates/admin.php:132
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr "Apps toestaan de Share API te gebruiken"
 
-#: templates/admin.php:139
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr "Toestaan links"
 
-#: templates/admin.php:140
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr "Toestaan dat gebruikers objecten met links delen met anderen"
 
-#: templates/admin.php:147
+#: templates/admin.php:150
 msgid "Allow resharing"
 msgstr "Toestaan opnieuw delen"
 
-#: templates/admin.php:148
+#: templates/admin.php:151
 msgid "Allow users to share items shared with them again"
 msgstr "Toestaan dat gebruikers objecten die anderen met hun gedeeld hebben zelf ook weer delen met anderen"
 
-#: templates/admin.php:155
+#: templates/admin.php:158
 msgid "Allow users to share with anyone"
 msgstr "Toestaan dat gebruikers met iedereen delen"
 
-#: templates/admin.php:158
+#: templates/admin.php:161
 msgid "Allow users to only share with users in their groups"
 msgstr "Instellen dat gebruikers alleen met leden binnen hun groepen delen"
 
-#: templates/admin.php:165
+#: templates/admin.php:168
 msgid "Security"
 msgstr "Beveiliging"
 
-#: templates/admin.php:178
+#: templates/admin.php:181
 msgid "Enforce HTTPS"
 msgstr "Afdwingen HTTPS"
 
-#: templates/admin.php:179
+#: templates/admin.php:182
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr "Afdwingen dat de clients alleen via versleutelde verbinding contact maken met ownCloud."
 
-#: templates/admin.php:182
+#: templates/admin.php:185
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr "Maak via HTTPS verbinding met deze ownCloud inrichting om het afdwingen van gebruik van SSL te activeren of deactiveren."
 
-#: templates/admin.php:192
+#: templates/admin.php:195
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:193
+#: templates/admin.php:196
 msgid "Log level"
 msgstr "Log niveau"
 
-#: templates/admin.php:220
+#: templates/admin.php:223
 msgid "More"
 msgstr "Meer"
 
-#: templates/admin.php:227 templates/personal.php:98
+#: templates/admin.php:230 templates/personal.php:102
 msgid "Version"
 msgstr "Versie"
 
-#: templates/admin.php:230 templates/personal.php:100
+#: templates/admin.php:233 templates/personal.php:105
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -341,51 +342,51 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "Ontwikkeld door de <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud gemeenschap</a>, de <a href=\"https://github.com/owncloud\" target=\"_blank\">bron code</a> is gelicenseerd onder de <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
-#: templates/apps.php:10
+#: templates/apps.php:11
 msgid "Add your App"
 msgstr "App toevoegen"
 
-#: templates/apps.php:11
+#: templates/apps.php:12
 msgid "More Apps"
 msgstr "Meer apps"
 
-#: templates/apps.php:24
+#: templates/apps.php:28
 msgid "Select an App"
 msgstr "Selecteer een app"
 
-#: templates/apps.php:28
+#: templates/apps.php:34
 msgid "See application page at apps.owncloud.com"
 msgstr "Zie de applicatiepagina op apps.owncloud.com"
 
-#: templates/apps.php:29
+#: templates/apps.php:36
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-Gelicenseerd door <span class=\"author\"></span>"
 
-#: templates/apps.php:31
+#: templates/apps.php:38
 msgid "Update"
 msgstr "Bijwerken"
 
-#: templates/help.php:3
+#: templates/help.php:4
 msgid "User Documentation"
 msgstr "Gebruikersdocumentatie"
 
-#: templates/help.php:4
+#: templates/help.php:6
 msgid "Administrator Documentation"
 msgstr "Beheerdersdocumentatie"
 
-#: templates/help.php:6
+#: templates/help.php:9
 msgid "Online Documentation"
 msgstr "Online documentatie"
 
-#: templates/help.php:7
+#: templates/help.php:11
 msgid "Forum"
 msgstr "Forum"
 
-#: templates/help.php:9
+#: templates/help.php:14
 msgid "Bugtracker"
 msgstr "Bugtracker"
 
-#: templates/help.php:11
+#: templates/help.php:17
 msgid "Commercial Support"
 msgstr "Commerciële ondersteuning"
 
@@ -394,79 +395,79 @@ msgstr "Commerciële ondersteuning"
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "U heeft <strong>%s</strong> van de <strong>%s</strong>  beschikbaren gebruikt"
 
-#: templates/personal.php:14
+#: templates/personal.php:15
 msgid "Get the apps to sync your files"
 msgstr "Download de apps om bestanden te synchen"
 
-#: templates/personal.php:25
+#: templates/personal.php:26
 msgid "Show First Run Wizard again"
 msgstr "Toon de Eerste start Wizard opnieuw"
 
-#: templates/personal.php:36 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
 msgid "Password"
 msgstr "Wachtwoord"
 
-#: templates/personal.php:37
+#: templates/personal.php:38
 msgid "Your password was changed"
 msgstr "Je wachtwoord is veranderd"
 
-#: templates/personal.php:38
+#: templates/personal.php:39
 msgid "Unable to change your password"
 msgstr "Niet in staat om uw wachtwoord te wijzigen"
 
-#: templates/personal.php:39
+#: templates/personal.php:40
 msgid "Current password"
 msgstr "Huidig wachtwoord"
 
-#: templates/personal.php:40
+#: templates/personal.php:42
 msgid "New password"
 msgstr "Nieuw wachtwoord"
 
-#: templates/personal.php:42
+#: templates/personal.php:44
 msgid "Change password"
 msgstr "Wijzig wachtwoord"
 
-#: templates/personal.php:54 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:78
 msgid "Display Name"
 msgstr "Weergavenaam"
 
-#: templates/personal.php:55
+#: templates/personal.php:57
 msgid "Your display name was changed"
 msgstr "Uw weergavenaam is gewijzigd"
 
-#: templates/personal.php:56
+#: templates/personal.php:58
 msgid "Unable to change your display name"
 msgstr "Kon de weergavenaam niet wijzigen"
 
-#: templates/personal.php:59
+#: templates/personal.php:61
 msgid "Change display name"
 msgstr "Wijzig weergavenaam"
 
-#: templates/personal.php:68
+#: templates/personal.php:70
 msgid "Email"
 msgstr "E-mailadres"
 
-#: templates/personal.php:69
+#: templates/personal.php:72
 msgid "Your email address"
 msgstr "Uw e-mailadres"
 
-#: templates/personal.php:70
+#: templates/personal.php:73
 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:76 templates/personal.php:77
+#: templates/personal.php:79 templates/personal.php:80
 msgid "Language"
 msgstr "Taal"
 
-#: templates/personal.php:82
+#: templates/personal.php:86
 msgid "Help translate"
 msgstr "Help met vertalen"
 
-#: templates/personal.php:87
+#: templates/personal.php:91
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:89
+#: templates/personal.php:93
 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"
 
diff --git a/l10n/nl/user_ldap.po b/l10n/nl/user_ldap.po
index 2640a49d7ebeb5a92fea2be55f9df6f6f6d1445e..bc89175daac9baad8ddf6a49b8b810af83645efe 100644
--- a/l10n/nl/user_ldap.po
+++ b/l10n/nl/user_ldap.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 09:46+0000\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"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -24,17 +24,17 @@ msgstr ""
 msgid "Failed to delete the server configuration"
 msgstr "Verwijderen serverconfiguratie mislukt"
 
-#: ajax/testConfiguration.php:35
+#: ajax/testConfiguration.php:36
 msgid "The configuration is valid and the connection could be established!"
 msgstr "De configuratie is geldig en de verbinding is geslaagd!"
 
-#: ajax/testConfiguration.php:37
+#: ajax/testConfiguration.php:39
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
 msgstr "De configuratie is geldig, maar Bind mislukte. Controleer de serverinstellingen en inloggegevens."
 
-#: ajax/testConfiguration.php:40
+#: ajax/testConfiguration.php:43
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
@@ -89,224 +89,248 @@ msgstr "<b>Waarschuwing:</b> De PHP LDAP module is niet geïnstalleerd, het back
 msgid "Server configuration"
 msgstr "Serverconfiguratie"
 
-#: templates/settings.php:17
+#: templates/settings.php:18
 msgid "Add Server Configuration"
 msgstr "Toevoegen serverconfiguratie"
 
-#: templates/settings.php:21
+#: templates/settings.php:23
 msgid "Host"
 msgstr "Host"
 
-#: templates/settings.php:21
+#: templates/settings.php:25
 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:22
+#: templates/settings.php:26
 msgid "Base DN"
 msgstr "Base DN"
 
-#: templates/settings.php:22
+#: templates/settings.php:27
 msgid "One Base DN per line"
 msgstr "Een Base DN per regel"
 
-#: templates/settings.php:22
+#: templates/settings.php:28
 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:23
+#: templates/settings.php:30
 msgid "User DN"
 msgstr "User DN"
 
-#: templates/settings.php:23
+#: templates/settings.php:32
 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:24
+#: templates/settings.php:33
 msgid "Password"
 msgstr "Wachtwoord"
 
-#: templates/settings.php:24
+#: templates/settings.php:36
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "Voor anonieme toegang, laat de DN en het wachtwoord leeg."
 
-#: templates/settings.php:25
+#: templates/settings.php:37
 msgid "User Login Filter"
 msgstr "Gebruikers Login Filter"
 
-#: templates/settings.php:25
+#: templates/settings.php:40
 #, 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:25
+#: templates/settings.php:41
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "gebruik %%uid placeholder, bijv. \"uid=%%uid\""
 
-#: templates/settings.php:26
+#: templates/settings.php:42
 msgid "User List Filter"
 msgstr "Gebruikers Lijst Filter"
 
-#: templates/settings.php:26
+#: templates/settings.php:45
 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:26
+#: templates/settings.php:46
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "zonder een placeholder, bijv. \"objectClass=person\""
 
-#: templates/settings.php:27
+#: templates/settings.php:47
 msgid "Group Filter"
 msgstr "Groep Filter"
 
-#: templates/settings.php:27
+#: templates/settings.php:50
 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:27
+#: templates/settings.php:51
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "zonder een placeholder, bijv. \"objectClass=posixGroup\""
 
-#: templates/settings.php:31
+#: templates/settings.php:55
 msgid "Connection Settings"
 msgstr "Verbindingsinstellingen"
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "Configuration Active"
 msgstr "Configuratie actief"
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "When unchecked, this configuration will be skipped."
 msgstr "Als dit niet is ingeschakeld wordt deze configuratie overgeslagen."
 
-#: templates/settings.php:34
+#: templates/settings.php:58
 msgid "Port"
 msgstr "Poort"
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid "Backup (Replica) Host"
 msgstr "Backup (Replica) Host"
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 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:36
+#: templates/settings.php:60
 msgid "Backup (Replica) Port"
 msgstr "Backup (Replica) Poort"
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "Disable Main Server"
 msgstr "Deactiveren hoofdserver"
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 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:38
+#: templates/settings.php:62
 msgid "Use TLS"
 msgstr "Gebruik TLS"
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 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:39
+#: templates/settings.php:63
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Niet-hoofdlettergevoelige LDAP server (Windows)"
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid "Turn off SSL certificate validation."
 msgstr "Schakel SSL certificaat validatie uit."
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 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:40
+#: templates/settings.php:64
 msgid "Not recommended, use for testing only."
 msgstr "Niet aangeraden, gebruik alleen voor test doeleinden."
 
-#: templates/settings.php:41
+#: templates/settings.php:65
+msgid "Cache Time-To-Live"
+msgstr "Cache time-to-live"
+
+#: templates/settings.php:65
 msgid "in seconds. A change empties the cache."
 msgstr "in seconden. Een verandering maakt de cache leeg."
 
-#: templates/settings.php:43
+#: templates/settings.php:67
 msgid "Directory Settings"
 msgstr "Mapinstellingen"
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "User Display Name Field"
 msgstr "Gebruikers Schermnaam Veld"
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 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:46
+#: templates/settings.php:70
 msgid "Base User Tree"
 msgstr "Basis Gebruikers Structuur"
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "One User Base DN per line"
 msgstr "Een User Base DN per regel"
 
-#: templates/settings.php:47
+#: templates/settings.php:71
 msgid "User Search Attributes"
 msgstr "Attributen voor gebruikerszoekopdrachten"
 
-#: templates/settings.php:47 templates/settings.php:50
+#: templates/settings.php:71 templates/settings.php:74
 msgid "Optional; one attribute per line"
 msgstr "Optioneel; één attribuut per regel"
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "Group Display Name Field"
 msgstr "Groep Schermnaam Veld"
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 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:49
+#: templates/settings.php:73
 msgid "Base Group Tree"
 msgstr "Basis Groupen Structuur"
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "One Group Base DN per line"
 msgstr "Een Group Base DN per regel"
 
-#: templates/settings.php:50
+#: templates/settings.php:74
 msgid "Group Search Attributes"
 msgstr "Attributen voor groepszoekopdrachten"
 
-#: templates/settings.php:51
+#: templates/settings.php:75
 msgid "Group-Member association"
 msgstr "Groepslid associatie"
 
-#: templates/settings.php:53
+#: templates/settings.php:77
 msgid "Special Attributes"
 msgstr "Speciale attributen"
 
-#: templates/settings.php:56
+#: templates/settings.php:79
+msgid "Quota Field"
+msgstr "Quota veld"
+
+#: templates/settings.php:80
+msgid "Quota Default"
+msgstr "Quota standaard"
+
+#: templates/settings.php:80
 msgid "in bytes"
 msgstr "in bytes"
 
-#: templates/settings.php:58
+#: templates/settings.php:81
+msgid "Email Field"
+msgstr "E-mailveld"
+
+#: templates/settings.php:82
+msgid "User Home Folder Naming Rule"
+msgstr "Gebruikers Home map naamgevingsregel"
+
+#: templates/settings.php:82
 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:62
+#: templates/settings.php:86
+msgid "Test Configuration"
+msgstr "Test configuratie"
+
+#: templates/settings.php:86
 msgid "Help"
 msgstr "Help"
diff --git a/l10n/nn_NO/files.po b/l10n/nn_NO/files.po
index 06effef4db75d1cce102dacf613daddc8d184d98..576b1aad49e73bdf109aaa169856bbbbcf117004 100644
--- a/l10n/nn_NO/files.po
+++ b/l10n/nn_NO/files.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\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: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -52,27 +52,27 @@ msgid ""
 "the HTML form"
 msgstr "Den opplasta fila er større enn variabelen MAX_FILE_SIZE i HTML-skjemaet"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
 msgstr "Fila vart berre delvis lasta opp"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:31
 msgid "No file was uploaded"
 msgstr "Ingen filer vart lasta opp"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:32
 msgid "Missing a temporary folder"
 msgstr "Manglar ei mellombels mappe"
 
-#: ajax/upload.php:34
+#: ajax/upload.php:33
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:52
+#: ajax/upload.php:51
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:83
+#: ajax/upload.php:82
 msgid "Invalid directory."
 msgstr ""
 
@@ -84,7 +84,7 @@ msgstr "Filer"
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:127 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:127 templates/index.php:92 templates/index.php:93
 msgid "Delete"
 msgstr "Slett"
 
@@ -92,40 +92,36 @@ msgstr "Slett"
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:253
+#: js/filelist.js:251
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:295
-msgid "replaced {new_name}"
+#: js/filelist.js:298
+msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:295 js/filelist.js:297
+#: js/filelist.js:298
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:297
-msgid "replaced {new_name} with {old_name}"
-msgstr ""
-
-#: js/filelist.js:322
+#: js/filelist.js:323
 msgid "perform delete operation"
 msgstr ""
 
@@ -151,74 +147,74 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:224
+#: js/files.js:225
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:261
+#: js/files.js:262
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:261
+#: js/files.js:262
 msgid "Upload Error"
 msgstr ""
 
-#: js/files.js:272
+#: js/files.js:273
 msgid "Close"
 msgstr "Lukk"
 
-#: js/files.js:311
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr ""
 
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr ""
 
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:496
+#: js/files.js:497
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:569
+#: js/files.js:570
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:574
+#: js/files.js:575
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:953 templates/index.php:68
 msgid "Name"
 msgstr "Namn"
 
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:954 templates/index.php:79
 msgid "Size"
 msgstr "Storleik"
 
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:955 templates/index.php:81
 msgid "Modified"
 msgstr "Endra"
 
-#: js/files.js:969
+#: js/files.js:974
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:971
+#: js/files.js:976
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:979
+#: js/files.js:984
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:981
+#: js/files.js:986
 msgid "{count} files"
 msgstr ""
 
@@ -282,33 +278,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:53
+msgid "You don’t have write permissions here."
+msgstr ""
+
+#: templates/index.php:60
 msgid "Nothing in here. Upload something!"
 msgstr "Ingenting her. Last noko opp!"
 
-#: templates/index.php:73
+#: templates/index.php:74
 msgid "Download"
 msgstr "Last ned"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:86 templates/index.php:87
 msgid "Unshare"
 msgstr ""
 
-#: templates/index.php:105
+#: templates/index.php:106
 msgid "Upload too large"
 msgstr "For stor opplasting"
 
-#: templates/index.php:107
+#: templates/index.php:108
 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."
 
-#: templates/index.php:112
+#: templates/index.php:113
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:115
+#: templates/index.php:116
 msgid "Current scanning"
 msgstr ""
 
diff --git a/l10n/nn_NO/files_external.po b/l10n/nn_NO/files_external.po
index eb83e9d2a129c2c9f460fef97c7c999cd0c64ea3..3ab783c8371ec70e21f69501ff246b2fbda9e04e 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: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-11 23:22+0000\n"
+"POT-Creation-Date: 2013-02-28 00:04+0100\n"
+"PO-Revision-Date: 2013-02-27 23:04+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -17,37 +17,33 @@ msgstr ""
 "Language: nn_NO\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:421
 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:424
 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 "
@@ -58,63 +54,63 @@ msgstr ""
 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 "Grupper"
 
-#: templates/settings.php:95
+#: templates/settings.php:100
 msgid "Users"
 msgstr "Brukarar"
 
-#: 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 "Slett"
 
-#: 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/nn_NO/files_trashbin.po b/l10n/nn_NO/files_trashbin.po
index 43941fff2c727512a8cf0d38c9bdad2ad7265b9e..25d68085d96630dc5ba5729340bbbb800c14b7a7 100644
--- a/l10n/nn_NO/files_trashbin.po
+++ b/l10n/nn_NO/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-02-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 10:07+0000\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: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Language: nn_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:22
+#: ajax/delete.php:40
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
@@ -27,35 +27,39 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:33
+#: js/trash.js:34
 msgid "delete file permanently"
 msgstr ""
 
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr ""
+
+#: js/trash.js:174 templates/index.php:17
 msgid "Name"
 msgstr "Namn"
 
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:175 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:135
+#: js/trash.js:184
 msgid "1 folder"
 msgstr ""
 
-#: js/trash.js:137
+#: js/trash.js:186
 msgid "{count} folders"
 msgstr ""
 
-#: js/trash.js:145
+#: js/trash.js:194
 msgid "1 file"
 msgstr ""
 
-#: js/trash.js:147
+#: js/trash.js:196
 msgid "{count} files"
 msgstr ""
 
@@ -66,3 +70,11 @@ msgstr ""
 #: templates/index.php:20 templates/index.php:22
 msgid "Restore"
 msgstr ""
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr "Slett"
+
+#: templates/part.breadcrumb.php:9
+msgid "Deleted Files"
+msgstr ""
diff --git a/l10n/nn_NO/files_versions.po b/l10n/nn_NO/files_versions.po
index 3ed063fcb555de323582f0b356ab4249dfc1c062..abcb5fe4f5fb054f02505d8ef9fdc0496c9442f9 100644
--- a/l10n/nn_NO/files_versions.po
+++ b/l10n/nn_NO/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-08 00:10+0100\n"
-"PO-Revision-Date: 2013-02-07 23:11+0000\n"
+"POT-Creation-Date: 2013-02-28 00:04+0100\n"
+"PO-Revision-Date: 2013-02-27 23:04+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -48,18 +48,10 @@ msgstr ""
 msgid "No path specified"
 msgstr ""
 
-#: js/versions.js:16
-msgid "History"
+#: 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 ""
-
-#: templates/settings.php:3
-msgid "Files Versioning"
-msgstr ""
-
-#: templates/settings.php:4
-msgid "Enable"
-msgstr ""
diff --git a/l10n/nn_NO/lib.po b/l10n/nn_NO/lib.po
index 609a1a36241a62ebf068613dd8e1a134f52e2ad1..043fe1fd0a7aa00747b4f39b05b433fe8836e7cb 100644
--- a/l10n/nn_NO/lib.po
+++ b/l10n/nn_NO/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-11 15:39+0100\n"
-"PO-Revision-Date: 2013-02-11 14:40+0000\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: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -17,27 +17,27 @@ msgstr ""
 "Language: nn_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:339
+#: app.php:349
 msgid "Help"
 msgstr "Hjelp"
 
-#: app.php:346
+#: app.php:362
 msgid "Personal"
 msgstr "Personleg"
 
-#: app.php:351
+#: app.php:373
 msgid "Settings"
 msgstr "Innstillingar"
 
-#: app.php:356
+#: app.php:385
 msgid "Users"
 msgstr "Brukarar"
 
-#: app.php:363
+#: app.php:398
 msgid "Apps"
 msgstr ""
 
-#: app.php:365
+#: app.php:406
 msgid "Admin"
 msgstr ""
 
@@ -49,15 +49,15 @@ msgstr ""
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:203 files.php:228
+#: files.php:204 files.php:231
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:227
+#: files.php:228
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: helper.php:226
+#: helper.php:228
 msgid "couldn't be determined"
 msgstr ""
 
@@ -97,87 +97,92 @@ msgstr ""
 msgid "Specify a data folder."
 msgstr ""
 
-#: setup.php:53
+#: setup.php:55
 #, php-format
 msgid "%s enter the database username."
 msgstr ""
 
-#: setup.php:56
+#: setup.php:58
 #, php-format
 msgid "%s enter the database name."
 msgstr ""
 
-#: setup.php:59
+#: setup.php:61
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr ""
 
-#: setup.php:62
+#: setup.php:64
 #, php-format
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:126 setup.php:291 setup.php:336
+#: setup.php:128 setup.php:320 setup.php:365
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:127 setup.php:150 setup.php:204
+#: setup.php:129 setup.php:152 setup.php:229
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:149 setup.php:423 setup.php:489
+#: setup.php:151 setup.php:453 setup.php:520
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:203
+#: setup.php:228
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:255 setup.php:357 setup.php:366 setup.php:384 setup.php:394
-#: setup.php:403 setup.php:430 setup.php:496 setup.php:522 setup.php:529
-#: setup.php:540 setup.php:547 setup.php:556 setup.php:564 setup.php:573
-#: setup.php:579
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:256 setup.php:358 setup.php:367 setup.php:385 setup.php:395
-#: setup.php:404 setup.php:431 setup.php:497 setup.php:523 setup.php:530
-#: setup.php:541 setup.php:557 setup.php:565 setup.php:574
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:270
+#: setup.php:299
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:271
+#: setup.php:300
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:276
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:277
+#: setup.php:306
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:548 setup.php:580
+#: setup.php:579 setup.php:611
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:644
+#: setup.php:631
+#, php-format
+msgid "MS SQL username and/or password not valid: %s"
+msgstr ""
+
+#: setup.php:849
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:645
+#: setup.php:850
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
@@ -234,16 +239,16 @@ msgstr ""
 msgid "years ago"
 msgstr ""
 
-#: updater.php:75
+#: updater.php:78
 #, php-format
 msgid "%s is available. Get <a href=\"%s\">more information</a>"
 msgstr ""
 
-#: updater.php:77
+#: updater.php:81
 msgid "up to date"
 msgstr ""
 
-#: updater.php:80
+#: updater.php:84
 msgid "updates check is disabled"
 msgstr ""
 
diff --git a/l10n/nn_NO/settings.po b/l10n/nn_NO/settings.po
index 69672b6e8322bf4db29651d4af950599b5c16784..a4361ebb42e3942b6cf5c66ef5841edccdcea600 100644
--- a/l10n/nn_NO/settings.po
+++ b/l10n/nn_NO/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 23:05+0000\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: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -23,8 +23,8 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "Klarer ikkje å laste inn liste fra App Store"
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:15
-#: ajax/togglegroups.php:18
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr "Feil i autentisering"
 
@@ -72,12 +72,12 @@ msgstr "Ugyldig førespurnad"
 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 ""
@@ -118,7 +118,7 @@ msgstr "Feil"
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:96
+#: js/personal.js:99
 msgid "Saving..."
 msgstr ""
 
@@ -147,23 +147,23 @@ msgstr ""
 msgid "Delete"
 msgstr "Slett"
 
-#: js/users.js:190
+#: js/users.js:191
 msgid "add group"
 msgstr ""
 
-#: js/users.js:351
+#: js/users.js:352
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:357
+#: js/users.js:358
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
 msgid "__language_name__"
 msgstr "Nynorsk"
 
@@ -209,19 +209,19 @@ msgstr ""
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:61
+#: templates/admin.php:63
+#, php-format
 msgid ""
-"This ownCloud server can't set system locale to "
-"\"en_US.UTF-8\"/\"en_US.UTF8\". 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 en_US.UTF-8/en_US.UTF8."
+"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:72
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:75
+#: 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 "
@@ -231,98 +231,98 @@ msgid ""
 " of ownCloud."
 msgstr ""
 
-#: templates/admin.php:89
+#: templates/admin.php:92
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:98
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:108
+#: 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:118
+#: 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:125
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:131
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:132
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:140
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:147
+#: templates/admin.php:150
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:148
+#: templates/admin.php:151
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:155
+#: templates/admin.php:158
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:161
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:165
+#: templates/admin.php:168
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:181
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:179
+#: templates/admin.php:182
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:182
+#: templates/admin.php:185
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr ""
 
-#: templates/admin.php:192
+#: templates/admin.php:195
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:193
+#: templates/admin.php:196
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:220
+#: templates/admin.php:223
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:227 templates/personal.php:98
+#: templates/admin.php:230 templates/personal.php:102
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:230 templates/personal.php:100
+#: templates/admin.php:233 templates/personal.php:105
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -332,51 +332,51 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr ""
 
-#: templates/apps.php:10
+#: templates/apps.php:11
 msgid "Add your App"
 msgstr ""
 
-#: templates/apps.php:11
+#: templates/apps.php:12
 msgid "More Apps"
 msgstr ""
 
-#: templates/apps.php:24
+#: templates/apps.php:28
 msgid "Select an App"
 msgstr "Vel ein applikasjon"
 
-#: templates/apps.php:28
+#: templates/apps.php:34
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:29
+#: templates/apps.php:36
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
-#: templates/apps.php:31
+#: templates/apps.php:38
 msgid "Update"
 msgstr "Oppdater"
 
-#: templates/help.php:3
+#: 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 ""
 
@@ -385,79 +385,79 @@ msgstr ""
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:14
+#: templates/personal.php:15
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:25
+#: templates/personal.php:26
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:36 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
 msgid "Password"
 msgstr "Passord"
 
-#: templates/personal.php:37
+#: templates/personal.php:38
 msgid "Your password was changed"
 msgstr ""
 
-#: templates/personal.php:38
+#: templates/personal.php:39
 msgid "Unable to change your password"
 msgstr "Klarte ikkje å endra passordet"
 
-#: templates/personal.php:39
+#: templates/personal.php:40
 msgid "Current password"
 msgstr "Passord"
 
-#: templates/personal.php:40
+#: templates/personal.php:42
 msgid "New password"
 msgstr "Nytt passord"
 
-#: templates/personal.php:42
+#: templates/personal.php:44
 msgid "Change password"
 msgstr "Endra passord"
 
-#: templates/personal.php:54 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:78
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:55
+#: templates/personal.php:57
 msgid "Your display name was changed"
 msgstr ""
 
-#: templates/personal.php:56
+#: templates/personal.php:58
 msgid "Unable to change your display name"
 msgstr ""
 
-#: templates/personal.php:59
+#: templates/personal.php:61
 msgid "Change display name"
 msgstr ""
 
-#: templates/personal.php:68
+#: templates/personal.php:70
 msgid "Email"
 msgstr "Epost"
 
-#: templates/personal.php:69
+#: templates/personal.php:72
 msgid "Your email address"
 msgstr "Din epost addresse"
 
-#: templates/personal.php:70
+#: templates/personal.php:73
 msgid "Fill in an email address to enable password recovery"
 msgstr "Fyll inn din e-post addresse for og kunne motta passord tilbakestilling"
 
-#: templates/personal.php:76 templates/personal.php:77
+#: templates/personal.php:79 templates/personal.php:80
 msgid "Language"
 msgstr "Språk"
 
-#: templates/personal.php:82
+#: templates/personal.php:86
 msgid "Help translate"
 msgstr "Hjelp oss å oversett"
 
-#: templates/personal.php:87
+#: templates/personal.php:91
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:89
+#: templates/personal.php:93
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
diff --git a/l10n/nn_NO/user_ldap.po b/l10n/nn_NO/user_ldap.po
index d2cf7889567f56628e5422e14f30e2b873777dfe..33368c43791836fc463f16039f904bbc9615674d 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-02-08 00:10+0100\n"
-"PO-Revision-Date: 2013-02-07 23:11+0000\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: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -21,17 +21,17 @@ msgstr ""
 msgid "Failed to delete the server configuration"
 msgstr ""
 
-#: ajax/testConfiguration.php:35
+#: ajax/testConfiguration.php:36
 msgid "The configuration is valid and the connection could be established!"
 msgstr ""
 
-#: ajax/testConfiguration.php:37
+#: ajax/testConfiguration.php:39
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
 msgstr ""
 
-#: ajax/testConfiguration.php:40
+#: ajax/testConfiguration.php:43
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
@@ -86,224 +86,248 @@ msgstr ""
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:17
+#: templates/settings.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:23
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:25
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:26
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:27
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:28
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:32
 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:24
+#: templates/settings.php:33
 msgid "Password"
 msgstr ""
 
-#: templates/settings.php:24
+#: templates/settings.php:36
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:37
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:40
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:41
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:42
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:45
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:46
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:47
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:50
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:51
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:55
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:34
+#: templates/settings.php:58
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:60
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:39
+#: templates/settings.php:63
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:65
+msgid "Cache Time-To-Live"
+msgstr ""
+
+#: templates/settings.php:65
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:67
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:47
+#: templates/settings.php:71
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:47 templates/settings.php:50
+#: templates/settings.php:71 templates/settings.php:74
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:74
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:75
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:77
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:79
+msgid "Quota Field"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Quota Default"
+msgstr ""
+
+#: templates/settings.php:80
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:81
+msgid "Email Field"
+msgstr ""
+
+#: templates/settings.php:82
+msgid "User Home Folder Naming Rule"
+msgstr ""
+
+#: templates/settings.php:82
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:62
+#: templates/settings.php:86
+msgid "Test Configuration"
+msgstr ""
+
+#: templates/settings.php:86
 msgid "Help"
 msgstr "Hjelp"
diff --git a/l10n/oc/core.po b/l10n/oc/core.po
index cb7ee02dd0c1df4b4195b925974dc035d54b1d93..a2b487f6866d69ee9f412cf31f98de1d13bb78b6 100644
--- a/l10n/oc/core.po
+++ b/l10n/oc/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 14:31+0000\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"
 "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
 "MIME-Version: 1.0\n"
@@ -387,7 +387,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 "senhal d'ownCloud tornat botar"
 
diff --git a/l10n/oc/files.po b/l10n/oc/files.po
index 57fc9bcb13e760332cc137a0e13b6afc647f811c..6500ddb024b5fcde4697ed912a40eff82eb5ca33 100644
--- a/l10n/oc/files.po
+++ b/l10n/oc/files.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\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: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
 "MIME-Version: 1.0\n"
@@ -51,27 +51,27 @@ msgid ""
 "the HTML form"
 msgstr "Lo fichièr amontcargat es mai gròs que la directiva «MAX_FILE_SIZE» especifiada dins lo formulari HTML"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
 msgstr "Lo fichièr foguèt pas completament amontcargat"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:31
 msgid "No file was uploaded"
 msgstr "Cap de fichièrs son estats amontcargats"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:32
 msgid "Missing a temporary folder"
 msgstr "Un dorsièr temporari manca"
 
-#: ajax/upload.php:34
+#: ajax/upload.php:33
 msgid "Failed to write to disk"
 msgstr "L'escriptura sul disc a fracassat"
 
-#: ajax/upload.php:52
+#: ajax/upload.php:51
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:83
+#: ajax/upload.php:82
 msgid "Invalid directory."
 msgstr ""
 
@@ -83,7 +83,7 @@ msgstr "Fichièrs"
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:127 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:127 templates/index.php:92 templates/index.php:93
 msgid "Delete"
 msgstr "Escafa"
 
@@ -91,40 +91,36 @@ msgstr "Escafa"
 msgid "Rename"
 msgstr "Torna nomenar"
 
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
 msgid "Pending"
 msgstr "Al esperar"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "replace"
 msgstr "remplaça"
 
-#: js/filelist.js:253
+#: js/filelist.js:251
 msgid "suggest name"
 msgstr "nom prepausat"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "cancel"
 msgstr "anulla"
 
-#: js/filelist.js:295
-msgid "replaced {new_name}"
+#: js/filelist.js:298
+msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:295 js/filelist.js:297
+#: js/filelist.js:298
 msgid "undo"
 msgstr "defar"
 
-#: js/filelist.js:297
-msgid "replaced {new_name} with {old_name}"
-msgstr ""
-
-#: js/filelist.js:322
+#: js/filelist.js:323
 msgid "perform delete operation"
 msgstr ""
 
@@ -150,74 +146,74 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:224
+#: js/files.js:225
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:261
+#: js/files.js:262
 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:261
+#: js/files.js:262
 msgid "Upload Error"
 msgstr "Error d'amontcargar"
 
-#: js/files.js:272
+#: js/files.js:273
 msgid "Close"
 msgstr ""
 
-#: js/files.js:311
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr "1 fichièr al amontcargar"
 
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr ""
 
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "Amontcargar anullat."
 
-#: js/files.js:496
+#: js/files.js:497
 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:569
+#: js/files.js:570
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:574
+#: js/files.js:575
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:953 templates/index.php:68
 msgid "Name"
 msgstr "Nom"
 
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:954 templates/index.php:79
 msgid "Size"
 msgstr "Talha"
 
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:955 templates/index.php:81
 msgid "Modified"
 msgstr "Modificat"
 
-#: js/files.js:969
+#: js/files.js:974
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:971
+#: js/files.js:976
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:979
+#: js/files.js:984
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:981
+#: js/files.js:986
 msgid "{count} files"
 msgstr ""
 
@@ -281,33 +277,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr " Anulla l'amontcargar"
 
-#: templates/index.php:59
+#: templates/index.php:53
+msgid "You don’t have write permissions here."
+msgstr ""
+
+#: templates/index.php:60
 msgid "Nothing in here. Upload something!"
 msgstr "Pas res dedins. Amontcarga qualquaren"
 
-#: templates/index.php:73
+#: templates/index.php:74
 msgid "Download"
 msgstr "Avalcarga"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:86 templates/index.php:87
 msgid "Unshare"
 msgstr "Non parteja"
 
-#: templates/index.php:105
+#: templates/index.php:106
 msgid "Upload too large"
 msgstr "Amontcargament tròp gròs"
 
-#: templates/index.php:107
+#: templates/index.php:108
 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:112
+#: templates/index.php:113
 msgid "Files are being scanned, please wait."
 msgstr "Los fiichièrs son a èsser explorats, "
 
-#: templates/index.php:115
+#: templates/index.php:116
 msgid "Current scanning"
 msgstr "Exploracion en cors"
 
diff --git a/l10n/oc/files_external.po b/l10n/oc/files_external.po
index fcf2b75be30efd9ae03b6af1822e0c3d81b5aa23..b363f8d316d4c9c180c7ecaed24c08c94dfef7c1 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: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-11 23:22+0000\n"
+"POT-Creation-Date: 2013-02-28 00:04+0100\n"
+"PO-Revision-Date: 2013-02-27 23:04+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
 "MIME-Version: 1.0\n"
@@ -17,37 +17,33 @@ msgstr ""
 "Language: oc\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:421
 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:424
 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 "
@@ -58,63 +54,63 @@ msgstr ""
 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 "Grops"
 
-#: templates/settings.php:95
+#: templates/settings.php:100
 msgid "Users"
 msgstr "Usancièrs"
 
-#: 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 "Escafa"
 
-#: 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/oc/files_trashbin.po b/l10n/oc/files_trashbin.po
index f3243c02aa847e43e59c208cfd9a7d34921a490d..c021b24f318e5406479a0ca830ca250d1b8f27cf 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-02-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 10:07+0000\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: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
 "MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Language: oc\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ajax/delete.php:22
+#: ajax/delete.php:40
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
@@ -27,35 +27,39 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:33
+#: js/trash.js:34
 msgid "delete file permanently"
 msgstr ""
 
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr ""
+
+#: js/trash.js:174 templates/index.php:17
 msgid "Name"
 msgstr "Nom"
 
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:175 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:135
+#: js/trash.js:184
 msgid "1 folder"
 msgstr ""
 
-#: js/trash.js:137
+#: js/trash.js:186
 msgid "{count} folders"
 msgstr ""
 
-#: js/trash.js:145
+#: js/trash.js:194
 msgid "1 file"
 msgstr ""
 
-#: js/trash.js:147
+#: js/trash.js:196
 msgid "{count} files"
 msgstr ""
 
@@ -66,3 +70,11 @@ msgstr ""
 #: templates/index.php:20 templates/index.php:22
 msgid "Restore"
 msgstr ""
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr "Escafa"
+
+#: templates/part.breadcrumb.php:9
+msgid "Deleted Files"
+msgstr ""
diff --git a/l10n/oc/files_versions.po b/l10n/oc/files_versions.po
index ed722b6022254dfe08b89cde46724a0a4a28fa59..a84be8cd14bb4d42b26e411ab1300d5e9125c13f 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-08 00:10+0100\n"
-"PO-Revision-Date: 2013-02-07 23:11+0000\n"
+"POT-Creation-Date: 2013-02-28 00:04+0100\n"
+"PO-Revision-Date: 2013-02-27 23:04+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
 "MIME-Version: 1.0\n"
@@ -48,18 +48,10 @@ msgstr ""
 msgid "No path specified"
 msgstr ""
 
-#: js/versions.js:16
-msgid "History"
+#: 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 ""
-
-#: templates/settings.php:3
-msgid "Files Versioning"
-msgstr ""
-
-#: templates/settings.php:4
-msgid "Enable"
-msgstr ""
diff --git a/l10n/oc/lib.po b/l10n/oc/lib.po
index ada37ffbff335a65beefda266b0e680eca398cd7..005e945b230b8d92a32ccc2cbe0028869b62cbfd 100644
--- a/l10n/oc/lib.po
+++ b/l10n/oc/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-11 15:39+0100\n"
-"PO-Revision-Date: 2013-02-11 14:41+0000\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: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
 "MIME-Version: 1.0\n"
@@ -18,27 +18,27 @@ msgstr ""
 "Language: oc\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: app.php:339
+#: app.php:349
 msgid "Help"
 msgstr "Ajuda"
 
-#: app.php:346
+#: app.php:362
 msgid "Personal"
 msgstr "Personal"
 
-#: app.php:351
+#: app.php:373
 msgid "Settings"
 msgstr "Configuracion"
 
-#: app.php:356
+#: app.php:385
 msgid "Users"
 msgstr "Usancièrs"
 
-#: app.php:363
+#: app.php:398
 msgid "Apps"
 msgstr "Apps"
 
-#: app.php:365
+#: app.php:406
 msgid "Admin"
 msgstr "Admin"
 
@@ -50,15 +50,15 @@ msgstr "Avalcargar los ZIP es inactiu."
 msgid "Files need to be downloaded one by one."
 msgstr "Los fichièrs devan èsser avalcargats un per un."
 
-#: files.php:203 files.php:228
+#: files.php:204 files.php:231
 msgid "Back to Files"
 msgstr "Torna cap als fichièrs"
 
-#: files.php:227
+#: files.php:228
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: helper.php:226
+#: helper.php:228
 msgid "couldn't be determined"
 msgstr ""
 
@@ -98,87 +98,92 @@ msgstr ""
 msgid "Specify a data folder."
 msgstr ""
 
-#: setup.php:53
+#: setup.php:55
 #, php-format
 msgid "%s enter the database username."
 msgstr ""
 
-#: setup.php:56
+#: setup.php:58
 #, php-format
 msgid "%s enter the database name."
 msgstr ""
 
-#: setup.php:59
+#: setup.php:61
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr ""
 
-#: setup.php:62
+#: setup.php:64
 #, php-format
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:126 setup.php:291 setup.php:336
+#: setup.php:128 setup.php:320 setup.php:365
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:127 setup.php:150 setup.php:204
+#: setup.php:129 setup.php:152 setup.php:229
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:149 setup.php:423 setup.php:489
+#: setup.php:151 setup.php:453 setup.php:520
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:203
+#: setup.php:228
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:255 setup.php:357 setup.php:366 setup.php:384 setup.php:394
-#: setup.php:403 setup.php:430 setup.php:496 setup.php:522 setup.php:529
-#: setup.php:540 setup.php:547 setup.php:556 setup.php:564 setup.php:573
-#: setup.php:579
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:256 setup.php:358 setup.php:367 setup.php:385 setup.php:395
-#: setup.php:404 setup.php:431 setup.php:497 setup.php:523 setup.php:530
-#: setup.php:541 setup.php:557 setup.php:565 setup.php:574
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:270
+#: setup.php:299
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:271
+#: setup.php:300
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:276
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:277
+#: setup.php:306
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:548 setup.php:580
+#: setup.php:579 setup.php:611
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:644
+#: setup.php:631
+#, php-format
+msgid "MS SQL username and/or password not valid: %s"
+msgstr ""
+
+#: setup.php:849
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:645
+#: setup.php:850
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
@@ -235,16 +240,16 @@ msgstr "an passat"
 msgid "years ago"
 msgstr "ans a"
 
-#: updater.php:75
+#: updater.php:78
 #, php-format
 msgid "%s is available. Get <a href=\"%s\">more information</a>"
 msgstr ""
 
-#: updater.php:77
+#: updater.php:81
 msgid "up to date"
 msgstr "a jorn"
 
-#: updater.php:80
+#: updater.php:84
 msgid "updates check is disabled"
 msgstr "la verificacion de mesa a jorn es inactiva"
 
diff --git a/l10n/oc/settings.po b/l10n/oc/settings.po
index dd9a80413d23253ed7bf5f020e17f22d1f466683..3dd4a1a3fd4c7fbbfb0279705fab75a104e398f6 100644
--- a/l10n/oc/settings.po
+++ b/l10n/oc/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 23:05+0000\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: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
 "MIME-Version: 1.0\n"
@@ -22,8 +22,8 @@ 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:15
-#: ajax/togglegroups.php:18
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr "Error d'autentificacion"
 
@@ -71,12 +71,12 @@ msgstr "Demanda invalida"
 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 "Pas capable d'apondre un usancièr al grop %s"
 
-#: ajax/togglegroups.php:34
+#: ajax/togglegroups.php:36
 #, php-format
 msgid "Unable to remove user from group %s"
 msgstr "Pas capable de tira un usancièr del grop %s"
@@ -117,7 +117,7 @@ msgstr "Error"
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:96
+#: js/personal.js:99
 msgid "Saving..."
 msgstr "Enregistra..."
 
@@ -146,23 +146,23 @@ msgstr "Grop Admin"
 msgid "Delete"
 msgstr "Escafa"
 
-#: js/users.js:190
+#: js/users.js:191
 msgid "add group"
 msgstr ""
 
-#: js/users.js:351
+#: js/users.js:352
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:357
+#: js/users.js:358
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -208,19 +208,19 @@ msgstr ""
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:61
+#: templates/admin.php:63
+#, php-format
 msgid ""
-"This ownCloud server can't set system locale to "
-"\"en_US.UTF-8\"/\"en_US.UTF8\". 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 en_US.UTF-8/en_US.UTF8."
+"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:72
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:75
+#: 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 "
@@ -230,98 +230,98 @@ msgid ""
 " of ownCloud."
 msgstr ""
 
-#: templates/admin.php:89
+#: templates/admin.php:92
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:98
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:108
+#: 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:118
+#: 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:125
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:131
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:132
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:140
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:147
+#: templates/admin.php:150
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:148
+#: templates/admin.php:151
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:155
+#: templates/admin.php:158
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:161
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:165
+#: templates/admin.php:168
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:181
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:179
+#: templates/admin.php:182
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:182
+#: templates/admin.php:185
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr ""
 
-#: templates/admin.php:192
+#: templates/admin.php:195
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:193
+#: templates/admin.php:196
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:220
+#: templates/admin.php:223
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:227 templates/personal.php:98
+#: templates/admin.php:230 templates/personal.php:102
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:230 templates/personal.php:100
+#: templates/admin.php:233 templates/personal.php:105
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -331,51 +331,51 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr ""
 
-#: templates/apps.php:10
+#: templates/apps.php:11
 msgid "Add your App"
 msgstr "Ajusta ton App"
 
-#: templates/apps.php:11
+#: templates/apps.php:12
 msgid "More Apps"
 msgstr ""
 
-#: templates/apps.php:24
+#: templates/apps.php:28
 msgid "Select an App"
 msgstr "Selecciona una applicacion"
 
-#: templates/apps.php:28
+#: templates/apps.php:34
 msgid "See application page at apps.owncloud.com"
 msgstr "Agacha la pagina d'applications en cò de apps.owncloud.com"
 
-#: templates/apps.php:29
+#: templates/apps.php:36
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-licençiat per <span class=\"author\"></span>"
 
-#: templates/apps.php:31
+#: templates/apps.php:38
 msgid "Update"
 msgstr ""
 
-#: templates/help.php:3
+#: 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 ""
 
@@ -384,79 +384,79 @@ msgstr ""
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:14
+#: templates/personal.php:15
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:25
+#: templates/personal.php:26
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:36 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
 msgid "Password"
 msgstr "Senhal"
 
-#: templates/personal.php:37
+#: templates/personal.php:38
 msgid "Your password was changed"
 msgstr "Ton senhal a cambiat"
 
-#: templates/personal.php:38
+#: templates/personal.php:39
 msgid "Unable to change your password"
 msgstr "Pas possible de cambiar ton senhal"
 
-#: templates/personal.php:39
+#: templates/personal.php:40
 msgid "Current password"
 msgstr "Senhal en cors"
 
-#: templates/personal.php:40
+#: templates/personal.php:42
 msgid "New password"
 msgstr "Senhal novèl"
 
-#: templates/personal.php:42
+#: templates/personal.php:44
 msgid "Change password"
 msgstr "Cambia lo senhal"
 
-#: templates/personal.php:54 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:78
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:55
+#: templates/personal.php:57
 msgid "Your display name was changed"
 msgstr ""
 
-#: templates/personal.php:56
+#: templates/personal.php:58
 msgid "Unable to change your display name"
 msgstr ""
 
-#: templates/personal.php:59
+#: templates/personal.php:61
 msgid "Change display name"
 msgstr ""
 
-#: templates/personal.php:68
+#: templates/personal.php:70
 msgid "Email"
 msgstr "Corrièl"
 
-#: templates/personal.php:69
+#: templates/personal.php:72
 msgid "Your email address"
 msgstr "Ton adreiça de corrièl"
 
-#: templates/personal.php:70
+#: templates/personal.php:73
 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:76 templates/personal.php:77
+#: templates/personal.php:79 templates/personal.php:80
 msgid "Language"
 msgstr "Lenga"
 
-#: templates/personal.php:82
+#: templates/personal.php:86
 msgid "Help translate"
 msgstr "Ajuda a la revirada"
 
-#: templates/personal.php:87
+#: templates/personal.php:91
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:89
+#: templates/personal.php:93
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
diff --git a/l10n/oc/user_ldap.po b/l10n/oc/user_ldap.po
index 56fd18cfc3318180ed75a34efdca78f1cd4175ec..3c1cdc754b3ef8856aa23fd0f259996db4500868 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-02-08 00:10+0100\n"
-"PO-Revision-Date: 2013-02-07 23:11+0000\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: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
 "MIME-Version: 1.0\n"
@@ -21,17 +21,17 @@ msgstr ""
 msgid "Failed to delete the server configuration"
 msgstr ""
 
-#: ajax/testConfiguration.php:35
+#: ajax/testConfiguration.php:36
 msgid "The configuration is valid and the connection could be established!"
 msgstr ""
 
-#: ajax/testConfiguration.php:37
+#: ajax/testConfiguration.php:39
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
 msgstr ""
 
-#: ajax/testConfiguration.php:40
+#: ajax/testConfiguration.php:43
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
@@ -86,224 +86,248 @@ msgstr ""
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:17
+#: templates/settings.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:23
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:25
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:26
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:27
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:28
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:32
 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:24
+#: templates/settings.php:33
 msgid "Password"
 msgstr ""
 
-#: templates/settings.php:24
+#: templates/settings.php:36
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:37
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:40
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:41
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:42
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:45
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:46
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:47
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:50
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:51
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:55
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:34
+#: templates/settings.php:58
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:60
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:39
+#: templates/settings.php:63
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:65
+msgid "Cache Time-To-Live"
+msgstr ""
+
+#: templates/settings.php:65
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:67
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:47
+#: templates/settings.php:71
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:47 templates/settings.php:50
+#: templates/settings.php:71 templates/settings.php:74
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:74
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:75
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:77
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:79
+msgid "Quota Field"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Quota Default"
+msgstr ""
+
+#: templates/settings.php:80
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:81
+msgid "Email Field"
+msgstr ""
+
+#: templates/settings.php:82
+msgid "User Home Folder Naming Rule"
+msgstr ""
+
+#: templates/settings.php:82
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:62
+#: templates/settings.php:86
+msgid "Test Configuration"
+msgstr ""
+
+#: templates/settings.php:86
 msgid "Help"
 msgstr "Ajuda"
diff --git a/l10n/pl/core.po b/l10n/pl/core.po
index 5021e25a3666f9f6b62d4550784b6504a7d1f9c2..a12e97ff66e3c553224301d7eca166f068bf7e0e 100644
--- a/l10n/pl/core.po
+++ b/l10n/pl/core.po
@@ -7,8 +7,10 @@
 # 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.
@@ -17,9 +19,9 @@ 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 14:31+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "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"
@@ -27,142 +29,142 @@ 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/share.php:85
+#: ajax/share.php:97
 #, php-format
 msgid "User %s shared a file with you"
-msgstr "Użytkownik %s współdzieli plik z tobą"
+msgstr "Użytkownik %s udostępnił ci plik"
 
-#: ajax/share.php:87
+#: ajax/share.php:99
 #, php-format
 msgid "User %s shared a folder with you"
-msgstr "Uzytkownik %s wspóldzieli folder z toba"
+msgstr "Użytkownik %s udostępnił ci folder"
 
-#: 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żytkownik %s współdzieli plik \"%s\" z tobą. Jest dostępny tutaj: %s"
+msgstr "Użytkownik %s udostępnił ci plik „%s”. Możesz pobrać go stąd: %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 "Uzytkownik %s wspóldzieli folder \"%s\" z toba. Jest dostepny tutaj: %s"
+msgstr "Użytkownik %s udostępnił ci folder „%s”. Możesz pobrać go stąd: %s"
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
-msgstr "Typ kategorii nie podany."
+msgstr "Nie podano typu kategorii."
 
 #: ajax/vcategories/add.php:30
 msgid "No category to add?"
-msgstr "Brak kategorii"
+msgstr "Brak kategorii do dodania?"
 
 #: ajax/vcategories/add.php:37
 #, php-format
 msgid "This category already exists: %s"
-msgstr ""
+msgstr "Ta kategoria już istnieje: %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 "Typ obiektu nie podany."
+msgstr "Nie podano typu obiektu."
 
 #: ajax/vcategories/addToFavorites.php:30
 #: ajax/vcategories/removeFromFavorites.php:30
 #, php-format
 msgid "%s ID not provided."
-msgstr "%s ID nie podany."
+msgstr "Nie podano ID %s."
 
 #: ajax/vcategories/addToFavorites.php:35
 #, php-format
 msgid "Error adding %s to favorites."
-msgstr "Błąd dodania %s do ulubionych."
+msgstr "Błąd podczas dodawania %s do ulubionych."
 
 #: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
 msgid "No categories selected for deletion."
-msgstr "Nie ma kategorii zaznaczonych do usunięcia."
+msgstr "Nie zaznaczono kategorii do usunięcia."
 
 #: ajax/vcategories/removeFromFavorites.php:35
 #, php-format
 msgid "Error removing %s from favorites."
-msgstr "Błąd usunięcia %s z ulubionych."
+msgstr "Błąd podczas usuwania %s z ulubionych."
 
-#: js/config.php:32
+#: js/config.php:34
 msgid "Sunday"
 msgstr "Niedziela"
 
-#: js/config.php:32
+#: js/config.php:35
 msgid "Monday"
 msgstr "Poniedziałek"
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Tuesday"
 msgstr "Wtorek"
 
-#: js/config.php:32
+#: js/config.php:37
 msgid "Wednesday"
 msgstr "Środa"
 
-#: js/config.php:32
+#: js/config.php:38
 msgid "Thursday"
 msgstr "Czwartek"
 
-#: js/config.php:32
+#: js/config.php:39
 msgid "Friday"
 msgstr "Piątek"
 
-#: js/config.php:32
+#: js/config.php:40
 msgid "Saturday"
 msgstr "Sobota"
 
-#: js/config.php:33
+#: js/config.php:45
 msgid "January"
 msgstr "Styczeń"
 
-#: js/config.php:33
+#: js/config.php:46
 msgid "February"
 msgstr "Luty"
 
-#: js/config.php:33
+#: js/config.php:47
 msgid "March"
 msgstr "Marzec"
 
-#: js/config.php:33
+#: js/config.php:48
 msgid "April"
 msgstr "Kwiecień"
 
-#: js/config.php:33
+#: js/config.php:49
 msgid "May"
 msgstr "Maj"
 
-#: js/config.php:33
+#: js/config.php:50
 msgid "June"
 msgstr "Czerwiec"
 
-#: js/config.php:33
+#: js/config.php:51
 msgid "July"
 msgstr "Lipiec"
 
-#: js/config.php:33
+#: js/config.php:52
 msgid "August"
 msgstr "Sierpień"
 
-#: js/config.php:33
+#: js/config.php:53
 msgid "September"
 msgstr "Wrzesień"
 
-#: js/config.php:33
+#: js/config.php:54
 msgid "October"
 msgstr "Październik"
 
-#: js/config.php:33
+#: js/config.php:55
 msgid "November"
 msgstr "Listopad"
 
-#: js/config.php:33
+#: js/config.php:56
 msgid "December"
 msgstr "Grudzień"
 
@@ -170,55 +172,55 @@ msgstr "Grudzień"
 msgid "Settings"
 msgstr "Ustawienia"
 
-#: js/js.js:767
+#: js/js.js:768
 msgid "seconds ago"
 msgstr "sekund temu"
 
-#: js/js.js:768
+#: js/js.js:769
 msgid "1 minute ago"
-msgstr "1 minute temu"
+msgstr "1 minutę temu"
 
-#: js/js.js:769
+#: js/js.js:770
 msgid "{minutes} minutes ago"
 msgstr "{minutes} minut temu"
 
-#: js/js.js:770
+#: js/js.js:771
 msgid "1 hour ago"
-msgstr "1 godzine temu"
+msgstr "1 godzinę temu"
 
-#: js/js.js:771
+#: js/js.js:772
 msgid "{hours} hours ago"
 msgstr "{hours} godzin temu"
 
-#: js/js.js:772
+#: js/js.js:773
 msgid "today"
 msgstr "dziś"
 
-#: js/js.js:773
+#: js/js.js:774
 msgid "yesterday"
 msgstr "wczoraj"
 
-#: js/js.js:774
+#: js/js.js:775
 msgid "{days} days ago"
 msgstr "{days} dni temu"
 
-#: js/js.js:775
+#: js/js.js:776
 msgid "last month"
-msgstr "ostani miesiąc"
+msgstr "w zeszłym miesiącu"
 
-#: js/js.js:776
+#: js/js.js:777
 msgid "{months} months ago"
 msgstr "{months} miesięcy temu"
 
-#: js/js.js:777
+#: js/js.js:778
 msgid "months ago"
 msgstr "miesięcy temu"
 
-#: js/js.js:778
+#: js/js.js:779
 msgid "last year"
-msgstr "ostatni rok"
+msgstr "w zeszłym roku"
 
-#: js/js.js:779
+#: js/js.js:780
 msgid "years ago"
 msgstr "lat temu"
 
@@ -240,12 +242,12 @@ msgstr "Tak"
 
 #: js/oc-dialogs.js:180
 msgid "Ok"
-msgstr "Ok"
+msgstr "OK"
 
 #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
 #: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
 msgid "The object type is not specified."
-msgstr "Typ obiektu nie jest określony."
+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
@@ -255,11 +257,11 @@ msgstr "Błąd"
 
 #: js/oc-vcategories.js:179
 msgid "The app name is not specified."
-msgstr "Nazwa aplikacji nie jest określona."
+msgstr "Nie określono nazwy aplikacji."
 
 #: js/oc-vcategories.js:194
 msgid "The required file {file} is not installed!"
-msgstr "Żądany plik {file} nie jest zainstalowany!"
+msgstr "Wymagany plik {file} nie jest zainstalowany!"
 
 #: js/share.js:29 js/share.js:43 js/share.js:90
 msgid "Shared"
@@ -283,11 +285,11 @@ msgstr "Błąd przy zmianie uprawnień"
 
 #: js/share.js:168
 msgid "Shared with you and the group {group} by {owner}"
-msgstr "Udostępnione Tobie i grupie {group} przez {owner}"
+msgstr "Udostępnione tobie i grupie {group} przez {owner}"
 
 #: js/share.js:170
 msgid "Shared with you by {owner}"
-msgstr "Udostępnione Ci przez {owner}"
+msgstr "Udostępnione tobie przez {owner}"
 
 #: js/share.js:175
 msgid "Share with"
@@ -295,19 +297,19 @@ msgstr "Współdziel z"
 
 #: js/share.js:180
 msgid "Share with link"
-msgstr "Współdziel z link"
+msgstr "Współdziel wraz z odnośnikiem"
 
 #: js/share.js:183
 msgid "Password protect"
-msgstr "Zabezpieczone hasłem"
+msgstr "Zabezpiecz hasłem"
 
-#: js/share.js:185 templates/installation.php:44 templates/login.php:35
+#: js/share.js:185 templates/installation.php:47 templates/login.php:35
 msgid "Password"
 msgstr "Hasło"
 
 #: js/share.js:189
 msgid "Email link to person"
-msgstr "Email do osoby"
+msgstr "Wyślij osobie odnośnik poprzez e-mail"
 
 #: js/share.js:190
 msgid "Send"
@@ -323,7 +325,7 @@ msgstr "Data wygaśnięcia"
 
 #: js/share.js:227
 msgid "Share via email:"
-msgstr "Współdziel poprzez maila"
+msgstr "Współdziel poprzez e-mail:"
 
 #: js/share.js:229
 msgid "No people found"
@@ -343,7 +345,7 @@ msgstr "Zatrzymaj współdzielenie"
 
 #: js/share.js:325
 msgid "can edit"
-msgstr "można edytować"
+msgstr "może edytować"
 
 #: js/share.js:327
 msgid "access control"
@@ -371,7 +373,7 @@ msgstr "Zabezpieczone hasłem"
 
 #: js/share.js:582
 msgid "Error unsetting expiration date"
-msgstr "Błąd niszczenie daty wygaśnięcia"
+msgstr "Błąd podczas usuwania daty wygaśnięcia"
 
 #: js/share.js:594
 msgid "Error setting expiration date"
@@ -383,26 +385,26 @@ msgstr "Wysyłanie..."
 
 #: js/share.js:620
 msgid "Email sent"
-msgstr "Wyślij Email"
+msgstr "E-mail wysłany"
 
 #: 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 "Aktualizacja zakończyła się niepowodzeniem. Zgłoś ten problem <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">spoleczności ownCloud</a>."
 
 #: js/update.js:18
 msgid "The update was successful. Redirecting you to ownCloud now."
-msgstr ""
+msgstr "Aktualizacji zakończyła się powodzeniem. Przekierowuję do ownCloud."
 
-#: lostpassword/controller.php:47
+#: lostpassword/controller.php:48
 msgid "ownCloud password reset"
-msgstr "restart hasła"
+msgstr "restart hasła ownCloud"
 
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
-msgstr "Proszę użyć tego odnośnika do zresetowania hasła: {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."
@@ -410,13 +412,13 @@ msgstr "Odnośnik służący do resetowania hasła zostanie wysłany na adres e-
 
 #: lostpassword/templates/lostpassword.php:5
 msgid "Reset email send."
-msgstr "Wyślij zresetowany email."
+msgstr "Wysłano e-mail resetujący."
 
 #: lostpassword/templates/lostpassword.php:8
 msgid "Request failed!"
-msgstr "Próba nieudana!"
+msgstr "Żądanie nieudane!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:39
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:41
 #: templates/login.php:28
 msgid "Username"
 msgstr "Nazwa użytkownika"
@@ -451,7 +453,7 @@ msgstr "Użytkownicy"
 
 #: strings.php:7
 msgid "Apps"
-msgstr "Programy"
+msgstr "Aplikacje"
 
 #: strings.php:8
 msgid "Admin"
@@ -471,93 +473,94 @@ msgstr "Nie odnaleziono chmury"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
-msgstr "Edytuj kategorię"
+msgstr "Edytuj kategorie"
 
 #: templates/edit_categories_dialog.php:16
 msgid "Add"
 msgstr "Dodaj"
 
-#: templates/installation.php:23 templates/installation.php:30
+#: templates/installation.php:24 templates/installation.php:31
 msgid "Security Warning"
 msgstr "Ostrzeżenie o zabezpieczeniach"
 
-#: templates/installation.php:24
+#: templates/installation.php:25
 msgid ""
 "No secure random number generator is available, please enable the PHP "
 "OpenSSL extension."
-msgstr "Niedostępny bezpieczny generator liczb losowych, należy włączyć rozszerzenie OpenSSL w PHP."
+msgstr "Bezpieczny generator liczb losowych jest niedostępny. Włącz rozszerzenie OpenSSL w PHP."
 
-#: templates/installation.php:25
+#: templates/installation.php:26
 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 być w stanie przewidzieć resetujące hasło tokena i przejąć kontrolę nad swoim kontem."
+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:31
+#: templates/installation.php:32
 msgid ""
 "Your data directory and files are probably accessible from the internet "
 "because the .htaccess file does not work."
-msgstr ""
+msgstr "Twój katalog danych i pliki są prawdopodobnie dostępne z poziomu internetu, ponieważ plik .htaccess nie działa."
 
-#: templates/installation.php:32
+#: templates/installation.php:33
 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 "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:36
+#: templates/installation.php:37
 msgid "Create an <strong>admin account</strong>"
-msgstr "Tworzenie <strong>konta administratora</strong>"
+msgstr "Utwórz <strong>konta administratora</strong>"
 
-#: templates/installation.php:52
+#: templates/installation.php:55
 msgid "Advanced"
 msgstr "Zaawansowane"
 
-#: templates/installation.php:54
+#: templates/installation.php:57
 msgid "Data folder"
 msgstr "Katalog danych"
 
-#: templates/installation.php:61
+#: templates/installation.php:66
 msgid "Configure the database"
-msgstr "Konfiguracja bazy danych"
+msgstr "Skonfiguruj bazę danych"
 
-#: templates/installation.php:66 templates/installation.php:77
-#: templates/installation.php:87 templates/installation.php:97
+#: templates/installation.php:71 templates/installation.php:83
+#: templates/installation.php:94 templates/installation.php:105
+#: templates/installation.php:117
 msgid "will be used"
 msgstr "zostanie użyte"
 
-#: templates/installation.php:109
+#: templates/installation.php:129
 msgid "Database user"
 msgstr "Użytkownik bazy danych"
 
-#: templates/installation.php:113
+#: templates/installation.php:134
 msgid "Database password"
 msgstr "Hasło do bazy danych"
 
-#: templates/installation.php:117
+#: templates/installation.php:139
 msgid "Database name"
 msgstr "Nazwa bazy danych"
 
-#: templates/installation.php:125
+#: templates/installation.php:149
 msgid "Database tablespace"
 msgstr "Obszar tabel bazy danych"
 
-#: templates/installation.php:131
+#: templates/installation.php:156
 msgid "Database host"
 msgstr "Komputer bazy danych"
 
-#: templates/installation.php:136
+#: templates/installation.php:162
 msgid "Finish setup"
 msgstr "Zakończ konfigurowanie"
 
-#: templates/layout.guest.php:33
+#: templates/layout.guest.php:35
 msgid "web services under your control"
 msgstr "usługi internetowe pod kontrolą"
 
-#: templates/layout.user.php:48
+#: templates/layout.user.php:53
 msgid "Log out"
-msgstr "Wylogowuje użytkownika"
+msgstr "Wyloguj"
 
 #: templates/login.php:10
 msgid "Automatic logon rejected!"
@@ -567,11 +570,11 @@ msgstr "Automatyczne logowanie odrzucone!"
 msgid ""
 "If you did not change your password recently, your account may be "
 "compromised!"
-msgstr "Jeśli nie było zmianie niedawno hasło, Twoje konto może być zagrożone!"
+msgstr "Jeśli hasło było dawno niezmieniane, twoje konto może być zagrożone!"
 
 #: templates/login.php:13
 msgid "Please change your password to secure your account again."
-msgstr "Proszę zmienić swoje hasło, aby zabezpieczyć swoje konto ponownie."
+msgstr "Zmień swoje hasło, aby ponownie zabezpieczyć swoje konto."
 
 #: templates/login.php:19
 msgid "Lost your password?"
@@ -579,7 +582,7 @@ msgstr "Nie pamiętasz hasła?"
 
 #: templates/login.php:41
 msgid "remember"
-msgstr "Zapamiętanie"
+msgstr "pamiętaj"
 
 #: templates/login.php:43
 msgid "Log in"
@@ -587,7 +590,7 @@ msgstr "Zaloguj"
 
 #: templates/login.php:49
 msgid "Alternative Logins"
-msgstr ""
+msgstr "Alternatywne loginy"
 
 #: templates/part.pagenavi.php:3
 msgid "prev"
@@ -600,4 +603,4 @@ msgstr "naprzód"
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "Aktualizowanie ownCloud do wersji %s, może to potrwać chwilę."
+msgstr "Aktualizowanie ownCloud do wersji %s. Może to trochę potrwać."
diff --git a/l10n/pl/files.po b/l10n/pl/files.po
index 9890a2eae897bac04565b54a0f6599fb4ee7bd6e..aa0c7c7b15a7049e59cc00ef6ce3c36d0ae3f23a 100644
--- a/l10n/pl/files.po
+++ b/l10n/pl/files.po
@@ -6,7 +6,9 @@
 #   <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.
@@ -15,8 +17,8 @@ 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 23:05+0000\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: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -41,7 +43,7 @@ msgstr "Nie można zmienić nazwy pliku"
 
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
-msgstr "Plik nie został załadowany. Nieznany błąd"
+msgstr "Żaden plik nie został załadowany. Nieznany błąd"
 
 #: ajax/upload.php:26
 msgid "There is no error, the file uploaded with success"
@@ -56,29 +58,29 @@ msgstr "Wgrany plik przekracza wartość upload_max_filesize zdefiniowaną w php
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
-msgstr "Rozmiar przesłanego pliku przekracza maksymalną wartość dyrektywy upload_max_filesize, zawartą formularzu HTML"
+msgstr "Wysłany plik przekracza wielkość dyrektywy MAX_FILE_SIZE określonej w formularzu HTML"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
-msgstr "Plik przesłano tylko częściowo"
+msgstr "Załadowany plik został wysłany tylko częściowo."
 
-#: ajax/upload.php:32
+#: ajax/upload.php:31
 msgid "No file was uploaded"
 msgstr "Nie przesłano żadnego pliku"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:32
 msgid "Missing a temporary folder"
 msgstr "Brak katalogu tymczasowego"
 
-#: ajax/upload.php:34
+#: ajax/upload.php:33
 msgid "Failed to write to disk"
 msgstr "Błąd zapisu na dysk"
 
-#: ajax/upload.php:52
+#: ajax/upload.php:51
 msgid "Not enough storage available"
-msgstr ""
+msgstr "Za mało dostępnego miejsca"
 
-#: ajax/upload.php:83
+#: ajax/upload.php:82
 msgid "Invalid directory."
 msgstr "Zła ścieżka."
 
@@ -88,56 +90,52 @@ msgstr "Pliki"
 
 #: js/fileactions.js:125
 msgid "Delete permanently"
-msgstr ""
+msgstr "Trwale usuń"
 
-#: js/fileactions.js:127 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:127 templates/index.php:92 templates/index.php:93
 msgid "Delete"
-msgstr "Usuwa element"
+msgstr "Usuń"
 
 #: js/fileactions.js:193
 msgid "Rename"
 msgstr "Zmień nazwę"
 
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
 msgid "Pending"
 msgstr "Oczekujące"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "{new_name} already exists"
 msgstr "{new_name} już istnieje"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "replace"
-msgstr "zastap"
+msgstr "zastąp"
 
-#: js/filelist.js:253
+#: js/filelist.js:251
 msgid "suggest name"
 msgstr "zasugeruj nazwę"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "cancel"
 msgstr "anuluj"
 
-#: js/filelist.js:295
-msgid "replaced {new_name}"
-msgstr "zastąpiony {new_name}"
+#: js/filelist.js:298
+msgid "replaced {new_name} with {old_name}"
+msgstr "zastąpiono {new_name} przez {old_name}"
 
-#: js/filelist.js:295 js/filelist.js:297
+#: js/filelist.js:298
 msgid "undo"
-msgstr "wróć"
+msgstr "cofnij"
 
-#: js/filelist.js:297
-msgid "replaced {new_name} with {old_name}"
-msgstr "zastąpiony {new_name} z {old_name}"
-
-#: js/filelist.js:322
+#: js/filelist.js:323
 msgid "perform delete operation"
-msgstr ""
+msgstr "wykonaj operację usunięcia"
 
 #: js/files.js:52
 msgid "'.' is an invalid file name."
-msgstr "'.'  jest nieprawidłową nazwą pliku."
+msgstr "„.” jest nieprawidłową nazwą pliku."
 
 #: js/files.js:56
 msgid "File name cannot be empty."
@@ -147,86 +145,86 @@ msgstr "Nazwa pliku nie może być pusta."
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
-msgstr "Niepoprawna nazwa, Znaki '\\', '/', '<', '>', ':', '\"', '|', '?' oraz '*'są niedozwolone."
+msgstr "Nieprawidłowa nazwa. Znaki '\\', '/', '<', '>', ':', '\"', '|', '?' oraz '*' są niedozwolone."
 
 #: js/files.js:78
 msgid "Your storage is full, files can not be updated or synced anymore!"
-msgstr ""
+msgstr "Magazyn jest pełny. Pliki nie mogą zostać zaktualizowane lub zsynchronizowane!"
 
 #: js/files.js:82
 msgid "Your storage is almost full ({usedSpacePercent}%)"
-msgstr ""
+msgstr "Twój magazyn jest prawie pełny ({usedSpacePercent}%)"
 
-#: js/files.js:224
+#: js/files.js:225
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
-msgstr ""
+msgstr "Pobieranie jest przygotowywane. Może to zająć trochę czasu jeśli pliki są duże."
 
-#: js/files.js:261
+#: js/files.js:262
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Nie można wczytać pliku jeśli jest katalogiem lub ma 0 bajtów"
+msgstr "Nie można wczytać pliku, ponieważ jest on katalogiem lub ma 0 bajtów"
 
-#: js/files.js:261
+#: js/files.js:262
 msgid "Upload Error"
 msgstr "Błąd wczytywania"
 
-#: js/files.js:272
+#: js/files.js:273
 msgid "Close"
 msgstr "Zamknij"
 
-#: js/files.js:311
+#: js/files.js:312
 msgid "1 file uploading"
-msgstr "1 plik wczytany"
+msgstr "1 plik wczytywany"
 
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
-msgstr "{count} przesyłanie plików"
+msgstr "Ilość przesyłanych plików: {count}"
 
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "Wczytywanie anulowane."
 
-#: js/files.js:496
+#: js/files.js:497
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
-msgstr "Wysyłanie pliku jest w toku. Teraz opuszczając stronę wysyłanie zostanie anulowane."
+msgstr "Wysyłanie pliku jest w toku. Jeśli opuścisz tę stronę, wysyłanie zostanie przerwane."
 
-#: js/files.js:569
+#: js/files.js:570
 msgid "URL cannot be empty."
 msgstr "URL nie może być pusty."
 
-#: js/files.js:574
+#: js/files.js:575
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr "Nazwa folderu nieprawidłowa. Wykorzystanie \"Shared\" jest zarezerwowane przez Owncloud"
+msgstr "Nieprawidłowa nazwa folderu. Korzystanie z nazwy „Shared” jest zarezerwowane dla ownCloud"
 
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:953 templates/index.php:68
 msgid "Name"
 msgstr "Nazwa"
 
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:954 templates/index.php:79
 msgid "Size"
 msgstr "Rozmiar"
 
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:955 templates/index.php:81
 msgid "Modified"
-msgstr "Czas modyfikacji"
+msgstr "Modyfikacja"
 
-#: js/files.js:969
+#: js/files.js:974
 msgid "1 folder"
 msgstr "1 folder"
 
-#: js/files.js:971
+#: js/files.js:976
 msgid "{count} folders"
-msgstr "{count} foldery"
+msgstr "Ilość folderów: {count}"
 
-#: js/files.js:979
+#: js/files.js:984
 msgid "1 file"
 msgstr "1 plik"
 
-#: js/files.js:981
+#: js/files.js:986
 msgid "{count} files"
-msgstr "{count} pliki"
+msgstr "Ilość plików: {count}"
 
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
@@ -242,7 +240,7 @@ msgstr "Maksymalny rozmiar wysyłanego pliku"
 
 #: templates/admin.php:10
 msgid "max. possible: "
-msgstr "max. możliwych"
+msgstr "maks. możliwy:"
 
 #: templates/admin.php:15
 msgid "Needed for multi-file and folder downloads."
@@ -254,7 +252,7 @@ msgstr "Włącz pobieranie ZIP-paczki"
 
 #: templates/admin.php:20
 msgid "0 is unlimited"
-msgstr "0 jest nielimitowane"
+msgstr "0 - bez limitów"
 
 #: templates/admin.php:22
 msgid "Maximum input size for ZIP files"
@@ -278,46 +276,50 @@ msgstr "Katalog"
 
 #: templates/index.php:14
 msgid "From link"
-msgstr "Z linku"
+msgstr "Z odnośnika"
 
 #: templates/index.php:40
 msgid "Deleted files"
-msgstr ""
+msgstr "Pliki usunięte"
 
 #: templates/index.php:46
 msgid "Cancel upload"
-msgstr "Przestań wysyłać"
+msgstr "Anuluj wysyłanie"
 
-#: templates/index.php:59
+#: templates/index.php:53
+msgid "You don’t have write permissions here."
+msgstr "Nie masz uprawnień do zapisu w tym miejscu."
+
+#: templates/index.php:60
 msgid "Nothing in here. Upload something!"
-msgstr "Brak zawartości. Proszę wysłać pliki!"
+msgstr "Pusto. Wyślij coś!"
 
-#: templates/index.php:73
+#: templates/index.php:74
 msgid "Download"
-msgstr "Pobiera element"
+msgstr "Pobierz"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:86 templates/index.php:87
 msgid "Unshare"
 msgstr "Nie udostępniaj"
 
-#: templates/index.php:105
+#: templates/index.php:106
 msgid "Upload too large"
 msgstr "Wysyłany plik ma za duży rozmiar"
 
-#: templates/index.php:107
+#: templates/index.php:108
 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ść."
+msgstr "Pliki, które próbujesz przesłać, przekraczają maksymalną dopuszczalną wielkość."
 
-#: templates/index.php:112
+#: templates/index.php:113
 msgid "Files are being scanned, please wait."
 msgstr "Skanowanie plików, proszę czekać."
 
-#: templates/index.php:115
+#: templates/index.php:116
 msgid "Current scanning"
 msgstr "Aktualnie skanowane"
 
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
-msgstr ""
+msgstr "Uaktualnianie plików pamięci podręcznej..."
diff --git a/l10n/pl/files_external.po b/l10n/pl/files_external.po
index a6a1c7b5483615224ca20696b69611aea0cb9842..9111a967f72c99f863d8e597e3c841f7d2b7717a 100644
--- a/l10n/pl/files_external.po
+++ b/l10n/pl/files_external.po
@@ -5,14 +5,15 @@
 # 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: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-12 11:26+0000\n"
-"Last-Translator: Marcin Małecki <gerber@tkdami.net>\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"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,37 +21,33 @@ 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"
 
-#: 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 "Dostęp do"
 
-#: 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 "Wystąpił błąd podczas konfigurowania zasobu Dropbox"
 
-#: 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 "Udziel dostępu"
 
-#: js/dropbox.js:73 js/google.js:72
-msgid "Fill out all required fields"
-msgstr "Wypełnij wszystkie wymagane pola"
-
-#: js/dropbox.js:85
+#: js/dropbox.js:101
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr "Proszę podać prawidłowy klucz aplikacji Dropbox i klucz sekretny."
 
-#: 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 "Wystąpił błąd podczas konfigurowania zasobu Google Drive"
 
-#: lib/config.php:434
+#: lib/config.php:421
 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:435
+#: lib/config.php:424
 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 "
@@ -61,63 +58,63 @@ msgstr "<b>Ostrzeżenie:</b> Wsparcie dla FTP w PHP nie jest zainstalowane lub w
 msgid "External Storage"
 msgstr "Zewnętrzna zasoby dyskowe"
 
-#: templates/settings.php:8 templates/settings.php:22
-msgid "Mount point"
-msgstr "Punkt montowania"
-
-#: templates/settings.php:9
-msgid "Backend"
-msgstr "Zaplecze"
+#: templates/settings.php:9 templates/settings.php:28
+msgid "Folder name"
+msgstr "Nazwa folderu"
 
 #: templates/settings.php:10
+msgid "External storage"
+msgstr "Zewnętrzne zasoby dyskowe"
+
+#: templates/settings.php:11
 msgid "Configuration"
 msgstr "Konfiguracja"
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid "Options"
 msgstr "Opcje"
 
-#: templates/settings.php:12
+#: templates/settings.php:13
 msgid "Applicable"
 msgstr "Zastosowanie"
 
-#: templates/settings.php:27
-msgid "Add mount point"
-msgstr "Dodaj punkt montowania"
+#: templates/settings.php:33
+msgid "Add storage"
+msgstr "Dodaj zasoby dyskowe"
 
-#: templates/settings.php:85
+#: templates/settings.php:90
 msgid "None set"
 msgstr "Nie ustawione"
 
-#: templates/settings.php:86
+#: templates/settings.php:91
 msgid "All Users"
 msgstr "Wszyscy uzytkownicy"
 
-#: templates/settings.php:87
+#: templates/settings.php:92
 msgid "Groups"
 msgstr "Grupy"
 
-#: templates/settings.php:95
+#: templates/settings.php:100
 msgid "Users"
 msgstr "Użytkownicy"
 
-#: 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 "Usuń"
 
-#: templates/settings.php:124
+#: templates/settings.php:129
 msgid "Enable User External Storage"
 msgstr "Włącz zewnętrzne zasoby dyskowe użytkownika"
 
-#: templates/settings.php:125
+#: templates/settings.php:130
 msgid "Allow users to mount their own external storage"
 msgstr "Zezwalaj użytkownikom na montowanie  ich własnych zewnętrznych zasobów dyskowych"
 
-#: templates/settings.php:139
+#: templates/settings.php:141
 msgid "SSL root certificates"
 msgstr "Główny certyfikat SSL"
 
-#: templates/settings.php:158
+#: templates/settings.php:159
 msgid "Import Root Certificate"
 msgstr "Importuj główny certyfikat"
diff --git a/l10n/pl/files_sharing.po b/l10n/pl/files_sharing.po
index 9ad1cd88a470a107ac5ecdb8dd202b1e08b52960..a355ae067e71ea5f8ad1c6cecbe446c35cbf3203 100644
--- a/l10n/pl/files_sharing.po
+++ b/l10n/pl/files_sharing.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-26 13:19+0200\n"
-"PO-Revision-Date: 2012-09-26 10:44+0000\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"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -28,24 +28,24 @@ msgstr "Hasło"
 msgid "Submit"
 msgstr "Wyślij"
 
-#: templates/public.php:9
+#: templates/public.php:10
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s współdzieli folder z tobą %s"
 
-#: templates/public.php:11
+#: templates/public.php:13
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s współdzieli z tobą plik %s"
 
-#: templates/public.php:14 templates/public.php:30
+#: templates/public.php:19 templates/public.php:37
 msgid "Download"
 msgstr "Pobierz"
 
-#: templates/public.php:29
+#: templates/public.php:34
 msgid "No preview available for"
 msgstr "Podgląd nie jest dostępny dla"
 
-#: templates/public.php:37
+#: templates/public.php:43
 msgid "web services under your control"
 msgstr "Kontrolowane serwisy"
diff --git a/l10n/pl/files_trashbin.po b/l10n/pl/files_trashbin.po
index eea8ff8f6d6819c04d8dee712cf8f684106a1006..a226bea7473c177940db25b6cfeec51fcf9f36ac 100644
--- a/l10n/pl/files_trashbin.po
+++ b/l10n/pl/files_trashbin.po
@@ -3,12 +3,13 @@
 # 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-02-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 09:50+0000\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: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -17,52 +18,64 @@ 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:22
+#: ajax/delete.php:40
 #, php-format
 msgid "Couldn't delete %s permanently"
-msgstr ""
+msgstr "Nie można trwale usunąć %s"
 
 #: ajax/undelete.php:41
 #, php-format
 msgid "Couldn't restore %s"
-msgstr ""
+msgstr "Nie można przywrócić %s"
 
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
 msgid "perform restore operation"
-msgstr ""
+msgstr "wykonywanie operacji przywracania"
 
-#: js/trash.js:33
+#: js/trash.js:34
 msgid "delete file permanently"
-msgstr ""
+msgstr "trwale usuń plik"
+
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr "Trwale usuń"
 
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:174 templates/index.php:17
 msgid "Name"
 msgstr "Nazwa"
 
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:175 templates/index.php:27
 msgid "Deleted"
-msgstr ""
+msgstr "Usunięte"
 
-#: js/trash.js:135
+#: js/trash.js:184
 msgid "1 folder"
 msgstr "1 folder"
 
-#: js/trash.js:137
+#: js/trash.js:186
 msgid "{count} folders"
 msgstr "{count} foldery"
 
-#: js/trash.js:145
+#: js/trash.js:194
 msgid "1 file"
 msgstr "1 plik"
 
-#: js/trash.js:147
+#: js/trash.js:196
 msgid "{count} files"
 msgstr "{count} pliki"
 
 #: templates/index.php:9
 msgid "Nothing in here. Your trash bin is empty!"
-msgstr ""
+msgstr "Nic tu nie ma. Twój kosz jest pusty!"
 
 #: templates/index.php:20 templates/index.php:22
 msgid "Restore"
 msgstr "Przywróć"
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr "Usuń"
+
+#: templates/part.breadcrumb.php:9
+msgid "Deleted Files"
+msgstr ""
diff --git a/l10n/pl/files_versions.po b/l10n/pl/files_versions.po
index 70b17a7c959183f291b9bafcaed997f89fb640db..54824d793e71939227f1ccbb9b3ad25ba97dbc33 100644
--- a/l10n/pl/files_versions.po
+++ b/l10n/pl/files_versions.po
@@ -5,14 +5,15 @@
 # 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-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-03-03 00:05+0100\n"
+"PO-Revision-Date: 2013-03-02 07:50+0000\n"
+"Last-Translator: Maciej Tarmas <maciej@tarmas.com>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -43,26 +44,18 @@ msgstr "porażka"
 msgid "File %s could not be reverted to version %s"
 msgstr "Plik %s nie mógł być przywrócony do wersji %s"
 
-#: history.php:68
+#: history.php:69
 msgid "No old versions available"
 msgstr "Nie są dostępne żadne starsze wersje"
 
-#: history.php:73
+#: history.php:74
 msgid "No path specified"
 msgstr "Nie podano ścieżki"
 
-#: js/versions.js:16
-msgid "History"
-msgstr "Historia"
+#: js/versions.js:6
+msgid "Versions"
+msgstr "Wersje"
 
 #: templates/history.php:20
 msgid "Revert a file to a previous version by clicking on its revert button"
 msgstr "Przywróć plik do poprzedniej wersji klikając w jego przycisk przywrócenia"
-
-#: templates/settings.php:3
-msgid "Files Versioning"
-msgstr "Wersjonowanie plików"
-
-#: templates/settings.php:4
-msgid "Enable"
-msgstr "Włącz"
diff --git a/l10n/pl/lib.po b/l10n/pl/lib.po
index 39c053a1578d387843f74afb37cf3e4ac6dcd530..47111cb368f681ad89b6673d81c136f2bb49c2d3 100644
--- a/l10n/pl/lib.po
+++ b/l10n/pl/lib.po
@@ -4,15 +4,16 @@
 # 
 # Translators:
 # Cyryl Sochacki <>, 2012.
-# Cyryl Sochacki <cyrylsochacki@gmail.com>, 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-02-11 15:39+0100\n"
-"PO-Revision-Date: 2013-02-11 14:40+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,27 +21,27 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: app.php:339
+#: app.php:349
 msgid "Help"
 msgstr "Pomoc"
 
-#: app.php:346
+#: app.php:362
 msgid "Personal"
 msgstr "Osobiste"
 
-#: app.php:351
+#: app.php:373
 msgid "Settings"
 msgstr "Ustawienia"
 
-#: app.php:356
+#: app.php:385
 msgid "Users"
 msgstr "Użytkownicy"
 
-#: app.php:363
+#: app.php:398
 msgid "Apps"
 msgstr "Aplikacje"
 
-#: app.php:365
+#: app.php:406
 msgid "Admin"
 msgstr "Administrator"
 
@@ -52,15 +53,15 @@ msgstr "Pobieranie ZIP jest wyłączone."
 msgid "Files need to be downloaded one by one."
 msgstr "Pliki muszą zostać pobrane pojedynczo."
 
-#: files.php:203 files.php:228
+#: files.php:204 files.php:231
 msgid "Back to Files"
 msgstr "Wróć do plików"
 
-#: files.php:227
+#: files.php:228
 msgid "Selected files too large to generate zip file."
 msgstr "Wybrane pliki są zbyt duże, aby wygenerować plik zip."
 
-#: helper.php:226
+#: helper.php:228
 msgid "couldn't be determined"
 msgstr "nie może zostać znaleziony"
 
@@ -90,100 +91,105 @@ msgstr "Obrazy"
 
 #: setup.php:34
 msgid "Set an admin username."
-msgstr ""
+msgstr "Ustaw nazwę administratora."
 
 #: setup.php:37
 msgid "Set an admin password."
-msgstr ""
+msgstr "Ustaw hasło administratora."
 
 #: setup.php:40
 msgid "Specify a data folder."
-msgstr ""
+msgstr "Określ folder danych."
 
-#: setup.php:53
+#: setup.php:55
 #, php-format
 msgid "%s enter the database username."
-msgstr ""
+msgstr "%s wpisz nazwę użytkownika do  bazy"
 
-#: setup.php:56
+#: setup.php:58
 #, php-format
 msgid "%s enter the database name."
-msgstr ""
+msgstr "%s wpisz nazwę bazy."
 
-#: setup.php:59
+#: setup.php:61
 #, php-format
 msgid "%s you may not use dots in the database name"
-msgstr ""
+msgstr "%s nie można używać kropki w nazwie bazy danych"
 
-#: setup.php:62
+#: setup.php:64
 #, php-format
 msgid "%s set the database host."
-msgstr ""
+msgstr "%s ustaw hosta bazy danych."
 
-#: setup.php:126 setup.php:291 setup.php:336
+#: setup.php:128 setup.php:320 setup.php:365
 msgid "PostgreSQL username and/or password not valid"
-msgstr ""
+msgstr "PostgreSQL: Nazwa użytkownika i/lub hasło jest niepoprawne"
 
-#: setup.php:127 setup.php:150 setup.php:204
+#: setup.php:129 setup.php:152 setup.php:229
 msgid "You need to enter either an existing account or the administrator."
-msgstr ""
+msgstr "Należy wprowadzić istniejące konto użytkownika lub  administratora."
 
-#: setup.php:149 setup.php:423 setup.php:489
+#: setup.php:151 setup.php:453 setup.php:520
 msgid "Oracle username and/or password not valid"
-msgstr ""
+msgstr "Oracle: Nazwa użytkownika i/lub hasło jest niepoprawne"
 
-#: setup.php:203
+#: setup.php:228
 msgid "MySQL username and/or password not valid"
-msgstr ""
+msgstr "MySQL: Nazwa użytkownika i/lub hasło jest niepoprawne"
 
-#: setup.php:255 setup.php:357 setup.php:366 setup.php:384 setup.php:394
-#: setup.php:403 setup.php:430 setup.php:496 setup.php:522 setup.php:529
-#: setup.php:540 setup.php:547 setup.php:556 setup.php:564 setup.php:573
-#: setup.php:579
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
-msgstr ""
+msgstr "Błąd DB: \"%s\""
 
-#: setup.php:256 setup.php:358 setup.php:367 setup.php:385 setup.php:395
-#: setup.php:404 setup.php:431 setup.php:497 setup.php:523 setup.php:530
-#: setup.php:541 setup.php:557 setup.php:565 setup.php:574
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
-msgstr ""
+msgstr "Niepoprawna komenda: \"%s\""
 
-#: setup.php:270
+#: setup.php:299
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
-msgstr ""
+msgstr "Użytkownik MySQL  '%s'@'localhost' już istnieje"
 
-#: setup.php:271
+#: setup.php:300
 msgid "Drop this user from MySQL"
-msgstr ""
+msgstr "Usuń tego użytkownika z MySQL"
 
-#: setup.php:276
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
-msgstr ""
+msgstr "Użytkownik MySQL  '%s'@'%%t' już istnieje"
 
-#: setup.php:277
+#: setup.php:306
 msgid "Drop this user from MySQL."
-msgstr ""
+msgstr "Usuń tego użytkownika z MySQL."
 
-#: setup.php:548 setup.php:580
+#: setup.php:579 setup.php:611
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
-msgstr ""
+msgstr "Niepoprawne polecania:  \"%s\", nazwa: %s, hasło: %s"
+
+#: setup.php:631
+#, 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:644
+#: setup.php:849
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
-msgstr ""
+msgstr "Serwer www nie jest jeszcze poprawnie ustawiony, aby umożliwić synchronizację plików, ponieważ interfejs WebDAV wydaje się być uszkodzony. Sprawdź ustawienia serwera."
 
-#: setup.php:645
+#: setup.php:850
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr ""
+msgstr "Proszę sprawdź ponownie <a href='%s'>przewodnik instalacji</a>."
 
 #: template.php:113
 msgid "seconds ago"
@@ -237,16 +243,16 @@ msgstr "ostatni rok"
 msgid "years ago"
 msgstr "lat temu"
 
-#: updater.php:75
+#: 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:77
+#: updater.php:81
 msgid "up to date"
 msgstr "Aktualne"
 
-#: updater.php:80
+#: updater.php:84
 msgid "updates check is disabled"
 msgstr "wybór aktualizacji jest wyłączony"
 
diff --git a/l10n/pl/settings.po b/l10n/pl/settings.po
index d69ae9efa29325679ebe7a741c07b2175c674cfb..66b58472169269f981272daf66283dc6f0dfd8f2 100644
--- a/l10n/pl/settings.po
+++ b/l10n/pl/settings.po
@@ -9,6 +9,7 @@
 # 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.
@@ -20,9 +21,9 @@ 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:05+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "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"
@@ -32,16 +33,16 @@ msgstr ""
 
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
-msgstr "Nie mogę załadować listy aplikacji"
+msgstr "Nie można wczytać listy aplikacji"
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:15
-#: ajax/togglegroups.php:18
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr "Błąd uwierzytelniania"
 
 #: ajax/changedisplayname.php:32
 msgid "Unable to change display name"
-msgstr "Nie można zmienić nazwy wyświetlanej"
+msgstr "Nie można zmienić wyświetlanej nazwy"
 
 #: ajax/creategroup.php:10
 msgid "Group already exists"
@@ -57,11 +58,11 @@ msgstr "Nie można włączyć aplikacji."
 
 #: ajax/lostpassword.php:12
 msgid "Email saved"
-msgstr "Email zapisany"
+msgstr "E-mail zapisany"
 
 #: ajax/lostpassword.php:14
 msgid "Invalid email"
-msgstr "Niepoprawny email"
+msgstr "Nieprawidłowy e-mail"
 
 #: ajax/removegroup.php:13
 msgid "Unable to delete group"
@@ -73,7 +74,7 @@ msgstr "Nie można usunąć użytkownika"
 
 #: ajax/setlanguage.php:15
 msgid "Language changed"
-msgstr "Język zmieniony"
+msgstr "Zmieniono język"
 
 #: ajax/setlanguage.php:17 ajax/setlanguage.php:20
 msgid "Invalid request"
@@ -81,21 +82,21 @@ msgstr "Nieprawidłowe żądanie"
 
 #: ajax/togglegroups.php:12
 msgid "Admins can't remove themself from the admin group"
-msgstr "Administratorzy nie mogą usunąć się sami z grupy administratorów."
+msgstr "Administratorzy nie mogą usunąć siebie samych z grupy administratorów"
 
-#: ajax/togglegroups.php:28
+#: ajax/togglegroups.php:30
 #, php-format
 msgid "Unable to add user to group %s"
 msgstr "Nie można dodać użytkownika do grupy %s"
 
-#: ajax/togglegroups.php:34
+#: ajax/togglegroups.php:36
 #, php-format
 msgid "Unable to remove user from group %s"
 msgstr "Nie można usunąć użytkownika z grupy %s"
 
 #: ajax/updateapp.php:14
 msgid "Couldn't update app."
-msgstr "Nie można uaktualnić aplikacji"
+msgstr "Nie można uaktualnić aplikacji."
 
 #: js/apps.js:30
 msgid "Update to {appversion}"
@@ -111,7 +112,7 @@ msgstr "Włącz"
 
 #: js/apps.js:55
 msgid "Please wait...."
-msgstr "Prosze czekać..."
+msgstr "Proszę czekać..."
 
 #: js/apps.js:84
 msgid "Updating...."
@@ -129,21 +130,21 @@ msgstr "Błąd"
 msgid "Updated"
 msgstr "Zaktualizowano"
 
-#: js/personal.js:96
+#: js/personal.js:99
 msgid "Saving..."
 msgstr "Zapisywanie..."
 
 #: js/users.js:30
 msgid "deleted"
-msgstr "skasuj"
+msgstr "usunięto"
 
 #: js/users.js:30
 msgid "undo"
-msgstr "wróć"
+msgstr "cofnij"
 
 #: js/users.js:62
 msgid "Unable to remove user"
-msgstr ""
+msgstr "Nie można usunąć użytkownika"
 
 #: js/users.js:75 templates/users.php:26 templates/users.php:80
 #: templates/users.php:105
@@ -152,31 +153,31 @@ msgstr "Grupy"
 
 #: js/users.js:78 templates/users.php:82 templates/users.php:119
 msgid "Group Admin"
-msgstr "Grupa Admin"
+msgstr "Administrator grupy"
 
 #: js/users.js:99 templates/users.php:161
 msgid "Delete"
-msgstr "Usuń"
+msgstr "Usuń"
 
-#: js/users.js:190
+#: js/users.js:191
 msgid "add group"
-msgstr ""
+msgstr "dodaj grupę"
 
-#: js/users.js:351
+#: js/users.js:352
 msgid "A valid username must be provided"
-msgstr ""
+msgstr "Należy podać prawidłową nazwę użytkownika"
 
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
 msgid "Error creating user"
-msgstr ""
+msgstr "Błąd podczas tworzenia użytkownika"
 
-#: js/users.js:357
+#: js/users.js:358
 msgid "A valid password must be provided"
-msgstr ""
+msgstr "Należy podać prawidłowe hasło"
 
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
 msgid "__language_name__"
-msgstr "Polski"
+msgstr "polski"
 
 #: templates/admin.php:15
 msgid "Security Warning"
@@ -189,50 +190,50 @@ 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 "Katalog danych (data) i pliki są prawdopodobnie dostępnego z Internetu. Sprawdź plik .htaccess oraz konfigurację serwera (hosta). Sugerujemy, skonfiguruj swój serwer w taki sposób, żeby dane katalogu nie były dostępne lub przenieść katalog danych spoza głównego dokumentu webserwera."
+msgstr "Katalog danych i twoje pliki są prawdopodobnie dostępne z Internetu. Plik .htaccess dostarczony przez ownCloud nie działa. Zalecamy skonfigurowanie serwera internetowego w taki sposób, aby katalog z danymi nie był dostępny lub przeniesienie katalogu z danymi poza katalog główny serwera internetowego."
 
 #: templates/admin.php:29
 msgid "Setup Warning"
-msgstr ""
+msgstr "Ostrzeżenia konfiguracji"
 
 #: 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 "Serwer internetowy nie jest jeszcze poprawnie skonfigurowany, aby umożliwić synchronizację plików, ponieważ interfejs WebDAV wydaje się być uszkodzony."
 
 #: templates/admin.php:33
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr ""
+msgstr "Sprawdź ponownie <a href='%s'>przewodniki instalacji</a>."
 
 #: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
-msgstr ""
+msgstr "Brak modułu „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 "Brak modułu PHP „fileinfo”. Zalecamy włączenie tego modułu, aby uzyskać najlepsze wyniki podczas wykrywania typów MIME."
 
 #: templates/admin.php:58
 msgid "Locale not working"
-msgstr ""
+msgstr "Lokalizacja nie działa"
 
-#: templates/admin.php:61
+#: templates/admin.php:63
+#, php-format
 msgid ""
-"This ownCloud server can't set system locale to "
-"\"en_US.UTF-8\"/\"en_US.UTF8\". 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 en_US.UTF-8/en_US.UTF8."
-msgstr ""
+"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 "Ten serwer ownCloud nie może włączyć ustawień regionalnych %s. Może to oznaczać, że wystąpiły problemy z niektórymi znakami w nazwach plików. Zalecamy instalację wymaganych pakietów na tym systemie w celu wsparcia %s."
 
-#: templates/admin.php:72
+#: templates/admin.php:75
 msgid "Internet connection not working"
-msgstr ""
+msgstr "Połączenie internetowe nie działa"
 
-#: templates/admin.php:75
+#: 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 "
@@ -240,100 +241,100 @@ 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 "Ten serwer OwnCloud nie ma działającego połączenia z Internetem. Oznacza to, że niektóre z funkcji, takich jak montowanie zewnętrznych zasobów, powiadomienia o aktualizacji lub instalacja dodatkowych aplikacji nie będą działać. Dostęp do plików z zewnątrz i wysyłanie powiadomień e-mail może również nie działać. Sugerujemy, aby włączyć połączenie internetowe dla tego serwera, jeśli chcesz korzystać ze wszystkich funkcji ownCloud."
 
-#: templates/admin.php:89
+#: templates/admin.php:92
 msgid "Cron"
-msgstr ""
+msgstr "Cron"
 
-#: templates/admin.php:98
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
-msgstr ""
+msgstr "Wykonuj jedno zadanie wraz z każdą wczytaną stroną"
 
-#: templates/admin.php:108
+#: 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 jest zarejestrowany w usłudze webcron. Przywołaj stronę cron.php w katalogu głównym ownCloud raz na minutę przez http."
 
-#: templates/admin.php:118
+#: 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 "Użyj systemowej usługi cron. Przywołaj plik cron.php z katalogu ownCloud przez systemowy cronjob raz na minutę."
 
-#: templates/admin.php:125
+#: templates/admin.php:128
 msgid "Sharing"
-msgstr ""
+msgstr "Udostępnianie"
 
-#: templates/admin.php:131
+#: templates/admin.php:134
 msgid "Enable Share API"
-msgstr ""
+msgstr "Włącz API udostępniania"
 
-#: templates/admin.php:132
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
-msgstr ""
+msgstr "Zezwalaj aplikacjom na korzystanie z API udostępniania"
 
-#: templates/admin.php:139
+#: templates/admin.php:142
 msgid "Allow links"
-msgstr ""
+msgstr "Zezwalaj na odnośniki"
 
-#: templates/admin.php:140
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
-msgstr ""
+msgstr "Zezwalaj użytkownikom na publiczne współdzielenie zasobów za pomocą odnośników"
 
-#: templates/admin.php:147
+#: templates/admin.php:150
 msgid "Allow resharing"
-msgstr ""
+msgstr "Zezwalaj na ponowne udostępnianie"
 
-#: templates/admin.php:148
+#: templates/admin.php:151
 msgid "Allow users to share items shared with them again"
-msgstr ""
+msgstr "Zezwalaj użytkownikom na ponowne współdzielenie zasobów już z nimi współdzielonych"
 
-#: templates/admin.php:155
+#: templates/admin.php:158
 msgid "Allow users to share with anyone"
-msgstr ""
+msgstr "Zezwalaj użytkownikom na współdzielenie z kimkolwiek"
 
-#: templates/admin.php:158
+#: templates/admin.php:161
 msgid "Allow users to only share with users in their groups"
-msgstr ""
+msgstr "Zezwalaj użytkownikom współdzielić z użytkownikami ze swoich grup"
 
-#: templates/admin.php:165
+#: templates/admin.php:168
 msgid "Security"
-msgstr ""
+msgstr "Bezpieczeństwo"
 
-#: templates/admin.php:178
+#: templates/admin.php:181
 msgid "Enforce HTTPS"
-msgstr ""
+msgstr "Wymuś HTTPS"
 
-#: templates/admin.php:179
+#: templates/admin.php:182
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
-msgstr ""
+msgstr "Wymusza na klientach na łączenie się ownCloud za pośrednictwem połączenia szyfrowanego."
 
-#: templates/admin.php:182
+#: templates/admin.php:185
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
-msgstr ""
+msgstr "Proszę połącz się do tej instancji ownCloud za pośrednictwem protokołu HTTPS, aby włączyć lub wyłączyć stosowanie protokołu SSL."
 
-#: templates/admin.php:192
+#: templates/admin.php:195
 msgid "Log"
-msgstr ""
+msgstr "Logi"
 
-#: templates/admin.php:193
+#: templates/admin.php:196
 msgid "Log level"
-msgstr ""
+msgstr "Poziom logów"
 
-#: templates/admin.php:220
+#: templates/admin.php:223
 msgid "More"
 msgstr "Więcej"
 
-#: templates/admin.php:227 templates/personal.php:98
+#: templates/admin.php:230 templates/personal.php:102
 msgid "Version"
 msgstr "Wersja"
 
-#: templates/admin.php:230 templates/personal.php:100
+#: templates/admin.php:233 templates/personal.php:105
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -341,134 +342,134 @@ 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 "Stworzone przez <a href=\"http://ownCloud.org/contact\" target=\"_blank\"> społeczność ownCloud</a>, the <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>."
+msgstr "Stworzone przez <a href=\"http://ownCloud.org/contact\" target=\"_blank\">społeczność ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">kod źródłowy</a> na licencji <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
-#: templates/apps.php:10
+#: templates/apps.php:11
 msgid "Add your App"
-msgstr "Dodaj aplikacje"
+msgstr "Dodaj swoją aplikację"
 
-#: templates/apps.php:11
+#: templates/apps.php:12
 msgid "More Apps"
 msgstr "Więcej aplikacji"
 
-#: templates/apps.php:24
+#: templates/apps.php:28
 msgid "Select an App"
-msgstr "Zaznacz aplikacje"
+msgstr "Zaznacz aplikację"
 
-#: templates/apps.php:28
+#: templates/apps.php:34
 msgid "See application page at apps.owncloud.com"
 msgstr "Zobacz stronę aplikacji na apps.owncloud.com"
 
-#: templates/apps.php:29
+#: templates/apps.php:36
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-licencjonowane przez <span class=\"author\"></span>"
 
-#: templates/apps.php:31
+#: templates/apps.php:38
 msgid "Update"
 msgstr "Zaktualizuj"
 
-#: templates/help.php:3
+#: templates/help.php:4
 msgid "User Documentation"
 msgstr "Dokumentacja użytkownika"
 
-#: templates/help.php:4
+#: templates/help.php:6
 msgid "Administrator Documentation"
-msgstr "Dokumentacja Administratora"
+msgstr "Dokumentacja administratora"
 
-#: templates/help.php:6
+#: templates/help.php:9
 msgid "Online Documentation"
-msgstr "Dokumentacja Online"
+msgstr "Dokumentacja online"
 
-#: templates/help.php:7
+#: templates/help.php:11
 msgid "Forum"
 msgstr "Forum"
 
-#: templates/help.php:9
+#: templates/help.php:14
 msgid "Bugtracker"
 msgstr "Zgłaszanie błędów"
 
-#: templates/help.php:11
+#: templates/help.php:17
 msgid "Commercial Support"
 msgstr "Wsparcie komercyjne"
 
 #: templates/personal.php:8
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr "Korzystasz z <strong>%s</strong> z dostępnych <strong>%s</strong>"
+msgstr "Wykorzystujesz <strong>%s</strong> z dostępnych <strong>%s</strong>"
 
-#: templates/personal.php:14
+#: templates/personal.php:15
 msgid "Get the apps to sync your files"
 msgstr "Pobierz aplikacje żeby synchronizować swoje pliki"
 
-#: templates/personal.php:25
+#: templates/personal.php:26
 msgid "Show First Run Wizard again"
 msgstr "Uruchom ponownie kreatora pierwszego uruchomienia"
 
-#: templates/personal.php:36 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
 msgid "Password"
 msgstr "Hasło"
 
-#: templates/personal.php:37
+#: templates/personal.php:38
 msgid "Your password was changed"
 msgstr "Twoje hasło zostało zmienione"
 
-#: templates/personal.php:38
+#: templates/personal.php:39
 msgid "Unable to change your password"
 msgstr "Nie można zmienić hasła"
 
-#: templates/personal.php:39
+#: templates/personal.php:40
 msgid "Current password"
 msgstr "Bieżące hasło"
 
-#: templates/personal.php:40
+#: templates/personal.php:42
 msgid "New password"
 msgstr "Nowe hasło"
 
-#: templates/personal.php:42
+#: templates/personal.php:44
 msgid "Change password"
 msgstr "Zmień hasło"
 
-#: templates/personal.php:54 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:78
 msgid "Display Name"
 msgstr "Wyświetlana nazwa"
 
-#: templates/personal.php:55
+#: templates/personal.php:57
 msgid "Your display name was changed"
 msgstr "Twoja nazwa wyświetlana została zmieniona"
 
-#: templates/personal.php:56
+#: templates/personal.php:58
 msgid "Unable to change your display name"
-msgstr "Nie można zmianić wyświetlanej nazwy"
+msgstr "Nie można zmienić twojej wyświetlanej nazwy"
 
-#: templates/personal.php:59
+#: templates/personal.php:61
 msgid "Change display name"
-msgstr "Zmiana wyświetlanej nazwy"
+msgstr "Zmień wyświetlaną nazwę"
 
-#: templates/personal.php:68
+#: templates/personal.php:70
 msgid "Email"
 msgstr "E-mail"
 
-#: templates/personal.php:69
+#: templates/personal.php:72
 msgid "Your email address"
-msgstr "Adres e-mail użytkownika"
+msgstr "Twój adres e-mail"
 
-#: templates/personal.php:70
+#: templates/personal.php:73
 msgid "Fill in an email address to enable password recovery"
-msgstr "Proszę wprowadzić adres e-mail, aby uzyskać możliwość odzyskania hasła"
+msgstr "Podaj adres e-mail, aby uzyskać możliwość odzyskania hasła"
 
-#: templates/personal.php:76 templates/personal.php:77
+#: templates/personal.php:79 templates/personal.php:80
 msgid "Language"
 msgstr "Język"
 
-#: templates/personal.php:82
+#: templates/personal.php:86
 msgid "Help translate"
 msgstr "Pomóż w tłumaczeniu"
 
-#: templates/personal.php:87
+#: templates/personal.php:91
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:89
+#: templates/personal.php:93
 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"
 
@@ -482,7 +483,7 @@ msgstr "Utwórz"
 
 #: templates/users.php:35
 msgid "Default Storage"
-msgstr "Domyślny magazyn"
+msgstr "Magazyn domyślny"
 
 #: templates/users.php:41 templates/users.php:139
 msgid "Unlimited"
@@ -498,11 +499,11 @@ msgstr "Magazyn"
 
 #: templates/users.php:95
 msgid "change display name"
-msgstr "zmień nazwę wyświetlaną"
+msgstr "zmień wyświetlaną nazwę"
 
 #: templates/users.php:99
 msgid "set new password"
-msgstr "zmień hasło"
+msgstr "ustaw nowe hasło"
 
 #: templates/users.php:134
 msgid "Default"
diff --git a/l10n/pl/user_ldap.po b/l10n/pl/user_ldap.po
index 375849b6dc2a191dc408367c860097d13547ba15..e788ca48f596af0e158c2639b8b47f4d73b310f5 100644
--- a/l10n/pl/user_ldap.po
+++ b/l10n/pl/user_ldap.po
@@ -4,15 +4,17 @@
 # 
 # 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-02-08 00:10+0100\n"
-"PO-Revision-Date: 2013-02-07 23:11+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "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,23 +24,23 @@ msgstr ""
 
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
-msgstr ""
+msgstr "Nie można usunąć konfiguracji serwera"
 
-#: ajax/testConfiguration.php:35
+#: ajax/testConfiguration.php:36
 msgid "The configuration is valid and the connection could be established!"
-msgstr ""
+msgstr "Konfiguracja jest prawidłowa i można ustanowić połączenie!"
 
-#: ajax/testConfiguration.php:37
+#: ajax/testConfiguration.php:39
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
-msgstr ""
+msgstr "Konfiguracja jest prawidłowa, ale Bind nie. Sprawdź ustawienia serwera i poświadczenia."
 
-#: ajax/testConfiguration.php:40
+#: ajax/testConfiguration.php:43
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
-msgstr ""
+msgstr "Konfiguracja jest nieprawidłowa. Proszę przejrzeć logi dziennika ownCloud "
 
 #: js/settings.js:66
 msgid "Deletion failed"
@@ -46,31 +48,31 @@ msgstr "Skasowanie nie powiodło się"
 
 #: js/settings.js:82
 msgid "Take over settings from recent server configuration?"
-msgstr ""
+msgstr "Przejmij ustawienia z ostatnich konfiguracji serwera?"
 
 #: js/settings.js:83
 msgid "Keep settings?"
-msgstr ""
+msgstr "Zachować ustawienia?"
 
 #: js/settings.js:97
 msgid "Cannot add server configuration"
-msgstr ""
+msgstr "Nie można dodać konfiguracji serwera"
 
 #: js/settings.js:121
 msgid "Connection test succeeded"
-msgstr ""
+msgstr "Test połączenia udany"
 
 #: js/settings.js:126
 msgid "Connection test failed"
-msgstr ""
+msgstr "Test połączenia nie udany"
 
 #: js/settings.js:136
 msgid "Do you really want to delete the current Server Configuration?"
-msgstr ""
+msgstr "Czy chcesz usunąć bieżącą konfigurację serwera?"
 
 #: js/settings.js:137
 msgid "Confirm Deletion"
-msgstr ""
+msgstr "Potwierdź usunięcie"
 
 #: templates/settings.php:8
 msgid ""
@@ -83,230 +85,254 @@ msgstr "<b>Ostrzeżenie:</b> Aplikacje user_ldap i user_webdavauth nie są  komp
 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>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
 msgid "Server configuration"
-msgstr ""
+msgstr "Konfiguracja servera"
 
-#: templates/settings.php:17
+#: templates/settings.php:18
 msgid "Add Server Configuration"
-msgstr ""
+msgstr "Dodaj konfigurację servera"
 
-#: templates/settings.php:21
+#: templates/settings.php:23
 msgid "Host"
 msgstr "Host"
 
-#: templates/settings.php:21
+#: templates/settings.php:25
 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:22
+#: templates/settings.php:26
 msgid "Base DN"
 msgstr "Baza DN"
 
-#: templates/settings.php:22
+#: templates/settings.php:27
 msgid "One Base DN per line"
-msgstr ""
+msgstr "Jedna baza DN na linię"
 
-#: templates/settings.php:22
+#: templates/settings.php:28
 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:23
+#: templates/settings.php:30
 msgid "User DN"
 msgstr "Użytkownik DN"
 
-#: templates/settings.php:23
+#: templates/settings.php:32
 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:24
+#: templates/settings.php:33
 msgid "Password"
 msgstr "Hasło"
 
-#: templates/settings.php:24
+#: templates/settings.php:36
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "Dla dostępu anonimowego pozostawić DN i hasło puste."
 
-#: templates/settings.php:25
+#: templates/settings.php:37
 msgid "User Login Filter"
 msgstr "Filtr logowania użytkownika"
 
-#: templates/settings.php:25
+#: templates/settings.php:40
 #, 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:25
+#: templates/settings.php:41
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "Użyj %%uid zastępczy, np. \"uid=%%uid\""
 
-#: templates/settings.php:26
+#: templates/settings.php:42
 msgid "User List Filter"
 msgstr "Lista filtrów użytkownika"
 
-#: templates/settings.php:26
+#: templates/settings.php:45
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Definiuje filtry do zastosowania, podczas pobierania użytkowników."
 
-#: templates/settings.php:26
+#: templates/settings.php:46
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "bez żadnych symboli zastępczych np. \"objectClass=person\"."
 
-#: templates/settings.php:27
+#: templates/settings.php:47
 msgid "Group Filter"
 msgstr "Grupa filtrów"
 
-#: templates/settings.php:27
+#: templates/settings.php:50
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Definiuje filtry do zastosowania, podczas pobierania grup."
 
-#: templates/settings.php:27
+#: templates/settings.php:51
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "bez żadnych symboli zastępczych np. \"objectClass=posixGroup\"."
 
-#: templates/settings.php:31
+#: templates/settings.php:55
 msgid "Connection Settings"
-msgstr ""
+msgstr "Konfiguracja połączeń"
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "Configuration Active"
-msgstr ""
+msgstr "Konfiguracja archiwum"
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "When unchecked, this configuration will be skipped."
-msgstr ""
+msgstr "Gdy niezaznaczone, ta konfiguracja zostanie pominięta."
 
-#: templates/settings.php:34
+#: templates/settings.php:58
 msgid "Port"
 msgstr "Port"
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid "Backup (Replica) Host"
-msgstr ""
+msgstr "Kopia zapasowa (repliki) host"
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
-msgstr ""
+msgstr "Dać opcjonalnie  hosta kopii zapasowej . To musi być repliką głównego serwera LDAP/AD."
 
-#: templates/settings.php:36
+#: templates/settings.php:60
 msgid "Backup (Replica) Port"
-msgstr ""
+msgstr "Kopia zapasowa (repliki) Port"
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "Disable Main Server"
-msgstr ""
+msgstr "Wyłącz serwer główny"
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "When switched on, ownCloud will only connect to the replica server."
-msgstr ""
+msgstr "Po włączeniu, ownCloud tylko połączy się z serwerem repliki."
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Use TLS"
 msgstr "Użyj TLS"
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Do not use it additionally for LDAPS connections, it will fail."
-msgstr ""
+msgstr "Nie używaj go dodatkowo dla połączeń protokołu LDAPS, zakończy się niepowodzeniem."
 
-#: templates/settings.php:39
+#: templates/settings.php:63
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Wielkość liter serwera LDAP (Windows)"
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid "Turn off SSL certificate validation."
 msgstr "Wyłączyć sprawdzanie poprawności certyfikatu SSL."
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 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:40
+#: templates/settings.php:64
 msgid "Not recommended, use for testing only."
 msgstr "Niezalecane, użyj tylko testowo."
 
-#: templates/settings.php:41
+#: templates/settings.php:65
+msgid "Cache Time-To-Live"
+msgstr "Przechowuj czas życia"
+
+#: templates/settings.php:65
 msgid "in seconds. A change empties the cache."
 msgstr "w sekundach. Zmiana opróżnia pamięć podręczną."
 
-#: templates/settings.php:43
+#: templates/settings.php:67
 msgid "Directory Settings"
-msgstr ""
+msgstr "Ustawienia katalogów"
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "User Display Name Field"
 msgstr "Pole wyświetlanej nazwy użytkownika"
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 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:46
+#: templates/settings.php:70
 msgid "Base User Tree"
 msgstr "Drzewo bazy użytkowników"
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "One User Base DN per line"
-msgstr ""
+msgstr "Jeden użytkownik Bazy DN na linię"
 
-#: templates/settings.php:47
+#: templates/settings.php:71
 msgid "User Search Attributes"
-msgstr ""
+msgstr "Szukaj atrybutów"
 
-#: templates/settings.php:47 templates/settings.php:50
+#: templates/settings.php:71 templates/settings.php:74
 msgid "Optional; one attribute per line"
-msgstr ""
+msgstr "Opcjonalnie; jeden atrybut w wierszu"
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "Group Display Name Field"
 msgstr "Pole wyświetlanej nazwy grupy"
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 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:49
+#: templates/settings.php:73
 msgid "Base Group Tree"
 msgstr "Drzewo bazy grup"
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "One Group Base DN per line"
-msgstr ""
+msgstr "Jedna grupa bazy DN na linię"
 
-#: templates/settings.php:50
+#: templates/settings.php:74
 msgid "Group Search Attributes"
-msgstr ""
+msgstr "Grupa atrybutów wyszukaj"
 
-#: templates/settings.php:51
+#: templates/settings.php:75
 msgid "Group-Member association"
 msgstr "Członek grupy stowarzyszenia"
 
-#: templates/settings.php:53
+#: templates/settings.php:77
 msgid "Special Attributes"
-msgstr ""
+msgstr "Specjalne atrybuty"
+
+#: templates/settings.php:79
+msgid "Quota Field"
+msgstr "Pole przydziału"
+
+#: templates/settings.php:80
+msgid "Quota Default"
+msgstr "Przydział domyślny"
 
-#: templates/settings.php:56
+#: templates/settings.php:80
 msgid "in bytes"
 msgstr "w bajtach"
 
-#: templates/settings.php:58
+#: templates/settings.php:81
+msgid "Email Field"
+msgstr "Pole email"
+
+#: templates/settings.php:82
+msgid "User Home Folder Naming Rule"
+msgstr "Reguły nazewnictwa folderu domowego użytkownika"
+
+#: templates/settings.php:82
 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:62
+#: templates/settings.php:86
+msgid "Test Configuration"
+msgstr "Konfiguracja testowa"
+
+#: templates/settings.php:86
 msgid "Help"
 msgstr "Pomoc"
diff --git a/l10n/pl_PL/files.po b/l10n/pl_PL/files.po
index 058fd601d411f075817b88ab658940bbad482840..a3b275e94fa8bb0b4bd15cbda36ab5f653085e06 100644
--- a/l10n/pl_PL/files.po
+++ b/l10n/pl_PL/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\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: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
 "MIME-Version: 1.0\n"
@@ -50,27 +50,27 @@ msgid ""
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:31
+#: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:32
+#: ajax/upload.php:31
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:33
+#: ajax/upload.php:32
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:34
+#: ajax/upload.php:33
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:52
+#: ajax/upload.php:51
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:83
+#: ajax/upload.php:82
 msgid "Invalid directory."
 msgstr ""
 
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:127 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:127 templates/index.php:92 templates/index.php:93
 msgid "Delete"
 msgstr ""
 
@@ -90,40 +90,36 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:253
+#: js/filelist.js:251
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:295
-msgid "replaced {new_name}"
+#: js/filelist.js:298
+msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:295 js/filelist.js:297
+#: js/filelist.js:298
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:297
-msgid "replaced {new_name} with {old_name}"
-msgstr ""
-
-#: js/filelist.js:322
+#: js/filelist.js:323
 msgid "perform delete operation"
 msgstr ""
 
@@ -149,74 +145,74 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:224
+#: js/files.js:225
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:261
+#: js/files.js:262
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:261
+#: js/files.js:262
 msgid "Upload Error"
 msgstr ""
 
-#: js/files.js:272
+#: js/files.js:273
 msgid "Close"
 msgstr ""
 
-#: js/files.js:311
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr ""
 
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr ""
 
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:496
+#: js/files.js:497
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:569
+#: js/files.js:570
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:574
+#: js/files.js:575
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:953 templates/index.php:68
 msgid "Name"
 msgstr ""
 
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:954 templates/index.php:79
 msgid "Size"
 msgstr ""
 
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:955 templates/index.php:81
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:969
+#: js/files.js:974
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:971
+#: js/files.js:976
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:979
+#: js/files.js:984
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:981
+#: js/files.js:986
 msgid "{count} files"
 msgstr ""
 
@@ -280,33 +276,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:53
+msgid "You don’t have write permissions here."
+msgstr ""
+
+#: templates/index.php:60
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:73
+#: templates/index.php:74
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:86 templates/index.php:87
 msgid "Unshare"
 msgstr ""
 
-#: templates/index.php:105
+#: templates/index.php:106
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:107
+#: templates/index.php:108
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:112
+#: templates/index.php:113
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:115
+#: templates/index.php:116
 msgid "Current scanning"
 msgstr ""
 
diff --git a/l10n/pl_PL/files_external.po b/l10n/pl_PL/files_external.po
index f5c11983aa723f4771e40c56f3692d5ee123e19e..abd87d253b8b65416d0c841084e8a584975c02a2 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: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-11 23:22+0000\n"
+"POT-Creation-Date: 2013-02-28 00:04+0100\n"
+"PO-Revision-Date: 2013-02-27 23:04+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
 "MIME-Version: 1.0\n"
@@ -17,37 +17,33 @@ 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"
 
-#: 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:421
 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:424
 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 "
@@ -58,63 +54,63 @@ msgstr ""
 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 ""
 
-#: 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 ""
 
-#: 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/pl_PL/files_trashbin.po b/l10n/pl_PL/files_trashbin.po
index d35b236c8f8b64aa25c40601a13c8de081c4a98f..3de7aff0fae4c1ddc19a3f4f190356294adbdeaa 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-02-08 00:10+0100\n"
-"PO-Revision-Date: 2013-02-07 23:11+0000\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: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
 "MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@ 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:22
+#: ajax/delete.php:40
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
@@ -27,35 +27,39 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:33
+#: js/trash.js:34
 msgid "delete file permanently"
 msgstr ""
 
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr ""
+
+#: js/trash.js:174 templates/index.php:17
 msgid "Name"
 msgstr ""
 
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:175 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:135
+#: js/trash.js:184
 msgid "1 folder"
 msgstr ""
 
-#: js/trash.js:137
+#: js/trash.js:186
 msgid "{count} folders"
 msgstr ""
 
-#: js/trash.js:145
+#: js/trash.js:194
 msgid "1 file"
 msgstr ""
 
-#: js/trash.js:147
+#: js/trash.js:196
 msgid "{count} files"
 msgstr ""
 
@@ -66,3 +70,11 @@ 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/pl_PL/files_versions.po b/l10n/pl_PL/files_versions.po
index 4423dd3512d086fcd00bc0cc915c8670302bf8c3..8634a4a3e6a649fc4119ccdb39ad926584281e87 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-08 00:10+0100\n"
-"PO-Revision-Date: 2013-02-07 23:11+0000\n"
+"POT-Creation-Date: 2013-02-28 00:04+0100\n"
+"PO-Revision-Date: 2013-02-27 23:04+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
 "MIME-Version: 1.0\n"
@@ -48,18 +48,10 @@ msgstr ""
 msgid "No path specified"
 msgstr ""
 
-#: js/versions.js:16
-msgid "History"
+#: 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 ""
-
-#: templates/settings.php:3
-msgid "Files Versioning"
-msgstr ""
-
-#: templates/settings.php:4
-msgid "Enable"
-msgstr ""
diff --git a/l10n/pl_PL/lib.po b/l10n/pl_PL/lib.po
index 2d0b95690787a8fda9c1a66e669dc93ebeec9fff..3a14af541f8912cb071316e2df74dd0e0e77d8c6 100644
--- a/l10n/pl_PL/lib.po
+++ b/l10n/pl_PL/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-11 15:39+0100\n"
-"PO-Revision-Date: 2013-02-11 14:41+0000\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"
 "MIME-Version: 1.0\n"
@@ -17,27 +17,27 @@ msgstr ""
 "Language: pl_PL\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: app.php:339
+#: app.php:349
 msgid "Help"
 msgstr ""
 
-#: app.php:346
+#: app.php:362
 msgid "Personal"
 msgstr ""
 
-#: app.php:351
+#: app.php:373
 msgid "Settings"
 msgstr "Ustawienia"
 
-#: app.php:356
+#: app.php:385
 msgid "Users"
 msgstr ""
 
-#: app.php:363
+#: app.php:398
 msgid "Apps"
 msgstr ""
 
-#: app.php:365
+#: app.php:406
 msgid "Admin"
 msgstr ""
 
@@ -49,15 +49,15 @@ msgstr ""
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:203 files.php:228
+#: files.php:204 files.php:231
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:227
+#: files.php:228
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: helper.php:226
+#: helper.php:228
 msgid "couldn't be determined"
 msgstr ""
 
@@ -97,87 +97,92 @@ msgstr ""
 msgid "Specify a data folder."
 msgstr ""
 
-#: setup.php:53
+#: setup.php:55
 #, php-format
 msgid "%s enter the database username."
 msgstr ""
 
-#: setup.php:56
+#: setup.php:58
 #, php-format
 msgid "%s enter the database name."
 msgstr ""
 
-#: setup.php:59
+#: setup.php:61
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr ""
 
-#: setup.php:62
+#: setup.php:64
 #, php-format
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:126 setup.php:291 setup.php:336
+#: setup.php:128 setup.php:320 setup.php:365
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:127 setup.php:150 setup.php:204
+#: setup.php:129 setup.php:152 setup.php:229
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:149 setup.php:423 setup.php:489
+#: setup.php:151 setup.php:453 setup.php:520
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:203
+#: setup.php:228
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:255 setup.php:357 setup.php:366 setup.php:384 setup.php:394
-#: setup.php:403 setup.php:430 setup.php:496 setup.php:522 setup.php:529
-#: setup.php:540 setup.php:547 setup.php:556 setup.php:564 setup.php:573
-#: setup.php:579
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:256 setup.php:358 setup.php:367 setup.php:385 setup.php:395
-#: setup.php:404 setup.php:431 setup.php:497 setup.php:523 setup.php:530
-#: setup.php:541 setup.php:557 setup.php:565 setup.php:574
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:270
+#: setup.php:299
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:271
+#: setup.php:300
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:276
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:277
+#: setup.php:306
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:548 setup.php:580
+#: setup.php:579 setup.php:611
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:644
+#: setup.php:631
+#, php-format
+msgid "MS SQL username and/or password not valid: %s"
+msgstr ""
+
+#: setup.php:849
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:645
+#: setup.php:850
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
@@ -234,16 +239,16 @@ msgstr ""
 msgid "years ago"
 msgstr ""
 
-#: updater.php:75
+#: updater.php:78
 #, php-format
 msgid "%s is available. Get <a href=\"%s\">more information</a>"
 msgstr ""
 
-#: updater.php:77
+#: updater.php:81
 msgid "up to date"
 msgstr ""
 
-#: updater.php:80
+#: updater.php:84
 msgid "updates check is disabled"
 msgstr ""
 
diff --git a/l10n/pl_PL/settings.po b/l10n/pl_PL/settings.po
index f84cdc55d7aaf3cbc808fdc8501be47e91906879..3a1780a3529c09fa493350b1126598b7af0b3ccc 100644
--- a/l10n/pl_PL/settings.po
+++ b/l10n/pl_PL/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 23:05+0000\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"
 "MIME-Version: 1.0\n"
@@ -21,8 +21,8 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr ""
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:15
-#: ajax/togglegroups.php:18
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr ""
 
@@ -70,12 +70,12 @@ 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 ""
@@ -116,7 +116,7 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:96
+#: js/personal.js:99
 msgid "Saving..."
 msgstr ""
 
@@ -145,23 +145,23 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
-#: js/users.js:190
+#: js/users.js:191
 msgid "add group"
 msgstr ""
 
-#: js/users.js:351
+#: js/users.js:352
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:357
+#: js/users.js:358
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
 msgid "__language_name__"
 msgstr ""
 
@@ -207,19 +207,19 @@ msgstr ""
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:61
+#: templates/admin.php:63
+#, php-format
 msgid ""
-"This ownCloud server can't set system locale to "
-"\"en_US.UTF-8\"/\"en_US.UTF8\". 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 en_US.UTF-8/en_US.UTF8."
+"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:72
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:75
+#: 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 "
@@ -229,98 +229,98 @@ msgid ""
 " of ownCloud."
 msgstr ""
 
-#: templates/admin.php:89
+#: templates/admin.php:92
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:98
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:108
+#: 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:118
+#: 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:125
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:131
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:132
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:140
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:147
+#: templates/admin.php:150
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:148
+#: templates/admin.php:151
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:155
+#: templates/admin.php:158
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:161
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:165
+#: templates/admin.php:168
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:181
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:179
+#: templates/admin.php:182
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:182
+#: templates/admin.php:185
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr ""
 
-#: templates/admin.php:192
+#: templates/admin.php:195
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:193
+#: templates/admin.php:196
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:220
+#: templates/admin.php:223
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:227 templates/personal.php:98
+#: templates/admin.php:230 templates/personal.php:102
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:230 templates/personal.php:100
+#: templates/admin.php:233 templates/personal.php:105
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -330,51 +330,51 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr ""
 
-#: templates/apps.php:10
+#: templates/apps.php:11
 msgid "Add your App"
 msgstr ""
 
-#: templates/apps.php:11
+#: templates/apps.php:12
 msgid "More Apps"
 msgstr ""
 
-#: templates/apps.php:24
+#: templates/apps.php:28
 msgid "Select an App"
 msgstr ""
 
-#: templates/apps.php:28
+#: templates/apps.php:34
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:29
+#: templates/apps.php:36
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
-#: templates/apps.php:31
+#: templates/apps.php:38
 msgid "Update"
 msgstr "Uaktualnienie"
 
-#: templates/help.php:3
+#: 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 ""
 
@@ -383,79 +383,79 @@ msgstr ""
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:14
+#: templates/personal.php:15
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:25
+#: templates/personal.php:26
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:36 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
 msgid "Password"
 msgstr ""
 
-#: templates/personal.php:37
+#: templates/personal.php:38
 msgid "Your password was changed"
 msgstr ""
 
-#: templates/personal.php:38
+#: templates/personal.php:39
 msgid "Unable to change your password"
 msgstr ""
 
-#: templates/personal.php:39
+#: templates/personal.php:40
 msgid "Current password"
 msgstr ""
 
-#: templates/personal.php:40
+#: templates/personal.php:42
 msgid "New password"
 msgstr ""
 
-#: templates/personal.php:42
+#: templates/personal.php:44
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:54 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:78
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:55
+#: templates/personal.php:57
 msgid "Your display name was changed"
 msgstr ""
 
-#: templates/personal.php:56
+#: templates/personal.php:58
 msgid "Unable to change your display name"
 msgstr ""
 
-#: templates/personal.php:59
+#: templates/personal.php:61
 msgid "Change display name"
 msgstr ""
 
-#: templates/personal.php:68
+#: templates/personal.php:70
 msgid "Email"
 msgstr "Email"
 
-#: templates/personal.php:69
+#: templates/personal.php:72
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:70
+#: templates/personal.php:73
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:76 templates/personal.php:77
+#: templates/personal.php:79 templates/personal.php:80
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:82
+#: templates/personal.php:86
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:87
+#: templates/personal.php:91
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:89
+#: templates/personal.php:93
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
diff --git a/l10n/pl_PL/user_ldap.po b/l10n/pl_PL/user_ldap.po
index 6fecd479fb54ff54852c133bc0ca6de5887bf758..34b3f1b71578e51934807c738ba48da60dba6f69 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-02-08 00:10+0100\n"
-"PO-Revision-Date: 2013-02-07 23:11+0000\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: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
 "MIME-Version: 1.0\n"
@@ -21,17 +21,17 @@ msgstr ""
 msgid "Failed to delete the server configuration"
 msgstr ""
 
-#: ajax/testConfiguration.php:35
+#: ajax/testConfiguration.php:36
 msgid "The configuration is valid and the connection could be established!"
 msgstr ""
 
-#: ajax/testConfiguration.php:37
+#: ajax/testConfiguration.php:39
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
 msgstr ""
 
-#: ajax/testConfiguration.php:40
+#: ajax/testConfiguration.php:43
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
@@ -86,224 +86,248 @@ msgstr ""
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:17
+#: templates/settings.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:23
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:25
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:26
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:27
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:28
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:32
 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:24
+#: templates/settings.php:33
 msgid "Password"
 msgstr ""
 
-#: templates/settings.php:24
+#: templates/settings.php:36
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:37
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:40
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:41
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:42
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:45
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:46
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:47
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:50
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:51
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:55
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:34
+#: templates/settings.php:58
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:60
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:39
+#: templates/settings.php:63
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:65
+msgid "Cache Time-To-Live"
+msgstr ""
+
+#: templates/settings.php:65
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:67
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:47
+#: templates/settings.php:71
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:47 templates/settings.php:50
+#: templates/settings.php:71 templates/settings.php:74
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:74
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:75
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:77
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:79
+msgid "Quota Field"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Quota Default"
+msgstr ""
+
+#: templates/settings.php:80
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:81
+msgid "Email Field"
+msgstr ""
+
+#: templates/settings.php:82
+msgid "User Home Folder Naming Rule"
+msgstr ""
+
+#: templates/settings.php:82
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:62
+#: templates/settings.php:86
+msgid "Test Configuration"
+msgstr ""
+
+#: templates/settings.php:86
 msgid "Help"
 msgstr ""
diff --git a/l10n/pt_BR/core.po b/l10n/pt_BR/core.po
index 2fad1b25c98ce87c82bc2f612b67fbfa8804d425..f89a43e9dd01cd5e9752d7ca80ab2c2b2c2bbb98 100644
--- a/l10n/pt_BR/core.po
+++ b/l10n/pt_BR/core.po
@@ -18,8 +18,8 @@ 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-13 23:10+0000\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"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -397,7 +397,7 @@ msgstr "A atualização falhou. Por favor, relate este problema para a <a href=\
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "A atualização teve êxito. Você será redirecionado ao ownCloud agora."
 
-#: lostpassword/controller.php:47
+#: lostpassword/controller.php:48
 msgid "ownCloud password reset"
 msgstr "Redefinir senha ownCloud"
 
diff --git a/l10n/pt_BR/files.po b/l10n/pt_BR/files.po
index 9e297e235b1bb47dead4704446f777cdea5d865c..9bf36d86207f039cbdb177b36bbffd5980f441e1 100644
--- a/l10n/pt_BR/files.po
+++ b/l10n/pt_BR/files.po
@@ -3,6 +3,7 @@
 # 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.
@@ -10,15 +11,16 @@
 # 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.
 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 23:05+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "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"
@@ -29,12 +31,12 @@ msgstr ""
 #: ajax/move.php:17
 #, php-format
 msgid "Could not move %s - File with this name already exists"
-msgstr "Não possível mover %s - Um arquivo com este nome já existe"
+msgstr "Impossível mover %s - Um arquivo com este nome já existe"
 
 #: ajax/move.php:27 ajax/move.php:30
 #, php-format
 msgid "Could not move %s"
-msgstr "Não possível mover %s"
+msgstr "Impossível mover %s"
 
 #: ajax/rename.php:22 ajax/rename.php:25
 msgid "Unable to rename file"
@@ -42,7 +44,7 @@ msgstr "Impossível renomear arquivo"
 
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
-msgstr "Nenhum arquivo foi transferido. Erro desconhecido"
+msgstr "Nenhum arquivo foi enviado. Erro desconhecido"
 
 #: ajax/upload.php:26
 msgid "There is no error, the file uploaded with success"
@@ -59,27 +61,27 @@ msgid ""
 "the HTML form"
 msgstr "O arquivo carregado excede o MAX_FILE_SIZE que foi especificado no formulário HTML"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
 msgstr "O arquivo foi transferido parcialmente"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:31
 msgid "No file was uploaded"
 msgstr "Nenhum arquivo foi transferido"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:32
 msgid "Missing a temporary folder"
 msgstr "Pasta temporária não encontrada"
 
-#: ajax/upload.php:34
+#: ajax/upload.php:33
 msgid "Failed to write to disk"
 msgstr "Falha ao escrever no disco"
 
-#: ajax/upload.php:52
+#: ajax/upload.php:51
 msgid "Not enough storage available"
 msgstr "Espaço de armazenamento insuficiente"
 
-#: ajax/upload.php:83
+#: ajax/upload.php:82
 msgid "Invalid directory."
 msgstr "Diretório inválido."
 
@@ -91,7 +93,7 @@ msgstr "Arquivos"
 msgid "Delete permanently"
 msgstr "Excluir permanentemente"
 
-#: js/fileactions.js:127 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:127 templates/index.php:92 templates/index.php:93
 msgid "Delete"
 msgstr "Excluir"
 
@@ -99,40 +101,36 @@ msgstr "Excluir"
 msgid "Rename"
 msgstr "Renomear"
 
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:293 js/files.js:409
+#: js/files.js:440
 msgid "Pending"
 msgstr "Pendente"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "{new_name} already exists"
 msgstr "{new_name} já existe"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "replace"
 msgstr "substituir"
 
-#: js/filelist.js:253
+#: js/filelist.js:251
 msgid "suggest name"
 msgstr "sugerir nome"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "cancel"
 msgstr "cancelar"
 
-#: js/filelist.js:295
-msgid "replaced {new_name}"
-msgstr "substituído {new_name}"
+#: js/filelist.js:298
+msgid "replaced {new_name} with {old_name}"
+msgstr "Substituído {old_name} por {new_name} "
 
-#: js/filelist.js:295 js/filelist.js:297
+#: js/filelist.js:298
 msgid "undo"
 msgstr "desfazer"
 
-#: js/filelist.js:297
-msgid "replaced {new_name} with {old_name}"
-msgstr "Substituído {old_name} por {new_name} "
-
-#: js/filelist.js:322
+#: js/filelist.js:323
 msgid "perform delete operation"
 msgstr "realizar operação de exclusão"
 
@@ -152,80 +150,80 @@ msgstr "Nome inválido, '\\', '/', '<', '>', ':', '\"', '|', '?' e '*' não são
 
 #: js/files.js:78
 msgid "Your storage is full, files can not be updated or synced anymore!"
-msgstr "Seu armazenamento está cheio, arquivos não serão mais atualizados nem sincronizados!"
+msgstr "Seu armazenamento está cheio, arquivos não podem mais ser atualizados ou sincronizados!"
 
 #: js/files.js:82
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Seu armazenamento está quase cheio ({usedSpacePercent}%)"
 
-#: js/files.js:224
+#: js/files.js:226
 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:261
+#: js/files.js:263
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Impossível enviar seus arquivo como diretório ou ele tem 0 bytes."
+msgstr "Impossível enviar seus arquivo por ele ser um diretório ou ter 0 bytes."
 
-#: js/files.js:261
+#: js/files.js:263
 msgid "Upload Error"
 msgstr "Erro de envio"
 
-#: js/files.js:272
+#: js/files.js:274
 msgid "Close"
 msgstr "Fechar"
 
-#: js/files.js:311
+#: js/files.js:313
 msgid "1 file uploading"
 msgstr "enviando 1 arquivo"
 
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:316 js/files.js:371 js/files.js:386
 msgid "{count} files uploading"
 msgstr "Enviando {count} arquivos"
 
-#: js/files.js:387 js/files.js:422
+#: js/files.js:389 js/files.js:424
 msgid "Upload cancelled."
 msgstr "Envio cancelado."
 
-#: js/files.js:496
+#: js/files.js:498
 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:569
+#: js/files.js:571
 msgid "URL cannot be empty."
 msgstr "URL não pode ficar em branco"
 
-#: js/files.js:574
+#: js/files.js:576
 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:948 templates/index.php:67
+#: js/files.js:954 templates/index.php:68
 msgid "Name"
 msgstr "Nome"
 
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:955 templates/index.php:79
 msgid "Size"
 msgstr "Tamanho"
 
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:956 templates/index.php:81
 msgid "Modified"
 msgstr "Modificado"
 
-#: js/files.js:969
+#: js/files.js:975
 msgid "1 folder"
 msgstr "1 pasta"
 
-#: js/files.js:971
+#: js/files.js:977
 msgid "{count} folders"
 msgstr "{count} pastas"
 
-#: js/files.js:979
+#: js/files.js:985
 msgid "1 file"
 msgstr "1 arquivo"
 
-#: js/files.js:981
+#: js/files.js:987
 msgid "{count} files"
 msgstr "{count} arquivos"
 
@@ -247,7 +245,7 @@ msgstr "max. possível:"
 
 #: templates/admin.php:15
 msgid "Needed for multi-file and folder downloads."
-msgstr "Necessário para multiplos arquivos e diretório de downloads."
+msgstr "Necessário para download de múltiplos arquivos e diretórios."
 
 #: templates/admin.php:17
 msgid "Enable ZIP-download"
@@ -283,42 +281,46 @@ msgstr "Do link"
 
 #: templates/index.php:40
 msgid "Deleted files"
-msgstr ""
+msgstr "Arquivos apagados"
 
 #: templates/index.php:46
 msgid "Cancel upload"
 msgstr "Cancelar upload"
 
-#: templates/index.php:59
+#: templates/index.php:53
+msgid "You don’t have write permissions here."
+msgstr "Você não possui permissão de escrita aqui."
+
+#: templates/index.php:60
 msgid "Nothing in here. Upload something!"
 msgstr "Nada aqui.Carrege alguma coisa!"
 
-#: templates/index.php:73
+#: templates/index.php:74
 msgid "Download"
 msgstr "Baixar"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:86 templates/index.php:87
 msgid "Unshare"
 msgstr "Descompartilhar"
 
-#: templates/index.php:105
+#: templates/index.php:106
 msgid "Upload too large"
 msgstr "Arquivo muito grande"
 
-#: templates/index.php:107
+#: templates/index.php:108
 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:112
+#: templates/index.php:113
 msgid "Files are being scanned, please wait."
 msgstr "Arquivos sendo escaneados, por favor aguarde."
 
-#: templates/index.php:115
+#: templates/index.php:116
 msgid "Current scanning"
 msgstr "Scanning atual"
 
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
-msgstr "Aprimorando cache do sistema de arquivos..."
+msgstr "Atualizando cache do sistema de arquivos..."
diff --git a/l10n/pt_BR/files_external.po b/l10n/pt_BR/files_external.po
index 5f0a169ed2d6256fab90d604213627dcf0d5519c..830dad23e37724842494f6b19cfdb3c3bffb7b85 100644
--- a/l10n/pt_BR/files_external.po
+++ b/l10n/pt_BR/files_external.po
@@ -3,15 +3,16 @@
 # 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.
 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:50+0000\n"
-"Last-Translator: rodrigost23 <rodrigo.st23@hotmail.com>\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"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,104 +20,100 @@ msgstr ""
 "Language: pt_BR\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 "Acesso concedido"
 
-#: 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 "Erro ao configurar armazenamento do Dropbox"
 
-#: 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 "Permitir acesso"
 
-#: js/dropbox.js:73 js/google.js:72
-msgid "Fill out all required fields"
-msgstr "Preencha todos os campos obrigatórios"
-
-#: js/dropbox.js:85
+#: js/dropbox.js:101
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr "Por favor forneça um app key e secret válido do Dropbox"
 
-#: 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 "Erro ao configurar armazenamento do Google Drive"
 
-#: lib/config.php:413
+#: lib/config.php:421
 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. Não será possível montar compartilhamentos de CIFS/SMB. Por favor, peça ao seu administrador do sistema para instalá-lo."
+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:414
+#: lib/config.php:424
 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. Não será possível montar compartilhamentos FTP. Por favor, peça ao seu administrador do sistema para instalá-lo."
+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."
 
 #: templates/settings.php:3
 msgid "External Storage"
 msgstr "Armazenamento Externo"
 
-#: templates/settings.php:8 templates/settings.php:22
-msgid "Mount point"
-msgstr "Ponto de montagem"
-
-#: templates/settings.php:9
-msgid "Backend"
-msgstr "Backend"
+#: templates/settings.php:9 templates/settings.php:28
+msgid "Folder name"
+msgstr "Nome da pasta"
 
 #: templates/settings.php:10
+msgid "External storage"
+msgstr "Armazenamento Externo"
+
+#: templates/settings.php:11
 msgid "Configuration"
 msgstr "Configuração"
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid "Options"
 msgstr "Opções"
 
-#: templates/settings.php:12
+#: templates/settings.php:13
 msgid "Applicable"
 msgstr "Aplicável"
 
-#: templates/settings.php:27
-msgid "Add mount point"
-msgstr "Adicionar ponto de montagem"
+#: templates/settings.php:33
+msgid "Add storage"
+msgstr "Adicionar Armazenamento"
 
-#: templates/settings.php:85
+#: templates/settings.php:90
 msgid "None set"
 msgstr "Nenhum definido"
 
-#: templates/settings.php:86
+#: templates/settings.php:91
 msgid "All Users"
 msgstr "Todos os Usuários"
 
-#: templates/settings.php:87
+#: templates/settings.php:92
 msgid "Groups"
 msgstr "Grupos"
 
-#: templates/settings.php:95
+#: templates/settings.php:100
 msgid "Users"
 msgstr "Usuários"
 
-#: templates/settings.php:108 templates/settings.php:109
-#: templates/settings.php:144 templates/settings.php:145
+#: templates/settings.php:113 templates/settings.php:114
+#: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
 msgstr "Remover"
 
-#: templates/settings.php:124
+#: templates/settings.php:129
 msgid "Enable User External Storage"
 msgstr "Habilitar Armazenamento Externo do Usuário"
 
-#: templates/settings.php:125
+#: templates/settings.php:130
 msgid "Allow users to mount their own external storage"
 msgstr "Permitir usuários a montar seus próprios armazenamentos externos"
 
-#: templates/settings.php:136
+#: templates/settings.php:141
 msgid "SSL root certificates"
 msgstr "Certificados SSL raíz"
 
-#: templates/settings.php:153
+#: templates/settings.php:159
 msgid "Import Root Certificate"
 msgstr "Importar Certificado Raíz"
diff --git a/l10n/pt_BR/files_trashbin.po b/l10n/pt_BR/files_trashbin.po
index e5e109080a8de298aae21bd940404da6d76c2df7..71df0cbd868f07632326f63f3167618780395c22 100644
--- a/l10n/pt_BR/files_trashbin.po
+++ b/l10n/pt_BR/files_trashbin.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 00:00+0000\n"
-"Last-Translator: rodrigost23 <rodrigo.st23@hotmail.com>\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: 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"
@@ -18,7 +18,7 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ajax/delete.php:22
+#: ajax/delete.php:40
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "Não foi possível excluir %s permanentemente"
@@ -28,35 +28,39 @@ msgstr "Não foi possível excluir %s permanentemente"
 msgid "Couldn't restore %s"
 msgstr "Não foi possível restaurar %s"
 
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
 msgid "perform restore operation"
 msgstr "realizar operação de restauração"
 
-#: js/trash.js:33
+#: js/trash.js:34
 msgid "delete file permanently"
 msgstr "excluir arquivo permanentemente"
 
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr "Excluir permanentemente"
+
+#: js/trash.js:174 templates/index.php:17
 msgid "Name"
 msgstr "Nome"
 
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:175 templates/index.php:27
 msgid "Deleted"
 msgstr "Excluído"
 
-#: js/trash.js:135
+#: js/trash.js:184
 msgid "1 folder"
 msgstr "1 pasta"
 
-#: js/trash.js:137
+#: js/trash.js:186
 msgid "{count} folders"
 msgstr "{count} pastas"
 
-#: js/trash.js:145
+#: js/trash.js:194
 msgid "1 file"
 msgstr "1 arquivo"
 
-#: js/trash.js:147
+#: js/trash.js:196
 msgid "{count} files"
 msgstr "{count} arquivos"
 
@@ -67,3 +71,11 @@ msgstr "Nada aqui. Sua lixeira está vazia!"
 #: templates/index.php:20 templates/index.php:22
 msgid "Restore"
 msgstr "Restaurar"
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr "Excluir"
+
+#: templates/part.breadcrumb.php:9
+msgid "Deleted Files"
+msgstr ""
diff --git a/l10n/pt_BR/files_versions.po b/l10n/pt_BR/files_versions.po
index c809eecec5c1f5ceb001fd497d917e607ea63341..88db88761f5a99a605c17f06139669fa61b5ce8f 100644
--- a/l10n/pt_BR/files_versions.po
+++ b/l10n/pt_BR/files_versions.po
@@ -3,6 +3,7 @@
 # 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.
@@ -10,9 +11,9 @@ 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:10+0000\n"
-"Last-Translator: rodrigost23 <rodrigo.st23@hotmail.com>\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"
 "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"
@@ -23,7 +24,7 @@ msgstr ""
 #: ajax/rollbackVersion.php:15
 #, php-format
 msgid "Could not revert: %s"
-msgstr "Não foi possível reverter: %s"
+msgstr "Impossível reverter: %s"
 
 #: history.php:40
 msgid "success"
@@ -43,26 +44,18 @@ msgstr "falha"
 msgid "File %s could not be reverted to version %s"
 msgstr "Arquivo %s não pôde ser revertido à versão %s"
 
-#: history.php:68
+#: history.php:69
 msgid "No old versions available"
 msgstr "Nenhuma versão antiga disponível"
 
-#: history.php:73
+#: history.php:74
 msgid "No path specified"
 msgstr "Nenhum caminho especificado"
 
-#: js/versions.js:16
-msgid "History"
-msgstr "Histórico"
+#: js/versions.js:6
+msgid "Versions"
+msgstr "Versões"
 
 #: templates/history.php:20
 msgid "Revert a file to a previous version by clicking on its revert button"
 msgstr "Reverta um arquivo a uma versão anterior clicando no botão reverter"
-
-#: templates/settings.php:3
-msgid "Files Versioning"
-msgstr "Versionamento de Arquivos"
-
-#: templates/settings.php:4
-msgid "Enable"
-msgstr "Habilitar"
diff --git a/l10n/pt_BR/lib.po b/l10n/pt_BR/lib.po
index 7bb62b48c8ee1133607b843d43bf13eefa3c219f..5acde385452cc68e1bdb87c81e3d6e79a4aa33f9 100644
--- a/l10n/pt_BR/lib.po
+++ b/l10n/pt_BR/lib.po
@@ -4,6 +4,7 @@
 # 
 # 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.
@@ -11,9 +12,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-13 23:10+0000\n"
-"Last-Translator: rodrigost23 <rodrigo.st23@hotmail.com>\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"
 "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"
@@ -101,87 +102,92 @@ msgstr "Defina uma senha de administrador."
 msgid "Specify a data folder."
 msgstr "Especifique uma pasta de dados."
 
-#: setup.php:53
+#: setup.php:55
 #, php-format
 msgid "%s enter the database username."
 msgstr "%s insira o nome de usuário do banco de dados."
 
-#: setup.php:56
+#: setup.php:58
 #, php-format
 msgid "%s enter the database name."
 msgstr "%s insira o nome do banco de dados."
 
-#: setup.php:59
+#: setup.php:61
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr "%s você não pode usar pontos no nome do banco de dados"
 
-#: setup.php:62
+#: setup.php:64
 #, php-format
 msgid "%s set the database host."
 msgstr "%s defina o host do banco de dados."
 
-#: setup.php:126 setup.php:294 setup.php:339
+#: setup.php:128 setup.php:320 setup.php:365
 msgid "PostgreSQL username and/or password not valid"
 msgstr "Nome de usuário e/ou senha PostgreSQL inválido(s)"
 
-#: setup.php:127 setup.php:150 setup.php:204
+#: setup.php:129 setup.php:152 setup.php:229
 msgid "You need to enter either an existing account or the administrator."
 msgstr "Você precisa inserir uma conta existente ou o administrador."
 
-#: setup.php:149 setup.php:427 setup.php:494
+#: setup.php:151 setup.php:453 setup.php:520
 msgid "Oracle username and/or password not valid"
 msgstr "Nome de usuário e/ou senha Oracle inválido(s)"
 
-#: setup.php:203
+#: setup.php:228
 msgid "MySQL username and/or password not valid"
 msgstr "Nome de usuário e/ou senha MySQL inválido(s)"
 
-#: setup.php:257 setup.php:360 setup.php:369 setup.php:387 setup.php:397
-#: setup.php:406 setup.php:435 setup.php:501 setup.php:527 setup.php:534
-#: setup.php:545 setup.php:552 setup.php:561 setup.php:569 setup.php:578
-#: setup.php:584
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Erro no BD: \"%s\""
 
-#: setup.php:258 setup.php:361 setup.php:370 setup.php:388 setup.php:398
-#: setup.php:407 setup.php:436 setup.php:502 setup.php:528 setup.php:535
-#: setup.php:546 setup.php:562 setup.php:570 setup.php:579
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "Comando ofensivo era: \"%s\""
 
-#: setup.php:273
+#: setup.php:299
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "O usuário MySQL '%s'@'localhost' já existe."
 
-#: setup.php:274
+#: setup.php:300
 msgid "Drop this user from MySQL"
 msgstr "Derrubar este usuário do MySQL"
 
-#: setup.php:279
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "Usuário MySQL '%s'@'%%' já existe"
 
-#: setup.php:280
+#: setup.php:306
 msgid "Drop this user from MySQL."
 msgstr "Derrube este usuário do MySQL."
 
-#: setup.php:553 setup.php:585
+#: setup.php:579 setup.php:611
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Comando ofensivo era: \"%s\", nome: %s, senha: %s"
 
-#: setup.php:649
+#: setup.php:631
+#, 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
 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:651
+#: setup.php:850
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Por favor, confira os <a href='%s'>guias de instalação</a>."
diff --git a/l10n/pt_BR/settings.po b/l10n/pt_BR/settings.po
index d73ca9e69d5125d42f1b1f66295ac5937dda739e..c29a840ce614057ad2e8c743e02ee966f0faee0e 100644
--- a/l10n/pt_BR/settings.po
+++ b/l10n/pt_BR/settings.po
@@ -4,6 +4,7 @@
 # 
 # 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.
@@ -17,9 +18,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 00:20+0000\n"
-"Last-Translator: rodrigost23 <rodrigo.st23@hotmail.com>\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"
 "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"
@@ -31,8 +32,8 @@ 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:15
-#: ajax/togglegroups.php:18
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr "Erro de autenticação"
 
@@ -80,12 +81,12 @@ msgstr "Pedido inválido"
 msgid "Admins can't remove themself from the admin group"
 msgstr "Admins não podem se remover do grupo admin"
 
-#: ajax/togglegroups.php:28
+#: ajax/togglegroups.php:30
 #, php-format
 msgid "Unable to add user to group %s"
 msgstr "Não foi possível adicionar usuário ao grupo %s"
 
-#: ajax/togglegroups.php:34
+#: ajax/togglegroups.php:36
 #, php-format
 msgid "Unable to remove user from group %s"
 msgstr "Não foi possível remover usuário do grupo %s"
@@ -126,7 +127,7 @@ msgstr "Erro"
 msgid "Updated"
 msgstr "Atualizado"
 
-#: js/personal.js:96
+#: js/personal.js:99
 msgid "Saving..."
 msgstr "Guardando..."
 
@@ -171,7 +172,7 @@ msgstr "Erro ao criar usuário"
 msgid "A valid password must be provided"
 msgstr "Forneça uma senha válida"
 
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
 msgid "__language_name__"
 msgstr "Português (Brasil)"
 
@@ -217,19 +218,19 @@ msgstr "O módulo PHP 'fileinfo' está faltando. Recomendamos que ative este mó
 msgid "Locale not working"
 msgstr "Localização não funcionando"
 
-#: templates/admin.php:61
+#: templates/admin.php:63
+#, php-format
 msgid ""
-"This ownCloud server can't set system locale to "
-"\"en_US.UTF-8\"/\"en_US.UTF8\". 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 en_US.UTF-8/en_US.UTF8."
-msgstr "Este servidor ownCloud não pode definir a localização do sistema para \"en_US.UTF-8\"/\"en_US.UTF8\". Isto significa que deve haver problemas com certos caracteres em nomes de arquivos. Sugerimos que instale os pacotes necessários no seu sistema para suportar en_US.UTF-8/en_US.UTF8."
+"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 não pode configurar a localização do sistema para %s.  Isto significa que pode haver problema com alguns caracteres nos nomes de arquivos.  Nós recomendamos fortemente que você instale os pacotes requeridos em seu sistema para suportar %s."
 
-#: templates/admin.php:72
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr "Sem conexão com a internet"
 
-#: templates/admin.php:75
+#: 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 "
@@ -239,98 +240,98 @@ msgid ""
 " of ownCloud."
 msgstr "Este servidor ownCloud não tem conexão com a internet. Isto significa que alguns dos recursos como montar armazenamento externo, notificar atualizações ou instalar aplicativos de terceiros não funcionam. Acesso remoto a arquivos e envio de e-mails de notificação podem também não funcionar. Sugerimos que habilite a conexão com a internet neste servidor se quiser usufruir de todos os recursos do ownCloud."
 
-#: templates/admin.php:89
+#: templates/admin.php:92
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:98
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr "Execute uma tarefa com cada página carregada"
 
-#: templates/admin.php:108
+#: 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 está registrado no serviço webcron. Chame a página cron.php na raíz do owncloud a cada minuto por http."
 
-#: templates/admin.php:118
+#: 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 "Usar serviço de cron do sistema. Chama o arquivo cron.php na pasta owncloud via cronjob do sistema a cada minuto."
 
-#: templates/admin.php:125
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr "Compartilhamento"
 
-#: templates/admin.php:131
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr "Habilitar API de Compartilhamento"
 
-#: templates/admin.php:132
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr "Permitir que aplicativos usem a API de Compartilhamento"
 
-#: templates/admin.php:139
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr "Permitir links"
 
-#: templates/admin.php:140
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr "Permitir que usuários compartilhem itens com o público usando links"
 
-#: templates/admin.php:147
+#: templates/admin.php:150
 msgid "Allow resharing"
 msgstr "Permitir recompartilhamento"
 
-#: templates/admin.php:148
+#: templates/admin.php:151
 msgid "Allow users to share items shared with them again"
 msgstr "Permitir que usuários compartilhem novamente itens compartilhados com eles"
 
-#: templates/admin.php:155
+#: templates/admin.php:158
 msgid "Allow users to share with anyone"
 msgstr "Permitir que usuários compartilhem com qualquer um"
 
-#: templates/admin.php:158
+#: templates/admin.php:161
 msgid "Allow users to only share with users in their groups"
 msgstr "Permitir que usuários compartilhem somente com usuários em seus grupos"
 
-#: templates/admin.php:165
+#: templates/admin.php:168
 msgid "Security"
 msgstr "Segurança"
 
-#: templates/admin.php:178
+#: templates/admin.php:181
 msgid "Enforce HTTPS"
 msgstr "Forçar HTTPS"
 
-#: templates/admin.php:179
+#: templates/admin.php:182
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr "Força o cliente a conectar-se ao ownCloud por uma conexão criptografada."
 
-#: templates/admin.php:182
+#: templates/admin.php:185
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr "Por favor, conecte-se a esta instância do ownCloud via HTTPS para habilitar ou desabilitar 'Forçar SSL'."
 
-#: templates/admin.php:192
+#: templates/admin.php:195
 msgid "Log"
 msgstr "Registro"
 
-#: templates/admin.php:193
+#: templates/admin.php:196
 msgid "Log level"
 msgstr "Nível de registro"
 
-#: templates/admin.php:220
+#: templates/admin.php:223
 msgid "More"
 msgstr "Mais"
 
-#: templates/admin.php:227 templates/personal.php:98
+#: templates/admin.php:230 templates/personal.php:102
 msgid "Version"
 msgstr "Versão"
 
-#: templates/admin.php:230 templates/personal.php:100
+#: templates/admin.php:233 templates/personal.php:105
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -340,51 +341,51 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "Desenvolvido pela <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidade ownCloud</a>, o <a href=\"https://github.com/owncloud\" target=\"_blank\">código fonte</a> está licenciado sob <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
-#: templates/apps.php:10
+#: templates/apps.php:11
 msgid "Add your App"
 msgstr "Adicione seu Aplicativo"
 
-#: templates/apps.php:11
+#: templates/apps.php:12
 msgid "More Apps"
 msgstr "Mais Apps"
 
-#: templates/apps.php:24
+#: templates/apps.php:28
 msgid "Select an App"
 msgstr "Selecione um Aplicativo"
 
-#: templates/apps.php:28
+#: templates/apps.php:34
 msgid "See application page at apps.owncloud.com"
 msgstr "Ver página do aplicativo em apps.owncloud.com"
 
-#: templates/apps.php:29
+#: templates/apps.php:36
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-licenciado por <span class=\"author\"></span>"
 
-#: templates/apps.php:31
+#: templates/apps.php:38
 msgid "Update"
 msgstr "Atualizar"
 
-#: templates/help.php:3
+#: templates/help.php:4
 msgid "User Documentation"
 msgstr "Documentação de Usuário"
 
-#: templates/help.php:4
+#: templates/help.php:6
 msgid "Administrator Documentation"
 msgstr "Documentação de Administrador"
 
-#: templates/help.php:6
+#: templates/help.php:9
 msgid "Online Documentation"
 msgstr "Documentação Online"
 
-#: templates/help.php:7
+#: templates/help.php:11
 msgid "Forum"
 msgstr "Fórum"
 
-#: templates/help.php:9
+#: templates/help.php:14
 msgid "Bugtracker"
 msgstr "Rastreador de Bugs"
 
-#: templates/help.php:11
+#: templates/help.php:17
 msgid "Commercial Support"
 msgstr "Suporte Comercial"
 
@@ -393,79 +394,79 @@ msgstr "Suporte Comercial"
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Você usou <strong>%s</strong> do seu espaço de <strong>%s</strong>"
 
-#: templates/personal.php:14
+#: templates/personal.php:15
 msgid "Get the apps to sync your files"
 msgstr "Faça com que os apps sincronize seus arquivos"
 
-#: templates/personal.php:25
+#: templates/personal.php:26
 msgid "Show First Run Wizard again"
 msgstr "Mostrar este Assistente de novo"
 
-#: templates/personal.php:36 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
 msgid "Password"
 msgstr "Senha"
 
-#: templates/personal.php:37
+#: templates/personal.php:38
 msgid "Your password was changed"
 msgstr "Sua senha foi alterada"
 
-#: templates/personal.php:38
+#: templates/personal.php:39
 msgid "Unable to change your password"
 msgstr "Não é possivel alterar a sua senha"
 
-#: templates/personal.php:39
+#: templates/personal.php:40
 msgid "Current password"
 msgstr "Senha atual"
 
-#: templates/personal.php:40
+#: templates/personal.php:42
 msgid "New password"
 msgstr "Nova senha"
 
-#: templates/personal.php:42
+#: templates/personal.php:44
 msgid "Change password"
 msgstr "Alterar senha"
 
-#: templates/personal.php:54 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:78
 msgid "Display Name"
 msgstr "Nome de Exibição"
 
-#: templates/personal.php:55
+#: templates/personal.php:57
 msgid "Your display name was changed"
 msgstr "Seu nome de exibição foi alterado"
 
-#: templates/personal.php:56
+#: templates/personal.php:58
 msgid "Unable to change your display name"
 msgstr "Impossível alterar seu nome de exibição"
 
-#: templates/personal.php:59
+#: templates/personal.php:61
 msgid "Change display name"
 msgstr "Alterar nome de exibição"
 
-#: templates/personal.php:68
+#: templates/personal.php:70
 msgid "Email"
 msgstr "E-mail"
 
-#: templates/personal.php:69
+#: templates/personal.php:72
 msgid "Your email address"
 msgstr "Seu endereço de e-mail"
 
-#: templates/personal.php:70
+#: templates/personal.php:73
 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:76 templates/personal.php:77
+#: templates/personal.php:79 templates/personal.php:80
 msgid "Language"
 msgstr "Idioma"
 
-#: templates/personal.php:82
+#: templates/personal.php:86
 msgid "Help translate"
 msgstr "Ajude a traduzir"
 
-#: templates/personal.php:87
+#: templates/personal.php:91
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:89
+#: templates/personal.php:93
 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"
 
diff --git a/l10n/pt_BR/user_ldap.po b/l10n/pt_BR/user_ldap.po
index ad9f2821c0c5f0c1f96bf3320695e7c253b492e8..7558c7b05ac8e7907be8e9c02d76f66c062fd290 100644
--- a/l10n/pt_BR/user_ldap.po
+++ b/l10n/pt_BR/user_ldap.po
@@ -3,15 +3,18 @@
 # 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.
 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-03-08 00:25+0100\n"
+"PO-Revision-Date: 2013-03-07 12:31+0000\n"
+"Last-Translator: dudanogueira <dudanogueira@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"
@@ -21,23 +24,23 @@ msgstr ""
 
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
-msgstr ""
+msgstr "Falha ao deletar a configuração do servidor"
 
-#: ajax/testConfiguration.php:35
+#: ajax/testConfiguration.php:36
 msgid "The configuration is valid and the connection could be established!"
-msgstr ""
+msgstr "A configuração é válida e a conexão foi estabelecida!"
 
-#: ajax/testConfiguration.php:37
+#: ajax/testConfiguration.php:39
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
-msgstr ""
+msgstr "A configuração é válida, mas o Bind falhou. Confira as configurações do servidor e as credenciais."
 
-#: ajax/testConfiguration.php:40
+#: ajax/testConfiguration.php:43
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
-msgstr ""
+msgstr "A configuração é inválida. Leia o log do ownCloud para mais detalhes."
 
 #: js/settings.js:66
 msgid "Deletion failed"
@@ -45,7 +48,7 @@ msgstr "Remoção falhou"
 
 #: js/settings.js:82
 msgid "Take over settings from recent server configuration?"
-msgstr ""
+msgstr "Tomar parámetros de recente configuração de servidor?"
 
 #: js/settings.js:83
 msgid "Keep settings?"
@@ -53,19 +56,19 @@ msgstr "Manter ajustes?"
 
 #: js/settings.js:97
 msgid "Cannot add server configuration"
-msgstr ""
+msgstr "Impossível adicionar a configuração do servidor"
 
 #: js/settings.js:121
 msgid "Connection test succeeded"
-msgstr ""
+msgstr "Teste de conexão bem sucedida"
 
 #: js/settings.js:126
 msgid "Connection test failed"
-msgstr ""
+msgstr "Teste de conexão falhou"
 
 #: js/settings.js:136
 msgid "Do you really want to delete the current Server Configuration?"
-msgstr ""
+msgstr "Você quer realmente deletar as atuais Configurações de Servidor?"
 
 #: js/settings.js:137
 msgid "Confirm Deletion"
@@ -86,226 +89,250 @@ msgstr "<b>Aviso:</b> O módulo PHP LDAP não está instalado, o backend não fu
 
 #: templates/settings.php:15
 msgid "Server configuration"
-msgstr ""
+msgstr "Configuração de servidor"
 
-#: templates/settings.php:17
+#: templates/settings.php:31
 msgid "Add Server Configuration"
-msgstr ""
+msgstr "Adicionar Configuração de Servidor"
 
-#: templates/settings.php:21
+#: templates/settings.php:36
 msgid "Host"
-msgstr "Host"
+msgstr "Servidor"
 
-#: templates/settings.php:21
+#: templates/settings.php:38
 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:22
+#: templates/settings.php:39
 msgid "Base DN"
 msgstr "DN Base"
 
-#: templates/settings.php:22
+#: templates/settings.php:40
 msgid "One Base DN per line"
-msgstr ""
+msgstr "Uma base DN por linha"
 
-#: templates/settings.php:22
+#: templates/settings.php:41
 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:23
+#: templates/settings.php:43
 msgid "User DN"
 msgstr "DN Usuário"
 
-#: templates/settings.php:23
+#: 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 "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:24
+#: templates/settings.php:46
 msgid "Password"
 msgstr "Senha"
 
-#: templates/settings.php:24
+#: templates/settings.php:49
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "Para acesso anônimo, deixe DN e Senha vazios."
 
-#: templates/settings.php:25
+#: templates/settings.php:50
 msgid "User Login Filter"
 msgstr "Filtro de Login de Usuário"
 
-#: templates/settings.php:25
+#: 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 "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:25
+#: templates/settings.php:54
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "use %%uid placeholder, ex. \"uid=%%uid\""
 
-#: templates/settings.php:26
+#: templates/settings.php:55
 msgid "User List Filter"
 msgstr "Filtro de Lista de Usuário"
 
-#: templates/settings.php:26
+#: templates/settings.php:58
 msgid "Defines the filter to apply, when retrieving users."
-msgstr "Define filtro a aplicar ao obter usuários."
+msgstr "Define filtro a ser aplicado ao obter usuários."
 
-#: templates/settings.php:26
+#: templates/settings.php:59
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "sem nenhum espaço reservado, ex. \"objectClass=person\"."
 
-#: templates/settings.php:27
+#: templates/settings.php:60
 msgid "Group Filter"
 msgstr "Filtro de Grupo"
 
-#: templates/settings.php:27
+#: templates/settings.php:63
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Define o filtro a aplicar ao obter grupos."
 
-#: templates/settings.php:27
+#: templates/settings.php:64
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "sem nenhum espaço reservado, ex.  \"objectClass=posixGroup\""
 
-#: templates/settings.php:31
+#: templates/settings.php:68
 msgid "Connection Settings"
-msgstr ""
+msgstr "Configurações de Conexão"
 
-#: templates/settings.php:33
+#: templates/settings.php:70
 msgid "Configuration Active"
-msgstr ""
+msgstr "Configuração ativa"
 
-#: templates/settings.php:33
+#: templates/settings.php:70
 msgid "When unchecked, this configuration will be skipped."
-msgstr ""
+msgstr "Quando não marcada, esta configuração será ignorada."
 
-#: templates/settings.php:34
+#: templates/settings.php:71
 msgid "Port"
 msgstr "Porta"
 
-#: templates/settings.php:35
+#: templates/settings.php:72
 msgid "Backup (Replica) Host"
-msgstr ""
+msgstr "Servidor de Backup (Réplica)"
 
-#: templates/settings.php:35
+#: templates/settings.php:72
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
-msgstr ""
+msgstr "Defina um servidor de backup opcional. Ele deverá ser uma réplica do servidor LDAP/AD principal."
 
-#: templates/settings.php:36
+#: templates/settings.php:73
 msgid "Backup (Replica) Port"
-msgstr ""
+msgstr "Porta do Backup (Réplica)"
 
-#: templates/settings.php:37
+#: templates/settings.php:74
 msgid "Disable Main Server"
-msgstr ""
+msgstr "Desativar Servidor Principal"
 
-#: templates/settings.php:37
+#: templates/settings.php:74
 msgid "When switched on, ownCloud will only connect to the replica server."
-msgstr ""
+msgstr "Quando ativado, ownCloud somente se conectará ao servidor de réplica."
 
-#: templates/settings.php:38
+#: templates/settings.php:75
 msgid "Use TLS"
 msgstr "Usar TLS"
 
-#: templates/settings.php:38
+#: templates/settings.php:75
 msgid "Do not use it additionally for LDAPS connections, it will fail."
-msgstr ""
+msgstr "Não use adicionalmente para conexões LDAPS, pois falhará."
 
-#: templates/settings.php:39
+#: templates/settings.php:76
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Servidor LDAP sensível à caixa alta (Windows)"
 
-#: templates/settings.php:40
+#: templates/settings.php:77
 msgid "Turn off SSL certificate validation."
 msgstr "Desligar validação de certificado SSL."
 
-#: templates/settings.php:40
+#: templates/settings.php:77
 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:40
+#: templates/settings.php:77
 msgid "Not recommended, use for testing only."
 msgstr "Não recomendado, use somente para testes."
 
-#: templates/settings.php:41
+#: templates/settings.php:78
+msgid "Cache Time-To-Live"
+msgstr "Cache Time-To-Live"
+
+#: templates/settings.php:78
 msgid "in seconds. A change empties the cache."
 msgstr "em segundos. Uma mudança esvaziará o cache."
 
-#: templates/settings.php:43
+#: templates/settings.php:80
 msgid "Directory Settings"
-msgstr ""
+msgstr "Configurações de Diretório"
 
-#: templates/settings.php:45
+#: templates/settings.php:82
 msgid "User Display Name Field"
 msgstr "Campo Nome de Exibição de Usuário"
 
-#: templates/settings.php:45
+#: templates/settings.php:82
 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:46
+#: templates/settings.php:83
 msgid "Base User Tree"
 msgstr "Árvore de Usuário Base"
 
-#: templates/settings.php:46
+#: templates/settings.php:83
 msgid "One User Base DN per line"
-msgstr ""
+msgstr "Um usuário-base DN por linha"
 
-#: templates/settings.php:47
+#: templates/settings.php:84
 msgid "User Search Attributes"
-msgstr ""
+msgstr "Atributos de Busca de Usuário"
 
-#: templates/settings.php:47 templates/settings.php:50
+#: templates/settings.php:84 templates/settings.php:87
 msgid "Optional; one attribute per line"
-msgstr ""
+msgstr "Opcional; um atributo por linha"
 
-#: templates/settings.php:48
+#: templates/settings.php:85
 msgid "Group Display Name Field"
 msgstr "Campo Nome de Exibição de Grupo"
 
-#: templates/settings.php:48
+#: templates/settings.php:85
 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:49
+#: templates/settings.php:86
 msgid "Base Group Tree"
 msgstr "Árvore de Grupo Base"
 
-#: templates/settings.php:49
+#: templates/settings.php:86
 msgid "One Group Base DN per line"
-msgstr ""
+msgstr "Um grupo-base DN por linha"
 
-#: templates/settings.php:50
+#: templates/settings.php:87
 msgid "Group Search Attributes"
-msgstr ""
+msgstr "Atributos de Busca de Grupo"
 
-#: templates/settings.php:51
+#: templates/settings.php:88
 msgid "Group-Member association"
 msgstr "Associação Grupo-Membro"
 
-#: templates/settings.php:53
+#: templates/settings.php:90
 msgid "Special Attributes"
-msgstr ""
+msgstr "Atributos Especiais"
+
+#: templates/settings.php:92
+msgid "Quota Field"
+msgstr "Campo de Cota"
+
+#: templates/settings.php:93
+msgid "Quota Default"
+msgstr "Cota Padrão"
 
-#: templates/settings.php:56
+#: templates/settings.php:93
 msgid "in bytes"
 msgstr "em bytes"
 
-#: templates/settings.php:58
+#: templates/settings.php:94
+msgid "Email Field"
+msgstr "Campo de Email"
+
+#: templates/settings.php:95
+msgid "User Home Folder Naming Rule"
+msgstr "Regra para Nome da Pasta Pessoal do Usuário"
+
+#: templates/settings.php:95
 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:62
+#: templates/settings.php:99
+msgid "Test Configuration"
+msgstr "Teste de Configuração"
+
+#: templates/settings.php:99
 msgid "Help"
 msgstr "Ajuda"
diff --git a/l10n/pt_PT/core.po b/l10n/pt_PT/core.po
index 8e36e6786ef4e014f1c0afbb465c88b3f21c529e..3a972374e6dd8eff97b981182d3630238451de38 100644
--- a/l10n/pt_PT/core.po
+++ b/l10n/pt_PT/core.po
@@ -15,8 +15,8 @@ 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 14:32+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:20+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"
@@ -394,7 +394,7 @@ msgstr "A actualização falhou. Por favor reporte este incidente seguindo este
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "A actualização foi concluída com sucesso. Vai ser redireccionado para o ownCloud agora."
 
-#: lostpassword/controller.php:47
+#: lostpassword/controller.php:48
 msgid "ownCloud password reset"
 msgstr "Reposição da password ownCloud"
 
diff --git a/l10n/pt_PT/files.po b/l10n/pt_PT/files.po
index 1e85d6184d7069fbdd16958887aa199356c78881..55c2ec26ca9ca29752df7a0836a02815846fd928 100644
--- a/l10n/pt_PT/files.po
+++ b/l10n/pt_PT/files.po
@@ -15,9 +15,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: 2013-02-14 23:05+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "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"
@@ -58,27 +58,27 @@ msgid ""
 "the HTML form"
 msgstr "O ficheiro enviado excede o diretivo MAX_FILE_SIZE especificado no formulário HTML"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
 msgstr "O ficheiro enviado só foi enviado parcialmente"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:31
 msgid "No file was uploaded"
 msgstr "Não foi enviado nenhum ficheiro"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:32
 msgid "Missing a temporary folder"
 msgstr "Falta uma pasta temporária"
 
-#: ajax/upload.php:34
+#: ajax/upload.php:33
 msgid "Failed to write to disk"
 msgstr "Falhou a escrita no disco"
 
-#: ajax/upload.php:52
+#: ajax/upload.php:51
 msgid "Not enough storage available"
 msgstr "Não há espaço suficiente em disco"
 
-#: ajax/upload.php:83
+#: ajax/upload.php:82
 msgid "Invalid directory."
 msgstr "Directório Inválido"
 
@@ -90,7 +90,7 @@ msgstr "Ficheiros"
 msgid "Delete permanently"
 msgstr "Eliminar permanentemente"
 
-#: js/fileactions.js:127 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:127 templates/index.php:92 templates/index.php:93
 msgid "Delete"
 msgstr "Apagar"
 
@@ -98,40 +98,36 @@ msgstr "Apagar"
 msgid "Rename"
 msgstr "Renomear"
 
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
 msgid "Pending"
 msgstr "Pendente"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "{new_name} already exists"
 msgstr "O nome {new_name} já existe"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "replace"
 msgstr "substituir"
 
-#: js/filelist.js:253
+#: js/filelist.js:251
 msgid "suggest name"
 msgstr "sugira um nome"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "cancel"
 msgstr "cancelar"
 
-#: js/filelist.js:295
-msgid "replaced {new_name}"
-msgstr "{new_name} substituido"
+#: js/filelist.js:298
+msgid "replaced {new_name} with {old_name}"
+msgstr "substituido {new_name} por {old_name}"
 
-#: js/filelist.js:295 js/filelist.js:297
+#: js/filelist.js:298
 msgid "undo"
 msgstr "desfazer"
 
-#: js/filelist.js:297
-msgid "replaced {new_name} with {old_name}"
-msgstr "substituido {new_name} por {old_name}"
-
-#: js/filelist.js:322
+#: js/filelist.js:323
 msgid "perform delete operation"
 msgstr "Executar a tarefa de apagar"
 
@@ -157,74 +153,74 @@ 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:224
+#: js/files.js:225
 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:261
+#: js/files.js:262
 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:261
+#: js/files.js:262
 msgid "Upload Error"
 msgstr "Erro no envio"
 
-#: js/files.js:272
+#: js/files.js:273
 msgid "Close"
 msgstr "Fechar"
 
-#: js/files.js:311
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr "A enviar 1 ficheiro"
 
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr "A carregar {count} ficheiros"
 
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "Envio cancelado."
 
-#: js/files.js:496
+#: js/files.js:497
 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:569
+#: js/files.js:570
 msgid "URL cannot be empty."
 msgstr "O URL não pode estar vazio."
 
-#: js/files.js:574
+#: js/files.js:575
 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:948 templates/index.php:67
+#: js/files.js:953 templates/index.php:68
 msgid "Name"
 msgstr "Nome"
 
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:954 templates/index.php:79
 msgid "Size"
 msgstr "Tamanho"
 
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:955 templates/index.php:81
 msgid "Modified"
 msgstr "Modificado"
 
-#: js/files.js:969
+#: js/files.js:974
 msgid "1 folder"
 msgstr "1 pasta"
 
-#: js/files.js:971
+#: js/files.js:976
 msgid "{count} folders"
 msgstr "{count} pastas"
 
-#: js/files.js:979
+#: js/files.js:984
 msgid "1 file"
 msgstr "1 ficheiro"
 
-#: js/files.js:981
+#: js/files.js:986
 msgid "{count} files"
 msgstr "{count} ficheiros"
 
@@ -282,39 +278,43 @@ msgstr "Da ligação"
 
 #: templates/index.php:40
 msgid "Deleted files"
-msgstr ""
+msgstr "Ficheiros eliminados"
 
 #: templates/index.php:46
 msgid "Cancel upload"
 msgstr "Cancelar envio"
 
-#: templates/index.php:59
+#: templates/index.php:53
+msgid "You don’t have write permissions here."
+msgstr "Não tem permissões de escrita aqui."
+
+#: templates/index.php:60
 msgid "Nothing in here. Upload something!"
 msgstr "Vazio. Envie alguma coisa!"
 
-#: templates/index.php:73
+#: templates/index.php:74
 msgid "Download"
 msgstr "Transferir"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:86 templates/index.php:87
 msgid "Unshare"
 msgstr "Deixar de partilhar"
 
-#: templates/index.php:105
+#: templates/index.php:106
 msgid "Upload too large"
 msgstr "Envio muito grande"
 
-#: templates/index.php:107
+#: templates/index.php:108
 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."
 
-#: templates/index.php:112
+#: templates/index.php:113
 msgid "Files are being scanned, please wait."
 msgstr "Os ficheiros estão a ser analisados, por favor aguarde."
 
-#: templates/index.php:115
+#: templates/index.php:116
 msgid "Current scanning"
 msgstr "Análise actual"
 
diff --git a/l10n/pt_PT/files_external.po b/l10n/pt_PT/files_external.po
index 6319794b213f8e71373b425fe74cdd591bc47a13..6a1dd0910b8f4376184585b5d8d88816edeb3793 100644
--- a/l10n/pt_PT/files_external.po
+++ b/l10n/pt_PT/files_external.po
@@ -5,13 +5,14 @@
 # Translators:
 #   <daniel@mouxy.net>, 2012.
 # 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: 2012-12-18 00:13+0100\n"
-"PO-Revision-Date: 2012-12-17 01:29+0000\n"
-"Last-Translator: Mouxy <daniel@mouxy.net>\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"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,37 +20,33 @@ msgstr ""
 "Language: pt_PT\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 "Acesso autorizado"
 
-#: 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 "Erro ao configurar o armazenamento do Dropbox"
 
-#: 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 "Conceder acesso"
 
-#: js/dropbox.js:73 js/google.js:72
-msgid "Fill out all required fields"
-msgstr "Preencha todos os campos obrigatórios"
-
-#: js/dropbox.js:85
+#: js/dropbox.js:101
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr "Por favor forneça uma \"app key\" e \"secret\" do Dropbox válidas."
 
-#: 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 "Erro ao configurar o armazenamento do Google Drive"
 
-#: lib/config.php:434
+#: lib/config.php:421
 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> O cliente \"smbclient\" não está instalado. Não é possível montar as partilhas CIFS/SMB . Peça ao seu administrador para instalar."
+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:435
+#: lib/config.php:424
 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 "
@@ -60,63 +57,63 @@ msgstr "<b>Aviso:</b> O suporte FTP no PHP não está activate ou instalado. Nã
 msgid "External Storage"
 msgstr "Armazenamento Externo"
 
-#: templates/settings.php:8 templates/settings.php:22
-msgid "Mount point"
-msgstr "Ponto de montagem"
-
-#: templates/settings.php:9
-msgid "Backend"
-msgstr "Backend"
+#: templates/settings.php:9 templates/settings.php:28
+msgid "Folder name"
+msgstr "Nome da pasta"
 
 #: templates/settings.php:10
+msgid "External storage"
+msgstr "Armazenamento Externo"
+
+#: templates/settings.php:11
 msgid "Configuration"
 msgstr "Configuração"
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid "Options"
 msgstr "Opções"
 
-#: templates/settings.php:12
+#: templates/settings.php:13
 msgid "Applicable"
 msgstr "Aplicável"
 
-#: templates/settings.php:27
-msgid "Add mount point"
-msgstr "Adicionar ponto de montagem"
+#: templates/settings.php:33
+msgid "Add storage"
+msgstr "Adicionar armazenamento"
 
-#: templates/settings.php:85
+#: templates/settings.php:90
 msgid "None set"
-msgstr "Nenhum configurado"
+msgstr "Não definido"
 
-#: templates/settings.php:86
+#: templates/settings.php:91
 msgid "All Users"
 msgstr "Todos os utilizadores"
 
-#: templates/settings.php:87
+#: templates/settings.php:92
 msgid "Groups"
 msgstr "Grupos"
 
-#: templates/settings.php:95
+#: templates/settings.php:100
 msgid "Users"
 msgstr "Utilizadores"
 
-#: 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 "Apagar"
+msgstr "Eliminar"
 
-#: templates/settings.php:124
+#: templates/settings.php:129
 msgid "Enable User External Storage"
 msgstr "Activar Armazenamento Externo para o Utilizador"
 
-#: templates/settings.php:125
+#: templates/settings.php:130
 msgid "Allow users to mount their own external storage"
 msgstr "Permitir que os utilizadores montem o seu próprio armazenamento externo"
 
-#: templates/settings.php:139
+#: templates/settings.php:141
 msgid "SSL root certificates"
 msgstr "Certificados SSL de raiz"
 
-#: templates/settings.php:158
+#: templates/settings.php:159
 msgid "Import Root Certificate"
 msgstr "Importar Certificado Root"
diff --git a/l10n/pt_PT/files_trashbin.po b/l10n/pt_PT/files_trashbin.po
index 653dc5d23378c060b89da39f05e11ec752d987b6..abd247504d069915fb5f1086149eb8b574ba015c 100644
--- a/l10n/pt_PT/files_trashbin.po
+++ b/l10n/pt_PT/files_trashbin.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-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 10:07+0000\n"
-"Last-Translator: Mouxy <daniel@mouxy.net>\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: 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"
@@ -18,7 +18,7 @@ msgstr ""
 "Language: pt_PT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:22
+#: ajax/delete.php:40
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "Não foi possível eliminar %s de forma permanente"
@@ -28,35 +28,39 @@ msgstr "Não foi possível eliminar %s de forma permanente"
 msgid "Couldn't restore %s"
 msgstr "Não foi possível restaurar %s"
 
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
 msgid "perform restore operation"
 msgstr "Restaurar"
 
-#: js/trash.js:33
+#: js/trash.js:34
 msgid "delete file permanently"
 msgstr "Eliminar permanentemente o(s) ficheiro(s)"
 
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr "Eliminar permanentemente"
+
+#: js/trash.js:174 templates/index.php:17
 msgid "Name"
 msgstr "Nome"
 
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:175 templates/index.php:27
 msgid "Deleted"
 msgstr "Apagado"
 
-#: js/trash.js:135
+#: js/trash.js:184
 msgid "1 folder"
 msgstr "1 pasta"
 
-#: js/trash.js:137
+#: js/trash.js:186
 msgid "{count} folders"
 msgstr "{count} pastas"
 
-#: js/trash.js:145
+#: js/trash.js:194
 msgid "1 file"
 msgstr "1 ficheiro"
 
-#: js/trash.js:147
+#: js/trash.js:196
 msgid "{count} files"
 msgstr "{count} ficheiros"
 
@@ -67,3 +71,11 @@ msgstr "Não ha ficheiros. O lixo está vazio"
 #: templates/index.php:20 templates/index.php:22
 msgid "Restore"
 msgstr "Restaurar"
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr "Apagar"
+
+#: templates/part.breadcrumb.php:9
+msgid "Deleted Files"
+msgstr ""
diff --git a/l10n/pt_PT/files_versions.po b/l10n/pt_PT/files_versions.po
index 9e0c86ead326e0c955ba592cb8179b406c657f88..54018e45527e41bd0480898f883867d1cabf566b 100644
--- a/l10n/pt_PT/files_versions.po
+++ b/l10n/pt_PT/files_versions.po
@@ -5,13 +5,14 @@
 # Translators:
 # Daniel Pinto <daniel@mouxy.net>, 2013.
 # Duarte Velez Grilo <duartegrilo@gmail.com>, 2012.
+# Helder Meneses <helder.meneses@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-11 00:03+0100\n"
-"PO-Revision-Date: 2013-02-10 14:21+0000\n"
-"Last-Translator: Mouxy <daniel@mouxy.net>\n"
+"POT-Creation-Date: 2013-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"
 "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"
@@ -42,26 +43,18 @@ msgstr "Falha"
 msgid "File %s could not be reverted to version %s"
 msgstr "Não foi possível reverter o ficheiro %s para a versão %s"
 
-#: history.php:68
+#: history.php:69
 msgid "No old versions available"
 msgstr "Não existem versões mais antigas"
 
-#: history.php:73
+#: history.php:74
 msgid "No path specified"
 msgstr "Nenhum caminho especificado"
 
-#: js/versions.js:16
-msgid "History"
-msgstr "Histórico"
+#: js/versions.js:6
+msgid "Versions"
+msgstr "Versões"
 
 #: templates/history.php:20
 msgid "Revert a file to a previous version by clicking on its revert button"
 msgstr "Reverter um ficheiro para uma versão anterior clicando no seu botão reverter."
-
-#: templates/settings.php:3
-msgid "Files Versioning"
-msgstr "Versionamento de Ficheiros"
-
-#: templates/settings.php:4
-msgid "Enable"
-msgstr "Activar"
diff --git a/l10n/pt_PT/lib.po b/l10n/pt_PT/lib.po
index 5aad6742ac06fa3a40c5e5f84a8d733692b96b83..e251c49b92848feda8f99050afca7dadfe8996ee 100644
--- a/l10n/pt_PT/lib.po
+++ b/l10n/pt_PT/lib.po
@@ -6,13 +6,14 @@
 #   <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-02-15 00:05+0100\n"
-"PO-Revision-Date: 2013-02-14 23:06+0000\n"
-"Last-Translator: Mouxy <daniel@mouxy.net>\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"
 "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"
@@ -100,87 +101,92 @@ msgstr "Definiar uma password de administrador"
 msgid "Specify a data folder."
 msgstr "Especificar a pasta para os dados."
 
-#: setup.php:53
+#: setup.php:55
 #, php-format
 msgid "%s enter the database username."
 msgstr "%s introduza o nome de utilizador da base de dados"
 
-#: setup.php:56
+#: setup.php:58
 #, php-format
 msgid "%s enter the database name."
 msgstr "%s introduza o nome da base de dados"
 
-#: setup.php:59
+#: setup.php:61
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr "%s não é permitido utilizar pontos (.) no nome da base de dados"
 
-#: setup.php:62
+#: setup.php:64
 #, php-format
 msgid "%s set the database host."
 msgstr "%s defina o servidor da base de dados (geralmente localhost)"
 
-#: setup.php:126 setup.php:294 setup.php:339
+#: setup.php:128 setup.php:320 setup.php:365
 msgid "PostgreSQL username and/or password not valid"
-msgstr "Nome de utilizador/passwor do PostgreSQL inválido"
+msgstr "Nome de utilizador/password do PostgreSQL inválido"
 
-#: setup.php:127 setup.php:150 setup.php:204
+#: setup.php:129 setup.php:152 setup.php:229
 msgid "You need to enter either an existing account or the administrator."
 msgstr "Precisa de introduzir uma conta existente ou de administrador"
 
-#: setup.php:149 setup.php:427 setup.php:494
+#: setup.php:151 setup.php:453 setup.php:520
 msgid "Oracle username and/or password not valid"
-msgstr ""
+msgstr "Nome de utilizador/password do Oracle inválida"
 
-#: setup.php:203
+#: setup.php:228
 msgid "MySQL username and/or password not valid"
-msgstr ""
+msgstr "Nome de utilizador/password do MySQL inválida"
 
-#: setup.php:257 setup.php:360 setup.php:369 setup.php:387 setup.php:397
-#: setup.php:406 setup.php:435 setup.php:501 setup.php:527 setup.php:534
-#: setup.php:545 setup.php:552 setup.php:561 setup.php:569 setup.php:578
-#: setup.php:584
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
-msgstr ""
+msgstr "Erro na BD: \"%s\""
 
-#: setup.php:258 setup.php:361 setup.php:370 setup.php:388 setup.php:398
-#: setup.php:407 setup.php:436 setup.php:502 setup.php:528 setup.php:535
-#: setup.php:546 setup.php:562 setup.php:570 setup.php:579
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
-msgstr ""
+msgstr "O comando gerador de erro foi: \"%s\""
 
-#: setup.php:273
+#: setup.php:299
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
-msgstr ""
+msgstr "O utilizador '%s'@'localhost' do MySQL já existe."
 
-#: setup.php:274
+#: setup.php:300
 msgid "Drop this user from MySQL"
-msgstr ""
+msgstr "Eliminar este utilizador do MySQL"
 
-#: setup.php:279
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
-msgstr ""
+msgstr "O utilizador '%s'@'%%' do MySQL já existe"
 
-#: setup.php:280
+#: setup.php:306
 msgid "Drop this user from MySQL."
-msgstr ""
+msgstr "Eliminar este utilizador do MySQL"
 
-#: setup.php:553 setup.php:585
+#: setup.php:579 setup.php:611
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
-msgstr ""
+msgstr "O comando gerador de erro foi: \"%s\", nome: %s, password: %s"
+
+#: setup.php:631
+#, php-format
+msgid "MS SQL username and/or password not valid: %s"
+msgstr "Nome de utilizador/password do MySQL é inválido: %s"
 
-#: setup.php:649
+#: setup.php:849
 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:651
+#: setup.php:850
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Por favor verifique <a href='%s'>installation guides</a>."
diff --git a/l10n/pt_PT/settings.po b/l10n/pt_PT/settings.po
index e1dc13b05bda14bf1345aa09ac8702b3bb3fda97..84f9f0950299d2949b25277788bcff6ab8041199 100644
--- a/l10n/pt_PT/settings.po
+++ b/l10n/pt_PT/settings.po
@@ -8,16 +8,16 @@
 #  <duartegrilo@gmail.com>, 2013.
 # Duarte Velez Grilo <duartegrilo@gmail.com>, 2012-2013.
 #   <geral@ricardolameiro.pt>, 2012.
-# Helder Meneses <helder.meneses@gmail.com>, 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-02-15 00:05+0100\n"
-"PO-Revision-Date: 2013-02-14 23:03+0000\n"
-"Last-Translator: Mouxy <daniel@mouxy.net>\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"
 "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,8 +29,8 @@ 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:15
-#: ajax/togglegroups.php:18
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr "Erro de autenticação"
 
@@ -78,12 +78,12 @@ msgstr "Pedido inválido"
 msgid "Admins can't remove themself from the admin group"
 msgstr "Os administradores não se podem remover a eles mesmos do grupo admin."
 
-#: ajax/togglegroups.php:28
+#: ajax/togglegroups.php:30
 #, php-format
 msgid "Unable to add user to group %s"
 msgstr "Impossível acrescentar utilizador ao grupo %s"
 
-#: ajax/togglegroups.php:34
+#: ajax/togglegroups.php:36
 #, php-format
 msgid "Unable to remove user from group %s"
 msgstr "Impossível apagar utilizador do grupo %s"
@@ -124,7 +124,7 @@ msgstr "Erro"
 msgid "Updated"
 msgstr "Actualizado"
 
-#: js/personal.js:96
+#: js/personal.js:99
 msgid "Saving..."
 msgstr "A guardar..."
 
@@ -169,7 +169,7 @@ msgstr "Erro a criar utilizador"
 msgid "A valid password must be provided"
 msgstr "Uma password válida deve ser fornecida"
 
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -215,19 +215,19 @@ msgstr "O Módulo PHP 'fileinfo' não se encontra instalado/activado. É forteme
 msgid "Locale not working"
 msgstr "Internacionalização não está a funcionar"
 
-#: templates/admin.php:61
+#: templates/admin.php:63
+#, php-format
 msgid ""
-"This ownCloud server can't set system locale to "
-"\"en_US.UTF-8\"/\"en_US.UTF8\". 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 en_US.UTF-8/en_US.UTF8."
-msgstr "Este servidor de ownCloud não consegue definir a codificação de caracteres para \"en_US.UTF-8\"/\"en_US.UTF8\". Isto significa que pode haver problemas com alguns caracteres nos nomes de ficheiros. É fortemente recomendado que instale o pacote para ser possível ver caracteres codificados em en_US.UTF-8/en_US.UTF8."
+"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 de ownCloud não consegue definir a codificação de caracteres para %s. Isto significa que pode haver problemas com alguns caracteres nos nomes dos ficheiros. É fortemente recomendado que instale o pacote recomendado para ser possível ver caracteres codificados em %s."
 
-#: templates/admin.php:72
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr "A ligação à internet não está a funcionar"
 
-#: templates/admin.php:75
+#: 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 "
@@ -237,98 +237,98 @@ msgid ""
 " of ownCloud."
 msgstr "Este servidor ownCloud não tem uma ligação de internet funcional. Isto significa que algumas funcionalidades como o acesso a locais externos (dropbox, gdrive, etc), notificações sobre actualizções, ou a instalação de aplicações não irá funcionar. Sugerimos que active uma ligação à internet se pretende obter todas as funcionalidades do ownCloud."
 
-#: templates/admin.php:89
+#: templates/admin.php:92
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:98
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr "Executar uma tarefa com cada página carregada"
 
-#: templates/admin.php:108
+#: 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 está registado como um serviço webcron. Aceda a pagina cron.php que se encontra na raiz do ownCloud uma vez por minuto utilizando o seu browser."
 
-#: templates/admin.php:118
+#: 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 "Usar o serviço cron do sistema. Aceda a pagina cron.php que se encontra na raiz do ownCloud uma vez por minuto utilizando o seu browser."
 
-#: templates/admin.php:125
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr "Partilha"
 
-#: templates/admin.php:131
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr "Activar a API de partilha"
 
-#: templates/admin.php:132
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr "Permitir que os utilizadores usem a API de partilha"
 
-#: templates/admin.php:139
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr "Permitir links"
 
-#: templates/admin.php:140
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr "Permitir que os utilizadores partilhem itens com o público utilizando um link."
 
-#: templates/admin.php:147
+#: templates/admin.php:150
 msgid "Allow resharing"
 msgstr "Permitir repartilha"
 
-#: templates/admin.php:148
+#: templates/admin.php:151
 msgid "Allow users to share items shared with them again"
 msgstr "Permitir que os utilizadores partilhem itens partilhados com eles"
 
-#: templates/admin.php:155
+#: templates/admin.php:158
 msgid "Allow users to share with anyone"
 msgstr "Permitir que os utilizadores partilhem com todos"
 
-#: templates/admin.php:158
+#: templates/admin.php:161
 msgid "Allow users to only share with users in their groups"
 msgstr "Permitir que os utilizadores partilhem somente com utilizadores do seu grupo"
 
-#: templates/admin.php:165
+#: templates/admin.php:168
 msgid "Security"
 msgstr "Segurança"
 
-#: templates/admin.php:178
+#: templates/admin.php:181
 msgid "Enforce HTTPS"
 msgstr "Forçar HTTPS"
 
-#: templates/admin.php:179
+#: templates/admin.php:182
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr "Forçar clientes a ligar através de uma ligação encriptada"
 
-#: templates/admin.php:182
+#: templates/admin.php:185
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr "Por favor ligue-se ao ownCloud através de uma ligação HTTPS para ligar/desligar o forçar da ligação por SSL"
 
-#: templates/admin.php:192
+#: templates/admin.php:195
 msgid "Log"
 msgstr "Registo"
 
-#: templates/admin.php:193
+#: templates/admin.php:196
 msgid "Log level"
 msgstr "Nível do registo"
 
-#: templates/admin.php:220
+#: templates/admin.php:223
 msgid "More"
 msgstr "Mais"
 
-#: templates/admin.php:227 templates/personal.php:98
+#: templates/admin.php:230 templates/personal.php:102
 msgid "Version"
 msgstr "Versão"
 
-#: templates/admin.php:230 templates/personal.php:100
+#: templates/admin.php:233 templates/personal.php:105
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -338,51 +338,51 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "Desenvolvido pela <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidade ownCloud</a>, o<a href=\"https://github.com/owncloud\" target=\"_blank\">código fonte</a> está licenciado sob a <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
-#: templates/apps.php:10
+#: templates/apps.php:11
 msgid "Add your App"
 msgstr "Adicione a sua aplicação"
 
-#: templates/apps.php:11
+#: templates/apps.php:12
 msgid "More Apps"
 msgstr "Mais Aplicações"
 
-#: templates/apps.php:24
+#: templates/apps.php:28
 msgid "Select an App"
 msgstr "Selecione uma aplicação"
 
-#: templates/apps.php:28
+#: templates/apps.php:34
 msgid "See application page at apps.owncloud.com"
 msgstr "Ver a página da aplicação em apps.owncloud.com"
 
-#: templates/apps.php:29
+#: templates/apps.php:36
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-licenciado por <span class=\"author\"></span>"
 
-#: templates/apps.php:31
+#: templates/apps.php:38
 msgid "Update"
 msgstr "Actualizar"
 
-#: templates/help.php:3
+#: templates/help.php:4
 msgid "User Documentation"
 msgstr "Documentação de Utilizador"
 
-#: templates/help.php:4
+#: templates/help.php:6
 msgid "Administrator Documentation"
 msgstr "Documentação de administrador."
 
-#: templates/help.php:6
+#: templates/help.php:9
 msgid "Online Documentation"
 msgstr "Documentação Online"
 
-#: templates/help.php:7
+#: templates/help.php:11
 msgid "Forum"
 msgstr "Fórum"
 
-#: templates/help.php:9
+#: templates/help.php:14
 msgid "Bugtracker"
 msgstr "Bugtracker"
 
-#: templates/help.php:11
+#: templates/help.php:17
 msgid "Commercial Support"
 msgstr "Suporte Comercial"
 
@@ -391,79 +391,79 @@ msgstr "Suporte Comercial"
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Usou <strong>%s</strong> do disponivel <strong>%s</strong>"
 
-#: templates/personal.php:14
+#: templates/personal.php:15
 msgid "Get the apps to sync your files"
 msgstr "Obtenha as aplicações para sincronizar os seus ficheiros"
 
-#: templates/personal.php:25
+#: templates/personal.php:26
 msgid "Show First Run Wizard again"
 msgstr "Mostrar novamente Wizard de Arranque Inicial"
 
-#: templates/personal.php:36 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
 msgid "Password"
 msgstr "Palavra-chave"
 
-#: templates/personal.php:37
+#: templates/personal.php:38
 msgid "Your password was changed"
 msgstr "A sua palavra-passe foi alterada"
 
-#: templates/personal.php:38
+#: templates/personal.php:39
 msgid "Unable to change your password"
 msgstr "Não foi possivel alterar a sua palavra-chave"
 
-#: templates/personal.php:39
+#: templates/personal.php:40
 msgid "Current password"
 msgstr "Palavra-chave actual"
 
-#: templates/personal.php:40
+#: templates/personal.php:42
 msgid "New password"
 msgstr "Nova palavra-chave"
 
-#: templates/personal.php:42
+#: templates/personal.php:44
 msgid "Change password"
 msgstr "Alterar palavra-chave"
 
-#: templates/personal.php:54 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:78
 msgid "Display Name"
 msgstr "Nome público"
 
-#: templates/personal.php:55
+#: templates/personal.php:57
 msgid "Your display name was changed"
 msgstr "O seu nome foi alterado"
 
-#: templates/personal.php:56
+#: templates/personal.php:58
 msgid "Unable to change your display name"
 msgstr "Não foi possível alterar o seu nome"
 
-#: templates/personal.php:59
+#: templates/personal.php:61
 msgid "Change display name"
 msgstr "Alterar nome"
 
-#: templates/personal.php:68
+#: templates/personal.php:70
 msgid "Email"
 msgstr "endereço de email"
 
-#: templates/personal.php:69
+#: templates/personal.php:72
 msgid "Your email address"
 msgstr "O seu endereço de email"
 
-#: templates/personal.php:70
+#: templates/personal.php:73
 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:76 templates/personal.php:77
+#: templates/personal.php:79 templates/personal.php:80
 msgid "Language"
 msgstr "Idioma"
 
-#: templates/personal.php:82
+#: templates/personal.php:86
 msgid "Help translate"
 msgstr "Ajude a traduzir"
 
-#: templates/personal.php:87
+#: templates/personal.php:91
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:89
+#: templates/personal.php:93
 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"
 
diff --git a/l10n/pt_PT/user_ldap.po b/l10n/pt_PT/user_ldap.po
index 3a798d9e6a02099c1136fc68325c31677b34479b..594e6693abe1fce7faa9ada99a9bfcc0efd88e69 100644
--- a/l10n/pt_PT/user_ldap.po
+++ b/l10n/pt_PT/user_ldap.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-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-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"
 "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"
@@ -26,17 +26,17 @@ msgstr ""
 msgid "Failed to delete the server configuration"
 msgstr "Erro ao eliminar as configurações do servidor"
 
-#: ajax/testConfiguration.php:35
+#: ajax/testConfiguration.php:36
 msgid "The configuration is valid and the connection could be established!"
 msgstr "A configuração está correcta e foi possível estabelecer a ligação!"
 
-#: ajax/testConfiguration.php:37
+#: ajax/testConfiguration.php:39
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
 msgstr "A configuração está correcta, mas não foi possível estabelecer o \"laço\", por favor, verifique as configurações do servidor e as credenciais."
 
-#: ajax/testConfiguration.php:40
+#: ajax/testConfiguration.php:43
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
@@ -91,224 +91,248 @@ msgstr "<b>Aviso:</b> O módulo PHP LDAP não está instalado, logo não irá fu
 msgid "Server configuration"
 msgstr "Configurações do servidor"
 
-#: templates/settings.php:17
+#: templates/settings.php:18
 msgid "Add Server Configuration"
 msgstr "Adicionar configurações do servidor"
 
-#: templates/settings.php:21
+#: templates/settings.php:23
 msgid "Host"
 msgstr "Anfitrião"
 
-#: templates/settings.php:21
+#: templates/settings.php:25
 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:22
+#: templates/settings.php:26
 msgid "Base DN"
 msgstr "DN base"
 
-#: templates/settings.php:22
+#: templates/settings.php:27
 msgid "One Base DN per line"
 msgstr "Uma base DN por linho"
 
-#: templates/settings.php:22
+#: templates/settings.php:28
 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:23
+#: templates/settings.php:30
 msgid "User DN"
 msgstr "DN do utilizador"
 
-#: templates/settings.php:23
+#: templates/settings.php:32
 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:24
+#: templates/settings.php:33
 msgid "Password"
 msgstr "Palavra-passe"
 
-#: templates/settings.php:24
+#: templates/settings.php:36
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "Para acesso anónimo, deixe DN e a Palavra-passe vazios."
 
-#: templates/settings.php:25
+#: templates/settings.php:37
 msgid "User Login Filter"
 msgstr "Filtro de login de utilizador"
 
-#: templates/settings.php:25
+#: templates/settings.php:40
 #, 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:25
+#: templates/settings.php:41
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "Use a variável %%uid , exemplo: \"uid=%%uid\""
 
-#: templates/settings.php:26
+#: templates/settings.php:42
 msgid "User List Filter"
 msgstr "Utilizar filtro"
 
-#: templates/settings.php:26
+#: templates/settings.php:45
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Defina o filtro a aplicar, ao recuperar utilizadores."
 
-#: templates/settings.php:26
+#: templates/settings.php:46
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "Sem variável. Exemplo: \"objectClass=pessoa\"."
 
-#: templates/settings.php:27
+#: templates/settings.php:47
 msgid "Group Filter"
 msgstr "Filtrar por grupo"
 
-#: templates/settings.php:27
+#: templates/settings.php:50
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Defina o filtro a aplicar, ao recuperar grupos."
 
-#: templates/settings.php:27
+#: templates/settings.php:51
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "Sem nenhuma variável. Exemplo: \"objectClass=posixGroup\"."
 
-#: templates/settings.php:31
+#: templates/settings.php:55
 msgid "Connection Settings"
 msgstr "Definições de ligação"
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "Configuration Active"
 msgstr "Configuração activa"
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 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:34
+#: templates/settings.php:58
 msgid "Port"
 msgstr "Porto"
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid "Backup (Replica) Host"
 msgstr "Servidor de Backup (Réplica)"
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 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:36
+#: templates/settings.php:60
 msgid "Backup (Replica) Port"
 msgstr "Porta do servidor de backup (Replica)"
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "Disable Main Server"
 msgstr "Desactivar servidor principal"
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 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:38
+#: templates/settings.php:62
 msgid "Use TLS"
 msgstr "Usar TLS"
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 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:39
+#: templates/settings.php:63
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Servidor LDAP (Windows) não sensível a maiúsculas."
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid "Turn off SSL certificate validation."
 msgstr "Desligar a validação de certificado SSL."
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 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:40
+#: templates/settings.php:64
 msgid "Not recommended, use for testing only."
 msgstr "Não recomendado, utilizado apenas para testes!"
 
-#: templates/settings.php:41
+#: templates/settings.php:65
+msgid "Cache Time-To-Live"
+msgstr "Cache do tempo de vida dos objetos no servidor"
+
+#: templates/settings.php:65
 msgid "in seconds. A change empties the cache."
 msgstr "em segundos. Uma alteração esvazia a cache."
 
-#: templates/settings.php:43
+#: templates/settings.php:67
 msgid "Directory Settings"
 msgstr "Definições de directorias"
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "User Display Name Field"
 msgstr "Mostrador do nome de utilizador."
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 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:46
+#: templates/settings.php:70
 msgid "Base User Tree"
 msgstr "Base da árvore de utilizadores."
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "One User Base DN per line"
 msgstr "Uma base de utilizador DN por linha"
 
-#: templates/settings.php:47
+#: templates/settings.php:71
 msgid "User Search Attributes"
 msgstr "Utilizar atributos de pesquisa"
 
-#: templates/settings.php:47 templates/settings.php:50
+#: templates/settings.php:71 templates/settings.php:74
 msgid "Optional; one attribute per line"
 msgstr "Opcional; Um atributo por linha"
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "Group Display Name Field"
 msgstr "Mostrador do nome do grupo."
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 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:49
+#: templates/settings.php:73
 msgid "Base Group Tree"
 msgstr "Base da árvore de grupos."
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "One Group Base DN per line"
 msgstr "Uma base de grupo DN por linha"
 
-#: templates/settings.php:50
+#: templates/settings.php:74
 msgid "Group Search Attributes"
 msgstr "Atributos de pesquisa de grupo"
 
-#: templates/settings.php:51
+#: templates/settings.php:75
 msgid "Group-Member association"
 msgstr "Associar utilizador ao grupo."
 
-#: templates/settings.php:53
+#: templates/settings.php:77
 msgid "Special Attributes"
 msgstr "Atributos especiais"
 
-#: templates/settings.php:56
+#: templates/settings.php:79
+msgid "Quota Field"
+msgstr "Quota"
+
+#: templates/settings.php:80
+msgid "Quota Default"
+msgstr "Quota padrão"
+
+#: templates/settings.php:80
 msgid "in bytes"
 msgstr "em bytes"
 
-#: templates/settings.php:58
+#: templates/settings.php:81
+msgid "Email Field"
+msgstr "Campo de email"
+
+#: templates/settings.php:82
+msgid "User Home Folder Naming Rule"
+msgstr "Regra da pasta inicial do utilizador"
+
+#: templates/settings.php:82
 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:62
+#: templates/settings.php:86
+msgid "Test Configuration"
+msgstr "Testar a configuração"
+
+#: templates/settings.php:86
 msgid "Help"
 msgstr "Ajuda"
diff --git a/l10n/ro/core.po b/l10n/ro/core.po
index a9fbdcdf8b2f487748859cac8ef073fc24a937b2..6a1ff327f340907505e5572b2062343bde1d91c4 100644
--- a/l10n/ro/core.po
+++ b/l10n/ro/core.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 14:32+0000\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"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -392,7 +392,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 "Resetarea parolei ownCloud "
 
diff --git a/l10n/ro/files.po b/l10n/ro/files.po
index 828e14ff110ab5aa78592869f35489bca28d3af9..e7f7597e8e0283fea12ed29db78978dd0f4ddbe0 100644
--- a/l10n/ro/files.po
+++ b/l10n/ro/files.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\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: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -56,27 +56,27 @@ msgid ""
 "the HTML form"
 msgstr "Fișierul are o dimensiune mai mare decât variabile MAX_FILE_SIZE specificată în formularul HTML"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
 msgstr "Fișierul a fost încărcat doar parțial"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:31
 msgid "No file was uploaded"
 msgstr "Niciun fișier încărcat"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:32
 msgid "Missing a temporary folder"
 msgstr "Lipsește un dosar temporar"
 
-#: ajax/upload.php:34
+#: ajax/upload.php:33
 msgid "Failed to write to disk"
 msgstr "Eroare la scriere pe disc"
 
-#: ajax/upload.php:52
+#: ajax/upload.php:51
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:83
+#: ajax/upload.php:82
 msgid "Invalid directory."
 msgstr "Director invalid."
 
@@ -88,7 +88,7 @@ msgstr "Fișiere"
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:127 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:127 templates/index.php:92 templates/index.php:93
 msgid "Delete"
 msgstr "Șterge"
 
@@ -96,40 +96,36 @@ msgstr "Șterge"
 msgid "Rename"
 msgstr "Redenumire"
 
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
 msgid "Pending"
 msgstr "În așteptare"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "{new_name} already exists"
 msgstr "{new_name} deja exista"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "replace"
 msgstr "înlocuire"
 
-#: js/filelist.js:253
+#: js/filelist.js:251
 msgid "suggest name"
 msgstr "sugerează nume"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "cancel"
 msgstr "anulare"
 
-#: js/filelist.js:295
-msgid "replaced {new_name}"
-msgstr "inlocuit {new_name}"
+#: js/filelist.js:298
+msgid "replaced {new_name} with {old_name}"
+msgstr "{new_name} inlocuit cu {old_name}"
 
-#: js/filelist.js:295 js/filelist.js:297
+#: js/filelist.js:298
 msgid "undo"
 msgstr "Anulează ultima acțiune"
 
-#: js/filelist.js:297
-msgid "replaced {new_name} with {old_name}"
-msgstr "{new_name} inlocuit cu {old_name}"
-
-#: js/filelist.js:322
+#: js/filelist.js:323
 msgid "perform delete operation"
 msgstr ""
 
@@ -155,74 +151,74 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:224
+#: js/files.js:225
 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:261
+#: js/files.js:262
 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:261
+#: js/files.js:262
 msgid "Upload Error"
 msgstr "Eroare la încărcare"
 
-#: js/files.js:272
+#: js/files.js:273
 msgid "Close"
 msgstr "Închide"
 
-#: js/files.js:311
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr "un fișier se încarcă"
 
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr "{count} fisiere incarcate"
 
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "Încărcare anulată."
 
-#: js/files.js:496
+#: js/files.js:497
 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:569
+#: js/files.js:570
 msgid "URL cannot be empty."
 msgstr "Adresa URL nu poate fi goală."
 
-#: js/files.js:574
+#: js/files.js:575
 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:948 templates/index.php:67
+#: js/files.js:953 templates/index.php:68
 msgid "Name"
 msgstr "Nume"
 
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:954 templates/index.php:79
 msgid "Size"
 msgstr "Dimensiune"
 
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:955 templates/index.php:81
 msgid "Modified"
 msgstr "Modificat"
 
-#: js/files.js:969
+#: js/files.js:974
 msgid "1 folder"
 msgstr "1 folder"
 
-#: js/files.js:971
+#: js/files.js:976
 msgid "{count} folders"
 msgstr "{count} foldare"
 
-#: js/files.js:979
+#: js/files.js:984
 msgid "1 file"
 msgstr "1 fisier"
 
-#: js/files.js:981
+#: js/files.js:986
 msgid "{count} files"
 msgstr "{count} fisiere"
 
@@ -286,33 +282,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr "Anulează încărcarea"
 
-#: templates/index.php:59
+#: templates/index.php:53
+msgid "You don’t have write permissions here."
+msgstr ""
+
+#: templates/index.php:60
 msgid "Nothing in here. Upload something!"
 msgstr "Nimic aici. Încarcă ceva!"
 
-#: templates/index.php:73
+#: templates/index.php:74
 msgid "Download"
 msgstr "Descarcă"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:86 templates/index.php:87
 msgid "Unshare"
 msgstr "Anulează partajarea"
 
-#: templates/index.php:105
+#: templates/index.php:106
 msgid "Upload too large"
 msgstr "Fișierul încărcat este prea mare"
 
-#: templates/index.php:107
+#: templates/index.php:108
 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:112
+#: templates/index.php:113
 msgid "Files are being scanned, please wait."
 msgstr "Fișierele sunt scanate, te rog așteptă."
 
-#: templates/index.php:115
+#: templates/index.php:116
 msgid "Current scanning"
 msgstr "În curs de scanare"
 
diff --git a/l10n/ro/files_external.po b/l10n/ro/files_external.po
index fd43a0fd65b407d2b749575a960e1fdc80be7fe3..c97be8f9cc989ba91e182bb549fd8581f38a2f3e 100644
--- a/l10n/ro/files_external.po
+++ b/l10n/ro/files_external.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-25 23:25+0000\n"
-"Last-Translator: Dimon Pockemon <>\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"
 "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"
@@ -19,37 +19,33 @@ msgstr ""
 "Language: ro\n"
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2: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 "Acces permis"
 
-#: 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 "Eroare la configurarea mediului de stocare Dropbox"
 
-#: 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 "Permite accesul"
 
-#: js/dropbox.js:73 js/google.js:72
-msgid "Fill out all required fields"
-msgstr "Completează toate câmpurile necesare"
-
-#: js/dropbox.js:85
+#: js/dropbox.js:101
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr "Prezintă te rog o cheie de Dropbox validă și parola"
 
-#: 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 "Eroare la configurarea mediului de stocare Google Drive"
 
-#: lib/config.php:434
+#: lib/config.php:421
 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:435
+#: lib/config.php:424
 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 "
@@ -60,63 +56,63 @@ msgstr "<b>Atenție:</b> suportul pentru FTP în PHP nu este activat sau instala
 msgid "External Storage"
 msgstr "Stocare externă"
 
-#: templates/settings.php:8 templates/settings.php:22
-msgid "Mount point"
-msgstr "Punctul de montare"
-
-#: templates/settings.php:9
-msgid "Backend"
-msgstr "Backend"
+#: templates/settings.php:9 templates/settings.php:28
+msgid "Folder name"
+msgstr "Denumire director"
 
 #: templates/settings.php:10
+msgid "External storage"
+msgstr ""
+
+#: templates/settings.php:11
 msgid "Configuration"
 msgstr "Configurație"
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid "Options"
 msgstr "Opțiuni"
 
-#: templates/settings.php:12
+#: templates/settings.php:13
 msgid "Applicable"
 msgstr "Aplicabil"
 
-#: templates/settings.php:27
-msgid "Add mount point"
-msgstr "Adaugă punct de montare"
+#: templates/settings.php:33
+msgid "Add storage"
+msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:90
 msgid "None set"
 msgstr "Niciunul"
 
-#: templates/settings.php:86
+#: templates/settings.php:91
 msgid "All Users"
 msgstr "Toți utilizatorii"
 
-#: templates/settings.php:87
+#: templates/settings.php:92
 msgid "Groups"
 msgstr "Grupuri"
 
-#: templates/settings.php:95
+#: templates/settings.php:100
 msgid "Users"
 msgstr "Utilizatori"
 
-#: templates/settings.php:108 templates/settings.php:109
-#: templates/settings.php:144 templates/settings.php:145
+#: templates/settings.php:113 templates/settings.php:114
+#: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
 msgstr "Șterge"
 
-#: templates/settings.php:124
+#: templates/settings.php:129
 msgid "Enable User External Storage"
 msgstr "Permite stocare externă pentru utilizatori"
 
-#: templates/settings.php:125
+#: templates/settings.php:130
 msgid "Allow users to mount their own external storage"
 msgstr "Permite utilizatorilor să monteze stocare externă proprie"
 
-#: templates/settings.php:136
+#: templates/settings.php:141
 msgid "SSL root certificates"
 msgstr "Certificate SSL root"
 
-#: templates/settings.php:153
+#: templates/settings.php:159
 msgid "Import Root Certificate"
 msgstr "Importă certificat root"
diff --git a/l10n/ro/files_trashbin.po b/l10n/ro/files_trashbin.po
index 441c56d5980016af5d350be8364d26e57d3c24c2..facd2efe40d35614fa981e099d5e4a94f5a5990a 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-02-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 10:07+0000\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: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@ 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:22
+#: ajax/delete.php:40
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
@@ -27,35 +27,39 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:33
+#: js/trash.js:34
 msgid "delete file permanently"
 msgstr ""
 
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr ""
+
+#: js/trash.js:174 templates/index.php:17
 msgid "Name"
 msgstr "Nume"
 
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:175 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:135
+#: js/trash.js:184
 msgid "1 folder"
 msgstr "1 folder"
 
-#: js/trash.js:137
+#: js/trash.js:186
 msgid "{count} folders"
 msgstr "{count} foldare"
 
-#: js/trash.js:145
+#: js/trash.js:194
 msgid "1 file"
 msgstr "1 fisier"
 
-#: js/trash.js:147
+#: js/trash.js:196
 msgid "{count} files"
 msgstr "{count} fisiere"
 
@@ -66,3 +70,11 @@ msgstr ""
 #: templates/index.php:20 templates/index.php:22
 msgid "Restore"
 msgstr ""
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr "Șterge"
+
+#: templates/part.breadcrumb.php:9
+msgid "Deleted Files"
+msgstr ""
diff --git a/l10n/ro/files_versions.po b/l10n/ro/files_versions.po
index 46715013ca3bb3baf2d827a2f51c50b636931fbc..9a6c076a43c2a0fd01a130172ac28119dac0ccec 100644
--- a/l10n/ro/files_versions.po
+++ b/l10n/ro/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-08 00:10+0100\n"
-"PO-Revision-Date: 2013-02-07 23:11+0000\n"
+"POT-Creation-Date: 2013-02-28 00:04+0100\n"
+"PO-Revision-Date: 2013-02-27 23:04+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -49,18 +49,10 @@ msgstr ""
 msgid "No path specified"
 msgstr ""
 
-#: js/versions.js:16
-msgid "History"
-msgstr "Istoric"
+#: 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 ""
-
-#: templates/settings.php:3
-msgid "Files Versioning"
-msgstr "Versionare fișiere"
-
-#: templates/settings.php:4
-msgid "Enable"
-msgstr "Activare"
diff --git a/l10n/ro/lib.po b/l10n/ro/lib.po
index 4380e638e1b9cfe13bb7e089aa1ac4a02eb4bf49..e8cff99f648ab901854c8e1988f9929a5241d296 100644
--- a/l10n/ro/lib.po
+++ b/l10n/ro/lib.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-11 15:39+0100\n"
-"PO-Revision-Date: 2013-02-11 14:40+0000\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: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -20,27 +20,27 @@ msgstr ""
 "Language: ro\n"
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
 
-#: app.php:339
+#: app.php:349
 msgid "Help"
 msgstr "Ajutor"
 
-#: app.php:346
+#: app.php:362
 msgid "Personal"
 msgstr "Personal"
 
-#: app.php:351
+#: app.php:373
 msgid "Settings"
 msgstr "Setări"
 
-#: app.php:356
+#: app.php:385
 msgid "Users"
 msgstr "Utilizatori"
 
-#: app.php:363
+#: app.php:398
 msgid "Apps"
 msgstr "Aplicații"
 
-#: app.php:365
+#: app.php:406
 msgid "Admin"
 msgstr "Admin"
 
@@ -52,15 +52,15 @@ msgstr "Descărcarea ZIP este dezactivată."
 msgid "Files need to be downloaded one by one."
 msgstr "Fișierele trebuie descărcate unul câte unul."
 
-#: files.php:203 files.php:228
+#: files.php:204 files.php:231
 msgid "Back to Files"
 msgstr "Înapoi la fișiere"
 
-#: files.php:227
+#: files.php:228
 msgid "Selected files too large to generate zip file."
 msgstr "Fișierele selectate sunt prea mari pentru a genera un fișier zip."
 
-#: helper.php:226
+#: helper.php:228
 msgid "couldn't be determined"
 msgstr "nu poate fi determinat"
 
@@ -100,87 +100,92 @@ msgstr ""
 msgid "Specify a data folder."
 msgstr ""
 
-#: setup.php:53
+#: setup.php:55
 #, php-format
 msgid "%s enter the database username."
 msgstr ""
 
-#: setup.php:56
+#: setup.php:58
 #, php-format
 msgid "%s enter the database name."
 msgstr ""
 
-#: setup.php:59
+#: setup.php:61
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr ""
 
-#: setup.php:62
+#: setup.php:64
 #, php-format
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:126 setup.php:291 setup.php:336
+#: setup.php:128 setup.php:320 setup.php:365
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:127 setup.php:150 setup.php:204
+#: setup.php:129 setup.php:152 setup.php:229
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:149 setup.php:423 setup.php:489
+#: setup.php:151 setup.php:453 setup.php:520
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:203
+#: setup.php:228
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:255 setup.php:357 setup.php:366 setup.php:384 setup.php:394
-#: setup.php:403 setup.php:430 setup.php:496 setup.php:522 setup.php:529
-#: setup.php:540 setup.php:547 setup.php:556 setup.php:564 setup.php:573
-#: setup.php:579
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:256 setup.php:358 setup.php:367 setup.php:385 setup.php:395
-#: setup.php:404 setup.php:431 setup.php:497 setup.php:523 setup.php:530
-#: setup.php:541 setup.php:557 setup.php:565 setup.php:574
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:270
+#: setup.php:299
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:271
+#: setup.php:300
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:276
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:277
+#: setup.php:306
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:548 setup.php:580
+#: setup.php:579 setup.php:611
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:644
+#: setup.php:631
+#, php-format
+msgid "MS SQL username and/or password not valid: %s"
+msgstr ""
+
+#: setup.php:849
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:645
+#: setup.php:850
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
@@ -237,16 +242,16 @@ msgstr "ultimul an"
 msgid "years ago"
 msgstr "ani în urmă"
 
-#: updater.php:75
+#: 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:77
+#: updater.php:81
 msgid "up to date"
 msgstr "la zi"
 
-#: updater.php:80
+#: updater.php:84
 msgid "updates check is disabled"
 msgstr "verificarea după actualizări este dezactivată"
 
diff --git a/l10n/ro/settings.po b/l10n/ro/settings.po
index af1b84945b605778f5648416f09fabad48e2d922..ac2965b4d758e9486f6c4c3d23bb6c076b5d58c1 100644
--- a/l10n/ro/settings.po
+++ b/l10n/ro/settings.po
@@ -14,8 +14,8 @@ 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:05+0000\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: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -28,8 +28,8 @@ 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:15
-#: ajax/togglegroups.php:18
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr "Eroare de autentificare"
 
@@ -77,12 +77,12 @@ msgstr "Cerere eronată"
 msgid "Admins can't remove themself from the admin group"
 msgstr "Administratorii nu se pot șterge singuri din grupul admin"
 
-#: ajax/togglegroups.php:28
+#: ajax/togglegroups.php:30
 #, php-format
 msgid "Unable to add user to group %s"
 msgstr "Nu s-a putut adăuga utilizatorul la grupul %s"
 
-#: ajax/togglegroups.php:34
+#: ajax/togglegroups.php:36
 #, php-format
 msgid "Unable to remove user from group %s"
 msgstr "Nu s-a putut elimina utilizatorul din grupul %s"
@@ -123,7 +123,7 @@ msgstr "Eroare"
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:96
+#: js/personal.js:99
 msgid "Saving..."
 msgstr "Salvez..."
 
@@ -152,23 +152,23 @@ msgstr "Grupul Admin "
 msgid "Delete"
 msgstr "Șterge"
 
-#: js/users.js:190
+#: js/users.js:191
 msgid "add group"
 msgstr ""
 
-#: js/users.js:351
+#: js/users.js:352
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:357
+#: js/users.js:358
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
 msgid "__language_name__"
 msgstr "_language_name_"
 
@@ -214,19 +214,19 @@ msgstr ""
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:61
+#: templates/admin.php:63
+#, php-format
 msgid ""
-"This ownCloud server can't set system locale to "
-"\"en_US.UTF-8\"/\"en_US.UTF8\". 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 en_US.UTF-8/en_US.UTF8."
+"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:72
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:75
+#: 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 "
@@ -236,98 +236,98 @@ msgid ""
 " of ownCloud."
 msgstr ""
 
-#: templates/admin.php:89
+#: templates/admin.php:92
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:98
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:108
+#: 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:118
+#: 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:125
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:131
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:132
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:140
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:147
+#: templates/admin.php:150
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:148
+#: templates/admin.php:151
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:155
+#: templates/admin.php:158
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:161
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:165
+#: templates/admin.php:168
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:181
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:179
+#: templates/admin.php:182
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:182
+#: templates/admin.php:185
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr ""
 
-#: templates/admin.php:192
+#: templates/admin.php:195
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:193
+#: templates/admin.php:196
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:220
+#: templates/admin.php:223
 msgid "More"
 msgstr "Mai mult"
 
-#: templates/admin.php:227 templates/personal.php:98
+#: templates/admin.php:230 templates/personal.php:102
 msgid "Version"
 msgstr "Versiunea"
 
-#: templates/admin.php:230 templates/personal.php:100
+#: templates/admin.php:233 templates/personal.php:105
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -337,51 +337,51 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "Dezvoltat de the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunitatea ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">codul sursă</a> este licențiat sub <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
-#: templates/apps.php:10
+#: templates/apps.php:11
 msgid "Add your App"
 msgstr "Adaugă aplicația ta"
 
-#: templates/apps.php:11
+#: templates/apps.php:12
 msgid "More Apps"
 msgstr "Mai multe aplicații"
 
-#: templates/apps.php:24
+#: templates/apps.php:28
 msgid "Select an App"
 msgstr "Selectează o aplicație"
 
-#: templates/apps.php:28
+#: templates/apps.php:34
 msgid "See application page at apps.owncloud.com"
 msgstr "Vizualizează pagina applicației pe apps.owncloud.com"
 
-#: templates/apps.php:29
+#: templates/apps.php:36
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-licențiat <span class=\"author\"></span>"
 
-#: templates/apps.php:31
+#: templates/apps.php:38
 msgid "Update"
 msgstr "Actualizare"
 
-#: templates/help.php:3
+#: templates/help.php:4
 msgid "User Documentation"
 msgstr "Documentație utilizator"
 
-#: templates/help.php:4
+#: templates/help.php:6
 msgid "Administrator Documentation"
 msgstr "Documentație administrator"
 
-#: templates/help.php:6
+#: templates/help.php:9
 msgid "Online Documentation"
 msgstr "Documentație online"
 
-#: templates/help.php:7
+#: templates/help.php:11
 msgid "Forum"
 msgstr "Forum"
 
-#: templates/help.php:9
+#: templates/help.php:14
 msgid "Bugtracker"
 msgstr "Urmărire bug-uri"
 
-#: templates/help.php:11
+#: templates/help.php:17
 msgid "Commercial Support"
 msgstr "Suport comercial"
 
@@ -390,79 +390,79 @@ msgstr "Suport comercial"
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Ați utilizat <strong>%s</strong> din <strong>%s</strong> disponibile"
 
-#: templates/personal.php:14
+#: templates/personal.php:15
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:25
+#: templates/personal.php:26
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:36 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
 msgid "Password"
 msgstr "Parolă"
 
-#: templates/personal.php:37
+#: templates/personal.php:38
 msgid "Your password was changed"
 msgstr "Parola a fost modificată"
 
-#: templates/personal.php:38
+#: templates/personal.php:39
 msgid "Unable to change your password"
 msgstr "Imposibil de-ați schimbat parola"
 
-#: templates/personal.php:39
+#: templates/personal.php:40
 msgid "Current password"
 msgstr "Parola curentă"
 
-#: templates/personal.php:40
+#: templates/personal.php:42
 msgid "New password"
 msgstr "Noua parolă"
 
-#: templates/personal.php:42
+#: templates/personal.php:44
 msgid "Change password"
 msgstr "Schimbă parola"
 
-#: templates/personal.php:54 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:78
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:55
+#: templates/personal.php:57
 msgid "Your display name was changed"
 msgstr ""
 
-#: templates/personal.php:56
+#: templates/personal.php:58
 msgid "Unable to change your display name"
 msgstr ""
 
-#: templates/personal.php:59
+#: templates/personal.php:61
 msgid "Change display name"
 msgstr ""
 
-#: templates/personal.php:68
+#: templates/personal.php:70
 msgid "Email"
 msgstr "Email"
 
-#: templates/personal.php:69
+#: templates/personal.php:72
 msgid "Your email address"
 msgstr "Adresa ta de email"
 
-#: templates/personal.php:70
+#: templates/personal.php:73
 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:76 templates/personal.php:77
+#: templates/personal.php:79 templates/personal.php:80
 msgid "Language"
 msgstr "Limba"
 
-#: templates/personal.php:82
+#: templates/personal.php:86
 msgid "Help translate"
 msgstr "Ajută la traducere"
 
-#: templates/personal.php:87
+#: templates/personal.php:91
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:89
+#: templates/personal.php:93
 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"
 
diff --git a/l10n/ro/user_ldap.po b/l10n/ro/user_ldap.po
index 4a97d1b7d6a031ca9d4de1bfdfb534ee4b426cf2..3f4d630d95b4b402f0fb4887175b52ffe8011a96 100644
--- a/l10n/ro/user_ldap.po
+++ b/l10n/ro/user_ldap.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-08 00:10+0100\n"
-"PO-Revision-Date: 2013-02-07 23:11+0000\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: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -24,17 +24,17 @@ msgstr ""
 msgid "Failed to delete the server configuration"
 msgstr ""
 
-#: ajax/testConfiguration.php:35
+#: ajax/testConfiguration.php:36
 msgid "The configuration is valid and the connection could be established!"
 msgstr ""
 
-#: ajax/testConfiguration.php:37
+#: ajax/testConfiguration.php:39
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
 msgstr ""
 
-#: ajax/testConfiguration.php:40
+#: ajax/testConfiguration.php:43
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
@@ -89,224 +89,248 @@ msgstr "<b>Atenție</b> Modulul PHP LDAP nu este instalat, infrastructura nu va
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:17
+#: templates/settings.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:23
 msgid "Host"
 msgstr "Gazdă"
 
-#: templates/settings.php:21
+#: templates/settings.php:25
 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:22
+#: templates/settings.php:26
 msgid "Base DN"
 msgstr "DN de bază"
 
-#: templates/settings.php:22
+#: templates/settings.php:27
 msgid "One Base DN per line"
 msgstr "Un Base DN pe linie"
 
-#: templates/settings.php:22
+#: templates/settings.php:28
 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:23
+#: templates/settings.php:30
 msgid "User DN"
 msgstr "DN al utilizatorului"
 
-#: templates/settings.php:23
+#: templates/settings.php:32
 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:24
+#: templates/settings.php:33
 msgid "Password"
 msgstr "Parolă"
 
-#: templates/settings.php:24
+#: templates/settings.php:36
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "Pentru acces anonim, lăsați DN și Parolă libere."
 
-#: templates/settings.php:25
+#: templates/settings.php:37
 msgid "User Login Filter"
 msgstr "Filtrare după Nume Utilizator"
 
-#: templates/settings.php:25
+#: templates/settings.php:40
 #, 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:25
+#: templates/settings.php:41
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "folosiți substituentul %%uid , d.e. \"uid=%%uid\""
 
-#: templates/settings.php:26
+#: templates/settings.php:42
 msgid "User List Filter"
 msgstr "Filtrarea după lista utilizatorilor"
 
-#: templates/settings.php:26
+#: templates/settings.php:45
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Definește filtrele care trebui aplicate, când se peiau utilzatorii."
 
-#: templates/settings.php:26
+#: templates/settings.php:46
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "fără substituenți, d.e. \"objectClass=person\"."
 
-#: templates/settings.php:27
+#: templates/settings.php:47
 msgid "Group Filter"
 msgstr "Fitrare Grup"
 
-#: templates/settings.php:27
+#: templates/settings.php:50
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Definește filtrele care se aplică, când se preiau grupurile."
 
-#: templates/settings.php:27
+#: templates/settings.php:51
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "fără substituenți, d.e. \"objectClass=posixGroup\""
 
-#: templates/settings.php:31
+#: templates/settings.php:55
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:34
+#: templates/settings.php:58
 msgid "Port"
 msgstr "Portul"
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:60
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Use TLS"
 msgstr "Utilizează TLS"
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:39
+#: templates/settings.php:63
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Server LDAP insensibil la majuscule (Windows)"
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid "Turn off SSL certificate validation."
 msgstr "Oprește validarea certificatelor SSL "
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 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:40
+#: templates/settings.php:64
 msgid "Not recommended, use for testing only."
 msgstr "Nu este recomandat, a se utiliza doar pentru testare."
 
-#: templates/settings.php:41
+#: templates/settings.php:65
+msgid "Cache Time-To-Live"
+msgstr ""
+
+#: templates/settings.php:65
 msgid "in seconds. A change empties the cache."
 msgstr "în secunde. O schimbare curăță memoria tampon."
 
-#: templates/settings.php:43
+#: templates/settings.php:67
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "User Display Name Field"
 msgstr "Câmpul cu numele vizibil al utilizatorului"
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 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:46
+#: templates/settings.php:70
 msgid "Base User Tree"
 msgstr "Arborele de bază al Utilizatorilor"
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "One User Base DN per line"
 msgstr "Un User Base DN pe linie"
 
-#: templates/settings.php:47
+#: templates/settings.php:71
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:47 templates/settings.php:50
+#: templates/settings.php:71 templates/settings.php:74
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "Group Display Name Field"
 msgstr "Câmpul cu numele grupului"
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 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:49
+#: templates/settings.php:73
 msgid "Base Group Tree"
 msgstr "Arborele de bază al Grupurilor"
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "One Group Base DN per line"
 msgstr "Un Group Base DN pe linie"
 
-#: templates/settings.php:50
+#: templates/settings.php:74
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:75
 msgid "Group-Member association"
 msgstr "Asocierea Grup-Membru"
 
-#: templates/settings.php:53
+#: templates/settings.php:77
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:79
+msgid "Quota Field"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Quota Default"
+msgstr ""
+
+#: templates/settings.php:80
 msgid "in bytes"
 msgstr "în octeți"
 
-#: templates/settings.php:58
+#: templates/settings.php:81
+msgid "Email Field"
+msgstr ""
+
+#: templates/settings.php:82
+msgid "User Home Folder Naming Rule"
+msgstr ""
+
+#: templates/settings.php:82
 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:62
+#: templates/settings.php:86
+msgid "Test Configuration"
+msgstr ""
+
+#: templates/settings.php:86
 msgid "Help"
 msgstr "Ajutor"
diff --git a/l10n/ru/core.po b/l10n/ru/core.po
index 87c8db8abcc7377ba5309f22e96a77812c7bfd45..21dfba20b358e8c3c2c674c7627604221c17d63f 100644
--- a/l10n/ru/core.po
+++ b/l10n/ru/core.po
@@ -19,8 +19,8 @@ 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 14:31+0000\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 (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -398,7 +398,7 @@ msgstr "При обновлении произошла ошибка. Пожал
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Обновление прошло успешно. Перенаправляемся в Ваш ownCloud..."
 
-#: lostpassword/controller.php:47
+#: lostpassword/controller.php:48
 msgid "ownCloud password reset"
 msgstr "Сброс пароля "
 
diff --git a/l10n/ru/files.po b/l10n/ru/files.po
index fcc6d86ae4b2dc0d5dc5d3d00972453e931f7df9..7748313329630df7268c8e2cb28a4695f1a3e688 100644
--- a/l10n/ru/files.po
+++ b/l10n/ru/files.po
@@ -21,8 +21,8 @@ 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 23:05+0000\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 (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -64,27 +64,27 @@ msgid ""
 "the HTML form"
 msgstr "Файл превышает размер MAX_FILE_SIZE, указаный в HTML-форме"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
 msgstr "Файл был загружен не полностью"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:31
 msgid "No file was uploaded"
 msgstr "Файл не был загружен"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:32
 msgid "Missing a temporary folder"
 msgstr "Невозможно найти временную папку"
 
-#: ajax/upload.php:34
+#: ajax/upload.php:33
 msgid "Failed to write to disk"
 msgstr "Ошибка записи на диск"
 
-#: ajax/upload.php:52
+#: ajax/upload.php:51
 msgid "Not enough storage available"
 msgstr "Недостаточно доступного места в хранилище"
 
-#: ajax/upload.php:83
+#: ajax/upload.php:82
 msgid "Invalid directory."
 msgstr "Неправильный каталог."
 
@@ -96,7 +96,7 @@ msgstr "Файлы"
 msgid "Delete permanently"
 msgstr "Удалено навсегда"
 
-#: js/fileactions.js:127 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:127 templates/index.php:92 templates/index.php:93
 msgid "Delete"
 msgstr "Удалить"
 
@@ -104,40 +104,36 @@ msgstr "Удалить"
 msgid "Rename"
 msgstr "Переименовать"
 
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
 msgid "Pending"
 msgstr "Ожидание"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "{new_name} already exists"
 msgstr "{new_name} уже существует"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "replace"
 msgstr "заменить"
 
-#: js/filelist.js:253
+#: js/filelist.js:251
 msgid "suggest name"
 msgstr "предложить название"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "cancel"
 msgstr "отмена"
 
-#: js/filelist.js:295
-msgid "replaced {new_name}"
-msgstr "заменено {new_name}"
+#: js/filelist.js:298
+msgid "replaced {new_name} with {old_name}"
+msgstr "заменено {new_name} на {old_name}"
 
-#: js/filelist.js:295 js/filelist.js:297
+#: js/filelist.js:298
 msgid "undo"
 msgstr "отмена"
 
-#: js/filelist.js:297
-msgid "replaced {new_name} with {old_name}"
-msgstr "заменено {new_name} на {old_name}"
-
-#: js/filelist.js:322
+#: js/filelist.js:323
 msgid "perform delete operation"
 msgstr "выполняется операция удаления"
 
@@ -163,74 +159,74 @@ msgstr "Ваше дисковое пространство полностью з
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Ваше хранилище почти заполнено ({usedSpacePercent}%)"
 
-#: js/files.js:224
+#: js/files.js:225
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Загрузка началась. Это может потребовать много времени, если файл большого размера."
 
-#: js/files.js:261
+#: js/files.js:262
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Не удается загрузить файл размером 0 байт в каталог"
 
-#: js/files.js:261
+#: js/files.js:262
 msgid "Upload Error"
 msgstr "Ошибка загрузки"
 
-#: js/files.js:272
+#: js/files.js:273
 msgid "Close"
 msgstr "Закрыть"
 
-#: js/files.js:311
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr "загружается 1 файл"
 
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr "{count} файлов загружается"
 
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "Загрузка отменена."
 
-#: js/files.js:496
+#: js/files.js:497
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Файл в процессе загрузки. Покинув страницу вы прервёте загрузку."
 
-#: js/files.js:569
+#: js/files.js:570
 msgid "URL cannot be empty."
 msgstr "Ссылка не может быть пустой."
 
-#: js/files.js:574
+#: js/files.js:575
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Неправильное имя каталога. Имя 'Shared' зарезервировано."
 
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:953 templates/index.php:68
 msgid "Name"
 msgstr "Название"
 
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:954 templates/index.php:79
 msgid "Size"
 msgstr "Размер"
 
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:955 templates/index.php:81
 msgid "Modified"
 msgstr "Изменён"
 
-#: js/files.js:969
+#: js/files.js:974
 msgid "1 folder"
 msgstr "1 папка"
 
-#: js/files.js:971
+#: js/files.js:976
 msgid "{count} folders"
 msgstr "{count} папок"
 
-#: js/files.js:979
+#: js/files.js:984
 msgid "1 file"
 msgstr "1 файл"
 
-#: js/files.js:981
+#: js/files.js:986
 msgid "{count} files"
 msgstr "{count} файлов"
 
@@ -288,39 +284,43 @@ msgstr "Из ссылки"
 
 #: templates/index.php:40
 msgid "Deleted files"
-msgstr ""
+msgstr "Удалённые файлы"
 
 #: templates/index.php:46
 msgid "Cancel upload"
 msgstr "Отмена загрузки"
 
-#: templates/index.php:59
+#: templates/index.php:53
+msgid "You don’t have write permissions here."
+msgstr "У вас нет разрешений на запись здесь."
+
+#: templates/index.php:60
 msgid "Nothing in here. Upload something!"
 msgstr "Здесь ничего нет. Загрузите что-нибудь!"
 
-#: templates/index.php:73
+#: templates/index.php:74
 msgid "Download"
 msgstr "Скачать"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:86 templates/index.php:87
 msgid "Unshare"
 msgstr "Отменить публикацию"
 
-#: templates/index.php:105
+#: templates/index.php:106
 msgid "Upload too large"
 msgstr "Файл слишком большой"
 
-#: templates/index.php:107
+#: templates/index.php:108
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Файлы, которые Вы пытаетесь загрузить, превышают лимит для файлов на этом сервере."
 
-#: templates/index.php:112
+#: templates/index.php:113
 msgid "Files are being scanned, please wait."
 msgstr "Подождите, файлы сканируются."
 
-#: templates/index.php:115
+#: templates/index.php:116
 msgid "Current scanning"
 msgstr "Текущее сканирование"
 
diff --git a/l10n/ru/files_external.po b/l10n/ru/files_external.po
index e6f36547a063ec8ada579d5a6f548972965b90af..36c362cae6b6d1bb8e2a6da579c106b24b974ad7 100644
--- a/l10n/ru/files_external.po
+++ b/l10n/ru/files_external.po
@@ -6,13 +6,14 @@
 # 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: 2012-12-14 00:16+0100\n"
-"PO-Revision-Date: 2012-12-13 17:02+0000\n"
-"Last-Translator: sam002 <semen@sam002.net>\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"
 "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"
@@ -20,37 +21,33 @@ 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"
 
-#: 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 "Ошибка при настройке хранилища Dropbox"
 
-#: 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 "Пожалуйста, предоставьте действующий ключ Dropbox и пароль."
 
-#: 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 "Ошибка при настройке хранилища Google Drive"
 
-#: lib/config.php:434
+#: lib/config.php:421
 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:435
+#: lib/config.php:424
 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 "
@@ -61,63 +58,63 @@ msgstr "<b>Внимание:</b> Поддержка FTP не включена в
 msgid "External Storage"
 msgstr "Внешний носитель"
 
-#: templates/settings.php:8 templates/settings.php:22
-msgid "Mount point"
-msgstr "Точка монтирования"
-
-#: templates/settings.php:9
-msgid "Backend"
-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: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"
-msgstr "Добавить точку монтирования"
+#: 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 "Пользователи"
 
-#: 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 "Удалить"
 
-#: 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 "Корневые сертификаты SSL"
 
-#: templates/settings.php:158
+#: templates/settings.php:159
 msgid "Import Root Certificate"
 msgstr "Импортировать корневые сертификаты"
diff --git a/l10n/ru/files_trashbin.po b/l10n/ru/files_trashbin.po
index cef3725c58356d17c76f678a84b6e4b548bf63af..b30bcd85ec26b7c10447e39f8eaa78f7f809cd19 100644
--- a/l10n/ru/files_trashbin.po
+++ b/l10n/ru/files_trashbin.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-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 10:07+0000\n"
-"Last-Translator: Langaru <langaru@gmail.com>\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 (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,7 +18,7 @@ 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:22
+#: ajax/delete.php:40
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "%s не может быть удалён навсегда"
@@ -28,35 +28,39 @@ msgstr "%s не может быть удалён навсегда"
 msgid "Couldn't restore %s"
 msgstr "%s не может быть восстановлен"
 
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
 msgid "perform restore operation"
 msgstr "выполнить операцию восстановления"
 
-#: js/trash.js:33
+#: js/trash.js:34
 msgid "delete file permanently"
 msgstr "удалить файл навсегда"
 
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr "Удалено навсегда"
+
+#: js/trash.js:174 templates/index.php:17
 msgid "Name"
 msgstr "Имя"
 
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:175 templates/index.php:27
 msgid "Deleted"
 msgstr "Удалён"
 
-#: js/trash.js:135
+#: js/trash.js:184
 msgid "1 folder"
 msgstr "1 папка"
 
-#: js/trash.js:137
+#: js/trash.js:186
 msgid "{count} folders"
 msgstr "{count} папок"
 
-#: js/trash.js:145
+#: js/trash.js:194
 msgid "1 file"
 msgstr "1 файл"
 
-#: js/trash.js:147
+#: js/trash.js:196
 msgid "{count} files"
 msgstr "{count} файлов"
 
@@ -67,3 +71,11 @@ 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/ru/files_versions.po b/l10n/ru/files_versions.po
index 87dce55db7e5dfc0e49e11a49daac21fb5f50fc9..8709b06612f4c687a87dfbabf4f88c47c05b8ad4 100644
--- a/l10n/ru/files_versions.po
+++ b/l10n/ru/files_versions.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-09 00:12+0100\n"
-"PO-Revision-Date: 2013-02-08 06:30+0000\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"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -44,26 +44,18 @@ 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:16
-msgid "History"
-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 "Вернуть файл к предыдущей версии нажатием на кнопку возврата"
-
-#: templates/settings.php:3
-msgid "Files Versioning"
-msgstr "Версии файлов"
-
-#: templates/settings.php:4
-msgid "Enable"
-msgstr "Включить"
diff --git a/l10n/ru/lib.po b/l10n/ru/lib.po
index 48b7c3887202bbea734cf3841e767e409e08bf22..ccb02d12a01791b93a8b902fb75e0153d078f3ba 100644
--- a/l10n/ru/lib.po
+++ b/l10n/ru/lib.po
@@ -10,13 +10,14 @@
 #   <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-02-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 10:36+0000\n"
-"Last-Translator: Denis <reg.transifex.net@demitel.ru>\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"
 "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"
@@ -24,27 +25,27 @@ msgstr ""
 "Language: ru\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: app.php:339
+#: app.php:349
 msgid "Help"
 msgstr "Помощь"
 
-#: app.php:346
+#: app.php:362
 msgid "Personal"
 msgstr "Личное"
 
-#: app.php:351
+#: app.php:373
 msgid "Settings"
 msgstr "Настройки"
 
-#: app.php:356
+#: app.php:385
 msgid "Users"
 msgstr "Пользователи"
 
-#: app.php:363
+#: app.php:398
 msgid "Apps"
 msgstr "Приложения"
 
-#: app.php:365
+#: app.php:406
 msgid "Admin"
 msgstr "Admin"
 
@@ -56,15 +57,15 @@ msgstr "ZIP-скачивание отключено."
 msgid "Files need to be downloaded one by one."
 msgstr "Файлы должны быть загружены по одному."
 
-#: files.php:203 files.php:228
+#: files.php:204 files.php:231
 msgid "Back to Files"
 msgstr "Назад к файлам"
 
-#: files.php:227
+#: files.php:228
 msgid "Selected files too large to generate zip file."
 msgstr "Выбранные файлы слишком велики, чтобы создать zip файл."
 
-#: helper.php:226
+#: helper.php:228
 msgid "couldn't be determined"
 msgstr "Невозможно установить"
 
@@ -104,90 +105,95 @@ msgstr "становит пароль для admin."
 msgid "Specify a data folder."
 msgstr "Указать папку данных."
 
-#: setup.php:53
+#: setup.php:55
 #, php-format
 msgid "%s enter the database username."
-msgstr ""
+msgstr "%s введите имя пользователя базы данных."
 
-#: setup.php:56
+#: setup.php:58
 #, php-format
 msgid "%s enter the database name."
-msgstr ""
+msgstr "%s введите имя базы данных."
 
-#: setup.php:59
+#: setup.php:61
 #, php-format
 msgid "%s you may not use dots in the database name"
-msgstr ""
+msgstr "%s Вы не можете использовать точки в имени базы данных"
 
-#: setup.php:62
+#: setup.php:64
 #, php-format
 msgid "%s set the database host."
-msgstr ""
+msgstr "%s задайте хост базы данных."
 
-#: setup.php:126 setup.php:291 setup.php:336
+#: setup.php:128 setup.php:320 setup.php:365
 msgid "PostgreSQL username and/or password not valid"
 msgstr "Неверное имя пользователя и/или пароль PostgreSQL"
 
-#: setup.php:127 setup.php:150 setup.php:204
+#: setup.php:129 setup.php:152 setup.php:229
 msgid "You need to enter either an existing account or the administrator."
 msgstr "Вы должны войти или в существующий аккаунт или под администратором."
 
-#: setup.php:149 setup.php:423 setup.php:489
+#: setup.php:151 setup.php:453 setup.php:520
 msgid "Oracle username and/or password not valid"
 msgstr "Неверное имя пользователя и/или пароль Oracle"
 
-#: setup.php:203
+#: setup.php:228
 msgid "MySQL username and/or password not valid"
 msgstr "Неверное имя пользователя и/или пароль MySQL"
 
-#: setup.php:255 setup.php:357 setup.php:366 setup.php:384 setup.php:394
-#: setup.php:403 setup.php:430 setup.php:496 setup.php:522 setup.php:529
-#: setup.php:540 setup.php:547 setup.php:556 setup.php:564 setup.php:573
-#: setup.php:579
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Ошибка БД: \"%s\""
 
-#: setup.php:256 setup.php:358 setup.php:367 setup.php:385 setup.php:395
-#: setup.php:404 setup.php:431 setup.php:497 setup.php:523 setup.php:530
-#: setup.php:541 setup.php:557 setup.php:565 setup.php:574
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
-msgstr ""
+msgstr "Вызываемая команда была: \"%s\""
 
-#: setup.php:270
+#: setup.php:299
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "Пользователь MySQL '%s'@'localhost' уже существует."
 
-#: setup.php:271
+#: setup.php:300
 msgid "Drop this user from MySQL"
 msgstr "Удалить этого пользователя из MySQL"
 
-#: setup.php:276
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "Пользователь MySQL '%s'@'%%' уже существует"
 
-#: setup.php:277
+#: setup.php:306
 msgid "Drop this user from MySQL."
 msgstr "Удалить этого пользователя из MySQL."
 
-#: setup.php:548 setup.php:580
+#: setup.php:579 setup.php:611
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
-msgstr ""
+msgstr "Вызываемая команда была: \"%s\", имя: %s, пароль: %s"
+
+#: setup.php:631
+#, php-format
+msgid "MS SQL username and/or password not valid: %s"
+msgstr "Имя пользователя и/или пароль MS SQL не подходит: %s"
 
-#: setup.php:644
+#: setup.php:849
 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:645
+#: setup.php:850
 #, 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,16 +247,16 @@ msgstr "в прошлом году"
 msgid "years ago"
 msgstr "годы назад"
 
-#: updater.php:75
+#: updater.php:78
 #, php-format
 msgid "%s is available. Get <a href=\"%s\">more information</a>"
 msgstr "Возможно обновление до %s. <a href=\"%s\">Подробнее</a>"
 
-#: updater.php:77
+#: updater.php:81
 msgid "up to date"
 msgstr "актуальная версия"
 
-#: updater.php:80
+#: updater.php:84
 msgid "updates check is disabled"
 msgstr "проверка обновлений отключена"
 
diff --git a/l10n/ru/settings.po b/l10n/ru/settings.po
index 4374f73dfa0438e95f7fbeeb489b56053ef5ede7..9fc87e4aad9f0dfac1ad56ba2f0665be0e34a405 100644
--- a/l10n/ru/settings.po
+++ b/l10n/ru/settings.po
@@ -22,9 +22,9 @@ 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:05+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "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,8 +36,8 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "Загрузка из App Store запрещена"
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:15
-#: ajax/togglegroups.php:18
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr "Ошибка авторизации"
 
@@ -85,12 +85,12 @@ msgstr "Неверный запрос"
 msgid "Admins can't remove themself from the admin group"
 msgstr "Администратор не может удалить сам себя из группы admin"
 
-#: ajax/togglegroups.php:28
+#: ajax/togglegroups.php:30
 #, php-format
 msgid "Unable to add user to group %s"
 msgstr "Невозможно добавить пользователя в группу %s"
 
-#: ajax/togglegroups.php:34
+#: ajax/togglegroups.php:36
 #, php-format
 msgid "Unable to remove user from group %s"
 msgstr "Невозможно удалить пользователя из группы %s"
@@ -131,7 +131,7 @@ msgstr "Ошибка"
 msgid "Updated"
 msgstr "Обновлено"
 
-#: js/personal.js:96
+#: js/personal.js:99
 msgid "Saving..."
 msgstr "Сохранение..."
 
@@ -145,7 +145,7 @@ msgstr "отмена"
 
 #: js/users.js:62
 msgid "Unable to remove user"
-msgstr ""
+msgstr "Невозможно удалить пользователя"
 
 #: js/users.js:75 templates/users.php:26 templates/users.php:80
 #: templates/users.php:105
@@ -160,23 +160,23 @@ msgstr "Группа Администраторы"
 msgid "Delete"
 msgstr "Удалить"
 
-#: js/users.js:190
+#: js/users.js:191
 msgid "add group"
-msgstr ""
+msgstr "добавить группу"
 
-#: js/users.js:351
+#: js/users.js:352
 msgid "A valid username must be provided"
-msgstr ""
+msgstr "Предоставте подходящее имя пользователя"
 
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
 msgid "Error creating user"
-msgstr ""
+msgstr "Ошибка создания пользователя"
 
-#: js/users.js:357
+#: js/users.js:358
 msgid "A valid password must be provided"
-msgstr ""
+msgstr "Предоставте подходящий пароль"
 
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
 msgid "__language_name__"
 msgstr "Русский "
 
@@ -195,46 +195,46 @@ 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:61
+#: templates/admin.php:63
+#, php-format
 msgid ""
-"This ownCloud server can't set system locale to "
-"\"en_US.UTF-8\"/\"en_US.UTF8\". 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 en_US.UTF-8/en_US.UTF8."
-msgstr ""
+"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 "Этот сервер ownCloud не может установить язык системы на %s. Это означает, что могут быть проблемы с некоторыми символами в именах файлов. Мы настоятельно рекомендуем установить необходимые пакеты в вашей системе для поддержки %s."
 
-#: templates/admin.php:72
+#: templates/admin.php:75
 msgid "Internet connection not working"
-msgstr ""
+msgstr "Интернет соединение не работает"
 
-#: templates/admin.php:75
+#: 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 "
@@ -242,100 +242,100 @@ 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го рода приложений,не работают."
 
-#: templates/admin.php:89
+#: templates/admin.php:92
 msgid "Cron"
-msgstr ""
+msgstr "Демон"
 
-#: templates/admin.php:98
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
-msgstr ""
+msgstr "Выполнять одно задание с каждой загруженной страницей"
 
-#: templates/admin.php:108
+#: 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 раз в минуту через http."
 
-#: templates/admin.php:118
+#: 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:125
+#: templates/admin.php:128
 msgid "Sharing"
-msgstr ""
+msgstr "Общий доступ"
 
-#: templates/admin.php:131
+#: templates/admin.php:134
 msgid "Enable Share API"
-msgstr ""
+msgstr "Включить API общего доступа"
 
-#: templates/admin.php:132
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
-msgstr ""
+msgstr "Позволить программам использовать API общего доступа"
 
-#: templates/admin.php:139
+#: templates/admin.php:142
 msgid "Allow links"
-msgstr ""
+msgstr "Разрешить ссылки"
 
-#: templates/admin.php:140
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
-msgstr ""
+msgstr "Разрешить пользователям открывать в общий доступ эллементы с публичной ссылкой"
 
-#: templates/admin.php:147
+#: templates/admin.php:150
 msgid "Allow resharing"
-msgstr ""
+msgstr "Разрешить переоткрытие общего доступа"
 
-#: templates/admin.php:148
+#: templates/admin.php:151
 msgid "Allow users to share items shared with them again"
-msgstr ""
+msgstr "Позволить пользователям открывать общий доступ к эллементам уже открытым в общий доступ"
 
-#: templates/admin.php:155
+#: templates/admin.php:158
 msgid "Allow users to share with anyone"
-msgstr ""
+msgstr "Разрешить пользователя делать общий доступ любому"
 
-#: templates/admin.php:158
+#: templates/admin.php:161
 msgid "Allow users to only share with users in their groups"
-msgstr ""
+msgstr "Разрешить пользователям делать общий доступ только для пользователей их групп"
 
-#: templates/admin.php:165
+#: templates/admin.php:168
 msgid "Security"
-msgstr ""
+msgstr "Безопасность"
 
-#: templates/admin.php:178
+#: templates/admin.php:181
 msgid "Enforce HTTPS"
-msgstr ""
+msgstr "Принудить к HTTPS"
 
-#: templates/admin.php:179
+#: templates/admin.php:182
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
-msgstr ""
+msgstr "Принудить клиентов подключаться к ownCloud через шифрованное подключение."
 
-#: templates/admin.php:182
+#: 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:192
+#: templates/admin.php:195
 msgid "Log"
-msgstr ""
+msgstr "Лог"
 
-#: templates/admin.php:193
+#: templates/admin.php:196
 msgid "Log level"
-msgstr ""
+msgstr "Уровень лога"
 
-#: templates/admin.php:220
+#: templates/admin.php:223
 msgid "More"
 msgstr "Больше"
 
-#: templates/admin.php:227 templates/personal.php:98
+#: templates/admin.php:230 templates/personal.php:102
 msgid "Version"
 msgstr "Версия"
 
-#: templates/admin.php:230 templates/personal.php:100
+#: templates/admin.php:233 templates/personal.php:105
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -345,51 +345,51 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "Разрабатывается <a href=\"http://ownCloud.org/contact\" target=\"_blank\">сообществом ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">исходный код</a> доступен под лицензией <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
-#: templates/apps.php:10
+#: templates/apps.php:11
 msgid "Add your App"
 msgstr "Добавить приложение"
 
-#: templates/apps.php:11
+#: templates/apps.php:12
 msgid "More Apps"
 msgstr "Больше приложений"
 
-#: templates/apps.php:24
+#: templates/apps.php:28
 msgid "Select an App"
 msgstr "Выберите приложение"
 
-#: templates/apps.php:28
+#: templates/apps.php:34
 msgid "See application page at apps.owncloud.com"
 msgstr "Смотрите дополнения на apps.owncloud.com"
 
-#: templates/apps.php:29
+#: templates/apps.php:36
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span> лицензия. Автор <span class=\"author\"></span>"
 
-#: templates/apps.php:31
+#: templates/apps.php:38
 msgid "Update"
 msgstr "Обновить"
 
-#: templates/help.php:3
+#: 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 "Online документация"
 
-#: templates/help.php:7
+#: templates/help.php:11
 msgid "Forum"
 msgstr "Форум"
 
-#: templates/help.php:9
+#: templates/help.php:14
 msgid "Bugtracker"
 msgstr "Bugtracker"
 
-#: templates/help.php:11
+#: templates/help.php:17
 msgid "Commercial Support"
 msgstr "Коммерческая поддержка"
 
@@ -398,79 +398,79 @@ msgstr "Коммерческая поддержка"
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Вы использовали <strong>%s</strong> из доступных <strong>%s</strong>"
 
-#: templates/personal.php:14
+#: templates/personal.php:15
 msgid "Get the apps to sync your files"
 msgstr "Получить приложения для синхронизации ваших файлов"
 
-#: templates/personal.php:25
+#: templates/personal.php:26
 msgid "Show First Run Wizard again"
 msgstr "Показать помощник настройки"
 
-#: templates/personal.php:36 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
 msgid "Password"
 msgstr "Пароль"
 
-#: templates/personal.php:37
+#: templates/personal.php:38
 msgid "Your password was changed"
 msgstr "Ваш пароль изменён"
 
-#: templates/personal.php:38
+#: templates/personal.php:39
 msgid "Unable to change your password"
 msgstr "Невозможно сменить пароль"
 
-#: templates/personal.php:39
+#: templates/personal.php:40
 msgid "Current password"
 msgstr "Текущий пароль"
 
-#: templates/personal.php:40
+#: templates/personal.php:42
 msgid "New password"
 msgstr "Новый пароль"
 
-#: templates/personal.php:42
+#: templates/personal.php:44
 msgid "Change password"
 msgstr "Сменить пароль"
 
-#: templates/personal.php:54 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:78
 msgid "Display Name"
 msgstr "Отображаемое имя"
 
-#: templates/personal.php:55
+#: templates/personal.php:57
 msgid "Your display name was changed"
 msgstr "Ваше отображаемое имя было изменено"
 
-#: templates/personal.php:56
+#: templates/personal.php:58
 msgid "Unable to change your display name"
 msgstr "Невозможно изменить Ваше отображаемое имя"
 
-#: templates/personal.php:59
+#: templates/personal.php:61
 msgid "Change display name"
 msgstr "Изменить отображаемое имя"
 
-#: templates/personal.php:68
+#: templates/personal.php:70
 msgid "Email"
 msgstr "e-mail"
 
-#: templates/personal.php:69
+#: templates/personal.php:72
 msgid "Your email address"
 msgstr "Ваш адрес электронной почты"
 
-#: templates/personal.php:70
+#: templates/personal.php:73
 msgid "Fill in an email address to enable password recovery"
 msgstr "Введите адрес электронной почты, чтобы появилась возможность восстановления пароля"
 
-#: templates/personal.php:76 templates/personal.php:77
+#: templates/personal.php:79 templates/personal.php:80
 msgid "Language"
 msgstr "Язык"
 
-#: templates/personal.php:82
+#: templates/personal.php:86
 msgid "Help translate"
 msgstr "Помочь с переводом"
 
-#: templates/personal.php:87
+#: templates/personal.php:91
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:89
+#: templates/personal.php:93
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "Используйте этот URL для подключения файлового менеджера к Вашему хранилищу"
 
diff --git a/l10n/ru/user_ldap.po b/l10n/ru/user_ldap.po
index c25f1f500d7e1331d7e2ff9db9f198d6cbce13e0..e419106c75046fa65b314d6cf484248bffc43b83 100644
--- a/l10n/ru/user_ldap.po
+++ b/l10n/ru/user_ldap.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-02-12 00:20+0100\n"
-"PO-Revision-Date: 2013-02-11 16:30+0000\n"
-"Last-Translator: unixoid <victor.ashirov@gmail.com>\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"
 "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"
@@ -26,17 +26,17 @@ msgstr ""
 msgid "Failed to delete the server configuration"
 msgstr "Не удалось удалить конфигурацию сервера"
 
-#: ajax/testConfiguration.php:35
+#: ajax/testConfiguration.php:36
 msgid "The configuration is valid and the connection could be established!"
 msgstr "Конфигурация правильная и подключение может быть установлено!"
 
-#: ajax/testConfiguration.php:37
+#: ajax/testConfiguration.php:39
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
 msgstr "Конфигурация верна, но операция подключения завершилась неудачно. Пожалуйста, проверьте настройки сервера и учетные данные."
 
-#: ajax/testConfiguration.php:40
+#: ajax/testConfiguration.php:43
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
@@ -91,224 +91,248 @@ msgstr "<b>Внимание:</b> Модуль LDAP для PHP не устано
 msgid "Server configuration"
 msgstr "Конфигурация сервера"
 
-#: templates/settings.php:17
+#: templates/settings.php:18
 msgid "Add Server Configuration"
 msgstr "Добавить конфигурацию сервера"
 
-#: templates/settings.php:21
+#: templates/settings.php:23
 msgid "Host"
 msgstr "Сервер"
 
-#: templates/settings.php:21
+#: templates/settings.php:25
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "Можно опустить протокол, за исключением того, когда вам требуется SSL. Тогда начните с ldaps :/ /"
 
-#: templates/settings.php:22
+#: templates/settings.php:26
 msgid "Base DN"
 msgstr "Базовый DN"
 
-#: templates/settings.php:22
+#: templates/settings.php:27
 msgid "One Base DN per line"
 msgstr "По одному базовому DN в строке."
 
-#: templates/settings.php:22
+#: templates/settings.php:28
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "Вы можете задать Base DN для пользователей и групп на вкладке \"Расширенное\""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "User DN"
 msgstr "DN пользователя"
 
-#: templates/settings.php:23
+#: templates/settings.php:32
 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:24
+#: templates/settings.php:33
 msgid "Password"
 msgstr "Пароль"
 
-#: templates/settings.php:24
+#: templates/settings.php:36
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "Для анонимного доступа оставьте DN и пароль пустыми."
 
-#: templates/settings.php:25
+#: templates/settings.php:37
 msgid "User Login Filter"
 msgstr "Фильтр входа пользователей"
 
-#: templates/settings.php:25
+#: templates/settings.php:40
 #, 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:25
+#: templates/settings.php:41
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "используйте заполнитель %%uid, например: \"uid=%%uid\""
 
-#: templates/settings.php:26
+#: templates/settings.php:42
 msgid "User List Filter"
 msgstr "Фильтр списка пользователей"
 
-#: templates/settings.php:26
+#: templates/settings.php:45
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Определяет фильтр для применения при получении пользователей."
 
-#: templates/settings.php:26
+#: templates/settings.php:46
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "без заполнителя, например: \"objectClass=person\"."
 
-#: templates/settings.php:27
+#: templates/settings.php:47
 msgid "Group Filter"
 msgstr "Фильтр группы"
 
-#: templates/settings.php:27
+#: templates/settings.php:50
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Определяет фильтр для применения при получении группы."
 
-#: templates/settings.php:27
+#: templates/settings.php:51
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "без заполнения, например \"objectClass=posixGroup\"."
 
-#: templates/settings.php:31
+#: templates/settings.php:55
 msgid "Connection Settings"
 msgstr "Настройки подключения"
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "Configuration Active"
 msgstr "Конфигурация активна"
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "When unchecked, this configuration will be skipped."
 msgstr "Когда галочка снята, эта конфигурация будет пропущена."
 
-#: templates/settings.php:34
+#: templates/settings.php:58
 msgid "Port"
 msgstr "Порт"
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid "Backup (Replica) Host"
 msgstr "Адрес резервного сервера"
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr "Укажите дополнительный резервный сервер. Он должен быть репликой главного LDAP/AD сервера."
 
-#: templates/settings.php:36
+#: templates/settings.php:60
 msgid "Backup (Replica) Port"
 msgstr "Порт резервного сервера"
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "Disable Main Server"
 msgstr "Отключение главного сервера"
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr "Когда включено, ownCloud будет соединяться только с резервным сервером."
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Use TLS"
 msgstr "Использовать TLS"
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr "Не используйте совместно с безопасными подключениями (LDAPS), это не сработает."
 
-#: templates/settings.php:39
+#: templates/settings.php:63
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Нечувствительный к регистру сервер LDAP (Windows)"
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid "Turn off SSL certificate validation."
 msgstr "Отключить проверку сертификата SSL."
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 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:40
+#: templates/settings.php:64
 msgid "Not recommended, use for testing only."
 msgstr "Не рекомендуется, используйте только для тестирования."
 
-#: templates/settings.php:41
+#: templates/settings.php:65
+msgid "Cache Time-To-Live"
+msgstr "Кэш времени жизни"
+
+#: templates/settings.php:65
 msgid "in seconds. A change empties the cache."
 msgstr "в секундах. Изменение очистит кэш."
 
-#: templates/settings.php:43
+#: templates/settings.php:67
 msgid "Directory Settings"
 msgstr "Настройки каталога"
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "User Display Name Field"
 msgstr "Поле отображаемого имени пользователя"
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "Атрибут LDAP для генерации имени пользователя ownCloud."
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "Base User Tree"
 msgstr "База пользовательского дерева"
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "One User Base DN per line"
 msgstr "По одной базовому DN пользователей в строке."
 
-#: templates/settings.php:47
+#: templates/settings.php:71
 msgid "User Search Attributes"
 msgstr "Поисковые атрибуты пользователя"
 
-#: templates/settings.php:47 templates/settings.php:50
+#: templates/settings.php:71 templates/settings.php:74
 msgid "Optional; one attribute per line"
 msgstr "Опционально; один атрибут на линию"
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "Group Display Name Field"
 msgstr "Поле отображаемого имени группы"
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "Атрибут LDAP для генерации имени группы ownCloud."
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "Base Group Tree"
 msgstr "База группового дерева"
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "One Group Base DN per line"
 msgstr "По одной базовому DN групп в строке."
 
-#: templates/settings.php:50
+#: templates/settings.php:74
 msgid "Group Search Attributes"
 msgstr "Атрибуты поиска для группы"
 
-#: templates/settings.php:51
+#: templates/settings.php:75
 msgid "Group-Member association"
 msgstr "Ассоциация Группа-Участник"
 
-#: templates/settings.php:53
+#: templates/settings.php:77
 msgid "Special Attributes"
 msgstr "Специальные атрибуты"
 
-#: templates/settings.php:56
+#: templates/settings.php:79
+msgid "Quota Field"
+msgstr "Поле квота"
+
+#: templates/settings.php:80
+msgid "Quota Default"
+msgstr "Квота по умолчанию"
+
+#: templates/settings.php:80
 msgid "in bytes"
 msgstr "в байтах"
 
-#: templates/settings.php:58
+#: templates/settings.php:81
+msgid "Email Field"
+msgstr "Поле адресса эллектронной почты"
+
+#: templates/settings.php:82
+msgid "User Home Folder Naming Rule"
+msgstr "Правило именования Домашней Папки Пользователя"
+
+#: templates/settings.php:82
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Оставьте имя пользователя пустым (по умолчанию). Иначе укажите атрибут LDAP/AD."
 
-#: templates/settings.php:62
+#: templates/settings.php:86
+msgid "Test Configuration"
+msgstr "Тестовая конфигурация"
+
+#: templates/settings.php:86
 msgid "Help"
 msgstr "Помощь"
diff --git a/l10n/ru_RU/core.po b/l10n/ru_RU/core.po
index a8b77a5d60060d144a660561060a60f01b747f03..b3fdce00f69f4dc527b7d6e15254e9f5e7636832 100644
--- a/l10n/ru_RU/core.po
+++ b/l10n/ru_RU/core.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 14:32+0000\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"
 "MIME-Version: 1.0\n"
@@ -389,7 +389,7 @@ msgstr "Обновление прошло неудачно. Пожалуйста
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Обновление прошло успешно. Немедленное перенаправление Вас на ownCloud."
 
-#: lostpassword/controller.php:47
+#: lostpassword/controller.php:48
 msgid "ownCloud password reset"
 msgstr "Переназначение пароля"
 
diff --git a/l10n/ru_RU/files.po b/l10n/ru_RU/files.po
index baae545b0e70a199adacfc575eba7079e21e0059..0ae9fc53840781c212a16a4dd424bc6e361b6df8 100644
--- a/l10n/ru_RU/files.po
+++ b/l10n/ru_RU/files.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\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"
 "MIME-Version: 1.0\n"
@@ -54,27 +54,27 @@ msgid ""
 "the HTML form"
 msgstr "Размер загруженного"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
 msgstr "Загружаемый файл был загружен частично"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:31
 msgid "No file was uploaded"
 msgstr "Файл не был загружен"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:32
 msgid "Missing a temporary folder"
 msgstr "Отсутствует временная папка"
 
-#: ajax/upload.php:34
+#: ajax/upload.php:33
 msgid "Failed to write to disk"
 msgstr "Не удалось записать на диск"
 
-#: ajax/upload.php:52
+#: ajax/upload.php:51
 msgid "Not enough storage available"
 msgstr "Недостаточно места в хранилище"
 
-#: ajax/upload.php:83
+#: ajax/upload.php:82
 msgid "Invalid directory."
 msgstr "Неверный каталог."
 
@@ -86,7 +86,7 @@ msgstr "Файлы"
 msgid "Delete permanently"
 msgstr "Удалить навсегда"
 
-#: js/fileactions.js:127 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:127 templates/index.php:92 templates/index.php:93
 msgid "Delete"
 msgstr "Удалить"
 
@@ -94,40 +94,36 @@ msgstr "Удалить"
 msgid "Rename"
 msgstr "Переименовать"
 
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
 msgid "Pending"
 msgstr "Ожидающий решения"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "{new_name} already exists"
 msgstr "{новое_имя} уже существует"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "replace"
 msgstr "отмена"
 
-#: js/filelist.js:253
+#: js/filelist.js:251
 msgid "suggest name"
 msgstr "подобрать название"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "cancel"
 msgstr "отменить"
 
-#: js/filelist.js:295
-msgid "replaced {new_name}"
-msgstr "заменено {новое_имя}"
+#: js/filelist.js:298
+msgid "replaced {new_name} with {old_name}"
+msgstr "заменено {новое_имя} с {старое_имя}"
 
-#: js/filelist.js:295 js/filelist.js:297
+#: js/filelist.js:298
 msgid "undo"
 msgstr "отменить действие"
 
-#: js/filelist.js:297
-msgid "replaced {new_name} with {old_name}"
-msgstr "заменено {новое_имя} с {старое_имя}"
-
-#: js/filelist.js:322
+#: js/filelist.js:323
 msgid "perform delete operation"
 msgstr "выполняется процесс удаления"
 
@@ -153,74 +149,74 @@ msgstr "Ваше хранилище переполнено, фалы больш
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Ваше хранилище почти полно ({usedSpacePercent}%)"
 
-#: js/files.js:224
+#: js/files.js:225
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Идёт подготовка к скачке Вашего файла. Это может занять некоторое время, если фалы большие."
 
-#: js/files.js:261
+#: js/files.js:262
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Невозможно загрузить файл,\n так как он имеет нулевой размер или является директорией"
 
-#: js/files.js:261
+#: js/files.js:262
 msgid "Upload Error"
 msgstr "Ошибка загрузки"
 
-#: js/files.js:272
+#: js/files.js:273
 msgid "Close"
 msgstr "Закрыть"
 
-#: js/files.js:311
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr "загрузка 1 файла"
 
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr "{количество} загружено файлов"
 
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "Загрузка отменена"
 
-#: js/files.js:496
+#: js/files.js:497
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Процесс загрузки файла. Если покинуть страницу сейчас, загрузка будет отменена."
 
-#: js/files.js:569
+#: js/files.js:570
 msgid "URL cannot be empty."
 msgstr "URL не должен быть пустым."
 
-#: js/files.js:574
+#: js/files.js:575
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Неверное имя папки. Использование наименования 'Опубликовано' зарезервировано Owncloud"
 
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:953 templates/index.php:68
 msgid "Name"
 msgstr "Имя"
 
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:954 templates/index.php:79
 msgid "Size"
 msgstr "Размер"
 
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:955 templates/index.php:81
 msgid "Modified"
 msgstr "Изменен"
 
-#: js/files.js:969
+#: js/files.js:974
 msgid "1 folder"
 msgstr "1 папка"
 
-#: js/files.js:971
+#: js/files.js:976
 msgid "{count} folders"
 msgstr "{количество} папок"
 
-#: js/files.js:979
+#: js/files.js:984
 msgid "1 file"
 msgstr "1 файл"
 
-#: js/files.js:981
+#: js/files.js:986
 msgid "{count} files"
 msgstr "{количество} файлов"
 
@@ -284,33 +280,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr "Отмена загрузки"
 
-#: templates/index.php:59
+#: templates/index.php:53
+msgid "You don’t have write permissions here."
+msgstr ""
+
+#: templates/index.php:60
 msgid "Nothing in here. Upload something!"
 msgstr "Здесь ничего нет. Загрузите что-нибудь!"
 
-#: templates/index.php:73
+#: templates/index.php:74
 msgid "Download"
 msgstr "Загрузить"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:86 templates/index.php:87
 msgid "Unshare"
 msgstr "Скрыть"
 
-#: templates/index.php:105
+#: templates/index.php:106
 msgid "Upload too large"
 msgstr "Загрузка слишком велика"
 
-#: templates/index.php:107
+#: templates/index.php:108
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Размер файлов, которые Вы пытаетесь загрузить, превышает максимально допустимый размер для загрузки на данный сервер."
 
-#: templates/index.php:112
+#: templates/index.php:113
 msgid "Files are being scanned, please wait."
 msgstr "Файлы сканируются, пожалуйста, подождите."
 
-#: templates/index.php:115
+#: templates/index.php:116
 msgid "Current scanning"
 msgstr "Текущее сканирование"
 
diff --git a/l10n/ru_RU/files_external.po b/l10n/ru_RU/files_external.po
index b93907dab57006c21580f47860a9c9a1334cc0f1..4938cb4d6ada54c17c5f3c5842d0a84e4db4d24c 100644
--- a/l10n/ru_RU/files_external.po
+++ b/l10n/ru_RU/files_external.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-12-22 00:24+0100\n"
-"PO-Revision-Date: 2012-12-21 10:27+0000\n"
-"Last-Translator: AnnaSch <cdewqazxsqwe@gmail.com>\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"
 "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"
@@ -18,37 +18,33 @@ msgstr ""
 "Language: ru_RU\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: 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 "Ошибка при конфигурировании хранилища Dropbox"
 
-#: 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 "Пожалуйста представьте допустимый ключ приложения Dropbox и пароль."
 
-#: 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 "Ошибка настройки хранилища Google Drive"
 
-#: lib/config.php:434
+#: lib/config.php:421
 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:435
+#: lib/config.php:424
 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 "
@@ -59,63 +55,63 @@ msgstr "<b>Предупреждение:</b> Поддержка FTP в PHP не
 msgid "External Storage"
 msgstr "Внешние системы хранения данных"
 
-#: templates/settings.php:8 templates/settings.php:22
-msgid "Mount point"
-msgstr "Точка монтирования"
-
-#: templates/settings.php:9
-msgid "Backend"
-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: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"
-msgstr "Добавить точку монтирования"
+#: 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 "Пользователи"
 
-#: templates/settings.php:108 templates/settings.php:109
-#: templates/settings.php:144 templates/settings.php:145
+#: templates/settings.php:113 templates/settings.php:114
+#: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
 msgstr "Удалить"
 
-#: 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:136
+#: templates/settings.php:141
 msgid "SSL root certificates"
 msgstr "Корневые сертификаты SSL"
 
-#: templates/settings.php:153
+#: templates/settings.php:159
 msgid "Import Root Certificate"
 msgstr "Импортировать корневые сертификаты"
diff --git a/l10n/ru_RU/files_trashbin.po b/l10n/ru_RU/files_trashbin.po
index 987521a79617bdfa78172422511e6a94a3f69b45..5d352379365593b7c8f05cff1f2c15a2a4aa8468 100644
--- a/l10n/ru_RU/files_trashbin.po
+++ b/l10n/ru_RU/files_trashbin.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-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 10:07+0000\n"
-"Last-Translator: Langaru <langaru@gmail.com>\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Language: ru_RU\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ajax/delete.php:22
+#: ajax/delete.php:40
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "%s не может быть удалён навсегда"
@@ -28,35 +28,39 @@ msgstr "%s не может быть удалён навсегда"
 msgid "Couldn't restore %s"
 msgstr "%s не может быть восстановлен"
 
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
 msgid "perform restore operation"
 msgstr "выполнить операцию восстановления"
 
-#: js/trash.js:33
+#: js/trash.js:34
 msgid "delete file permanently"
 msgstr "удалить файл навсегда"
 
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr "Удалить навсегда"
+
+#: js/trash.js:174 templates/index.php:17
 msgid "Name"
 msgstr "Имя"
 
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:175 templates/index.php:27
 msgid "Deleted"
 msgstr "Удалён"
 
-#: js/trash.js:135
+#: js/trash.js:184
 msgid "1 folder"
 msgstr "1 папка"
 
-#: js/trash.js:137
+#: js/trash.js:186
 msgid "{count} folders"
 msgstr "{количество} папок"
 
-#: js/trash.js:145
+#: js/trash.js:194
 msgid "1 file"
 msgstr "1 файл"
 
-#: js/trash.js:147
+#: js/trash.js:196
 msgid "{count} files"
 msgstr "{количество} файлов"
 
@@ -67,3 +71,11 @@ 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/ru_RU/files_versions.po b/l10n/ru_RU/files_versions.po
index 1cb13519bbbfe0ab34413316c93e54db6f8ec153..202ace6ab3c411ed5f838725059741d159993313 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-08 00:10+0100\n"
-"PO-Revision-Date: 2013-02-07 23:11+0000\n"
+"POT-Creation-Date: 2013-02-28 00:04+0100\n"
+"PO-Revision-Date: 2013-02-27 23:04+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
 "MIME-Version: 1.0\n"
@@ -49,18 +49,10 @@ msgstr ""
 msgid "No path specified"
 msgstr ""
 
-#: js/versions.js:16
-msgid "History"
-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 ""
-
-#: templates/settings.php:3
-msgid "Files Versioning"
-msgstr "Файлы управления версиями"
-
-#: templates/settings.php:4
-msgid "Enable"
-msgstr "Включить"
diff --git a/l10n/ru_RU/lib.po b/l10n/ru_RU/lib.po
index 679ada657af3365bda7110fbcd437fb8f73c513c..2ffed90f68e5f38f5e85423ebf384455b17b9c8f 100644
--- a/l10n/ru_RU/lib.po
+++ b/l10n/ru_RU/lib.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 14:33+0000\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"
 "MIME-Version: 1.0\n"
@@ -20,27 +20,27 @@ msgstr ""
 "Language: ru_RU\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: app.php:339
+#: app.php:349
 msgid "Help"
 msgstr "Помощь"
 
-#: app.php:346
+#: app.php:362
 msgid "Personal"
 msgstr "Персональный"
 
-#: app.php:351
+#: app.php:373
 msgid "Settings"
 msgstr "Настройки"
 
-#: app.php:356
+#: app.php:385
 msgid "Users"
 msgstr "Пользователи"
 
-#: app.php:363
+#: app.php:398
 msgid "Apps"
 msgstr "Приложения"
 
-#: app.php:365
+#: app.php:406
 msgid "Admin"
 msgstr "Админ"
 
@@ -52,15 +52,15 @@ msgstr "Загрузка ZIP выключена."
 msgid "Files need to be downloaded one by one."
 msgstr "Файлы должны быть загружены один за другим."
 
-#: files.php:203 files.php:228
+#: files.php:204 files.php:231
 msgid "Back to Files"
 msgstr "Обратно к файлам"
 
-#: files.php:227
+#: files.php:228
 msgid "Selected files too large to generate zip file."
 msgstr "Выбранные файлы слишком велики для генерации zip-архива."
 
-#: helper.php:226
+#: helper.php:228
 msgid "couldn't be determined"
 msgstr "не может быть определено"
 
@@ -100,87 +100,92 @@ msgstr ""
 msgid "Specify a data folder."
 msgstr ""
 
-#: setup.php:53
+#: setup.php:55
 #, php-format
 msgid "%s enter the database username."
 msgstr ""
 
-#: setup.php:56
+#: setup.php:58
 #, php-format
 msgid "%s enter the database name."
 msgstr ""
 
-#: setup.php:59
+#: setup.php:61
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr ""
 
-#: setup.php:62
+#: setup.php:64
 #, php-format
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:126 setup.php:291 setup.php:336
+#: setup.php:128 setup.php:320 setup.php:365
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:127 setup.php:150 setup.php:204
+#: setup.php:129 setup.php:152 setup.php:229
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:149 setup.php:423 setup.php:489
+#: setup.php:151 setup.php:453 setup.php:520
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:203
+#: setup.php:228
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:255 setup.php:357 setup.php:366 setup.php:384 setup.php:394
-#: setup.php:403 setup.php:430 setup.php:496 setup.php:522 setup.php:529
-#: setup.php:540 setup.php:547 setup.php:556 setup.php:564 setup.php:573
-#: setup.php:579
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:256 setup.php:358 setup.php:367 setup.php:385 setup.php:395
-#: setup.php:404 setup.php:431 setup.php:497 setup.php:523 setup.php:530
-#: setup.php:541 setup.php:557 setup.php:565 setup.php:574
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:270
+#: setup.php:299
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:271
+#: setup.php:300
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:276
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:277
+#: setup.php:306
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:548 setup.php:580
+#: setup.php:579 setup.php:611
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:644
+#: setup.php:631
+#, php-format
+msgid "MS SQL username and/or password not valid: %s"
+msgstr ""
+
+#: setup.php:849
 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:645
+#: setup.php:850
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Пожалуйста проверте дважды <a href='%s'>гиды по установке</a>."
@@ -237,16 +242,16 @@ msgstr "в прошлом году"
 msgid "years ago"
 msgstr "год назад"
 
-#: updater.php:75
+#: 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:77
+#: updater.php:81
 msgid "up to date"
 msgstr "до настоящего времени"
 
-#: updater.php:80
+#: updater.php:84
 msgid "updates check is disabled"
 msgstr "Проверка обновлений отключена"
 
diff --git a/l10n/ru_RU/settings.po b/l10n/ru_RU/settings.po
index 2f5ea18ce9a25e10d6ad5dac4465cec545022bd9..cfc0f39c99faa165c862c497902c9b127164d8f0 100644
--- a/l10n/ru_RU/settings.po
+++ b/l10n/ru_RU/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 23:05+0000\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"
 "MIME-Version: 1.0\n"
@@ -23,8 +23,8 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "Невозможно загрузить список из App Store"
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:15
-#: ajax/togglegroups.php:18
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr "Ошибка авторизации"
 
@@ -72,12 +72,12 @@ 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 "Невозможно добавить пользователя в группу %s"
 
-#: ajax/togglegroups.php:34
+#: ajax/togglegroups.php:36
 #, php-format
 msgid "Unable to remove user from group %s"
 msgstr "Невозможно удалить пользователя из группы %s"
@@ -118,7 +118,7 @@ msgstr "Ошибка"
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:96
+#: js/personal.js:99
 msgid "Saving..."
 msgstr "Сохранение"
 
@@ -147,23 +147,23 @@ msgstr "Группа Admin"
 msgid "Delete"
 msgstr "Удалить"
 
-#: js/users.js:190
+#: js/users.js:191
 msgid "add group"
 msgstr ""
 
-#: js/users.js:351
+#: js/users.js:352
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:357
+#: js/users.js:358
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
 msgid "__language_name__"
 msgstr "__язык_имя__"
 
@@ -209,19 +209,19 @@ msgstr ""
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:61
+#: templates/admin.php:63
+#, php-format
 msgid ""
-"This ownCloud server can't set system locale to "
-"\"en_US.UTF-8\"/\"en_US.UTF8\". 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 en_US.UTF-8/en_US.UTF8."
+"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:72
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:75
+#: 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 "
@@ -231,98 +231,98 @@ msgid ""
 " of ownCloud."
 msgstr ""
 
-#: templates/admin.php:89
+#: templates/admin.php:92
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:98
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:108
+#: 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:118
+#: 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:125
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:131
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:132
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:140
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:147
+#: templates/admin.php:150
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:148
+#: templates/admin.php:151
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:155
+#: templates/admin.php:158
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:161
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:165
+#: templates/admin.php:168
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:181
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:179
+#: templates/admin.php:182
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:182
+#: templates/admin.php:185
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr ""
 
-#: templates/admin.php:192
+#: templates/admin.php:195
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:193
+#: templates/admin.php:196
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:220
+#: templates/admin.php:223
 msgid "More"
 msgstr "Подробнее"
 
-#: templates/admin.php:227 templates/personal.php:98
+#: templates/admin.php:230 templates/personal.php:102
 msgid "Version"
 msgstr "Версия"
 
-#: templates/admin.php:230 templates/personal.php:100
+#: templates/admin.php:233 templates/personal.php:105
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -332,51 +332,51 @@ msgid ""
 "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>."
 
-#: templates/apps.php:10
+#: templates/apps.php:11
 msgid "Add your App"
 msgstr "Добавить Ваше приложение"
 
-#: templates/apps.php:11
+#: templates/apps.php:12
 msgid "More Apps"
 msgstr "Больше приложений"
 
-#: templates/apps.php:24
+#: templates/apps.php:28
 msgid "Select an App"
 msgstr "Выбрать приложение"
 
-#: templates/apps.php:28
+#: templates/apps.php:34
 msgid "See application page at apps.owncloud.com"
 msgstr "Обратитесь к странице приложений на apps.owncloud.com"
 
-#: templates/apps.php:29
+#: 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>"
 
-#: templates/apps.php:31
+#: templates/apps.php:38
 msgid "Update"
 msgstr "Обновить"
 
-#: templates/help.php:3
+#: 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 "Документация online"
 
-#: 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 "Коммерческая поддержка"
 
@@ -385,79 +385,79 @@ msgstr "Коммерческая поддержка"
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Вы использовали <strong>%s</strong> из возможных <strong>%s</strong>"
 
-#: templates/personal.php:14
+#: templates/personal.php:15
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:25
+#: templates/personal.php:26
 msgid "Show First Run Wizard again"
 msgstr "Вновь показать помощника первоначальной настройки"
 
-#: templates/personal.php:36 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
 msgid "Password"
 msgstr "Пароль"
 
-#: templates/personal.php:37
+#: templates/personal.php:38
 msgid "Your password was changed"
 msgstr "Ваш пароль был изменен"
 
-#: templates/personal.php:38
+#: templates/personal.php:39
 msgid "Unable to change your password"
 msgstr "Невозможно изменить Ваш пароль"
 
-#: templates/personal.php:39
+#: templates/personal.php:40
 msgid "Current password"
 msgstr "Текущий пароль"
 
-#: templates/personal.php:40
+#: templates/personal.php:42
 msgid "New password"
 msgstr "Новый пароль"
 
-#: templates/personal.php:42
+#: templates/personal.php:44
 msgid "Change password"
 msgstr "Изменить пароль"
 
-#: templates/personal.php:54 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:78
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:55
+#: templates/personal.php:57
 msgid "Your display name was changed"
 msgstr ""
 
-#: templates/personal.php:56
+#: templates/personal.php:58
 msgid "Unable to change your display name"
 msgstr ""
 
-#: templates/personal.php:59
+#: templates/personal.php:61
 msgid "Change display name"
 msgstr ""
 
-#: templates/personal.php:68
+#: templates/personal.php:70
 msgid "Email"
 msgstr "Электронная почта"
 
-#: templates/personal.php:69
+#: templates/personal.php:72
 msgid "Your email address"
 msgstr "Адрес Вашей электронной почты"
 
-#: templates/personal.php:70
+#: templates/personal.php:73
 msgid "Fill in an email address to enable password recovery"
 msgstr "Введите адрес электронной почты для возможности восстановления пароля"
 
-#: templates/personal.php:76 templates/personal.php:77
+#: templates/personal.php:79 templates/personal.php:80
 msgid "Language"
 msgstr "Язык"
 
-#: templates/personal.php:82
+#: templates/personal.php:86
 msgid "Help translate"
 msgstr "Помогите перевести"
 
-#: templates/personal.php:87
+#: templates/personal.php:91
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:89
+#: templates/personal.php:93
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "Используйте этот адрес для подключения к ownCloud в Вашем файловом менеджере"
 
diff --git a/l10n/ru_RU/user_ldap.po b/l10n/ru_RU/user_ldap.po
index 0b6b9ebf1a5b39783be624399aca49c3a4990d73..72f9dfc6cf9e9a719e9588c2c81066fdbdaafe70 100644
--- a/l10n/ru_RU/user_ldap.po
+++ b/l10n/ru_RU/user_ldap.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-08 00:10+0100\n"
-"PO-Revision-Date: 2013-02-07 23:11+0000\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"
 "MIME-Version: 1.0\n"
@@ -23,17 +23,17 @@ msgstr ""
 msgid "Failed to delete the server configuration"
 msgstr ""
 
-#: ajax/testConfiguration.php:35
+#: ajax/testConfiguration.php:36
 msgid "The configuration is valid and the connection could be established!"
 msgstr ""
 
-#: ajax/testConfiguration.php:37
+#: ajax/testConfiguration.php:39
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
 msgstr ""
 
-#: ajax/testConfiguration.php:40
+#: ajax/testConfiguration.php:43
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
@@ -88,224 +88,248 @@ msgstr "<b>Предупреждение:</b> Модуль PHP LDAP не уста
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:17
+#: templates/settings.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:23
 msgid "Host"
 msgstr "Хост"
 
-#: templates/settings.php:21
+#: templates/settings.php:25
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "Вы можете пропустить протокол, если Вам не требуется SSL. Затем начните с ldaps://"
 
-#: templates/settings.php:22
+#: templates/settings.php:26
 msgid "Base DN"
 msgstr "База DN"
 
-#: templates/settings.php:22
+#: templates/settings.php:27
 msgid "One Base DN per line"
 msgstr "Одно базовое DN на линию"
 
-#: templates/settings.php:22
+#: templates/settings.php:28
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "Вы можете задать Base DN для пользователей и групп во вкладке «Дополнительно»"
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "User DN"
 msgstr "DN пользователя"
 
-#: templates/settings.php:23
+#: templates/settings.php:32
 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:24
+#: templates/settings.php:33
 msgid "Password"
 msgstr "Пароль"
 
-#: templates/settings.php:24
+#: templates/settings.php:36
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "Для анонимного доступа оставьте поля DN и пароль пустыми."
 
-#: templates/settings.php:25
+#: templates/settings.php:37
 msgid "User Login Filter"
 msgstr "Фильтр имен пользователей"
 
-#: templates/settings.php:25
+#: templates/settings.php:40
 #, 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:25
+#: templates/settings.php:41
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "используйте %%uid заполнитель, например, \"uid=%%uid\""
 
-#: templates/settings.php:26
+#: templates/settings.php:42
 msgid "User List Filter"
 msgstr "Фильтр списка пользователей"
 
-#: templates/settings.php:26
+#: templates/settings.php:45
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Задает фильтр, применяемый при получении пользователей."
 
-#: templates/settings.php:26
+#: templates/settings.php:46
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "без каких-либо заполнителей, например, \"objectClass=person\"."
 
-#: templates/settings.php:27
+#: templates/settings.php:47
 msgid "Group Filter"
 msgstr "Групповой фильтр"
 
-#: templates/settings.php:27
+#: templates/settings.php:50
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Задает фильтр, применяемый при получении групп."
 
-#: templates/settings.php:27
+#: templates/settings.php:51
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "без каких-либо заполнителей, например, \"objectClass=posixGroup\"."
 
-#: templates/settings.php:31
+#: templates/settings.php:55
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:34
+#: templates/settings.php:58
 msgid "Port"
 msgstr "Порт"
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:60
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Use TLS"
 msgstr "Использовать TLS"
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:39
+#: templates/settings.php:63
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Нечувствительный к регистру LDAP-сервер (Windows)"
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid "Turn off SSL certificate validation."
 msgstr "Выключить проверку сертификата SSL."
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 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:40
+#: templates/settings.php:64
 msgid "Not recommended, use for testing only."
 msgstr "Не рекомендовано, используйте только для тестирования."
 
-#: templates/settings.php:41
+#: templates/settings.php:65
+msgid "Cache Time-To-Live"
+msgstr ""
+
+#: templates/settings.php:65
 msgid "in seconds. A change empties the cache."
 msgstr "в секундах. Изменение очищает кэш."
 
-#: templates/settings.php:43
+#: templates/settings.php:67
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "User Display Name Field"
 msgstr "Поле, отображаемое как имя пользователя"
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "Атрибут LDAP, используемый для создания имени пользователя в ownCloud."
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "Base User Tree"
 msgstr "Базовое дерево пользователей"
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "One User Base DN per line"
 msgstr "Одно пользовательское базовое DN на линию"
 
-#: templates/settings.php:47
+#: templates/settings.php:71
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:47 templates/settings.php:50
+#: templates/settings.php:71 templates/settings.php:74
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "Group Display Name Field"
 msgstr "Поле, отображаемое как имя группы"
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "Атрибут LDAP, используемый для создания группового имени в ownCloud."
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "Base Group Tree"
 msgstr "Базовое дерево групп"
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "One Group Base DN per line"
 msgstr "Одно групповое базовое DN на линию"
 
-#: templates/settings.php:50
+#: templates/settings.php:74
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:75
 msgid "Group-Member association"
 msgstr "Связь член-группа"
 
-#: templates/settings.php:53
+#: templates/settings.php:77
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:79
+msgid "Quota Field"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Quota Default"
+msgstr ""
+
+#: templates/settings.php:80
 msgid "in bytes"
 msgstr "в байтах"
 
-#: templates/settings.php:58
+#: templates/settings.php:81
+msgid "Email Field"
+msgstr ""
+
+#: templates/settings.php:82
+msgid "User Home Folder Naming Rule"
+msgstr ""
+
+#: templates/settings.php:82
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Оставьте пустым под имя пользователя (по умолчанию). В противном случае задайте LDAP/AD атрибут."
 
-#: templates/settings.php:62
+#: templates/settings.php:86
+msgid "Test Configuration"
+msgstr ""
+
+#: templates/settings.php:86
 msgid "Help"
 msgstr "Помощь"
diff --git a/l10n/si_LK/core.po b/l10n/si_LK/core.po
index 7d0e79ce9d06dd040d17d4fd0406d8114eff38cd..7ea576ef3202f5a6a0768c25797899b2854e71de 100644
--- a/l10n/si_LK/core.po
+++ b/l10n/si_LK/core.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 14:31+0000\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"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -389,7 +389,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 "ownCloud මුරපදය ප්‍රත්‍යාරම්භ කරන්න"
 
diff --git a/l10n/si_LK/files.po b/l10n/si_LK/files.po
index 4b00adc79e9fdcb2903c86f90fbca956cd2813cb..c745c9d510b3d67fdfd2ed60c0fabcbbffa29333 100644
--- a/l10n/si_LK/files.po
+++ b/l10n/si_LK/files.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\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: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -52,27 +52,27 @@ msgid ""
 "the HTML form"
 msgstr "උඩුගත කළ ගොනුවේ විශාලත්වය HTML පෝරමයේ නියම කළ ඇති MAX_FILE_SIZE විශාලත්වයට වඩා වැඩිය"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
 msgstr "උඩුගත කළ ගොනුවේ කොටසක් පමණක් උඩුගත විය"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:31
 msgid "No file was uploaded"
 msgstr "කිසිදු ගොනවක් උඩුගත නොවිනි"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:32
 msgid "Missing a temporary folder"
 msgstr "තාවකාලික ෆොල්ඩරයක් සොයාගත නොහැක"
 
-#: ajax/upload.php:34
+#: ajax/upload.php:33
 msgid "Failed to write to disk"
 msgstr "තැටිගත කිරීම අසාර්ථකයි"
 
-#: ajax/upload.php:52
+#: ajax/upload.php:51
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:83
+#: ajax/upload.php:82
 msgid "Invalid directory."
 msgstr ""
 
@@ -84,7 +84,7 @@ msgstr "ගොනු"
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:127 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:127 templates/index.php:92 templates/index.php:93
 msgid "Delete"
 msgstr "මකන්න"
 
@@ -92,40 +92,36 @@ msgstr "මකන්න"
 msgid "Rename"
 msgstr "නැවත නම් කරන්න"
 
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "replace"
 msgstr "ප්‍රතිස්ථාපනය කරන්න"
 
-#: js/filelist.js:253
+#: js/filelist.js:251
 msgid "suggest name"
 msgstr "නමක් යෝජනා කරන්න"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "cancel"
 msgstr "අත් හරින්න"
 
-#: js/filelist.js:295
-msgid "replaced {new_name}"
+#: js/filelist.js:298
+msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:295 js/filelist.js:297
+#: js/filelist.js:298
 msgid "undo"
 msgstr "නිෂ්ප්‍රභ කරන්න"
 
-#: js/filelist.js:297
-msgid "replaced {new_name} with {old_name}"
-msgstr ""
-
-#: js/filelist.js:322
+#: js/filelist.js:323
 msgid "perform delete operation"
 msgstr ""
 
@@ -151,74 +147,74 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:224
+#: js/files.js:225
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:261
+#: js/files.js:262
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:261
+#: js/files.js:262
 msgid "Upload Error"
 msgstr "උඩුගත කිරීමේ දෝශයක්"
 
-#: js/files.js:272
+#: js/files.js:273
 msgid "Close"
 msgstr "වසන්න"
 
-#: js/files.js:311
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr "1 ගොනුවක් උඩගත කෙරේ"
 
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr ""
 
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "උඩුගත කිරීම අත් හරින්න ලදී"
 
-#: js/files.js:496
+#: js/files.js:497
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "උඩුගතකිරීමක් සිදුවේ. පිටුව හැර යාමෙන් එය නැවතෙනු ඇත"
 
-#: js/files.js:569
+#: js/files.js:570
 msgid "URL cannot be empty."
 msgstr "යොමුව හිස් විය නොහැක"
 
-#: js/files.js:574
+#: js/files.js:575
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:953 templates/index.php:68
 msgid "Name"
 msgstr "නම"
 
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:954 templates/index.php:79
 msgid "Size"
 msgstr "ප්‍රමාණය"
 
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:955 templates/index.php:81
 msgid "Modified"
 msgstr "වෙනස් කළ"
 
-#: js/files.js:969
+#: js/files.js:974
 msgid "1 folder"
 msgstr "1 ෆොල්ඩරයක්"
 
-#: js/files.js:971
+#: js/files.js:976
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:979
+#: js/files.js:984
 msgid "1 file"
 msgstr "1 ගොනුවක්"
 
-#: js/files.js:981
+#: js/files.js:986
 msgid "{count} files"
 msgstr ""
 
@@ -282,33 +278,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr "උඩුගත කිරීම අත් හරින්න"
 
-#: templates/index.php:59
+#: templates/index.php:53
+msgid "You don’t have write permissions here."
+msgstr ""
+
+#: templates/index.php:60
 msgid "Nothing in here. Upload something!"
 msgstr "මෙහි කිසිවක් නොමැත. යමක් උඩුගත කරන්න"
 
-#: templates/index.php:73
+#: templates/index.php:74
 msgid "Download"
 msgstr "බාගත කිරීම"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:86 templates/index.php:87
 msgid "Unshare"
 msgstr "නොබෙදු"
 
-#: templates/index.php:105
+#: templates/index.php:106
 msgid "Upload too large"
 msgstr "උඩුගත කිරීම විශාල වැඩිය"
 
-#: templates/index.php:107
+#: templates/index.php:108
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "ඔබ උඩුගත කිරීමට තැත් කරන ගොනු මෙම සේවාදායකයා උඩුගත කිරීමට ඉඩදී ඇති උපරිම ගොනු විශාලත්වයට වඩා වැඩිය"
 
-#: templates/index.php:112
+#: templates/index.php:113
 msgid "Files are being scanned, please wait."
 msgstr "ගොනු පරික්ෂා කෙරේ. මඳක් රැඳී සිටින්න"
 
-#: templates/index.php:115
+#: templates/index.php:116
 msgid "Current scanning"
 msgstr "වර්තමාන පරික්ෂාව"
 
diff --git a/l10n/si_LK/files_external.po b/l10n/si_LK/files_external.po
index 1c63e48b42c4c995f2870510f6e7f8569007deaf..938dfbfadab8ef1f4dd4d23388d7b70b75407edf 100644
--- a/l10n/si_LK/files_external.po
+++ b/l10n/si_LK/files_external.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-11 23:22+0000\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"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -18,37 +18,33 @@ msgstr ""
 "Language: si_LK\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 "Dropbox ගබඩාව වින්‍යාස කිරීමේ දෝශයක් ඇත"
 
-#: 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 "කරුණාකර වලංගු Dropbox යෙදුම් යතුරක් හා රහසක් ලබාදෙන්න."
 
-#: 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 "Google Drive ගබඩාව වින්‍යාස කිරීමේ දෝශයක් ඇත"
 
-#: lib/config.php:434
+#: lib/config.php:421
 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:424
 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 "
@@ -59,63 +55,63 @@ msgstr ""
 msgid "External Storage"
 msgstr "භාහිර ගබඩාව"
 
-#: templates/settings.php:8 templates/settings.php:22
-msgid "Mount point"
-msgstr "මවුන්ට් කළ ස්ථානය"
-
-#: templates/settings.php:9
-msgid "Backend"
-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: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"
-msgstr "මවුන්ට් කරන ස්ථානයක් එකතු කරන්න"
+#: 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 "පරිශීලකයන්"
 
-#: 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 "මකා දමන්න"
 
-#: 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 "SSL මූල සහතිකයන්"
 
-#: templates/settings.php:158
+#: templates/settings.php:159
 msgid "Import Root Certificate"
 msgstr "මූල සහතිකය ආයාත කරන්න"
diff --git a/l10n/si_LK/files_trashbin.po b/l10n/si_LK/files_trashbin.po
index e19b02db18b61071be1377e1a690713e0705fdab..fd1a2c1ae8c51c9544c189a5f07325e930ef0c63 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-02-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 10:07+0000\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: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Language: si_LK\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:22
+#: ajax/delete.php:40
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
@@ -27,35 +27,39 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:33
+#: js/trash.js:34
 msgid "delete file permanently"
 msgstr ""
 
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr ""
+
+#: js/trash.js:174 templates/index.php:17
 msgid "Name"
 msgstr "නම"
 
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:175 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:135
+#: js/trash.js:184
 msgid "1 folder"
 msgstr "1 ෆොල්ඩරයක්"
 
-#: js/trash.js:137
+#: js/trash.js:186
 msgid "{count} folders"
 msgstr ""
 
-#: js/trash.js:145
+#: js/trash.js:194
 msgid "1 file"
 msgstr "1 ගොනුවක්"
 
-#: js/trash.js:147
+#: js/trash.js:196
 msgid "{count} files"
 msgstr ""
 
@@ -66,3 +70,11 @@ 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/si_LK/files_versions.po b/l10n/si_LK/files_versions.po
index a7a9fdc4990d30c5da5c576b322709eb818578e4..66e6bcb8f644c6f1fc1e129650ebfd149ba9a31b 100644
--- a/l10n/si_LK/files_versions.po
+++ b/l10n/si_LK/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-08 00:10+0100\n"
-"PO-Revision-Date: 2013-02-07 23:11+0000\n"
+"POT-Creation-Date: 2013-02-28 00:04+0100\n"
+"PO-Revision-Date: 2013-02-27 23:04+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -49,18 +49,10 @@ msgstr ""
 msgid "No path specified"
 msgstr ""
 
-#: js/versions.js:16
-msgid "History"
-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 ""
-
-#: templates/settings.php:3
-msgid "Files Versioning"
-msgstr "ගොනු අනුවාදයන්"
-
-#: templates/settings.php:4
-msgid "Enable"
-msgstr "සක්‍රිය කරන්න"
diff --git a/l10n/si_LK/lib.po b/l10n/si_LK/lib.po
index d914ff96880ca5b2fc2447e3ca4cee423cc903de..ea4c6cdb755e2f652abd6e5df913415538540277 100644
--- a/l10n/si_LK/lib.po
+++ b/l10n/si_LK/lib.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-11 15:39+0100\n"
-"PO-Revision-Date: 2013-02-11 14:41+0000\n"
+"POT-Creation-Date: 2013-02-27 14:35+0100\n"
+"PO-Revision-Date: 2013-02-27 13:36+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -19,27 +19,27 @@ msgstr ""
 "Language: si_LK\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:339
+#: app.php:349
 msgid "Help"
 msgstr "උදව්"
 
-#: app.php:346
+#: app.php:362
 msgid "Personal"
 msgstr "පෞද්ගලික"
 
-#: app.php:351
+#: app.php:373
 msgid "Settings"
 msgstr "සිටුවම්"
 
-#: app.php:356
+#: app.php:385
 msgid "Users"
 msgstr "පරිශීලකයන්"
 
-#: app.php:363
+#: app.php:398
 msgid "Apps"
 msgstr "යෙදුම්"
 
-#: app.php:365
+#: app.php:406
 msgid "Admin"
 msgstr "පරිපාලක"
 
@@ -51,15 +51,15 @@ msgstr "ZIP භාගත කිරීම් අක්‍රියයි"
 msgid "Files need to be downloaded one by one."
 msgstr "ගොනු එකින් එක භාගත යුතුයි"
 
-#: files.php:203 files.php:228
+#: files.php:204 files.php:231
 msgid "Back to Files"
 msgstr "ගොනු වෙතට නැවත යන්න"
 
-#: files.php:227
+#: files.php:228
 msgid "Selected files too large to generate zip file."
 msgstr "තෝරාගත් ගොනු ZIP ගොනුවක් තැනීමට විශාල වැඩිය."
 
-#: helper.php:226
+#: helper.php:228
 msgid "couldn't be determined"
 msgstr ""
 
@@ -99,87 +99,92 @@ msgstr ""
 msgid "Specify a data folder."
 msgstr ""
 
-#: setup.php:53
+#: setup.php:55
 #, php-format
 msgid "%s enter the database username."
 msgstr ""
 
-#: setup.php:56
+#: setup.php:58
 #, php-format
 msgid "%s enter the database name."
 msgstr ""
 
-#: setup.php:59
+#: setup.php:61
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr ""
 
-#: setup.php:62
+#: setup.php:64
 #, php-format
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:126 setup.php:291 setup.php:336
+#: setup.php:128 setup.php:320 setup.php:365
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:127 setup.php:150 setup.php:204
+#: setup.php:129 setup.php:152 setup.php:229
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:149 setup.php:423 setup.php:489
+#: setup.php:151 setup.php:453 setup.php:520
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:203
+#: setup.php:228
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:255 setup.php:357 setup.php:366 setup.php:384 setup.php:394
-#: setup.php:403 setup.php:430 setup.php:496 setup.php:522 setup.php:529
-#: setup.php:540 setup.php:547 setup.php:556 setup.php:564 setup.php:573
-#: setup.php:579
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:256 setup.php:358 setup.php:367 setup.php:385 setup.php:395
-#: setup.php:404 setup.php:431 setup.php:497 setup.php:523 setup.php:530
-#: setup.php:541 setup.php:557 setup.php:565 setup.php:574
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:270
+#: setup.php:299
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:271
+#: setup.php:300
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:276
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:277
+#: setup.php:306
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:548 setup.php:580
+#: setup.php:579 setup.php:611
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:644
+#: setup.php:631
+#, php-format
+msgid "MS SQL username and/or password not valid: %s"
+msgstr ""
+
+#: setup.php:849
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:645
+#: setup.php:850
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
@@ -236,16 +241,16 @@ msgstr "පෙර අවුරුද්දේ"
 msgid "years ago"
 msgstr "අවුරුදු කීපයකට පෙර"
 
-#: updater.php:75
+#: updater.php:78
 #, php-format
 msgid "%s is available. Get <a href=\"%s\">more information</a>"
 msgstr "%s යොදාගත හැක. <a href=\"%s\">තව විස්තර</a> ලබාගන්න"
 
-#: updater.php:77
+#: updater.php:81
 msgid "up to date"
 msgstr "යාවත්කාලීනයි"
 
-#: updater.php:80
+#: updater.php:84
 msgid "updates check is disabled"
 msgstr "යාවත්කාලීන බව පරීක්ෂණය අක්‍රියයි"
 
diff --git a/l10n/si_LK/settings.po b/l10n/si_LK/settings.po
index f63cf9b3a3d8e467965de04f8e31abff159106ee..faa4cd05a42a5e0f8688c3fae8c01a4379d8a65d 100644
--- a/l10n/si_LK/settings.po
+++ b/l10n/si_LK/settings.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 23:05+0000\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: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -24,8 +24,8 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr ""
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:15
-#: ajax/togglegroups.php:18
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr "සත්‍යාපන දෝෂයක්"
 
@@ -73,12 +73,12 @@ 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 "පරිශීලකයා %s කණ්ඩායමට එකතු කළ නොහැක"
 
-#: ajax/togglegroups.php:34
+#: ajax/togglegroups.php:36
 #, php-format
 msgid "Unable to remove user from group %s"
 msgstr "පරිශීලකයා %s කණ්ඩායමින් ඉවත් කළ නොහැක"
@@ -119,7 +119,7 @@ msgstr "දෝෂයක්"
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:96
+#: js/personal.js:99
 msgid "Saving..."
 msgstr "සුරැකෙමින් පවතී..."
 
@@ -148,23 +148,23 @@ msgstr "කාණ්ඩ පරිපාලක"
 msgid "Delete"
 msgstr "මකා දමනවා"
 
-#: js/users.js:190
+#: js/users.js:191
 msgid "add group"
 msgstr ""
 
-#: js/users.js:351
+#: js/users.js:352
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:357
+#: js/users.js:358
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
 msgid "__language_name__"
 msgstr ""
 
@@ -210,19 +210,19 @@ msgstr ""
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:61
+#: templates/admin.php:63
+#, php-format
 msgid ""
-"This ownCloud server can't set system locale to "
-"\"en_US.UTF-8\"/\"en_US.UTF8\". 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 en_US.UTF-8/en_US.UTF8."
+"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:72
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:75
+#: 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 "
@@ -232,98 +232,98 @@ msgid ""
 " of ownCloud."
 msgstr ""
 
-#: templates/admin.php:89
+#: templates/admin.php:92
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:98
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:108
+#: 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:118
+#: 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:125
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:131
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:132
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:140
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:147
+#: templates/admin.php:150
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:148
+#: templates/admin.php:151
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:155
+#: templates/admin.php:158
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:161
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:165
+#: templates/admin.php:168
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:181
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:179
+#: templates/admin.php:182
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:182
+#: templates/admin.php:185
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr ""
 
-#: templates/admin.php:192
+#: templates/admin.php:195
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:193
+#: templates/admin.php:196
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:220
+#: templates/admin.php:223
 msgid "More"
 msgstr "වැඩි"
 
-#: templates/admin.php:227 templates/personal.php:98
+#: templates/admin.php:230 templates/personal.php:102
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:230 templates/personal.php:100
+#: templates/admin.php:233 templates/personal.php:105
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -333,51 +333,51 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "නිපදන ලද්දේ <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud සමාජයෙන්</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">මුල් කේතය </a>ලයිසන්ස් කර ඇත්තේ <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> යටතේ."
 
-#: templates/apps.php:10
+#: templates/apps.php:11
 msgid "Add your App"
 msgstr "යෙදුමක් එක් කිරීම"
 
-#: templates/apps.php:11
+#: templates/apps.php:12
 msgid "More Apps"
 msgstr "තවත් යෙදුම්"
 
-#: templates/apps.php:24
+#: templates/apps.php:28
 msgid "Select an App"
 msgstr "යෙදුමක් තොරන්න"
 
-#: templates/apps.php:28
+#: templates/apps.php:34
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:29
+#: templates/apps.php:36
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
-#: templates/apps.php:31
+#: templates/apps.php:38
 msgid "Update"
 msgstr "යාවත්කාල කිරීම"
 
-#: templates/help.php:3
+#: 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 ""
 
@@ -386,79 +386,79 @@ msgstr ""
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:14
+#: templates/personal.php:15
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:25
+#: templates/personal.php:26
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:36 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
 msgid "Password"
 msgstr "මුරපදය"
 
-#: templates/personal.php:37
+#: templates/personal.php:38
 msgid "Your password was changed"
 msgstr "ඔබගේ මුර පදය වෙනස් කෙරුණි"
 
-#: templates/personal.php:38
+#: templates/personal.php:39
 msgid "Unable to change your password"
 msgstr "මුර පදය වෙනස් කළ නොහැකි විය"
 
-#: templates/personal.php:39
+#: templates/personal.php:40
 msgid "Current password"
 msgstr "වත්මන් මුරපදය"
 
-#: templates/personal.php:40
+#: templates/personal.php:42
 msgid "New password"
 msgstr "නව මුරපදය"
 
-#: templates/personal.php:42
+#: templates/personal.php:44
 msgid "Change password"
 msgstr "මුරපදය වෙනස් කිරීම"
 
-#: templates/personal.php:54 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:78
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:55
+#: templates/personal.php:57
 msgid "Your display name was changed"
 msgstr ""
 
-#: templates/personal.php:56
+#: templates/personal.php:58
 msgid "Unable to change your display name"
 msgstr ""
 
-#: templates/personal.php:59
+#: templates/personal.php:61
 msgid "Change display name"
 msgstr ""
 
-#: templates/personal.php:68
+#: templates/personal.php:70
 msgid "Email"
 msgstr "විද්‍යුත් තැපෑල"
 
-#: templates/personal.php:69
+#: templates/personal.php:72
 msgid "Your email address"
 msgstr "ඔබගේ විද්‍යුත් තැපෑල"
 
-#: templates/personal.php:70
+#: templates/personal.php:73
 msgid "Fill in an email address to enable password recovery"
 msgstr "මුරපද ප්‍රතිස්ථාපනය සඳහා විද්‍යුත් තැපැල් විස්තර ලබා දෙන්න"
 
-#: templates/personal.php:76 templates/personal.php:77
+#: templates/personal.php:79 templates/personal.php:80
 msgid "Language"
 msgstr "භාෂාව"
 
-#: templates/personal.php:82
+#: templates/personal.php:86
 msgid "Help translate"
 msgstr "පරිවර්ථන සහය"
 
-#: templates/personal.php:87
+#: templates/personal.php:91
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:89
+#: templates/personal.php:93
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
diff --git a/l10n/si_LK/user_ldap.po b/l10n/si_LK/user_ldap.po
index 992b171e9093a4414032ae2a1061ca98dc55fb4d..a08af3b4ceea9407b4264d9e27f2de41d95005e0 100644
--- a/l10n/si_LK/user_ldap.po
+++ b/l10n/si_LK/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-08 00:10+0100\n"
-"PO-Revision-Date: 2013-02-07 23:11+0000\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: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -22,17 +22,17 @@ msgstr ""
 msgid "Failed to delete the server configuration"
 msgstr ""
 
-#: ajax/testConfiguration.php:35
+#: ajax/testConfiguration.php:36
 msgid "The configuration is valid and the connection could be established!"
 msgstr ""
 
-#: ajax/testConfiguration.php:37
+#: ajax/testConfiguration.php:39
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
 msgstr ""
 
-#: ajax/testConfiguration.php:40
+#: ajax/testConfiguration.php:43
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
@@ -87,224 +87,248 @@ msgstr ""
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:17
+#: templates/settings.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:23
 msgid "Host"
 msgstr "සත්කාරකය"
 
-#: templates/settings.php:21
+#: templates/settings.php:25
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "SSL අවශ්‍යය වන විට පමණක් හැර, අන් අවස්ථාවන්හිදී ප්‍රොටොකෝලය අත් හැරිය හැක. භාවිතා කරන විට ldaps:// ලෙස ආරම්භ කරන්න"
 
-#: templates/settings.php:22
+#: templates/settings.php:26
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:27
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:28
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:32
 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:24
+#: templates/settings.php:33
 msgid "Password"
 msgstr "මුර පදය"
 
-#: templates/settings.php:24
+#: templates/settings.php:36
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:37
 msgid "User Login Filter"
 msgstr "පරිශීලක පිවිසුම් පෙරහන"
 
-#: templates/settings.php:25
+#: templates/settings.php:40
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:41
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:42
 msgid "User List Filter"
 msgstr "පරිශීලක ලැයිස්තු පෙරහන"
 
-#: templates/settings.php:26
+#: templates/settings.php:45
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:46
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:47
 msgid "Group Filter"
 msgstr "කණ්ඩායම් පෙරහන"
 
-#: templates/settings.php:27
+#: templates/settings.php:50
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "කණ්ඩායම් සොයා ලබාගන්නා විට, යොදන පෙරහන නියම කරයි"
 
-#: templates/settings.php:27
+#: templates/settings.php:51
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:55
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:34
+#: templates/settings.php:58
 msgid "Port"
 msgstr "තොට"
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:60
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Use TLS"
 msgstr "TLS භාවිතා කරන්න"
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:39
+#: templates/settings.php:63
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid "Not recommended, use for testing only."
 msgstr "නිර්දේශ කළ නොහැක. පරීක්ෂණ සඳහා පමණක් භාවිත කරන්න"
 
-#: templates/settings.php:41
+#: templates/settings.php:65
+msgid "Cache Time-To-Live"
+msgstr ""
+
+#: templates/settings.php:65
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:67
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:47
+#: templates/settings.php:71
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:47 templates/settings.php:50
+#: templates/settings.php:71 templates/settings.php:74
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:74
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:75
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:77
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:79
+msgid "Quota Field"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Quota Default"
+msgstr ""
+
+#: templates/settings.php:80
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:81
+msgid "Email Field"
+msgstr ""
+
+#: templates/settings.php:82
+msgid "User Home Folder Naming Rule"
+msgstr ""
+
+#: templates/settings.php:82
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:62
+#: templates/settings.php:86
+msgid "Test Configuration"
+msgstr ""
+
+#: templates/settings.php:86
 msgid "Help"
 msgstr "උදව්"
diff --git a/l10n/sk/files.po b/l10n/sk/files.po
index 7645aa9b5493f06af4ae9850921633145e2a3455..dc487bdeeb258e1c097ab3e3c71fc890693b140e 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-02-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\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: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
 "MIME-Version: 1.0\n"
@@ -50,27 +50,27 @@ msgid ""
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:31
+#: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:32
+#: ajax/upload.php:31
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:33
+#: ajax/upload.php:32
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:34
+#: ajax/upload.php:33
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:52
+#: ajax/upload.php:51
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:83
+#: ajax/upload.php:82
 msgid "Invalid directory."
 msgstr ""
 
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:127 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:127 templates/index.php:92 templates/index.php:93
 msgid "Delete"
 msgstr ""
 
@@ -90,40 +90,36 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:253
+#: js/filelist.js:251
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:295
-msgid "replaced {new_name}"
+#: js/filelist.js:298
+msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:295 js/filelist.js:297
+#: js/filelist.js:298
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:297
-msgid "replaced {new_name} with {old_name}"
-msgstr ""
-
-#: js/filelist.js:322
+#: js/filelist.js:323
 msgid "perform delete operation"
 msgstr ""
 
@@ -149,74 +145,74 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:224
+#: js/files.js:225
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:261
+#: js/files.js:262
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:261
+#: js/files.js:262
 msgid "Upload Error"
 msgstr ""
 
-#: js/files.js:272
+#: js/files.js:273
 msgid "Close"
 msgstr ""
 
-#: js/files.js:311
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr ""
 
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr ""
 
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:496
+#: js/files.js:497
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:569
+#: js/files.js:570
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:574
+#: js/files.js:575
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:953 templates/index.php:68
 msgid "Name"
 msgstr ""
 
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:954 templates/index.php:79
 msgid "Size"
 msgstr ""
 
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:955 templates/index.php:81
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:969
+#: js/files.js:974
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:971
+#: js/files.js:976
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:979
+#: js/files.js:984
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:981
+#: js/files.js:986
 msgid "{count} files"
 msgstr ""
 
@@ -280,33 +276,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:53
+msgid "You don’t have write permissions here."
+msgstr ""
+
+#: templates/index.php:60
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:73
+#: templates/index.php:74
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:86 templates/index.php:87
 msgid "Unshare"
 msgstr ""
 
-#: templates/index.php:105
+#: templates/index.php:106
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:107
+#: templates/index.php:108
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:112
+#: templates/index.php:113
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:115
+#: templates/index.php:116
 msgid "Current scanning"
 msgstr ""
 
diff --git a/l10n/sk/files_external.po b/l10n/sk/files_external.po
index 3c72b5b471470936059969dfe224a32b1c2011aa..685594af3ea5fe4aa1f9cbc87f09f987949e8a62 100644
--- a/l10n/sk/files_external.po
+++ b/l10n/sk/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-09 00:12+0100\n"
-"PO-Revision-Date: 2012-08-12 22:34+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-02-28 00:04+0100\n"
+"PO-Revision-Date: 2013-02-27 23:04+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,37 +17,33 @@ msgstr ""
 "Language: sk\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\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:405
+#: lib/config.php:421
 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:406
+#: lib/config.php:424
 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 "
@@ -58,63 +54,63 @@ msgstr ""
 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 ""
 
-#: templates/settings.php:108 templates/settings.php:109
-#: templates/settings.php:144 templates/settings.php:145
+#: templates/settings.php:113 templates/settings.php:114
+#: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
 msgstr ""
 
-#: 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:136
+#: templates/settings.php:141
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:153
+#: templates/settings.php:159
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/sk/files_trashbin.po b/l10n/sk/files_trashbin.po
index 8655044756660973bca07542240635e6b95c6263..39049d7953472c5ff5c098aafb92dce40ad51cb8 100644
--- a/l10n/sk/files_trashbin.po
+++ b/l10n/sk/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-02-09 00:12+0100\n"
-"PO-Revision-Date: 2013-01-31 16:03+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Language: sk\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: ajax/delete.php:22
+#: ajax/delete.php:40
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
@@ -27,35 +27,39 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:33
+#: js/trash.js:34
 msgid "delete file permanently"
 msgstr ""
 
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr ""
+
+#: js/trash.js:174 templates/index.php:17
 msgid "Name"
 msgstr ""
 
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:175 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:135
+#: js/trash.js:184
 msgid "1 folder"
 msgstr ""
 
-#: js/trash.js:137
+#: js/trash.js:186
 msgid "{count} folders"
 msgstr ""
 
-#: js/trash.js:145
+#: js/trash.js:194
 msgid "1 file"
 msgstr ""
 
-#: js/trash.js:147
+#: js/trash.js:196
 msgid "{count} files"
 msgstr ""
 
@@ -66,3 +70,11 @@ 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/sk/files_versions.po b/l10n/sk/files_versions.po
index dd26d70a1ccec158fe47384e0c23fb33245e41b3..c273fd68fbdc2917eb6b2edc2afdb6c32b0352ce 100644
--- a/l10n/sk/files_versions.po
+++ b/l10n/sk/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-09 00:12+0100\n"
-"PO-Revision-Date: 2012-08-12 22:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-02-28 00:04+0100\n"
+"PO-Revision-Date: 2013-02-27 23:04+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -48,18 +48,10 @@ msgstr ""
 msgid "No path specified"
 msgstr ""
 
-#: js/versions.js:16
-msgid "History"
+#: 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 ""
-
-#: templates/settings.php:3
-msgid "Files Versioning"
-msgstr ""
-
-#: templates/settings.php:4
-msgid "Enable"
-msgstr ""
diff --git a/l10n/sk/lib.po b/l10n/sk/lib.po
index 598f2b64413f8e1f2245a80c629d9e7371a49957..68541eae87db4abad53a83e44f7fd6060d977b48 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-11 15:39+0100\n"
-"PO-Revision-Date: 2013-02-11 14:41+0000\n"
+"POT-Creation-Date: 2013-02-27 14:35+0100\n"
+"PO-Revision-Date: 2013-02-27 13:36+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,27 +17,27 @@ msgstr ""
 "Language: sk\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: app.php:339
+#: app.php:349
 msgid "Help"
 msgstr ""
 
-#: app.php:346
+#: app.php:362
 msgid "Personal"
 msgstr ""
 
-#: app.php:351
+#: app.php:373
 msgid "Settings"
 msgstr ""
 
-#: app.php:356
+#: app.php:385
 msgid "Users"
 msgstr ""
 
-#: app.php:363
+#: app.php:398
 msgid "Apps"
 msgstr ""
 
-#: app.php:365
+#: app.php:406
 msgid "Admin"
 msgstr ""
 
@@ -49,15 +49,15 @@ msgstr ""
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:203 files.php:228
+#: files.php:204 files.php:231
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:227
+#: files.php:228
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: helper.php:226
+#: helper.php:228
 msgid "couldn't be determined"
 msgstr ""
 
@@ -97,87 +97,92 @@ msgstr ""
 msgid "Specify a data folder."
 msgstr ""
 
-#: setup.php:53
+#: setup.php:55
 #, php-format
 msgid "%s enter the database username."
 msgstr ""
 
-#: setup.php:56
+#: setup.php:58
 #, php-format
 msgid "%s enter the database name."
 msgstr ""
 
-#: setup.php:59
+#: setup.php:61
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr ""
 
-#: setup.php:62
+#: setup.php:64
 #, php-format
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:126 setup.php:291 setup.php:336
+#: setup.php:128 setup.php:320 setup.php:365
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:127 setup.php:150 setup.php:204
+#: setup.php:129 setup.php:152 setup.php:229
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:149 setup.php:423 setup.php:489
+#: setup.php:151 setup.php:453 setup.php:520
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:203
+#: setup.php:228
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:255 setup.php:357 setup.php:366 setup.php:384 setup.php:394
-#: setup.php:403 setup.php:430 setup.php:496 setup.php:522 setup.php:529
-#: setup.php:540 setup.php:547 setup.php:556 setup.php:564 setup.php:573
-#: setup.php:579
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:256 setup.php:358 setup.php:367 setup.php:385 setup.php:395
-#: setup.php:404 setup.php:431 setup.php:497 setup.php:523 setup.php:530
-#: setup.php:541 setup.php:557 setup.php:565 setup.php:574
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:270
+#: setup.php:299
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:271
+#: setup.php:300
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:276
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:277
+#: setup.php:306
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:548 setup.php:580
+#: setup.php:579 setup.php:611
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:644
+#: setup.php:631
+#, php-format
+msgid "MS SQL username and/or password not valid: %s"
+msgstr ""
+
+#: setup.php:849
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:645
+#: setup.php:850
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
@@ -234,16 +239,16 @@ msgstr ""
 msgid "years ago"
 msgstr ""
 
-#: updater.php:75
+#: updater.php:78
 #, php-format
 msgid "%s is available. Get <a href=\"%s\">more information</a>"
 msgstr ""
 
-#: updater.php:77
+#: updater.php:81
 msgid "up to date"
 msgstr ""
 
-#: updater.php:80
+#: updater.php:84
 msgid "updates check is disabled"
 msgstr ""
 
diff --git a/l10n/sk/settings.po b/l10n/sk/settings.po
index b26e19c025a32321d2f80a6022accad8554d85cf..f2e8a802d76a408e2d05be35c1da481edaa97f24 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-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 23:05+0000\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: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
 "MIME-Version: 1.0\n"
@@ -21,8 +21,8 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr ""
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:15
-#: ajax/togglegroups.php:18
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr ""
 
@@ -70,12 +70,12 @@ 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 ""
@@ -116,7 +116,7 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:96
+#: js/personal.js:99
 msgid "Saving..."
 msgstr ""
 
@@ -145,23 +145,23 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
-#: js/users.js:190
+#: js/users.js:191
 msgid "add group"
 msgstr ""
 
-#: js/users.js:351
+#: js/users.js:352
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:357
+#: js/users.js:358
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
 msgid "__language_name__"
 msgstr ""
 
@@ -207,19 +207,19 @@ msgstr ""
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:61
+#: templates/admin.php:63
+#, php-format
 msgid ""
-"This ownCloud server can't set system locale to "
-"\"en_US.UTF-8\"/\"en_US.UTF8\". 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 en_US.UTF-8/en_US.UTF8."
+"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:72
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:75
+#: 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 "
@@ -229,98 +229,98 @@ msgid ""
 " of ownCloud."
 msgstr ""
 
-#: templates/admin.php:89
+#: templates/admin.php:92
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:98
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:108
+#: 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:118
+#: 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:125
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:131
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:132
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:140
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:147
+#: templates/admin.php:150
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:148
+#: templates/admin.php:151
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:155
+#: templates/admin.php:158
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:161
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:165
+#: templates/admin.php:168
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:181
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:179
+#: templates/admin.php:182
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:182
+#: templates/admin.php:185
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr ""
 
-#: templates/admin.php:192
+#: templates/admin.php:195
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:193
+#: templates/admin.php:196
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:220
+#: templates/admin.php:223
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:227 templates/personal.php:98
+#: templates/admin.php:230 templates/personal.php:102
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:230 templates/personal.php:100
+#: templates/admin.php:233 templates/personal.php:105
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -330,51 +330,51 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr ""
 
-#: templates/apps.php:10
+#: templates/apps.php:11
 msgid "Add your App"
 msgstr ""
 
-#: templates/apps.php:11
+#: templates/apps.php:12
 msgid "More Apps"
 msgstr ""
 
-#: templates/apps.php:24
+#: templates/apps.php:28
 msgid "Select an App"
 msgstr ""
 
-#: templates/apps.php:28
+#: templates/apps.php:34
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:29
+#: templates/apps.php:36
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
-#: templates/apps.php:31
+#: templates/apps.php:38
 msgid "Update"
 msgstr ""
 
-#: templates/help.php:3
+#: 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 ""
 
@@ -383,79 +383,79 @@ msgstr ""
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:14
+#: templates/personal.php:15
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:25
+#: templates/personal.php:26
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:36 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
 msgid "Password"
 msgstr ""
 
-#: templates/personal.php:37
+#: templates/personal.php:38
 msgid "Your password was changed"
 msgstr ""
 
-#: templates/personal.php:38
+#: templates/personal.php:39
 msgid "Unable to change your password"
 msgstr ""
 
-#: templates/personal.php:39
+#: templates/personal.php:40
 msgid "Current password"
 msgstr ""
 
-#: templates/personal.php:40
+#: templates/personal.php:42
 msgid "New password"
 msgstr ""
 
-#: templates/personal.php:42
+#: templates/personal.php:44
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:54 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:78
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:55
+#: templates/personal.php:57
 msgid "Your display name was changed"
 msgstr ""
 
-#: templates/personal.php:56
+#: templates/personal.php:58
 msgid "Unable to change your display name"
 msgstr ""
 
-#: templates/personal.php:59
+#: templates/personal.php:61
 msgid "Change display name"
 msgstr ""
 
-#: templates/personal.php:68
+#: templates/personal.php:70
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:69
+#: templates/personal.php:72
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:70
+#: templates/personal.php:73
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:76 templates/personal.php:77
+#: templates/personal.php:79 templates/personal.php:80
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:82
+#: templates/personal.php:86
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:87
+#: templates/personal.php:91
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:89
+#: templates/personal.php:93
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
diff --git a/l10n/sk/user_ldap.po b/l10n/sk/user_ldap.po
index 3148a0621610d1c22de02b96a7d1835b5951d138..a22107c718ce8de2310f3769d1bac920a21f2892 100644
--- a/l10n/sk/user_ldap.po
+++ b/l10n/sk/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-09 00:12+0100\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,17 +21,17 @@ msgstr ""
 msgid "Failed to delete the server configuration"
 msgstr ""
 
-#: ajax/testConfiguration.php:35
+#: ajax/testConfiguration.php:36
 msgid "The configuration is valid and the connection could be established!"
 msgstr ""
 
-#: ajax/testConfiguration.php:37
+#: ajax/testConfiguration.php:39
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
 msgstr ""
 
-#: ajax/testConfiguration.php:40
+#: ajax/testConfiguration.php:43
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
@@ -86,224 +86,248 @@ msgstr ""
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:17
+#: templates/settings.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:23
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:25
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:26
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:27
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:28
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:32
 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:24
+#: templates/settings.php:33
 msgid "Password"
 msgstr ""
 
-#: templates/settings.php:24
+#: templates/settings.php:36
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:37
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:40
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:41
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:42
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:45
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:46
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:47
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:50
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:51
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:55
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:34
+#: templates/settings.php:58
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:60
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:39
+#: templates/settings.php:63
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:65
+msgid "Cache Time-To-Live"
+msgstr ""
+
+#: templates/settings.php:65
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:67
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:47
+#: templates/settings.php:71
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:47 templates/settings.php:50
+#: templates/settings.php:71 templates/settings.php:74
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:74
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:75
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:77
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:79
+msgid "Quota Field"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Quota Default"
+msgstr ""
+
+#: templates/settings.php:80
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:81
+msgid "Email Field"
+msgstr ""
+
+#: templates/settings.php:82
+msgid "User Home Folder Naming Rule"
+msgstr ""
+
+#: templates/settings.php:82
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:62
+#: templates/settings.php:86
+msgid "Test Configuration"
+msgstr ""
+
+#: templates/settings.php:86
 msgid "Help"
 msgstr ""
diff --git a/l10n/sk_SK/core.po b/l10n/sk_SK/core.po
index bac83aa35ff89e1b9cbda2f9599842d4efb7041d..f190736828ffbc22cab89fad3a989019b614f753 100644
--- a/l10n/sk_SK/core.po
+++ b/l10n/sk_SK/core.po
@@ -14,8 +14,8 @@ 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 14:32+0000\n"
+"POT-Creation-Date: 2013-03-04 00:06+0100\n"
+"PO-Revision-Date: 2013-03-03 14:40+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"
@@ -24,33 +24,33 @@ msgstr ""
 "Language: sk_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 "Používateľ %s zdieľa s Vami súbor"
 
-#: ajax/share.php:87
+#: ajax/share.php:99
 #, php-format
 msgid "User %s shared a folder with you"
-msgstr "Používateľ %s zdieľa s Vami adresár"
+msgstr "Používateľ %s zdieľa s Vami priečinok"
 
-#: 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 "Používateľ %s zdieľa s Vami súbor \"%s\".  Môžete si ho stiahnuť tu: %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 "Používateľ %s zdieľa s Vami adresár \"%s\".  Môžete si ho stiahnuť tu: %s"
+msgstr "Používateľ %s zdieľa s Vami priečinok \"%s\".  Môžete si ho stiahnuť tu: %s"
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
-msgstr "Neposkytnutý kategorický typ."
+msgstr "Neposkytnutý typ kategórie."
 
 #: ajax/vcategories/add.php:30
 msgid "No category to add?"
@@ -59,7 +59,7 @@ msgstr "Žiadna kategória pre pridanie?"
 #: ajax/vcategories/add.php:37
 #, php-format
 msgid "This category already exists: %s"
-msgstr "Kategéria: %s už existuje."
+msgstr "Kategória: %s už existuje."
 
 #: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
 #: ajax/vcategories/favorites.php:24
@@ -87,79 +87,79 @@ msgstr "Neboli vybrané žiadne kategórie pre odstránenie."
 msgid "Error removing %s from favorites."
 msgstr "Chyba pri odstraňovaní %s z obľúbených položiek."
 
-#: js/config.php:32
+#: js/config.php:34
 msgid "Sunday"
 msgstr "Nedeľa"
 
-#: js/config.php:32
+#: js/config.php:35
 msgid "Monday"
 msgstr "Pondelok"
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Tuesday"
 msgstr "Utorok"
 
-#: js/config.php:32
+#: js/config.php:37
 msgid "Wednesday"
 msgstr "Streda"
 
-#: js/config.php:32
+#: js/config.php:38
 msgid "Thursday"
 msgstr "Štvrtok"
 
-#: js/config.php:32
+#: js/config.php:39
 msgid "Friday"
 msgstr "Piatok"
 
-#: js/config.php:32
+#: js/config.php:40
 msgid "Saturday"
 msgstr "Sobota"
 
-#: js/config.php:33
+#: js/config.php:45
 msgid "January"
 msgstr "Január"
 
-#: js/config.php:33
+#: js/config.php:46
 msgid "February"
 msgstr "Február"
 
-#: js/config.php:33
+#: js/config.php:47
 msgid "March"
 msgstr "Marec"
 
-#: js/config.php:33
+#: js/config.php:48
 msgid "April"
 msgstr "Apríl"
 
-#: js/config.php:33
+#: js/config.php:49
 msgid "May"
 msgstr "Máj"
 
-#: 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 "August"
 
-#: 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 "November"
 
-#: js/config.php:33
+#: js/config.php:56
 msgid "December"
 msgstr "December"
 
@@ -167,55 +167,55 @@ msgstr "December"
 msgid "Settings"
 msgstr "Nastavenia"
 
-#: js/js.js:767
+#: js/js.js:777
 msgid "seconds ago"
 msgstr "pred sekundami"
 
-#: js/js.js:768
+#: js/js.js:778
 msgid "1 minute ago"
 msgstr "pred minútou"
 
-#: js/js.js:769
+#: js/js.js:779
 msgid "{minutes} minutes ago"
 msgstr "pred {minutes} minútami"
 
-#: js/js.js:770
+#: js/js.js:780
 msgid "1 hour ago"
 msgstr "Pred 1 hodinou."
 
-#: js/js.js:771
+#: js/js.js:781
 msgid "{hours} hours ago"
 msgstr "Pred {hours} hodinami."
 
-#: js/js.js:772
+#: js/js.js:782
 msgid "today"
 msgstr "dnes"
 
-#: js/js.js:773
+#: js/js.js:783
 msgid "yesterday"
 msgstr "včera"
 
-#: js/js.js:774
+#: js/js.js:784
 msgid "{days} days ago"
 msgstr "pred {days} dňami"
 
-#: js/js.js:775
+#: js/js.js:785
 msgid "last month"
 msgstr "minulý mesiac"
 
-#: js/js.js:776
+#: js/js.js:786
 msgid "{months} months ago"
 msgstr "Pred {months} mesiacmi."
 
-#: js/js.js:777
+#: js/js.js:787
 msgid "months ago"
 msgstr "pred mesiacmi"
 
-#: js/js.js:778
+#: js/js.js:788
 msgid "last year"
 msgstr "minulý rok"
 
-#: js/js.js:779
+#: js/js.js:789
 msgid "years ago"
 msgstr "pred rokmi"
 
@@ -256,7 +256,7 @@ msgstr "Nešpecifikované meno aplikácie."
 
 #: js/oc-vcategories.js:194
 msgid "The required file {file} is not installed!"
-msgstr "Požadovaný súbor {file} nie je inštalovaný!"
+msgstr "Požadovaný súbor {file} nie je nainštalovaný!"
 
 #: js/share.js:29 js/share.js:43 js/share.js:90
 msgid "Shared"
@@ -264,7 +264,7 @@ msgstr "Zdieľané"
 
 #: js/share.js:93
 msgid "Share"
-msgstr "Zdieľaj"
+msgstr "Zdieľať"
 
 #: js/share.js:141 js/share.js:622
 msgid "Error while sharing"
@@ -298,13 +298,13 @@ msgstr "Zdieľať cez odkaz"
 msgid "Password protect"
 msgstr "Chrániť heslom"
 
-#: js/share.js:185 templates/installation.php:44 templates/login.php:35
+#: js/share.js:185 templates/installation.php:47 templates/login.php:35
 msgid "Password"
 msgstr "Heslo"
 
 #: js/share.js:189
 msgid "Email link to person"
-msgstr "Odoslať odkaz osobe e-mailom"
+msgstr "Odoslať odkaz emailom"
 
 #: js/share.js:190
 msgid "Send"
@@ -344,7 +344,7 @@ msgstr "môže upraviť"
 
 #: js/share.js:327
 msgid "access control"
-msgstr "riadenie prístupu"
+msgstr "prístupové práva"
 
 #: js/share.js:330
 msgid "create"
@@ -352,11 +352,11 @@ msgstr "vytvoriť"
 
 #: js/share.js:333
 msgid "update"
-msgstr "aktualizácia"
+msgstr "aktualizovať"
 
 #: js/share.js:336
 msgid "delete"
-msgstr "zmazať"
+msgstr "vymazať"
 
 #: js/share.js:339
 msgid "share"
@@ -368,11 +368,11 @@ msgstr "Chránené heslom"
 
 #: js/share.js:582
 msgid "Error unsetting expiration date"
-msgstr "Chyba pri odstraňovaní dátumu vypršania platnosti"
+msgstr "Chyba pri odstraňovaní dátumu expirácie"
 
 #: js/share.js:594
 msgid "Error setting expiration date"
-msgstr "Chyba pri nastavení dátumu vypršania platnosti"
+msgstr "Chyba pri nastavení dátumu expirácie"
 
 #: js/share.js:609
 msgid "Sending ..."
@@ -391,9 +391,9 @@ msgstr "Aktualizácia nebola úspešná. Problém nahláste na <a href=\"https:/
 
 #: js/update.js:18
 msgid "The update was successful. Redirecting you to ownCloud now."
-msgstr "Aktualizácia bola úspešná. Presmerovávam na ownCloud."
+msgstr "Aktualizácia bola úspešná. Presmerovávam na prihlasovaciu stránku."
 
-#: lostpassword/controller.php:47
+#: lostpassword/controller.php:48
 msgid "ownCloud password reset"
 msgstr "Obnovenie hesla pre ownCloud"
 
@@ -413,7 +413,7 @@ msgstr "Obnovovací email bol odoslaný."
 msgid "Request failed!"
 msgstr "Požiadavka zlyhala!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:39
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:41
 #: templates/login.php:28
 msgid "Username"
 msgstr "Prihlasovacie meno"
@@ -436,7 +436,7 @@ msgstr "Nové heslo"
 
 #: lostpassword/templates/resetpassword.php:11
 msgid "Reset password"
-msgstr "Obnova hesla"
+msgstr "Obnovenie hesla"
 
 #: strings.php:5
 msgid "Personal"
@@ -474,85 +474,86 @@ msgstr "Úprava kategórií"
 msgid "Add"
 msgstr "Pridať"
 
-#: templates/installation.php:23 templates/installation.php:30
+#: templates/installation.php:24 templates/installation.php:31
 msgid "Security Warning"
 msgstr "Bezpečnostné varovanie"
 
-#: templates/installation.php:24
+#: templates/installation.php:25
 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:25
+#: templates/installation.php:26
 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:31
+#: templates/installation.php:32
 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:32
+#: templates/installation.php:33
 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:36
+#: templates/installation.php:37
 msgid "Create an <strong>admin account</strong>"
 msgstr "Vytvoriť <strong>administrátorský účet</strong>"
 
-#: templates/installation.php:52
+#: templates/installation.php:55
 msgid "Advanced"
-msgstr "Pokročilé"
+msgstr "Rozšírené"
 
-#: templates/installation.php:54
+#: templates/installation.php:57
 msgid "Data folder"
 msgstr "Priečinok dát"
 
-#: templates/installation.php:61
+#: templates/installation.php:66
 msgid "Configure the database"
 msgstr "Nastaviť databázu"
 
-#: templates/installation.php:66 templates/installation.php:77
-#: templates/installation.php:87 templates/installation.php:97
+#: templates/installation.php:71 templates/installation.php:83
+#: templates/installation.php:94 templates/installation.php:105
+#: templates/installation.php:117
 msgid "will be used"
 msgstr "bude použité"
 
-#: templates/installation.php:109
+#: templates/installation.php:129
 msgid "Database user"
 msgstr "Hostiteľ databázy"
 
-#: templates/installation.php:113
+#: templates/installation.php:134
 msgid "Database password"
 msgstr "Heslo databázy"
 
-#: templates/installation.php:117
+#: templates/installation.php:139
 msgid "Database name"
 msgstr "Meno databázy"
 
-#: templates/installation.php:125
+#: templates/installation.php:149
 msgid "Database tablespace"
 msgstr "Tabuľkový priestor databázy"
 
-#: templates/installation.php:131
+#: templates/installation.php:156
 msgid "Database host"
 msgstr "Server databázy"
 
-#: templates/installation.php:136
+#: templates/installation.php:162
 msgid "Finish setup"
 msgstr "Dokončiť inštaláciu"
 
-#: templates/layout.guest.php:33
+#: templates/layout.guest.php:40
 msgid "web services under your control"
 msgstr "webové služby pod vašou kontrolou"
 
-#: templates/layout.user.php:48
+#: templates/layout.user.php:58
 msgid "Log out"
 msgstr "Odhlásiť"
 
@@ -584,7 +585,7 @@ msgstr "Prihlásiť sa"
 
 #: templates/login.php:49
 msgid "Alternative Logins"
-msgstr "Altrnatívne loginy"
+msgstr "Alternatívne prihlasovanie"
 
 #: templates/part.pagenavi.php:3
 msgid "prev"
diff --git a/l10n/sk_SK/files.po b/l10n/sk_SK/files.po
index 8893c32c4374fe9d757a398eee29efa5c7bf42d2..f810df29b21c87c9bf16a8f7d5399bbd3124cd8a 100644
--- a/l10n/sk_SK/files.po
+++ b/l10n/sk_SK/files.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\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: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
@@ -56,27 +56,27 @@ msgid ""
 "the HTML form"
 msgstr "Nahrávaný súbor presiahol MAX_FILE_SIZE direktívu, ktorá bola špecifikovaná v HTML formulári"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
 msgstr "Nahrávaný súbor bol iba čiastočne nahraný"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:31
 msgid "No file was uploaded"
 msgstr "Žiaden súbor nebol nahraný"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:32
 msgid "Missing a temporary folder"
 msgstr "Chýbajúci dočasný priečinok"
 
-#: ajax/upload.php:34
+#: ajax/upload.php:33
 msgid "Failed to write to disk"
 msgstr "Zápis na disk sa nepodaril"
 
-#: ajax/upload.php:52
+#: ajax/upload.php:51
 msgid "Not enough storage available"
 msgstr "Nedostatok dostupného úložného priestoru"
 
-#: ajax/upload.php:83
+#: ajax/upload.php:82
 msgid "Invalid directory."
 msgstr "Neplatný priečinok"
 
@@ -88,7 +88,7 @@ msgstr "Súbory"
 msgid "Delete permanently"
 msgstr "Zmazať  trvalo"
 
-#: js/fileactions.js:127 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:127 templates/index.php:92 templates/index.php:93
 msgid "Delete"
 msgstr "Odstrániť"
 
@@ -96,40 +96,36 @@ msgstr "Odstrániť"
 msgid "Rename"
 msgstr "Premenovať"
 
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
 msgid "Pending"
 msgstr "Čaká sa"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "{new_name} already exists"
 msgstr "{new_name} už existuje"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "replace"
 msgstr "nahradiť"
 
-#: js/filelist.js:253
+#: js/filelist.js:251
 msgid "suggest name"
 msgstr "pomôcť s menom"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "cancel"
 msgstr "zrušiť"
 
-#: js/filelist.js:295
-msgid "replaced {new_name}"
-msgstr "prepísaný {new_name}"
+#: js/filelist.js:298
+msgid "replaced {new_name} with {old_name}"
+msgstr "prepísaný {new_name} súborom {old_name}"
 
-#: js/filelist.js:295 js/filelist.js:297
+#: js/filelist.js:298
 msgid "undo"
 msgstr "vrátiť"
 
-#: js/filelist.js:297
-msgid "replaced {new_name} with {old_name}"
-msgstr "prepísaný {new_name} súborom {old_name}"
-
-#: js/filelist.js:322
+#: js/filelist.js:323
 msgid "perform delete operation"
 msgstr "vykonať zmazanie"
 
@@ -155,74 +151,74 @@ 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:224
+#: js/files.js:225
 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:261
+#: js/files.js:262
 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."
 
-#: js/files.js:261
+#: js/files.js:262
 msgid "Upload Error"
 msgstr "Chyba odosielania"
 
-#: js/files.js:272
+#: js/files.js:273
 msgid "Close"
 msgstr "Zavrieť"
 
-#: js/files.js:311
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr "1 súbor sa posiela "
 
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: 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:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "Odosielanie zrušené"
 
-#: js/files.js:496
+#: js/files.js:497
 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:569
+#: js/files.js:570
 msgid "URL cannot be empty."
 msgstr "URL nemôže byť prázdne"
 
-#: js/files.js:574
+#: js/files.js:575
 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:948 templates/index.php:67
+#: js/files.js:953 templates/index.php:68
 msgid "Name"
 msgstr "Meno"
 
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:954 templates/index.php:79
 msgid "Size"
 msgstr "Veľkosť"
 
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:955 templates/index.php:81
 msgid "Modified"
 msgstr "Upravené"
 
-#: js/files.js:969
+#: js/files.js:974
 msgid "1 folder"
 msgstr "1 priečinok"
 
-#: js/files.js:971
+#: js/files.js:976
 msgid "{count} folders"
 msgstr "{count} priečinkov"
 
-#: js/files.js:979
+#: js/files.js:984
 msgid "1 file"
 msgstr "1 súbor"
 
-#: js/files.js:981
+#: js/files.js:986
 msgid "{count} files"
 msgstr "{count} súborov"
 
@@ -280,39 +276,43 @@ msgstr "Z odkazu"
 
 #: templates/index.php:40
 msgid "Deleted files"
-msgstr ""
+msgstr "Zmazané súbory"
 
 #: templates/index.php:46
 msgid "Cancel upload"
 msgstr "Zrušiť odosielanie"
 
-#: templates/index.php:59
+#: templates/index.php:53
+msgid "You don’t have write permissions here."
+msgstr "Nemáte oprávnenie na zápis."
+
+#: templates/index.php:60
 msgid "Nothing in here. Upload something!"
 msgstr "Žiadny súbor. Nahrajte niečo!"
 
-#: templates/index.php:73
+#: templates/index.php:74
 msgid "Download"
 msgstr "Stiahnuť"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:86 templates/index.php:87
 msgid "Unshare"
 msgstr "Nezdielať"
 
-#: templates/index.php:105
+#: templates/index.php:106
 msgid "Upload too large"
 msgstr "Odosielaný súbor je príliš veľký"
 
-#: templates/index.php:107
+#: templates/index.php:108
 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:112
+#: templates/index.php:113
 msgid "Files are being scanned, please wait."
 msgstr "Čakajte, súbory sú prehľadávané."
 
-#: templates/index.php:115
+#: templates/index.php:116
 msgid "Current scanning"
 msgstr "Práve prezerané"
 
diff --git a/l10n/sk_SK/files_external.po b/l10n/sk_SK/files_external.po
index 92807a28e1e2ffb2dc47d68e8a8e761b9821fbb4..9e8b7b49330f996493d472eca94ce897105caa9e 100644
--- a/l10n/sk_SK/files_external.po
+++ b/l10n/sk_SK/files_external.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-11 15:39+0100\n"
-"PO-Revision-Date: 2013-02-11 13:30+0000\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"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
@@ -20,37 +20,33 @@ msgstr ""
 "Language: sk_SK\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\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 "Prístup povolený"
 
-#: 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 "Chyba pri konfigurácii úložiska Dropbox"
 
-#: 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 "Povoliť prístup"
 
-#: js/dropbox.js:73 js/google.js:72
-msgid "Fill out all required fields"
-msgstr "Vyplňte všetky vyžadované kolónky"
-
-#: js/dropbox.js:85
+#: js/dropbox.js:101
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr "Zadajte platný kľúč aplikácie a heslo Dropbox"
 
-#: 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 "Chyba pri konfigurácii úložiska Google drive"
 
-#: lib/config.php:413
+#: lib/config.php:421
 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:414
+#: lib/config.php:424
 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 "
@@ -61,63 +57,63 @@ msgstr "<b>Upozornenie:</b> Podpora FTP v PHP nie je povolená alebo nainštalov
 msgid "External Storage"
 msgstr "Externé úložisko"
 
-#: templates/settings.php:8 templates/settings.php:22
-msgid "Mount point"
-msgstr "Prípojný bod"
-
-#: templates/settings.php:9
-msgid "Backend"
-msgstr "Backend"
+#: templates/settings.php:9 templates/settings.php:28
+msgid "Folder name"
+msgstr "Meno priečinka"
 
 #: templates/settings.php:10
+msgid "External storage"
+msgstr "Externé úložisko"
+
+#: templates/settings.php:11
 msgid "Configuration"
 msgstr "Nastavenia"
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid "Options"
 msgstr "Možnosti"
 
-#: templates/settings.php:12
+#: templates/settings.php:13
 msgid "Applicable"
 msgstr "Aplikovateľné"
 
-#: templates/settings.php:27
-msgid "Add mount point"
-msgstr "Pridať prípojný bod"
+#: templates/settings.php:33
+msgid "Add storage"
+msgstr "Pridať úložisko"
 
-#: templates/settings.php:85
+#: templates/settings.php:90
 msgid "None set"
 msgstr "Žiadne nastavené"
 
-#: templates/settings.php:86
+#: templates/settings.php:91
 msgid "All Users"
 msgstr "Všetci používatelia"
 
-#: templates/settings.php:87
+#: templates/settings.php:92
 msgid "Groups"
 msgstr "Skupiny"
 
-#: templates/settings.php:95
+#: templates/settings.php:100
 msgid "Users"
 msgstr "Používatelia"
 
-#: templates/settings.php:108 templates/settings.php:109
-#: templates/settings.php:144 templates/settings.php:145
+#: templates/settings.php:113 templates/settings.php:114
+#: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
 msgstr "Odstrániť"
 
-#: templates/settings.php:124
+#: templates/settings.php:129
 msgid "Enable User External Storage"
 msgstr "Povoliť externé úložisko"
 
-#: templates/settings.php:125
+#: templates/settings.php:130
 msgid "Allow users to mount their own external storage"
 msgstr "Povoliť používateľom pripojiť ich vlastné externé úložisko"
 
-#: templates/settings.php:136
+#: templates/settings.php:141
 msgid "SSL root certificates"
 msgstr "Koreňové SSL certifikáty"
 
-#: templates/settings.php:153
+#: templates/settings.php:159
 msgid "Import Root Certificate"
 msgstr "Importovať koreňový certifikát"
diff --git a/l10n/sk_SK/files_trashbin.po b/l10n/sk_SK/files_trashbin.po
index c1d5863d6790c37e1f0d71f1264c40dfb3daf536..9e51dd8cd252d50f658f93c3fd2631a39fc4e86a 100644
--- a/l10n/sk_SK/files_trashbin.po
+++ b/l10n/sk_SK/files_trashbin.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-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 09:50+0000\n"
-"Last-Translator: mhh <marian.hvolka@stuba.sk>\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: 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,7 +19,7 @@ msgstr ""
 "Language: sk_SK\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: ajax/delete.php:22
+#: ajax/delete.php:40
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "Nemožno zmazať %s navždy"
@@ -29,35 +29,39 @@ msgstr "Nemožno zmazať %s navždy"
 msgid "Couldn't restore %s"
 msgstr "Nemožno obnoviť %s"
 
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
 msgid "perform restore operation"
 msgstr "vykonať obnovu"
 
-#: js/trash.js:33
+#: js/trash.js:34
 msgid "delete file permanently"
 msgstr "trvalo zmazať súbor"
 
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr "Zmazať  trvalo"
+
+#: js/trash.js:174 templates/index.php:17
 msgid "Name"
 msgstr "Meno"
 
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:175 templates/index.php:27
 msgid "Deleted"
 msgstr "Zmazané"
 
-#: js/trash.js:135
+#: js/trash.js:184
 msgid "1 folder"
 msgstr "1 priečinok"
 
-#: js/trash.js:137
+#: js/trash.js:186
 msgid "{count} folders"
 msgstr "{count} priečinkov"
 
-#: js/trash.js:145
+#: js/trash.js:194
 msgid "1 file"
 msgstr "1 súbor"
 
-#: js/trash.js:147
+#: js/trash.js:196
 msgid "{count} files"
 msgstr "{count} súborov"
 
@@ -68,3 +72,11 @@ msgstr "Žiadny obsah. Kôš je prázdny!"
 #: templates/index.php:20 templates/index.php:22
 msgid "Restore"
 msgstr "Obnoviť"
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr "Zmazať"
+
+#: templates/part.breadcrumb.php:9
+msgid "Deleted Files"
+msgstr ""
diff --git a/l10n/sk_SK/files_versions.po b/l10n/sk_SK/files_versions.po
index 5cf9366ed688935fdaa85b654e0b01541a530665..0face773183b617945fb1fc726a3de8a9641e913 100644
--- a/l10n/sk_SK/files_versions.po
+++ b/l10n/sk_SK/files_versions.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-11 15:39+0100\n"
-"PO-Revision-Date: 2013-02-11 13:10+0000\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"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
@@ -51,18 +51,10 @@ msgstr "Nie sú dostupné žiadne staršie verzie"
 msgid "No path specified"
 msgstr "Nevybrali ste cestu"
 
-#: js/versions.js:16
-msgid "History"
-msgstr "História"
+#: js/versions.js:6
+msgid "Versions"
+msgstr "Verzie"
 
 #: templates/history.php:20
 msgid "Revert a file to a previous version by clicking on its revert button"
 msgstr "Obnovte súbor do predošlej verzie kliknutím na tlačítko obnoviť"
-
-#: templates/settings.php:3
-msgid "Files Versioning"
-msgstr "Vytváranie verzií súborov"
-
-#: templates/settings.php:4
-msgid "Enable"
-msgstr "Zapnúť"
diff --git a/l10n/sk_SK/lib.po b/l10n/sk_SK/lib.po
index 8a6e04468328c759a70b650ed9b2eeee38a9ab46..2c5e5a1c881b4e8f696836b4a54d33ef1643da68 100644
--- a/l10n/sk_SK/lib.po
+++ b/l10n/sk_SK/lib.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 14:33+0000\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"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
@@ -21,27 +21,27 @@ msgstr ""
 "Language: sk_SK\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: app.php:339
+#: app.php:349
 msgid "Help"
 msgstr "Pomoc"
 
-#: app.php:346
+#: app.php:362
 msgid "Personal"
 msgstr "Osobné"
 
-#: app.php:351
+#: app.php:373
 msgid "Settings"
 msgstr "Nastavenia"
 
-#: app.php:356
+#: app.php:385
 msgid "Users"
 msgstr "Používatelia"
 
-#: app.php:363
+#: app.php:398
 msgid "Apps"
 msgstr "Aplikácie"
 
-#: app.php:365
+#: app.php:406
 msgid "Admin"
 msgstr "Administrátor"
 
@@ -53,15 +53,15 @@ msgstr "Sťahovanie súborov ZIP je vypnuté."
 msgid "Files need to be downloaded one by one."
 msgstr "Súbory musia byť nahrávané jeden za druhým."
 
-#: files.php:203 files.php:228
+#: files.php:204 files.php:231
 msgid "Back to Files"
 msgstr "Späť na súbory"
 
-#: files.php:227
+#: files.php:228
 msgid "Selected files too large to generate zip file."
 msgstr "Zvolené súbory sú príliš veľké na vygenerovanie zip súboru."
 
-#: helper.php:226
+#: helper.php:228
 msgid "couldn't be determined"
 msgstr "nedá sa zistiť"
 
@@ -101,87 +101,92 @@ msgstr "Zadajte heslo administrátora."
 msgid "Specify a data folder."
 msgstr "Zadajte priečinok pre dáta."
 
-#: setup.php:53
+#: setup.php:55
 #, php-format
 msgid "%s enter the database username."
 msgstr "Zadajte používateľské meno %s databázy.."
 
-#: setup.php:56
+#: setup.php:58
 #, php-format
 msgid "%s enter the database name."
 msgstr "Zadajte názov databázy pre %s databázy."
 
-#: setup.php:59
+#: setup.php:61
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr "V názve databázy %s nemôžete používať bodky"
 
-#: setup.php:62
+#: setup.php:64
 #, php-format
 msgid "%s set the database host."
 msgstr "Zadajte názov počítača s databázou %s."
 
-#: setup.php:126 setup.php:291 setup.php:336
+#: setup.php:128 setup.php:320 setup.php:365
 msgid "PostgreSQL username and/or password not valid"
 msgstr "Používateľské meno a/alebo heslo pre PostgreSQL databázu je neplatné"
 
-#: setup.php:127 setup.php:150 setup.php:204
+#: setup.php:129 setup.php:152 setup.php:229
 msgid "You need to enter either an existing account or the administrator."
 msgstr "Musíte zadať jestvujúci účet alebo administrátora."
 
-#: setup.php:149 setup.php:423 setup.php:489
+#: setup.php:151 setup.php:453 setup.php:520
 msgid "Oracle username and/or password not valid"
 msgstr "Používateľské meno a/alebo heslo pre Oracle databázu je neplatné"
 
-#: setup.php:203
+#: setup.php:228
 msgid "MySQL username and/or password not valid"
 msgstr "Používateľské meno a/alebo heslo pre MySQL databázu je neplatné"
 
-#: setup.php:255 setup.php:357 setup.php:366 setup.php:384 setup.php:394
-#: setup.php:403 setup.php:430 setup.php:496 setup.php:522 setup.php:529
-#: setup.php:540 setup.php:547 setup.php:556 setup.php:564 setup.php:573
-#: setup.php:579
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Chyba DB: \"%s\""
 
-#: setup.php:256 setup.php:358 setup.php:367 setup.php:385 setup.php:395
-#: setup.php:404 setup.php:431 setup.php:497 setup.php:523 setup.php:530
-#: setup.php:541 setup.php:557 setup.php:565 setup.php:574
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "Podozrivý príkaz bol: \"%s\""
 
-#: setup.php:270
+#: setup.php:299
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "Používateľ '%s'@'localhost' už v MySQL existuje."
 
-#: setup.php:271
+#: setup.php:300
 msgid "Drop this user from MySQL"
 msgstr "Zahodiť používateľa z MySQL."
 
-#: setup.php:276
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "Používateľ '%s'@'%%' už v MySQL existuje"
 
-#: setup.php:277
+#: setup.php:306
 msgid "Drop this user from MySQL."
 msgstr "Zahodiť používateľa z MySQL."
 
-#: setup.php:548 setup.php:580
+#: setup.php:579 setup.php:611
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Podozrivý príkaz bol: \"%s\", meno: %s, heslo: %s"
 
-#: setup.php:644
+#: setup.php:631
+#, 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
 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:645
+#: setup.php:850
 #, 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>."
@@ -238,16 +243,16 @@ msgstr "minulý rok"
 msgid "years ago"
 msgstr "pred rokmi"
 
-#: updater.php:75
+#: 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:77
+#: updater.php:81
 msgid "up to date"
 msgstr "aktuálny"
 
-#: updater.php:80
+#: updater.php:84
 msgid "updates check is disabled"
 msgstr "sledovanie aktualizácií je vypnuté"
 
diff --git a/l10n/sk_SK/settings.po b/l10n/sk_SK/settings.po
index 5df4ee90ecb39d867c54f37dc2fa6bfa4940f196..0d12e6c1d74d0f457fb148b9924f445b2ca5d82b 100644
--- a/l10n/sk_SK/settings.po
+++ b/l10n/sk_SK/settings.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:05+0100\n"
-"PO-Revision-Date: 2013-02-14 14:00+0000\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"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
@@ -27,8 +27,8 @@ 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:15
-#: ajax/togglegroups.php:18
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr "Chyba pri autentifikácii"
 
@@ -76,12 +76,12 @@ msgstr "Neplatná požiadavka"
 msgid "Admins can't remove themself from the admin group"
 msgstr "Administrátori nesmú odstrániť sami seba zo skupiny admin"
 
-#: ajax/togglegroups.php:28
+#: ajax/togglegroups.php:30
 #, php-format
 msgid "Unable to add user to group %s"
 msgstr "Nie je možné pridať používateľa do skupiny %s"
 
-#: ajax/togglegroups.php:34
+#: ajax/togglegroups.php:36
 #, php-format
 msgid "Unable to remove user from group %s"
 msgstr "Nie je možné odstrániť používateľa zo skupiny %s"
@@ -122,7 +122,7 @@ msgstr "Chyba"
 msgid "Updated"
 msgstr "Aktualizované"
 
-#: js/personal.js:96
+#: js/personal.js:99
 msgid "Saving..."
 msgstr "Ukladám..."
 
@@ -167,7 +167,7 @@ msgstr "Chyba pri vytváraní používateľa"
 msgid "A valid password must be provided"
 msgstr "Musíte zadať platné heslo"
 
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
 msgid "__language_name__"
 msgstr "Slovensky"
 
@@ -213,19 +213,19 @@ msgstr "Chýba modul 'fileinfo'. Dôrazne doporučujeme ho povoliť pre dosiahnu
 msgid "Locale not working"
 msgstr "Lokalizácia nefunguje"
 
-#: templates/admin.php:61
+#: templates/admin.php:63
+#, php-format
 msgid ""
-"This ownCloud server can't set system locale to "
-"\"en_US.UTF-8\"/\"en_US.UTF8\". 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 en_US.UTF-8/en_US.UTF8."
-msgstr "Tento server ownCloud nemôže nastaviť národné prostredie systému na \"en_US.UTF-8\" / \"en_US.UTF8\". To znamená, že by mohli byť problémy s niektorými znakmi v názvoch súborov. Veľmi odporúčame nainštalovať požadované balíky na podporu en_US.UTF-8/en_US.UTF8."
+"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 "Tento server ownCloud nemôže nastaviť národné prostredie systému na %s. To znamená, že by mohli byť problémy s niektorými znakmi v názvoch súborov. Veľmi odporúčame nainštalovať požadované balíky na podporu %s."
 
-#: templates/admin.php:72
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr "Pripojenie na internet nefunguje"
 
-#: templates/admin.php:75
+#: 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 "
@@ -235,98 +235,98 @@ msgid ""
 " of ownCloud."
 msgstr "Tento server ownCloud nemá funkčné pripojenie k internetu. To znamená, že niektoré z funkcií, ako je pripojenie externého úložiska, oznámenia o aktualizáciách či inštalácia aplikácií tretích strán nefungujú. Prístup k súborom zo vzdialených miest a odosielanie oznamovacích e-mailov tiež nemusí fungovať. Odporúčame pripojiť tento server  k internetu, ak chcete využívať všetky vlastnosti ownCloud."
 
-#: templates/admin.php:89
+#: templates/admin.php:92
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:98
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr "Vykonať jednu úlohu s každým načítaní stránky"
 
-#: templates/admin.php:108
+#: 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 je registrovaná u služby webcron. Zavolá cron.php stránku v koreňovom priečinku owncloud raz za minútu cez protokol HTTP."
 
-#: templates/admin.php:118
+#: 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 "Používať systémovú službu cron. Zavolať cron.php v priečinku owncloud cez systémovú úlohu raz za minútu"
 
-#: templates/admin.php:125
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr "Zdieľanie"
 
-#: templates/admin.php:131
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr "Povoliť API zdieľania"
 
-#: templates/admin.php:132
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr "Povoliť aplikáciám používať API na zdieľanie"
 
-#: templates/admin.php:139
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr "Povoliť odkazy"
 
-#: templates/admin.php:140
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr "Povoliť používateľom zdieľať položky pre verejnosť cez odkazy"
 
-#: templates/admin.php:147
+#: templates/admin.php:150
 msgid "Allow resharing"
 msgstr "Povoliť zdieľanie ďalej"
 
-#: templates/admin.php:148
+#: templates/admin.php:151
 msgid "Allow users to share items shared with them again"
 msgstr "Povoliť používateľom ďalej zdieľať zdieľané položky"
 
-#: templates/admin.php:155
+#: templates/admin.php:158
 msgid "Allow users to share with anyone"
 msgstr "Povoliť používateľom zdieľať s kýmkoľvek"
 
-#: templates/admin.php:158
+#: templates/admin.php:161
 msgid "Allow users to only share with users in their groups"
 msgstr "Povoliť používateľom zdieľať len s používateľmi v ich skupinách"
 
-#: templates/admin.php:165
+#: templates/admin.php:168
 msgid "Security"
 msgstr "Zabezpečenie"
 
-#: templates/admin.php:178
+#: templates/admin.php:181
 msgid "Enforce HTTPS"
 msgstr "Vynútiť HTTPS"
 
-#: templates/admin.php:179
+#: templates/admin.php:182
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr "Vynúti pripojovanie klientov ownCloud cez šifrované pripojenie."
 
-#: templates/admin.php:182
+#: templates/admin.php:185
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr "Pripojte sa k tejto inštancii ownCloud cez HTTPS pre povolenie alebo zakázanie vynútenia SSL."
 
-#: templates/admin.php:192
+#: templates/admin.php:195
 msgid "Log"
 msgstr "Záznam"
 
-#: templates/admin.php:193
+#: templates/admin.php:196
 msgid "Log level"
 msgstr "Úroveň záznamu"
 
-#: templates/admin.php:220
+#: templates/admin.php:223
 msgid "More"
 msgstr "Viac"
 
-#: templates/admin.php:227 templates/personal.php:98
+#: templates/admin.php:230 templates/personal.php:102
 msgid "Version"
 msgstr "Verzia"
 
-#: templates/admin.php:230 templates/personal.php:100
+#: templates/admin.php:233 templates/personal.php:105
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -336,51 +336,51 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "Vyvinuté <a href=\"http://ownCloud.org/contact\" target=\"_blank\">komunitou ownCloud</a>,<a href=\"https://github.com/owncloud\" target=\"_blank\">zdrojový kód</a> je licencovaný pod <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
-#: templates/apps.php:10
+#: templates/apps.php:11
 msgid "Add your App"
 msgstr "Pridať vašu aplikáciu"
 
-#: templates/apps.php:11
+#: templates/apps.php:12
 msgid "More Apps"
 msgstr "Viac aplikácií"
 
-#: templates/apps.php:24
+#: templates/apps.php:28
 msgid "Select an App"
 msgstr "Vyberte aplikáciu"
 
-#: templates/apps.php:28
+#: templates/apps.php:34
 msgid "See application page at apps.owncloud.com"
 msgstr "Pozrite si stránku aplikácií na apps.owncloud.com"
 
-#: templates/apps.php:29
+#: templates/apps.php:36
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-licencované <span class=\"author\"></span>"
 
-#: templates/apps.php:31
+#: templates/apps.php:38
 msgid "Update"
 msgstr "Aktualizovať"
 
-#: templates/help.php:3
+#: templates/help.php:4
 msgid "User Documentation"
 msgstr "Príručka používateľa"
 
-#: templates/help.php:4
+#: templates/help.php:6
 msgid "Administrator Documentation"
 msgstr "Príručka administrátora"
 
-#: templates/help.php:6
+#: templates/help.php:9
 msgid "Online Documentation"
 msgstr "Online príručka"
 
-#: templates/help.php:7
+#: templates/help.php:11
 msgid "Forum"
 msgstr "Fórum"
 
-#: templates/help.php:9
+#: templates/help.php:14
 msgid "Bugtracker"
 msgstr "Bugtracker"
 
-#: templates/help.php:11
+#: templates/help.php:17
 msgid "Commercial Support"
 msgstr "Komerčná podpora"
 
@@ -389,79 +389,79 @@ msgstr "Komerčná podpora"
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Použili ste <strong>%s</strong> z <strong>%s</strong> dostupných "
 
-#: templates/personal.php:14
+#: templates/personal.php:15
 msgid "Get the apps to sync your files"
 msgstr "Získať aplikácie na synchronizáciu Vašich súborov"
 
-#: templates/personal.php:25
+#: templates/personal.php:26
 msgid "Show First Run Wizard again"
 msgstr "Znovu zobraziť sprievodcu prvým spustením"
 
-#: templates/personal.php:36 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
 msgid "Password"
 msgstr "Heslo"
 
-#: templates/personal.php:37
+#: templates/personal.php:38
 msgid "Your password was changed"
 msgstr "Heslo bolo zmenené"
 
-#: templates/personal.php:38
+#: templates/personal.php:39
 msgid "Unable to change your password"
 msgstr "Nie je možné zmeniť vaše heslo"
 
-#: templates/personal.php:39
+#: templates/personal.php:40
 msgid "Current password"
 msgstr "Aktuálne heslo"
 
-#: templates/personal.php:40
+#: templates/personal.php:42
 msgid "New password"
 msgstr "Nové heslo"
 
-#: templates/personal.php:42
+#: templates/personal.php:44
 msgid "Change password"
 msgstr "Zmeniť heslo"
 
-#: templates/personal.php:54 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:78
 msgid "Display Name"
 msgstr "Zobrazované meno"
 
-#: templates/personal.php:55
+#: templates/personal.php:57
 msgid "Your display name was changed"
 msgstr "Vaše zobrazované meno bolo zmenené"
 
-#: templates/personal.php:56
+#: templates/personal.php:58
 msgid "Unable to change your display name"
 msgstr "Nemožno zmeniť Vaše zobrazované meno"
 
-#: templates/personal.php:59
+#: templates/personal.php:61
 msgid "Change display name"
 msgstr "Zmeniť zobrazované meno"
 
-#: templates/personal.php:68
+#: templates/personal.php:70
 msgid "Email"
 msgstr "Email"
 
-#: templates/personal.php:69
+#: templates/personal.php:72
 msgid "Your email address"
 msgstr "Vaša emailová adresa"
 
-#: templates/personal.php:70
+#: templates/personal.php:73
 msgid "Fill in an email address to enable password recovery"
 msgstr "Vyplňte emailovú adresu pre aktivovanie obnovy hesla"
 
-#: templates/personal.php:76 templates/personal.php:77
+#: templates/personal.php:79 templates/personal.php:80
 msgid "Language"
 msgstr "Jazyk"
 
-#: templates/personal.php:82
+#: templates/personal.php:86
 msgid "Help translate"
 msgstr "Pomôcť s prekladom"
 
-#: templates/personal.php:87
+#: templates/personal.php:91
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:89
+#: templates/personal.php:93
 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"
 
diff --git a/l10n/sk_SK/user_ldap.po b/l10n/sk_SK/user_ldap.po
index 6075f01a7d945159153f7ba09cc54a28c0a69f3f..e8ae844a7394e6bad263cee2db0fd41d745675b0 100644
--- a/l10n/sk_SK/user_ldap.po
+++ b/l10n/sk_SK/user_ldap.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-11 15:39+0100\n"
-"PO-Revision-Date: 2013-02-11 13:20+0000\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"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
@@ -23,17 +23,17 @@ msgstr ""
 msgid "Failed to delete the server configuration"
 msgstr "Zlyhalo zmazanie nastavenia servera."
 
-#: ajax/testConfiguration.php:35
+#: ajax/testConfiguration.php:36
 msgid "The configuration is valid and the connection could be established!"
 msgstr "Nastavenie je v poriadku a pripojenie je stabilné."
 
-#: ajax/testConfiguration.php:37
+#: ajax/testConfiguration.php:39
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
 msgstr "Nastavenie je v poriadku, ale pripojenie zlyhalo. Skontrolujte nastavenia servera a prihlasovacie údaje."
 
-#: ajax/testConfiguration.php:40
+#: ajax/testConfiguration.php:43
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
@@ -88,224 +88,248 @@ msgstr "<b>Upozornenie:</b> nie je nainštalovaný LDAP modul pre PHP, backend v
 msgid "Server configuration"
 msgstr "Nastavenia servera"
 
-#: templates/settings.php:17
+#: templates/settings.php:18
 msgid "Add Server Configuration"
 msgstr "Pridať nastavenia servera."
 
-#: templates/settings.php:21
+#: templates/settings.php:23
 msgid "Host"
 msgstr "Hostiteľ"
 
-#: templates/settings.php:21
+#: templates/settings.php:25
 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:22
+#: templates/settings.php:26
 msgid "Base DN"
 msgstr "Základné DN"
 
-#: templates/settings.php:22
+#: templates/settings.php:27
 msgid "One Base DN per line"
 msgstr "Jedno základné DN na riadok"
 
-#: templates/settings.php:22
+#: templates/settings.php:28
 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:23
+#: templates/settings.php:30
 msgid "User DN"
 msgstr "Používateľské DN"
 
-#: templates/settings.php:23
+#: templates/settings.php:32
 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:24
+#: templates/settings.php:33
 msgid "Password"
 msgstr "Heslo"
 
-#: templates/settings.php:24
+#: templates/settings.php:36
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "Pre anonymný prístup ponechajte údaje DN a Heslo prázdne."
 
-#: templates/settings.php:25
+#: templates/settings.php:37
 msgid "User Login Filter"
 msgstr "Filter prihlásenia používateľov"
 
-#: templates/settings.php:25
+#: templates/settings.php:40
 #, 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:25
+#: templates/settings.php:41
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "použite zástupný vzor %%uid, napr. \\\"uid=%%uid\\\""
 
-#: templates/settings.php:26
+#: templates/settings.php:42
 msgid "User List Filter"
 msgstr "Filter zoznamov používateľov"
 
-#: templates/settings.php:26
+#: templates/settings.php:45
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Definuje použitý filter, pre získanie používateľov."
 
-#: templates/settings.php:26
+#: templates/settings.php:46
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "bez zástupných znakov, napr. \"objectClass=person\""
 
-#: templates/settings.php:27
+#: templates/settings.php:47
 msgid "Group Filter"
 msgstr "Filter skupiny"
 
-#: templates/settings.php:27
+#: templates/settings.php:50
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Definuje použitý filter, pre získanie skupín."
 
-#: templates/settings.php:27
+#: templates/settings.php:51
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "bez zástupných znakov, napr. \"objectClass=posixGroup\""
 
-#: templates/settings.php:31
+#: templates/settings.php:55
 msgid "Connection Settings"
 msgstr "Nastavenie pripojenia"
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "Configuration Active"
 msgstr "Nastavenia sú aktívne "
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "When unchecked, this configuration will be skipped."
 msgstr "Ak nie je zaškrtnuté, nastavenie bude preskočené."
 
-#: templates/settings.php:34
+#: templates/settings.php:58
 msgid "Port"
 msgstr "Port"
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid "Backup (Replica) Host"
 msgstr "Záložný server (kópia) hosť"
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 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:36
+#: templates/settings.php:60
 msgid "Backup (Replica) Port"
 msgstr "Záložný server (kópia) port"
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "Disable Main Server"
 msgstr "Zakázať hlavný server"
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 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:38
+#: templates/settings.php:62
 msgid "Use TLS"
 msgstr "Použi TLS"
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr "Nepoužívajte pre pripojenie LDAPS, zlyhá."
 
-#: templates/settings.php:39
+#: templates/settings.php:63
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "LDAP server nerozlišuje veľkosť znakov (Windows)"
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid "Turn off SSL certificate validation."
 msgstr "Vypnúť overovanie SSL certifikátu."
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 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:40
+#: templates/settings.php:64
 msgid "Not recommended, use for testing only."
 msgstr "Nie je doporučované, len pre testovacie účely."
 
-#: templates/settings.php:41
+#: templates/settings.php:65
+msgid "Cache Time-To-Live"
+msgstr "Životnosť objektov v cache"
+
+#: templates/settings.php:65
 msgid "in seconds. A change empties the cache."
 msgstr "v sekundách. Zmena vyprázdni vyrovnávaciu pamäť."
 
-#: templates/settings.php:43
+#: templates/settings.php:67
 msgid "Directory Settings"
 msgstr "Nastavenie priečinka"
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "User Display Name Field"
 msgstr "Pole pre zobrazenia mena používateľa"
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 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:46
+#: templates/settings.php:70
 msgid "Base User Tree"
 msgstr "Základný používateľský strom"
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "One User Base DN per line"
 msgstr "Jedna používateľská základná DN na riadok"
 
-#: templates/settings.php:47
+#: templates/settings.php:71
 msgid "User Search Attributes"
 msgstr "Atribúty vyhľadávania používateľov"
 
-#: templates/settings.php:47 templates/settings.php:50
+#: templates/settings.php:71 templates/settings.php:74
 msgid "Optional; one attribute per line"
 msgstr "Voliteľné, jeden atribút na jeden riadok"
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "Group Display Name Field"
 msgstr "Pole pre zobrazenie mena skupiny"
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 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:49
+#: templates/settings.php:73
 msgid "Base Group Tree"
 msgstr "Základný skupinový strom"
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "One Group Base DN per line"
 msgstr "Jedna skupinová základná DN na riadok"
 
-#: templates/settings.php:50
+#: templates/settings.php:74
 msgid "Group Search Attributes"
 msgstr "Atribúty vyhľadávania skupín"
 
-#: templates/settings.php:51
+#: templates/settings.php:75
 msgid "Group-Member association"
 msgstr "Priradenie člena skupiny"
 
-#: templates/settings.php:53
+#: templates/settings.php:77
 msgid "Special Attributes"
 msgstr "Špeciálne atribúty"
 
-#: templates/settings.php:56
+#: templates/settings.php:79
+msgid "Quota Field"
+msgstr "Pole kvóty"
+
+#: templates/settings.php:80
+msgid "Quota Default"
+msgstr "Predvolená kvóta"
+
+#: templates/settings.php:80
 msgid "in bytes"
 msgstr "v bajtoch"
 
-#: templates/settings.php:58
+#: templates/settings.php:81
+msgid "Email Field"
+msgstr "Pole email"
+
+#: templates/settings.php:82
+msgid "User Home Folder Naming Rule"
+msgstr "Pravidlo pre nastavenie mena používateľského priečinka dát"
+
+#: templates/settings.php:82
 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:62
+#: templates/settings.php:86
+msgid "Test Configuration"
+msgstr "Test nastavenia"
+
+#: templates/settings.php:86
 msgid "Help"
 msgstr "Pomoc"
diff --git a/l10n/sl/core.po b/l10n/sl/core.po
index 57d87ce6bcc8179c7ddb36128b58c8a68ec15609..3237325869e49104e6b47b6f7cddd2ed89525cc1 100644
--- a/l10n/sl/core.po
+++ b/l10n/sl/core.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 14:32+0000\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"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -390,7 +390,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 "Ponastavitev gesla ownCloud"
 
diff --git a/l10n/sl/files.po b/l10n/sl/files.po
index 94b106efeaf650894fd76a313cbd57cf942ae61a..4ba12451df4ac1fef87a79948bad95b6a08490d7 100644
--- a/l10n/sl/files.po
+++ b/l10n/sl/files.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\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: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -54,27 +54,27 @@ msgid ""
 "the HTML form"
 msgstr "Naložena datoteka presega velikost, ki jo določa parameter MAX_FILE_SIZE v HTML obrazcu"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
 msgstr "Datoteka je le delno naložena"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:31
 msgid "No file was uploaded"
 msgstr "Nobena datoteka ni bila naložena"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:32
 msgid "Missing a temporary folder"
 msgstr "Manjka začasna mapa"
 
-#: ajax/upload.php:34
+#: ajax/upload.php:33
 msgid "Failed to write to disk"
 msgstr "Pisanje na disk je spodletelo"
 
-#: ajax/upload.php:52
+#: ajax/upload.php:51
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:83
+#: ajax/upload.php:82
 msgid "Invalid directory."
 msgstr ""
 
@@ -86,7 +86,7 @@ msgstr "Datoteke"
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:127 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:127 templates/index.php:92 templates/index.php:93
 msgid "Delete"
 msgstr "Izbriši"
 
@@ -94,40 +94,36 @@ msgstr "Izbriši"
 msgid "Rename"
 msgstr "Preimenuj"
 
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
 msgid "Pending"
 msgstr "V čakanju ..."
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "{new_name} already exists"
 msgstr "{new_name} že obstaja"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "replace"
 msgstr "zamenjaj"
 
-#: js/filelist.js:253
+#: js/filelist.js:251
 msgid "suggest name"
 msgstr "predlagaj ime"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "cancel"
 msgstr "prekliči"
 
-#: js/filelist.js:295
-msgid "replaced {new_name}"
-msgstr "zamenjano je ime {new_name}"
+#: js/filelist.js:298
+msgid "replaced {new_name} with {old_name}"
+msgstr "zamenjano ime {new_name} z imenom {old_name}"
 
-#: js/filelist.js:295 js/filelist.js:297
+#: js/filelist.js:298
 msgid "undo"
 msgstr "razveljavi"
 
-#: js/filelist.js:297
-msgid "replaced {new_name} with {old_name}"
-msgstr "zamenjano ime {new_name} z imenom {old_name}"
-
-#: js/filelist.js:322
+#: js/filelist.js:323
 msgid "perform delete operation"
 msgstr ""
 
@@ -153,74 +149,74 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:224
+#: js/files.js:225
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:261
+#: js/files.js:262
 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:261
+#: js/files.js:262
 msgid "Upload Error"
 msgstr "Napaka med nalaganjem"
 
-#: js/files.js:272
+#: js/files.js:273
 msgid "Close"
 msgstr "Zapri"
 
-#: js/files.js:311
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr "Pošiljanje 1 datoteke"
 
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr "nalagam {count} datotek"
 
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "Pošiljanje je preklicano."
 
-#: js/files.js:496
+#: js/files.js:497
 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:569
+#: js/files.js:570
 msgid "URL cannot be empty."
 msgstr "Naslov URL ne sme biti prazen."
 
-#: js/files.js:574
+#: js/files.js:575
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:953 templates/index.php:68
 msgid "Name"
 msgstr "Ime"
 
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:954 templates/index.php:79
 msgid "Size"
 msgstr "Velikost"
 
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:955 templates/index.php:81
 msgid "Modified"
 msgstr "Spremenjeno"
 
-#: js/files.js:969
+#: js/files.js:974
 msgid "1 folder"
 msgstr "1 mapa"
 
-#: js/files.js:971
+#: js/files.js:976
 msgid "{count} folders"
 msgstr "{count} map"
 
-#: js/files.js:979
+#: js/files.js:984
 msgid "1 file"
 msgstr "1 datoteka"
 
-#: js/files.js:981
+#: js/files.js:986
 msgid "{count} files"
 msgstr "{count} datotek"
 
@@ -284,33 +280,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr "Prekliči pošiljanje"
 
-#: templates/index.php:59
+#: templates/index.php:53
+msgid "You don’t have write permissions here."
+msgstr ""
+
+#: templates/index.php:60
 msgid "Nothing in here. Upload something!"
 msgstr "Tukaj ni ničesar. Naložite kaj!"
 
-#: templates/index.php:73
+#: templates/index.php:74
 msgid "Download"
 msgstr "Prejmi"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:86 templates/index.php:87
 msgid "Unshare"
 msgstr "Odstrani iz souporabe"
 
-#: templates/index.php:105
+#: templates/index.php:106
 msgid "Upload too large"
 msgstr "Nalaganje ni mogoče, ker je preveliko"
 
-#: templates/index.php:107
+#: templates/index.php:108
 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."
 
-#: templates/index.php:112
+#: templates/index.php:113
 msgid "Files are being scanned, please wait."
 msgstr "Poteka preučevanje datotek, počakajte ..."
 
-#: templates/index.php:115
+#: templates/index.php:116
 msgid "Current scanning"
 msgstr "Trenutno poteka preučevanje"
 
diff --git a/l10n/sl/files_external.po b/l10n/sl/files_external.po
index f20fb0bad26abc1766d7b10fce921c8fbcb5591c..1eb81c770892548bb472846ac3ecbaaa8e628054 100644
--- a/l10n/sl/files_external.po
+++ b/l10n/sl/files_external.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-16 00:11+0100\n"
-"PO-Revision-Date: 2012-12-15 16:43+0000\n"
-"Last-Translator: Peter Peroša <peter.perosa@gmail.com>\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"
 "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"
@@ -19,37 +19,33 @@ 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"
 
-#: 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 "Dostop je odobren"
 
-#: 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 "Napaka nastavljanja shrambe Dropbox"
 
-#: 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 "Odobri dostop"
 
-#: js/dropbox.js:73 js/google.js:72
-msgid "Fill out all required fields"
-msgstr "Zapolni vsa zahtevana polja"
-
-#: js/dropbox.js:85
+#: js/dropbox.js:101
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr "Vpišite veljaven ključ programa in kodo za Dropbox"
 
-#: 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 "Napaka nastavljanja shrambe Google Drive"
 
-#: lib/config.php:434
+#: lib/config.php:421
 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."
 
-#: lib/config.php:435
+#: lib/config.php:424
 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 "
@@ -60,63 +56,63 @@ msgstr "<b>Opozorilo:</b> FTP podpora v PHP ni omogočena ali nameščena. Prikl
 msgid "External Storage"
 msgstr "Zunanja podatkovna shramba"
 
-#: templates/settings.php:8 templates/settings.php:22
-msgid "Mount point"
-msgstr "Priklopna točka"
-
-#: templates/settings.php:9
-msgid "Backend"
-msgstr "Zaledje"
+#: templates/settings.php:9 templates/settings.php:28
+msgid "Folder name"
+msgstr "Ime mape"
 
 #: templates/settings.php:10
+msgid "External storage"
+msgstr ""
+
+#: templates/settings.php:11
 msgid "Configuration"
 msgstr "Nastavitve"
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid "Options"
 msgstr "Možnosti"
 
-#: templates/settings.php:12
+#: templates/settings.php:13
 msgid "Applicable"
 msgstr "Se uporablja"
 
-#: templates/settings.php:27
-msgid "Add mount point"
-msgstr "Dodaj priklopno točko"
+#: templates/settings.php:33
+msgid "Add storage"
+msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:90
 msgid "None set"
 msgstr "Ni nastavljeno"
 
-#: templates/settings.php:86
+#: templates/settings.php:91
 msgid "All Users"
 msgstr "Vsi uporabniki"
 
-#: templates/settings.php:87
+#: templates/settings.php:92
 msgid "Groups"
 msgstr "Skupine"
 
-#: templates/settings.php:95
+#: templates/settings.php:100
 msgid "Users"
 msgstr "Uporabniki"
 
-#: 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 "Izbriši"
 
-#: templates/settings.php:124
+#: templates/settings.php:129
 msgid "Enable User External Storage"
 msgstr "Omogoči uporabo zunanje podatkovne shrambe za uporabnike"
 
-#: templates/settings.php:125
+#: templates/settings.php:130
 msgid "Allow users to mount their own external storage"
 msgstr "Dovoli uporabnikom priklop lastne zunanje podatkovne shrambe"
 
-#: templates/settings.php:139
+#: templates/settings.php:141
 msgid "SSL root certificates"
 msgstr "Korenska potrdila SSL"
 
-#: templates/settings.php:158
+#: templates/settings.php:159
 msgid "Import Root Certificate"
 msgstr "Uvozi korensko potrdilo"
diff --git a/l10n/sl/files_trashbin.po b/l10n/sl/files_trashbin.po
index 6bcfe28d48a2acbd17e720774ecc896bbe002a31..6731c6eb2b99aa6a02573f2a650a904cae533490 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-02-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 10:07+0000\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: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@ 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:22
+#: ajax/delete.php:40
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
@@ -27,35 +27,39 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:33
+#: js/trash.js:34
 msgid "delete file permanently"
 msgstr ""
 
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr ""
+
+#: js/trash.js:174 templates/index.php:17
 msgid "Name"
 msgstr "Ime"
 
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:175 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:135
+#: js/trash.js:184
 msgid "1 folder"
 msgstr "1 mapa"
 
-#: js/trash.js:137
+#: js/trash.js:186
 msgid "{count} folders"
 msgstr "{count} map"
 
-#: js/trash.js:145
+#: js/trash.js:194
 msgid "1 file"
 msgstr "1 datoteka"
 
-#: js/trash.js:147
+#: js/trash.js:196
 msgid "{count} files"
 msgstr "{count} datotek"
 
@@ -66,3 +70,11 @@ msgstr ""
 #: templates/index.php:20 templates/index.php:22
 msgid "Restore"
 msgstr ""
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr "Izbriši"
+
+#: templates/part.breadcrumb.php:9
+msgid "Deleted Files"
+msgstr ""
diff --git a/l10n/sl/files_versions.po b/l10n/sl/files_versions.po
index dad9f10280ea231dea19be416aa109c214b17e4a..d2588528b0c3f474b01f3937b29a592175fabcd8 100644
--- a/l10n/sl/files_versions.po
+++ b/l10n/sl/files_versions.po
@@ -4,14 +4,14 @@
 # 
 # Translators:
 #   <>, 2012.
-# Peter Peroša <peter.perosa@gmail.com>, 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-02-08 00:10+0100\n"
-"PO-Revision-Date: 2013-02-07 23:11+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "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"
@@ -42,26 +42,18 @@ msgstr ""
 msgid "File %s could not be reverted to version %s"
 msgstr ""
 
-#: history.php:68
+#: history.php:69
 msgid "No old versions available"
-msgstr ""
+msgstr "Starejših različic ni na voljo"
 
-#: history.php:73
+#: history.php:74
 msgid "No path specified"
 msgstr ""
 
-#: js/versions.js:16
-msgid "History"
-msgstr "Zgodovina"
+#: 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 ""
-
-#: templates/settings.php:3
-msgid "Files Versioning"
-msgstr "Sledenje različicam"
-
-#: templates/settings.php:4
-msgid "Enable"
-msgstr "Omogoči"
diff --git a/l10n/sl/lib.po b/l10n/sl/lib.po
index e3f61a640a8c6c88fb5a73344f07f40246a49cd6..620819da9ffde505c4c0765f08b86799dfedf208 100644
--- a/l10n/sl/lib.po
+++ b/l10n/sl/lib.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-11 15:39+0100\n"
-"PO-Revision-Date: 2013-02-11 14:40+0000\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: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -19,27 +19,27 @@ msgstr ""
 "Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
 
-#: app.php:339
+#: app.php:349
 msgid "Help"
 msgstr "Pomoč"
 
-#: app.php:346
+#: app.php:362
 msgid "Personal"
 msgstr "Osebno"
 
-#: app.php:351
+#: app.php:373
 msgid "Settings"
 msgstr "Nastavitve"
 
-#: app.php:356
+#: app.php:385
 msgid "Users"
 msgstr "Uporabniki"
 
-#: app.php:363
+#: app.php:398
 msgid "Apps"
 msgstr "Programi"
 
-#: app.php:365
+#: app.php:406
 msgid "Admin"
 msgstr "Skrbništvo"
 
@@ -51,15 +51,15 @@ msgstr "Prejem datotek ZIP je onemogočen."
 msgid "Files need to be downloaded one by one."
 msgstr "Datoteke je mogoče prejeti le posamič."
 
-#: files.php:203 files.php:228
+#: files.php:204 files.php:231
 msgid "Back to Files"
 msgstr "Nazaj na datoteke"
 
-#: files.php:227
+#: files.php:228
 msgid "Selected files too large to generate zip file."
 msgstr "Izbrane datoteke so prevelike za ustvarjanje datoteke arhiva zip."
 
-#: helper.php:226
+#: helper.php:228
 msgid "couldn't be determined"
 msgstr ""
 
@@ -99,87 +99,92 @@ msgstr ""
 msgid "Specify a data folder."
 msgstr ""
 
-#: setup.php:53
+#: setup.php:55
 #, php-format
 msgid "%s enter the database username."
 msgstr ""
 
-#: setup.php:56
+#: setup.php:58
 #, php-format
 msgid "%s enter the database name."
 msgstr ""
 
-#: setup.php:59
+#: setup.php:61
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr ""
 
-#: setup.php:62
+#: setup.php:64
 #, php-format
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:126 setup.php:291 setup.php:336
+#: setup.php:128 setup.php:320 setup.php:365
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:127 setup.php:150 setup.php:204
+#: setup.php:129 setup.php:152 setup.php:229
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:149 setup.php:423 setup.php:489
+#: setup.php:151 setup.php:453 setup.php:520
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:203
+#: setup.php:228
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:255 setup.php:357 setup.php:366 setup.php:384 setup.php:394
-#: setup.php:403 setup.php:430 setup.php:496 setup.php:522 setup.php:529
-#: setup.php:540 setup.php:547 setup.php:556 setup.php:564 setup.php:573
-#: setup.php:579
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:256 setup.php:358 setup.php:367 setup.php:385 setup.php:395
-#: setup.php:404 setup.php:431 setup.php:497 setup.php:523 setup.php:530
-#: setup.php:541 setup.php:557 setup.php:565 setup.php:574
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:270
+#: setup.php:299
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:271
+#: setup.php:300
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:276
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:277
+#: setup.php:306
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:548 setup.php:580
+#: setup.php:579 setup.php:611
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:644
+#: setup.php:631
+#, php-format
+msgid "MS SQL username and/or password not valid: %s"
+msgstr ""
+
+#: setup.php:849
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:645
+#: setup.php:850
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
@@ -236,16 +241,16 @@ msgstr "lani"
 msgid "years ago"
 msgstr "pred nekaj leti"
 
-#: updater.php:75
+#: 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:77
+#: updater.php:81
 msgid "up to date"
 msgstr "posodobljeno"
 
-#: updater.php:80
+#: updater.php:84
 msgid "updates check is disabled"
 msgstr "preverjanje za posodobitve je onemogočeno"
 
diff --git a/l10n/sl/settings.po b/l10n/sl/settings.po
index f887087717cb63fec23b8ea85e86c244c66f3602..3eb120c5f5e2fbfc043e40a93cc6e27f95c5075b 100644
--- a/l10n/sl/settings.po
+++ b/l10n/sl/settings.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 23:05+0000\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"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -25,8 +25,8 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "Ni mogoče naložiti seznama iz App Store"
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:15
-#: ajax/togglegroups.php:18
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr "Napaka overitve"
 
@@ -74,12 +74,12 @@ msgstr "Neveljavna zahteva"
 msgid "Admins can't remove themself from the admin group"
 msgstr "Administratorji sebe ne morejo odstraniti iz skupine admin"
 
-#: ajax/togglegroups.php:28
+#: ajax/togglegroups.php:30
 #, php-format
 msgid "Unable to add user to group %s"
 msgstr "Uporabnika ni mogoče dodati k skupini %s"
 
-#: ajax/togglegroups.php:34
+#: ajax/togglegroups.php:36
 #, php-format
 msgid "Unable to remove user from group %s"
 msgstr "Uporabnika ni mogoče odstraniti iz skupine %s"
@@ -120,7 +120,7 @@ msgstr "Napaka"
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:96
+#: js/personal.js:99
 msgid "Saving..."
 msgstr "Poteka shranjevanje ..."
 
@@ -149,23 +149,23 @@ msgstr "Skrbnik skupine"
 msgid "Delete"
 msgstr "Izbriši"
 
-#: js/users.js:190
+#: js/users.js:191
 msgid "add group"
 msgstr ""
 
-#: js/users.js:351
+#: js/users.js:352
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:357
+#: js/users.js:358
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
 msgid "__language_name__"
 msgstr "__ime_jezika__"
 
@@ -211,19 +211,19 @@ msgstr ""
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:61
+#: templates/admin.php:63
+#, php-format
 msgid ""
-"This ownCloud server can't set system locale to "
-"\"en_US.UTF-8\"/\"en_US.UTF8\". 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 en_US.UTF-8/en_US.UTF8."
+"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:72
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:75
+#: 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 "
@@ -233,98 +233,98 @@ msgid ""
 " of ownCloud."
 msgstr ""
 
-#: templates/admin.php:89
+#: templates/admin.php:92
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:98
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:108
+#: 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:118
+#: 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:125
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:131
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:132
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:140
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:147
+#: templates/admin.php:150
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:148
+#: templates/admin.php:151
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:155
+#: templates/admin.php:158
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:161
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:165
+#: templates/admin.php:168
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:181
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:179
+#: templates/admin.php:182
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:182
+#: templates/admin.php:185
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr ""
 
-#: templates/admin.php:192
+#: templates/admin.php:195
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:193
+#: templates/admin.php:196
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:220
+#: templates/admin.php:223
 msgid "More"
 msgstr "Več"
 
-#: templates/admin.php:227 templates/personal.php:98
+#: templates/admin.php:230 templates/personal.php:102
 msgid "Version"
 msgstr "Različica"
 
-#: templates/admin.php:230 templates/personal.php:100
+#: templates/admin.php:233 templates/personal.php:105
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -334,51 +334,51 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "Programski paket razvija <a href=\"http://ownCloud.org/contact\" target=\"_blank\">skupnost ownCloud</a>. <a href=\"https://github.com/owncloud\" target=\"_blank\">Izvorna koda</a> je objavljena pod pogoji dovoljenja <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Splošno javno dovoljenje Affero\">AGPL</abbr></a>."
 
-#: templates/apps.php:10
+#: templates/apps.php:11
 msgid "Add your App"
 msgstr "Dodaj program"
 
-#: templates/apps.php:11
+#: templates/apps.php:12
 msgid "More Apps"
 msgstr "Več programov"
 
-#: templates/apps.php:24
+#: templates/apps.php:28
 msgid "Select an App"
 msgstr "Izberite program"
 
-#: templates/apps.php:28
+#: templates/apps.php:34
 msgid "See application page at apps.owncloud.com"
 msgstr "Obiščite spletno stran programa na apps.owncloud.com"
 
-#: templates/apps.php:29
+#: 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>"
 
-#: templates/apps.php:31
+#: templates/apps.php:38
 msgid "Update"
 msgstr "Posodobi"
 
-#: templates/help.php:3
+#: templates/help.php:4
 msgid "User Documentation"
 msgstr "Uporabniška dokumentacija"
 
-#: templates/help.php:4
+#: templates/help.php:6
 msgid "Administrator Documentation"
 msgstr "Administratorjeva dokumentacija"
 
-#: templates/help.php:6
+#: templates/help.php:9
 msgid "Online Documentation"
 msgstr "Spletna dokumentacija"
 
-#: templates/help.php:7
+#: templates/help.php:11
 msgid "Forum"
 msgstr "Forum"
 
-#: templates/help.php:9
+#: templates/help.php:14
 msgid "Bugtracker"
 msgstr "Sistem za sledenje napakam"
 
-#: templates/help.php:11
+#: templates/help.php:17
 msgid "Commercial Support"
 msgstr "Komercialna podpora"
 
@@ -387,79 +387,79 @@ msgstr "Komercialna podpora"
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Uporabljate <strong>%s</strong> od razpoložljivih <strong>%s</strong>"
 
-#: templates/personal.php:14
+#: templates/personal.php:15
 msgid "Get the apps to sync your files"
-msgstr ""
+msgstr "Pridobi programe za usklajevanje datotek"
 
-#: templates/personal.php:25
+#: templates/personal.php:26
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:36 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
 msgid "Password"
 msgstr "Geslo"
 
-#: templates/personal.php:37
+#: templates/personal.php:38
 msgid "Your password was changed"
 msgstr "Vaše geslo je spremenjeno"
 
-#: templates/personal.php:38
+#: templates/personal.php:39
 msgid "Unable to change your password"
 msgstr "Gesla ni mogoče spremeniti."
 
-#: templates/personal.php:39
+#: templates/personal.php:40
 msgid "Current password"
 msgstr "Trenutno geslo"
 
-#: templates/personal.php:40
+#: templates/personal.php:42
 msgid "New password"
 msgstr "Novo geslo"
 
-#: templates/personal.php:42
+#: templates/personal.php:44
 msgid "Change password"
 msgstr "Spremeni geslo"
 
-#: templates/personal.php:54 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:78
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:55
+#: templates/personal.php:57
 msgid "Your display name was changed"
 msgstr ""
 
-#: templates/personal.php:56
+#: templates/personal.php:58
 msgid "Unable to change your display name"
 msgstr ""
 
-#: templates/personal.php:59
+#: templates/personal.php:61
 msgid "Change display name"
 msgstr ""
 
-#: templates/personal.php:68
+#: templates/personal.php:70
 msgid "Email"
 msgstr "Elektronska pošta"
 
-#: templates/personal.php:69
+#: templates/personal.php:72
 msgid "Your email address"
 msgstr "Vaš elektronski poštni naslov"
 
-#: templates/personal.php:70
+#: templates/personal.php:73
 msgid "Fill in an email address to enable password recovery"
 msgstr "Vpišite vaš elektronski naslov in s tem omogočite obnovitev gesla"
 
-#: templates/personal.php:76 templates/personal.php:77
+#: templates/personal.php:79 templates/personal.php:80
 msgid "Language"
 msgstr "Jezik"
 
-#: templates/personal.php:82
+#: templates/personal.php:86
 msgid "Help translate"
 msgstr "Pomagajte pri prevajanju"
 
-#: templates/personal.php:87
+#: templates/personal.php:91
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:89
+#: templates/personal.php:93
 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."
 
diff --git a/l10n/sl/user_ldap.po b/l10n/sl/user_ldap.po
index c3b92afff382b98157cf1b2e496497c1cfc7cd4f..e4a0d78c54a9f11a5774eda95b564502bbae9539 100644
--- a/l10n/sl/user_ldap.po
+++ b/l10n/sl/user_ldap.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-08 00:10+0100\n"
-"PO-Revision-Date: 2013-02-07 23:11+0000\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: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -23,17 +23,17 @@ msgstr ""
 msgid "Failed to delete the server configuration"
 msgstr ""
 
-#: ajax/testConfiguration.php:35
+#: ajax/testConfiguration.php:36
 msgid "The configuration is valid and the connection could be established!"
 msgstr ""
 
-#: ajax/testConfiguration.php:37
+#: ajax/testConfiguration.php:39
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
 msgstr ""
 
-#: ajax/testConfiguration.php:40
+#: ajax/testConfiguration.php:43
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
@@ -88,224 +88,248 @@ msgstr ""
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:17
+#: templates/settings.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:23
 msgid "Host"
 msgstr "Gostitelj"
 
-#: templates/settings.php:21
+#: templates/settings.php:25
 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:22
+#: templates/settings.php:26
 msgid "Base DN"
 msgstr "Osnovni DN"
 
-#: templates/settings.php:22
+#: templates/settings.php:27
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:28
 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"
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "User DN"
 msgstr "Uporabnik DN"
 
-#: templates/settings.php:23
+#: templates/settings.php:32
 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."
 
-#: templates/settings.php:24
+#: templates/settings.php:33
 msgid "Password"
 msgstr "Geslo"
 
-#: templates/settings.php:24
+#: templates/settings.php:36
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "Za anonimni dostop sta polji DN in geslo prazni."
 
-#: templates/settings.php:25
+#: templates/settings.php:37
 msgid "User Login Filter"
 msgstr "Filter prijav uporabnikov"
 
-#: templates/settings.php:25
+#: templates/settings.php:40
 #, 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."
 
-#: templates/settings.php:25
+#: templates/settings.php:41
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "Uporabite vsebnik %%uid, npr. \"uid=%%uid\"."
 
-#: templates/settings.php:26
+#: templates/settings.php:42
 msgid "User List Filter"
 msgstr "Filter seznama uporabnikov"
 
-#: templates/settings.php:26
+#: templates/settings.php:45
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Določi filter za uporabo med pridobivanjem uporabnikov."
 
-#: templates/settings.php:26
+#: templates/settings.php:46
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "Brez kateregakoli vsebnika, npr. \"objectClass=person\"."
 
-#: templates/settings.php:27
+#: templates/settings.php:47
 msgid "Group Filter"
 msgstr "Filter skupin"
 
-#: templates/settings.php:27
+#: templates/settings.php:50
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Določi filter za uporabo med pridobivanjem skupin."
 
-#: templates/settings.php:27
+#: templates/settings.php:51
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "Brez katerekoli vsebnika, npr. \"objectClass=posixGroup\"."
 
-#: templates/settings.php:31
+#: templates/settings.php:55
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:34
+#: templates/settings.php:58
 msgid "Port"
 msgstr "Vrata"
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:60
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Use TLS"
 msgstr "Uporabi TLS"
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:39
+#: templates/settings.php:63
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Strežnik LDAP ne upošteva velikosti črk (Windows)"
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid "Turn off SSL certificate validation."
 msgstr "Onemogoči potrditev veljavnosti potrdila SSL."
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 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."
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid "Not recommended, use for testing only."
 msgstr "Dejanje ni priporočeno; uporabljeno naj bo le za preizkušanje delovanja."
 
-#: templates/settings.php:41
+#: templates/settings.php:65
+msgid "Cache Time-To-Live"
+msgstr ""
+
+#: templates/settings.php:65
 msgid "in seconds. A change empties the cache."
 msgstr "v sekundah. Sprememba izprazni predpomnilnik."
 
-#: templates/settings.php:43
+#: templates/settings.php:67
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "User Display Name Field"
 msgstr "Polje za uporabnikovo prikazano ime"
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 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:46
+#: templates/settings.php:70
 msgid "Base User Tree"
 msgstr "Osnovno uporabniško drevo"
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:47
+#: templates/settings.php:71
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:47 templates/settings.php:50
+#: templates/settings.php:71 templates/settings.php:74
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "Group Display Name Field"
 msgstr "Polje za prikazano ime skupine"
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 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:49
+#: templates/settings.php:73
 msgid "Base Group Tree"
 msgstr "Osnovno drevo skupine"
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:74
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:75
 msgid "Group-Member association"
 msgstr "Povezava člana skupine"
 
-#: templates/settings.php:53
+#: templates/settings.php:77
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:79
+msgid "Quota Field"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Quota Default"
+msgstr ""
+
+#: templates/settings.php:80
 msgid "in bytes"
 msgstr "v bajtih"
 
-#: templates/settings.php:58
+#: templates/settings.php:81
+msgid "Email Field"
+msgstr ""
+
+#: templates/settings.php:82
+msgid "User Home Folder Naming Rule"
+msgstr ""
+
+#: templates/settings.php:82
 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."
 
-#: templates/settings.php:62
+#: templates/settings.php:86
+msgid "Test Configuration"
+msgstr ""
+
+#: templates/settings.php:86
 msgid "Help"
 msgstr "Pomoč"
diff --git a/l10n/sr/core.po b/l10n/sr/core.po
index 2f0933563299c154da95bc494369ea4a66064bfc..1c71933f89d473b1ef184fbfde2fce7044ef71d1 100644
--- a/l10n/sr/core.po
+++ b/l10n/sr/core.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 14:31+0000\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"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -389,7 +389,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 "Поништавање лозинке за ownCloud"
 
diff --git a/l10n/sr/files.po b/l10n/sr/files.po
index 949fbc2cfc6ca69a686c6bae89106fcd69eb0cf5..90690956b721aec586bd9684231af419290080eb 100644
--- a/l10n/sr/files.po
+++ b/l10n/sr/files.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\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: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -53,27 +53,27 @@ msgid ""
 "the HTML form"
 msgstr "Отпремљена датотека прелази смерницу MAX_FILE_SIZE која је наведена у HTML обрасцу"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
 msgstr "Датотека је делимично отпремљена"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:31
 msgid "No file was uploaded"
 msgstr "Датотека није отпремљена"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:32
 msgid "Missing a temporary folder"
 msgstr "Недостаје привремена фасцикла"
 
-#: ajax/upload.php:34
+#: ajax/upload.php:33
 msgid "Failed to write to disk"
 msgstr "Не могу да пишем на диск"
 
-#: ajax/upload.php:52
+#: ajax/upload.php:51
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:83
+#: ajax/upload.php:82
 msgid "Invalid directory."
 msgstr ""
 
@@ -85,7 +85,7 @@ msgstr "Датотеке"
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:127 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:127 templates/index.php:92 templates/index.php:93
 msgid "Delete"
 msgstr "Обриши"
 
@@ -93,40 +93,36 @@ msgstr "Обриши"
 msgid "Rename"
 msgstr "Преименуј"
 
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
 msgid "Pending"
 msgstr "На чекању"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "{new_name} already exists"
 msgstr "{new_name} већ постоји"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "replace"
 msgstr "замени"
 
-#: js/filelist.js:253
+#: js/filelist.js:251
 msgid "suggest name"
 msgstr "предложи назив"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "cancel"
 msgstr "откажи"
 
-#: js/filelist.js:295
-msgid "replaced {new_name}"
-msgstr "замењено {new_name}"
+#: js/filelist.js:298
+msgid "replaced {new_name} with {old_name}"
+msgstr "замењено {new_name} са {old_name}"
 
-#: js/filelist.js:295 js/filelist.js:297
+#: js/filelist.js:298
 msgid "undo"
 msgstr "опозови"
 
-#: js/filelist.js:297
-msgid "replaced {new_name} with {old_name}"
-msgstr "замењено {new_name} са {old_name}"
-
-#: js/filelist.js:322
+#: js/filelist.js:323
 msgid "perform delete operation"
 msgstr ""
 
@@ -152,74 +148,74 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:224
+#: js/files.js:225
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:261
+#: js/files.js:262
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Не могу да отпремим датотеку као фасциклу или она има 0 бајтова"
 
-#: js/files.js:261
+#: js/files.js:262
 msgid "Upload Error"
 msgstr "Грешка при отпремању"
 
-#: js/files.js:272
+#: js/files.js:273
 msgid "Close"
 msgstr "Затвори"
 
-#: js/files.js:311
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr "Отпремам 1 датотеку"
 
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr "Отпремам {count} датотеке/а"
 
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "Отпремање је прекинуто."
 
-#: js/files.js:496
+#: js/files.js:497
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Отпремање датотеке је у току. Ако сада напустите страницу, прекинућете отпремање."
 
-#: js/files.js:569
+#: js/files.js:570
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:574
+#: js/files.js:575
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:953 templates/index.php:68
 msgid "Name"
 msgstr "Назив"
 
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:954 templates/index.php:79
 msgid "Size"
 msgstr "Величина"
 
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:955 templates/index.php:81
 msgid "Modified"
 msgstr "Измењено"
 
-#: js/files.js:969
+#: js/files.js:974
 msgid "1 folder"
 msgstr "1 фасцикла"
 
-#: js/files.js:971
+#: js/files.js:976
 msgid "{count} folders"
 msgstr "{count} фасцикле/и"
 
-#: js/files.js:979
+#: js/files.js:984
 msgid "1 file"
 msgstr "1 датотека"
 
-#: js/files.js:981
+#: js/files.js:986
 msgid "{count} files"
 msgstr "{count} датотеке/а"
 
@@ -283,33 +279,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr "Прекини отпремање"
 
-#: templates/index.php:59
+#: templates/index.php:53
+msgid "You don’t have write permissions here."
+msgstr ""
+
+#: templates/index.php:60
 msgid "Nothing in here. Upload something!"
 msgstr "Овде нема ничег. Отпремите нешто!"
 
-#: templates/index.php:73
+#: templates/index.php:74
 msgid "Download"
 msgstr "Преузми"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:86 templates/index.php:87
 msgid "Unshare"
 msgstr "Укини дељење"
 
-#: templates/index.php:105
+#: templates/index.php:106
 msgid "Upload too large"
 msgstr "Датотека је превелика"
 
-#: templates/index.php:107
+#: templates/index.php:108
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Датотеке које желите да отпремите прелазе ограничење у величини."
 
-#: templates/index.php:112
+#: templates/index.php:113
 msgid "Files are being scanned, please wait."
 msgstr "Скенирам датотеке…"
 
-#: templates/index.php:115
+#: templates/index.php:116
 msgid "Current scanning"
 msgstr "Тренутно скенирање"
 
diff --git a/l10n/sr/files_external.po b/l10n/sr/files_external.po
index 867ac5a97ae014b3d2317c04e338d6876af60363..f9dec54fe8b2e11961a8d4f6972bb4f641546e46 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: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-11 23:22+0000\n"
+"POT-Creation-Date: 2013-02-28 00:04+0100\n"
+"PO-Revision-Date: 2013-02-27 23:04+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -17,37 +17,33 @@ 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"
 
-#: 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:421
 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:424
 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 "
@@ -58,63 +54,63 @@ msgstr ""
 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 "Корисници"
 
-#: 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 "Обриши"
 
-#: 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/sr/files_trashbin.po b/l10n/sr/files_trashbin.po
index 4e1a43a04958a77431033ffec43fe78d273caecc..b02e31e10988f7bb047c967682224b3cf8990cd1 100644
--- a/l10n/sr/files_trashbin.po
+++ b/l10n/sr/files_trashbin.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 10:07+0000\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: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -18,7 +18,7 @@ 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:22
+#: ajax/delete.php:40
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
@@ -28,35 +28,39 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
 msgid "perform restore operation"
 msgstr "врати у претходно стање"
 
-#: js/trash.js:33
+#: js/trash.js:34
 msgid "delete file permanently"
 msgstr ""
 
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr ""
+
+#: js/trash.js:174 templates/index.php:17
 msgid "Name"
 msgstr "Име"
 
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:175 templates/index.php:27
 msgid "Deleted"
 msgstr "Обрисано"
 
-#: js/trash.js:135
+#: js/trash.js:184
 msgid "1 folder"
 msgstr "1 фасцикла"
 
-#: js/trash.js:137
+#: js/trash.js:186
 msgid "{count} folders"
 msgstr "{count} фасцикле/и"
 
-#: js/trash.js:145
+#: js/trash.js:194
 msgid "1 file"
 msgstr "1 датотека"
 
-#: js/trash.js:147
+#: js/trash.js:196
 msgid "{count} files"
 msgstr "{count} датотеке/а"
 
@@ -67,3 +71,11 @@ 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/sr/files_versions.po b/l10n/sr/files_versions.po
index 74719197c5f64636cc76d5cf49066bf08fb3d063..402e0c7165b11e81e1874dfd78a3bb67445f74e8 100644
--- a/l10n/sr/files_versions.po
+++ b/l10n/sr/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-08 00:10+0100\n"
-"PO-Revision-Date: 2013-02-07 23:11+0000\n"
+"POT-Creation-Date: 2013-02-28 00:04+0100\n"
+"PO-Revision-Date: 2013-02-27 23:04+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -49,18 +49,10 @@ msgstr ""
 msgid "No path specified"
 msgstr ""
 
-#: js/versions.js:16
-msgid "History"
-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 ""
-
-#: templates/settings.php:3
-msgid "Files Versioning"
-msgstr "Прављење верзија датотека"
-
-#: templates/settings.php:4
-msgid "Enable"
-msgstr "Омогући"
diff --git a/l10n/sr/lib.po b/l10n/sr/lib.po
index ac54addda50d2356391414544ad16015ba13ba34..4b7461a06db9217f005ef0f63189e0eb40a39e75 100644
--- a/l10n/sr/lib.po
+++ b/l10n/sr/lib.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-11 15:39+0100\n"
-"PO-Revision-Date: 2013-02-11 14:40+0000\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: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -20,27 +20,27 @@ msgstr ""
 "Language: sr\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: app.php:339
+#: app.php:349
 msgid "Help"
 msgstr "Помоћ"
 
-#: app.php:346
+#: app.php:362
 msgid "Personal"
 msgstr "Лично"
 
-#: app.php:351
+#: app.php:373
 msgid "Settings"
 msgstr "Поставке"
 
-#: app.php:356
+#: app.php:385
 msgid "Users"
 msgstr "Корисници"
 
-#: app.php:363
+#: app.php:398
 msgid "Apps"
 msgstr "Апликације"
 
-#: app.php:365
+#: app.php:406
 msgid "Admin"
 msgstr "Администратор"
 
@@ -52,15 +52,15 @@ msgstr "Преузимање ZIP-а је искључено."
 msgid "Files need to be downloaded one by one."
 msgstr "Датотеке морате преузимати једну по једну."
 
-#: files.php:203 files.php:228
+#: files.php:204 files.php:231
 msgid "Back to Files"
 msgstr "Назад на датотеке"
 
-#: files.php:227
+#: files.php:228
 msgid "Selected files too large to generate zip file."
 msgstr "Изабране датотеке су превелике да бисте направили ZIP датотеку."
 
-#: helper.php:226
+#: helper.php:228
 msgid "couldn't be determined"
 msgstr "није одређено"
 
@@ -100,87 +100,92 @@ msgstr ""
 msgid "Specify a data folder."
 msgstr ""
 
-#: setup.php:53
+#: setup.php:55
 #, php-format
 msgid "%s enter the database username."
 msgstr ""
 
-#: setup.php:56
+#: setup.php:58
 #, php-format
 msgid "%s enter the database name."
 msgstr ""
 
-#: setup.php:59
+#: setup.php:61
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr ""
 
-#: setup.php:62
+#: setup.php:64
 #, php-format
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:126 setup.php:291 setup.php:336
+#: setup.php:128 setup.php:320 setup.php:365
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:127 setup.php:150 setup.php:204
+#: setup.php:129 setup.php:152 setup.php:229
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:149 setup.php:423 setup.php:489
+#: setup.php:151 setup.php:453 setup.php:520
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:203
+#: setup.php:228
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:255 setup.php:357 setup.php:366 setup.php:384 setup.php:394
-#: setup.php:403 setup.php:430 setup.php:496 setup.php:522 setup.php:529
-#: setup.php:540 setup.php:547 setup.php:556 setup.php:564 setup.php:573
-#: setup.php:579
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:256 setup.php:358 setup.php:367 setup.php:385 setup.php:395
-#: setup.php:404 setup.php:431 setup.php:497 setup.php:523 setup.php:530
-#: setup.php:541 setup.php:557 setup.php:565 setup.php:574
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:270
+#: setup.php:299
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:271
+#: setup.php:300
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:276
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:277
+#: setup.php:306
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:548 setup.php:580
+#: setup.php:579 setup.php:611
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:644
+#: setup.php:631
+#, php-format
+msgid "MS SQL username and/or password not valid: %s"
+msgstr ""
+
+#: setup.php:849
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:645
+#: setup.php:850
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
@@ -237,16 +242,16 @@ msgstr "прошле године"
 msgid "years ago"
 msgstr "година раније"
 
-#: updater.php:75
+#: updater.php:78
 #, php-format
 msgid "%s is available. Get <a href=\"%s\">more information</a>"
 msgstr "%s је доступна. Погледајте <a href=\"%s\">више информација</a>."
 
-#: updater.php:77
+#: updater.php:81
 msgid "up to date"
 msgstr "је ажурна"
 
-#: updater.php:80
+#: updater.php:84
 msgid "updates check is disabled"
 msgstr "провера ажурирања је онемогућена"
 
diff --git a/l10n/sr/settings.po b/l10n/sr/settings.po
index 46a0dd8a5c285043162b8cbedad5fbdc8796a891..6e248a0cdde39e3d018f4eb2a6485096bf381b97 100644
--- a/l10n/sr/settings.po
+++ b/l10n/sr/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 23:05+0000\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: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -23,8 +23,8 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "Грешка приликом учитавања списка из Складишта Програма"
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:15
-#: ajax/togglegroups.php:18
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr "Грешка при аутентификацији"
 
@@ -72,12 +72,12 @@ 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 "Не могу да додам корисника у групу %s"
 
-#: ajax/togglegroups.php:34
+#: ajax/togglegroups.php:36
 #, php-format
 msgid "Unable to remove user from group %s"
 msgstr "Не могу да уклоним корисника из групе %s"
@@ -118,7 +118,7 @@ msgstr "Грешка"
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:96
+#: js/personal.js:99
 msgid "Saving..."
 msgstr "Чување у току..."
 
@@ -147,23 +147,23 @@ msgstr "Управник групе"
 msgid "Delete"
 msgstr "Обриши"
 
-#: js/users.js:190
+#: js/users.js:191
 msgid "add group"
 msgstr ""
 
-#: js/users.js:351
+#: js/users.js:352
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:357
+#: js/users.js:358
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -209,19 +209,19 @@ msgstr ""
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:61
+#: templates/admin.php:63
+#, php-format
 msgid ""
-"This ownCloud server can't set system locale to "
-"\"en_US.UTF-8\"/\"en_US.UTF8\". 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 en_US.UTF-8/en_US.UTF8."
+"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:72
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:75
+#: 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 "
@@ -231,98 +231,98 @@ msgid ""
 " of ownCloud."
 msgstr ""
 
-#: templates/admin.php:89
+#: templates/admin.php:92
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:98
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:108
+#: 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:118
+#: 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:125
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:131
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:132
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:140
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:147
+#: templates/admin.php:150
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:148
+#: templates/admin.php:151
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:155
+#: templates/admin.php:158
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:161
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:165
+#: templates/admin.php:168
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:181
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:179
+#: templates/admin.php:182
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:182
+#: templates/admin.php:185
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr ""
 
-#: templates/admin.php:192
+#: templates/admin.php:195
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:193
+#: templates/admin.php:196
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:220
+#: templates/admin.php:223
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:227 templates/personal.php:98
+#: templates/admin.php:230 templates/personal.php:102
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:230 templates/personal.php:100
+#: templates/admin.php:233 templates/personal.php:105
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -332,51 +332,51 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "Развијају <a href=\"http://ownCloud.org/contact\" target=\"_blank\">Оунклауд (ownCloud) заједница</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">изворни код</a> је издат под <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Аферо Јавном Лиценцом (Affero General Public License)\">АГПЛ лиценцом</abbr></a>."
 
-#: templates/apps.php:10
+#: templates/apps.php:11
 msgid "Add your App"
 msgstr "Додајте ваш програм"
 
-#: templates/apps.php:11
+#: templates/apps.php:12
 msgid "More Apps"
 msgstr "Више програма"
 
-#: templates/apps.php:24
+#: templates/apps.php:28
 msgid "Select an App"
 msgstr "Изаберите програм"
 
-#: templates/apps.php:28
+#: templates/apps.php:34
 msgid "See application page at apps.owncloud.com"
 msgstr "Погледајте страницу са програмима на apps.owncloud.com"
 
-#: templates/apps.php:29
+#: templates/apps.php:36
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-лиценцирао <span class=\"author\"></span>"
 
-#: templates/apps.php:31
+#: templates/apps.php:38
 msgid "Update"
 msgstr "Ажурирај"
 
-#: templates/help.php:3
+#: 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 ""
 
@@ -385,79 +385,79 @@ msgstr ""
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Искористили сте <strong>%s</strong> од дозвољених <strong>%s</strong>"
 
-#: templates/personal.php:14
+#: templates/personal.php:15
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:25
+#: templates/personal.php:26
 msgid "Show First Run Wizard again"
 msgstr "Поново прикажи чаробњак за прво покретање"
 
-#: templates/personal.php:36 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
 msgid "Password"
 msgstr "Лозинка"
 
-#: templates/personal.php:37
+#: templates/personal.php:38
 msgid "Your password was changed"
 msgstr "Лозинка је промењена"
 
-#: templates/personal.php:38
+#: templates/personal.php:39
 msgid "Unable to change your password"
 msgstr "Не могу да изменим вашу лозинку"
 
-#: templates/personal.php:39
+#: templates/personal.php:40
 msgid "Current password"
 msgstr "Тренутна лозинка"
 
-#: templates/personal.php:40
+#: templates/personal.php:42
 msgid "New password"
 msgstr "Нова лозинка"
 
-#: templates/personal.php:42
+#: templates/personal.php:44
 msgid "Change password"
 msgstr "Измени лозинку"
 
-#: templates/personal.php:54 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:78
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:55
+#: templates/personal.php:57
 msgid "Your display name was changed"
 msgstr ""
 
-#: templates/personal.php:56
+#: templates/personal.php:58
 msgid "Unable to change your display name"
 msgstr ""
 
-#: templates/personal.php:59
+#: templates/personal.php:61
 msgid "Change display name"
 msgstr ""
 
-#: templates/personal.php:68
+#: templates/personal.php:70
 msgid "Email"
 msgstr "Е-пошта"
 
-#: templates/personal.php:69
+#: templates/personal.php:72
 msgid "Your email address"
 msgstr "Ваша адреса е-поште"
 
-#: templates/personal.php:70
+#: templates/personal.php:73
 msgid "Fill in an email address to enable password recovery"
 msgstr "Ун"
 
-#: templates/personal.php:76 templates/personal.php:77
+#: templates/personal.php:79 templates/personal.php:80
 msgid "Language"
 msgstr "Језик"
 
-#: templates/personal.php:82
+#: templates/personal.php:86
 msgid "Help translate"
 msgstr " Помозите у превођењу"
 
-#: templates/personal.php:87
+#: templates/personal.php:91
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:89
+#: templates/personal.php:93
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
diff --git a/l10n/sr/user_ldap.po b/l10n/sr/user_ldap.po
index 28760cfceb4a7f7668cc6af3e0d59f5af98913f2..604cf33cd58a5e7989cd2834e7a743441a8fe357 100644
--- a/l10n/sr/user_ldap.po
+++ b/l10n/sr/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-08 00:10+0100\n"
-"PO-Revision-Date: 2013-02-07 23:11+0000\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: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -22,17 +22,17 @@ msgstr ""
 msgid "Failed to delete the server configuration"
 msgstr ""
 
-#: ajax/testConfiguration.php:35
+#: ajax/testConfiguration.php:36
 msgid "The configuration is valid and the connection could be established!"
 msgstr ""
 
-#: ajax/testConfiguration.php:37
+#: ajax/testConfiguration.php:39
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
 msgstr ""
 
-#: ajax/testConfiguration.php:40
+#: ajax/testConfiguration.php:43
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
@@ -87,224 +87,248 @@ msgstr ""
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:17
+#: templates/settings.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:23
 msgid "Host"
 msgstr "Домаћин"
 
-#: templates/settings.php:21
+#: templates/settings.php:25
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "Можете да изоставите протокол, осим ако захтевате SSL. У том случају почните са ldaps://."
 
-#: templates/settings.php:22
+#: templates/settings.php:26
 msgid "Base DN"
 msgstr "База DN"
 
-#: templates/settings.php:22
+#: templates/settings.php:27
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:28
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "User DN"
 msgstr "Корисник DN"
 
-#: templates/settings.php:23
+#: templates/settings.php:32
 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:24
+#: templates/settings.php:33
 msgid "Password"
 msgstr "Лозинка"
 
-#: templates/settings.php:24
+#: templates/settings.php:36
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "За анониман приступ, оставите поља DN и лозинка празним."
 
-#: templates/settings.php:25
+#: templates/settings.php:37
 msgid "User Login Filter"
 msgstr "Филтер за пријаву корисника"
 
-#: templates/settings.php:25
+#: templates/settings.php:40
 #, 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:25
+#: templates/settings.php:41
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "користите чувар места %%uid, нпр. „uid=%%uid\""
 
-#: templates/settings.php:26
+#: templates/settings.php:42
 msgid "User List Filter"
 msgstr "Филтер за списак корисника"
 
-#: templates/settings.php:26
+#: templates/settings.php:45
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Одређује филтер за примењивање при прибављању корисника."
 
-#: templates/settings.php:26
+#: templates/settings.php:46
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "без икаквог чувара места, нпр. „objectClass=person“."
 
-#: templates/settings.php:27
+#: templates/settings.php:47
 msgid "Group Filter"
 msgstr "Филтер групе"
 
-#: templates/settings.php:27
+#: templates/settings.php:50
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Одређује филтер за примењивање при прибављању група."
 
-#: templates/settings.php:27
+#: templates/settings.php:51
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "без икаквог чувара места, нпр. „objectClass=posixGroup“."
 
-#: templates/settings.php:31
+#: templates/settings.php:55
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:34
+#: templates/settings.php:58
 msgid "Port"
 msgstr "Порт"
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:60
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Use TLS"
 msgstr "Користи TLS"
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:39
+#: templates/settings.php:63
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "LDAP сервер осетљив на велика и мала слова (Windows)"
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid "Turn off SSL certificate validation."
 msgstr "Искључите потврду SSL сертификата."
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 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:40
+#: templates/settings.php:64
 msgid "Not recommended, use for testing only."
 msgstr "Не препоручује се; користите само за тестирање."
 
-#: templates/settings.php:41
+#: templates/settings.php:65
+msgid "Cache Time-To-Live"
+msgstr ""
+
+#: templates/settings.php:65
 msgid "in seconds. A change empties the cache."
 msgstr "у секундама. Промена испражњава кеш меморију."
 
-#: templates/settings.php:43
+#: templates/settings.php:67
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "User Display Name Field"
 msgstr "Име приказа корисника"
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "LDAP атрибут за стварање имена ownCloud-а корисника."
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "Base User Tree"
 msgstr "Основно стабло корисника"
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:47
+#: templates/settings.php:71
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:47 templates/settings.php:50
+#: templates/settings.php:71 templates/settings.php:74
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "Group Display Name Field"
 msgstr "Име приказа групе"
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "LDAP атрибут за стварање имена ownCloud-а групе."
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "Base Group Tree"
 msgstr "Основна стабло група"
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:74
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:75
 msgid "Group-Member association"
 msgstr "Придруживање чланова у групу"
 
-#: templates/settings.php:53
+#: templates/settings.php:77
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:79
+msgid "Quota Field"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Quota Default"
+msgstr ""
+
+#: templates/settings.php:80
 msgid "in bytes"
 msgstr "у бајтовима"
 
-#: templates/settings.php:58
+#: templates/settings.php:81
+msgid "Email Field"
+msgstr ""
+
+#: templates/settings.php:82
+msgid "User Home Folder Naming Rule"
+msgstr ""
+
+#: templates/settings.php:82
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:62
+#: templates/settings.php:86
+msgid "Test Configuration"
+msgstr ""
+
+#: templates/settings.php:86
 msgid "Help"
 msgstr "Помоћ"
diff --git a/l10n/sr@latin/files.po b/l10n/sr@latin/files.po
index 721a34c0996902991502cc3a8d50b8e484392d96..49adfe19322f0b0e53591e1a9503a515932d8e65 100644
--- a/l10n/sr@latin/files.po
+++ b/l10n/sr@latin/files.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\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: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -51,27 +51,27 @@ msgid ""
 "the HTML form"
 msgstr "Poslati fajl prevazilazi direktivu MAX_FILE_SIZE koja je navedena u HTML formi"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
 msgstr "Poslati fajl je samo delimično otpremljen!"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:31
 msgid "No file was uploaded"
 msgstr "Nijedan fajl nije poslat"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:32
 msgid "Missing a temporary folder"
 msgstr "Nedostaje privremena fascikla"
 
-#: ajax/upload.php:34
+#: ajax/upload.php:33
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:52
+#: ajax/upload.php:51
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:83
+#: ajax/upload.php:82
 msgid "Invalid directory."
 msgstr ""
 
@@ -83,7 +83,7 @@ msgstr "Fajlovi"
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:127 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:127 templates/index.php:92 templates/index.php:93
 msgid "Delete"
 msgstr "Obriši"
 
@@ -91,40 +91,36 @@ msgstr "Obriši"
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:253
+#: js/filelist.js:251
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:295
-msgid "replaced {new_name}"
+#: js/filelist.js:298
+msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:295 js/filelist.js:297
+#: js/filelist.js:298
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:297
-msgid "replaced {new_name} with {old_name}"
-msgstr ""
-
-#: js/filelist.js:322
+#: js/filelist.js:323
 msgid "perform delete operation"
 msgstr ""
 
@@ -150,74 +146,74 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:224
+#: js/files.js:225
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:261
+#: js/files.js:262
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:261
+#: js/files.js:262
 msgid "Upload Error"
 msgstr ""
 
-#: js/files.js:272
+#: js/files.js:273
 msgid "Close"
 msgstr "Zatvori"
 
-#: js/files.js:311
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr ""
 
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr ""
 
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:496
+#: js/files.js:497
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:569
+#: js/files.js:570
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:574
+#: js/files.js:575
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:953 templates/index.php:68
 msgid "Name"
 msgstr "Ime"
 
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:954 templates/index.php:79
 msgid "Size"
 msgstr "Veličina"
 
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:955 templates/index.php:81
 msgid "Modified"
 msgstr "Zadnja izmena"
 
-#: js/files.js:969
+#: js/files.js:974
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:971
+#: js/files.js:976
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:979
+#: js/files.js:984
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:981
+#: js/files.js:986
 msgid "{count} files"
 msgstr ""
 
@@ -281,33 +277,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:53
+msgid "You don’t have write permissions here."
+msgstr ""
+
+#: templates/index.php:60
 msgid "Nothing in here. Upload something!"
 msgstr "Ovde nema ničeg. Pošaljite nešto!"
 
-#: templates/index.php:73
+#: templates/index.php:74
 msgid "Download"
 msgstr "Preuzmi"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:86 templates/index.php:87
 msgid "Unshare"
 msgstr ""
 
-#: templates/index.php:105
+#: templates/index.php:106
 msgid "Upload too large"
 msgstr "Pošiljka je prevelika"
 
-#: templates/index.php:107
+#: templates/index.php:108
 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:112
+#: templates/index.php:113
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:115
+#: templates/index.php:116
 msgid "Current scanning"
 msgstr ""
 
diff --git a/l10n/sr@latin/files_external.po b/l10n/sr@latin/files_external.po
index 1952c7f947495ed26c28db106c767399731cea45..ccf11b6140c1cdc77776b000a8cb0c7a28b2c535 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: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-11 23:22+0000\n"
+"POT-Creation-Date: 2013-02-28 00:04+0100\n"
+"PO-Revision-Date: 2013-02-27 23:04+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -17,37 +17,33 @@ 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"
 
-#: 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:421
 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:424
 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 "
@@ -58,63 +54,63 @@ msgstr ""
 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 "Grupe"
 
-#: templates/settings.php:95
+#: templates/settings.php:100
 msgid "Users"
 msgstr "Korisnici"
 
-#: 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 "Obriši"
 
-#: 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/sr@latin/files_trashbin.po b/l10n/sr@latin/files_trashbin.po
index a96b8aed4fc2bf60cbc7e3ed99c483f64b40845f..65e0a7afc15ddc1804a0c7c52fe6481c0bb01db7 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-02-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 10:07+0000\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: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@ 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:22
+#: ajax/delete.php:40
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
@@ -27,35 +27,39 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:33
+#: js/trash.js:34
 msgid "delete file permanently"
 msgstr ""
 
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr ""
+
+#: js/trash.js:174 templates/index.php:17
 msgid "Name"
 msgstr "Ime"
 
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:175 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:135
+#: js/trash.js:184
 msgid "1 folder"
 msgstr ""
 
-#: js/trash.js:137
+#: js/trash.js:186
 msgid "{count} folders"
 msgstr ""
 
-#: js/trash.js:145
+#: js/trash.js:194
 msgid "1 file"
 msgstr ""
 
-#: js/trash.js:147
+#: js/trash.js:196
 msgid "{count} files"
 msgstr ""
 
@@ -66,3 +70,11 @@ msgstr ""
 #: templates/index.php:20 templates/index.php:22
 msgid "Restore"
 msgstr ""
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr "Obriši"
+
+#: templates/part.breadcrumb.php:9
+msgid "Deleted Files"
+msgstr ""
diff --git a/l10n/sr@latin/files_versions.po b/l10n/sr@latin/files_versions.po
index d049a5e55bd167aab3516b9553a539adfd767e2b..53af96aaac6e7066b540a4a3aed4cba5cca1027d 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-08 00:10+0100\n"
-"PO-Revision-Date: 2013-02-07 23:11+0000\n"
+"POT-Creation-Date: 2013-02-28 00:04+0100\n"
+"PO-Revision-Date: 2013-02-27 23:04+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -48,18 +48,10 @@ msgstr ""
 msgid "No path specified"
 msgstr ""
 
-#: js/versions.js:16
-msgid "History"
+#: 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 ""
-
-#: templates/settings.php:3
-msgid "Files Versioning"
-msgstr ""
-
-#: templates/settings.php:4
-msgid "Enable"
-msgstr ""
diff --git a/l10n/sr@latin/lib.po b/l10n/sr@latin/lib.po
index 602dcf788336b20871e26564682bd3a60efcb282..f5d0fd7b3f791e037c2e2c073c8a7a10513cf3ac 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-11 15:39+0100\n"
-"PO-Revision-Date: 2013-02-11 14:40+0000\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: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -17,27 +17,27 @@ msgstr ""
 "Language: sr@latin\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: app.php:339
+#: app.php:349
 msgid "Help"
 msgstr "Pomoć"
 
-#: app.php:346
+#: app.php:362
 msgid "Personal"
 msgstr "Lično"
 
-#: app.php:351
+#: app.php:373
 msgid "Settings"
 msgstr "Podešavanja"
 
-#: app.php:356
+#: app.php:385
 msgid "Users"
 msgstr "Korisnici"
 
-#: app.php:363
+#: app.php:398
 msgid "Apps"
 msgstr ""
 
-#: app.php:365
+#: app.php:406
 msgid "Admin"
 msgstr ""
 
@@ -49,15 +49,15 @@ msgstr ""
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:203 files.php:228
+#: files.php:204 files.php:231
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:227
+#: files.php:228
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: helper.php:226
+#: helper.php:228
 msgid "couldn't be determined"
 msgstr ""
 
@@ -97,87 +97,92 @@ msgstr ""
 msgid "Specify a data folder."
 msgstr ""
 
-#: setup.php:53
+#: setup.php:55
 #, php-format
 msgid "%s enter the database username."
 msgstr ""
 
-#: setup.php:56
+#: setup.php:58
 #, php-format
 msgid "%s enter the database name."
 msgstr ""
 
-#: setup.php:59
+#: setup.php:61
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr ""
 
-#: setup.php:62
+#: setup.php:64
 #, php-format
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:126 setup.php:291 setup.php:336
+#: setup.php:128 setup.php:320 setup.php:365
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:127 setup.php:150 setup.php:204
+#: setup.php:129 setup.php:152 setup.php:229
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:149 setup.php:423 setup.php:489
+#: setup.php:151 setup.php:453 setup.php:520
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:203
+#: setup.php:228
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:255 setup.php:357 setup.php:366 setup.php:384 setup.php:394
-#: setup.php:403 setup.php:430 setup.php:496 setup.php:522 setup.php:529
-#: setup.php:540 setup.php:547 setup.php:556 setup.php:564 setup.php:573
-#: setup.php:579
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:256 setup.php:358 setup.php:367 setup.php:385 setup.php:395
-#: setup.php:404 setup.php:431 setup.php:497 setup.php:523 setup.php:530
-#: setup.php:541 setup.php:557 setup.php:565 setup.php:574
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:270
+#: setup.php:299
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:271
+#: setup.php:300
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:276
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:277
+#: setup.php:306
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:548 setup.php:580
+#: setup.php:579 setup.php:611
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:644
+#: setup.php:631
+#, php-format
+msgid "MS SQL username and/or password not valid: %s"
+msgstr ""
+
+#: setup.php:849
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:645
+#: setup.php:850
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
@@ -234,16 +239,16 @@ msgstr ""
 msgid "years ago"
 msgstr ""
 
-#: updater.php:75
+#: updater.php:78
 #, php-format
 msgid "%s is available. Get <a href=\"%s\">more information</a>"
 msgstr ""
 
-#: updater.php:77
+#: updater.php:81
 msgid "up to date"
 msgstr ""
 
-#: updater.php:80
+#: updater.php:84
 msgid "updates check is disabled"
 msgstr ""
 
diff --git a/l10n/sr@latin/settings.po b/l10n/sr@latin/settings.po
index a275ec0d3a74ba1917c025d9784c662eed76200e..02323fa5e0556f5140fdfa019159b982ed8d070e 100644
--- a/l10n/sr@latin/settings.po
+++ b/l10n/sr@latin/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 23:05+0000\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: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -22,8 +22,8 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr ""
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:15
-#: ajax/togglegroups.php:18
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr "Greška pri autentifikaciji"
 
@@ -71,12 +71,12 @@ msgstr "Neispravan zahtev"
 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 ""
@@ -117,7 +117,7 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:96
+#: js/personal.js:99
 msgid "Saving..."
 msgstr ""
 
@@ -146,23 +146,23 @@ msgstr ""
 msgid "Delete"
 msgstr "Obriši"
 
-#: js/users.js:190
+#: js/users.js:191
 msgid "add group"
 msgstr ""
 
-#: js/users.js:351
+#: js/users.js:352
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:357
+#: js/users.js:358
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
 msgid "__language_name__"
 msgstr ""
 
@@ -208,19 +208,19 @@ msgstr ""
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:61
+#: templates/admin.php:63
+#, php-format
 msgid ""
-"This ownCloud server can't set system locale to "
-"\"en_US.UTF-8\"/\"en_US.UTF8\". 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 en_US.UTF-8/en_US.UTF8."
+"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:72
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:75
+#: 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 "
@@ -230,98 +230,98 @@ msgid ""
 " of ownCloud."
 msgstr ""
 
-#: templates/admin.php:89
+#: templates/admin.php:92
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:98
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:108
+#: 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:118
+#: 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:125
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:131
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:132
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:140
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:147
+#: templates/admin.php:150
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:148
+#: templates/admin.php:151
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:155
+#: templates/admin.php:158
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:161
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:165
+#: templates/admin.php:168
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:181
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:179
+#: templates/admin.php:182
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:182
+#: templates/admin.php:185
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr ""
 
-#: templates/admin.php:192
+#: templates/admin.php:195
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:193
+#: templates/admin.php:196
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:220
+#: templates/admin.php:223
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:227 templates/personal.php:98
+#: templates/admin.php:230 templates/personal.php:102
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:230 templates/personal.php:100
+#: templates/admin.php:233 templates/personal.php:105
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -331,51 +331,51 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr ""
 
-#: templates/apps.php:10
+#: templates/apps.php:11
 msgid "Add your App"
 msgstr ""
 
-#: templates/apps.php:11
+#: templates/apps.php:12
 msgid "More Apps"
 msgstr ""
 
-#: templates/apps.php:24
+#: templates/apps.php:28
 msgid "Select an App"
 msgstr "Izaberite program"
 
-#: templates/apps.php:28
+#: templates/apps.php:34
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:29
+#: templates/apps.php:36
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
-#: templates/apps.php:31
+#: templates/apps.php:38
 msgid "Update"
 msgstr ""
 
-#: templates/help.php:3
+#: 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 ""
 
@@ -384,79 +384,79 @@ msgstr ""
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:14
+#: templates/personal.php:15
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:25
+#: templates/personal.php:26
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:36 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
 msgid "Password"
 msgstr "Lozinka"
 
-#: templates/personal.php:37
+#: templates/personal.php:38
 msgid "Your password was changed"
 msgstr ""
 
-#: templates/personal.php:38
+#: templates/personal.php:39
 msgid "Unable to change your password"
 msgstr "Ne mogu da izmenim vašu lozinku"
 
-#: templates/personal.php:39
+#: templates/personal.php:40
 msgid "Current password"
 msgstr "Trenutna lozinka"
 
-#: templates/personal.php:40
+#: templates/personal.php:42
 msgid "New password"
 msgstr "Nova lozinka"
 
-#: templates/personal.php:42
+#: templates/personal.php:44
 msgid "Change password"
 msgstr "Izmeni lozinku"
 
-#: templates/personal.php:54 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:78
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:55
+#: templates/personal.php:57
 msgid "Your display name was changed"
 msgstr ""
 
-#: templates/personal.php:56
+#: templates/personal.php:58
 msgid "Unable to change your display name"
 msgstr ""
 
-#: templates/personal.php:59
+#: templates/personal.php:61
 msgid "Change display name"
 msgstr ""
 
-#: templates/personal.php:68
+#: templates/personal.php:70
 msgid "Email"
 msgstr "E-mail"
 
-#: templates/personal.php:69
+#: templates/personal.php:72
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:70
+#: templates/personal.php:73
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:76 templates/personal.php:77
+#: templates/personal.php:79 templates/personal.php:80
 msgid "Language"
 msgstr "Jezik"
 
-#: templates/personal.php:82
+#: templates/personal.php:86
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:87
+#: templates/personal.php:91
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:89
+#: templates/personal.php:93
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
diff --git a/l10n/sr@latin/user_ldap.po b/l10n/sr@latin/user_ldap.po
index b53dc7e85e978b050c932f12d2787bbaf99a980b..05f0229b2ed08f15b2e965c1b2eb84a3a06ab4e8 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-02-08 00:10+0100\n"
-"PO-Revision-Date: 2013-02-07 23:11+0000\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: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -21,17 +21,17 @@ msgstr ""
 msgid "Failed to delete the server configuration"
 msgstr ""
 
-#: ajax/testConfiguration.php:35
+#: ajax/testConfiguration.php:36
 msgid "The configuration is valid and the connection could be established!"
 msgstr ""
 
-#: ajax/testConfiguration.php:37
+#: ajax/testConfiguration.php:39
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
 msgstr ""
 
-#: ajax/testConfiguration.php:40
+#: ajax/testConfiguration.php:43
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
@@ -86,224 +86,248 @@ msgstr ""
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:17
+#: templates/settings.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:23
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:25
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:26
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:27
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:28
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:32
 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:24
+#: templates/settings.php:33
 msgid "Password"
 msgstr ""
 
-#: templates/settings.php:24
+#: templates/settings.php:36
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:37
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:40
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:41
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:42
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:45
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:46
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:47
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:50
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:51
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:55
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:34
+#: templates/settings.php:58
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:60
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:39
+#: templates/settings.php:63
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:65
+msgid "Cache Time-To-Live"
+msgstr ""
+
+#: templates/settings.php:65
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:67
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:47
+#: templates/settings.php:71
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:47 templates/settings.php:50
+#: templates/settings.php:71 templates/settings.php:74
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:74
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:75
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:77
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:79
+msgid "Quota Field"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Quota Default"
+msgstr ""
+
+#: templates/settings.php:80
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:81
+msgid "Email Field"
+msgstr ""
+
+#: templates/settings.php:82
+msgid "User Home Folder Naming Rule"
+msgstr ""
+
+#: templates/settings.php:82
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:62
+#: templates/settings.php:86
+msgid "Test Configuration"
+msgstr ""
+
+#: templates/settings.php:86
 msgid "Help"
 msgstr "Pomoć"
diff --git a/l10n/sv/core.po b/l10n/sv/core.po
index eb1279048c5b3669320b61f84df06fbebf5440cc..66e9d73211aac5211e3ada08257d0398a1e8d15a 100644
--- a/l10n/sv/core.po
+++ b/l10n/sv/core.po
@@ -14,8 +14,8 @@ 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 14:32+0000\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"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -393,7 +393,7 @@ msgstr "Uppdateringen misslyckades. Rapportera detta problem till <a href=\"http
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Uppdateringen lyckades. Du omdirigeras nu till OwnCloud"
 
-#: lostpassword/controller.php:47
+#: lostpassword/controller.php:48
 msgid "ownCloud password reset"
 msgstr "ownCloud lösenordsåterställning"
 
diff --git a/l10n/sv/files.po b/l10n/sv/files.po
index 4b3b2f578f0a5e70846cffc9cdc199f64cc5e92c..c965ecb646ec8d48e5f168e9b1d1833bcbd7acd7 100644
--- a/l10n/sv/files.po
+++ b/l10n/sv/files.po
@@ -14,9 +14,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: 2013-02-14 23:05+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "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"
@@ -57,27 +57,27 @@ msgid ""
 "the HTML form"
 msgstr "Den uppladdade filen överstiger MAX_FILE_SIZE direktivet som anges i HTML-formulär"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
 msgstr "Den uppladdade filen var endast delvis uppladdad"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:31
 msgid "No file was uploaded"
 msgstr "Ingen fil blev uppladdad"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:32
 msgid "Missing a temporary folder"
 msgstr "Saknar en tillfällig mapp"
 
-#: ajax/upload.php:34
+#: ajax/upload.php:33
 msgid "Failed to write to disk"
 msgstr "Misslyckades spara till disk"
 
-#: ajax/upload.php:52
+#: ajax/upload.php:51
 msgid "Not enough storage available"
 msgstr "Inte tillräckligt med lagringsutrymme tillgängligt"
 
-#: ajax/upload.php:83
+#: ajax/upload.php:82
 msgid "Invalid directory."
 msgstr "Felaktig mapp."
 
@@ -89,7 +89,7 @@ msgstr "Filer"
 msgid "Delete permanently"
 msgstr "Radera permanent"
 
-#: js/fileactions.js:127 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:127 templates/index.php:92 templates/index.php:93
 msgid "Delete"
 msgstr "Radera"
 
@@ -97,40 +97,36 @@ msgstr "Radera"
 msgid "Rename"
 msgstr "Byt namn"
 
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
 msgid "Pending"
 msgstr "Väntar"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "{new_name} already exists"
 msgstr "{new_name} finns redan"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "replace"
 msgstr "ersätt"
 
-#: js/filelist.js:253
+#: js/filelist.js:251
 msgid "suggest name"
 msgstr "föreslå namn"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "cancel"
 msgstr "avbryt"
 
-#: js/filelist.js:295
-msgid "replaced {new_name}"
-msgstr "ersatt {new_name}"
+#: js/filelist.js:298
+msgid "replaced {new_name} with {old_name}"
+msgstr "ersatt {new_name} med {old_name}"
 
-#: js/filelist.js:295 js/filelist.js:297
+#: js/filelist.js:298
 msgid "undo"
 msgstr "ångra"
 
-#: js/filelist.js:297
-msgid "replaced {new_name} with {old_name}"
-msgstr "ersatt {new_name} med {old_name}"
-
-#: js/filelist.js:322
+#: js/filelist.js:323
 msgid "perform delete operation"
 msgstr "utför raderingen"
 
@@ -156,74 +152,74 @@ 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:224
+#: js/files.js:225
 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:261
+#: js/files.js:262
 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."
 
-#: js/files.js:261
+#: js/files.js:262
 msgid "Upload Error"
 msgstr "Uppladdningsfel"
 
-#: js/files.js:272
+#: js/files.js:273
 msgid "Close"
 msgstr "Stäng"
 
-#: js/files.js:311
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr "1 filuppladdning"
 
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr "{count} filer laddas upp"
 
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "Uppladdning avbruten."
 
-#: js/files.js:496
+#: js/files.js:497
 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:569
+#: js/files.js:570
 msgid "URL cannot be empty."
 msgstr "URL kan inte vara tom."
 
-#: js/files.js:574
+#: js/files.js:575
 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:948 templates/index.php:67
+#: js/files.js:953 templates/index.php:68
 msgid "Name"
 msgstr "Namn"
 
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:954 templates/index.php:79
 msgid "Size"
 msgstr "Storlek"
 
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:955 templates/index.php:81
 msgid "Modified"
 msgstr "Ändrad"
 
-#: js/files.js:969
+#: js/files.js:974
 msgid "1 folder"
 msgstr "1 mapp"
 
-#: js/files.js:971
+#: js/files.js:976
 msgid "{count} folders"
 msgstr "{count} mappar"
 
-#: js/files.js:979
+#: js/files.js:984
 msgid "1 file"
 msgstr "1 fil"
 
-#: js/files.js:981
+#: js/files.js:986
 msgid "{count} files"
 msgstr "{count} filer"
 
@@ -281,39 +277,43 @@ msgstr "Från länk"
 
 #: templates/index.php:40
 msgid "Deleted files"
-msgstr ""
+msgstr "Raderade filer"
 
 #: templates/index.php:46
 msgid "Cancel upload"
 msgstr "Avbryt uppladdning"
 
-#: templates/index.php:59
+#: templates/index.php:53
+msgid "You don’t have write permissions here."
+msgstr "Du saknar skrivbehörighet här."
+
+#: templates/index.php:60
 msgid "Nothing in here. Upload something!"
 msgstr "Ingenting här. Ladda upp något!"
 
-#: templates/index.php:73
+#: templates/index.php:74
 msgid "Download"
 msgstr "Ladda ner"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:86 templates/index.php:87
 msgid "Unshare"
 msgstr "Sluta dela"
 
-#: templates/index.php:105
+#: templates/index.php:106
 msgid "Upload too large"
 msgstr "För stor uppladdning"
 
-#: templates/index.php:107
+#: templates/index.php:108
 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:112
+#: templates/index.php:113
 msgid "Files are being scanned, please wait."
 msgstr "Filer skannas, var god vänta"
 
-#: templates/index.php:115
+#: templates/index.php:116
 msgid "Current scanning"
 msgstr "Aktuell skanning"
 
diff --git a/l10n/sv/files_external.po b/l10n/sv/files_external.po
index 0de3f3e3556856ce6c366f7f6349aa713be1e0b2..edcc1e79da000cf811cabf45ac77e46238857c59 100644
--- a/l10n/sv/files_external.po
+++ b/l10n/sv/files_external.po
@@ -3,14 +3,15 @@
 # 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: 2012-12-26 00:10+0100\n"
-"PO-Revision-Date: 2012-12-25 15:20+0000\n"
-"Last-Translator: Magnus Höglund <magnus@linux.com>\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"
 "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"
@@ -18,37 +19,33 @@ msgstr ""
 "Language: sv\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 "Åtkomst beviljad"
 
-#: 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 "Fel vid konfigurering av Dropbox"
 
-#: 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 "Bevilja åtkomst"
 
-#: js/dropbox.js:73 js/google.js:72
-msgid "Fill out all required fields"
-msgstr "Fyll i alla obligatoriska fält"
-
-#: js/dropbox.js:85
+#: js/dropbox.js:101
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr "Ange en giltig Dropbox nyckel och hemlighet."
 
-#: 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 "Fel vid konfigurering av Google Drive"
 
-#: lib/config.php:434
+#: lib/config.php:421
 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:435
+#: lib/config.php:424
 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 "
@@ -59,63 +56,63 @@ msgstr "<b>Varning:</b> Stöd för FTP i PHP är inte aktiverat eller installera
 msgid "External Storage"
 msgstr "Extern lagring"
 
-#: templates/settings.php:8 templates/settings.php:22
-msgid "Mount point"
-msgstr "Monteringspunkt"
-
-#: templates/settings.php:9
-msgid "Backend"
-msgstr "Källa"
+#: templates/settings.php:9 templates/settings.php:28
+msgid "Folder name"
+msgstr "Mappnamn"
 
 #: templates/settings.php:10
+msgid "External storage"
+msgstr "Extern lagring"
+
+#: templates/settings.php:11
 msgid "Configuration"
 msgstr "Konfiguration"
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid "Options"
 msgstr "Alternativ"
 
-#: templates/settings.php:12
+#: templates/settings.php:13
 msgid "Applicable"
 msgstr "Tillämplig"
 
-#: templates/settings.php:27
-msgid "Add mount point"
-msgstr "Lägg till monteringspunkt"
+#: templates/settings.php:33
+msgid "Add storage"
+msgstr "Lägg till lagring"
 
-#: templates/settings.php:85
+#: templates/settings.php:90
 msgid "None set"
 msgstr "Ingen angiven"
 
-#: templates/settings.php:86
+#: templates/settings.php:91
 msgid "All Users"
 msgstr "Alla användare"
 
-#: templates/settings.php:87
+#: templates/settings.php:92
 msgid "Groups"
 msgstr "Grupper"
 
-#: templates/settings.php:95
+#: templates/settings.php:100
 msgid "Users"
 msgstr "Användare"
 
-#: templates/settings.php:108 templates/settings.php:109
-#: templates/settings.php:144 templates/settings.php:145
+#: templates/settings.php:113 templates/settings.php:114
+#: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
 msgstr "Radera"
 
-#: templates/settings.php:124
+#: templates/settings.php:129
 msgid "Enable User External Storage"
 msgstr "Aktivera extern lagring för användare"
 
-#: templates/settings.php:125
+#: templates/settings.php:130
 msgid "Allow users to mount their own external storage"
 msgstr "Tillåt användare att montera egen extern lagring"
 
-#: templates/settings.php:136
+#: templates/settings.php:141
 msgid "SSL root certificates"
 msgstr "SSL rotcertifikat"
 
-#: templates/settings.php:153
+#: templates/settings.php:159
 msgid "Import Root Certificate"
 msgstr "Importera rotcertifikat"
diff --git a/l10n/sv/files_trashbin.po b/l10n/sv/files_trashbin.po
index 94410d99b970c5458178846d3ad897f5ce6cee1d..48a48d9ad757d32d6e880f20c133c66e19f1f94e 100644
--- a/l10n/sv/files_trashbin.po
+++ b/l10n/sv/files_trashbin.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-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 10:07+0000\n"
-"Last-Translator: Magnus Höglund <magnus@linux.com>\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: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,7 +19,7 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:22
+#: ajax/delete.php:40
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "Kunde inte radera %s permanent"
@@ -29,35 +29,39 @@ msgstr "Kunde inte radera %s permanent"
 msgid "Couldn't restore %s"
 msgstr "Kunde inte återställa %s"
 
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
 msgid "perform restore operation"
 msgstr "utför återställning"
 
-#: js/trash.js:33
+#: js/trash.js:34
 msgid "delete file permanently"
 msgstr "radera filen permanent"
 
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr "Radera permanent"
+
+#: js/trash.js:174 templates/index.php:17
 msgid "Name"
 msgstr "Namn"
 
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:175 templates/index.php:27
 msgid "Deleted"
 msgstr "Raderad"
 
-#: js/trash.js:135
+#: js/trash.js:184
 msgid "1 folder"
 msgstr "1 mapp"
 
-#: js/trash.js:137
+#: js/trash.js:186
 msgid "{count} folders"
 msgstr "{count} mappar"
 
-#: js/trash.js:145
+#: js/trash.js:194
 msgid "1 file"
 msgstr "1 fil"
 
-#: js/trash.js:147
+#: js/trash.js:196
 msgid "{count} files"
 msgstr "{count} filer"
 
@@ -68,3 +72,11 @@ msgstr "Ingenting här. Din papperskorg är tom!"
 #: templates/index.php:20 templates/index.php:22
 msgid "Restore"
 msgstr "Återskapa"
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr "Radera"
+
+#: templates/part.breadcrumb.php:9
+msgid "Deleted Files"
+msgstr ""
diff --git a/l10n/sv/files_versions.po b/l10n/sv/files_versions.po
index 3930feca0f403df306f7ad08237592a2ee614a4d..f092111cf652b4f081793c8d2f89476fd922c26b 100644
--- a/l10n/sv/files_versions.po
+++ b/l10n/sv/files_versions.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-11 15:39+0100\n"
-"PO-Revision-Date: 2013-02-11 07:20+0000\n"
-"Last-Translator: Magnus Höglund <magnus@linux.com>\n"
+"POT-Creation-Date: 2013-02-28 00:04+0100\n"
+"PO-Revision-Date: 2013-02-27 23:04+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -49,18 +49,10 @@ msgstr "Inga gamla versioner finns tillgängliga"
 msgid "No path specified"
 msgstr "Ingen sökväg angiven"
 
-#: js/versions.js:16
-msgid "History"
-msgstr "Historik"
+#: 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 "Återställ en fil till en tidigare version genom att klicka på knappen"
-
-#: templates/settings.php:3
-msgid "Files Versioning"
-msgstr "Versionshantering av filer"
-
-#: templates/settings.php:4
-msgid "Enable"
-msgstr "Aktivera"
diff --git a/l10n/sv/lib.po b/l10n/sv/lib.po
index a9d9be915c25174e7e7f1502ba7634b90a815d49..44ec1427c251e473838c34698917dc3bf70e387e 100644
--- a/l10n/sv/lib.po
+++ b/l10n/sv/lib.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 14:33+0000\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: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -19,27 +19,27 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:339
+#: app.php:349
 msgid "Help"
 msgstr "Hjälp"
 
-#: app.php:346
+#: app.php:362
 msgid "Personal"
 msgstr "Personligt"
 
-#: app.php:351
+#: app.php:373
 msgid "Settings"
 msgstr "Inställningar"
 
-#: app.php:356
+#: app.php:385
 msgid "Users"
 msgstr "Användare"
 
-#: app.php:363
+#: app.php:398
 msgid "Apps"
 msgstr "Program"
 
-#: app.php:365
+#: app.php:406
 msgid "Admin"
 msgstr "Admin"
 
@@ -51,15 +51,15 @@ msgstr "Nerladdning av ZIP är avstängd."
 msgid "Files need to be downloaded one by one."
 msgstr "Filer laddas ner en åt gången."
 
-#: files.php:203 files.php:228
+#: files.php:204 files.php:231
 msgid "Back to Files"
 msgstr "Tillbaka till Filer"
 
-#: files.php:227
+#: files.php:228
 msgid "Selected files too large to generate zip file."
 msgstr "Valda filer är för stora för att skapa zip-fil."
 
-#: helper.php:226
+#: helper.php:228
 msgid "couldn't be determined"
 msgstr "kunde inte bestämmas"
 
@@ -99,87 +99,92 @@ msgstr ""
 msgid "Specify a data folder."
 msgstr ""
 
-#: setup.php:53
+#: setup.php:55
 #, php-format
 msgid "%s enter the database username."
 msgstr ""
 
-#: setup.php:56
+#: setup.php:58
 #, php-format
 msgid "%s enter the database name."
 msgstr ""
 
-#: setup.php:59
+#: setup.php:61
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr ""
 
-#: setup.php:62
+#: setup.php:64
 #, php-format
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:126 setup.php:291 setup.php:336
+#: setup.php:128 setup.php:320 setup.php:365
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:127 setup.php:150 setup.php:204
+#: setup.php:129 setup.php:152 setup.php:229
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:149 setup.php:423 setup.php:489
+#: setup.php:151 setup.php:453 setup.php:520
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:203
+#: setup.php:228
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:255 setup.php:357 setup.php:366 setup.php:384 setup.php:394
-#: setup.php:403 setup.php:430 setup.php:496 setup.php:522 setup.php:529
-#: setup.php:540 setup.php:547 setup.php:556 setup.php:564 setup.php:573
-#: setup.php:579
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:256 setup.php:358 setup.php:367 setup.php:385 setup.php:395
-#: setup.php:404 setup.php:431 setup.php:497 setup.php:523 setup.php:530
-#: setup.php:541 setup.php:557 setup.php:565 setup.php:574
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:270
+#: setup.php:299
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:271
+#: setup.php:300
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:276
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:277
+#: setup.php:306
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:548 setup.php:580
+#: setup.php:579 setup.php:611
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:644
+#: setup.php:631
+#, php-format
+msgid "MS SQL username and/or password not valid: %s"
+msgstr ""
+
+#: setup.php:849
 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:645
+#: setup.php:850
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Var god kontrollera <a href='%s'>installationsguiden</a>."
@@ -236,16 +241,16 @@ msgstr "förra året"
 msgid "years ago"
 msgstr "år sedan"
 
-#: updater.php:75
+#: 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:77
+#: updater.php:81
 msgid "up to date"
 msgstr "uppdaterad"
 
-#: updater.php:80
+#: updater.php:84
 msgid "updates check is disabled"
 msgstr "uppdateringskontroll är inaktiverad"
 
diff --git a/l10n/sv/settings.po b/l10n/sv/settings.po
index 854e6c5dbac60bc2099bbd488e05813ee627c4f4..bf1d01a7e9595e65ef4b756e165f2d8c78e2cb7e 100644
--- a/l10n/sv/settings.po
+++ b/l10n/sv/settings.po
@@ -16,9 +16,9 @@ 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:05+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "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,8 +30,8 @@ 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:15
-#: ajax/togglegroups.php:18
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr "Autentiseringsfel"
 
@@ -79,12 +79,12 @@ msgstr "Ogiltig begäran"
 msgid "Admins can't remove themself from the admin group"
 msgstr "Administratörer kan inte ta bort sig själva från admingruppen"
 
-#: ajax/togglegroups.php:28
+#: ajax/togglegroups.php:30
 #, php-format
 msgid "Unable to add user to group %s"
 msgstr "Kan inte lägga till användare i gruppen %s"
 
-#: ajax/togglegroups.php:34
+#: ajax/togglegroups.php:36
 #, php-format
 msgid "Unable to remove user from group %s"
 msgstr "Kan inte radera användare från gruppen %s"
@@ -125,7 +125,7 @@ msgstr "Fel"
 msgid "Updated"
 msgstr "Uppdaterad"
 
-#: js/personal.js:96
+#: js/personal.js:99
 msgid "Saving..."
 msgstr "Sparar..."
 
@@ -154,23 +154,23 @@ msgstr "Gruppadministratör"
 msgid "Delete"
 msgstr "Radera"
 
-#: js/users.js:190
+#: js/users.js:191
 msgid "add group"
-msgstr ""
+msgstr "lägg till grupp"
 
-#: js/users.js:351
+#: js/users.js:352
 msgid "A valid username must be provided"
-msgstr ""
+msgstr "Ett giltigt användarnamn måste anges"
 
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
 msgid "Error creating user"
-msgstr ""
+msgstr "Fel vid skapande av användare"
 
-#: js/users.js:357
+#: js/users.js:358
 msgid "A valid password must be provided"
-msgstr ""
+msgstr "Ett giltigt lösenord måste anges"
 
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -204,7 +204,7 @@ msgstr "Var god kontrollera <a href='%s'>installationsguiden</a>."
 
 #: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
-msgstr ""
+msgstr "Modulen \"fileinfo\" saknas"
 
 #: templates/admin.php:47
 msgid ""
@@ -216,19 +216,19 @@ msgstr ""
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:61
+#: templates/admin.php:63
+#, php-format
 msgid ""
-"This ownCloud server can't set system locale to "
-"\"en_US.UTF-8\"/\"en_US.UTF8\". 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 en_US.UTF-8/en_US.UTF8."
+"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:72
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:75
+#: 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 "
@@ -238,98 +238,98 @@ msgid ""
 " of ownCloud."
 msgstr ""
 
-#: templates/admin.php:89
+#: templates/admin.php:92
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:98
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:108
+#: 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:118
+#: 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:125
+#: templates/admin.php:128
 msgid "Sharing"
-msgstr ""
+msgstr "Dela"
 
-#: templates/admin.php:131
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:132
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:142
 msgid "Allow links"
-msgstr ""
+msgstr "Tillåt länkar"
 
-#: templates/admin.php:140
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:147
+#: templates/admin.php:150
 msgid "Allow resharing"
-msgstr ""
+msgstr "Tillåt vidaredelning"
 
-#: templates/admin.php:148
+#: templates/admin.php:151
 msgid "Allow users to share items shared with them again"
-msgstr ""
+msgstr "Tillåt användare att dela vidare filer som delats med dem"
 
-#: templates/admin.php:155
+#: templates/admin.php:158
 msgid "Allow users to share with anyone"
-msgstr ""
+msgstr "Tillåt delning med alla"
 
-#: templates/admin.php:158
+#: templates/admin.php:161
 msgid "Allow users to only share with users in their groups"
-msgstr ""
+msgstr "Tillåt bara delning med användare i egna grupper"
 
-#: templates/admin.php:165
+#: templates/admin.php:168
 msgid "Security"
-msgstr ""
+msgstr "Säkerhet"
 
-#: templates/admin.php:178
+#: templates/admin.php:181
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:179
+#: templates/admin.php:182
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:182
+#: templates/admin.php:185
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr ""
 
-#: templates/admin.php:192
+#: templates/admin.php:195
 msgid "Log"
-msgstr ""
+msgstr "Logg"
 
-#: templates/admin.php:193
+#: templates/admin.php:196
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:220
+#: templates/admin.php:223
 msgid "More"
 msgstr "Mer"
 
-#: templates/admin.php:227 templates/personal.php:98
+#: templates/admin.php:230 templates/personal.php:102
 msgid "Version"
 msgstr "Version"
 
-#: templates/admin.php:230 templates/personal.php:100
+#: templates/admin.php:233 templates/personal.php:105
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -339,51 +339,51 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "Utvecklad av <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud kommunity</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">källkoden</a> är licenserad under <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
-#: templates/apps.php:10
+#: templates/apps.php:11
 msgid "Add your App"
 msgstr "Lägg till din applikation"
 
-#: templates/apps.php:11
+#: templates/apps.php:12
 msgid "More Apps"
 msgstr "Fler Appar"
 
-#: templates/apps.php:24
+#: templates/apps.php:28
 msgid "Select an App"
 msgstr "Välj en App"
 
-#: templates/apps.php:28
+#: templates/apps.php:34
 msgid "See application page at apps.owncloud.com"
 msgstr "Se programsida på apps.owncloud.com"
 
-#: templates/apps.php:29
+#: templates/apps.php:36
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-licensierad av <span class=\"author\"></span>"
 
-#: templates/apps.php:31
+#: templates/apps.php:38
 msgid "Update"
 msgstr "Uppdatera"
 
-#: templates/help.php:3
+#: templates/help.php:4
 msgid "User Documentation"
 msgstr "Användardokumentation"
 
-#: templates/help.php:4
+#: templates/help.php:6
 msgid "Administrator Documentation"
 msgstr "Administratördokumentation"
 
-#: templates/help.php:6
+#: templates/help.php:9
 msgid "Online Documentation"
 msgstr "Onlinedokumentation"
 
-#: templates/help.php:7
+#: templates/help.php:11
 msgid "Forum"
 msgstr "Forum"
 
-#: templates/help.php:9
+#: templates/help.php:14
 msgid "Bugtracker"
 msgstr "Bugtracker"
 
-#: templates/help.php:11
+#: templates/help.php:17
 msgid "Commercial Support"
 msgstr "Kommersiell support"
 
@@ -392,79 +392,79 @@ msgstr "Kommersiell support"
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Du har använt <strong>%s</strong> av tillgängliga <strong>%s</strong>"
 
-#: templates/personal.php:14
+#: templates/personal.php:15
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:25
+#: templates/personal.php:26
 msgid "Show First Run Wizard again"
 msgstr "Visa Första uppstarts-guiden igen"
 
-#: templates/personal.php:36 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
 msgid "Password"
 msgstr "Lösenord"
 
-#: templates/personal.php:37
+#: templates/personal.php:38
 msgid "Your password was changed"
 msgstr "Ditt lösenord har ändrats"
 
-#: templates/personal.php:38
+#: templates/personal.php:39
 msgid "Unable to change your password"
 msgstr "Kunde inte ändra ditt lösenord"
 
-#: templates/personal.php:39
+#: templates/personal.php:40
 msgid "Current password"
 msgstr "Nuvarande lösenord"
 
-#: templates/personal.php:40
+#: templates/personal.php:42
 msgid "New password"
 msgstr "Nytt lösenord"
 
-#: templates/personal.php:42
+#: templates/personal.php:44
 msgid "Change password"
 msgstr "Ändra lösenord"
 
-#: templates/personal.php:54 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:78
 msgid "Display Name"
 msgstr "Visat namn"
 
-#: templates/personal.php:55
+#: templates/personal.php:57
 msgid "Your display name was changed"
 msgstr "Ditt visningsnamn har ändrats"
 
-#: templates/personal.php:56
+#: templates/personal.php:58
 msgid "Unable to change your display name"
 msgstr "Kan inte ändra ditt visningsnamn"
 
-#: templates/personal.php:59
+#: templates/personal.php:61
 msgid "Change display name"
 msgstr "Ändra visningsnamn"
 
-#: templates/personal.php:68
+#: templates/personal.php:70
 msgid "Email"
 msgstr "E-post"
 
-#: templates/personal.php:69
+#: templates/personal.php:72
 msgid "Your email address"
 msgstr "Din e-postadress"
 
-#: templates/personal.php:70
+#: templates/personal.php:73
 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:76 templates/personal.php:77
+#: templates/personal.php:79 templates/personal.php:80
 msgid "Language"
 msgstr "Språk"
 
-#: templates/personal.php:82
+#: templates/personal.php:86
 msgid "Help translate"
 msgstr "Hjälp att översätta"
 
-#: templates/personal.php:87
+#: templates/personal.php:91
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:89
+#: templates/personal.php:93
 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"
 
diff --git a/l10n/sv/user_ldap.po b/l10n/sv/user_ldap.po
index 148481a3560853e8e7fb77cecca14bf25c689359..2a936630928473f176b5e46c861a927dc9153001 100644
--- a/l10n/sv/user_ldap.po
+++ b/l10n/sv/user_ldap.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-11 15:39+0100\n"
-"PO-Revision-Date: 2013-02-11 07:00+0000\n"
-"Last-Translator: Magnus Höglund <magnus@linux.com>\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"
 "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,17 +24,17 @@ msgstr ""
 msgid "Failed to delete the server configuration"
 msgstr "Misslyckades med att radera serverinställningen"
 
-#: ajax/testConfiguration.php:35
+#: ajax/testConfiguration.php:36
 msgid "The configuration is valid and the connection could be established!"
 msgstr "Inställningen är giltig och anslutningen kunde upprättas!"
 
-#: ajax/testConfiguration.php:37
+#: ajax/testConfiguration.php:39
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
 msgstr "Konfigurationen är riktig, men Bind felade. Var vänlig och kontrollera serverinställningar och logininformation."
 
-#: ajax/testConfiguration.php:40
+#: ajax/testConfiguration.php:43
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
@@ -89,224 +89,248 @@ msgstr "<b>Varning:</b> PHP LDAP - modulen är inte installerad, serversidan kom
 msgid "Server configuration"
 msgstr "Serverinställning"
 
-#: templates/settings.php:17
+#: templates/settings.php:31
 msgid "Add Server Configuration"
 msgstr "Lägg till serverinställning"
 
-#: templates/settings.php:21
+#: templates/settings.php:36
 msgid "Host"
 msgstr "Server"
 
-#: templates/settings.php:21
+#: templates/settings.php:38
 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:22
+#: templates/settings.php:39
 msgid "Base DN"
 msgstr "Start DN"
 
-#: templates/settings.php:22
+#: templates/settings.php:40
 msgid "One Base DN per line"
 msgstr "Ett Start DN per rad"
 
-#: templates/settings.php:22
+#: templates/settings.php:41
 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:23
+#: templates/settings.php:43
 msgid "User DN"
 msgstr "Användare DN"
 
-#: templates/settings.php:23
+#: 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 "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:24
+#: templates/settings.php:46
 msgid "Password"
 msgstr "Lösenord"
 
-#: templates/settings.php:24
+#: templates/settings.php:49
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "För anonym åtkomst, lämna DN och lösenord tomt."
 
-#: templates/settings.php:25
+#: templates/settings.php:50
 msgid "User Login Filter"
 msgstr "Filter logga in användare"
 
-#: templates/settings.php:25
+#: 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 "Definierar filter att tillämpa vid inloggningsförsök. %% uid ersätter användarnamn i loginåtgärden."
 
-#: templates/settings.php:25
+#: templates/settings.php:54
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "använd platshållare %%uid, t ex \"uid=%%uid\""
 
-#: templates/settings.php:26
+#: templates/settings.php:55
 msgid "User List Filter"
 msgstr "Filter lista användare"
 
-#: templates/settings.php:26
+#: templates/settings.php:58
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Definierar filter att tillämpa vid listning av användare."
 
-#: templates/settings.php:26
+#: templates/settings.php:59
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "utan platshållare, t.ex. \"objectClass=person\"."
 
-#: templates/settings.php:27
+#: templates/settings.php:60
 msgid "Group Filter"
 msgstr "Gruppfilter"
 
-#: templates/settings.php:27
+#: templates/settings.php:63
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Definierar filter att tillämpa vid listning av grupper."
 
-#: templates/settings.php:27
+#: templates/settings.php:64
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "utan platshållare, t.ex. \"objectClass=posixGroup\"."
 
-#: templates/settings.php:31
+#: templates/settings.php:68
 msgid "Connection Settings"
 msgstr "Uppkopplingsinställningar"
 
-#: templates/settings.php:33
+#: templates/settings.php:70
 msgid "Configuration Active"
 msgstr "Konfiguration aktiv"
 
-#: templates/settings.php:33
+#: templates/settings.php:70
 msgid "When unchecked, this configuration will be skipped."
 msgstr "Ifall denna är avbockad så kommer konfigurationen att skippas."
 
-#: templates/settings.php:34
+#: templates/settings.php:71
 msgid "Port"
 msgstr "Port"
 
-#: templates/settings.php:35
+#: templates/settings.php:72
 msgid "Backup (Replica) Host"
 msgstr "Säkerhetskopierings-värd (Replika)"
 
-#: templates/settings.php:35
+#: templates/settings.php:72
 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:36
+#: templates/settings.php:73
 msgid "Backup (Replica) Port"
 msgstr "Säkerhetskopierins-port (Replika)"
 
-#: templates/settings.php:37
+#: templates/settings.php:74
 msgid "Disable Main Server"
 msgstr "Inaktivera huvudserver"
 
-#: templates/settings.php:37
+#: templates/settings.php:74
 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:38
+#: templates/settings.php:75
 msgid "Use TLS"
 msgstr "Använd TLS"
 
-#: templates/settings.php:38
+#: templates/settings.php:75
 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:39
+#: templates/settings.php:76
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "LDAP-servern är okänslig för gemener och versaler (Windows)"
 
-#: templates/settings.php:40
+#: templates/settings.php:77
 msgid "Turn off SSL certificate validation."
 msgstr "Stäng av verifiering av SSL-certifikat."
 
-#: templates/settings.php:40
+#: templates/settings.php:77
 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:40
+#: templates/settings.php:77
 msgid "Not recommended, use for testing only."
 msgstr "Rekommenderas inte, använd bara för test. "
 
-#: templates/settings.php:41
+#: templates/settings.php:78
+msgid "Cache Time-To-Live"
+msgstr ""
+
+#: templates/settings.php:78
 msgid "in seconds. A change empties the cache."
 msgstr "i sekunder. En förändring tömmer cache."
 
-#: templates/settings.php:43
+#: templates/settings.php:80
 msgid "Directory Settings"
 msgstr "Mappinställningar"
 
-#: templates/settings.php:45
+#: templates/settings.php:82
 msgid "User Display Name Field"
 msgstr "Attribut för användarnamn"
 
-#: templates/settings.php:45
+#: templates/settings.php:82
 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:46
+#: templates/settings.php:83
 msgid "Base User Tree"
 msgstr "Bas för användare i katalogtjänst"
 
-#: templates/settings.php:46
+#: templates/settings.php:83
 msgid "One User Base DN per line"
 msgstr "En Användare start DN per rad"
 
-#: templates/settings.php:47
+#: templates/settings.php:84
 msgid "User Search Attributes"
 msgstr "Användarsökningsattribut"
 
-#: templates/settings.php:47 templates/settings.php:50
+#: templates/settings.php:84 templates/settings.php:87
 msgid "Optional; one attribute per line"
 msgstr "Valfritt; ett attribut per rad"
 
-#: templates/settings.php:48
+#: templates/settings.php:85
 msgid "Group Display Name Field"
 msgstr "Attribut för gruppnamn"
 
-#: templates/settings.php:48
+#: templates/settings.php:85
 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:49
+#: templates/settings.php:86
 msgid "Base Group Tree"
 msgstr "Bas för grupper i katalogtjänst"
 
-#: templates/settings.php:49
+#: templates/settings.php:86
 msgid "One Group Base DN per line"
 msgstr "En Grupp start DN per rad"
 
-#: templates/settings.php:50
+#: templates/settings.php:87
 msgid "Group Search Attributes"
 msgstr "Gruppsökningsattribut"
 
-#: templates/settings.php:51
+#: templates/settings.php:88
 msgid "Group-Member association"
 msgstr "Attribut för gruppmedlemmar"
 
-#: templates/settings.php:53
+#: templates/settings.php:90
 msgid "Special Attributes"
 msgstr "Specialattribut"
 
-#: templates/settings.php:56
+#: templates/settings.php:92
+msgid "Quota Field"
+msgstr "Kvotfält"
+
+#: templates/settings.php:93
+msgid "Quota Default"
+msgstr ""
+
+#: templates/settings.php:93
 msgid "in bytes"
 msgstr "i bytes"
 
-#: templates/settings.php:58
+#: templates/settings.php:94
+msgid "Email Field"
+msgstr "E-postfält"
+
+#: templates/settings.php:95
+msgid "User Home Folder Naming Rule"
+msgstr ""
+
+#: templates/settings.php:95
 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:62
+#: templates/settings.php:99
+msgid "Test Configuration"
+msgstr ""
+
+#: templates/settings.php:99
 msgid "Help"
 msgstr "Hjälp"
diff --git a/l10n/sw_KE/files.po b/l10n/sw_KE/files.po
index 7f9a342c8f66c1d7c233709c78702f4ad46b853a..c6160aff80e4e8b5b7236cd2e8092f1c5e2e3ddc 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-02-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\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: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
 "MIME-Version: 1.0\n"
@@ -50,27 +50,27 @@ msgid ""
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:31
+#: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:32
+#: ajax/upload.php:31
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:33
+#: ajax/upload.php:32
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:34
+#: ajax/upload.php:33
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:52
+#: ajax/upload.php:51
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:83
+#: ajax/upload.php:82
 msgid "Invalid directory."
 msgstr ""
 
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:127 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:127 templates/index.php:92 templates/index.php:93
 msgid "Delete"
 msgstr ""
 
@@ -90,40 +90,36 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:253
+#: js/filelist.js:251
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:295
-msgid "replaced {new_name}"
+#: js/filelist.js:298
+msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:295 js/filelist.js:297
+#: js/filelist.js:298
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:297
-msgid "replaced {new_name} with {old_name}"
-msgstr ""
-
-#: js/filelist.js:322
+#: js/filelist.js:323
 msgid "perform delete operation"
 msgstr ""
 
@@ -149,74 +145,74 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:224
+#: js/files.js:225
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:261
+#: js/files.js:262
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:261
+#: js/files.js:262
 msgid "Upload Error"
 msgstr ""
 
-#: js/files.js:272
+#: js/files.js:273
 msgid "Close"
 msgstr ""
 
-#: js/files.js:311
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr ""
 
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr ""
 
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:496
+#: js/files.js:497
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:569
+#: js/files.js:570
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:574
+#: js/files.js:575
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:953 templates/index.php:68
 msgid "Name"
 msgstr ""
 
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:954 templates/index.php:79
 msgid "Size"
 msgstr ""
 
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:955 templates/index.php:81
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:969
+#: js/files.js:974
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:971
+#: js/files.js:976
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:979
+#: js/files.js:984
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:981
+#: js/files.js:986
 msgid "{count} files"
 msgstr ""
 
@@ -280,33 +276,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:53
+msgid "You don’t have write permissions here."
+msgstr ""
+
+#: templates/index.php:60
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:73
+#: templates/index.php:74
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:86 templates/index.php:87
 msgid "Unshare"
 msgstr ""
 
-#: templates/index.php:105
+#: templates/index.php:106
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:107
+#: templates/index.php:108
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:112
+#: templates/index.php:113
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:115
+#: templates/index.php:116
 msgid "Current scanning"
 msgstr ""
 
diff --git a/l10n/sw_KE/files_external.po b/l10n/sw_KE/files_external.po
index 0c02d8edc5fb440924cd52879c62460c19a54b90..2054bbb707ea136765c9be0ed94706f9035c26c9 100644
--- a/l10n/sw_KE/files_external.po
+++ b/l10n/sw_KE/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-08 00:09+0100\n"
-"PO-Revision-Date: 2012-08-12 22:34+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-02-28 00:04+0100\n"
+"PO-Revision-Date: 2013-02-27 23:04+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: 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"
@@ -17,37 +17,33 @@ msgstr ""
 "Language: sw_KE\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:405
+#: lib/config.php:421
 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:406
+#: lib/config.php:424
 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 "
@@ -58,63 +54,63 @@ msgstr ""
 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 ""
 
-#: templates/settings.php:108 templates/settings.php:109
-#: templates/settings.php:144 templates/settings.php:145
+#: templates/settings.php:113 templates/settings.php:114
+#: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
 msgstr ""
 
-#: 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:136
+#: templates/settings.php:141
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:153
+#: templates/settings.php:159
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/sw_KE/files_trashbin.po b/l10n/sw_KE/files_trashbin.po
index 91113e58ba9f52f525ac7e0863c1a76e5c0b7cca..441869baaba1c193a658da094ba3e3661dfd9ca5 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-02-08 00:10+0100\n"
-"PO-Revision-Date: 2013-02-07 23:11+0000\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: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
 "MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Language: sw_KE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:22
+#: ajax/delete.php:40
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
@@ -27,35 +27,39 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:33
+#: js/trash.js:34
 msgid "delete file permanently"
 msgstr ""
 
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr ""
+
+#: js/trash.js:174 templates/index.php:17
 msgid "Name"
 msgstr ""
 
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:175 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:135
+#: js/trash.js:184
 msgid "1 folder"
 msgstr ""
 
-#: js/trash.js:137
+#: js/trash.js:186
 msgid "{count} folders"
 msgstr ""
 
-#: js/trash.js:145
+#: js/trash.js:194
 msgid "1 file"
 msgstr ""
 
-#: js/trash.js:147
+#: js/trash.js:196
 msgid "{count} files"
 msgstr ""
 
@@ -66,3 +70,11 @@ 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/sw_KE/files_versions.po b/l10n/sw_KE/files_versions.po
index 1194d23a785238fe5076bb203e5381cf58691521..e8849bf702f65f5b2e7f5ac1b674532c6f511af9 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-08 00:10+0100\n"
-"PO-Revision-Date: 2013-02-07 23:11+0000\n"
+"POT-Creation-Date: 2013-02-28 00:04+0100\n"
+"PO-Revision-Date: 2013-02-27 23:04+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
 "MIME-Version: 1.0\n"
@@ -48,18 +48,10 @@ msgstr ""
 msgid "No path specified"
 msgstr ""
 
-#: js/versions.js:16
-msgid "History"
+#: 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 ""
-
-#: templates/settings.php:3
-msgid "Files Versioning"
-msgstr ""
-
-#: templates/settings.php:4
-msgid "Enable"
-msgstr ""
diff --git a/l10n/sw_KE/lib.po b/l10n/sw_KE/lib.po
index 803852d4296ae3de397bc20667e64834f42a4f9d..8dbccab4ab36d5bb8ec611f227c5ebd7cd75728f 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-11 15:39+0100\n"
-"PO-Revision-Date: 2013-02-11 14:41+0000\n"
+"POT-Creation-Date: 2013-02-27 14:35+0100\n"
+"PO-Revision-Date: 2013-02-27 13:36+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,27 +17,27 @@ msgstr ""
 "Language: sw_KE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:339
+#: app.php:349
 msgid "Help"
 msgstr ""
 
-#: app.php:346
+#: app.php:362
 msgid "Personal"
 msgstr ""
 
-#: app.php:351
+#: app.php:373
 msgid "Settings"
 msgstr ""
 
-#: app.php:356
+#: app.php:385
 msgid "Users"
 msgstr ""
 
-#: app.php:363
+#: app.php:398
 msgid "Apps"
 msgstr ""
 
-#: app.php:365
+#: app.php:406
 msgid "Admin"
 msgstr ""
 
@@ -49,15 +49,15 @@ msgstr ""
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:203 files.php:228
+#: files.php:204 files.php:231
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:227
+#: files.php:228
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: helper.php:226
+#: helper.php:228
 msgid "couldn't be determined"
 msgstr ""
 
@@ -97,87 +97,92 @@ msgstr ""
 msgid "Specify a data folder."
 msgstr ""
 
-#: setup.php:53
+#: setup.php:55
 #, php-format
 msgid "%s enter the database username."
 msgstr ""
 
-#: setup.php:56
+#: setup.php:58
 #, php-format
 msgid "%s enter the database name."
 msgstr ""
 
-#: setup.php:59
+#: setup.php:61
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr ""
 
-#: setup.php:62
+#: setup.php:64
 #, php-format
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:126 setup.php:291 setup.php:336
+#: setup.php:128 setup.php:320 setup.php:365
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:127 setup.php:150 setup.php:204
+#: setup.php:129 setup.php:152 setup.php:229
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:149 setup.php:423 setup.php:489
+#: setup.php:151 setup.php:453 setup.php:520
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:203
+#: setup.php:228
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:255 setup.php:357 setup.php:366 setup.php:384 setup.php:394
-#: setup.php:403 setup.php:430 setup.php:496 setup.php:522 setup.php:529
-#: setup.php:540 setup.php:547 setup.php:556 setup.php:564 setup.php:573
-#: setup.php:579
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:256 setup.php:358 setup.php:367 setup.php:385 setup.php:395
-#: setup.php:404 setup.php:431 setup.php:497 setup.php:523 setup.php:530
-#: setup.php:541 setup.php:557 setup.php:565 setup.php:574
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:270
+#: setup.php:299
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:271
+#: setup.php:300
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:276
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:277
+#: setup.php:306
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:548 setup.php:580
+#: setup.php:579 setup.php:611
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:644
+#: setup.php:631
+#, php-format
+msgid "MS SQL username and/or password not valid: %s"
+msgstr ""
+
+#: setup.php:849
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:645
+#: setup.php:850
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
@@ -234,16 +239,16 @@ msgstr ""
 msgid "years ago"
 msgstr ""
 
-#: updater.php:75
+#: updater.php:78
 #, php-format
 msgid "%s is available. Get <a href=\"%s\">more information</a>"
 msgstr ""
 
-#: updater.php:77
+#: updater.php:81
 msgid "up to date"
 msgstr ""
 
-#: updater.php:80
+#: updater.php:84
 msgid "updates check is disabled"
 msgstr ""
 
diff --git a/l10n/sw_KE/settings.po b/l10n/sw_KE/settings.po
index 457728750c404d73d908743c79ba898853dd448d..53be4d2d72fb9bc40c6fb34f8f3acb16b3237dbe 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-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 23:05+0000\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: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
 "MIME-Version: 1.0\n"
@@ -21,8 +21,8 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr ""
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:15
-#: ajax/togglegroups.php:18
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr ""
 
@@ -70,12 +70,12 @@ 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 ""
@@ -116,7 +116,7 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:96
+#: js/personal.js:99
 msgid "Saving..."
 msgstr ""
 
@@ -145,23 +145,23 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
-#: js/users.js:190
+#: js/users.js:191
 msgid "add group"
 msgstr ""
 
-#: js/users.js:351
+#: js/users.js:352
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:357
+#: js/users.js:358
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
 msgid "__language_name__"
 msgstr ""
 
@@ -207,19 +207,19 @@ msgstr ""
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:61
+#: templates/admin.php:63
+#, php-format
 msgid ""
-"This ownCloud server can't set system locale to "
-"\"en_US.UTF-8\"/\"en_US.UTF8\". 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 en_US.UTF-8/en_US.UTF8."
+"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:72
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:75
+#: 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 "
@@ -229,98 +229,98 @@ msgid ""
 " of ownCloud."
 msgstr ""
 
-#: templates/admin.php:89
+#: templates/admin.php:92
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:98
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:108
+#: 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:118
+#: 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:125
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:131
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:132
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:140
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:147
+#: templates/admin.php:150
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:148
+#: templates/admin.php:151
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:155
+#: templates/admin.php:158
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:161
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:165
+#: templates/admin.php:168
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:181
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:179
+#: templates/admin.php:182
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:182
+#: templates/admin.php:185
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr ""
 
-#: templates/admin.php:192
+#: templates/admin.php:195
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:193
+#: templates/admin.php:196
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:220
+#: templates/admin.php:223
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:227 templates/personal.php:98
+#: templates/admin.php:230 templates/personal.php:102
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:230 templates/personal.php:100
+#: templates/admin.php:233 templates/personal.php:105
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -330,51 +330,51 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr ""
 
-#: templates/apps.php:10
+#: templates/apps.php:11
 msgid "Add your App"
 msgstr ""
 
-#: templates/apps.php:11
+#: templates/apps.php:12
 msgid "More Apps"
 msgstr ""
 
-#: templates/apps.php:24
+#: templates/apps.php:28
 msgid "Select an App"
 msgstr ""
 
-#: templates/apps.php:28
+#: templates/apps.php:34
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:29
+#: templates/apps.php:36
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
-#: templates/apps.php:31
+#: templates/apps.php:38
 msgid "Update"
 msgstr ""
 
-#: templates/help.php:3
+#: 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 ""
 
@@ -383,79 +383,79 @@ msgstr ""
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:14
+#: templates/personal.php:15
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:25
+#: templates/personal.php:26
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:36 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
 msgid "Password"
 msgstr ""
 
-#: templates/personal.php:37
+#: templates/personal.php:38
 msgid "Your password was changed"
 msgstr ""
 
-#: templates/personal.php:38
+#: templates/personal.php:39
 msgid "Unable to change your password"
 msgstr ""
 
-#: templates/personal.php:39
+#: templates/personal.php:40
 msgid "Current password"
 msgstr ""
 
-#: templates/personal.php:40
+#: templates/personal.php:42
 msgid "New password"
 msgstr ""
 
-#: templates/personal.php:42
+#: templates/personal.php:44
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:54 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:78
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:55
+#: templates/personal.php:57
 msgid "Your display name was changed"
 msgstr ""
 
-#: templates/personal.php:56
+#: templates/personal.php:58
 msgid "Unable to change your display name"
 msgstr ""
 
-#: templates/personal.php:59
+#: templates/personal.php:61
 msgid "Change display name"
 msgstr ""
 
-#: templates/personal.php:68
+#: templates/personal.php:70
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:69
+#: templates/personal.php:72
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:70
+#: templates/personal.php:73
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:76 templates/personal.php:77
+#: templates/personal.php:79 templates/personal.php:80
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:82
+#: templates/personal.php:86
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:87
+#: templates/personal.php:91
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:89
+#: templates/personal.php:93
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
diff --git a/l10n/sw_KE/user_ldap.po b/l10n/sw_KE/user_ldap.po
index 2ef2872dc3f590d141ade2a02a262fc8df6f9245..4715c3b41d2d7bd65ba767488d155f233dc07e0c 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-02-08 00:10+0100\n"
-"PO-Revision-Date: 2013-02-07 23:11+0000\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: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
 "MIME-Version: 1.0\n"
@@ -21,17 +21,17 @@ msgstr ""
 msgid "Failed to delete the server configuration"
 msgstr ""
 
-#: ajax/testConfiguration.php:35
+#: ajax/testConfiguration.php:36
 msgid "The configuration is valid and the connection could be established!"
 msgstr ""
 
-#: ajax/testConfiguration.php:37
+#: ajax/testConfiguration.php:39
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
 msgstr ""
 
-#: ajax/testConfiguration.php:40
+#: ajax/testConfiguration.php:43
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
@@ -86,224 +86,248 @@ msgstr ""
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:17
+#: templates/settings.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:23
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:25
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:26
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:27
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:28
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:32
 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:24
+#: templates/settings.php:33
 msgid "Password"
 msgstr ""
 
-#: templates/settings.php:24
+#: templates/settings.php:36
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:37
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:40
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:41
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:42
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:45
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:46
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:47
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:50
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:51
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:55
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:34
+#: templates/settings.php:58
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:60
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:39
+#: templates/settings.php:63
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:65
+msgid "Cache Time-To-Live"
+msgstr ""
+
+#: templates/settings.php:65
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:67
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:47
+#: templates/settings.php:71
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:47 templates/settings.php:50
+#: templates/settings.php:71 templates/settings.php:74
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:74
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:75
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:77
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:79
+msgid "Quota Field"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Quota Default"
+msgstr ""
+
+#: templates/settings.php:80
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:81
+msgid "Email Field"
+msgstr ""
+
+#: templates/settings.php:82
+msgid "User Home Folder Naming Rule"
+msgstr ""
+
+#: templates/settings.php:82
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:62
+#: templates/settings.php:86
+msgid "Test Configuration"
+msgstr ""
+
+#: templates/settings.php:86
 msgid "Help"
 msgstr ""
diff --git a/l10n/ta_LK/core.po b/l10n/ta_LK/core.po
index 0a06dc2c2a923a6f0bd914e25a52820234669bb3..853bf9f186a2ea5e43984744e7a5ddded21867b3 100644
--- a/l10n/ta_LK/core.po
+++ b/l10n/ta_LK/core.po
@@ -3,14 +3,15 @@
 # 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-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 14:32+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "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"
@@ -18,24 +19,24 @@ msgstr ""
 "Language: ta_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 "
@@ -81,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 "மார்கழி"
 
@@ -161,55 +162,55 @@ msgstr "மார்கழி"
 msgid "Settings"
 msgstr "அமைப்புகள்"
 
-#: js/js.js:767
+#: js/js.js:768
 msgid "seconds ago"
 msgstr "செக்கன்களுக்கு முன்"
 
-#: js/js.js:768
+#: js/js.js:769
 msgid "1 minute ago"
 msgstr "1 நிமிடத்திற்கு முன் "
 
-#: js/js.js:769
+#: js/js.js:770
 msgid "{minutes} minutes ago"
 msgstr "{நிமிடங்கள்} நிமிடங்களுக்கு முன் "
 
-#: js/js.js:770
+#: js/js.js:771
 msgid "1 hour ago"
 msgstr "1 மணித்தியாலத்திற்கு முன்"
 
-#: js/js.js:771
+#: js/js.js:772
 msgid "{hours} hours ago"
 msgstr "{மணித்தியாலங்கள்} மணித்தியாலங்களிற்கு முன்"
 
-#: js/js.js:772
+#: js/js.js:773
 msgid "today"
 msgstr "இன்று"
 
-#: js/js.js:773
+#: js/js.js:774
 msgid "yesterday"
 msgstr "நேற்று"
 
-#: js/js.js:774
+#: js/js.js:775
 msgid "{days} days ago"
 msgstr "{நாட்கள்} நாட்களுக்கு முன்"
 
-#: js/js.js:775
+#: js/js.js:776
 msgid "last month"
 msgstr "கடந்த மாதம்"
 
-#: js/js.js:776
+#: js/js.js:777
 msgid "{months} months ago"
 msgstr "{மாதங்கள்} மாதங்களிற்கு முன்"
 
-#: js/js.js:777
+#: js/js.js:778
 msgid "months ago"
 msgstr "மாதங்களுக்கு முன்"
 
-#: js/js.js:778
+#: js/js.js:779
 msgid "last year"
 msgstr "கடந்த வருடம்"
 
-#: js/js.js:779
+#: js/js.js:780
 msgid "years ago"
 msgstr "வருடங்களுக்கு முன்"
 
@@ -292,7 +293,7 @@ msgstr "இணைப்புடன் பகிர்தல்"
 msgid "Password protect"
 msgstr "கடவுச்சொல்லை பாதுகாத்தல்"
 
-#: js/share.js:185 templates/installation.php:44 templates/login.php:35
+#: js/share.js:185 templates/installation.php:47 templates/login.php:35
 msgid "Password"
 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 "ownCloud இன் கடவுச்சொல் மீளமைப்பு"
 
@@ -407,7 +408,7 @@ msgstr "மின்னுஞ்சல் அனுப்புதலை மீ
 msgid "Request failed!"
 msgstr "வேண்டுகோள் தோல்வியுற்றது!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:39
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:41
 #: templates/login.php:28
 msgid "Username"
 msgstr "பயனாளர் பெயர்"
@@ -458,7 +459,7 @@ msgstr "அணுக தடை"
 
 #: templates/404.php:12
 msgid "Cloud not found"
-msgstr "Cloud கண்டுப்பிடிப்படவில்லை"
+msgstr "Cloud காணப்படவில்லை"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
@@ -468,85 +469,86 @@ msgstr "வகைகளை தொகுக்க"
 msgid "Add"
 msgstr "சேர்க்க"
 
-#: templates/installation.php:23 templates/installation.php:30
+#: templates/installation.php:24 templates/installation.php:31
 msgid "Security Warning"
 msgstr "பாதுகாப்பு எச்சரிக்கை"
 
-#: templates/installation.php:24
+#: templates/installation.php:25
 msgid ""
 "No secure random number generator is available, please enable the PHP "
 "OpenSSL extension."
 msgstr "குறிப்பிட்ட எண்ணிக்கை பாதுகாப்பான புறப்பாக்கி / உண்டாக்கிகள் இல்லை, தயவுசெய்து PHP OpenSSL நீட்சியை இயலுமைப்படுத்துக. "
 
-#: templates/installation.php:25
+#: templates/installation.php:26
 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:32
 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:33
 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:37
 msgid "Create an <strong>admin account</strong>"
 msgstr "<strong> நிர்வாக கணக்கொன்றை </strong> உருவாக்குக"
 
-#: templates/installation.php:52
+#: templates/installation.php:55
 msgid "Advanced"
 msgstr "மேம்பட்ட"
 
-#: templates/installation.php:54
+#: templates/installation.php:57
 msgid "Data folder"
 msgstr "தரவு கோப்புறை"
 
-#: templates/installation.php:61
+#: templates/installation.php:66
 msgid "Configure the database"
 msgstr "தரவுத்தளத்தை தகவமைக்க"
 
-#: templates/installation.php:66 templates/installation.php:77
-#: templates/installation.php:87 templates/installation.php:97
+#: templates/installation.php:71 templates/installation.php:83
+#: templates/installation.php:94 templates/installation.php:105
+#: templates/installation.php:117
 msgid "will be used"
 msgstr "பயன்படுத்தப்படும்"
 
-#: templates/installation.php:109
+#: templates/installation.php:129
 msgid "Database user"
 msgstr "தரவுத்தள பயனாளர்"
 
-#: templates/installation.php:113
+#: templates/installation.php:134
 msgid "Database password"
 msgstr "தரவுத்தள கடவுச்சொல்"
 
-#: templates/installation.php:117
+#: templates/installation.php:139
 msgid "Database name"
 msgstr "தரவுத்தள பெயர்"
 
-#: templates/installation.php:125
+#: templates/installation.php:149
 msgid "Database tablespace"
 msgstr "தரவுத்தள அட்டவணை"
 
-#: templates/installation.php:131
+#: templates/installation.php:156
 msgid "Database host"
 msgstr "தரவுத்தள ஓம்புனர்"
 
-#: templates/installation.php:136
+#: templates/installation.php:162
 msgid "Finish setup"
 msgstr "அமைப்பை முடிக்க"
 
-#: templates/layout.guest.php:33
+#: templates/layout.guest.php:35
 msgid "web services under your control"
 msgstr "உங்கள் கட்டுப்பாட்டின் கீழ் இணைய சேவைகள்"
 
-#: templates/layout.user.php:48
+#: templates/layout.user.php:53
 msgid "Log out"
 msgstr "விடுபதிகை செய்க"
 
diff --git a/l10n/ta_LK/files.po b/l10n/ta_LK/files.po
index f6d7c0f4462daeeba50480b8bbc0caf29c1bb99d..668ac3ce21eea805fa655fb461f6d9d5f18f31e3 100644
--- a/l10n/ta_LK/files.po
+++ b/l10n/ta_LK/files.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\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: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -51,27 +51,27 @@ msgid ""
 "the HTML form"
 msgstr "பதிவேற்றப்பட்ட கோப்பானது HTML  படிவத்தில் குறிப்பிடப்பட்டுள்ள MAX_FILE_SIZE  directive ஐ விட கூடியது"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
 msgstr "பதிவேற்றப்பட்ட கோப்பானது பகுதியாக மட்டுமே பதிவேற்றப்பட்டுள்ளது"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:31
 msgid "No file was uploaded"
 msgstr "எந்த கோப்பும் பதிவேற்றப்படவில்லை"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:32
 msgid "Missing a temporary folder"
 msgstr "ஒரு தற்காலிகமான கோப்புறையை காணவில்லை"
 
-#: ajax/upload.php:34
+#: ajax/upload.php:33
 msgid "Failed to write to disk"
 msgstr "வட்டில் எழுத முடியவில்லை"
 
-#: ajax/upload.php:52
+#: ajax/upload.php:51
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:83
+#: ajax/upload.php:82
 msgid "Invalid directory."
 msgstr ""
 
@@ -83,7 +83,7 @@ msgstr "கோப்புகள்"
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:127 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:127 templates/index.php:92 templates/index.php:93
 msgid "Delete"
 msgstr "அழிக்க"
 
@@ -91,40 +91,36 @@ msgstr "அழிக்க"
 msgid "Rename"
 msgstr "பெயர்மாற்றம்"
 
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
 msgid "Pending"
 msgstr "நிலுவையிலுள்ள"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "{new_name} already exists"
 msgstr "{new_name} ஏற்கனவே உள்ளது"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "replace"
 msgstr "மாற்றிடுக"
 
-#: js/filelist.js:253
+#: js/filelist.js:251
 msgid "suggest name"
 msgstr "பெயரை பரிந்துரைக்க"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "cancel"
 msgstr "இரத்து செய்க"
 
-#: js/filelist.js:295
-msgid "replaced {new_name}"
-msgstr "மாற்றப்பட்டது {new_name}"
+#: js/filelist.js:298
+msgid "replaced {new_name} with {old_name}"
+msgstr "{new_name} ஆனது {old_name} இனால் மாற்றப்பட்டது"
 
-#: js/filelist.js:295 js/filelist.js:297
+#: js/filelist.js:298
 msgid "undo"
 msgstr "முன் செயல் நீக்கம் "
 
-#: js/filelist.js:297
-msgid "replaced {new_name} with {old_name}"
-msgstr "{new_name} ஆனது {old_name} இனால் மாற்றப்பட்டது"
-
-#: js/filelist.js:322
+#: js/filelist.js:323
 msgid "perform delete operation"
 msgstr ""
 
@@ -150,74 +146,74 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:224
+#: js/files.js:225
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:261
+#: js/files.js:262
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "அடைவு அல்லது 0 bytes ஐ கொண்டுள்ளதால் உங்களுடைய கோப்பை பதிவேற்ற முடியவில்லை"
 
-#: js/files.js:261
+#: js/files.js:262
 msgid "Upload Error"
 msgstr "பதிவேற்றல் வழு"
 
-#: js/files.js:272
+#: js/files.js:273
 msgid "Close"
 msgstr "மூடுக"
 
-#: js/files.js:311
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr "1 கோப்பு பதிவேற்றப்படுகிறது"
 
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr "{எண்ணிக்கை} கோப்புகள் பதிவேற்றப்படுகின்றது"
 
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "பதிவேற்றல் இரத்து செய்யப்பட்டுள்ளது"
 
-#: js/files.js:496
+#: js/files.js:497
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "கோப்பு பதிவேற்றம் செயல்பாட்டில் உள்ளது. இந்தப் பக்கத்திலிருந்து வெறியேறுவதானது பதிவேற்றலை இரத்து செய்யும்."
 
-#: js/files.js:569
+#: js/files.js:570
 msgid "URL cannot be empty."
 msgstr "URL  வெறுமையாக இருக்கமுடியாது."
 
-#: js/files.js:574
+#: js/files.js:575
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:953 templates/index.php:68
 msgid "Name"
 msgstr "பெயர்"
 
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:954 templates/index.php:79
 msgid "Size"
 msgstr "அளவு"
 
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:955 templates/index.php:81
 msgid "Modified"
 msgstr "மாற்றப்பட்டது"
 
-#: js/files.js:969
+#: js/files.js:974
 msgid "1 folder"
 msgstr "1 கோப்புறை"
 
-#: js/files.js:971
+#: js/files.js:976
 msgid "{count} folders"
 msgstr "{எண்ணிக்கை} கோப்புறைகள்"
 
-#: js/files.js:979
+#: js/files.js:984
 msgid "1 file"
 msgstr "1 கோப்பு"
 
-#: js/files.js:981
+#: js/files.js:986
 msgid "{count} files"
 msgstr "{எண்ணிக்கை} கோப்புகள்"
 
@@ -281,33 +277,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr "பதிவேற்றலை இரத்து செய்க"
 
-#: templates/index.php:59
+#: templates/index.php:53
+msgid "You don’t have write permissions here."
+msgstr ""
+
+#: templates/index.php:60
 msgid "Nothing in here. Upload something!"
 msgstr "இங்கு ஒன்றும் இல்லை. ஏதாவது பதிவேற்றுக!"
 
-#: templates/index.php:73
+#: templates/index.php:74
 msgid "Download"
 msgstr "பதிவிறக்குக"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:86 templates/index.php:87
 msgid "Unshare"
 msgstr "பகிரப்படாதது"
 
-#: templates/index.php:105
+#: templates/index.php:106
 msgid "Upload too large"
 msgstr "பதிவேற்றல் மிகப்பெரியது"
 
-#: templates/index.php:107
+#: templates/index.php:108
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "நீங்கள் பதிவேற்ற முயற்சிக்கும் கோப்புகளானது இந்த சேவையகத்தில் கோப்பு பதிவேற்றக்கூடிய ஆகக்கூடிய அளவிலும் கூடியது."
 
-#: templates/index.php:112
+#: templates/index.php:113
 msgid "Files are being scanned, please wait."
 msgstr "கோப்புகள் வருடப்படுகின்றன, தயவுசெய்து காத்திருங்கள்."
 
-#: templates/index.php:115
+#: templates/index.php:116
 msgid "Current scanning"
 msgstr "தற்போது வருடப்படுபவை"
 
diff --git a/l10n/ta_LK/files_external.po b/l10n/ta_LK/files_external.po
index 196376b86f5a775f683bba091caf42356a2c6f74..7ade0af6ff2426f0959f2a40da9716e564dcc975 100644
--- a/l10n/ta_LK/files_external.po
+++ b/l10n/ta_LK/files_external.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-11 23:22+0000\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"
 "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -18,37 +18,33 @@ msgstr ""
 "Language: ta_LK\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 "Dropbox சேமிப்பை தகவமைப்பதில் வழு"
 
-#: 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 "தயவுசெய்து ஒரு செல்லுபடியான Dropbox செயலி சாவி மற்றும் இரகசியத்தை வழங்குக. "
 
-#: 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 "Google இயக்க சேமிப்பகத்தை தகமைப்பதில் வழு"
 
-#: lib/config.php:434
+#: lib/config.php:421
 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:424
 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 "
@@ -59,63 +55,63 @@ msgstr ""
 msgid "External Storage"
 msgstr "வெளி சேமிப்பு"
 
-#: templates/settings.php:8 templates/settings.php:22
-msgid "Mount point"
-msgstr "ஏற்றப்புள்ளி"
-
-#: templates/settings.php:9
-msgid "Backend"
-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: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"
-msgstr "ஏற்றப்புள்ளியை சேர்க்க"
+#: 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 "பயனாளர்"
 
-#: 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 "நீக்குக"
 
-#: 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 "SSL வேர் சான்றிதழ்கள்"
 
-#: templates/settings.php:158
+#: templates/settings.php:159
 msgid "Import Root Certificate"
 msgstr "வேர் சான்றிதழை இறக்குமதி செய்க"
diff --git a/l10n/ta_LK/files_trashbin.po b/l10n/ta_LK/files_trashbin.po
index aa8e5682663d9d9f40ca1ca9e3f01c65f735b3f5..ee8095bcdc257b3e187b1a8f39402ecf6ba92f86 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-02-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 10:07+0000\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: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Language: ta_LK\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:22
+#: ajax/delete.php:40
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
@@ -27,35 +27,39 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:33
+#: js/trash.js:34
 msgid "delete file permanently"
 msgstr ""
 
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr ""
+
+#: js/trash.js:174 templates/index.php:17
 msgid "Name"
 msgstr "பெயர்"
 
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:175 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:135
+#: js/trash.js:184
 msgid "1 folder"
 msgstr "1 கோப்புறை"
 
-#: js/trash.js:137
+#: js/trash.js:186
 msgid "{count} folders"
 msgstr "{எண்ணிக்கை} கோப்புறைகள்"
 
-#: js/trash.js:145
+#: js/trash.js:194
 msgid "1 file"
 msgstr "1 கோப்பு"
 
-#: js/trash.js:147
+#: js/trash.js:196
 msgid "{count} files"
 msgstr "{எண்ணிக்கை} கோப்புகள்"
 
@@ -66,3 +70,11 @@ 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/ta_LK/files_versions.po b/l10n/ta_LK/files_versions.po
index 971b58bc8e79db0befbf41db1e5b731ebf3e6d57..abba80ba96bab168fa667c4ba2ff1dad52541fd8 100644
--- a/l10n/ta_LK/files_versions.po
+++ b/l10n/ta_LK/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-08 00:10+0100\n"
-"PO-Revision-Date: 2013-02-07 23:11+0000\n"
+"POT-Creation-Date: 2013-02-28 00:04+0100\n"
+"PO-Revision-Date: 2013-02-27 23:04+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -49,18 +49,10 @@ msgstr ""
 msgid "No path specified"
 msgstr ""
 
-#: js/versions.js:16
-msgid "History"
-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 ""
-
-#: templates/settings.php:3
-msgid "Files Versioning"
-msgstr "கோப்பு பதிப்புகள்"
-
-#: templates/settings.php:4
-msgid "Enable"
-msgstr "இயலுமைப்படுத்துக"
diff --git a/l10n/ta_LK/lib.po b/l10n/ta_LK/lib.po
index 80358acada19049f176260fb22a7594bf184370b..1ee1cfff40640e32e70c181e59638b5ca935f5a2 100644
--- a/l10n/ta_LK/lib.po
+++ b/l10n/ta_LK/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-11 15:39+0100\n"
-"PO-Revision-Date: 2013-02-11 14:41+0000\n"
+"POT-Creation-Date: 2013-02-27 14:35+0100\n"
+"PO-Revision-Date: 2013-02-27 13:36+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,27 +18,27 @@ msgstr ""
 "Language: ta_LK\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:339
+#: app.php:349
 msgid "Help"
 msgstr "உதவி"
 
-#: app.php:346
+#: app.php:362
 msgid "Personal"
 msgstr "தனிப்பட்ட"
 
-#: app.php:351
+#: app.php:373
 msgid "Settings"
 msgstr "அமைப்புகள்"
 
-#: app.php:356
+#: app.php:385
 msgid "Users"
 msgstr "பயனாளர்கள்"
 
-#: app.php:363
+#: app.php:398
 msgid "Apps"
 msgstr "செயலிகள்"
 
-#: app.php:365
+#: app.php:406
 msgid "Admin"
 msgstr "நிர்வாகம்"
 
@@ -50,15 +50,15 @@ msgstr "வீசொலிப் பூட்டு பதிவிறக்க
 msgid "Files need to be downloaded one by one."
 msgstr "கோப்புகள்ஒன்றன் பின் ஒன்றாக பதிவிறக்கப்படவேண்டும்."
 
-#: files.php:203 files.php:228
+#: files.php:204 files.php:231
 msgid "Back to Files"
 msgstr "கோப்புகளுக்கு செல்க"
 
-#: files.php:227
+#: files.php:228
 msgid "Selected files too large to generate zip file."
 msgstr "வீ சொலிக் கோப்புகளை உருவாக்குவதற்கு தெரிவுசெய்யப்பட்ட கோப்புகள் மிகப்பெரியவை"
 
-#: helper.php:226
+#: helper.php:228
 msgid "couldn't be determined"
 msgstr ""
 
@@ -98,87 +98,92 @@ msgstr ""
 msgid "Specify a data folder."
 msgstr ""
 
-#: setup.php:53
+#: setup.php:55
 #, php-format
 msgid "%s enter the database username."
 msgstr ""
 
-#: setup.php:56
+#: setup.php:58
 #, php-format
 msgid "%s enter the database name."
 msgstr ""
 
-#: setup.php:59
+#: setup.php:61
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr ""
 
-#: setup.php:62
+#: setup.php:64
 #, php-format
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:126 setup.php:291 setup.php:336
+#: setup.php:128 setup.php:320 setup.php:365
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:127 setup.php:150 setup.php:204
+#: setup.php:129 setup.php:152 setup.php:229
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:149 setup.php:423 setup.php:489
+#: setup.php:151 setup.php:453 setup.php:520
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:203
+#: setup.php:228
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:255 setup.php:357 setup.php:366 setup.php:384 setup.php:394
-#: setup.php:403 setup.php:430 setup.php:496 setup.php:522 setup.php:529
-#: setup.php:540 setup.php:547 setup.php:556 setup.php:564 setup.php:573
-#: setup.php:579
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:256 setup.php:358 setup.php:367 setup.php:385 setup.php:395
-#: setup.php:404 setup.php:431 setup.php:497 setup.php:523 setup.php:530
-#: setup.php:541 setup.php:557 setup.php:565 setup.php:574
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:270
+#: setup.php:299
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:271
+#: setup.php:300
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:276
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:277
+#: setup.php:306
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:548 setup.php:580
+#: setup.php:579 setup.php:611
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:644
+#: setup.php:631
+#, php-format
+msgid "MS SQL username and/or password not valid: %s"
+msgstr ""
+
+#: setup.php:849
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:645
+#: setup.php:850
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
@@ -235,16 +240,16 @@ msgstr "கடந்த வருடம்"
 msgid "years ago"
 msgstr "வருடங்களுக்கு முன்"
 
-#: updater.php:75
+#: updater.php:78
 #, php-format
 msgid "%s is available. Get <a href=\"%s\">more information</a>"
 msgstr "%s இன்னும் இருக்கின்றன. <a href=\"%s\">மேலதிக தகவல்களுக்கு</a> எடுக்க"
 
-#: updater.php:77
+#: updater.php:81
 msgid "up to date"
 msgstr "நவீன"
 
-#: updater.php:80
+#: updater.php:84
 msgid "updates check is disabled"
 msgstr "இற்றைப்படுத்தலை சரிபார்ப்பதை செயலற்றதாக்குக"
 
diff --git a/l10n/ta_LK/settings.po b/l10n/ta_LK/settings.po
index 9b7eecce540436575cf04b54e5bb57ddcb2c046f..a6351ece395cf669d5db7a746f6bbe9ef39b3b20 100644
--- a/l10n/ta_LK/settings.po
+++ b/l10n/ta_LK/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 23:05+0000\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: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -22,8 +22,8 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "செயலி சேமிப்பிலிருந்து பட்டியலை ஏற்றமுடியாதுள்ளது"
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:15
-#: ajax/togglegroups.php:18
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr "அத்தாட்சிப்படுத்தலில் வழு"
 
@@ -71,12 +71,12 @@ 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 "குழு %s இல் பயனாளரை சேர்க்க முடியாது"
 
-#: ajax/togglegroups.php:34
+#: ajax/togglegroups.php:36
 #, php-format
 msgid "Unable to remove user from group %s"
 msgstr "குழு %s இலிருந்து பயனாளரை நீக்கமுடியாது"
@@ -117,7 +117,7 @@ msgstr "வழு"
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:96
+#: js/personal.js:99
 msgid "Saving..."
 msgstr "இயலுமைப்படுத்துக"
 
@@ -146,23 +146,23 @@ msgstr "குழு நிர்வாகி"
 msgid "Delete"
 msgstr "அழிக்க"
 
-#: js/users.js:190
+#: js/users.js:191
 msgid "add group"
 msgstr ""
 
-#: js/users.js:351
+#: js/users.js:352
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:357
+#: js/users.js:358
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
 msgid "__language_name__"
 msgstr "_மொழி_பெயர்_"
 
@@ -208,19 +208,19 @@ msgstr ""
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:61
+#: templates/admin.php:63
+#, php-format
 msgid ""
-"This ownCloud server can't set system locale to "
-"\"en_US.UTF-8\"/\"en_US.UTF8\". 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 en_US.UTF-8/en_US.UTF8."
+"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:72
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:75
+#: 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 "
@@ -230,98 +230,98 @@ msgid ""
 " of ownCloud."
 msgstr ""
 
-#: templates/admin.php:89
+#: templates/admin.php:92
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:98
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:108
+#: 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:118
+#: 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:125
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:131
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:132
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:140
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:147
+#: templates/admin.php:150
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:148
+#: templates/admin.php:151
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:155
+#: templates/admin.php:158
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:161
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:165
+#: templates/admin.php:168
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:181
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:179
+#: templates/admin.php:182
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:182
+#: templates/admin.php:185
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr ""
 
-#: templates/admin.php:192
+#: templates/admin.php:195
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:193
+#: templates/admin.php:196
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:220
+#: templates/admin.php:223
 msgid "More"
 msgstr "மேலதிக"
 
-#: templates/admin.php:227 templates/personal.php:98
+#: templates/admin.php:230 templates/personal.php:102
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:230 templates/personal.php:100
+#: templates/admin.php:233 templates/personal.php:105
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -331,51 +331,51 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
-#: templates/apps.php:10
+#: templates/apps.php:11
 msgid "Add your App"
 msgstr "உங்களுடைய செயலியை சேர்க்க"
 
-#: templates/apps.php:11
+#: templates/apps.php:12
 msgid "More Apps"
 msgstr "மேலதிக செயலிகள்"
 
-#: templates/apps.php:24
+#: templates/apps.php:28
 msgid "Select an App"
 msgstr "செயலி ஒன்றை தெரிவுசெய்க"
 
-#: templates/apps.php:28
+#: templates/apps.php:34
 msgid "See application page at apps.owncloud.com"
 msgstr "apps.owncloud.com இல் செயலி பக்கத்தை பார்க்க"
 
-#: templates/apps.php:29
+#: templates/apps.php:36
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"அனுமதிப்பத்திரம்\"></span>-அனுமதி பெற்ற <span class=\"ஆசிரியர்\"></span>"
 
-#: templates/apps.php:31
+#: templates/apps.php:38
 msgid "Update"
 msgstr "இற்றைப்படுத்தல்"
 
-#: templates/help.php:3
+#: 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 ""
 
@@ -384,79 +384,79 @@ msgstr ""
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "நீங்கள் <strong>%s</strong> இலுள்ள <strong>%s</strong>பயன்படுத்தியுள்ளீர்கள்"
 
-#: templates/personal.php:14
+#: templates/personal.php:15
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:25
+#: templates/personal.php:26
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:36 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
 msgid "Password"
 msgstr "கடவுச்சொல்"
 
-#: templates/personal.php:37
+#: templates/personal.php:38
 msgid "Your password was changed"
 msgstr "உங்களுடைய கடவுச்சொல் மாற்றப்பட்டுள்ளது"
 
-#: templates/personal.php:38
+#: templates/personal.php:39
 msgid "Unable to change your password"
 msgstr "உங்களுடைய கடவுச்சொல்லை மாற்றமுடியாது"
 
-#: templates/personal.php:39
+#: templates/personal.php:40
 msgid "Current password"
 msgstr "தற்போதைய கடவுச்சொல்"
 
-#: templates/personal.php:40
+#: templates/personal.php:42
 msgid "New password"
 msgstr "புதிய கடவுச்சொல்"
 
-#: templates/personal.php:42
+#: templates/personal.php:44
 msgid "Change password"
 msgstr "கடவுச்சொல்லை மாற்றுக"
 
-#: templates/personal.php:54 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:78
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:55
+#: templates/personal.php:57
 msgid "Your display name was changed"
 msgstr ""
 
-#: templates/personal.php:56
+#: templates/personal.php:58
 msgid "Unable to change your display name"
 msgstr ""
 
-#: templates/personal.php:59
+#: templates/personal.php:61
 msgid "Change display name"
 msgstr ""
 
-#: templates/personal.php:68
+#: templates/personal.php:70
 msgid "Email"
 msgstr "மின்னஞ்சல்"
 
-#: templates/personal.php:69
+#: templates/personal.php:72
 msgid "Your email address"
 msgstr "உங்களுடைய மின்னஞ்சல் முகவரி"
 
-#: templates/personal.php:70
+#: templates/personal.php:73
 msgid "Fill in an email address to enable password recovery"
 msgstr "கடவுச்சொல் மீள் பெறுவதை இயலுமைப்படுத்துவதற்கு மின்னஞ்சல் முகவரியை இயலுமைப்படுத்துக"
 
-#: templates/personal.php:76 templates/personal.php:77
+#: templates/personal.php:79 templates/personal.php:80
 msgid "Language"
 msgstr "மொழி"
 
-#: templates/personal.php:82
+#: templates/personal.php:86
 msgid "Help translate"
 msgstr "மொழிபெயர்க்க உதவி"
 
-#: templates/personal.php:87
+#: templates/personal.php:91
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:89
+#: templates/personal.php:93
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
diff --git a/l10n/ta_LK/user_ldap.po b/l10n/ta_LK/user_ldap.po
index 9e62a4a67e36b3159ff38e9a441f11f293a35626..82151c607fb8bf3952c4b0c59047c2085201fdac 100644
--- a/l10n/ta_LK/user_ldap.po
+++ b/l10n/ta_LK/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-08 00:10+0100\n"
-"PO-Revision-Date: 2013-02-07 23:11+0000\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: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -22,17 +22,17 @@ msgstr ""
 msgid "Failed to delete the server configuration"
 msgstr ""
 
-#: ajax/testConfiguration.php:35
+#: ajax/testConfiguration.php:36
 msgid "The configuration is valid and the connection could be established!"
 msgstr ""
 
-#: ajax/testConfiguration.php:37
+#: ajax/testConfiguration.php:39
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
 msgstr ""
 
-#: ajax/testConfiguration.php:40
+#: ajax/testConfiguration.php:43
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
@@ -87,224 +87,248 @@ msgstr ""
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:17
+#: templates/settings.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:23
 msgid "Host"
 msgstr "ஓம்புனர்"
 
-#: templates/settings.php:21
+#: templates/settings.php:25
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "நீங்கள் SSL சேவையை தவிர உடன்படு வரைமுறையை தவிர்க்க முடியும். பிறகு ldaps:.// உடன் ஆரம்பிக்கவும்"
 
-#: templates/settings.php:22
+#: templates/settings.php:26
 msgid "Base DN"
 msgstr "தள DN"
 
-#: templates/settings.php:22
+#: templates/settings.php:27
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:28
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "நீங்கள் பயனாளர்களுக்கும் மேன்மை தத்தலில் உள்ள குழுவிற்கும் தள DN ஐ குறிப்பிடலாம் "
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "User DN"
 msgstr "பயனாளர்  DN"
 
-#: templates/settings.php:23
+#: templates/settings.php:32
 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:24
+#: templates/settings.php:33
 msgid "Password"
 msgstr "கடவுச்சொல்"
 
-#: templates/settings.php:24
+#: templates/settings.php:36
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:37
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:40
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:41
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:42
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:45
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:46
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:47
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:50
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:51
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "எந்த ஒதுக்கீடும் இல்லாமல், உதாரணம். \"objectClass=posixGroup\"."
 
-#: templates/settings.php:31
+#: templates/settings.php:55
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:34
+#: templates/settings.php:58
 msgid "Port"
 msgstr "துறை "
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:60
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Use TLS"
 msgstr "TLS ஐ பயன்படுத்தவும்"
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:39
+#: templates/settings.php:63
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "உணர்ச்சியான LDAP சேவையகம் (சாளரங்கள்)"
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid "Turn off SSL certificate validation."
 msgstr "SSL சான்றிதழின் செல்லுபடியை நிறுத்திவிடவும்"
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 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:40
+#: templates/settings.php:64
 msgid "Not recommended, use for testing only."
 msgstr "பரிந்துரைக்கப்படவில்லை, சோதனைக்காக மட்டும் பயன்படுத்தவும்."
 
-#: templates/settings.php:41
+#: templates/settings.php:65
+msgid "Cache Time-To-Live"
+msgstr ""
+
+#: templates/settings.php:65
 msgid "in seconds. A change empties the cache."
 msgstr "செக்கன்களில். ஒரு மாற்றம் இடைமாற்றுநினைவகத்தை வெற்றிடமாக்கும்."
 
-#: templates/settings.php:43
+#: templates/settings.php:67
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "User Display Name Field"
 msgstr "பயனாளர் காட்சிப்பெயர் புலம்"
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "பயனாளரின் ownCloud பெயரை உருவாக்க LDAP பண்புக்கூறை பயன்படுத்தவும்."
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "Base User Tree"
 msgstr "தள பயனாளர் மரம்"
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:47
+#: templates/settings.php:71
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:47 templates/settings.php:50
+#: templates/settings.php:71 templates/settings.php:74
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "Group Display Name Field"
 msgstr "குழுவின் காட்சி பெயர் புலம் "
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "ownCloud குழுக்களின் பெயர்களை உருவாக்க LDAP பண்புக்கூறை பயன்படுத்தவும்."
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "Base Group Tree"
 msgstr "தள குழு மரம்"
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:74
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:75
 msgid "Group-Member association"
 msgstr "குழு உறுப்பினர் சங்கம்"
 
-#: templates/settings.php:53
+#: templates/settings.php:77
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:79
+msgid "Quota Field"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Quota Default"
+msgstr ""
+
+#: templates/settings.php:80
 msgid "in bytes"
 msgstr "bytes களில் "
 
-#: templates/settings.php:58
+#: templates/settings.php:81
+msgid "Email Field"
+msgstr ""
+
+#: templates/settings.php:82
+msgid "User Home Folder Naming Rule"
+msgstr ""
+
+#: templates/settings.php:82
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "பயனாளர் பெயரிற்கு வெற்றிடமாக விடவும் (பொது இருப்பு). இல்லாவிடின் LDAP/AD பண்புக்கூறை குறிப்பிடவும்."
 
-#: templates/settings.php:62
+#: templates/settings.php:86
+msgid "Test Configuration"
+msgstr ""
+
+#: templates/settings.php:86
 msgid "Help"
 msgstr "உதவி"
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 0cc8a3019e8fedde9455ac16f248cff1e08c962b..160af149eda0830e6d8960f2b7fecae64c0d7831 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-02-15 00:05+0100\n"
+"POT-Creation-Date: 2013-03-08 00:25+0100\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,24 +17,24 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\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,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 ""
 
@@ -160,55 +160,55 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:767
+#: js/js.js:777
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:768
+#: js/js.js:778
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:769
+#: js/js.js:779
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:770
+#: js/js.js:780
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:771
+#: js/js.js:781
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:772
+#: js/js.js:782
 msgid "today"
 msgstr ""
 
-#: js/js.js:773
+#: js/js.js:783
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:774
+#: js/js.js:784
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:775
+#: js/js.js:785
 msgid "last month"
 msgstr ""
 
-#: js/js.js:776
+#: js/js.js:786
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:777
+#: js/js.js:787
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:778
+#: js/js.js:788
 msgid "last year"
 msgstr ""
 
-#: js/js.js:779
+#: js/js.js:789
 msgid "years ago"
 msgstr ""
 
@@ -291,7 +291,7 @@ msgstr ""
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:185 templates/installation.php:44 templates/login.php:35
+#: js/share.js:185 templates/installation.php:47 templates/login.php:35
 msgid "Password"
 msgstr ""
 
@@ -386,7 +386,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 ""
 
@@ -406,7 +406,7 @@ msgstr ""
 msgid "Request failed!"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:39
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:41
 #: templates/login.php:28
 msgid "Username"
 msgstr ""
@@ -467,85 +467,86 @@ msgstr ""
 msgid "Add"
 msgstr ""
 
-#: templates/installation.php:23 templates/installation.php:30
+#: templates/installation.php:24 templates/installation.php:31
 msgid "Security Warning"
 msgstr ""
 
-#: templates/installation.php:24
+#: templates/installation.php:25
 msgid ""
 "No secure random number generator is available, please enable the PHP "
 "OpenSSL extension."
 msgstr ""
 
-#: templates/installation.php:25
+#: templates/installation.php:26
 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:32
 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:33
 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:37
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
-#: templates/installation.php:52
+#: templates/installation.php:55
 msgid "Advanced"
 msgstr ""
 
-#: templates/installation.php:54
+#: templates/installation.php:57
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:61
+#: templates/installation.php:66
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:66 templates/installation.php:77
-#: templates/installation.php:87 templates/installation.php:97
+#: templates/installation.php:71 templates/installation.php:83
+#: templates/installation.php:94 templates/installation.php:105
+#: templates/installation.php:117
 msgid "will be used"
 msgstr ""
 
-#: templates/installation.php:109
+#: templates/installation.php:129
 msgid "Database user"
 msgstr ""
 
-#: templates/installation.php:113
+#: templates/installation.php:134
 msgid "Database password"
 msgstr ""
 
-#: templates/installation.php:117
+#: templates/installation.php:139
 msgid "Database name"
 msgstr ""
 
-#: templates/installation.php:125
+#: templates/installation.php:149
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:131
+#: templates/installation.php:156
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:136
+#: templates/installation.php:162
 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:58
 msgid "Log out"
 msgstr ""
 
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index 078e0e4058517159546bff0aa2e3de4762ef3755..111131195de71bc6ddf3a3fdf009bfdb35944efa 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,13 +8,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 5.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-02-15 00:04+0100\n"
+"POT-Creation-Date: 2013-03-08 00:25+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ajax/move.php:17
@@ -50,27 +50,27 @@ msgid ""
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:31
+#: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:32
+#: ajax/upload.php:31
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:33
+#: ajax/upload.php:32
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:34
+#: ajax/upload.php:33
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:52
+#: ajax/upload.php:51
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:83
+#: ajax/upload.php:82
 msgid "Invalid directory."
 msgstr ""
 
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:127 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:127 templates/index.php:92 templates/index.php:93
 msgid "Delete"
 msgstr ""
 
@@ -90,40 +90,36 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:293 js/files.js:409
+#: js/files.js:440
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:253
+#: js/filelist.js:251
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:295
-msgid "replaced {new_name}"
+#: js/filelist.js:298
+msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:295 js/filelist.js:297
+#: js/filelist.js:298
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:297
-msgid "replaced {new_name} with {old_name}"
-msgstr ""
-
-#: js/filelist.js:322
+#: js/filelist.js:323
 msgid "perform delete operation"
 msgstr ""
 
@@ -149,74 +145,74 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:224
+#: js/files.js:226
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:261
+#: js/files.js:263
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:261
+#: js/files.js:263
 msgid "Upload Error"
 msgstr ""
 
-#: js/files.js:272
+#: js/files.js:274
 msgid "Close"
 msgstr ""
 
-#: js/files.js:311
+#: js/files.js:313
 msgid "1 file uploading"
 msgstr ""
 
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:316 js/files.js:371 js/files.js:386
 msgid "{count} files uploading"
 msgstr ""
 
-#: js/files.js:387 js/files.js:422
+#: js/files.js:389 js/files.js:424
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:496
+#: js/files.js:498
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:569
+#: js/files.js:571
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:574
+#: js/files.js:576
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:954 templates/index.php:68
 msgid "Name"
 msgstr ""
 
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:955 templates/index.php:79
 msgid "Size"
 msgstr ""
 
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:956 templates/index.php:81
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:969
+#: js/files.js:975
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:971
+#: js/files.js:977
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:979
+#: js/files.js:985
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:981
+#: js/files.js:987
 msgid "{count} files"
 msgstr ""
 
@@ -280,33 +276,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:53
+msgid "You don’t have write permissions here."
+msgstr ""
+
+#: templates/index.php:60
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:73
+#: templates/index.php:74
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:86 templates/index.php:87
 msgid "Unshare"
 msgstr ""
 
-#: templates/index.php:105
+#: templates/index.php:106
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:107
+#: templates/index.php:108
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:112
+#: templates/index.php:113
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:115
+#: templates/index.php:116
 msgid "Current scanning"
 msgstr ""
 
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index 6d0396470cb799142f4d314c02222467557a0ce8..346bfbdf1840f08e9863c8a4db9b172743b1d543 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-02-15 00:04+0100\n"
+"POT-Creation-Date: 2013-03-08 00:25+0100\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 db27055908338f1c1c5ebc7050101aa1c6cd86b5..2d2aed314af0bb86c58c991ef9f0b6a3182a79b1 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-02-15 00:04+0100\n"
+"POT-Creation-Date: 2013-03-08 00:25+0100\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,37 +17,33 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\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:413
+#: lib/config.php:421
 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:414
+#: lib/config.php:424
 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 "
@@ -58,63 +54,63 @@ msgstr ""
 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 ""
 
-#: templates/settings.php:108 templates/settings.php:109
-#: templates/settings.php:144 templates/settings.php:145
+#: templates/settings.php:113 templates/settings.php:114
+#: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
 msgstr ""
 
-#: 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:136
+#: templates/settings.php:141
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:153
+#: templates/settings.php:159
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index 27454624e29d530b83ea2b7869bf1ab9392a5bf9..43243d0e614cef8af96b3ebe9883801c3e7a72f0 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-02-15 00:04+0100\n"
+"POT-Creation-Date: 2013-03-08 00:25+0100\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"
@@ -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:37
 msgid "Download"
 msgstr ""
 
-#: templates/public.php:29
+#: templates/public.php:34
 msgid "No preview available for"
 msgstr ""
 
-#: templates/public.php:35
+#: templates/public.php:43
 msgid "web services under your control"
 msgstr ""
diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot
index dfb764945880d6da71e98afa15a21c837e168452..497a5c3ab6e14a81686c1a6d445241978834dbe6 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-02-15 00:05+0100\n"
+"POT-Creation-Date: 2013-03-08 00:25+0100\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,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ajax/delete.php:22
+#: ajax/delete.php:40
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
@@ -27,35 +27,39 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:33
+#: js/trash.js:34
 msgid "delete file permanently"
 msgstr ""
 
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr ""
+
+#: js/trash.js:174 templates/index.php:17
 msgid "Name"
 msgstr ""
 
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:175 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:135
+#: js/trash.js:184
 msgid "1 folder"
 msgstr ""
 
-#: js/trash.js:137
+#: js/trash.js:186
 msgid "{count} folders"
 msgstr ""
 
-#: js/trash.js:145
+#: js/trash.js:194
 msgid "1 file"
 msgstr ""
 
-#: js/trash.js:147
+#: js/trash.js:196
 msgid "{count} files"
 msgstr ""
 
@@ -66,3 +70,11 @@ 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/templates/files_versions.pot b/l10n/templates/files_versions.pot
index bbfa7fc167b647ef6b6f4004f08df6c606c2a263..51022726f2bc5cc36c25b4d8b2f15e19165a7941 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-02-15 00:05+0100\n"
+"POT-Creation-Date: 2013-03-08 00:25+0100\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"
@@ -40,26 +40,18 @@ 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:16
-msgid "History"
+#: 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 ""
-
-#: templates/settings.php:3
-msgid "Files Versioning"
-msgstr ""
-
-#: templates/settings.php:4
-msgid "Enable"
-msgstr ""
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index 40dc2bee040cdbef4b21578e2f546c2623f4afb4..7cee4b36ccc5f7eb3c1f64d3386c731f9635adf9 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-02-15 00:05+0100\n"
+"POT-Creation-Date: 2013-03-08 00:25+0100\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: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:238
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:228
+#: files.php:235
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
@@ -97,87 +97,92 @@ msgstr ""
 msgid "Specify a data folder."
 msgstr ""
 
-#: setup.php:53
+#: setup.php:55
 #, php-format
 msgid "%s enter the database username."
 msgstr ""
 
-#: setup.php:56
+#: setup.php:58
 #, php-format
 msgid "%s enter the database name."
 msgstr ""
 
-#: setup.php:59
+#: setup.php:61
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr ""
 
-#: setup.php:62
+#: setup.php:64
 #, php-format
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:126 setup.php:294 setup.php:339
+#: setup.php:128 setup.php:320 setup.php:365
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:127 setup.php:150 setup.php:204
+#: setup.php:129 setup.php:152 setup.php:229
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:149 setup.php:427 setup.php:494
+#: setup.php:151 setup.php:453 setup.php:520
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:203
+#: setup.php:228
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:257 setup.php:360 setup.php:369 setup.php:387 setup.php:397
-#: setup.php:406 setup.php:435 setup.php:501 setup.php:527 setup.php:534
-#: setup.php:545 setup.php:552 setup.php:561 setup.php:569 setup.php:578
-#: setup.php:584
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:258 setup.php:361 setup.php:370 setup.php:388 setup.php:398
-#: setup.php:407 setup.php:436 setup.php:502 setup.php:528 setup.php:535
-#: setup.php:546 setup.php:562 setup.php:570 setup.php:579
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:273
+#: setup.php:299
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:274
+#: setup.php:300
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:279
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:280
+#: setup.php:306
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:553 setup.php:585
+#: setup.php:579 setup.php:611
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:649
+#: setup.php:631
+#, php-format
+msgid "MS SQL username and/or password not valid: %s"
+msgstr ""
+
+#: setup.php:849
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:651
+#: setup.php:850
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index afd2407497c28492fccef6bcd9707501c44fe353..31cd164617479941d878d8923d5ed01dbdba5adc 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-02-15 00:05+0100\n"
+"POT-Creation-Date: 2013-03-08 00:25+0100\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,8 +21,8 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr ""
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:15
-#: ajax/togglegroups.php:18
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr ""
 
@@ -70,12 +70,12 @@ 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 ""
@@ -116,7 +116,7 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:96
+#: js/personal.js:99
 msgid "Saving..."
 msgstr ""
 
@@ -161,7 +161,7 @@ msgstr ""
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
 msgid "__language_name__"
 msgstr ""
 
@@ -207,19 +207,19 @@ msgstr ""
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:61
+#: templates/admin.php:63
+#, php-format
 msgid ""
-"This ownCloud server can't set system locale to \"en_US.UTF-8\"/\"en_US."
-"UTF8\". 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 en_US.UTF-8/en_US.UTF8."
+"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:72
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:75
+#: 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 "
@@ -229,98 +229,98 @@ msgid ""
 "of ownCloud."
 msgstr ""
 
-#: templates/admin.php:89
+#: templates/admin.php:92
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:98
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:108
+#: 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:118
+#: 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:125
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:131
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:132
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:140
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:147
+#: templates/admin.php:150
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:148
+#: templates/admin.php:151
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:155
+#: templates/admin.php:158
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:161
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:165
+#: templates/admin.php:168
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:181
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:179
+#: templates/admin.php:182
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:182
+#: templates/admin.php:185
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr ""
 
-#: templates/admin.php:192
+#: templates/admin.php:195
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:193
+#: templates/admin.php:196
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:220
+#: templates/admin.php:223
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:227 templates/personal.php:98
+#: templates/admin.php:230 templates/personal.php:102
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:230 templates/personal.php:100
+#: templates/admin.php:233 templates/personal.php:105
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank"
 "\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" "
@@ -329,52 +329,52 @@ msgid ""
 "General Public License\">AGPL</abbr></a>."
 msgstr ""
 
-#: templates/apps.php:10
+#: templates/apps.php:11
 msgid "Add your App"
 msgstr ""
 
-#: templates/apps.php:11
+#: templates/apps.php:12
 msgid "More Apps"
 msgstr ""
 
-#: templates/apps.php:24
+#: templates/apps.php:28
 msgid "Select an App"
 msgstr ""
 
-#: templates/apps.php:28
+#: templates/apps.php:34
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:29
+#: templates/apps.php:36
 msgid ""
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
-#: templates/apps.php:31
+#: templates/apps.php:38
 msgid "Update"
 msgstr ""
 
-#: templates/help.php:3
+#: 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 ""
 
@@ -383,79 +383,79 @@ msgstr ""
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:14
+#: templates/personal.php:15
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:25
+#: templates/personal.php:26
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:36 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
 msgid "Password"
 msgstr ""
 
-#: templates/personal.php:37
+#: templates/personal.php:38
 msgid "Your password was changed"
 msgstr ""
 
-#: templates/personal.php:38
+#: templates/personal.php:39
 msgid "Unable to change your password"
 msgstr ""
 
-#: templates/personal.php:39
+#: templates/personal.php:40
 msgid "Current password"
 msgstr ""
 
-#: templates/personal.php:40
+#: templates/personal.php:42
 msgid "New password"
 msgstr ""
 
-#: templates/personal.php:42
+#: templates/personal.php:44
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:54 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:78
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:55
+#: templates/personal.php:57
 msgid "Your display name was changed"
 msgstr ""
 
-#: templates/personal.php:56
+#: templates/personal.php:58
 msgid "Unable to change your display name"
 msgstr ""
 
-#: templates/personal.php:59
+#: templates/personal.php:61
 msgid "Change display name"
 msgstr ""
 
-#: templates/personal.php:68
+#: templates/personal.php:70
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:69
+#: templates/personal.php:72
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:70
+#: templates/personal.php:73
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:76 templates/personal.php:77
+#: templates/personal.php:79 templates/personal.php:80
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:82
+#: templates/personal.php:86
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:87
+#: templates/personal.php:91
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:89
+#: templates/personal.php:93
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index 0a173656b5e3fb21f8c6df95a294624aaf3e9e81..ba91ba629c39f543612e83993d57858c0e6f3e1a 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-02-15 00:05+0100\n"
+"POT-Creation-Date: 2013-03-08 00:25+0100\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,17 +21,17 @@ msgstr ""
 msgid "Failed to delete the server configuration"
 msgstr ""
 
-#: ajax/testConfiguration.php:35
+#: ajax/testConfiguration.php:36
 msgid "The configuration is valid and the connection could be established!"
 msgstr ""
 
-#: ajax/testConfiguration.php:37
+#: ajax/testConfiguration.php:39
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
 msgstr ""
 
-#: ajax/testConfiguration.php:40
+#: ajax/testConfiguration.php:43
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
@@ -86,222 +86,246 @@ msgstr ""
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:17
+#: templates/settings.php:31
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:36
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:38
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:39
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:40
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:41
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:43
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:23
+#: 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:24
+#: templates/settings.php:46
 msgid "Password"
 msgstr ""
 
-#: templates/settings.php:24
+#: templates/settings.php:49
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:50
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:25
+#: 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:25
+#: templates/settings.php:54
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:55
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:58
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:59
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:60
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:63
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:64
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:68
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:70
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:70
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:34
+#: templates/settings.php:71
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:72
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:35
+#: 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:36
+#: templates/settings.php:73
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:74
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:74
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:75
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:75
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:39
+#: templates/settings.php:76
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:77
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:40
+#: 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:40
+#: templates/settings.php:77
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:78
+msgid "Cache Time-To-Live"
+msgstr ""
+
+#: templates/settings.php:78
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:80
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:82
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:82
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:83
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:83
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:47
+#: templates/settings.php:84
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:47 templates/settings.php:50
+#: templates/settings.php:84 templates/settings.php:87
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:48
+#: templates/settings.php:85
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:48
+#: templates/settings.php:85
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:49
+#: templates/settings.php:86
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:49
+#: templates/settings.php:86
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:87
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:88
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:90
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:92
+msgid "Quota Field"
+msgstr ""
+
+#: templates/settings.php:93
+msgid "Quota Default"
+msgstr ""
+
+#: templates/settings.php:93
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:94
+msgid "Email Field"
+msgstr ""
+
+#: templates/settings.php:95
+msgid "User Home Folder Naming Rule"
+msgstr ""
+
+#: templates/settings.php:95
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute."
 msgstr ""
 
-#: templates/settings.php:62
+#: templates/settings.php:99
+msgid "Test Configuration"
+msgstr ""
+
+#: templates/settings.php:99
 msgid "Help"
 msgstr ""
diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot
index 0b84d4999f6fd0b66c42be410fd70518489597eb..8f6a357f841b48a5ee6268d1d10138f520c7c73a 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-02-15 00:05+0100\n"
+"POT-Creation-Date: 2013-03-08 00:25+0100\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 37394ee13a443c6578d6bd942a86b00bf3b01c5a..6349d38593a3ec858e9e8859249aed075e7a3638 100644
--- a/l10n/th_TH/core.po
+++ b/l10n/th_TH/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 14:32+0000\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"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
@@ -388,7 +388,7 @@ msgstr "การอัพเดทไม่เป็นผลสำเร็จ
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "การอัพเดทเสร็จเรียบร้อยแล้ว กำลังเปลี่ยนเส้นทางไปที่ ownCloud อยู่ในขณะนี้"
 
-#: lostpassword/controller.php:47
+#: lostpassword/controller.php:48
 msgid "ownCloud password reset"
 msgstr "รีเซ็ตรหัสผ่าน ownCloud"
 
diff --git a/l10n/th_TH/files.po b/l10n/th_TH/files.po
index 295ad41356cae5f1872792c6349afbe1267dc0f5..71a7680255fd7967ef069773db43508afbf44448 100644
--- a/l10n/th_TH/files.po
+++ b/l10n/th_TH/files.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\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: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
@@ -52,27 +52,27 @@ msgid ""
 "the HTML form"
 msgstr "ไฟล์ที่อัพโหลดมีขนาดเกินคำสั่ง MAX_FILE_SIZE ที่ระบุเอาไว้ในรูปแบบคำสั่งในภาษา HTML"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
 msgstr "ไฟล์ที่อัพโหลดยังไม่ได้ถูกอัพโหลดอย่างสมบูรณ์"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:31
 msgid "No file was uploaded"
 msgstr "ยังไม่มีไฟล์ที่ถูกอัพโหลด"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:32
 msgid "Missing a temporary folder"
 msgstr "แฟ้มเอกสารชั่วคราวเกิดการสูญหาย"
 
-#: ajax/upload.php:34
+#: ajax/upload.php:33
 msgid "Failed to write to disk"
 msgstr "เขียนข้อมูลลงแผ่นดิสก์ล้มเหลว"
 
-#: ajax/upload.php:52
+#: ajax/upload.php:51
 msgid "Not enough storage available"
 msgstr "เหลือพื้นที่ไม่เพียงสำหรับใช้งาน"
 
-#: ajax/upload.php:83
+#: ajax/upload.php:82
 msgid "Invalid directory."
 msgstr "ไดเร็กทอรี่ไม่ถูกต้อง"
 
@@ -84,7 +84,7 @@ msgstr "ไฟล์"
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:127 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:127 templates/index.php:92 templates/index.php:93
 msgid "Delete"
 msgstr "ลบ"
 
@@ -92,40 +92,36 @@ msgstr "ลบ"
 msgid "Rename"
 msgstr "เปลี่ยนชื่อ"
 
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
 msgid "Pending"
 msgstr "อยู่ระหว่างดำเนินการ"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "{new_name} already exists"
 msgstr "{new_name} มีอยู่แล้วในระบบ"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "replace"
 msgstr "แทนที่"
 
-#: js/filelist.js:253
+#: js/filelist.js:251
 msgid "suggest name"
 msgstr "แนะนำชื่อ"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "cancel"
 msgstr "ยกเลิก"
 
-#: js/filelist.js:295
-msgid "replaced {new_name}"
-msgstr "แทนที่ {new_name} แล้ว"
+#: js/filelist.js:298
+msgid "replaced {new_name} with {old_name}"
+msgstr "แทนที่ {new_name} ด้วย {old_name} แล้ว"
 
-#: js/filelist.js:295 js/filelist.js:297
+#: js/filelist.js:298
 msgid "undo"
 msgstr "เลิกทำ"
 
-#: js/filelist.js:297
-msgid "replaced {new_name} with {old_name}"
-msgstr "แทนที่ {new_name} ด้วย {old_name} แล้ว"
-
-#: js/filelist.js:322
+#: js/filelist.js:323
 msgid "perform delete operation"
 msgstr "ดำเนินการตามคำสั่งลบ"
 
@@ -151,74 +147,74 @@ msgstr "พื้นที่จัดเก็บข้อมูลของค
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "พื้นที่จัดเก็บข้อมูลของคุณใกล้เต็มแล้ว ({usedSpacePercent}%)"
 
-#: js/files.js:224
+#: js/files.js:225
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "กำลังเตรียมดาวน์โหลดข้อมูล หากไฟล์มีขนาดใหญ่ อาจใช้เวลาสักครู่"
 
-#: js/files.js:261
+#: js/files.js:262
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "ไม่สามารถอัพโหลดไฟล์ของคุณได้ เนื่องจากไฟล์ดังกล่าวเป็นไดเร็กทอรี่หรือมีขนาด 0 ไบต์"
 
-#: js/files.js:261
+#: js/files.js:262
 msgid "Upload Error"
 msgstr "เกิดข้อผิดพลาดในการอัพโหลด"
 
-#: js/files.js:272
+#: js/files.js:273
 msgid "Close"
 msgstr "ปิด"
 
-#: js/files.js:311
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr "กำลังอัพโหลดไฟล์ 1 ไฟล์"
 
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr "กำลังอัพโหลด {count} ไฟล์"
 
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "การอัพโหลดถูกยกเลิก"
 
-#: js/files.js:496
+#: js/files.js:497
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "การอัพโหลดไฟล์กำลังอยู่ในระหว่างดำเนินการ การออกจากหน้าเว็บนี้จะทำให้การอัพโหลดถูกยกเลิก"
 
-#: js/files.js:569
+#: js/files.js:570
 msgid "URL cannot be empty."
 msgstr "URL ไม่สามารถเว้นว่างได้"
 
-#: js/files.js:574
+#: js/files.js:575
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "ชื่อโฟลเดอร์ไม่ถูกต้อง การใช้งาน 'แชร์' สงวนไว้สำหรับ Owncloud เท่านั้น"
 
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:953 templates/index.php:68
 msgid "Name"
 msgstr "ชื่อ"
 
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:954 templates/index.php:79
 msgid "Size"
 msgstr "ขนาด"
 
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:955 templates/index.php:81
 msgid "Modified"
 msgstr "ปรับปรุงล่าสุด"
 
-#: js/files.js:969
+#: js/files.js:974
 msgid "1 folder"
 msgstr "1 โฟลเดอร์"
 
-#: js/files.js:971
+#: js/files.js:976
 msgid "{count} folders"
 msgstr "{count} โฟลเดอร์"
 
-#: js/files.js:979
+#: js/files.js:984
 msgid "1 file"
 msgstr "1 ไฟล์"
 
-#: js/files.js:981
+#: js/files.js:986
 msgid "{count} files"
 msgstr "{count} ไฟล์"
 
@@ -282,33 +278,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr "ยกเลิกการอัพโหลด"
 
-#: templates/index.php:59
+#: templates/index.php:53
+msgid "You don’t have write permissions here."
+msgstr ""
+
+#: templates/index.php:60
 msgid "Nothing in here. Upload something!"
 msgstr "ยังไม่มีไฟล์ใดๆอยู่ที่นี่ กรุณาอัพโหลดไฟล์!"
 
-#: templates/index.php:73
+#: templates/index.php:74
 msgid "Download"
 msgstr "ดาวน์โหลด"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:86 templates/index.php:87
 msgid "Unshare"
 msgstr "ยกเลิกการแชร์ข้อมูล"
 
-#: templates/index.php:105
+#: templates/index.php:106
 msgid "Upload too large"
 msgstr "ไฟล์ที่อัพโหลดมีขนาดใหญ่เกินไป"
 
-#: templates/index.php:107
+#: templates/index.php:108
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "ไฟล์ที่คุณพยายามที่จะอัพโหลดมีขนาดเกินกว่าขนาดสูงสุดที่กำหนดไว้ให้อัพโหลดได้สำหรับเซิร์ฟเวอร์นี้"
 
-#: templates/index.php:112
+#: templates/index.php:113
 msgid "Files are being scanned, please wait."
 msgstr "ไฟล์กำลังอยู่ระหว่างการสแกน, กรุณารอสักครู่."
 
-#: templates/index.php:115
+#: templates/index.php:116
 msgid "Current scanning"
 msgstr "ไฟล์ที่กำลังสแกนอยู่ขณะนี้"
 
diff --git a/l10n/th_TH/files_external.po b/l10n/th_TH/files_external.po
index 6d58bbeaf8134cf2f2a86921d3405f582df523b5..2406b5d449eacb14a0f8fca10ab794f70a780acd 100644
--- a/l10n/th_TH/files_external.po
+++ b/l10n/th_TH/files_external.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:50+0000\n"
-"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\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"
 "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"
@@ -18,37 +18,33 @@ msgstr ""
 "Language: th_TH\n"
 "Plural-Forms: nplurals=1; plural=0;\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 "เกิดข้อผิดพลาดในการกำหนดค่าพื้นที่จัดเก็บข้อมูล Dropbox"
 
-#: 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 "กรุณากรอกรหัส app key ของ Dropbox และรหัสลับ"
 
-#: 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 "เกิดข้อผิดพลาดในการกำหนดค่าการจัดเก็บข้อมูลในพื้นที่ของ Google Drive"
 
-#: lib/config.php:434
+#: lib/config.php:421
 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:435
+#: lib/config.php:424
 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 "
@@ -59,63 +55,63 @@ msgstr "<b>คำเตือน:</b> การสนับสนุนการ
 msgid "External Storage"
 msgstr "พื้นทีจัดเก็บข้อมูลจากภายนอก"
 
-#: templates/settings.php:8 templates/settings.php:22
-msgid "Mount point"
-msgstr "จุดชี้ตำแหน่ง"
-
-#: templates/settings.php:9
-msgid "Backend"
-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: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"
-msgstr "เพิ่มจุดชี้ตำแหน่ง"
+#: 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 "ผู้ใช้งาน"
 
-#: templates/settings.php:108 templates/settings.php:109
-#: templates/settings.php:144 templates/settings.php:145
+#: templates/settings.php:113 templates/settings.php:114
+#: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
 msgstr "ลบ"
 
-#: 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:136
+#: templates/settings.php:141
 msgid "SSL root certificates"
 msgstr "ใบรับรองความปลอดภัยด้วยระบบ SSL จาก Root"
 
-#: templates/settings.php:153
+#: templates/settings.php:159
 msgid "Import Root Certificate"
 msgstr "นำเข้าข้อมูลใบรับรองความปลอดภัยจาก Root"
diff --git a/l10n/th_TH/files_trashbin.po b/l10n/th_TH/files_trashbin.po
index b7f0801c5e2e01e92ead454e5a237873aceb9699..29f0f76aecaf434a2c52e59ca1f686d5def39783 100644
--- a/l10n/th_TH/files_trashbin.po
+++ b/l10n/th_TH/files_trashbin.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 10:07+0000\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: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Language: th_TH\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/delete.php:22
+#: ajax/delete.php:40
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
@@ -28,35 +28,39 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
 msgid "perform restore operation"
 msgstr "ดำเนินการคืนค่า"
 
-#: js/trash.js:33
+#: js/trash.js:34
 msgid "delete file permanently"
 msgstr ""
 
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr ""
+
+#: js/trash.js:174 templates/index.php:17
 msgid "Name"
 msgstr "ชื่อ"
 
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:175 templates/index.php:27
 msgid "Deleted"
 msgstr "ลบแล้ว"
 
-#: js/trash.js:135
+#: js/trash.js:184
 msgid "1 folder"
 msgstr "1 โฟลเดอร์"
 
-#: js/trash.js:137
+#: js/trash.js:186
 msgid "{count} folders"
 msgstr "{count} โฟลเดอร์"
 
-#: js/trash.js:145
+#: js/trash.js:194
 msgid "1 file"
 msgstr "1 ไฟล์"
 
-#: js/trash.js:147
+#: js/trash.js:196
 msgid "{count} files"
 msgstr "{count} ไฟล์"
 
@@ -67,3 +71,11 @@ 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/th_TH/files_versions.po b/l10n/th_TH/files_versions.po
index 4d724184b1c272112ef29642e47ae8df8301819b..1abe7bfdb5e7bbec2b871677c1ca8a4d121434a0 100644
--- a/l10n/th_TH/files_versions.po
+++ b/l10n/th_TH/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-08 00:10+0100\n"
-"PO-Revision-Date: 2013-02-07 23:11+0000\n"
+"POT-Creation-Date: 2013-02-28 00:04+0100\n"
+"PO-Revision-Date: 2013-02-27 23:04+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
@@ -49,18 +49,10 @@ msgstr ""
 msgid "No path specified"
 msgstr ""
 
-#: js/versions.js:16
-msgid "History"
-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 ""
-
-#: templates/settings.php:3
-msgid "Files Versioning"
-msgstr "การกำหนดเวอร์ชั่นของไฟล์"
-
-#: templates/settings.php:4
-msgid "Enable"
-msgstr "เปิดใช้งาน"
diff --git a/l10n/th_TH/lib.po b/l10n/th_TH/lib.po
index b7a10f4fd26728d9124664379ece14d7dedd8a98..dbe07fd74279ad8a83065641c1fbb16cb4fd0d15 100644
--- a/l10n/th_TH/lib.po
+++ b/l10n/th_TH/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-11 15:39+0100\n"
-"PO-Revision-Date: 2013-02-11 14:40+0000\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: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
@@ -18,27 +18,27 @@ msgstr ""
 "Language: th_TH\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: app.php:339
+#: app.php:349
 msgid "Help"
 msgstr "ช่วยเหลือ"
 
-#: app.php:346
+#: app.php:362
 msgid "Personal"
 msgstr "ส่วนตัว"
 
-#: app.php:351
+#: app.php:373
 msgid "Settings"
 msgstr "ตั้งค่า"
 
-#: app.php:356
+#: app.php:385
 msgid "Users"
 msgstr "ผู้ใช้งาน"
 
-#: app.php:363
+#: app.php:398
 msgid "Apps"
 msgstr "แอปฯ"
 
-#: app.php:365
+#: app.php:406
 msgid "Admin"
 msgstr "ผู้ดูแล"
 
@@ -50,15 +50,15 @@ msgstr "คุณสมบัติการดาวน์โหลด zip ถ
 msgid "Files need to be downloaded one by one."
 msgstr "ไฟล์สามารถดาวน์โหลดได้ทีละครั้งเท่านั้น"
 
-#: files.php:203 files.php:228
+#: files.php:204 files.php:231
 msgid "Back to Files"
 msgstr "กลับไปที่ไฟล์"
 
-#: files.php:227
+#: files.php:228
 msgid "Selected files too large to generate zip file."
 msgstr "ไฟล์ที่เลือกมีขนาดใหญ่เกินกว่าที่จะสร้างเป็นไฟล์ zip"
 
-#: helper.php:226
+#: helper.php:228
 msgid "couldn't be determined"
 msgstr "ไม่สามารถกำหนดได้"
 
@@ -98,87 +98,92 @@ msgstr ""
 msgid "Specify a data folder."
 msgstr ""
 
-#: setup.php:53
+#: setup.php:55
 #, php-format
 msgid "%s enter the database username."
 msgstr ""
 
-#: setup.php:56
+#: setup.php:58
 #, php-format
 msgid "%s enter the database name."
 msgstr ""
 
-#: setup.php:59
+#: setup.php:61
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr ""
 
-#: setup.php:62
+#: setup.php:64
 #, php-format
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:126 setup.php:291 setup.php:336
+#: setup.php:128 setup.php:320 setup.php:365
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:127 setup.php:150 setup.php:204
+#: setup.php:129 setup.php:152 setup.php:229
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:149 setup.php:423 setup.php:489
+#: setup.php:151 setup.php:453 setup.php:520
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:203
+#: setup.php:228
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:255 setup.php:357 setup.php:366 setup.php:384 setup.php:394
-#: setup.php:403 setup.php:430 setup.php:496 setup.php:522 setup.php:529
-#: setup.php:540 setup.php:547 setup.php:556 setup.php:564 setup.php:573
-#: setup.php:579
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:256 setup.php:358 setup.php:367 setup.php:385 setup.php:395
-#: setup.php:404 setup.php:431 setup.php:497 setup.php:523 setup.php:530
-#: setup.php:541 setup.php:557 setup.php:565 setup.php:574
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:270
+#: setup.php:299
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:271
+#: setup.php:300
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:276
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:277
+#: setup.php:306
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:548 setup.php:580
+#: setup.php:579 setup.php:611
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:644
+#: setup.php:631
+#, php-format
+msgid "MS SQL username and/or password not valid: %s"
+msgstr ""
+
+#: setup.php:849
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:645
+#: setup.php:850
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
@@ -235,16 +240,16 @@ msgstr "ปีที่แล้ว"
 msgid "years ago"
 msgstr "ปีที่ผ่านมา"
 
-#: updater.php:75
+#: updater.php:78
 #, php-format
 msgid "%s is available. Get <a href=\"%s\">more information</a>"
 msgstr "%s พร้อมให้ใช้งานได้แล้ว. <a href=\"%s\">ดูรายละเอียดเพิ่มเติม</a>"
 
-#: updater.php:77
+#: updater.php:81
 msgid "up to date"
 msgstr "ทันสมัย"
 
-#: updater.php:80
+#: updater.php:84
 msgid "updates check is disabled"
 msgstr "การตรวจสอบชุดอัพเดทถูกปิดใช้งานไว้"
 
diff --git a/l10n/th_TH/settings.po b/l10n/th_TH/settings.po
index 6cc808ea8998520dd41985d4963adb0bf9f04092..01fe7419eb2da602ce94f89fc27dcde51d5c78a7 100644
--- a/l10n/th_TH/settings.po
+++ b/l10n/th_TH/settings.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 23:05+0000\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: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
@@ -24,8 +24,8 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "ไม่สามารถโหลดรายการจาก App Store ได้"
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:15
-#: ajax/togglegroups.php:18
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr "เกิดข้อผิดพลาดเกี่ยวกับสิทธิ์การเข้าใช้งาน"
 
@@ -73,12 +73,12 @@ 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 "ไม่สามารถเพิ่มผู้ใช้งานเข้าไปที่กลุ่ม %s ได้"
 
-#: ajax/togglegroups.php:34
+#: ajax/togglegroups.php:36
 #, php-format
 msgid "Unable to remove user from group %s"
 msgstr "ไม่สามารถลบผู้ใช้งานออกจากกลุ่ม %s ได้"
@@ -119,7 +119,7 @@ msgstr "ข้อผิดพลาด"
 msgid "Updated"
 msgstr "อัพเดทแล้ว"
 
-#: js/personal.js:96
+#: js/personal.js:99
 msgid "Saving..."
 msgstr "กำลังบันทึุกข้อมูล..."
 
@@ -148,23 +148,23 @@ msgstr "ผู้ดูแลกลุ่ม"
 msgid "Delete"
 msgstr "ลบ"
 
-#: js/users.js:190
+#: js/users.js:191
 msgid "add group"
 msgstr ""
 
-#: js/users.js:351
+#: js/users.js:352
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:357
+#: js/users.js:358
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
 msgid "__language_name__"
 msgstr "ภาษาไทย"
 
@@ -210,19 +210,19 @@ msgstr ""
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:61
+#: templates/admin.php:63
+#, php-format
 msgid ""
-"This ownCloud server can't set system locale to "
-"\"en_US.UTF-8\"/\"en_US.UTF8\". 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 en_US.UTF-8/en_US.UTF8."
+"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:72
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:75
+#: 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 "
@@ -232,98 +232,98 @@ msgid ""
 " of ownCloud."
 msgstr ""
 
-#: templates/admin.php:89
+#: templates/admin.php:92
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:98
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:108
+#: 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:118
+#: 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:125
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:131
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:132
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:140
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:147
+#: templates/admin.php:150
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:148
+#: templates/admin.php:151
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:155
+#: templates/admin.php:158
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:161
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:165
+#: templates/admin.php:168
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:181
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:179
+#: templates/admin.php:182
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:182
+#: templates/admin.php:185
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr ""
 
-#: templates/admin.php:192
+#: templates/admin.php:195
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:193
+#: templates/admin.php:196
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:220
+#: templates/admin.php:223
 msgid "More"
 msgstr "มาก"
 
-#: templates/admin.php:227 templates/personal.php:98
+#: templates/admin.php:230 templates/personal.php:102
 msgid "Version"
 msgstr "รุ่น"
 
-#: templates/admin.php:230 templates/personal.php:100
+#: templates/admin.php:233 templates/personal.php:105
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -333,51 +333,51 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "พัฒนาโดย the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ชุมชนผู้ใช้งาน ownCloud</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">ซอร์สโค้ด</a>อยู่ภายใต้สัญญาอนุญาตของ <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
-#: templates/apps.php:10
+#: templates/apps.php:11
 msgid "Add your App"
 msgstr "เพิ่มแอปของคุณ"
 
-#: templates/apps.php:11
+#: templates/apps.php:12
 msgid "More Apps"
 msgstr "แอปฯอื่นเพิ่มเติม"
 
-#: templates/apps.php:24
+#: templates/apps.php:28
 msgid "Select an App"
 msgstr "เลือก App"
 
-#: templates/apps.php:28
+#: templates/apps.php:34
 msgid "See application page at apps.owncloud.com"
 msgstr "ดูหน้าแอพพลิเคชั่นที่ apps.owncloud.com"
 
-#: templates/apps.php:29
+#: templates/apps.php:36
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-ลิขสิทธิ์การใช้งานโดย <span class=\"author\"></span>"
 
-#: templates/apps.php:31
+#: templates/apps.php:38
 msgid "Update"
 msgstr "อัพเดท"
 
-#: templates/help.php:3
+#: 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 "Bugtracker"
 
-#: templates/help.php:11
+#: templates/help.php:17
 msgid "Commercial Support"
 msgstr "บริการลูกค้าแบบเสียค่าใช้จ่าย"
 
@@ -386,79 +386,79 @@ msgstr "บริการลูกค้าแบบเสียค่าใช
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "คุณได้ใช้งานไปแล้ว <strong>%s</strong> จากจำนวนที่สามารถใช้ได้ <strong>%s</strong>"
 
-#: templates/personal.php:14
+#: templates/personal.php:15
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:25
+#: templates/personal.php:26
 msgid "Show First Run Wizard again"
 msgstr "แสดงหน้าจอวิซาร์ดนำทางครั้งแรกอีกครั้ง"
 
-#: templates/personal.php:36 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
 msgid "Password"
 msgstr "รหัสผ่าน"
 
-#: templates/personal.php:37
+#: templates/personal.php:38
 msgid "Your password was changed"
 msgstr "รหัสผ่านของคุณถูกเปลี่ยนแล้ว"
 
-#: templates/personal.php:38
+#: templates/personal.php:39
 msgid "Unable to change your password"
 msgstr "ไม่สามารถเปลี่ยนรหัสผ่านของคุณได้"
 
-#: templates/personal.php:39
+#: templates/personal.php:40
 msgid "Current password"
 msgstr "รหัสผ่านปัจจุบัน"
 
-#: templates/personal.php:40
+#: templates/personal.php:42
 msgid "New password"
 msgstr "รหัสผ่านใหม่"
 
-#: templates/personal.php:42
+#: templates/personal.php:44
 msgid "Change password"
 msgstr "เปลี่ยนรหัสผ่าน"
 
-#: templates/personal.php:54 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:78
 msgid "Display Name"
 msgstr "ชื่อที่ต้องการแสดง"
 
-#: templates/personal.php:55
+#: templates/personal.php:57
 msgid "Your display name was changed"
 msgstr ""
 
-#: templates/personal.php:56
+#: templates/personal.php:58
 msgid "Unable to change your display name"
 msgstr ""
 
-#: templates/personal.php:59
+#: templates/personal.php:61
 msgid "Change display name"
 msgstr ""
 
-#: templates/personal.php:68
+#: templates/personal.php:70
 msgid "Email"
 msgstr "อีเมล์"
 
-#: templates/personal.php:69
+#: templates/personal.php:72
 msgid "Your email address"
 msgstr "ที่อยู่อีเมล์ของคุณ"
 
-#: templates/personal.php:70
+#: templates/personal.php:73
 msgid "Fill in an email address to enable password recovery"
 msgstr "กรอกที่อยู่อีเมล์ของคุณเพื่อเปิดให้มีการกู้คืนรหัสผ่านได้"
 
-#: templates/personal.php:76 templates/personal.php:77
+#: templates/personal.php:79 templates/personal.php:80
 msgid "Language"
 msgstr "ภาษา"
 
-#: templates/personal.php:82
+#: templates/personal.php:86
 msgid "Help translate"
 msgstr "ช่วยกันแปล"
 
-#: templates/personal.php:87
+#: templates/personal.php:91
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:89
+#: templates/personal.php:93
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "ใช้ที่อยู่นี้เพื่อเชื่อมต่อกับ ownCloud ในโปรแกรมจัดการไฟล์ของคุณ"
 
diff --git a/l10n/th_TH/user_ldap.po b/l10n/th_TH/user_ldap.po
index 3d906030931f66bea57581cfb65848214ee8fb79..7a53d8f816ab91c21ea2e62a4318689c1f364cab 100644
--- a/l10n/th_TH/user_ldap.po
+++ b/l10n/th_TH/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-08 00:10+0100\n"
-"PO-Revision-Date: 2013-02-07 23:11+0000\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: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
@@ -22,17 +22,17 @@ msgstr ""
 msgid "Failed to delete the server configuration"
 msgstr "การลบการกำหนดค่าเซิร์ฟเวอร์ล้มเหลว"
 
-#: ajax/testConfiguration.php:35
+#: ajax/testConfiguration.php:36
 msgid "The configuration is valid and the connection could be established!"
 msgstr "การกำหนดค่าถูกต้องและการเชื่อมต่อสามารถเชื่อมต่อได้!"
 
-#: ajax/testConfiguration.php:37
+#: ajax/testConfiguration.php:39
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
 msgstr "การกำหนดค่าถูกต้อง, แต่การผูกข้อมูลล้มเหลว, กรุณาตรวจสอบการตั้งค่าเซิร์ฟเวอร์และข้อมูลการเข้าใช้งาน"
 
-#: ajax/testConfiguration.php:40
+#: ajax/testConfiguration.php:43
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
@@ -87,224 +87,248 @@ msgstr "<b>คำเตือน:</b> โมดูล PHP LDAP ยังไม
 msgid "Server configuration"
 msgstr "การกำหนดค่าเซิร์ฟเวอร์"
 
-#: templates/settings.php:17
+#: templates/settings.php:18
 msgid "Add Server Configuration"
 msgstr "เพิ่มการกำหนดค่าเซิร์ฟเวอร์"
 
-#: templates/settings.php:21
+#: templates/settings.php:23
 msgid "Host"
 msgstr "โฮสต์"
 
-#: templates/settings.php:21
+#: templates/settings.php:25
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "คุณสามารถปล่อยช่องโปรโตคอลเว้นไว้ได้, ยกเว้นกรณีที่คุณต้องการใช้ SSL จากนั้นเริ่มต้นด้วย ldaps://"
 
-#: templates/settings.php:22
+#: templates/settings.php:26
 msgid "Base DN"
 msgstr "DN ฐาน"
 
-#: templates/settings.php:22
+#: templates/settings.php:27
 msgid "One Base DN per line"
 msgstr "หนึ่ง Base DN ต่อบรรทัด"
 
-#: templates/settings.php:22
+#: templates/settings.php:28
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "คุณสามารถระบุ DN หลักสำหรับผู้ใช้งานและกลุ่มต่างๆในแท็บขั้นสูงได้"
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "User DN"
 msgstr "DN ของผู้ใช้งาน"
 
-#: templates/settings.php:23
+#: templates/settings.php:32
 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:24
+#: templates/settings.php:33
 msgid "Password"
 msgstr "รหัสผ่าน"
 
-#: templates/settings.php:24
+#: templates/settings.php:36
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "สำหรับการเข้าถึงโดยบุคคลนิรนาม ให้เว้นว่าง DN และรหัสผ่านไว้"
 
-#: templates/settings.php:25
+#: templates/settings.php:37
 msgid "User Login Filter"
 msgstr "ตัวกรองข้อมูลการเข้าสู่ระบบของผู้ใช้งาน"
 
-#: templates/settings.php:25
+#: templates/settings.php:40
 #, 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:25
+#: templates/settings.php:41
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "ใช้ตัวยึด %%uid, เช่น \"uid=%%uid\""
 
-#: templates/settings.php:26
+#: templates/settings.php:42
 msgid "User List Filter"
 msgstr "ตัวกรองข้อมูลรายชื่อผู้ใช้งาน"
 
-#: templates/settings.php:26
+#: templates/settings.php:45
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "ระบุตัวกรองข้อมูลที่ต้องการนำไปใช้งาน, เมื่อดึงข้อมูลผู้ใช้งาน"
 
-#: templates/settings.php:26
+#: templates/settings.php:46
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "โดยไม่ต้องมีตัวยึดใดๆ, เช่น \"objectClass=person\","
 
-#: templates/settings.php:27
+#: templates/settings.php:47
 msgid "Group Filter"
 msgstr "ตัวกรองข้อมูลกลุ่ม"
 
-#: templates/settings.php:27
+#: templates/settings.php:50
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "ระบุตัวกรองข้อมูลที่ต้องการนำไปใช้งาน, เมื่อดึงข้อมูลกลุ่ม"
 
-#: templates/settings.php:27
+#: templates/settings.php:51
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "โดยไม่ต้องมีตัวยึดใดๆ, เช่น \"objectClass=posixGroup\","
 
-#: templates/settings.php:31
+#: templates/settings.php:55
 msgid "Connection Settings"
 msgstr "ตั้งค่าการเชื่อมต่อ"
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:34
+#: templates/settings.php:58
 msgid "Port"
 msgstr "พอร์ต"
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:60
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "Disable Main Server"
 msgstr "ปิดใช้งานเซิร์ฟเวอร์หลัก"
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Use TLS"
 msgstr "ใช้ TLS"
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:39
+#: templates/settings.php:63
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "เซิร์ฟเวอร์ LDAP ประเภท Case insensitive (วินโดวส์)"
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid "Turn off SSL certificate validation."
 msgstr "ปิดใช้งานการตรวจสอบความถูกต้องของใบรับรองความปลอดภัย SSL"
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 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:40
+#: templates/settings.php:64
 msgid "Not recommended, use for testing only."
 msgstr "ไม่แนะนำให้ใช้งาน, ใช้สำหรับการทดสอบเท่านั้น"
 
-#: templates/settings.php:41
+#: templates/settings.php:65
+msgid "Cache Time-To-Live"
+msgstr ""
+
+#: templates/settings.php:65
 msgid "in seconds. A change empties the cache."
 msgstr "ในอีกไม่กี่วินาที ระบบจะเปลี่ยนแปลงข้อมูลในแคชให้ว่างเปล่า"
 
-#: templates/settings.php:43
+#: templates/settings.php:67
 msgid "Directory Settings"
 msgstr "ตั้งค่าไดเร็กทอรี่"
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "User Display Name Field"
 msgstr "ช่องแสดงชื่อผู้ใช้งานที่ต้องการ"
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "คุณลักษณะ LDAP ที่ต้องการใช้สำหรับสร้างชื่อของผู้ใช้งาน ownCloud"
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "Base User Tree"
 msgstr "รายการผู้ใช้งานหลักแบบ Tree"
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "One User Base DN per line"
 msgstr "หนึ่ง User Base DN ต่อบรรทัด"
 
-#: templates/settings.php:47
+#: templates/settings.php:71
 msgid "User Search Attributes"
 msgstr "คุณลักษณะการค้นหาชื่อผู้ใช้"
 
-#: templates/settings.php:47 templates/settings.php:50
+#: templates/settings.php:71 templates/settings.php:74
 msgid "Optional; one attribute per line"
 msgstr "ตัวเลือกเพิ่มเติม; หนึ่งคุณลักษณะต่อบรรทัด"
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "Group Display Name Field"
 msgstr "ช่องแสดงชื่อกลุ่มที่ต้องการ"
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "คุณลักษณะ LDAP ที่ต้องการใช้สร้างชื่อกลุ่มของ ownCloud"
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "Base Group Tree"
 msgstr "รายการกลุ่มหลักแบบ Tree"
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "One Group Base DN per line"
 msgstr "หนึ่ง Group Base DN ต่อบรรทัด"
 
-#: templates/settings.php:50
+#: templates/settings.php:74
 msgid "Group Search Attributes"
 msgstr "คุณลักษณะการค้นหาแบบกลุ่ม"
 
-#: templates/settings.php:51
+#: templates/settings.php:75
 msgid "Group-Member association"
 msgstr "ความสัมพันธ์ของสมาชิกในกลุ่ม"
 
-#: templates/settings.php:53
+#: templates/settings.php:77
 msgid "Special Attributes"
 msgstr "คุณลักษณะพิเศษ"
 
-#: templates/settings.php:56
+#: templates/settings.php:79
+msgid "Quota Field"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Quota Default"
+msgstr ""
+
+#: templates/settings.php:80
 msgid "in bytes"
 msgstr "ในหน่วยไบต์"
 
-#: templates/settings.php:58
+#: templates/settings.php:81
+msgid "Email Field"
+msgstr ""
+
+#: templates/settings.php:82
+msgid "User Home Folder Naming Rule"
+msgstr ""
+
+#: templates/settings.php:82
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "เว้นว่างไว้สำหรับ ชื่อผู้ใช้ (ค่าเริ่มต้น) หรือไม่กรุณาระบุคุณลักษณะของ LDAP/AD"
 
-#: templates/settings.php:62
+#: templates/settings.php:86
+msgid "Test Configuration"
+msgstr ""
+
+#: templates/settings.php:86
 msgid "Help"
 msgstr "ช่วยเหลือ"
diff --git a/l10n/tr/core.po b/l10n/tr/core.po
index 85393a3132ccd361e988c92c0838eebf9da5a26e..eff8470675f6dfab128846e501e69a4b643239fc 100644
--- a/l10n/tr/core.po
+++ b/l10n/tr/core.po
@@ -8,13 +8,14 @@
 #   <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-02-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 14:32+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "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"
@@ -57,7 +58,7 @@ msgstr "Eklenecek kategori yok?"
 #: ajax/vcategories/add.php:37
 #, php-format
 msgid "This category already exists: %s"
-msgstr ""
+msgstr "Bu kategori zaten mevcut:  %s"
 
 #: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
 #: ajax/vcategories/favorites.php:24
@@ -258,7 +259,7 @@ msgstr "İhtiyaç duyulan {file} dosyası kurulu değil."
 
 #: js/share.js:29 js/share.js:43 js/share.js:90
 msgid "Shared"
-msgstr ""
+msgstr "Paylaşılan"
 
 #: js/share.js:93
 msgid "Share"
@@ -385,13 +386,13 @@ msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
 "href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
 "community</a>."
-msgstr ""
+msgstr "Güncelleme başarılı olmadı. Lütfen bu hatayı bildirin <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 "Güncelleme başarılı. ownCloud'a yönlendiriliyor."
 
-#: lostpassword/controller.php:47
+#: lostpassword/controller.php:48
 msgid "ownCloud password reset"
 msgstr "ownCloud parola sıfırlama"
 
@@ -492,14 +493,14 @@ msgstr "Güvenli rasgele sayı üreticisi olmadan saldırganlar parola sıfırla
 msgid ""
 "Your data directory and files are probably accessible from the internet "
 "because the .htaccess file does not work."
-msgstr ""
+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
 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 "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
 msgid "Create an <strong>admin account</strong>"
@@ -582,7 +583,7 @@ msgstr "Giriş yap"
 
 #: templates/login.php:49
 msgid "Alternative Logins"
-msgstr ""
+msgstr "Alternatif Girişler"
 
 #: templates/part.pagenavi.php:3
 msgid "prev"
diff --git a/l10n/tr/files.po b/l10n/tr/files.po
index 9656ce6720408de62a3ef044758e1ed0f63e905c..e64be58b17acfd6fe0faf40a08a474ceaf915175 100644
--- a/l10n/tr/files.po
+++ b/l10n/tr/files.po
@@ -9,12 +9,13 @@
 #   <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-02-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\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: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -56,27 +57,27 @@ msgid ""
 "the HTML form"
 msgstr "Yüklenen dosya HTML formundaki MAX_FILE_SIZE sınırını aşıyor"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
 msgstr "Yüklenen dosyanın sadece bir kısmı yüklendi"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:31
 msgid "No file was uploaded"
 msgstr "Hiç dosya yüklenmedi"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:32
 msgid "Missing a temporary folder"
 msgstr "Geçici bir klasör eksik"
 
-#: ajax/upload.php:34
+#: ajax/upload.php:33
 msgid "Failed to write to disk"
 msgstr "Diske yazılamadı"
 
-#: ajax/upload.php:52
+#: ajax/upload.php:51
 msgid "Not enough storage available"
-msgstr ""
+msgstr "Yeterli disk alanı yok"
 
-#: ajax/upload.php:83
+#: ajax/upload.php:82
 msgid "Invalid directory."
 msgstr "Geçersiz dizin."
 
@@ -86,9 +87,9 @@ msgstr "Dosyalar"
 
 #: js/fileactions.js:125
 msgid "Delete permanently"
-msgstr ""
+msgstr "Kalıcı olarak sil"
 
-#: js/fileactions.js:127 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:127 templates/index.php:92 templates/index.php:93
 msgid "Delete"
 msgstr "Sil"
 
@@ -96,42 +97,38 @@ msgstr "Sil"
 msgid "Rename"
 msgstr "İsim değiştir."
 
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
 msgid "Pending"
 msgstr "Bekliyor"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "{new_name} already exists"
 msgstr "{new_name} zaten mevcut"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "replace"
 msgstr "değiştir"
 
-#: js/filelist.js:253
+#: js/filelist.js:251
 msgid "suggest name"
 msgstr "Öneri ad"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "cancel"
 msgstr "iptal"
 
-#: js/filelist.js:295
-msgid "replaced {new_name}"
-msgstr "değiştirilen {new_name}"
+#: js/filelist.js:298
+msgid "replaced {new_name} with {old_name}"
+msgstr "{new_name} ismi {old_name} ile değiştirildi"
 
-#: js/filelist.js:295 js/filelist.js:297
+#: js/filelist.js:298
 msgid "undo"
 msgstr "geri al"
 
-#: js/filelist.js:297
-msgid "replaced {new_name} with {old_name}"
-msgstr "{new_name} ismi {old_name} ile değiştirildi"
-
-#: js/filelist.js:322
+#: js/filelist.js:323
 msgid "perform delete operation"
-msgstr ""
+msgstr "Silme işlemini gerçekleştir"
 
 #: js/files.js:52
 msgid "'.' is an invalid file name."
@@ -149,80 +146,80 @@ msgstr "Geçersiz isim, '\\', '/', '<', '>', ':', '\"', '|', '?' ve '*' karakter
 
 #: js/files.js:78
 msgid "Your storage is full, files can not be updated or synced anymore!"
-msgstr ""
+msgstr "Depolama alanınız dolu, artık dosyalar güncellenmeyecek yada senkronizasyon edilmeyecek."
 
 #: js/files.js:82
 msgid "Your storage is almost full ({usedSpacePercent}%)"
-msgstr ""
+msgstr "Depolama alanınız neredeyse dolu ({usedSpacePercent}%)"
 
-#: js/files.js:224
+#: js/files.js:225
 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:261
+#: js/files.js:262
 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:261
+#: js/files.js:262
 msgid "Upload Error"
 msgstr "Yükleme hatası"
 
-#: js/files.js:272
+#: js/files.js:273
 msgid "Close"
 msgstr "Kapat"
 
-#: js/files.js:311
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr "1 dosya yüklendi"
 
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr "{count} dosya yükleniyor"
 
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "Yükleme iptal edildi."
 
-#: js/files.js:496
+#: js/files.js:497
 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:569
+#: js/files.js:570
 msgid "URL cannot be empty."
 msgstr "URL boş olamaz."
 
-#: js/files.js:574
+#: js/files.js:575
 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:948 templates/index.php:67
+#: js/files.js:953 templates/index.php:68
 msgid "Name"
 msgstr "Ad"
 
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:954 templates/index.php:79
 msgid "Size"
 msgstr "Boyut"
 
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:955 templates/index.php:81
 msgid "Modified"
 msgstr "Değiştirilme"
 
-#: js/files.js:969
+#: js/files.js:974
 msgid "1 folder"
 msgstr "1 dizin"
 
-#: js/files.js:971
+#: js/files.js:976
 msgid "{count} folders"
 msgstr "{count} dizin"
 
-#: js/files.js:979
+#: js/files.js:984
 msgid "1 file"
 msgstr "1 dosya"
 
-#: js/files.js:981
+#: js/files.js:986
 msgid "{count} files"
 msgstr "{count} dosya"
 
@@ -280,42 +277,46 @@ msgstr "Bağlantıdan"
 
 #: templates/index.php:40
 msgid "Deleted files"
-msgstr ""
+msgstr "Dosyalar silindi"
 
 #: templates/index.php:46
 msgid "Cancel upload"
 msgstr "Yüklemeyi iptal et"
 
-#: templates/index.php:59
+#: templates/index.php:53
+msgid "You don’t have write permissions here."
+msgstr ""
+
+#: templates/index.php:60
 msgid "Nothing in here. Upload something!"
 msgstr "Burada hiçbir şey yok. Birşeyler yükleyin!"
 
-#: templates/index.php:73
+#: templates/index.php:74
 msgid "Download"
 msgstr "İndir"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:86 templates/index.php:87
 msgid "Unshare"
 msgstr "Paylaşılmayan"
 
-#: templates/index.php:105
+#: templates/index.php:106
 msgid "Upload too large"
 msgstr "Yüklemeniz çok büyük"
 
-#: templates/index.php:107
+#: templates/index.php:108
 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:112
+#: templates/index.php:113
 msgid "Files are being scanned, please wait."
 msgstr "Dosyalar taranıyor, lütfen bekleyin."
 
-#: templates/index.php:115
+#: templates/index.php:116
 msgid "Current scanning"
 msgstr "Güncel tarama"
 
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
-msgstr ""
+msgstr "Sistem dosyası önbelleği güncelleniyor"
diff --git a/l10n/tr/files_encryption.po b/l10n/tr/files_encryption.po
index fec3cbfb0bc35a2105461ac550a6e6b0ffd335c0..52609fb3a4e0799c1ca0da25772613e88a5b6c32 100644
--- a/l10n/tr/files_encryption.po
+++ b/l10n/tr/files_encryption.po
@@ -4,13 +4,14 @@
 # 
 # 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-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-02-19 00:05+0100\n"
+"PO-Revision-Date: 2013-02-18 20:10+0000\n"
+"Last-Translator: atakan96 <tayancatakan@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"
@@ -24,15 +25,15 @@ msgstr "Şifreleme"
 
 #: templates/settings-personal.php:7
 msgid "File encryption is enabled."
-msgstr ""
+msgstr "Dosya şifreleme aktif."
 
 #: templates/settings-personal.php:11
 msgid "The following file types will not be encrypted:"
-msgstr ""
+msgstr "Belirtilen dosya tipleri şifrelenmeyecek:"
 
 #: templates/settings.php:7
 msgid "Exclude the following file types from encryption:"
-msgstr ""
+msgstr "Seçilen dosya tiplerini şifreleme:"
 
 #: templates/settings.php:12
 msgid "None"
diff --git a/l10n/tr/files_external.po b/l10n/tr/files_external.po
index bb6c928a053332dbc14892f1eddf139a01c9e9c4..79063bc1eda3c307039fd9e16d9ffca5466cc9a8 100644
--- a/l10n/tr/files_external.po
+++ b/l10n/tr/files_external.po
@@ -4,13 +4,14 @@
 # 
 # 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: 2012-12-28 00:20+0100\n"
-"PO-Revision-Date: 2012-12-27 13:50+0000\n"
-"Last-Translator: Necdet Yücel <necdetyucel@gmail.com>\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"
 "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"
@@ -18,37 +19,33 @@ msgstr ""
 "Language: tr\n"
 "Plural-Forms: nplurals=1; plural=0;\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 ""
+msgstr "Giriş kabul edildi"
 
-#: 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 ""
+msgstr "Erişim sağlandı"
 
-#: js/dropbox.js:85
+#: js/dropbox.js:101
 msgid "Please provide a valid Dropbox app key and secret."
-msgstr ""
+msgstr "Lütfen Dropbox app key ve secret temin ediniz"
 
-#: 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:421
 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:424
 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 "
@@ -59,63 +56,63 @@ msgstr ""
 msgid "External Storage"
 msgstr "Harici Depolama"
 
-#: templates/settings.php:8 templates/settings.php:22
-msgid "Mount point"
-msgstr "Bağlama Noktası"
-
-#: templates/settings.php:9
-msgid "Backend"
-msgstr "Yönetici"
+#: templates/settings.php:9 templates/settings.php:28
+msgid "Folder name"
+msgstr "Dizin ismi"
 
 #: templates/settings.php:10
+msgid "External storage"
+msgstr ""
+
+#: templates/settings.php:11
 msgid "Configuration"
 msgstr "Yapılandırma"
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid "Options"
 msgstr "Seçenekler"
 
-#: templates/settings.php:12
+#: templates/settings.php:13
 msgid "Applicable"
 msgstr "Uygulanabilir"
 
-#: templates/settings.php:27
-msgid "Add mount point"
-msgstr "Bağlama noktası ekle"
+#: templates/settings.php:33
+msgid "Add storage"
+msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:90
 msgid "None set"
 msgstr "Hiçbiri"
 
-#: templates/settings.php:86
+#: templates/settings.php:91
 msgid "All Users"
 msgstr "Tüm Kullanıcılar"
 
-#: templates/settings.php:87
+#: templates/settings.php:92
 msgid "Groups"
 msgstr "Gruplar"
 
-#: templates/settings.php:95
+#: templates/settings.php:100
 msgid "Users"
 msgstr "Kullanıcılar"
 
-#: templates/settings.php:108 templates/settings.php:109
-#: templates/settings.php:144 templates/settings.php:145
+#: templates/settings.php:113 templates/settings.php:114
+#: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
 msgstr "Sil"
 
-#: templates/settings.php:124
+#: templates/settings.php:129
 msgid "Enable User External Storage"
-msgstr ""
+msgstr "Kullanıcılar için Harici Depolamayı Etkinleştir"
 
-#: templates/settings.php:125
+#: templates/settings.php:130
 msgid "Allow users to mount their own external storage"
-msgstr ""
+msgstr "Kullanıcıların kendi harici depolamalarını bağlamalarına izin ver"
 
-#: templates/settings.php:136
+#: templates/settings.php:141
 msgid "SSL root certificates"
 msgstr "SSL kök sertifikaları"
 
-#: templates/settings.php:153
+#: templates/settings.php:159
 msgid "Import Root Certificate"
 msgstr "Kök Sertifikalarını İçe Aktar"
diff --git a/l10n/tr/files_trashbin.po b/l10n/tr/files_trashbin.po
index bce1ba1a18c553d435afc3c919b4744a77920065..02db6edc713e3b21e85f43b0dac809abb9198d9b 100644
--- a/l10n/tr/files_trashbin.po
+++ b/l10n/tr/files_trashbin.po
@@ -3,12 +3,13 @@
 # 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-02-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 10:07+0000\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: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -17,52 +18,64 @@ msgstr ""
 "Language: tr\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/delete.php:22
+#: ajax/delete.php:40
 #, php-format
 msgid "Couldn't delete %s permanently"
-msgstr ""
+msgstr "%s Kalıcı olarak silinemedi"
 
 #: ajax/undelete.php:41
 #, php-format
 msgid "Couldn't restore %s"
-msgstr ""
+msgstr "%s Geri yüklenemedi"
 
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
 msgid "perform restore operation"
-msgstr ""
+msgstr "Geri yükleme işlemini gerçekleştir"
 
-#: js/trash.js:33
+#: js/trash.js:34
 msgid "delete file permanently"
-msgstr ""
+msgstr "Dosyayı kalıcı olarak sil"
+
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr "Kalıcı olarak sil"
 
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:174 templates/index.php:17
 msgid "Name"
 msgstr "İsim"
 
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:175 templates/index.php:27
 msgid "Deleted"
-msgstr ""
+msgstr "Silindi"
 
-#: js/trash.js:135
+#: js/trash.js:184
 msgid "1 folder"
 msgstr "1 dizin"
 
-#: js/trash.js:137
+#: js/trash.js:186
 msgid "{count} folders"
 msgstr "{count} dizin"
 
-#: js/trash.js:145
+#: js/trash.js:194
 msgid "1 file"
 msgstr "1 dosya"
 
-#: js/trash.js:147
+#: js/trash.js:196
 msgid "{count} files"
 msgstr "{count} dosya"
 
 #: templates/index.php:9
 msgid "Nothing in here. Your trash bin is empty!"
-msgstr ""
+msgstr "Burası boş. Çöp kutun tamamen boş."
 
 #: templates/index.php:20 templates/index.php:22
 msgid "Restore"
+msgstr "Geri yükle"
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr "Sil"
+
+#: templates/part.breadcrumb.php:9
+msgid "Deleted Files"
 msgstr ""
diff --git a/l10n/tr/files_versions.po b/l10n/tr/files_versions.po
index 73c00cd9cf18780d7746baea6b0062d3ee3a97e2..3dd6bcc23bf994eeb5867c944eb62d31586f43a3 100644
--- a/l10n/tr/files_versions.po
+++ b/l10n/tr/files_versions.po
@@ -4,12 +4,13 @@
 # 
 # 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-08 00:10+0100\n"
-"PO-Revision-Date: 2013-02-07 23:11+0000\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"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -21,46 +22,38 @@ msgstr ""
 #: ajax/rollbackVersion.php:15
 #, php-format
 msgid "Could not revert: %s"
-msgstr ""
+msgstr "Geri alınamıyor: %s"
 
 #: history.php:40
 msgid "success"
-msgstr ""
+msgstr "Başarılı."
 
 #: history.php:42
 #, php-format
 msgid "File %s was reverted to version %s"
-msgstr ""
+msgstr "Dosya %s, %s versiyonuna döndürüldü"
 
 #: history.php:49
 msgid "failure"
-msgstr ""
+msgstr "hata"
 
 #: history.php:51
 #, php-format
 msgid "File %s could not be reverted to version %s"
-msgstr ""
+msgstr "Dosya %s, %s versiyonuna döndürülemedi."
 
 #: history.php:68
 msgid "No old versions available"
-msgstr ""
+msgstr "Eski versiyonlar mevcut değil."
 
 #: history.php:73
 msgid "No path specified"
-msgstr ""
+msgstr "Yama belirtilmemiş"
 
-#: js/versions.js:16
-msgid "History"
-msgstr "Geçmiş"
+#: js/versions.js:6
+msgid "Versions"
+msgstr "Sürümler"
 
 #: templates/history.php:20
 msgid "Revert a file to a previous version by clicking on its revert button"
 msgstr ""
-
-#: templates/settings.php:3
-msgid "Files Versioning"
-msgstr "Dosya Sürümleri"
-
-#: templates/settings.php:4
-msgid "Enable"
-msgstr "Etkinleştir"
diff --git a/l10n/tr/lib.po b/l10n/tr/lib.po
index 0694caefa4887767cd0b02f2601e1d017c8cffb1..d11aba5798cc1a48f0d3b325994289720a86fee4 100644
--- a/l10n/tr/lib.po
+++ b/l10n/tr/lib.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-11 15:39+0100\n"
-"PO-Revision-Date: 2013-02-11 14:40+0000\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: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -19,27 +19,27 @@ msgstr ""
 "Language: tr\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: app.php:339
+#: app.php:349
 msgid "Help"
 msgstr "Yardı"
 
-#: app.php:346
+#: app.php:362
 msgid "Personal"
 msgstr "Kişisel"
 
-#: app.php:351
+#: app.php:373
 msgid "Settings"
 msgstr "Ayarlar"
 
-#: app.php:356
+#: app.php:385
 msgid "Users"
 msgstr "Kullanıcılar"
 
-#: app.php:363
+#: app.php:398
 msgid "Apps"
 msgstr "Uygulamalar"
 
-#: app.php:365
+#: app.php:406
 msgid "Admin"
 msgstr "Yönetici"
 
@@ -51,15 +51,15 @@ msgstr "ZIP indirmeleri kapatılmıştır."
 msgid "Files need to be downloaded one by one."
 msgstr "Dosyaların birer birer indirilmesi gerekmektedir."
 
-#: files.php:203 files.php:228
+#: files.php:204 files.php:231
 msgid "Back to Files"
 msgstr "Dosyalara dön"
 
-#: files.php:227
+#: files.php:228
 msgid "Selected files too large to generate zip file."
 msgstr "Seçilen dosyalar bir zip dosyası oluşturmak için fazla büyüktür."
 
-#: helper.php:226
+#: helper.php:228
 msgid "couldn't be determined"
 msgstr "tespit edilemedi"
 
@@ -99,87 +99,92 @@ msgstr ""
 msgid "Specify a data folder."
 msgstr ""
 
-#: setup.php:53
+#: setup.php:55
 #, php-format
 msgid "%s enter the database username."
 msgstr ""
 
-#: setup.php:56
+#: setup.php:58
 #, php-format
 msgid "%s enter the database name."
 msgstr ""
 
-#: setup.php:59
+#: setup.php:61
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr ""
 
-#: setup.php:62
+#: setup.php:64
 #, php-format
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:126 setup.php:291 setup.php:336
+#: setup.php:128 setup.php:320 setup.php:365
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:127 setup.php:150 setup.php:204
+#: setup.php:129 setup.php:152 setup.php:229
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:149 setup.php:423 setup.php:489
+#: setup.php:151 setup.php:453 setup.php:520
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:203
+#: setup.php:228
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:255 setup.php:357 setup.php:366 setup.php:384 setup.php:394
-#: setup.php:403 setup.php:430 setup.php:496 setup.php:522 setup.php:529
-#: setup.php:540 setup.php:547 setup.php:556 setup.php:564 setup.php:573
-#: setup.php:579
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:256 setup.php:358 setup.php:367 setup.php:385 setup.php:395
-#: setup.php:404 setup.php:431 setup.php:497 setup.php:523 setup.php:530
-#: setup.php:541 setup.php:557 setup.php:565 setup.php:574
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:270
+#: setup.php:299
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:271
+#: setup.php:300
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:276
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:277
+#: setup.php:306
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:548 setup.php:580
+#: setup.php:579 setup.php:611
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:644
+#: setup.php:631
+#, php-format
+msgid "MS SQL username and/or password not valid: %s"
+msgstr ""
+
+#: setup.php:849
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:645
+#: setup.php:850
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
@@ -236,16 +241,16 @@ msgstr "geçen yıl"
 msgid "years ago"
 msgstr "yıl önce"
 
-#: updater.php:75
+#: 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:77
+#: updater.php:81
 msgid "up to date"
 msgstr "güncel"
 
-#: updater.php:80
+#: updater.php:84
 msgid "updates check is disabled"
 msgstr "güncelleme kontrolü kapalı"
 
diff --git a/l10n/tr/settings.po b/l10n/tr/settings.po
index 6fc21c7bed50be72c4932d0dad6283c6c26ab8ac..43a285d6b95bb68bdddbbccb948ad3df1ef89fa4 100644
--- a/l10n/tr/settings.po
+++ b/l10n/tr/settings.po
@@ -3,16 +3,17 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Aranel Surion <aranel@aranelsurion.org>, 2011, 2012.
+# 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.
 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:05+0000\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: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -25,14 +26,14 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "App Store'dan liste yüklenemiyor"
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:15
-#: ajax/togglegroups.php:18
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr "Eşleşme hata"
 
 #: ajax/changedisplayname.php:32
 msgid "Unable to change display name"
-msgstr ""
+msgstr "Ekran adı değiştirilemiyor"
 
 #: ajax/creategroup.php:10
 msgid "Group already exists"
@@ -72,25 +73,25 @@ msgstr "Geçersiz istek"
 
 #: ajax/togglegroups.php:12
 msgid "Admins can't remove themself from the admin group"
-msgstr ""
+msgstr "Yöneticiler kendilerini yönetici grubundan kaldıramaz"
 
-#: ajax/togglegroups.php:28
+#: ajax/togglegroups.php:30
 #, php-format
 msgid "Unable to add user to group %s"
 msgstr "Kullanıcı %s grubuna eklenemiyor"
 
-#: ajax/togglegroups.php:34
+#: ajax/togglegroups.php:36
 #, php-format
 msgid "Unable to remove user from group %s"
-msgstr ""
+msgstr "%s grubundan kullanıcı kaldırılamıyor"
 
 #: ajax/updateapp.php:14
 msgid "Couldn't update app."
-msgstr ""
+msgstr "Uygulama güncellenemedi."
 
 #: js/apps.js:30
 msgid "Update to {appversion}"
-msgstr ""
+msgstr "{appversion} Güncelle"
 
 #: js/apps.js:36 js/apps.js:76
 msgid "Disable"
@@ -102,15 +103,15 @@ msgstr "Etkin"
 
 #: js/apps.js:55
 msgid "Please wait...."
-msgstr ""
+msgstr "Lütfen bekleyin...."
 
 #: js/apps.js:84
 msgid "Updating...."
-msgstr ""
+msgstr "Güncelleniyor...."
 
 #: js/apps.js:87
 msgid "Error while updating app"
-msgstr ""
+msgstr "Uygulama güncellenirken hata"
 
 #: js/apps.js:87
 msgid "Error"
@@ -118,9 +119,9 @@ msgstr "Hata"
 
 #: js/apps.js:90
 msgid "Updated"
-msgstr ""
+msgstr "Güncellendi"
 
-#: js/personal.js:96
+#: js/personal.js:99
 msgid "Saving..."
 msgstr "Kaydediliyor..."
 
@@ -134,7 +135,7 @@ msgstr "geri al"
 
 #: js/users.js:62
 msgid "Unable to remove user"
-msgstr ""
+msgstr "Kullanıcı kaldırılamıyor"
 
 #: js/users.js:75 templates/users.php:26 templates/users.php:80
 #: templates/users.php:105
@@ -149,23 +150,23 @@ msgstr "Yönetici Grubu "
 msgid "Delete"
 msgstr "Sil"
 
-#: js/users.js:190
+#: js/users.js:191
 msgid "add group"
-msgstr ""
+msgstr "grup ekle"
 
-#: js/users.js:351
+#: js/users.js:352
 msgid "A valid username must be provided"
-msgstr ""
+msgstr "Geçerli bir kullanıcı adı mutlaka sağlanmalı"
 
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
 msgid "Error creating user"
-msgstr ""
+msgstr "Kullanıcı oluşturulurken hata"
 
-#: js/users.js:357
+#: js/users.js:358
 msgid "A valid password must be provided"
-msgstr ""
+msgstr "Geçerli bir parola mutlaka sağlanmalı"
 
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
 msgid "__language_name__"
 msgstr "__dil_adı__"
 
@@ -184,7 +185,7 @@ msgstr "data dizininiz ve dosyalarınız büyük ihtimalle internet üzerinden e
 
 #: templates/admin.php:29
 msgid "Setup Warning"
-msgstr ""
+msgstr "Kurulum Uyarısı"
 
 #: templates/admin.php:32
 msgid ""
@@ -199,7 +200,7 @@ msgstr ""
 
 #: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
-msgstr ""
+msgstr "Modül 'fileinfo' kayıp"
 
 #: templates/admin.php:47
 msgid ""
@@ -211,19 +212,19 @@ msgstr ""
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:61
+#: templates/admin.php:63
+#, php-format
 msgid ""
-"This ownCloud server can't set system locale to "
-"\"en_US.UTF-8\"/\"en_US.UTF8\". 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 en_US.UTF-8/en_US.UTF8."
+"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:72
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:75
+#: 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 "
@@ -233,98 +234,98 @@ msgid ""
 " of ownCloud."
 msgstr ""
 
-#: templates/admin.php:89
+#: templates/admin.php:92
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:98
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:108
+#: 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:118
+#: 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:125
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:131
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:132
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:140
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:147
+#: templates/admin.php:150
 msgid "Allow resharing"
-msgstr ""
+msgstr "Paylaşıma izin ver"
 
-#: templates/admin.php:148
+#: templates/admin.php:151
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:155
+#: templates/admin.php:158
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:161
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:165
+#: templates/admin.php:168
 msgid "Security"
-msgstr ""
+msgstr "Güvenlik"
 
-#: templates/admin.php:178
+#: templates/admin.php:181
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:179
+#: templates/admin.php:182
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:182
+#: templates/admin.php:185
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr ""
 
-#: templates/admin.php:192
+#: templates/admin.php:195
 msgid "Log"
-msgstr ""
+msgstr "Kayıtlar"
 
-#: templates/admin.php:193
+#: templates/admin.php:196
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:220
+#: templates/admin.php:223
 msgid "More"
 msgstr "Daha fazla"
 
-#: templates/admin.php:227 templates/personal.php:98
+#: templates/admin.php:230 templates/personal.php:102
 msgid "Version"
 msgstr "Sürüm"
 
-#: templates/admin.php:230 templates/personal.php:100
+#: templates/admin.php:233 templates/personal.php:105
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -334,51 +335,51 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "Geliştirilen Taraf<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is altında lisanslanmıştır <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
-#: templates/apps.php:10
+#: templates/apps.php:11
 msgid "Add your App"
 msgstr "Uygulamanı Ekle"
 
-#: templates/apps.php:11
+#: templates/apps.php:12
 msgid "More Apps"
-msgstr "Daha fazla App"
+msgstr "Daha fazla uygulama"
 
-#: templates/apps.php:24
+#: templates/apps.php:28
 msgid "Select an App"
 msgstr "Bir uygulama seçin"
 
-#: templates/apps.php:28
+#: templates/apps.php:34
 msgid "See application page at apps.owncloud.com"
 msgstr "Uygulamanın sayfasına apps.owncloud.com adresinden bakın "
 
-#: templates/apps.php:29
+#: templates/apps.php:36
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
-msgstr ""
+msgstr "<span class=\"licence\"></span>-lisanslayan <span class=\"author\"></span>"
 
-#: templates/apps.php:31
+#: templates/apps.php:38
 msgid "Update"
 msgstr "Güncelleme"
 
-#: templates/help.php:3
+#: templates/help.php:4
 msgid "User Documentation"
 msgstr "Kullanıcı Belgelendirmesi"
 
-#: templates/help.php:4
+#: templates/help.php:6
 msgid "Administrator Documentation"
 msgstr "Yönetici Belgelendirmesi"
 
-#: templates/help.php:6
+#: templates/help.php:9
 msgid "Online Documentation"
 msgstr "Çevrimiçi Belgelendirme"
 
-#: templates/help.php:7
+#: templates/help.php:11
 msgid "Forum"
 msgstr "Forum"
 
-#: templates/help.php:9
+#: templates/help.php:14
 msgid "Bugtracker"
 msgstr "Hata Takip Sistemi"
 
-#: templates/help.php:11
+#: templates/help.php:17
 msgid "Commercial Support"
 msgstr "Ticari Destek"
 
@@ -387,85 +388,85 @@ msgstr "Ticari Destek"
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:14
+#: templates/personal.php:15
 msgid "Get the apps to sync your files"
-msgstr ""
+msgstr "Dosyalarınızı senkronize etmek için uygulamayı indirin"
 
-#: templates/personal.php:25
+#: templates/personal.php:26
 msgid "Show First Run Wizard again"
-msgstr ""
+msgstr "İlk Çalıştırma Sihirbazını yeniden göster"
 
-#: templates/personal.php:36 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
 msgid "Password"
 msgstr "Parola"
 
-#: templates/personal.php:37
+#: templates/personal.php:38
 msgid "Your password was changed"
 msgstr "Şifreniz değiştirildi"
 
-#: templates/personal.php:38
+#: templates/personal.php:39
 msgid "Unable to change your password"
 msgstr "Parolanız değiştirilemiyor"
 
-#: templates/personal.php:39
+#: templates/personal.php:40
 msgid "Current password"
 msgstr "Mevcut parola"
 
-#: templates/personal.php:40
+#: templates/personal.php:42
 msgid "New password"
 msgstr "Yeni parola"
 
-#: templates/personal.php:42
+#: templates/personal.php:44
 msgid "Change password"
 msgstr "Parola değiştir"
 
-#: templates/personal.php:54 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:78
 msgid "Display Name"
-msgstr ""
+msgstr "Ekran Adı"
 
-#: templates/personal.php:55
+#: templates/personal.php:57
 msgid "Your display name was changed"
-msgstr ""
+msgstr "Ekran adınız değiştirildi"
 
-#: templates/personal.php:56
+#: templates/personal.php:58
 msgid "Unable to change your display name"
-msgstr ""
+msgstr "Ekran adınız değiştirilemiyor"
 
-#: templates/personal.php:59
+#: templates/personal.php:61
 msgid "Change display name"
-msgstr ""
+msgstr "Ekran adını değiştir"
 
-#: templates/personal.php:68
+#: templates/personal.php:70
 msgid "Email"
 msgstr "Eposta"
 
-#: templates/personal.php:69
+#: templates/personal.php:72
 msgid "Your email address"
 msgstr "Eposta adresiniz"
 
-#: templates/personal.php:70
+#: templates/personal.php:73
 msgid "Fill in an email address to enable password recovery"
 msgstr "Parola sıfırlamayı aktifleştirmek için eposta adresi girin"
 
-#: templates/personal.php:76 templates/personal.php:77
+#: templates/personal.php:79 templates/personal.php:80
 msgid "Language"
 msgstr "Dil"
 
-#: templates/personal.php:82
+#: templates/personal.php:86
 msgid "Help translate"
 msgstr "Çevirilere yardım edin"
 
-#: templates/personal.php:87
+#: templates/personal.php:91
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:89
+#: templates/personal.php:93
 msgid "Use this address to connect to your ownCloud in your file manager"
-msgstr ""
+msgstr "Bu adresi kullanarak ownCloud 'unuza dosya yöneticinizde bağlanın"
 
 #: templates/users.php:21 templates/users.php:77
 msgid "Login Name"
-msgstr ""
+msgstr "Giriş Adı"
 
 #: templates/users.php:32
 msgid "Create"
@@ -473,11 +474,11 @@ msgstr "Oluştur"
 
 #: templates/users.php:35
 msgid "Default Storage"
-msgstr ""
+msgstr "Varsayılan Depolama"
 
 #: templates/users.php:41 templates/users.php:139
 msgid "Unlimited"
-msgstr ""
+msgstr "Limitsiz"
 
 #: templates/users.php:59 templates/users.php:154
 msgid "Other"
@@ -485,16 +486,16 @@ msgstr "Diğer"
 
 #: templates/users.php:84
 msgid "Storage"
-msgstr ""
+msgstr "Depolama"
 
 #: templates/users.php:95
 msgid "change display name"
-msgstr ""
+msgstr "ekran adını değiştir"
 
 #: templates/users.php:99
 msgid "set new password"
-msgstr ""
+msgstr "yeni parola belirle"
 
 #: templates/users.php:134
 msgid "Default"
-msgstr ""
+msgstr "Varsayılan"
diff --git a/l10n/tr/user_ldap.po b/l10n/tr/user_ldap.po
index 8cdf1507e90ca465c49e77a87c584f336ebfec8c..3fd47b502e2a451c506e21c4c3bfd7ec4bd2a44b 100644
--- a/l10n/tr/user_ldap.po
+++ b/l10n/tr/user_ldap.po
@@ -4,12 +4,13 @@
 # 
 # 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-08 00:10+0100\n"
-"PO-Revision-Date: 2013-02-07 23:11+0000\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: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -22,17 +23,17 @@ msgstr ""
 msgid "Failed to delete the server configuration"
 msgstr ""
 
-#: ajax/testConfiguration.php:35
+#: ajax/testConfiguration.php:36
 msgid "The configuration is valid and the connection could be established!"
 msgstr ""
 
-#: ajax/testConfiguration.php:37
+#: ajax/testConfiguration.php:39
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
 msgstr ""
 
-#: ajax/testConfiguration.php:40
+#: ajax/testConfiguration.php:43
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
@@ -48,7 +49,7 @@ msgstr ""
 
 #: js/settings.js:83
 msgid "Keep settings?"
-msgstr ""
+msgstr "Ayarları kalsınmı?"
 
 #: js/settings.js:97
 msgid "Cannot add server configuration"
@@ -56,11 +57,11 @@ msgstr ""
 
 #: js/settings.js:121
 msgid "Connection test succeeded"
-msgstr ""
+msgstr "Bağlantı testi başarılı oldu"
 
 #: js/settings.js:126
 msgid "Connection test failed"
-msgstr ""
+msgstr "Bağlantı testi başarısız oldu"
 
 #: js/settings.js:136
 msgid "Do you really want to delete the current Server Configuration?"
@@ -68,7 +69,7 @@ msgstr ""
 
 #: js/settings.js:137
 msgid "Confirm Deletion"
-msgstr ""
+msgstr "Silmeyi onayla"
 
 #: templates/settings.php:8
 msgid ""
@@ -87,224 +88,248 @@ msgstr ""
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:17
+#: templates/settings.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:23
 msgid "Host"
-msgstr "Konak"
+msgstr "Sunucu"
 
-#: templates/settings.php:21
+#: templates/settings.php:25
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:26
 msgid "Base DN"
-msgstr "Base DN"
+msgstr "Ana DN"
 
-#: templates/settings.php:22
+#: templates/settings.php:27
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:28
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "User DN"
-msgstr "User DN"
+msgstr "Kullanıcı DN"
 
-#: templates/settings.php:23
+#: templates/settings.php:32
 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:24
+#: templates/settings.php:33
 msgid "Password"
 msgstr "Parola"
 
-#: templates/settings.php:24
+#: templates/settings.php:36
 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:25
+#: templates/settings.php:37
 msgid "User Login Filter"
-msgstr "Kullanıcı Oturum Açma Süzgeci"
+msgstr "Kullanıcı Oturum Filtresi"
 
-#: templates/settings.php:25
+#: templates/settings.php:40
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:41
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "%%uid yer tutucusunu kullanın, örneğin \"uid=%%uid\""
 
-#: templates/settings.php:26
+#: templates/settings.php:42
 msgid "User List Filter"
-msgstr "Kullanıcı Liste Süzgeci"
+msgstr "Kullanıcı Liste Filtresi"
 
-#: templates/settings.php:26
+#: templates/settings.php:45
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:46
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "bir yer tutucusu olmadan, örneğin \"objectClass=person\""
 
-#: templates/settings.php:27
+#: templates/settings.php:47
 msgid "Group Filter"
 msgstr "Grup Süzgeci"
 
-#: templates/settings.php:27
+#: templates/settings.php:50
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:51
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:55
 msgid "Connection Settings"
-msgstr ""
+msgstr "Bağlantı ayarları"
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:34
+#: templates/settings.php:58
 msgid "Port"
 msgstr "Port"
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:60
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "Disable Main Server"
-msgstr ""
+msgstr "Ana sunucuyu devredışı birak"
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Use TLS"
 msgstr "TLS kullan"
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:39
+#: templates/settings.php:63
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid "Turn off SSL certificate validation."
 msgstr "SSL sertifika doğrulamasını kapat."
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid "Not recommended, use for testing only."
 msgstr "Önerilmez, sadece test için kullanın."
 
-#: templates/settings.php:41
+#: templates/settings.php:65
+msgid "Cache Time-To-Live"
+msgstr ""
+
+#: templates/settings.php:65
 msgid "in seconds. A change empties the cache."
 msgstr "saniye cinsinden. Bir değişiklik önbelleği temizleyecektir."
 
-#: templates/settings.php:43
+#: templates/settings.php:67
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "Base User Tree"
 msgstr "Temel Kullanıcı Ağacı"
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:47
+#: templates/settings.php:71
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:47 templates/settings.php:50
+#: templates/settings.php:71 templates/settings.php:74
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "Base Group Tree"
 msgstr "Temel Grup Ağacı"
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:74
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:75
 msgid "Group-Member association"
 msgstr "Grup-Üye işbirliği"
 
-#: templates/settings.php:53
+#: templates/settings.php:77
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:79
+msgid "Quota Field"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Quota Default"
+msgstr ""
+
+#: templates/settings.php:80
 msgid "in bytes"
 msgstr "byte cinsinden"
 
-#: templates/settings.php:58
+#: templates/settings.php:81
+msgid "Email Field"
+msgstr ""
+
+#: templates/settings.php:82
+msgid "User Home Folder Naming Rule"
+msgstr ""
+
+#: templates/settings.php:82
 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:62
+#: templates/settings.php:86
+msgid "Test Configuration"
+msgstr ""
+
+#: templates/settings.php:86
 msgid "Help"
 msgstr "Yardım"
diff --git a/l10n/tr/user_webdavauth.po b/l10n/tr/user_webdavauth.po
index 912a2ff24d2baefa7958a22c6042de8017769efe..f5f060e198ce141eeb8eb7f42abaf3f0d89718e5 100644
--- a/l10n/tr/user_webdavauth.po
+++ b/l10n/tr/user_webdavauth.po
@@ -5,13 +5,14 @@
 # Translators:
 #   <info@beyboo.de>, 2012.
 # 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-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-02-19 00:05+0100\n"
+"PO-Revision-Date: 2013-02-18 20:10+0000\n"
+"Last-Translator: atakan96 <tayancatakan@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"
@@ -21,13 +22,13 @@ msgstr ""
 
 #: templates/settings.php:3
 msgid "WebDAV Authentication"
-msgstr ""
+msgstr "WebDAV Kimlik doğrulaması"
 
 #: 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 "
diff --git a/l10n/uk/core.po b/l10n/uk/core.po
index 3c922b2b2b564c9c8d43bddbf45c8c74f83166c2..54ed07e8816070811d7597f554970a12d219f9e6 100644
--- a/l10n/uk/core.po
+++ b/l10n/uk/core.po
@@ -13,9 +13,9 @@ 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 14:32+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "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"
@@ -58,7 +58,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
@@ -392,7 +392,7 @@ msgstr "Оновлення виконалось неуспішно. Будь л
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Оновлення виконалось успішно. Перенаправляємо вас на  ownCloud."
 
-#: lostpassword/controller.php:47
+#: lostpassword/controller.php:48
 msgid "ownCloud password reset"
 msgstr "скидання пароля ownCloud"
 
@@ -493,14 +493,14 @@ msgstr "Без безпечного генератора випадкових ч
 msgid ""
 "Your data directory and files are probably accessible from the internet "
 "because the .htaccess file does not work."
-msgstr ""
+msgstr "Ваші дані каталогів і файлів, ймовірно, доступні з інтернету, тому що  .htaccess файл не працює."
 
 #: templates/installation.php:32
 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
 msgid "Create an <strong>admin account</strong>"
diff --git a/l10n/uk/files.po b/l10n/uk/files.po
index 6eeb4c0aa47e7b44b98dbb19c418c8d7deda40c9..58aae0590c5f06920f533d03dfb9db76dbe4ad1e 100644
--- a/l10n/uk/files.po
+++ b/l10n/uk/files.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-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "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"
@@ -24,16 +24,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 ""
+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"
@@ -54,27 +54,27 @@ msgid ""
 "the HTML form"
 msgstr "Розмір відвантаженого файлу перевищує директиву MAX_FILE_SIZE вказану в HTML формі"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
 msgstr "Файл відвантажено лише частково"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:31
 msgid "No file was uploaded"
 msgstr "Не відвантажено жодного файлу"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:32
 msgid "Missing a temporary folder"
 msgstr "Відсутній тимчасовий каталог"
 
-#: ajax/upload.php:34
+#: ajax/upload.php:33
 msgid "Failed to write to disk"
 msgstr "Невдалося записати на диск"
 
-#: ajax/upload.php:52
+#: ajax/upload.php:51
 msgid "Not enough storage available"
-msgstr ""
+msgstr "Місця більше немає"
 
-#: ajax/upload.php:83
+#: ajax/upload.php:82
 msgid "Invalid directory."
 msgstr "Невірний каталог."
 
@@ -86,7 +86,7 @@ msgstr "Файли"
 msgid "Delete permanently"
 msgstr "Видалити назавжди"
 
-#: js/fileactions.js:127 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:127 templates/index.php:92 templates/index.php:93
 msgid "Delete"
 msgstr "Видалити"
 
@@ -94,40 +94,36 @@ msgstr "Видалити"
 msgid "Rename"
 msgstr "Перейменувати"
 
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
 msgid "Pending"
 msgstr "Очікування"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "{new_name} already exists"
 msgstr "{new_name} вже існує"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "replace"
 msgstr "заміна"
 
-#: js/filelist.js:253
+#: js/filelist.js:251
 msgid "suggest name"
 msgstr "запропонуйте назву"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "cancel"
 msgstr "відміна"
 
-#: js/filelist.js:295
-msgid "replaced {new_name}"
-msgstr "замінено {new_name}"
+#: js/filelist.js:298
+msgid "replaced {new_name} with {old_name}"
+msgstr "замінено {new_name} на {old_name}"
 
-#: js/filelist.js:295 js/filelist.js:297
+#: js/filelist.js:298
 msgid "undo"
 msgstr "відмінити"
 
-#: js/filelist.js:297
-msgid "replaced {new_name} with {old_name}"
-msgstr "замінено {new_name} на {old_name}"
-
-#: js/filelist.js:322
+#: js/filelist.js:323
 msgid "perform delete operation"
 msgstr "виконати операцію видалення"
 
@@ -153,74 +149,74 @@ msgstr "Ваше сховище переповнене, файли більше
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Ваше сховище майже повне ({usedSpacePercent}%)"
 
-#: js/files.js:224
+#: js/files.js:225
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Ваше завантаження готується. Це може зайняти деякий час, якщо файли завеликі."
 
-#: js/files.js:261
+#: js/files.js:262
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Неможливо завантажити ваш файл тому, що він тека або файл розміром 0 байт"
 
-#: js/files.js:261
+#: js/files.js:262
 msgid "Upload Error"
 msgstr "Помилка завантаження"
 
-#: js/files.js:272
+#: js/files.js:273
 msgid "Close"
 msgstr "Закрити"
 
-#: js/files.js:311
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr "1 файл завантажується"
 
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr "{count} файлів завантажується"
 
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "Завантаження перервано."
 
-#: js/files.js:496
+#: js/files.js:497
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Виконується завантаження файлу. Закриття цієї сторінки приведе до відміни завантаження."
 
-#: js/files.js:569
+#: js/files.js:570
 msgid "URL cannot be empty."
 msgstr "URL не може бути пустим."
 
-#: js/files.js:574
+#: js/files.js:575
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Невірне ім'я теки. Використання \"Shared\" зарезервовано Owncloud"
 
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:953 templates/index.php:68
 msgid "Name"
 msgstr "Ім'я"
 
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:954 templates/index.php:79
 msgid "Size"
 msgstr "Розмір"
 
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:955 templates/index.php:81
 msgid "Modified"
 msgstr "Змінено"
 
-#: js/files.js:969
+#: js/files.js:974
 msgid "1 folder"
 msgstr "1 папка"
 
-#: js/files.js:971
+#: js/files.js:976
 msgid "{count} folders"
 msgstr "{count} папок"
 
-#: js/files.js:979
+#: js/files.js:984
 msgid "1 file"
 msgstr "1 файл"
 
-#: js/files.js:981
+#: js/files.js:986
 msgid "{count} files"
 msgstr "{count} файлів"
 
@@ -278,39 +274,43 @@ msgstr "З посилання"
 
 #: templates/index.php:40
 msgid "Deleted files"
-msgstr ""
+msgstr "Видалено файлів"
 
 #: templates/index.php:46
 msgid "Cancel upload"
 msgstr "Перервати завантаження"
 
-#: templates/index.php:59
+#: templates/index.php:53
+msgid "You don’t have write permissions here."
+msgstr "У вас тут немає прав на запис."
+
+#: templates/index.php:60
 msgid "Nothing in here. Upload something!"
 msgstr "Тут нічого немає. Відвантажте що-небудь!"
 
-#: templates/index.php:73
+#: templates/index.php:74
 msgid "Download"
 msgstr "Завантажити"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:86 templates/index.php:87
 msgid "Unshare"
 msgstr "Заборонити доступ"
 
-#: templates/index.php:105
+#: templates/index.php:106
 msgid "Upload too large"
 msgstr "Файл занадто великий"
 
-#: templates/index.php:107
+#: templates/index.php:108
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Файли,що ви намагаєтесь відвантажити перевищують максимальний дозволений розмір файлів на цьому сервері."
 
-#: templates/index.php:112
+#: templates/index.php:113
 msgid "Files are being scanned, please wait."
 msgstr "Файли скануються, зачекайте, будь-ласка."
 
-#: templates/index.php:115
+#: templates/index.php:116
 msgid "Current scanning"
 msgstr "Поточне сканування"
 
diff --git a/l10n/uk/files_encryption.po b/l10n/uk/files_encryption.po
index 1ee566098007cfa9683e6def77bd021d1135d4db..f0341a7e32ca2e9f8297a8213713ec4b2f620706 100644
--- a/l10n/uk/files_encryption.po
+++ b/l10n/uk/files_encryption.po
@@ -4,13 +4,14 @@
 # 
 # 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-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-02-19 00:05+0100\n"
+"PO-Revision-Date: 2013-02-18 16:40+0000\n"
+"Last-Translator: volodya327 <volodya327@gmail.com>\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"
@@ -24,15 +25,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/uk/files_external.po b/l10n/uk/files_external.po
index dc8a15861878b402be07d2295a91fc7e70f95348..1936a470772cf0c8c4cc4eacdfc0b087e3efc86c 100644
--- a/l10n/uk/files_external.po
+++ b/l10n/uk/files_external.po
@@ -5,12 +5,13 @@
 # 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: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-12 15:37+0000\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"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -19,37 +20,33 @@ 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"
 
-#: 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 "Помилка при налаштуванні сховища Dropbox"
 
-#: 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 "Будь ласка, надайте дійсний ключ та пароль Dropbox."
 
-#: 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 "Помилка при налаштуванні сховища Google Drive"
 
-#: lib/config.php:434
+#: lib/config.php:421
 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:435
+#: lib/config.php:424
 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 "
@@ -60,63 +57,63 @@ msgstr "<b>Попередження:</b> Підтримка FTP в PHP не ув
 msgid "External Storage"
 msgstr "Зовнішні сховища"
 
-#: templates/settings.php:8 templates/settings.php:22
-msgid "Mount point"
-msgstr "Точка монтування"
-
-#: templates/settings.php:9
-msgid "Backend"
-msgstr "Backend"
+#: 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: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"
-msgstr "Додати точку монтування"
+#: 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 "Користувачі"
 
-#: 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 "Видалити"
 
-#: 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 "SSL корневі сертифікати"
 
-#: templates/settings.php:158
+#: templates/settings.php:159
 msgid "Import Root Certificate"
 msgstr "Імпортувати корневі сертифікати"
diff --git a/l10n/uk/files_trashbin.po b/l10n/uk/files_trashbin.po
index d2cbb893abc43f5156dfd29fea664540bb6dfecc..c722965153b80291a37ad705d89a4cc260e35e40 100644
--- a/l10n/uk/files_trashbin.po
+++ b/l10n/uk/files_trashbin.po
@@ -3,12 +3,13 @@
 # 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-02-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 10:07+0000\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: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -17,52 +18,64 @@ 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:22
+#: ajax/delete.php:40
 #, php-format
 msgid "Couldn't delete %s permanently"
-msgstr ""
+msgstr "Неможливо видалити %s назавжди"
 
 #: ajax/undelete.php:41
 #, php-format
 msgid "Couldn't restore %s"
-msgstr ""
+msgstr "Неможливо відновити %s"
 
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
 msgid "perform restore operation"
-msgstr ""
+msgstr "виконати операцію відновлення"
 
-#: js/trash.js:33
+#: js/trash.js:34
 msgid "delete file permanently"
-msgstr ""
+msgstr "видалити файл назавжди"
+
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr "Видалити назавжди"
 
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:174 templates/index.php:17
 msgid "Name"
 msgstr "Ім'я"
 
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:175 templates/index.php:27
 msgid "Deleted"
-msgstr ""
+msgstr "Видалено"
 
-#: js/trash.js:135
+#: js/trash.js:184
 msgid "1 folder"
 msgstr "1 папка"
 
-#: js/trash.js:137
+#: js/trash.js:186
 msgid "{count} folders"
 msgstr "{count} папок"
 
-#: js/trash.js:145
+#: js/trash.js:194
 msgid "1 file"
 msgstr "1 файл"
 
-#: js/trash.js:147
+#: js/trash.js:196
 msgid "{count} files"
 msgstr "{count} файлів"
 
 #: templates/index.php:9
 msgid "Nothing in here. Your trash bin is empty!"
-msgstr ""
+msgstr "Нічого немає. Ваший кошик для сміття пустий!"
 
 #: templates/index.php:20 templates/index.php:22
 msgid "Restore"
+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/uk/files_versions.po b/l10n/uk/files_versions.po
index a511f9ae55720db9f1e155d4d60fd45994ed223d..57d0fd1f10c97020c8b1d9f546844e76b7a676da 100644
--- a/l10n/uk/files_versions.po
+++ b/l10n/uk/files_versions.po
@@ -4,13 +4,14 @@
 # 
 # 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-08 00:10+0100\n"
-"PO-Revision-Date: 2013-02-07 23:11+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "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"
@@ -21,46 +22,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:16
-msgid "History"
-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 ""
-
-#: templates/settings.php:3
-msgid "Files Versioning"
-msgstr "Версії файлів"
-
-#: templates/settings.php:4
-msgid "Enable"
-msgstr "Включити"
+msgstr "Відновити файл на попередню версію, натиснувши на кнопку Відновити"
diff --git a/l10n/uk/lib.po b/l10n/uk/lib.po
index 6380af6fb3db111be39c3c1514cec5d54a32dcba..3c4943397c87baa0087da141a09285922dd81d15 100644
--- a/l10n/uk/lib.po
+++ b/l10n/uk/lib.po
@@ -7,13 +7,14 @@
 #   <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-02-11 15:39+0100\n"
-"PO-Revision-Date: 2013-02-11 14:40+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "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"
@@ -21,27 +22,27 @@ msgstr ""
 "Language: uk\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: app.php:339
+#: app.php:349
 msgid "Help"
 msgstr "Допомога"
 
-#: app.php:346
+#: app.php:362
 msgid "Personal"
 msgstr "Особисте"
 
-#: app.php:351
+#: app.php:373
 msgid "Settings"
 msgstr "Налаштування"
 
-#: app.php:356
+#: app.php:385
 msgid "Users"
 msgstr "Користувачі"
 
-#: app.php:363
+#: app.php:398
 msgid "Apps"
 msgstr "Додатки"
 
-#: app.php:365
+#: app.php:406
 msgid "Admin"
 msgstr "Адмін"
 
@@ -53,15 +54,15 @@ msgstr "ZIP завантаження вимкнено."
 msgid "Files need to be downloaded one by one."
 msgstr "Файли повинні бути завантаженні послідовно."
 
-#: files.php:203 files.php:228
+#: files.php:204 files.php:231
 msgid "Back to Files"
 msgstr "Повернутися до файлів"
 
-#: files.php:227
+#: files.php:228
 msgid "Selected files too large to generate zip file."
 msgstr "Вибрані фали завеликі для генерування zip файлу."
 
-#: helper.php:226
+#: helper.php:228
 msgid "couldn't be determined"
 msgstr "не може бути визначено"
 
@@ -91,100 +92,105 @@ msgstr "Зображення"
 
 #: setup.php:34
 msgid "Set an admin username."
-msgstr ""
+msgstr "Встановіть ім'я адміністратора."
 
 #: setup.php:37
 msgid "Set an admin password."
-msgstr ""
+msgstr "Встановіть пароль адміністратора."
 
 #: setup.php:40
 msgid "Specify a data folder."
-msgstr ""
+msgstr "Вкажіть теку для даних."
 
-#: setup.php:53
+#: setup.php:55
 #, php-format
 msgid "%s enter the database username."
-msgstr ""
+msgstr "%s введіть ім'я користувача бази даних."
 
-#: setup.php:56
+#: setup.php:58
 #, php-format
 msgid "%s enter the database name."
-msgstr ""
+msgstr "%s введіть назву бази даних."
 
-#: setup.php:59
+#: setup.php:61
 #, php-format
 msgid "%s you may not use dots in the database name"
-msgstr ""
+msgstr "%s не можна використовувати крапки в назві бази даних"
 
-#: setup.php:62
+#: setup.php:64
 #, php-format
 msgid "%s set the database host."
-msgstr ""
+msgstr "%s встановити хост бази даних."
 
-#: setup.php:126 setup.php:291 setup.php:336
+#: setup.php:128 setup.php:320 setup.php:365
 msgid "PostgreSQL username and/or password not valid"
-msgstr ""
+msgstr "PostgreSQL ім'я користувача та/або пароль не дійсні"
 
-#: setup.php:127 setup.php:150 setup.php:204
+#: setup.php:129 setup.php:152 setup.php:229
 msgid "You need to enter either an existing account or the administrator."
-msgstr ""
+msgstr "Вам потрібно ввести або існуючий обліковий запис або administrator."
 
-#: setup.php:149 setup.php:423 setup.php:489
+#: setup.php:151 setup.php:453 setup.php:520
 msgid "Oracle username and/or password not valid"
-msgstr ""
+msgstr "Oracle ім'я користувача та/або пароль не дійсні"
 
-#: setup.php:203
+#: setup.php:228
 msgid "MySQL username and/or password not valid"
-msgstr ""
+msgstr "MySQL ім'я користувача та/або пароль не дійсні"
 
-#: setup.php:255 setup.php:357 setup.php:366 setup.php:384 setup.php:394
-#: setup.php:403 setup.php:430 setup.php:496 setup.php:522 setup.php:529
-#: setup.php:540 setup.php:547 setup.php:556 setup.php:564 setup.php:573
-#: setup.php:579
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
-msgstr ""
+msgstr "Помилка БД: \"%s\""
 
-#: setup.php:256 setup.php:358 setup.php:367 setup.php:385 setup.php:395
-#: setup.php:404 setup.php:431 setup.php:497 setup.php:523 setup.php:530
-#: setup.php:541 setup.php:557 setup.php:565 setup.php:574
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
-msgstr ""
+msgstr "Команда, що викликала проблему: \"%s\""
 
-#: setup.php:270
+#: setup.php:299
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
-msgstr ""
+msgstr "Користувач MySQL '%s'@'localhost' вже існує."
 
-#: setup.php:271
+#: setup.php:300
 msgid "Drop this user from MySQL"
-msgstr ""
+msgstr "Видалити цього користувача з MySQL"
 
-#: setup.php:276
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
-msgstr ""
+msgstr "Користувач MySQL '%s'@'%%' вже існує"
 
-#: setup.php:277
+#: setup.php:306
 msgid "Drop this user from MySQL."
-msgstr ""
+msgstr "Видалити цього користувача з MySQL."
 
-#: setup.php:548 setup.php:580
+#: setup.php:579 setup.php:611
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
-msgstr ""
+msgstr "Команда, що викликала проблему: \"%s\", ім'я: %s, пароль: %s"
+
+#: setup.php:631
+#, php-format
+msgid "MS SQL username and/or password not valid: %s"
+msgstr "MS SQL ім'я користувача та/або пароль не дійсні: %s"
 
-#: setup.php:644
+#: setup.php:849
 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:645
+#: setup.php:850
 #, 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"
@@ -238,16 +244,16 @@ msgstr "минулого року"
 msgid "years ago"
 msgstr "роки тому"
 
-#: updater.php:75
+#: updater.php:78
 #, php-format
 msgid "%s is available. Get <a href=\"%s\">more information</a>"
 msgstr "%s доступно. Отримати <a href=\"%s\">детальну інформацію</a>"
 
-#: updater.php:77
+#: updater.php:81
 msgid "up to date"
 msgstr "оновлено"
 
-#: updater.php:80
+#: updater.php:84
 msgid "updates check is disabled"
 msgstr "перевірка оновлень відключена"
 
diff --git a/l10n/uk/settings.po b/l10n/uk/settings.po
index 8023ecb8b181812595cffec98b09a0fdb432e43e..dd232bdd1ec726562f16e59c0830106cb3908adf 100644
--- a/l10n/uk/settings.po
+++ b/l10n/uk/settings.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 23:05+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "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,8 +25,8 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "Не вдалося завантажити список з App Store"
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:15
-#: ajax/togglegroups.php:18
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr "Помилка автентифікації"
 
@@ -74,12 +74,12 @@ 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 "Не вдалося додати користувача у групу %s"
 
-#: ajax/togglegroups.php:34
+#: ajax/togglegroups.php:36
 #, php-format
 msgid "Unable to remove user from group %s"
 msgstr "Не вдалося видалити користувача із групи %s"
@@ -120,7 +120,7 @@ msgstr "Помилка"
 msgid "Updated"
 msgstr "Оновлено"
 
-#: js/personal.js:96
+#: js/personal.js:99
 msgid "Saving..."
 msgstr "Зберігаю..."
 
@@ -134,7 +134,7 @@ msgstr "відмінити"
 
 #: js/users.js:62
 msgid "Unable to remove user"
-msgstr ""
+msgstr "Неможливо видалити користувача"
 
 #: js/users.js:75 templates/users.php:26 templates/users.php:80
 #: templates/users.php:105
@@ -149,23 +149,23 @@ msgstr "Адміністратор групи"
 msgid "Delete"
 msgstr "Видалити"
 
-#: js/users.js:190
+#: js/users.js:191
 msgid "add group"
-msgstr ""
+msgstr "додати групу"
 
-#: js/users.js:351
+#: js/users.js:352
 msgid "A valid username must be provided"
-msgstr ""
+msgstr "Потрібно задати вірне ім'я користувача"
 
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
 msgid "Error creating user"
-msgstr ""
+msgstr "Помилка при створенні користувача"
 
-#: js/users.js:357
+#: js/users.js:358
 msgid "A valid password must be provided"
-msgstr ""
+msgstr "Потрібно задати вірний пароль"
 
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -184,46 +184,46 @@ 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 "Ваш 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-типів."
 
 #: templates/admin.php:58
 msgid "Locale not working"
-msgstr ""
+msgstr "Локалізація не працює"
 
-#: templates/admin.php:61
+#: templates/admin.php:63
+#, php-format
 msgid ""
-"This ownCloud server can't set system locale to "
-"\"en_US.UTF-8\"/\"en_US.UTF8\". 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 en_US.UTF-8/en_US.UTF8."
-msgstr ""
+"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 "Цей сервер ownCloud не може встановити мову системи %s. Це означає, що можуть бути проблеми з деякими символами в іменах файлів. Ми наполегливо рекомендуємо встановити необхідні пакети у вашій системі для підтримки %s."
 
-#: templates/admin.php:72
+#: templates/admin.php:75
 msgid "Internet connection not working"
-msgstr ""
+msgstr "Інтернет-з'єднання не працює"
 
-#: templates/admin.php:75
+#: 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 "
@@ -231,100 +231,100 @@ 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:89
+#: templates/admin.php:92
 msgid "Cron"
-msgstr ""
+msgstr "Cron"
 
-#: templates/admin.php:98
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
-msgstr ""
+msgstr "Виконати одне завдання для кожної завантаженої сторінки "
 
-#: templates/admin.php:108
+#: 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 кожну хвилину по http."
 
-#: templates/admin.php:118
+#: 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:125
+#: templates/admin.php:128
 msgid "Sharing"
-msgstr ""
+msgstr "Спільний доступ"
 
-#: templates/admin.php:131
+#: templates/admin.php:134
 msgid "Enable Share API"
-msgstr ""
+msgstr "Увімкнути API спільного доступу"
 
-#: templates/admin.php:132
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
-msgstr ""
+msgstr "Дозволити програмам використовувати API спільного доступу"
 
-#: templates/admin.php:139
+#: templates/admin.php:142
 msgid "Allow links"
-msgstr ""
+msgstr "Дозволити посилання"
 
-#: templates/admin.php:140
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
-msgstr ""
+msgstr "Дозволити користувачам відкривати спільний доступ до елементів за допомогою посилань"
 
-#: templates/admin.php:147
+#: templates/admin.php:150
 msgid "Allow resharing"
-msgstr ""
+msgstr "Дозволити перевідкривати спільний доступ"
 
-#: templates/admin.php:148
+#: templates/admin.php:151
 msgid "Allow users to share items shared with them again"
-msgstr ""
+msgstr "Дозволити користувачам знову відкривати спільний доступ до елементів, які вже відкриті для доступу"
 
-#: templates/admin.php:155
+#: templates/admin.php:158
 msgid "Allow users to share with anyone"
-msgstr ""
+msgstr "Дозволити користувачам відкривати спільний доступ для всіх"
 
-#: templates/admin.php:158
+#: templates/admin.php:161
 msgid "Allow users to only share with users in their groups"
-msgstr ""
+msgstr "Дозволити користувачам відкривати спільний доступ лише для користувачів з їхньої групи"
 
-#: templates/admin.php:165
+#: templates/admin.php:168
 msgid "Security"
-msgstr ""
+msgstr "Безпека"
 
-#: templates/admin.php:178
+#: templates/admin.php:181
 msgid "Enforce HTTPS"
-msgstr ""
+msgstr "Примусове застосування HTTPS"
 
-#: templates/admin.php:179
+#: templates/admin.php:182
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
-msgstr ""
+msgstr "Зобов'язати клієнтів під'єднуватись до ownCloud через шифроване з'єднання."
 
-#: templates/admin.php:182
+#: 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:192
+#: templates/admin.php:195
 msgid "Log"
-msgstr ""
+msgstr "Протокол"
 
-#: templates/admin.php:193
+#: templates/admin.php:196
 msgid "Log level"
-msgstr ""
+msgstr "Рівень протоколювання"
 
-#: templates/admin.php:220
+#: templates/admin.php:223
 msgid "More"
 msgstr "Більше"
 
-#: templates/admin.php:227 templates/personal.php:98
+#: templates/admin.php:230 templates/personal.php:102
 msgid "Version"
 msgstr "Версія"
 
-#: templates/admin.php:230 templates/personal.php:100
+#: templates/admin.php:233 templates/personal.php:105
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -334,51 +334,51 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "Розроблено <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud громадою</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">вихідний код</a> має ліцензію <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
-#: templates/apps.php:10
+#: templates/apps.php:11
 msgid "Add your App"
 msgstr "Додати свою програму"
 
-#: templates/apps.php:11
+#: templates/apps.php:12
 msgid "More Apps"
 msgstr "Більше програм"
 
-#: templates/apps.php:24
+#: templates/apps.php:28
 msgid "Select an App"
 msgstr "Вибрати додаток"
 
-#: templates/apps.php:28
+#: templates/apps.php:34
 msgid "See application page at apps.owncloud.com"
 msgstr "Перегляньте сторінку програм на apps.owncloud.com"
 
-#: templates/apps.php:29
+#: 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>"
 
-#: templates/apps.php:31
+#: templates/apps.php:38
 msgid "Update"
 msgstr "Оновити"
 
-#: templates/help.php:3
+#: 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 "Комерційна підтримка"
 
@@ -387,79 +387,79 @@ msgstr "Комерційна підтримка"
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Ви використали <strong>%s</strong> із доступних <strong>%s</strong>"
 
-#: templates/personal.php:14
+#: templates/personal.php:15
 msgid "Get the apps to sync your files"
-msgstr ""
+msgstr "Отримати додатки для синхронізації ваших файлів"
 
-#: templates/personal.php:25
+#: templates/personal.php:26
 msgid "Show First Run Wizard again"
-msgstr ""
+msgstr "Показувати Майстер Налаштувань знову"
 
-#: templates/personal.php:36 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
 msgid "Password"
 msgstr "Пароль"
 
-#: templates/personal.php:37
+#: templates/personal.php:38
 msgid "Your password was changed"
 msgstr "Ваш пароль змінено"
 
-#: templates/personal.php:38
+#: templates/personal.php:39
 msgid "Unable to change your password"
 msgstr "Не вдалося змінити Ваш пароль"
 
-#: templates/personal.php:39
+#: templates/personal.php:40
 msgid "Current password"
 msgstr "Поточний пароль"
 
-#: templates/personal.php:40
+#: templates/personal.php:42
 msgid "New password"
 msgstr "Новий пароль"
 
-#: templates/personal.php:42
+#: templates/personal.php:44
 msgid "Change password"
 msgstr "Змінити пароль"
 
-#: templates/personal.php:54 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:78
 msgid "Display Name"
 msgstr "Показати Ім'я"
 
-#: templates/personal.php:55
+#: templates/personal.php:57
 msgid "Your display name was changed"
 msgstr "Ваше ім'я було змінене"
 
-#: templates/personal.php:56
+#: templates/personal.php:58
 msgid "Unable to change your display name"
 msgstr "Неможливо змінити ваше зображене ім'я"
 
-#: templates/personal.php:59
+#: templates/personal.php:61
 msgid "Change display name"
 msgstr "Змінити зображене ім'я"
 
-#: templates/personal.php:68
+#: templates/personal.php:70
 msgid "Email"
 msgstr "Ел.пошта"
 
-#: templates/personal.php:69
+#: templates/personal.php:72
 msgid "Your email address"
 msgstr "Ваша адреса електронної пошти"
 
-#: templates/personal.php:70
+#: templates/personal.php:73
 msgid "Fill in an email address to enable password recovery"
 msgstr "Введіть адресу електронної пошти для відновлення паролю"
 
-#: templates/personal.php:76 templates/personal.php:77
+#: templates/personal.php:79 templates/personal.php:80
 msgid "Language"
 msgstr "Мова"
 
-#: templates/personal.php:82
+#: templates/personal.php:86
 msgid "Help translate"
 msgstr "Допомогти з перекладом"
 
-#: templates/personal.php:87
+#: templates/personal.php:91
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:89
+#: templates/personal.php:93
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "Використовуйте цю адресу для під'єднання до вашого ownCloud у вашому файловому менеджері"
 
diff --git a/l10n/uk/user_ldap.po b/l10n/uk/user_ldap.po
index 2b1bfc0ad9d683ab50142a990318b45c61044ff2..c520e5395365f0aac21f4911400a12fc333bf21a 100644
--- a/l10n/uk/user_ldap.po
+++ b/l10n/uk/user_ldap.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-08 00:10+0100\n"
-"PO-Revision-Date: 2013-02-07 23:11+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "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"
@@ -24,17 +24,17 @@ msgstr ""
 msgid "Failed to delete the server configuration"
 msgstr "Не вдалося видалити конфігурацію сервера"
 
-#: ajax/testConfiguration.php:35
+#: ajax/testConfiguration.php:36
 msgid "The configuration is valid and the connection could be established!"
 msgstr "Конфігурація вірна і зв'язок може бути встановлений ​​!"
 
-#: ajax/testConfiguration.php:37
+#: ajax/testConfiguration.php:39
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
 msgstr "Конфігурація вірна, але встановити зв'язок не вдалося. Будь ласка, перевірте налаштування сервера і облікові дані."
 
-#: ajax/testConfiguration.php:40
+#: ajax/testConfiguration.php:43
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
@@ -89,224 +89,248 @@ msgstr "<b>Увага:</ b> Потрібний модуль PHP LDAP не вст
 msgid "Server configuration"
 msgstr "Налаштування Сервера"
 
-#: templates/settings.php:17
+#: templates/settings.php:18
 msgid "Add Server Configuration"
 msgstr "Додати налаштування Сервера"
 
-#: templates/settings.php:21
+#: templates/settings.php:23
 msgid "Host"
 msgstr "Хост"
 
-#: templates/settings.php:21
+#: templates/settings.php:25
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "Можна не вказувати протокол, якщо вам не потрібен SSL. Тоді почніть з ldaps://"
 
-#: templates/settings.php:22
+#: templates/settings.php:26
 msgid "Base DN"
 msgstr "Базовий DN"
 
-#: templates/settings.php:22
+#: templates/settings.php:27
 msgid "One Base DN per line"
 msgstr "Один Base DN на одній строчці"
 
-#: templates/settings.php:22
+#: templates/settings.php:28
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "Ви можете задати Базовий DN для користувачів і груп на вкладинці Додатково"
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "User DN"
 msgstr "DN Користувача"
 
-#: templates/settings.php:23
+#: templates/settings.php:32
 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:24
+#: templates/settings.php:33
 msgid "Password"
 msgstr "Пароль"
 
-#: templates/settings.php:24
+#: templates/settings.php:36
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "Для анонімного доступу, залиште DN і Пароль порожніми."
 
-#: templates/settings.php:25
+#: templates/settings.php:37
 msgid "User Login Filter"
 msgstr "Фільтр Користувачів, що під'єднуються"
 
-#: templates/settings.php:25
+#: templates/settings.php:40
 #, 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:25
+#: templates/settings.php:41
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "використовуйте %%uid заповнювач, наприклад: \"uid=%%uid\""
 
-#: templates/settings.php:26
+#: templates/settings.php:42
 msgid "User List Filter"
 msgstr "Фільтр Списку Користувачів"
 
-#: templates/settings.php:26
+#: templates/settings.php:45
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Визначає фільтр, який застосовується при отриманні користувачів"
 
-#: templates/settings.php:26
+#: templates/settings.php:46
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "без будь-якого заповнювача, наприклад: \"objectClass=person\"."
 
-#: templates/settings.php:27
+#: templates/settings.php:47
 msgid "Group Filter"
 msgstr "Фільтр Груп"
 
-#: templates/settings.php:27
+#: templates/settings.php:50
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Визначає фільтр, який застосовується при отриманні груп."
 
-#: templates/settings.php:27
+#: templates/settings.php:51
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "без будь-якого заповнювача, наприклад: \"objectClass=posixGroup\"."
 
-#: templates/settings.php:31
+#: templates/settings.php:55
 msgid "Connection Settings"
-msgstr ""
+msgstr "Налаштування З'єднання"
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "Configuration Active"
 msgstr "Налаштування Активне"
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "When unchecked, this configuration will be skipped."
 msgstr "Якщо \"галочка\" знята, ця конфігурація буде пропущена."
 
-#: templates/settings.php:34
+#: templates/settings.php:58
 msgid "Port"
 msgstr "Порт"
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid "Backup (Replica) Host"
-msgstr ""
+msgstr "Сервер для резервних копій"
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
-msgstr ""
+msgstr "Вкажіть додатковий резервний сервер. Він повинен бути копією головного LDAP/AD сервера."
 
-#: templates/settings.php:36
+#: templates/settings.php:60
 msgid "Backup (Replica) Port"
-msgstr ""
+msgstr "Порт сервера для резервних копій"
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "Disable Main Server"
-msgstr ""
+msgstr "Вимкнути Головний Сервер"
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "When switched on, ownCloud will only connect to the replica server."
-msgstr ""
+msgstr "Коли увімкнуто, ownCloud  буде приєднуватись лише до сервера з резервними копіями."
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Use TLS"
 msgstr "Використовуйте TLS"
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Do not use it additionally for LDAPS connections, it will fail."
-msgstr ""
+msgstr "Не використовуйте це додатково для під'єднання до LDAP, бо виконано не буде."
 
-#: templates/settings.php:39
+#: templates/settings.php:63
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Нечутливий до регістру LDAP сервер (Windows)"
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid "Turn off SSL certificate validation."
 msgstr "Вимкнути перевірку SSL сертифіката."
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 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:40
+#: templates/settings.php:64
 msgid "Not recommended, use for testing only."
 msgstr "Не рекомендується, використовуйте лише для тестів."
 
-#: templates/settings.php:41
+#: templates/settings.php:65
+msgid "Cache Time-To-Live"
+msgstr "Час актуальності Кеша"
+
+#: templates/settings.php:65
 msgid "in seconds. A change empties the cache."
 msgstr "в секундах. Зміна очищує кеш."
 
-#: templates/settings.php:43
+#: templates/settings.php:67
 msgid "Directory Settings"
-msgstr ""
+msgstr "Налаштування Каталога"
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "User Display Name Field"
 msgstr "Поле, яке відображає Ім'я Користувача"
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "Атрибут LDAP, який використовується для генерації імен користувачів ownCloud."
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "Base User Tree"
 msgstr "Основне Дерево Користувачів"
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "One User Base DN per line"
 msgstr "Один Користувач Base DN на одній строчці"
 
-#: templates/settings.php:47
+#: templates/settings.php:71
 msgid "User Search Attributes"
-msgstr ""
+msgstr "Пошукові Атрибути Користувача"
 
-#: templates/settings.php:47 templates/settings.php:50
+#: templates/settings.php:71 templates/settings.php:74
 msgid "Optional; one attribute per line"
-msgstr ""
+msgstr "Додатково; один атрибут на строчку"
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "Group Display Name Field"
 msgstr "Поле, яке відображає Ім'я Групи"
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "Атрибут LDAP, який використовується для генерації імен груп ownCloud."
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "Base Group Tree"
 msgstr "Основне Дерево Груп"
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "One Group Base DN per line"
 msgstr "Одна Група Base DN на одній строчці"
 
-#: templates/settings.php:50
+#: templates/settings.php:74
 msgid "Group Search Attributes"
-msgstr ""
+msgstr "Пошукові Атрибути Групи"
 
-#: templates/settings.php:51
+#: templates/settings.php:75
 msgid "Group-Member association"
 msgstr "Асоціація Група-Член"
 
-#: templates/settings.php:53
+#: templates/settings.php:77
 msgid "Special Attributes"
-msgstr ""
+msgstr "Спеціальні Атрибути"
+
+#: templates/settings.php:79
+msgid "Quota Field"
+msgstr "Поле Квоти"
 
-#: templates/settings.php:56
+#: templates/settings.php:80
+msgid "Quota Default"
+msgstr "Квота за замовчанням"
+
+#: templates/settings.php:80
 msgid "in bytes"
 msgstr "в байтах"
 
-#: templates/settings.php:58
+#: templates/settings.php:81
+msgid "Email Field"
+msgstr "Поле Ел. пошти"
+
+#: templates/settings.php:82
+msgid "User Home Folder Naming Rule"
+msgstr "Правило іменування домашньої теки користувача"
+
+#: templates/settings.php:82
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Залиште порожнім для імені користувача (за замовчанням). Інакше, вкажіть атрибут LDAP/AD."
 
-#: templates/settings.php:62
+#: templates/settings.php:86
+msgid "Test Configuration"
+msgstr "Тестове налаштування"
+
+#: templates/settings.php:86
 msgid "Help"
 msgstr "Допомога"
diff --git a/l10n/uk/user_webdavauth.po b/l10n/uk/user_webdavauth.po
index eec04d63355481b9d304238c7e00deb8d2f80b36..59983e502099f5974ec80f20c12ccb5d97e385bc 100644
--- a/l10n/uk/user_webdavauth.po
+++ b/l10n/uk/user_webdavauth.po
@@ -5,13 +5,14 @@
 # Translators:
 #   <skoptev@ukr.net>, 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-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-02-19 00:05+0100\n"
+"PO-Revision-Date: 2013-02-18 16:40+0000\n"
+"Last-Translator: volodya327 <volodya327@gmail.com>\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"
@@ -21,15 +22,15 @@ msgstr ""
 
 #: templates/settings.php:3
 msgid "WebDAV Authentication"
-msgstr ""
+msgstr "Аутентифікація 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 "ownCloud надішле облікові дані на цей URL. Цей плагін перевірить відповідь і буде інтерпретувати HTTP коди 401 і 403 як повідомлення про недійсні повноваження, а решту відповідей як дійсні облікові дані."
diff --git a/l10n/ur_PK/core.po b/l10n/ur_PK/core.po
new file mode 100644
index 0000000000000000000000000000000000000000..e0d59c7ccd0225f2b4b279fa8a42dd885e8d1e3a
--- /dev/null
+++ b/l10n/ur_PK/core.po
@@ -0,0 +1,595 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# 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"
+"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"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ur_PK\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:768
+msgid "seconds ago"
+msgstr ""
+
+#: js/js.js:769
+msgid "1 minute ago"
+msgstr ""
+
+#: js/js.js:770
+msgid "{minutes} minutes ago"
+msgstr ""
+
+#: js/js.js:771
+msgid "1 hour ago"
+msgstr ""
+
+#: js/js.js:772
+msgid "{hours} hours ago"
+msgstr ""
+
+#: js/js.js:773
+msgid "today"
+msgstr ""
+
+#: js/js.js:774
+msgid "yesterday"
+msgstr ""
+
+#: js/js.js:775
+msgid "{days} days ago"
+msgstr ""
+
+#: js/js.js:776
+msgid "last month"
+msgstr ""
+
+#: js/js.js:777
+msgid "{months} months ago"
+msgstr ""
+
+#: js/js.js:778
+msgid "months ago"
+msgstr ""
+
+#: js/js.js:779
+msgid "last year"
+msgstr ""
+
+#: js/js.js:780
+msgid "years ago"
+msgstr ""
+
+#: js/oc-dialogs.js:126
+msgid "Choose"
+msgstr "منتخب کریں"
+
+#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+msgid "Cancel"
+msgstr "منسوخ کریں"
+
+#: js/oc-dialogs.js:162
+msgid "No"
+msgstr "نہیں"
+
+#: js/oc-dialogs.js:163
+msgid "Yes"
+msgstr "ہاں"
+
+#: js/oc-dialogs.js:180
+msgid "Ok"
+msgstr "اوکے"
+
+#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
+#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
+msgid "The object type is not specified."
+msgstr ""
+
+#: js/oc-vcategories.js: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
+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:29 js/share.js:43 js/share.js:90
+msgid "Shared"
+msgstr ""
+
+#: js/share.js:93
+msgid "Share"
+msgstr ""
+
+#: js/share.js:141 js/share.js:622
+msgid "Error while sharing"
+msgstr "شئیرنگ کے دوران ایرر"
+
+#: js/share.js:152
+msgid "Error while unsharing"
+msgstr "شئیرنگ ختم کرنے  کے دوران ایرر"
+
+#: js/share.js:159
+msgid "Error while changing permissions"
+msgstr "اختیارات کو تبدیل کرنے کے دوران ایرر"
+
+#: js/share.js:168
+msgid "Shared with you and the group {group} by {owner}"
+msgstr ""
+
+#: js/share.js:170
+msgid "Shared with you by {owner}"
+msgstr ""
+
+#: js/share.js:175
+msgid "Share with"
+msgstr "اس کے ساتھ شئیر کریں"
+
+#: js/share.js:180
+msgid "Share with link"
+msgstr "لنک کے ساتھ شئیر کریں"
+
+#: js/share.js:183
+msgid "Password protect"
+msgstr "پاسورڈ سے محفوظ کریں"
+
+#: js/share.js:185 templates/installation.php:47 templates/login.php:35
+msgid "Password"
+msgstr "پاسورڈ"
+
+#: js/share.js:189
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:190
+msgid "Send"
+msgstr ""
+
+#: js/share.js:194
+msgid "Set expiration date"
+msgstr "تاریخ معیاد سیٹ کریں"
+
+#: js/share.js:195
+msgid "Expiration date"
+msgstr "تاریخ معیاد"
+
+#: js/share.js:227
+msgid "Share via email:"
+msgstr ""
+
+#: js/share.js:229
+msgid "No people found"
+msgstr "کوئی لوگ نہیں ملے۔"
+
+#: js/share.js:256
+msgid "Resharing is not allowed"
+msgstr "دوبارہ شئیر کرنے کی اجازت نہیں"
+
+#: js/share.js:292
+msgid "Shared in {item} with {user}"
+msgstr ""
+
+#: js/share.js:313
+msgid "Unshare"
+msgstr "شئیرنگ ختم کریں"
+
+#: js/share.js:325
+msgid "can edit"
+msgstr "ایڈٹ کر سکے"
+
+#: js/share.js:327
+msgid "access control"
+msgstr "اسیس کنٹرول"
+
+#: js/share.js:330
+msgid "create"
+msgstr "نیا بنائیں"
+
+#: js/share.js:333
+msgid "update"
+msgstr "اپ ڈیٹ"
+
+#: js/share.js:336
+msgid "delete"
+msgstr "ختم کریں"
+
+#: js/share.js:339
+msgid "share"
+msgstr "شئیر کریں"
+
+#: js/share.js:373 js/share.js:569
+msgid "Password protected"
+msgstr "پاسورڈ سے محفوظ کیا گیا ہے"
+
+#: js/share.js:582
+msgid "Error unsetting expiration date"
+msgstr ""
+
+#: js/share.js:594
+msgid "Error setting expiration date"
+msgstr ""
+
+#: js/share.js:609
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:620
+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 "اپنا پاسورڈ ری سیٹ کرنے کے لیے اس لنک پر کلک کریں۔  {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."
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:8
+msgid "Request failed!"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:41
+#: templates/login.php:28
+msgid "Username"
+msgstr "یوزر نیم"
+
+#: lostpassword/templates/lostpassword.php:14
+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
+msgid "Security Warning"
+msgstr ""
+
+#: templates/installation.php:25
+msgid ""
+"No secure random number generator is available, please enable the PHP "
+"OpenSSL extension."
+msgstr ""
+
+#: templates/installation.php:26
+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
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
+#: templates/installation.php:33
+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
+msgid "Create an <strong>admin account</strong>"
+msgstr "ایک<strong> ایڈمن اکاؤنٹ</strong> بنائیں"
+
+#: templates/installation.php:55
+msgid "Advanced"
+msgstr "ایڈوانسڈ"
+
+#: templates/installation.php:57
+msgid "Data folder"
+msgstr "ڈیٹا فولڈر"
+
+#: templates/installation.php:66
+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
+msgid "will be used"
+msgstr "استعمال ہو گا"
+
+#: templates/installation.php:129
+msgid "Database user"
+msgstr "ڈیٹابیس یوزر"
+
+#: templates/installation.php:134
+msgid "Database password"
+msgstr "ڈیٹابیس پاسورڈ"
+
+#: templates/installation.php:139
+msgid "Database name"
+msgstr "ڈیٹابیس کا نام"
+
+#: templates/installation.php:149
+msgid "Database tablespace"
+msgstr "ڈیٹابیس ٹیبل سپیس"
+
+#: templates/installation.php:156
+msgid "Database host"
+msgstr "ڈیٹابیس ہوسٹ"
+
+#: templates/installation.php:162
+msgid "Finish setup"
+msgstr "سیٹ اپ ختم کریں"
+
+#: templates/layout.guest.php:35
+msgid "web services under your control"
+msgstr "آپ کے اختیار میں ویب سروسیز"
+
+#: templates/layout.user.php:53
+msgid "Log out"
+msgstr "لاگ آؤٹ"
+
+#: templates/login.php:10
+msgid "Automatic logon rejected!"
+msgstr ""
+
+#: templates/login.php:11
+msgid ""
+"If you did not change your password recently, your account may be "
+"compromised!"
+msgstr ""
+
+#: templates/login.php:13
+msgid "Please change your password to secure your account again."
+msgstr ""
+
+#: templates/login.php:19
+msgid "Lost your password?"
+msgstr "کیا آپ پاسورڈ بھول گئے ہیں؟"
+
+#: templates/login.php:41
+msgid "remember"
+msgstr "یاد رکھیں"
+
+#: templates/login.php:43
+msgid "Log in"
+msgstr "لاگ ان"
+
+#: templates/login.php:49
+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/ur_PK/files.po b/l10n/ur_PK/files.po
new file mode 100644
index 0000000000000000000000000000000000000000..f331a7fa8a8aa249a0f1da81a71a6bbd866a192b
--- /dev/null
+++ b/l10n/ur_PK/files.po
@@ -0,0 +1,315 @@
+# 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-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: 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"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ur_PK\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/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 ""
+
+#: 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:82
+msgid "Invalid directory."
+msgstr ""
+
+#: appinfo/app.php:10
+msgid "Files"
+msgstr ""
+
+#: js/fileactions.js:125
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:127 templates/index.php:92 templates/index.php:93
+msgid "Delete"
+msgstr ""
+
+#: js/fileactions.js:193
+msgid "Rename"
+msgstr ""
+
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
+msgid "Pending"
+msgstr ""
+
+#: js/filelist.js:251 js/filelist.js:253
+msgid "{new_name} already exists"
+msgstr ""
+
+#: js/filelist.js:251 js/filelist.js:253
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:251
+msgid "suggest name"
+msgstr ""
+
+#: js/filelist.js:251 js/filelist.js:253
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:298
+msgid "replaced {new_name} with {old_name}"
+msgstr ""
+
+#: js/filelist.js:298
+msgid "undo"
+msgstr ""
+
+#: js/filelist.js:323
+msgid "perform delete operation"
+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:225
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
+
+#: js/files.js:262
+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"
+msgstr ""
+
+#: js/files.js:388 js/files.js:423
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:497
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/files.js:570
+msgid "URL cannot be empty."
+msgstr ""
+
+#: js/files.js:575
+msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
+msgstr ""
+
+#: js/files.js:953 templates/index.php:68
+msgid "Name"
+msgstr ""
+
+#: js/files.js:954 templates/index.php:79
+msgid "Size"
+msgstr ""
+
+#: js/files.js:955 templates/index.php:81
+msgid "Modified"
+msgstr ""
+
+#: js/files.js:974
+msgid "1 folder"
+msgstr ""
+
+#: js/files.js:976
+msgid "{count} folders"
+msgstr ""
+
+#: js/files.js:984
+msgid "1 file"
+msgstr ""
+
+#: js/files.js:986
+msgid "{count} files"
+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:40
+msgid "Deleted files"
+msgstr ""
+
+#: templates/index.php:46
+msgid "Cancel upload"
+msgstr ""
+
+#: templates/index.php:53
+msgid "You don’t have write permissions here."
+msgstr ""
+
+#: templates/index.php:60
+msgid "Nothing in here. Upload something!"
+msgstr ""
+
+#: templates/index.php:74
+msgid "Download"
+msgstr ""
+
+#: templates/index.php:86 templates/index.php:87
+msgid "Unshare"
+msgstr ""
+
+#: templates/index.php:106
+msgid "Upload too large"
+msgstr ""
+
+#: templates/index.php:108
+msgid ""
+"The files you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: templates/index.php:113
+msgid "Files are being scanned, please wait."
+msgstr ""
+
+#: templates/index.php:116
+msgid "Current scanning"
+msgstr ""
+
+#: templates/upgrade.php:2
+msgid "Upgrading filesystem cache..."
+msgstr ""
diff --git a/l10n/ur_PK/files_encryption.po b/l10n/ur_PK/files_encryption.po
new file mode 100644
index 0000000000000000000000000000000000000000..d945e7ba70d2c255e196ae921791fddc6aa3a7a5
--- /dev/null
+++ b/l10n/ur_PK/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-02-26 00:04+0100\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ur_PK\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/ur_PK/files_external.po b/l10n/ur_PK/files_external.po
new file mode 100644
index 0000000000000000000000000000000000000000..e9bdbedc1196fedbcb0bfee847746cbe6bd7029f
--- /dev/null
+++ b/l10n/ur_PK/files_external.po
@@ -0,0 +1,116 @@
+# 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-02-28 00:04+0100\n"
+"PO-Revision-Date: 2013-02-27 23:04+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: 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"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ur_PK\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:421
+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
+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 ""
+
+#: 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/ur_PK/files_sharing.po b/l10n/ur_PK/files_sharing.po
new file mode 100644
index 0000000000000000000000000000000000000000..bf96aabc4599264666fbc4b39985918d407ed4df
--- /dev/null
+++ b/l10n/ur_PK/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-02-27 00:08+0100\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ur_PK\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:37
+msgid "Download"
+msgstr ""
+
+#: templates/public.php:34
+msgid "No preview available for"
+msgstr ""
+
+#: templates/public.php:43
+msgid "web services under your control"
+msgstr "آپ کے اختیار میں ویب سروسیز"
diff --git a/l10n/ur_PK/files_trashbin.po b/l10n/ur_PK/files_trashbin.po
new file mode 100644
index 0000000000000000000000000000000000000000..89afda771afe20f8c9a9af8703a9d9f1d6c1a341
--- /dev/null
+++ b/l10n/ur_PK/files_trashbin.po
@@ -0,0 +1,80 @@
+# 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-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: 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"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ur_PK\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/delete.php:40
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:41
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/trash.js:7 js/trash.js:96
+msgid "perform restore operation"
+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/ur_PK/files_versions.po b/l10n/ur_PK/files_versions.po
new file mode 100644
index 0000000000000000000000000000000000000000..f2a9b38da54dc38e2301def533d722b59ef80b91
--- /dev/null
+++ b/l10n/ur_PK/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-02-28 00:04+0100\n"
+"PO-Revision-Date: 2013-02-27 23:04+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: 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"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ur_PK\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:68
+msgid "No old versions available"
+msgstr ""
+
+#: history.php:73
+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/ur_PK/lib.po b/l10n/ur_PK/lib.po
new file mode 100644
index 0000000000000000000000000000000000000000..88660467ae64a001e51abbdf7714ea18c551da94
--- /dev/null
+++ b/l10n/ur_PK/lib.po
@@ -0,0 +1,258 @@
+# 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-02-27 14:35+0100\n"
+"PO-Revision-Date: 2013-02-27 13:36+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"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ur_PK\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:202
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: files.php:203
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: files.php:204 files.php:231
+msgid "Back to Files"
+msgstr ""
+
+#: files.php:228
+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:40
+msgid "Specify a data folder."
+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:128 setup.php:320 setup.php:365
+msgid "PostgreSQL username and/or password not valid"
+msgstr ""
+
+#: setup.php:129 setup.php:152 setup.php:229
+msgid "You need to enter either an existing account or the administrator."
+msgstr ""
+
+#: setup.php:151 setup.php:453 setup.php:520
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:228
+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
+#, 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
+#, php-format
+msgid "Offending command was: \"%s\""
+msgstr ""
+
+#: setup.php:299
+#, php-format
+msgid "MySQL user '%s'@'localhost' exists already."
+msgstr ""
+
+#: setup.php:300
+msgid "Drop this user from MySQL"
+msgstr ""
+
+#: setup.php:305
+#, php-format
+msgid "MySQL user '%s'@'%%' already exists"
+msgstr ""
+
+#: setup.php:306
+msgid "Drop this user from MySQL."
+msgstr ""
+
+#: setup.php:579 setup.php:611
+#, php-format
+msgid "Offending command was: \"%s\", name: %s, password: %s"
+msgstr ""
+
+#: setup.php:631
+#, php-format
+msgid "MS SQL username and/or password not valid: %s"
+msgstr ""
+
+#: setup.php:849
+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
+#, 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 ""
+
+#: 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 ""
diff --git a/l10n/ur_PK/settings.po b/l10n/ur_PK/settings.po
new file mode 100644
index 0000000000000000000000000000000000000000..69006ade4028e22dfbdbb31d2fb5c4a6a7d9b7a3
--- /dev/null
+++ b/l10n/ur_PK/settings.po
@@ -0,0 +1,496 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-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: 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"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ur_PK\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:23 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"
+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
+msgid "Enable"
+msgstr ""
+
+#: js/apps.js:55
+msgid "Please wait...."
+msgstr ""
+
+#: js/apps.js:84
+msgid "Updating...."
+msgstr ""
+
+#: js/apps.js:87
+msgid "Error while updating app"
+msgstr ""
+
+#: js/apps.js:87
+msgid "Error"
+msgstr ""
+
+#: js/apps.js:90
+msgid "Updated"
+msgstr ""
+
+#: js/personal.js:99
+msgid "Saving..."
+msgstr ""
+
+#: js/users.js:30
+msgid "deleted"
+msgstr ""
+
+#: js/users.js:30
+msgid "undo"
+msgstr ""
+
+#: js/users.js:62
+msgid "Unable to remove user"
+msgstr ""
+
+#: js/users.js:75 templates/users.php:26 templates/users.php:80
+#: templates/users.php:105
+msgid "Groups"
+msgstr ""
+
+#: js/users.js:78 templates/users.php:82 templates/users.php:119
+msgid "Group Admin"
+msgstr ""
+
+#: js/users.js:99 templates/users.php:161
+msgid "Delete"
+msgstr ""
+
+#: js/users.js:191
+msgid "add group"
+msgstr ""
+
+#: js/users.js:352
+msgid "A valid username must be provided"
+msgstr ""
+
+#: js/users.js:353 js/users.js:359 js/users.js:374
+msgid "Error creating user"
+msgstr ""
+
+#: js/users.js:358
+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:223
+msgid "More"
+msgstr ""
+
+#: templates/admin.php:230 templates/personal.php:102
+msgid "Version"
+msgstr ""
+
+#: templates/admin.php:233 templates/personal.php:105
+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:79
+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:78
+msgid "Display Name"
+msgstr ""
+
+#: templates/personal.php:57
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:58
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:61
+msgid "Change display name"
+msgstr ""
+
+#: templates/personal.php:70
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:72
+msgid "Your email address"
+msgstr ""
+
+#: templates/personal.php:73
+msgid "Fill in an email address to enable password recovery"
+msgstr ""
+
+#: templates/personal.php:79 templates/personal.php:80
+msgid "Language"
+msgstr ""
+
+#: templates/personal.php:86
+msgid "Help translate"
+msgstr ""
+
+#: templates/personal.php:91
+msgid "WebDAV"
+msgstr ""
+
+#: templates/personal.php:93
+msgid "Use this address to connect to your ownCloud in your file manager"
+msgstr ""
+
+#: templates/users.php:21 templates/users.php:77
+msgid "Login Name"
+msgstr ""
+
+#: templates/users.php:32
+msgid "Create"
+msgstr ""
+
+#: templates/users.php:35
+msgid "Default Storage"
+msgstr ""
+
+#: templates/users.php:41 templates/users.php:139
+msgid "Unlimited"
+msgstr ""
+
+#: templates/users.php:59 templates/users.php:154
+msgid "Other"
+msgstr ""
+
+#: templates/users.php:84
+msgid "Storage"
+msgstr ""
+
+#: templates/users.php:95
+msgid "change display name"
+msgstr ""
+
+#: templates/users.php:99
+msgid "set new password"
+msgstr ""
+
+#: templates/users.php:134
+msgid "Default"
+msgstr ""
diff --git a/l10n/ur_PK/user_ldap.po b/l10n/ur_PK/user_ldap.po
new file mode 100644
index 0000000000000000000000000000000000000000..67a700b6057386b37f75e97af17d4b93e65513dc
--- /dev/null
+++ b/l10n/ur_PK/user_ldap.po
@@ -0,0 +1,333 @@
+# 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-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: 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"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ur_PK\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: 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:121
+msgid "Connection test succeeded"
+msgstr ""
+
+#: js/settings.js:126
+msgid "Connection test failed"
+msgstr ""
+
+#: js/settings.js:136
+msgid "Do you really want to delete the current Server Configuration?"
+msgstr ""
+
+#: js/settings.js:137
+msgid "Confirm Deletion"
+msgstr ""
+
+#: templates/settings.php:8
+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
+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
+msgid "Server configuration"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Add Server Configuration"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:25
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:27
+msgid "One Base DN per line"
+msgstr ""
+
+#: templates/settings.php:28
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:30
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:32
+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
+msgid "Password"
+msgstr "پاسورڈ"
+
+#: templates/settings.php:36
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:37
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:40
+#, 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
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:42
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:45
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:46
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:47
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:50
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:51
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:55
+msgid "Connection Settings"
+msgstr ""
+
+#: templates/settings.php:57
+msgid "Configuration Active"
+msgstr ""
+
+#: templates/settings.php:57
+msgid "When unchecked, this configuration will be skipped."
+msgstr ""
+
+#: templates/settings.php:58
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:59
+msgid "Backup (Replica) Host"
+msgstr ""
+
+#: templates/settings.php:59
+msgid ""
+"Give an optional backup host. It must be a replica of the main LDAP/AD "
+"server."
+msgstr ""
+
+#: templates/settings.php:60
+msgid "Backup (Replica) Port"
+msgstr ""
+
+#: templates/settings.php:61
+msgid "Disable Main Server"
+msgstr ""
+
+#: templates/settings.php:61
+msgid "When switched on, ownCloud will only connect to the replica server."
+msgstr ""
+
+#: templates/settings.php:62
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:62
+msgid "Do not use it additionally for LDAPS connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:63
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:64
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:65
+msgid "Cache Time-To-Live"
+msgstr ""
+
+#: templates/settings.php:65
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:67
+msgid "Directory Settings"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:70
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:70
+msgid "One User Base DN per line"
+msgstr ""
+
+#: templates/settings.php:71
+msgid "User Search Attributes"
+msgstr ""
+
+#: templates/settings.php:71 templates/settings.php:74
+msgid "Optional; one attribute per line"
+msgstr ""
+
+#: templates/settings.php:72
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:72
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:73
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:73
+msgid "One Group Base DN per line"
+msgstr ""
+
+#: templates/settings.php:74
+msgid "Group Search Attributes"
+msgstr ""
+
+#: templates/settings.php:75
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:77
+msgid "Special Attributes"
+msgstr ""
+
+#: templates/settings.php:79
+msgid "Quota Field"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Quota Default"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:81
+msgid "Email Field"
+msgstr ""
+
+#: templates/settings.php:82
+msgid "User Home Folder Naming Rule"
+msgstr ""
+
+#: templates/settings.php:82
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:86
+msgid "Test Configuration"
+msgstr ""
+
+#: templates/settings.php:86
+msgid "Help"
+msgstr "مدد"
diff --git a/l10n/ur_PK/user_webdavauth.po b/l10n/ur_PK/user_webdavauth.po
new file mode 100644
index 0000000000000000000000000000000000000000..31e16092c8873380144f103e83ca3d8388cc373c
--- /dev/null
+++ b/l10n/ur_PK/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-02-26 00:04+0100\n"
+"PO-Revision-Date: 2012-11-09 09:06+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ur_PK\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/vi/core.po b/l10n/vi/core.po
index f7bf90b56f15c03b98b1e85159530e53c63bd89e..f8755bc4aed531d256462cb026e336a850ea5750 100644
--- a/l10n/vi/core.po
+++ b/l10n/vi/core.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 14:32+0000\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"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
@@ -392,7 +392,7 @@ msgstr "Cập nhật không thành công . Vui lòng thông báo đến <a href=
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Cập nhật thành công .Hệ thống sẽ đưa bạn tới ownCloud."
 
-#: lostpassword/controller.php:47
+#: lostpassword/controller.php:48
 msgid "ownCloud password reset"
 msgstr "Khôi phục mật khẩu Owncloud "
 
diff --git a/l10n/vi/files.po b/l10n/vi/files.po
index d7eaa300bd9f575688be45bab74b5a396938f168..960372e9db792431dd9e5ff073aa2dd22840ab45 100644
--- a/l10n/vi/files.po
+++ b/l10n/vi/files.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\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: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
@@ -55,27 +55,27 @@ msgid ""
 "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"
 
-#: ajax/upload.php:31
+#: 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"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:31
 msgid "No file was uploaded"
 msgstr "Không có tập tin nào được tải lên"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:32
 msgid "Missing a temporary folder"
 msgstr "Không tìm thấy thư mục tạm"
 
-#: ajax/upload.php:34
+#: ajax/upload.php:33
 msgid "Failed to write to disk"
 msgstr "Không thể ghi "
 
-#: ajax/upload.php:52
+#: ajax/upload.php:51
 msgid "Not enough storage available"
 msgstr "Không đủ không gian lưu trữ"
 
-#: ajax/upload.php:83
+#: ajax/upload.php:82
 msgid "Invalid directory."
 msgstr "Thư mục không hợp lệ"
 
@@ -87,7 +87,7 @@ msgstr "Tập tin"
 msgid "Delete permanently"
 msgstr "Xóa vĩnh vễn"
 
-#: js/fileactions.js:127 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:127 templates/index.php:92 templates/index.php:93
 msgid "Delete"
 msgstr "Xóa"
 
@@ -95,40 +95,36 @@ msgstr "Xóa"
 msgid "Rename"
 msgstr "Sửa tên"
 
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
 msgid "Pending"
 msgstr "Chờ"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "{new_name} already exists"
 msgstr "{new_name} đã tồn tại"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "replace"
 msgstr "thay thế"
 
-#: js/filelist.js:253
+#: js/filelist.js:251
 msgid "suggest name"
 msgstr "tên gợi ý"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "cancel"
 msgstr "hủy"
 
-#: js/filelist.js:295
-msgid "replaced {new_name}"
-msgstr "đã thay thế {new_name}"
+#: js/filelist.js:298
+msgid "replaced {new_name} with {old_name}"
+msgstr "đã thay thế {new_name} bằng {old_name}"
 
-#: js/filelist.js:295 js/filelist.js:297
+#: js/filelist.js:298
 msgid "undo"
 msgstr "lùi lại"
 
-#: js/filelist.js:297
-msgid "replaced {new_name} with {old_name}"
-msgstr "đã thay thế {new_name} bằng {old_name}"
-
-#: js/filelist.js:322
+#: js/filelist.js:323
 msgid "perform delete operation"
 msgstr "thực hiện việc xóa"
 
@@ -154,74 +150,74 @@ 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:224
+#: js/files.js:225
 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:261
+#: js/files.js:262
 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:261
+#: js/files.js:262
 msgid "Upload Error"
 msgstr "Tải lên lỗi"
 
-#: js/files.js:272
+#: js/files.js:273
 msgid "Close"
 msgstr "Đóng"
 
-#: js/files.js:311
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr "1 tệp tin đang được tải lên"
 
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: 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:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "Hủy tải lên"
 
-#: js/files.js:496
+#: js/files.js:497
 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:569
+#: js/files.js:570
 msgid "URL cannot be empty."
 msgstr "URL không được để trống."
 
-#: js/files.js:574
+#: js/files.js:575
 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:948 templates/index.php:67
+#: js/files.js:953 templates/index.php:68
 msgid "Name"
 msgstr "Tên"
 
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:954 templates/index.php:79
 msgid "Size"
 msgstr "Kích cỡ"
 
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:955 templates/index.php:81
 msgid "Modified"
 msgstr "Thay đổi"
 
-#: js/files.js:969
+#: js/files.js:974
 msgid "1 folder"
 msgstr "1 thư mục"
 
-#: js/files.js:971
+#: js/files.js:976
 msgid "{count} folders"
 msgstr "{count} thư mục"
 
-#: js/files.js:979
+#: js/files.js:984
 msgid "1 file"
 msgstr "1 tập tin"
 
-#: js/files.js:981
+#: js/files.js:986
 msgid "{count} files"
 msgstr "{count} tập tin"
 
@@ -279,39 +275,43 @@ msgstr "Từ liên kết"
 
 #: templates/index.php:40
 msgid "Deleted files"
-msgstr ""
+msgstr "File đã bị xóa"
 
 #: templates/index.php:46
 msgid "Cancel upload"
 msgstr "Hủy upload"
 
-#: templates/index.php:59
+#: templates/index.php:53
+msgid "You don’t have write permissions here."
+msgstr ""
+
+#: templates/index.php:60
 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:73
+#: templates/index.php:74
 msgid "Download"
 msgstr "Tải xuống"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:86 templates/index.php:87
 msgid "Unshare"
 msgstr "Không chia sẽ"
 
-#: templates/index.php:105
+#: templates/index.php:106
 msgid "Upload too large"
 msgstr "Tập tin tải lên quá lớn"
 
-#: templates/index.php:107
+#: templates/index.php:108
 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:112
+#: templates/index.php:113
 msgid "Files are being scanned, please wait."
 msgstr "Tập tin đang được quét ,vui lòng chờ."
 
-#: templates/index.php:115
+#: templates/index.php:116
 msgid "Current scanning"
 msgstr "Hiện tại đang quét"
 
diff --git a/l10n/vi/files_external.po b/l10n/vi/files_external.po
index 6dbeed35de4a0601a12406135719b6ecfcd9a631..b2b69ff3b3c9e7218cf31956041a1d7b066dba02 100644
--- a/l10n/vi/files_external.po
+++ b/l10n/vi/files_external.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-10 00:08+0100\n"
-"PO-Revision-Date: 2013-02-09 18:40+0000\n"
-"Last-Translator: saosangm <saosangmo@yahoo.com>\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"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,37 +20,33 @@ msgstr ""
 "Language: vi\n"
 "Plural-Forms: nplurals=1; plural=0;\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 "Đã cấp quyền truy cập"
 
-#: 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 "Lỗi cấu hình lưu trữ Dropbox "
 
-#: 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 "Cấp quyền truy cập"
 
-#: js/dropbox.js:73 js/google.js:72
-msgid "Fill out all required fields"
-msgstr "Điền vào tất cả các trường bắt buộc"
-
-#: js/dropbox.js:85
+#: js/dropbox.js:101
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr "Xin vui lòng cung cấp một ứng dụng Dropbox hợp lệ và mã bí mật."
 
-#: 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 "Lỗi cấu hình lưu trữ Google Drive"
 
-#: lib/config.php:405
+#: lib/config.php:421
 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:406
+#: lib/config.php:424
 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 "
@@ -61,63 +57,63 @@ msgstr "<b>Cảnh báo:</b> FTP trong PHP chưa được cài đặt hoặc chư
 msgid "External Storage"
 msgstr "Lưu trữ ngoài"
 
-#: templates/settings.php:8 templates/settings.php:22
-msgid "Mount point"
-msgstr "Điểm gắn"
-
-#: templates/settings.php:9
-msgid "Backend"
-msgstr "phụ trợ"
+#: templates/settings.php:9 templates/settings.php:28
+msgid "Folder name"
+msgstr "Tên thư mục"
 
 #: templates/settings.php:10
+msgid "External storage"
+msgstr ""
+
+#: templates/settings.php:11
 msgid "Configuration"
 msgstr "Cấu hình"
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid "Options"
 msgstr "Tùy chọn"
 
-#: templates/settings.php:12
+#: templates/settings.php:13
 msgid "Applicable"
 msgstr "Áp dụng"
 
-#: templates/settings.php:27
-msgid "Add mount point"
-msgstr "Thêm điểm lắp"
+#: templates/settings.php:33
+msgid "Add storage"
+msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:90
 msgid "None set"
 msgstr "không"
 
-#: templates/settings.php:86
+#: templates/settings.php:91
 msgid "All Users"
 msgstr "Tất cả người dùng"
 
-#: templates/settings.php:87
+#: templates/settings.php:92
 msgid "Groups"
 msgstr "Nhóm"
 
-#: templates/settings.php:95
+#: templates/settings.php:100
 msgid "Users"
 msgstr "Người dùng"
 
-#: templates/settings.php:108 templates/settings.php:109
-#: templates/settings.php:144 templates/settings.php:145
+#: templates/settings.php:113 templates/settings.php:114
+#: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
 msgstr "Xóa"
 
-#: templates/settings.php:124
+#: templates/settings.php:129
 msgid "Enable User External Storage"
 msgstr "Kích hoạt tính năng lưu trữ ngoài"
 
-#: templates/settings.php:125
+#: templates/settings.php:130
 msgid "Allow users to mount their own external storage"
 msgstr "Cho phép người dùng kết nối với lưu trữ riêng bên ngoài của họ"
 
-#: templates/settings.php:136
+#: templates/settings.php:141
 msgid "SSL root certificates"
 msgstr "Chứng chỉ SSL root"
 
-#: templates/settings.php:153
+#: templates/settings.php:159
 msgid "Import Root Certificate"
 msgstr "Nhập Root Certificate"
diff --git a/l10n/vi/files_trashbin.po b/l10n/vi/files_trashbin.po
index c5b1c4de22b8ebb50529b3e8caf8f31b25269c6a..5087b9c429781374baedded5117dd7630876f4c1 100644
--- a/l10n/vi/files_trashbin.po
+++ b/l10n/vi/files_trashbin.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-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 10:07+0000\n"
-"Last-Translator: saosangm <saosangmo@yahoo.com>\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: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Language: vi\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/delete.php:22
+#: ajax/delete.php:40
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "Không thể óa %s vĩnh viễn"
@@ -28,35 +28,39 @@ msgstr "Không thể óa %s vĩnh viễn"
 msgid "Couldn't restore %s"
 msgstr "Không thể khôi phục %s"
 
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
 msgid "perform restore operation"
 msgstr "thực hiện phục hồi"
 
-#: js/trash.js:33
+#: js/trash.js:34
 msgid "delete file permanently"
 msgstr "xóa file vĩnh viễn"
 
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr "Xóa vĩnh vễn"
+
+#: js/trash.js:174 templates/index.php:17
 msgid "Name"
 msgstr "Tên"
 
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:175 templates/index.php:27
 msgid "Deleted"
 msgstr "Đã xóa"
 
-#: js/trash.js:135
+#: js/trash.js:184
 msgid "1 folder"
 msgstr "1 thư mục"
 
-#: js/trash.js:137
+#: js/trash.js:186
 msgid "{count} folders"
 msgstr "{count} thư mục"
 
-#: js/trash.js:145
+#: js/trash.js:194
 msgid "1 file"
 msgstr "1 tập tin"
 
-#: js/trash.js:147
+#: js/trash.js:196
 msgid "{count} files"
 msgstr "{count} tập tin"
 
@@ -67,3 +71,11 @@ msgstr "Không có gì ở đây. Thùng rác của bạn rỗng!"
 #: templates/index.php:20 templates/index.php:22
 msgid "Restore"
 msgstr "Khôi phục"
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr "Xóa"
+
+#: templates/part.breadcrumb.php:9
+msgid "Deleted Files"
+msgstr ""
diff --git a/l10n/vi/files_versions.po b/l10n/vi/files_versions.po
index 86b6d7a99838bcc91be2a5ea0a4eae52c4aa55ac..df14039e1148212bab582cd8b68a65a2ac0f59fe 100644
--- a/l10n/vi/files_versions.po
+++ b/l10n/vi/files_versions.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-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-02-28 00:04+0100\n"
+"PO-Revision-Date: 2013-02-27 23:04+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -51,18 +51,10 @@ msgstr "Không có phiên bản cũ nào"
 msgid "No path specified"
 msgstr "Không chỉ ra đường dẫn rõ ràng"
 
-#: js/versions.js:16
-msgid "History"
-msgstr "Lịch sử"
+#: 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 "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"
-
-#: templates/settings.php:3
-msgid "Files Versioning"
-msgstr "Phiên bản tập tin"
-
-#: templates/settings.php:4
-msgid "Enable"
-msgstr "Bật "
diff --git a/l10n/vi/lib.po b/l10n/vi/lib.po
index c8185ef509236c6bfa2966d1439994f1c924f041..c09c4caadc13287816cb2d10e8132addd98551ed 100644
--- a/l10n/vi/lib.po
+++ b/l10n/vi/lib.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-11 15:39+0100\n"
-"PO-Revision-Date: 2013-02-11 14:41+0000\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: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
@@ -21,27 +21,27 @@ msgstr ""
 "Language: vi\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: app.php:339
+#: app.php:349
 msgid "Help"
 msgstr "Giúp đỡ"
 
-#: app.php:346
+#: app.php:362
 msgid "Personal"
 msgstr "Cá nhân"
 
-#: app.php:351
+#: app.php:373
 msgid "Settings"
 msgstr "Cài đặt"
 
-#: app.php:356
+#: app.php:385
 msgid "Users"
 msgstr "Người dùng"
 
-#: app.php:363
+#: app.php:398
 msgid "Apps"
 msgstr "Ứng dụng"
 
-#: app.php:365
+#: app.php:406
 msgid "Admin"
 msgstr "Quản trị"
 
@@ -53,15 +53,15 @@ msgstr "Tải về ZIP đã bị tắt."
 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:203 files.php:228
+#: files.php:204 files.php:231
 msgid "Back to Files"
 msgstr "Trở lại tập tin"
 
-#: files.php:227
+#: files.php:228
 msgid "Selected files too large to generate zip file."
 msgstr "Tập tin được chọn quá lớn để tạo tập tin ZIP."
 
-#: helper.php:226
+#: helper.php:228
 msgid "couldn't be determined"
 msgstr "không thể phát hiện được"
 
@@ -101,87 +101,92 @@ msgstr ""
 msgid "Specify a data folder."
 msgstr ""
 
-#: setup.php:53
+#: setup.php:55
 #, php-format
 msgid "%s enter the database username."
 msgstr ""
 
-#: setup.php:56
+#: setup.php:58
 #, php-format
 msgid "%s enter the database name."
 msgstr ""
 
-#: setup.php:59
+#: setup.php:61
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr ""
 
-#: setup.php:62
+#: setup.php:64
 #, php-format
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:126 setup.php:291 setup.php:336
+#: setup.php:128 setup.php:320 setup.php:365
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:127 setup.php:150 setup.php:204
+#: setup.php:129 setup.php:152 setup.php:229
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:149 setup.php:423 setup.php:489
+#: setup.php:151 setup.php:453 setup.php:520
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:203
+#: setup.php:228
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:255 setup.php:357 setup.php:366 setup.php:384 setup.php:394
-#: setup.php:403 setup.php:430 setup.php:496 setup.php:522 setup.php:529
-#: setup.php:540 setup.php:547 setup.php:556 setup.php:564 setup.php:573
-#: setup.php:579
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:256 setup.php:358 setup.php:367 setup.php:385 setup.php:395
-#: setup.php:404 setup.php:431 setup.php:497 setup.php:523 setup.php:530
-#: setup.php:541 setup.php:557 setup.php:565 setup.php:574
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:270
+#: setup.php:299
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:271
+#: setup.php:300
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:276
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:277
+#: setup.php:306
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:548 setup.php:580
+#: setup.php:579 setup.php:611
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:644
+#: setup.php:631
+#, php-format
+msgid "MS SQL username and/or password not valid: %s"
+msgstr ""
+
+#: setup.php:849
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:645
+#: setup.php:850
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
@@ -238,16 +243,16 @@ msgstr "năm trước"
 msgid "years ago"
 msgstr "năm trước"
 
-#: updater.php:75
+#: 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:77
+#: updater.php:81
 msgid "up to date"
 msgstr "đến ngày"
 
-#: updater.php:80
+#: updater.php:84
 msgid "updates check is disabled"
 msgstr "đã TĂT chức năng cập nhật "
 
diff --git a/l10n/vi/settings.po b/l10n/vi/settings.po
index 49ceed9259db2d88ff39323d890c4cbd40b3d54e..c0451608cf16628df89a5831569874c85849a8e5 100644
--- a/l10n/vi/settings.po
+++ b/l10n/vi/settings.po
@@ -14,8 +14,8 @@ 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:05+0000\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: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
@@ -28,8 +28,8 @@ 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:15
-#: ajax/togglegroups.php:18
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr "Lỗi xác thực"
 
@@ -77,12 +77,12 @@ msgstr "Yêu cầu không hợp lệ"
 msgid "Admins can't remove themself from the admin group"
 msgstr "Quản trị viên không thể loại bỏ chính họ khỏi nhóm quản lý"
 
-#: ajax/togglegroups.php:28
+#: ajax/togglegroups.php:30
 #, php-format
 msgid "Unable to add user to group %s"
 msgstr "Không thể thêm người dùng vào nhóm %s"
 
-#: ajax/togglegroups.php:34
+#: ajax/togglegroups.php:36
 #, php-format
 msgid "Unable to remove user from group %s"
 msgstr "Không thể xóa người dùng từ nhóm %s"
@@ -123,7 +123,7 @@ msgstr "Lỗi"
 msgid "Updated"
 msgstr "Đã cập nhật"
 
-#: js/personal.js:96
+#: js/personal.js:99
 msgid "Saving..."
 msgstr "Đang tiến hành lưu ..."
 
@@ -152,23 +152,23 @@ msgstr "Nhóm quản trị"
 msgid "Delete"
 msgstr "Xóa"
 
-#: js/users.js:190
+#: js/users.js:191
 msgid "add group"
 msgstr ""
 
-#: js/users.js:351
+#: js/users.js:352
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:357
+#: js/users.js:358
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
 msgid "__language_name__"
 msgstr "__Ngôn ngữ___"
 
@@ -214,19 +214,19 @@ msgstr ""
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:61
+#: templates/admin.php:63
+#, php-format
 msgid ""
-"This ownCloud server can't set system locale to "
-"\"en_US.UTF-8\"/\"en_US.UTF8\". 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 en_US.UTF-8/en_US.UTF8."
+"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:72
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:75
+#: 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 "
@@ -236,98 +236,98 @@ msgid ""
 " of ownCloud."
 msgstr ""
 
-#: templates/admin.php:89
+#: templates/admin.php:92
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:98
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:108
+#: 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:118
+#: 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:125
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:131
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:132
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:140
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:147
+#: templates/admin.php:150
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:148
+#: templates/admin.php:151
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:155
+#: templates/admin.php:158
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:161
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:165
+#: templates/admin.php:168
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:181
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:179
+#: templates/admin.php:182
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:182
+#: templates/admin.php:185
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr ""
 
-#: templates/admin.php:192
+#: templates/admin.php:195
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:193
+#: templates/admin.php:196
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:220
+#: templates/admin.php:223
 msgid "More"
 msgstr "hơn"
 
-#: templates/admin.php:227 templates/personal.php:98
+#: templates/admin.php:230 templates/personal.php:102
 msgid "Version"
 msgstr "Phiên bản"
 
-#: templates/admin.php:230 templates/personal.php:100
+#: templates/admin.php:233 templates/personal.php:105
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -337,51 +337,51 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "Được phát triển bởi <a href=\"http://ownCloud.org/contact\" target=\"_blank\">cộng đồng ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">mã nguồn </a> đã được cấp phép theo chuẩn <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
-#: templates/apps.php:10
+#: templates/apps.php:11
 msgid "Add your App"
 msgstr "Thêm ứng dụng của bạn"
 
-#: templates/apps.php:11
+#: templates/apps.php:12
 msgid "More Apps"
 msgstr "Nhiều ứng dụng hơn"
 
-#: templates/apps.php:24
+#: templates/apps.php:28
 msgid "Select an App"
 msgstr "Chọn một ứng dụng"
 
-#: templates/apps.php:28
+#: templates/apps.php:34
 msgid "See application page at apps.owncloud.com"
 msgstr "Xem nhiều ứng dụng hơn tại apps.owncloud.com"
 
-#: templates/apps.php:29
+#: templates/apps.php:36
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-Giấy phép được cấp bởi  <span class=\"author\"></span>"
 
-#: templates/apps.php:31
+#: templates/apps.php:38
 msgid "Update"
 msgstr "Cập nhật"
 
-#: templates/help.php:3
+#: templates/help.php:4
 msgid "User Documentation"
 msgstr "Tài liệu người sử dụng"
 
-#: templates/help.php:4
+#: templates/help.php:6
 msgid "Administrator Documentation"
 msgstr "Tài liệu quản trị"
 
-#: templates/help.php:6
+#: templates/help.php:9
 msgid "Online Documentation"
 msgstr "Tài liệu trực tuyến"
 
-#: templates/help.php:7
+#: templates/help.php:11
 msgid "Forum"
 msgstr "Diễn đàn"
 
-#: templates/help.php:9
+#: templates/help.php:14
 msgid "Bugtracker"
 msgstr "Hệ ghi nhận lỗi"
 
-#: templates/help.php:11
+#: templates/help.php:17
 msgid "Commercial Support"
 msgstr "Hỗ trợ có phí"
 
@@ -390,79 +390,79 @@ msgstr "Hỗ trợ có phí"
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Bạn đã sử dụng <strong>%s </ strong> có sẵn <strong> %s </ strong>"
 
-#: templates/personal.php:14
+#: templates/personal.php:15
 msgid "Get the apps to sync your files"
 msgstr "Nhận ứng dụng để đồng bộ file của bạn"
 
-#: templates/personal.php:25
+#: templates/personal.php:26
 msgid "Show First Run Wizard again"
 msgstr "Hiện lại việc chạy đồ thuật khởi đầu"
 
-#: templates/personal.php:36 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
 msgid "Password"
 msgstr "Mật khẩu"
 
-#: templates/personal.php:37
+#: templates/personal.php:38
 msgid "Your password was changed"
 msgstr "Mật khẩu của bạn đã được thay đổi."
 
-#: templates/personal.php:38
+#: templates/personal.php:39
 msgid "Unable to change your password"
 msgstr "Không thể đổi mật khẩu"
 
-#: templates/personal.php:39
+#: templates/personal.php:40
 msgid "Current password"
 msgstr "Mật khẩu cũ"
 
-#: templates/personal.php:40
+#: templates/personal.php:42
 msgid "New password"
 msgstr "Mật khẩu mới "
 
-#: templates/personal.php:42
+#: templates/personal.php:44
 msgid "Change password"
 msgstr "Đổi mật khẩu"
 
-#: templates/personal.php:54 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:78
 msgid "Display Name"
 msgstr "Tên hiển thị"
 
-#: templates/personal.php:55
+#: 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:56
+#: 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:59
+#: templates/personal.php:61
 msgid "Change display name"
 msgstr "Thay đổi tên hiển thị"
 
-#: templates/personal.php:68
+#: templates/personal.php:70
 msgid "Email"
 msgstr "Email"
 
-#: templates/personal.php:69
+#: templates/personal.php:72
 msgid "Your email address"
 msgstr "Email của bạn"
 
-#: templates/personal.php:70
+#: templates/personal.php:73
 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:76 templates/personal.php:77
+#: templates/personal.php:79 templates/personal.php:80
 msgid "Language"
 msgstr "Ngôn ngữ"
 
-#: templates/personal.php:82
+#: templates/personal.php:86
 msgid "Help translate"
 msgstr "Hỗ trợ dịch thuật"
 
-#: templates/personal.php:87
+#: templates/personal.php:91
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:89
+#: templates/personal.php:93
 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"
 
diff --git a/l10n/vi/user_ldap.po b/l10n/vi/user_ldap.po
index 003187cb06d08824e6c9336e1a86ae8a583c1d4d..a1f05a928288d8a3ffc3b16069139624ca675cb8 100644
--- a/l10n/vi/user_ldap.po
+++ b/l10n/vi/user_ldap.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-10 00:08+0100\n"
-"PO-Revision-Date: 2013-02-09 19:00+0000\n"
-"Last-Translator: saosangm <saosangmo@yahoo.com>\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: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,17 +24,17 @@ msgstr ""
 msgid "Failed to delete the server configuration"
 msgstr ""
 
-#: ajax/testConfiguration.php:35
+#: ajax/testConfiguration.php:36
 msgid "The configuration is valid and the connection could be established!"
 msgstr ""
 
-#: ajax/testConfiguration.php:37
+#: ajax/testConfiguration.php:39
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
 msgstr ""
 
-#: ajax/testConfiguration.php:40
+#: ajax/testConfiguration.php:43
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
@@ -89,224 +89,248 @@ msgstr ""
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:17
+#: templates/settings.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:23
 msgid "Host"
 msgstr "Máy chủ"
 
-#: templates/settings.php:21
+#: templates/settings.php:25
 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:22
+#: templates/settings.php:26
 msgid "Base DN"
 msgstr "DN cơ bản"
 
-#: templates/settings.php:22
+#: templates/settings.php:27
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:28
 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:23
+#: templates/settings.php:30
 msgid "User DN"
 msgstr "Người dùng DN"
 
-#: templates/settings.php:23
+#: templates/settings.php:32
 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:24
+#: templates/settings.php:33
 msgid "Password"
 msgstr "Mật khẩu"
 
-#: templates/settings.php:24
+#: templates/settings.php:36
 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:25
+#: templates/settings.php:37
 msgid "User Login Filter"
 msgstr "Lọc người dùng đăng nhập"
 
-#: templates/settings.php:25
+#: templates/settings.php:40
 #, 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:25
+#: templates/settings.php:41
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "use %%uid placeholder, e.g. \"uid=%%uid\""
 
-#: templates/settings.php:26
+#: templates/settings.php:42
 msgid "User List Filter"
 msgstr "Lọc danh sách thành viên"
 
-#: templates/settings.php:26
+#: templates/settings.php:45
 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:26
+#: templates/settings.php:46
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "mà không giữ chỗ nào, ví dụ như \"objectClass = person\"."
 
-#: templates/settings.php:27
+#: templates/settings.php:47
 msgid "Group Filter"
 msgstr "Bộ lọc nhóm"
 
-#: templates/settings.php:27
+#: templates/settings.php:50
 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:27
+#: templates/settings.php:51
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "mà không giữ chỗ nào, ví dụ như \"objectClass = osixGroup\"."
 
-#: templates/settings.php:31
+#: templates/settings.php:55
 msgid "Connection Settings"
 msgstr "Connection Settings"
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:34
+#: templates/settings.php:58
 msgid "Port"
 msgstr "Cổng"
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:60
 msgid "Backup (Replica) Port"
 msgstr "Cổng sao lưu (Replica)"
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "Disable Main Server"
 msgstr "Tắt máy chủ chính"
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 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:38
+#: templates/settings.php:62
 msgid "Use TLS"
 msgstr "Sử dụng TLS"
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 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:39
+#: templates/settings.php:63
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Trường hợp insensitve LDAP máy chủ (Windows)"
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid "Turn off SSL certificate validation."
 msgstr "Tắt xác thực chứng nhận SSL"
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 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:40
+#: templates/settings.php:64
 msgid "Not recommended, use for testing only."
 msgstr "Không khuyến khích, Chỉ sử dụng để thử nghiệm."
 
-#: templates/settings.php:41
+#: templates/settings.php:65
+msgid "Cache Time-To-Live"
+msgstr ""
+
+#: templates/settings.php:65
 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:43
+#: templates/settings.php:67
 msgid "Directory Settings"
 msgstr "Directory Settings"
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "User Display Name Field"
 msgstr "Hiển thị tên người sử dụng"
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 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:46
+#: templates/settings.php:70
 msgid "Base User Tree"
 msgstr "Cây người dùng cơ bản"
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:47
+#: templates/settings.php:71
 msgid "User Search Attributes"
 msgstr "User Search Attributes"
 
-#: templates/settings.php:47 templates/settings.php:50
+#: templates/settings.php:71 templates/settings.php:74
 msgid "Optional; one attribute per line"
 msgstr "Optional; one attribute per line"
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "Group Display Name Field"
 msgstr "Hiển thị tên nhóm"
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 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:49
+#: templates/settings.php:73
 msgid "Base Group Tree"
 msgstr "Cây nhóm cơ bản"
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:74
 msgid "Group Search Attributes"
 msgstr "Group Search Attributes"
 
-#: templates/settings.php:51
+#: templates/settings.php:75
 msgid "Group-Member association"
 msgstr "Nhóm thành viên Cộng đồng"
 
-#: templates/settings.php:53
+#: templates/settings.php:77
 msgid "Special Attributes"
 msgstr "Special Attributes"
 
-#: templates/settings.php:56
+#: templates/settings.php:79
+msgid "Quota Field"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Quota Default"
+msgstr ""
+
+#: templates/settings.php:80
 msgid "in bytes"
 msgstr "Theo Byte"
 
-#: templates/settings.php:58
+#: templates/settings.php:81
+msgid "Email Field"
+msgstr ""
+
+#: templates/settings.php:82
+msgid "User Home Folder Naming Rule"
+msgstr ""
+
+#: templates/settings.php:82
 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:62
+#: templates/settings.php:86
+msgid "Test Configuration"
+msgstr ""
+
+#: templates/settings.php:86
 msgid "Help"
 msgstr "Giúp đỡ"
diff --git a/l10n/zh_CN.GB2312/core.po b/l10n/zh_CN.GB2312/core.po
index e8be26bcfea3d101b35c8c1010f85691c19b066b..971edd7b11dfeaf8d1e0b0cdb9bc4c579c4c24b6 100644
--- a/l10n/zh_CN.GB2312/core.po
+++ b/l10n/zh_CN.GB2312/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 14:31+0000\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"
 "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
@@ -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 "私有云密码重置"
 
diff --git a/l10n/zh_CN.GB2312/files.po b/l10n/zh_CN.GB2312/files.po
index a9b6ba1536fb8ee2b65ec8ca0c8e07257fb6fa6e..af5d6f75221bd8c11c3c2058d09ebd0bc85849e1 100644
--- a/l10n/zh_CN.GB2312/files.po
+++ b/l10n/zh_CN.GB2312/files.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\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: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
@@ -52,27 +52,27 @@ msgid ""
 "the HTML form"
 msgstr "上传的文件超过了HTML表单指定的MAX_FILE_SIZE"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
 msgstr "文件只有部分被上传"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:31
 msgid "No file was uploaded"
 msgstr "没有上传完成的文件"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:32
 msgid "Missing a temporary folder"
 msgstr "丢失了一个临时文件夹"
 
-#: ajax/upload.php:34
+#: ajax/upload.php:33
 msgid "Failed to write to disk"
 msgstr "写磁盘失败"
 
-#: ajax/upload.php:52
+#: ajax/upload.php:51
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:83
+#: ajax/upload.php:82
 msgid "Invalid directory."
 msgstr ""
 
@@ -84,7 +84,7 @@ msgstr "文件"
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:127 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:127 templates/index.php:92 templates/index.php:93
 msgid "Delete"
 msgstr "删除"
 
@@ -92,40 +92,36 @@ msgstr "删除"
 msgid "Rename"
 msgstr "重命名"
 
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
 msgid "Pending"
 msgstr "Pending"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "{new_name} already exists"
 msgstr "{new_name} 已存在"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "replace"
 msgstr "替换"
 
-#: js/filelist.js:253
+#: js/filelist.js:251
 msgid "suggest name"
 msgstr "推荐名称"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "cancel"
 msgstr "取消"
 
-#: js/filelist.js:295
-msgid "replaced {new_name}"
-msgstr "已替换 {new_name}"
+#: js/filelist.js:298
+msgid "replaced {new_name} with {old_name}"
+msgstr "已用 {old_name} 替换 {new_name}"
 
-#: js/filelist.js:295 js/filelist.js:297
+#: js/filelist.js:298
 msgid "undo"
 msgstr "撤销"
 
-#: js/filelist.js:297
-msgid "replaced {new_name} with {old_name}"
-msgstr "已用 {old_name} 替换 {new_name}"
-
-#: js/filelist.js:322
+#: js/filelist.js:323
 msgid "perform delete operation"
 msgstr ""
 
@@ -151,74 +147,74 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:224
+#: js/files.js:225
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:261
+#: js/files.js:262
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "不能上传你指定的文件,可能因为它是个文件夹或者大小为0"
 
-#: js/files.js:261
+#: js/files.js:262
 msgid "Upload Error"
 msgstr "上传错误"
 
-#: js/files.js:272
+#: js/files.js:273
 msgid "Close"
 msgstr "关闭"
 
-#: js/files.js:311
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr "1 个文件正在上传"
 
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr "{count} 个文件正在上传"
 
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "上传取消了"
 
-#: js/files.js:496
+#: js/files.js:497
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "文件正在上传。关闭页面会取消上传。"
 
-#: js/files.js:569
+#: js/files.js:570
 msgid "URL cannot be empty."
 msgstr "网址不能为空。"
 
-#: js/files.js:574
+#: js/files.js:575
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:953 templates/index.php:68
 msgid "Name"
 msgstr "名字"
 
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:954 templates/index.php:79
 msgid "Size"
 msgstr "大小"
 
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:955 templates/index.php:81
 msgid "Modified"
 msgstr "修改日期"
 
-#: js/files.js:969
+#: js/files.js:974
 msgid "1 folder"
 msgstr "1 个文件夹"
 
-#: js/files.js:971
+#: js/files.js:976
 msgid "{count} folders"
 msgstr "{count} 个文件夹"
 
-#: js/files.js:979
+#: js/files.js:984
 msgid "1 file"
 msgstr "1 个文件"
 
-#: js/files.js:981
+#: js/files.js:986
 msgid "{count} files"
 msgstr "{count} 个文件"
 
@@ -282,33 +278,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr "取消上传"
 
-#: templates/index.php:59
+#: templates/index.php:53
+msgid "You don’t have write permissions here."
+msgstr ""
+
+#: templates/index.php:60
 msgid "Nothing in here. Upload something!"
 msgstr "这里没有东西.上传点什么!"
 
-#: templates/index.php:73
+#: templates/index.php:74
 msgid "Download"
 msgstr "下载"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:86 templates/index.php:87
 msgid "Unshare"
 msgstr "取消共享"
 
-#: templates/index.php:105
+#: templates/index.php:106
 msgid "Upload too large"
 msgstr "上传的文件太大了"
 
-#: templates/index.php:107
+#: templates/index.php:108
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "你正在试图上传的文件超过了此服务器支持的最大的文件大小."
 
-#: templates/index.php:112
+#: templates/index.php:113
 msgid "Files are being scanned, please wait."
 msgstr "正在扫描文件,请稍候."
 
-#: templates/index.php:115
+#: templates/index.php:116
 msgid "Current scanning"
 msgstr "正在扫描"
 
diff --git a/l10n/zh_CN.GB2312/files_external.po b/l10n/zh_CN.GB2312/files_external.po
index 066da805d348c278b64ca207747687167daf856c..50616ee00fa2fff7c2f31f92c81ab239619e0fc8 100644
--- a/l10n/zh_CN.GB2312/files_external.po
+++ b/l10n/zh_CN.GB2312/files_external.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-11 23:22+0000\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"
 "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
@@ -18,37 +18,33 @@ msgstr ""
 "Language: zh_CN.GB2312\n"
 "Plural-Forms: nplurals=1; plural=0;\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 "配置 Dropbox 存储出错"
 
-#: 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 "请提供一个有效的 Dropbox app key 和 secret。"
 
-#: 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 "配置 Google Drive 存储失败"
 
-#: lib/config.php:434
+#: lib/config.php:421
 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:424
 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 "
@@ -59,63 +55,63 @@ msgstr ""
 msgid "External Storage"
 msgstr "外部存储"
 
-#: templates/settings.php:8 templates/settings.php:22
-msgid "Mount point"
-msgstr "挂载点"
-
-#: templates/settings.php:9
-msgid "Backend"
-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: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"
-msgstr "添加挂载点"
+#: 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 "用户"
 
-#: 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 "删除"
 
-#: 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 "SSL 根证书"
 
-#: templates/settings.php:158
+#: templates/settings.php:159
 msgid "Import Root Certificate"
 msgstr "导入根证书"
diff --git a/l10n/zh_CN.GB2312/files_trashbin.po b/l10n/zh_CN.GB2312/files_trashbin.po
index 4432759cfe377aba05e715b8b932463a577dd961..c433a8e19b7cce7f69924a8bf0b3acf9d99a7ead 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-02-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 10:07+0000\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: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Language: zh_CN.GB2312\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/delete.php:22
+#: ajax/delete.php:40
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
@@ -27,35 +27,39 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:33
+#: js/trash.js:34
 msgid "delete file permanently"
 msgstr ""
 
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr ""
+
+#: js/trash.js:174 templates/index.php:17
 msgid "Name"
 msgstr "名称"
 
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:175 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:135
+#: js/trash.js:184
 msgid "1 folder"
 msgstr "1 个文件夹"
 
-#: js/trash.js:137
+#: js/trash.js:186
 msgid "{count} folders"
 msgstr "{count} 个文件夹"
 
-#: js/trash.js:145
+#: js/trash.js:194
 msgid "1 file"
 msgstr "1 个文件"
 
-#: js/trash.js:147
+#: js/trash.js:196
 msgid "{count} files"
 msgstr "{count} 个文件"
 
@@ -66,3 +70,11 @@ 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/zh_CN.GB2312/files_versions.po b/l10n/zh_CN.GB2312/files_versions.po
index 97402cab1a7c72c90860af6659342785430b3b40..01b05ceb323146f356bd44e701798f747cb120ea 100644
--- a/l10n/zh_CN.GB2312/files_versions.po
+++ b/l10n/zh_CN.GB2312/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-08 00:10+0100\n"
-"PO-Revision-Date: 2013-02-07 23:11+0000\n"
+"POT-Creation-Date: 2013-02-28 00:04+0100\n"
+"PO-Revision-Date: 2013-02-27 23:04+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
@@ -49,18 +49,10 @@ msgstr ""
 msgid "No path specified"
 msgstr ""
 
-#: js/versions.js:16
-msgid "History"
-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 ""
-
-#: templates/settings.php:3
-msgid "Files Versioning"
-msgstr "文件版本"
-
-#: templates/settings.php:4
-msgid "Enable"
-msgstr "启用"
diff --git a/l10n/zh_CN.GB2312/lib.po b/l10n/zh_CN.GB2312/lib.po
index 79d527ff6d7ce0cfb9eb1339adec399fdd838e7d..3ab8eb8f8cf8f51b79a70f34ff4b31debca2ce9c 100644
--- a/l10n/zh_CN.GB2312/lib.po
+++ b/l10n/zh_CN.GB2312/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-11 15:39+0100\n"
-"PO-Revision-Date: 2013-02-11 14:41+0000\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: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
@@ -18,27 +18,27 @@ msgstr ""
 "Language: zh_CN.GB2312\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: app.php:339
+#: app.php:349
 msgid "Help"
 msgstr "帮助"
 
-#: app.php:346
+#: app.php:362
 msgid "Personal"
 msgstr "私人"
 
-#: app.php:351
+#: app.php:373
 msgid "Settings"
 msgstr "设置"
 
-#: app.php:356
+#: app.php:385
 msgid "Users"
 msgstr "用户"
 
-#: app.php:363
+#: app.php:398
 msgid "Apps"
 msgstr "程序"
 
-#: app.php:365
+#: app.php:406
 msgid "Admin"
 msgstr "管理员"
 
@@ -50,15 +50,15 @@ msgstr "ZIP 下载已关闭"
 msgid "Files need to be downloaded one by one."
 msgstr "需要逐个下载文件。"
 
-#: files.php:203 files.php:228
+#: files.php:204 files.php:231
 msgid "Back to Files"
 msgstr "返回到文件"
 
-#: files.php:227
+#: files.php:228
 msgid "Selected files too large to generate zip file."
 msgstr "选择的文件太大而不能生成 zip 文件。"
 
-#: helper.php:226
+#: helper.php:228
 msgid "couldn't be determined"
 msgstr ""
 
@@ -98,87 +98,92 @@ msgstr ""
 msgid "Specify a data folder."
 msgstr ""
 
-#: setup.php:53
+#: setup.php:55
 #, php-format
 msgid "%s enter the database username."
 msgstr ""
 
-#: setup.php:56
+#: setup.php:58
 #, php-format
 msgid "%s enter the database name."
 msgstr ""
 
-#: setup.php:59
+#: setup.php:61
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr ""
 
-#: setup.php:62
+#: setup.php:64
 #, php-format
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:126 setup.php:291 setup.php:336
+#: setup.php:128 setup.php:320 setup.php:365
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:127 setup.php:150 setup.php:204
+#: setup.php:129 setup.php:152 setup.php:229
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:149 setup.php:423 setup.php:489
+#: setup.php:151 setup.php:453 setup.php:520
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:203
+#: setup.php:228
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:255 setup.php:357 setup.php:366 setup.php:384 setup.php:394
-#: setup.php:403 setup.php:430 setup.php:496 setup.php:522 setup.php:529
-#: setup.php:540 setup.php:547 setup.php:556 setup.php:564 setup.php:573
-#: setup.php:579
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:256 setup.php:358 setup.php:367 setup.php:385 setup.php:395
-#: setup.php:404 setup.php:431 setup.php:497 setup.php:523 setup.php:530
-#: setup.php:541 setup.php:557 setup.php:565 setup.php:574
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:270
+#: setup.php:299
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:271
+#: setup.php:300
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:276
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:277
+#: setup.php:306
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:548 setup.php:580
+#: setup.php:579 setup.php:611
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:644
+#: setup.php:631
+#, php-format
+msgid "MS SQL username and/or password not valid: %s"
+msgstr ""
+
+#: setup.php:849
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:645
+#: setup.php:850
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
@@ -235,16 +240,16 @@ msgstr "去年"
 msgid "years ago"
 msgstr "年前"
 
-#: updater.php:75
+#: updater.php:78
 #, php-format
 msgid "%s is available. Get <a href=\"%s\">more information</a>"
 msgstr "%s 不可用。获知 <a href=\"%s\">详情</a>"
 
-#: updater.php:77
+#: updater.php:81
 msgid "up to date"
 msgstr "最新"
 
-#: updater.php:80
+#: updater.php:84
 msgid "updates check is disabled"
 msgstr "更新检测已禁用"
 
diff --git a/l10n/zh_CN.GB2312/settings.po b/l10n/zh_CN.GB2312/settings.po
index b2a1a746277d46b8cf0c92c96755ce2afacae2bc..01b153143fd6e23790f9c21c234ac67020d644cf 100644
--- a/l10n/zh_CN.GB2312/settings.po
+++ b/l10n/zh_CN.GB2312/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 23:05+0000\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: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
@@ -23,8 +23,8 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "不能从App Store 中加载列表"
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:15
-#: ajax/togglegroups.php:18
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr "认证错误"
 
@@ -72,12 +72,12 @@ 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 "未能添加用户到群组 %s"
 
-#: ajax/togglegroups.php:34
+#: ajax/togglegroups.php:36
 #, php-format
 msgid "Unable to remove user from group %s"
 msgstr "未能将用户从群组 %s 移除"
@@ -118,7 +118,7 @@ msgstr "出错"
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:96
+#: js/personal.js:99
 msgid "Saving..."
 msgstr "保存中..."
 
@@ -147,23 +147,23 @@ msgstr "群组管理员"
 msgid "Delete"
 msgstr "删除"
 
-#: js/users.js:190
+#: js/users.js:191
 msgid "add group"
 msgstr ""
 
-#: js/users.js:351
+#: js/users.js:352
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:357
+#: js/users.js:358
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
 msgid "__language_name__"
 msgstr "Chinese"
 
@@ -209,19 +209,19 @@ msgstr ""
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:61
+#: templates/admin.php:63
+#, php-format
 msgid ""
-"This ownCloud server can't set system locale to "
-"\"en_US.UTF-8\"/\"en_US.UTF8\". 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 en_US.UTF-8/en_US.UTF8."
+"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:72
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:75
+#: 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 "
@@ -231,98 +231,98 @@ msgid ""
 " of ownCloud."
 msgstr ""
 
-#: templates/admin.php:89
+#: templates/admin.php:92
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:98
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:108
+#: 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:118
+#: 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:125
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:131
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:132
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:140
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:147
+#: templates/admin.php:150
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:148
+#: templates/admin.php:151
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:155
+#: templates/admin.php:158
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:161
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:165
+#: templates/admin.php:168
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:181
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:179
+#: templates/admin.php:182
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:182
+#: templates/admin.php:185
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr ""
 
-#: templates/admin.php:192
+#: templates/admin.php:195
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:193
+#: templates/admin.php:196
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:220
+#: templates/admin.php:223
 msgid "More"
 msgstr "更多"
 
-#: templates/admin.php:227 templates/personal.php:98
+#: templates/admin.php:230 templates/personal.php:102
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:230 templates/personal.php:100
+#: templates/admin.php:233 templates/personal.php:105
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -332,51 +332,51 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "由 <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud 社区</a>开发,<a href=\"https://github.com/owncloud\" target=\"_blank\">s源代码</a> 以 <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> 许可协议发布。"
 
-#: templates/apps.php:10
+#: templates/apps.php:11
 msgid "Add your App"
 msgstr "添加你的应用程序"
 
-#: templates/apps.php:11
+#: templates/apps.php:12
 msgid "More Apps"
 msgstr "更多应用"
 
-#: templates/apps.php:24
+#: templates/apps.php:28
 msgid "Select an App"
 msgstr "选择一个程序"
 
-#: templates/apps.php:28
+#: templates/apps.php:34
 msgid "See application page at apps.owncloud.com"
 msgstr "在owncloud.com上查看应用程序"
 
-#: templates/apps.php:29
+#: templates/apps.php:36
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>授权协议 <span class=\"author\"></span>"
 
-#: templates/apps.php:31
+#: templates/apps.php:38
 msgid "Update"
 msgstr "更新"
 
-#: templates/help.php:3
+#: 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 ""
 
@@ -385,79 +385,79 @@ msgstr ""
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:14
+#: templates/personal.php:15
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:25
+#: templates/personal.php:26
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:36 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
 msgid "Password"
 msgstr "密码"
 
-#: templates/personal.php:37
+#: templates/personal.php:38
 msgid "Your password was changed"
 msgstr "您的密码以变更"
 
-#: templates/personal.php:38
+#: templates/personal.php:39
 msgid "Unable to change your password"
 msgstr "不能改变你的密码"
 
-#: templates/personal.php:39
+#: templates/personal.php:40
 msgid "Current password"
 msgstr "现在的密码"
 
-#: templates/personal.php:40
+#: templates/personal.php:42
 msgid "New password"
 msgstr "新密码"
 
-#: templates/personal.php:42
+#: templates/personal.php:44
 msgid "Change password"
 msgstr "改变密码"
 
-#: templates/personal.php:54 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:78
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:55
+#: templates/personal.php:57
 msgid "Your display name was changed"
 msgstr ""
 
-#: templates/personal.php:56
+#: templates/personal.php:58
 msgid "Unable to change your display name"
 msgstr ""
 
-#: templates/personal.php:59
+#: templates/personal.php:61
 msgid "Change display name"
 msgstr ""
 
-#: templates/personal.php:68
+#: templates/personal.php:70
 msgid "Email"
 msgstr "Email"
 
-#: templates/personal.php:69
+#: templates/personal.php:72
 msgid "Your email address"
 msgstr "你的email地址"
 
-#: templates/personal.php:70
+#: templates/personal.php:73
 msgid "Fill in an email address to enable password recovery"
 msgstr "输入一个邮箱地址以激活密码恢复功能"
 
-#: templates/personal.php:76 templates/personal.php:77
+#: templates/personal.php:79 templates/personal.php:80
 msgid "Language"
 msgstr "语言"
 
-#: templates/personal.php:82
+#: templates/personal.php:86
 msgid "Help translate"
 msgstr "帮助翻译"
 
-#: templates/personal.php:87
+#: templates/personal.php:91
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:89
+#: templates/personal.php:93
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
diff --git a/l10n/zh_CN.GB2312/user_ldap.po b/l10n/zh_CN.GB2312/user_ldap.po
index f85d4abe78fab413ce39fd0d949f0f8cd1909931..355999c92681932dc1679ed3c34e88027e885cfe 100644
--- a/l10n/zh_CN.GB2312/user_ldap.po
+++ b/l10n/zh_CN.GB2312/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-08 00:10+0100\n"
-"PO-Revision-Date: 2013-02-07 23:11+0000\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: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
@@ -22,17 +22,17 @@ msgstr ""
 msgid "Failed to delete the server configuration"
 msgstr ""
 
-#: ajax/testConfiguration.php:35
+#: ajax/testConfiguration.php:36
 msgid "The configuration is valid and the connection could be established!"
 msgstr ""
 
-#: ajax/testConfiguration.php:37
+#: ajax/testConfiguration.php:39
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
 msgstr ""
 
-#: ajax/testConfiguration.php:40
+#: ajax/testConfiguration.php:43
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
@@ -87,224 +87,248 @@ msgstr ""
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:17
+#: templates/settings.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:23
 msgid "Host"
 msgstr "主机"
 
-#: templates/settings.php:21
+#: templates/settings.php:25
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "您可以忽略协议,除非您需要 SSL。然后用 ldaps:// 开头"
 
-#: templates/settings.php:22
+#: templates/settings.php:26
 msgid "Base DN"
 msgstr "基本判别名"
 
-#: templates/settings.php:22
+#: templates/settings.php:27
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:28
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "您可以在高级选项卡中为用户和群组指定基本判别名"
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "User DN"
 msgstr "用户判别名"
 
-#: templates/settings.php:23
+#: templates/settings.php:32
 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:24
+#: templates/settings.php:33
 msgid "Password"
 msgstr "密码"
 
-#: templates/settings.php:24
+#: templates/settings.php:36
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "匿名访问请留空判别名和密码。"
 
-#: templates/settings.php:25
+#: templates/settings.php:37
 msgid "User Login Filter"
 msgstr "用户登录过滤器"
 
-#: templates/settings.php:25
+#: templates/settings.php:40
 #, 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:25
+#: templates/settings.php:41
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "使用 %%uid 占位符,例如 \"uid=%%uid\""
 
-#: templates/settings.php:26
+#: templates/settings.php:42
 msgid "User List Filter"
 msgstr "用户列表过滤器"
 
-#: templates/settings.php:26
+#: templates/settings.php:45
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "定义撷取用户时要应用的过滤器。"
 
-#: templates/settings.php:26
+#: templates/settings.php:46
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "不能使用占位符,例如 \"objectClass=person\"。"
 
-#: templates/settings.php:27
+#: templates/settings.php:47
 msgid "Group Filter"
 msgstr "群组过滤器"
 
-#: templates/settings.php:27
+#: templates/settings.php:50
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "定义撷取群组时要应用的过滤器"
 
-#: templates/settings.php:27
+#: templates/settings.php:51
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "不能使用占位符,例如 \"objectClass=posixGroup\"。"
 
-#: templates/settings.php:31
+#: templates/settings.php:55
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:34
+#: templates/settings.php:58
 msgid "Port"
 msgstr "端口"
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:60
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Use TLS"
 msgstr "使用 TLS"
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:39
+#: templates/settings.php:63
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "大小写不敏感的 LDAP 服务器 (Windows)"
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid "Turn off SSL certificate validation."
 msgstr "关闭 SSL 证书校验。"
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 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:40
+#: templates/settings.php:64
 msgid "Not recommended, use for testing only."
 msgstr "不推荐,仅供测试"
 
-#: templates/settings.php:41
+#: templates/settings.php:65
+msgid "Cache Time-To-Live"
+msgstr ""
+
+#: templates/settings.php:65
 msgid "in seconds. A change empties the cache."
 msgstr "以秒计。修改会清空缓存。"
 
-#: templates/settings.php:43
+#: templates/settings.php:67
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "User Display Name Field"
 msgstr "用户显示名称字段"
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "用于生成用户的 ownCloud 名称的 LDAP 属性。"
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "Base User Tree"
 msgstr "基本用户树"
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:47
+#: templates/settings.php:71
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:47 templates/settings.php:50
+#: templates/settings.php:71 templates/settings.php:74
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "Group Display Name Field"
 msgstr "群组显示名称字段"
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "用于生成群组的 ownCloud 名称的 LDAP 属性。"
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "Base Group Tree"
 msgstr "基本群组树"
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:74
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:75
 msgid "Group-Member association"
 msgstr "群组-成员组合"
 
-#: templates/settings.php:53
+#: templates/settings.php:77
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:79
+msgid "Quota Field"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Quota Default"
+msgstr ""
+
+#: templates/settings.php:80
 msgid "in bytes"
 msgstr "以字节计"
 
-#: templates/settings.php:58
+#: templates/settings.php:81
+msgid "Email Field"
+msgstr ""
+
+#: templates/settings.php:82
+msgid "User Home Folder Naming Rule"
+msgstr ""
+
+#: templates/settings.php:82
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "用户名请留空 (默认)。否则,请指定一个 LDAP/AD 属性。"
 
-#: templates/settings.php:62
+#: templates/settings.php:86
+msgid "Test Configuration"
+msgstr ""
+
+#: templates/settings.php:86
 msgid "Help"
 msgstr "帮助"
diff --git a/l10n/zh_CN/core.po b/l10n/zh_CN/core.po
index 1ea389e0f222591f91b03f53b8f30cc51dcc1e22..b1f593bcc25ad11981d9ceb3ab64628cfd20ed03 100644
--- a/l10n/zh_CN/core.po
+++ b/l10n/zh_CN/core.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 14:32+0000\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"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -392,7 +392,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 "重置 ownCloud 密码"
 
diff --git a/l10n/zh_CN/files.po b/l10n/zh_CN/files.po
index 76347b180a28a339945f8f0295b7c9391cbcc277..c62eacf1cb11566071b7a5c1a5b82a14f6310987 100644
--- a/l10n/zh_CN/files.po
+++ b/l10n/zh_CN/files.po
@@ -14,8 +14,8 @@ 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 23:05+0000\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: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -57,27 +57,27 @@ msgid ""
 "the HTML form"
 msgstr "上传的文件超过了在HTML 表单中指定的MAX_FILE_SIZE"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
 msgstr "只上传了文件的一部分"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:31
 msgid "No file was uploaded"
 msgstr "文件没有上传"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:32
 msgid "Missing a temporary folder"
 msgstr "缺少临时目录"
 
-#: ajax/upload.php:34
+#: ajax/upload.php:33
 msgid "Failed to write to disk"
 msgstr "写入磁盘失败"
 
-#: ajax/upload.php:52
+#: ajax/upload.php:51
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:83
+#: ajax/upload.php:82
 msgid "Invalid directory."
 msgstr "无效文件夹。"
 
@@ -89,7 +89,7 @@ msgstr "文件"
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:127 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:127 templates/index.php:92 templates/index.php:93
 msgid "Delete"
 msgstr "删除"
 
@@ -97,40 +97,36 @@ msgstr "删除"
 msgid "Rename"
 msgstr "重命名"
 
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
 msgid "Pending"
 msgstr "操作等待中"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "{new_name} already exists"
 msgstr "{new_name} 已存在"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "replace"
 msgstr "替换"
 
-#: js/filelist.js:253
+#: js/filelist.js:251
 msgid "suggest name"
 msgstr "建议名称"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "cancel"
 msgstr "取消"
 
-#: js/filelist.js:295
-msgid "replaced {new_name}"
-msgstr "替换 {new_name}"
+#: js/filelist.js:298
+msgid "replaced {new_name} with {old_name}"
+msgstr "已将 {old_name}替换成 {new_name}"
 
-#: js/filelist.js:295 js/filelist.js:297
+#: js/filelist.js:298
 msgid "undo"
 msgstr "撤销"
 
-#: js/filelist.js:297
-msgid "replaced {new_name} with {old_name}"
-msgstr "已将 {old_name}替换成 {new_name}"
-
-#: js/filelist.js:322
+#: js/filelist.js:323
 msgid "perform delete operation"
 msgstr ""
 
@@ -156,74 +152,74 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:224
+#: js/files.js:225
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "下载正在准备中。如果文件较大可能会花费一些时间。"
 
-#: js/files.js:261
+#: js/files.js:262
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "无法上传文件,因为它是一个目录或者大小为 0 字节"
 
-#: js/files.js:261
+#: js/files.js:262
 msgid "Upload Error"
 msgstr "上传错误"
 
-#: js/files.js:272
+#: js/files.js:273
 msgid "Close"
 msgstr "关闭"
 
-#: js/files.js:311
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr "1个文件上传中"
 
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr "{count} 个文件上传中"
 
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "上传已取消"
 
-#: js/files.js:496
+#: js/files.js:497
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "文件正在上传中。现在离开此页会导致上传动作被取消。"
 
-#: js/files.js:569
+#: js/files.js:570
 msgid "URL cannot be empty."
 msgstr "URL不能为空"
 
-#: js/files.js:574
+#: js/files.js:575
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "无效文件夹名。'共享' 是 Owncloud 预留的文件夹名。"
 
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:953 templates/index.php:68
 msgid "Name"
 msgstr "名称"
 
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:954 templates/index.php:79
 msgid "Size"
 msgstr "大小"
 
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:955 templates/index.php:81
 msgid "Modified"
 msgstr "修改日期"
 
-#: js/files.js:969
+#: js/files.js:974
 msgid "1 folder"
 msgstr "1个文件夹"
 
-#: js/files.js:971
+#: js/files.js:976
 msgid "{count} folders"
 msgstr "{count} 个文件夹"
 
-#: js/files.js:979
+#: js/files.js:984
 msgid "1 file"
 msgstr "1 个文件"
 
-#: js/files.js:981
+#: js/files.js:986
 msgid "{count} files"
 msgstr "{count} 个文件"
 
@@ -287,33 +283,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr "取消上传"
 
-#: templates/index.php:59
+#: templates/index.php:53
+msgid "You don’t have write permissions here."
+msgstr ""
+
+#: templates/index.php:60
 msgid "Nothing in here. Upload something!"
 msgstr "这里还什么都没有。上传些东西吧!"
 
-#: templates/index.php:73
+#: templates/index.php:74
 msgid "Download"
 msgstr "下载"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:86 templates/index.php:87
 msgid "Unshare"
 msgstr "取消分享"
 
-#: templates/index.php:105
+#: templates/index.php:106
 msgid "Upload too large"
 msgstr "上传文件过大"
 
-#: templates/index.php:107
+#: templates/index.php:108
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "您正尝试上传的文件超过了此服务器可以上传的最大容量限制"
 
-#: templates/index.php:112
+#: templates/index.php:113
 msgid "Files are being scanned, please wait."
 msgstr "文件正在被扫描,请稍候。"
 
-#: templates/index.php:115
+#: templates/index.php:116
 msgid "Current scanning"
 msgstr "当前扫描"
 
diff --git a/l10n/zh_CN/files_external.po b/l10n/zh_CN/files_external.po
index 674ecf16c69a6497a86dc769459dad7aa1ef1557..f4a457ca68cb40a530222170df5e08294c364e17 100644
--- a/l10n/zh_CN/files_external.po
+++ b/l10n/zh_CN/files_external.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-24 00:10+0100\n"
-"PO-Revision-Date: 2012-12-23 14:40+0000\n"
-"Last-Translator: Dianjin Wang <1132321739qq@gmail.com>\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"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,37 +19,33 @@ msgstr ""
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\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 "配置Dropbox存储时出错"
 
-#: 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 "请提供有效的Dropbox应用key和secret"
 
-#: 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 "配置Google Drive存储时出错"
 
-#: lib/config.php:434
+#: lib/config.php:421
 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:435
+#: lib/config.php:424
 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 "
@@ -60,63 +56,63 @@ msgstr "<b>警告:</b>PHP中尚未启用或安装FTP。FTP 分享挂载无法
 msgid "External Storage"
 msgstr "外部存储"
 
-#: templates/settings.php:8 templates/settings.php:22
-msgid "Mount point"
-msgstr "挂载点"
-
-#: templates/settings.php:9
-msgid "Backend"
-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: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"
-msgstr "增加挂载点"
+#: 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 "用户"
 
-#: templates/settings.php:108 templates/settings.php:109
-#: templates/settings.php:144 templates/settings.php:145
+#: templates/settings.php:113 templates/settings.php:114
+#: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
 msgstr "删除"
 
-#: 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:136
+#: templates/settings.php:141
 msgid "SSL root certificates"
 msgstr "SSL根证书"
 
-#: templates/settings.php:153
+#: templates/settings.php:159
 msgid "Import Root Certificate"
 msgstr "导入根证书"
diff --git a/l10n/zh_CN/files_trashbin.po b/l10n/zh_CN/files_trashbin.po
index 74ce3be6ba6d4c2058f959aa70b2bbdbe3c1ffc6..91cae3fa60fff3f9a7c4651d38367c262ee54354 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-02-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 10:07+0000\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: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/delete.php:22
+#: ajax/delete.php:40
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
@@ -27,35 +27,39 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:33
+#: js/trash.js:34
 msgid "delete file permanently"
 msgstr ""
 
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr ""
+
+#: js/trash.js:174 templates/index.php:17
 msgid "Name"
 msgstr "名称"
 
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:175 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:135
+#: js/trash.js:184
 msgid "1 folder"
 msgstr "1个文件夹"
 
-#: js/trash.js:137
+#: js/trash.js:186
 msgid "{count} folders"
 msgstr "{count} 个文件夹"
 
-#: js/trash.js:145
+#: js/trash.js:194
 msgid "1 file"
 msgstr "1 个文件"
 
-#: js/trash.js:147
+#: js/trash.js:196
 msgid "{count} files"
 msgstr "{count} 个文件"
 
@@ -66,3 +70,11 @@ 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/zh_CN/files_versions.po b/l10n/zh_CN/files_versions.po
index fef8172901c2a45ed9cc949355c9df8c1e78dc90..ada0de78abe97259dca52d068e8f097c0f43975e 100644
--- a/l10n/zh_CN/files_versions.po
+++ b/l10n/zh_CN/files_versions.po
@@ -4,13 +4,14 @@
 # 
 # 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-02-08 00:10+0100\n"
-"PO-Revision-Date: 2013-02-07 23:11+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "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"
@@ -21,46 +22,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:16
-msgid "History"
-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 ""
-
-#: templates/settings.php:3
-msgid "Files Versioning"
-msgstr "文件版本"
-
-#: templates/settings.php:4
-msgid "Enable"
-msgstr "开启"
+msgstr "点击恢复按钮可将文件恢复到之前的版本"
diff --git a/l10n/zh_CN/lib.po b/l10n/zh_CN/lib.po
index a1f1c4684229c21f4b46bb85d0f120d4bf02e1f1..55b00867f9fa24730de49e5f2acfcebeb0d30eaa 100644
--- a/l10n/zh_CN/lib.po
+++ b/l10n/zh_CN/lib.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-11 15:39+0100\n"
-"PO-Revision-Date: 2013-02-11 14:41+0000\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: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -19,27 +19,27 @@ msgstr ""
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: app.php:339
+#: app.php:349
 msgid "Help"
 msgstr "帮助"
 
-#: app.php:346
+#: app.php:362
 msgid "Personal"
 msgstr "个人"
 
-#: app.php:351
+#: app.php:373
 msgid "Settings"
 msgstr "设置"
 
-#: app.php:356
+#: app.php:385
 msgid "Users"
 msgstr "用户"
 
-#: app.php:363
+#: app.php:398
 msgid "Apps"
 msgstr "应用"
 
-#: app.php:365
+#: app.php:406
 msgid "Admin"
 msgstr "管理"
 
@@ -51,15 +51,15 @@ msgstr "ZIP 下载已经关闭"
 msgid "Files need to be downloaded one by one."
 msgstr "需要逐一下载文件"
 
-#: files.php:203 files.php:228
+#: files.php:204 files.php:231
 msgid "Back to Files"
 msgstr "回到文件"
 
-#: files.php:227
+#: files.php:228
 msgid "Selected files too large to generate zip file."
 msgstr "选择的文件太大,无法生成 zip 文件。"
 
-#: helper.php:226
+#: helper.php:228
 msgid "couldn't be determined"
 msgstr ""
 
@@ -99,87 +99,92 @@ msgstr ""
 msgid "Specify a data folder."
 msgstr ""
 
-#: setup.php:53
+#: setup.php:55
 #, php-format
 msgid "%s enter the database username."
 msgstr ""
 
-#: setup.php:56
+#: setup.php:58
 #, php-format
 msgid "%s enter the database name."
 msgstr ""
 
-#: setup.php:59
+#: setup.php:61
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr ""
 
-#: setup.php:62
+#: setup.php:64
 #, php-format
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:126 setup.php:291 setup.php:336
+#: setup.php:128 setup.php:320 setup.php:365
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:127 setup.php:150 setup.php:204
+#: setup.php:129 setup.php:152 setup.php:229
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:149 setup.php:423 setup.php:489
+#: setup.php:151 setup.php:453 setup.php:520
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:203
+#: setup.php:228
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:255 setup.php:357 setup.php:366 setup.php:384 setup.php:394
-#: setup.php:403 setup.php:430 setup.php:496 setup.php:522 setup.php:529
-#: setup.php:540 setup.php:547 setup.php:556 setup.php:564 setup.php:573
-#: setup.php:579
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:256 setup.php:358 setup.php:367 setup.php:385 setup.php:395
-#: setup.php:404 setup.php:431 setup.php:497 setup.php:523 setup.php:530
-#: setup.php:541 setup.php:557 setup.php:565 setup.php:574
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:270
+#: setup.php:299
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:271
+#: setup.php:300
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:276
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:277
+#: setup.php:306
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:548 setup.php:580
+#: setup.php:579 setup.php:611
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:644
+#: setup.php:631
+#, php-format
+msgid "MS SQL username and/or password not valid: %s"
+msgstr ""
+
+#: setup.php:849
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:645
+#: setup.php:850
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
@@ -236,16 +241,16 @@ msgstr "上年"
 msgid "years ago"
 msgstr "几年前"
 
-#: updater.php:75
+#: updater.php:78
 #, php-format
 msgid "%s is available. Get <a href=\"%s\">more information</a>"
 msgstr "%s 已存在. 点此 <a href=\"%s\">获取更多信息</a>"
 
-#: updater.php:77
+#: updater.php:81
 msgid "up to date"
 msgstr "已更新。"
 
-#: updater.php:80
+#: updater.php:84
 msgid "updates check is disabled"
 msgstr "检查更新功能被关闭。"
 
diff --git a/l10n/zh_CN/settings.po b/l10n/zh_CN/settings.po
index aeb9677b6716209b8bf1cf52b2e410eb9c790625..2262b78d9519bc98142ce8fd5edc033ba137c841 100644
--- a/l10n/zh_CN/settings.po
+++ b/l10n/zh_CN/settings.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 23:05+0000\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"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -27,8 +27,8 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "无法从应用商店载入列表"
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:15
-#: ajax/togglegroups.php:18
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr "认证错误"
 
@@ -76,12 +76,12 @@ 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 "无法把用户添加到组 %s"
 
-#: ajax/togglegroups.php:34
+#: ajax/togglegroups.php:36
 #, php-format
 msgid "Unable to remove user from group %s"
 msgstr "无法从组%s中移除用户"
@@ -122,7 +122,7 @@ msgstr "错误"
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:96
+#: js/personal.js:99
 msgid "Saving..."
 msgstr "正在保存"
 
@@ -151,23 +151,23 @@ msgstr "组管理员"
 msgid "Delete"
 msgstr "删除"
 
-#: js/users.js:190
+#: js/users.js:191
 msgid "add group"
 msgstr ""
 
-#: js/users.js:351
+#: js/users.js:352
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:357
+#: js/users.js:358
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
 msgid "__language_name__"
 msgstr "简体中文"
 
@@ -213,19 +213,19 @@ msgstr ""
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:61
+#: templates/admin.php:63
+#, php-format
 msgid ""
-"This ownCloud server can't set system locale to "
-"\"en_US.UTF-8\"/\"en_US.UTF8\". 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 en_US.UTF-8/en_US.UTF8."
+"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:72
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:75
+#: 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 "
@@ -235,98 +235,98 @@ msgid ""
 " of ownCloud."
 msgstr ""
 
-#: templates/admin.php:89
+#: templates/admin.php:92
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:98
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:108
+#: 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:118
+#: 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:125
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:131
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:132
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:140
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:147
+#: templates/admin.php:150
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:148
+#: templates/admin.php:151
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:155
+#: templates/admin.php:158
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:161
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:165
+#: templates/admin.php:168
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:181
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:179
+#: templates/admin.php:182
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:182
+#: templates/admin.php:185
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr ""
 
-#: templates/admin.php:192
+#: templates/admin.php:195
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:193
+#: templates/admin.php:196
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:220
+#: templates/admin.php:223
 msgid "More"
 msgstr "更多"
 
-#: templates/admin.php:227 templates/personal.php:98
+#: templates/admin.php:230 templates/personal.php:102
 msgid "Version"
 msgstr "版本"
 
-#: templates/admin.php:230 templates/personal.php:100
+#: templates/admin.php:233 templates/personal.php:105
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -336,51 +336,51 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "由<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud社区</a>开发,  <a href=\"https://github.com/owncloud\" target=\"_blank\">源代码</a>在<a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>许可证下发布。"
 
-#: templates/apps.php:10
+#: templates/apps.php:11
 msgid "Add your App"
 msgstr "添加应用"
 
-#: templates/apps.php:11
+#: templates/apps.php:12
 msgid "More Apps"
 msgstr "更多应用"
 
-#: templates/apps.php:24
+#: templates/apps.php:28
 msgid "Select an App"
 msgstr "选择一个应用"
 
-#: templates/apps.php:28
+#: templates/apps.php:34
 msgid "See application page at apps.owncloud.com"
 msgstr "查看在 app.owncloud.com 的应用程序页面"
 
-#: templates/apps.php:29
+#: templates/apps.php:36
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-核准: <span class=\"author\"></span>"
 
-#: templates/apps.php:31
+#: templates/apps.php:38
 msgid "Update"
 msgstr "更新"
 
-#: templates/help.php:3
+#: 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 "商业支持"
 
@@ -389,79 +389,79 @@ msgstr "商业支持"
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "你已使用 <strong>%s</strong>,有效空间 <strong>%s</strong>"
 
-#: templates/personal.php:14
+#: templates/personal.php:15
 msgid "Get the apps to sync your files"
-msgstr ""
+msgstr "安装应用进行文件同步"
 
-#: templates/personal.php:25
+#: templates/personal.php:26
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:36 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
 msgid "Password"
 msgstr "密码"
 
-#: templates/personal.php:37
+#: templates/personal.php:38
 msgid "Your password was changed"
 msgstr "密码已修改"
 
-#: templates/personal.php:38
+#: templates/personal.php:39
 msgid "Unable to change your password"
 msgstr "无法修改密码"
 
-#: templates/personal.php:39
+#: templates/personal.php:40
 msgid "Current password"
 msgstr "当前密码"
 
-#: templates/personal.php:40
+#: templates/personal.php:42
 msgid "New password"
 msgstr "新密码"
 
-#: templates/personal.php:42
+#: templates/personal.php:44
 msgid "Change password"
 msgstr "修改密码"
 
-#: templates/personal.php:54 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:78
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:55
+#: templates/personal.php:57
 msgid "Your display name was changed"
 msgstr ""
 
-#: templates/personal.php:56
+#: templates/personal.php:58
 msgid "Unable to change your display name"
 msgstr ""
 
-#: templates/personal.php:59
+#: templates/personal.php:61
 msgid "Change display name"
 msgstr ""
 
-#: templates/personal.php:68
+#: templates/personal.php:70
 msgid "Email"
 msgstr "电子邮件"
 
-#: templates/personal.php:69
+#: templates/personal.php:72
 msgid "Your email address"
 msgstr "您的电子邮件"
 
-#: templates/personal.php:70
+#: templates/personal.php:73
 msgid "Fill in an email address to enable password recovery"
 msgstr "填写电子邮件地址以启用密码恢复功能"
 
-#: templates/personal.php:76 templates/personal.php:77
+#: templates/personal.php:79 templates/personal.php:80
 msgid "Language"
 msgstr "语言"
 
-#: templates/personal.php:82
+#: templates/personal.php:86
 msgid "Help translate"
 msgstr "帮助翻译"
 
-#: templates/personal.php:87
+#: templates/personal.php:91
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:89
+#: templates/personal.php:93
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "用该地址来连接文件管理器中的 ownCloud"
 
diff --git a/l10n/zh_CN/user_ldap.po b/l10n/zh_CN/user_ldap.po
index 1f5920201f9cabb6e8b68f22d7fcf84fda84bff8..4d9a5122f2cc7f1baea938efd7664caaae5a541d 100644
--- a/l10n/zh_CN/user_ldap.po
+++ b/l10n/zh_CN/user_ldap.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-08 00:10+0100\n"
-"PO-Revision-Date: 2013-02-07 23:11+0000\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: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -23,17 +23,17 @@ msgstr ""
 msgid "Failed to delete the server configuration"
 msgstr ""
 
-#: ajax/testConfiguration.php:35
+#: ajax/testConfiguration.php:36
 msgid "The configuration is valid and the connection could be established!"
 msgstr ""
 
-#: ajax/testConfiguration.php:37
+#: ajax/testConfiguration.php:39
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
 msgstr ""
 
-#: ajax/testConfiguration.php:40
+#: ajax/testConfiguration.php:43
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
@@ -88,224 +88,248 @@ msgstr ""
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:17
+#: templates/settings.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:23
 msgid "Host"
 msgstr "主机"
 
-#: templates/settings.php:21
+#: templates/settings.php:25
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "可以忽略协议,但如要使用SSL,则需以ldaps://开头"
 
-#: templates/settings.php:22
+#: templates/settings.php:26
 msgid "Base DN"
 msgstr "Base DN"
 
-#: templates/settings.php:22
+#: templates/settings.php:27
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:28
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "您可以在高级选项卡里为用户和组指定Base DN"
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "User DN"
 msgstr "User DN"
 
-#: templates/settings.php:23
+#: templates/settings.php:32
 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:24
+#: templates/settings.php:33
 msgid "Password"
 msgstr "密码"
 
-#: templates/settings.php:24
+#: templates/settings.php:36
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "启用匿名访问,将DN和密码保留为空"
 
-#: templates/settings.php:25
+#: templates/settings.php:37
 msgid "User Login Filter"
 msgstr "用户登录过滤"
 
-#: templates/settings.php:25
+#: templates/settings.php:40
 #, 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:25
+#: templates/settings.php:41
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "使用 %%uid作为占位符,例如“uid=%%uid”"
 
-#: templates/settings.php:26
+#: templates/settings.php:42
 msgid "User List Filter"
 msgstr "用户列表过滤"
 
-#: templates/settings.php:26
+#: templates/settings.php:45
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "定义拉取用户时的过滤器"
 
-#: templates/settings.php:26
+#: templates/settings.php:46
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "没有任何占位符,如 \"objectClass=person\"."
 
-#: templates/settings.php:27
+#: templates/settings.php:47
 msgid "Group Filter"
 msgstr "组过滤"
 
-#: templates/settings.php:27
+#: templates/settings.php:50
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "定义拉取组信息时的过滤器"
 
-#: templates/settings.php:27
+#: templates/settings.php:51
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "无需占位符,例如\"objectClass=posixGroup\""
 
-#: templates/settings.php:31
+#: templates/settings.php:55
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:34
+#: templates/settings.php:58
 msgid "Port"
 msgstr "端口"
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:60
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Use TLS"
 msgstr "使用TLS"
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:39
+#: templates/settings.php:63
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "大小写敏感LDAP服务器(Windows)"
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid "Turn off SSL certificate validation."
 msgstr "关闭SSL证书验证"
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 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:40
+#: templates/settings.php:64
 msgid "Not recommended, use for testing only."
 msgstr "暂不推荐,仅供测试"
 
-#: templates/settings.php:41
+#: templates/settings.php:65
+msgid "Cache Time-To-Live"
+msgstr ""
+
+#: templates/settings.php:65
 msgid "in seconds. A change empties the cache."
 msgstr "以秒计。修改将清空缓存。"
 
-#: templates/settings.php:43
+#: templates/settings.php:67
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "User Display Name Field"
 msgstr "用户显示名称字段"
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "用来生成用户的ownCloud名称的 LDAP属性"
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "Base User Tree"
 msgstr "基础用户树"
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:47
+#: templates/settings.php:71
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:47 templates/settings.php:50
+#: templates/settings.php:71 templates/settings.php:74
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "Group Display Name Field"
 msgstr "组显示名称字段"
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "用来生成组的ownCloud名称的LDAP属性"
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "Base Group Tree"
 msgstr "基础组树"
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:74
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:75
 msgid "Group-Member association"
 msgstr "组成员关联"
 
-#: templates/settings.php:53
+#: templates/settings.php:77
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:79
+msgid "Quota Field"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Quota Default"
+msgstr ""
+
+#: templates/settings.php:80
 msgid "in bytes"
 msgstr "字节数"
 
-#: templates/settings.php:58
+#: templates/settings.php:81
+msgid "Email Field"
+msgstr ""
+
+#: templates/settings.php:82
+msgid "User Home Folder Naming Rule"
+msgstr ""
+
+#: templates/settings.php:82
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "将用户名称留空(默认)。否则指定一个LDAP/AD属性"
 
-#: templates/settings.php:62
+#: templates/settings.php:86
+msgid "Test Configuration"
+msgstr ""
+
+#: templates/settings.php:86
 msgid "Help"
 msgstr "帮助"
diff --git a/l10n/zh_HK/files.po b/l10n/zh_HK/files.po
index 81c2adf9f00ce93c4f6ca90db122e57fa7396483..6fb648527a3480bc7450f87f850c0bda00291122 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-02-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\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: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
@@ -50,27 +50,27 @@ msgid ""
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:31
+#: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:32
+#: ajax/upload.php:31
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:33
+#: ajax/upload.php:32
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:34
+#: ajax/upload.php:33
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:52
+#: ajax/upload.php:51
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:83
+#: ajax/upload.php:82
 msgid "Invalid directory."
 msgstr ""
 
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:127 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:127 templates/index.php:92 templates/index.php:93
 msgid "Delete"
 msgstr ""
 
@@ -90,40 +90,36 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:253
+#: js/filelist.js:251
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:295
-msgid "replaced {new_name}"
+#: js/filelist.js:298
+msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:295 js/filelist.js:297
+#: js/filelist.js:298
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:297
-msgid "replaced {new_name} with {old_name}"
-msgstr ""
-
-#: js/filelist.js:322
+#: js/filelist.js:323
 msgid "perform delete operation"
 msgstr ""
 
@@ -149,74 +145,74 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:224
+#: js/files.js:225
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:261
+#: js/files.js:262
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:261
+#: js/files.js:262
 msgid "Upload Error"
 msgstr ""
 
-#: js/files.js:272
+#: js/files.js:273
 msgid "Close"
 msgstr ""
 
-#: js/files.js:311
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr ""
 
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr ""
 
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:496
+#: js/files.js:497
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:569
+#: js/files.js:570
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:574
+#: js/files.js:575
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:953 templates/index.php:68
 msgid "Name"
 msgstr ""
 
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:954 templates/index.php:79
 msgid "Size"
 msgstr ""
 
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:955 templates/index.php:81
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:969
+#: js/files.js:974
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:971
+#: js/files.js:976
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:979
+#: js/files.js:984
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:981
+#: js/files.js:986
 msgid "{count} files"
 msgstr ""
 
@@ -280,33 +276,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:53
+msgid "You don’t have write permissions here."
+msgstr ""
+
+#: templates/index.php:60
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:73
+#: templates/index.php:74
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:86 templates/index.php:87
 msgid "Unshare"
 msgstr ""
 
-#: templates/index.php:105
+#: templates/index.php:106
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:107
+#: templates/index.php:108
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:112
+#: templates/index.php:113
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:115
+#: templates/index.php:116
 msgid "Current scanning"
 msgstr ""
 
diff --git a/l10n/zh_HK/files_external.po b/l10n/zh_HK/files_external.po
index 0b9d4d015c3ea2eecfa0f029458067e15afc7bf4..95bd8e76a913cd4a3169ad0569298c0178ba1f34 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: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-11 23:22+0000\n"
+"POT-Creation-Date: 2013-02-28 00:04+0100\n"
+"PO-Revision-Date: 2013-02-27 23:04+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
@@ -17,37 +17,33 @@ msgstr ""
 "Language: zh_HK\n"
 "Plural-Forms: nplurals=1; plural=0;\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:421
 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:424
 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 "
@@ -58,63 +54,63 @@ msgstr ""
 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 ""
 
-#: 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 ""
 
-#: 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/zh_HK/files_trashbin.po b/l10n/zh_HK/files_trashbin.po
index 4d462824758817b07b1384e816ad218432c45042..efeae3b8e6c9f6c80934f00528dbe7c182c55b59 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-02-08 00:10+0100\n"
-"PO-Revision-Date: 2013-02-07 23:11+0000\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: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Language: zh_HK\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/delete.php:22
+#: ajax/delete.php:40
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
@@ -27,35 +27,39 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:33
+#: js/trash.js:34
 msgid "delete file permanently"
 msgstr ""
 
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr ""
+
+#: js/trash.js:174 templates/index.php:17
 msgid "Name"
 msgstr ""
 
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:175 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:135
+#: js/trash.js:184
 msgid "1 folder"
 msgstr ""
 
-#: js/trash.js:137
+#: js/trash.js:186
 msgid "{count} folders"
 msgstr ""
 
-#: js/trash.js:145
+#: js/trash.js:194
 msgid "1 file"
 msgstr ""
 
-#: js/trash.js:147
+#: js/trash.js:196
 msgid "{count} files"
 msgstr ""
 
@@ -66,3 +70,11 @@ 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/zh_HK/files_versions.po b/l10n/zh_HK/files_versions.po
index 0b4229496a94aebf0dbe5ccd3f06cbca937aa2b6..893fb184e9b688b73829f037d64a01e12956a3ed 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-08 00:10+0100\n"
-"PO-Revision-Date: 2013-02-07 23:11+0000\n"
+"POT-Creation-Date: 2013-02-28 00:04+0100\n"
+"PO-Revision-Date: 2013-02-27 23:04+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
@@ -48,18 +48,10 @@ msgstr ""
 msgid "No path specified"
 msgstr ""
 
-#: js/versions.js:16
-msgid "History"
+#: 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 ""
-
-#: templates/settings.php:3
-msgid "Files Versioning"
-msgstr ""
-
-#: templates/settings.php:4
-msgid "Enable"
-msgstr ""
diff --git a/l10n/zh_HK/lib.po b/l10n/zh_HK/lib.po
index 9962c216301cb632b77a2bc333c88eced264231b..17cc01004159d99ad864d78b231ce06b6afff87c 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-11 15:39+0100\n"
-"PO-Revision-Date: 2013-02-11 14:41+0000\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: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
@@ -17,27 +17,27 @@ msgstr ""
 "Language: zh_HK\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: app.php:339
+#: app.php:349
 msgid "Help"
 msgstr ""
 
-#: app.php:346
+#: app.php:362
 msgid "Personal"
 msgstr ""
 
-#: app.php:351
+#: app.php:373
 msgid "Settings"
 msgstr ""
 
-#: app.php:356
+#: app.php:385
 msgid "Users"
 msgstr ""
 
-#: app.php:363
+#: app.php:398
 msgid "Apps"
 msgstr ""
 
-#: app.php:365
+#: app.php:406
 msgid "Admin"
 msgstr ""
 
@@ -49,15 +49,15 @@ msgstr ""
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:203 files.php:228
+#: files.php:204 files.php:231
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:227
+#: files.php:228
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: helper.php:226
+#: helper.php:228
 msgid "couldn't be determined"
 msgstr ""
 
@@ -97,87 +97,92 @@ msgstr ""
 msgid "Specify a data folder."
 msgstr ""
 
-#: setup.php:53
+#: setup.php:55
 #, php-format
 msgid "%s enter the database username."
 msgstr ""
 
-#: setup.php:56
+#: setup.php:58
 #, php-format
 msgid "%s enter the database name."
 msgstr ""
 
-#: setup.php:59
+#: setup.php:61
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr ""
 
-#: setup.php:62
+#: setup.php:64
 #, php-format
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:126 setup.php:291 setup.php:336
+#: setup.php:128 setup.php:320 setup.php:365
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:127 setup.php:150 setup.php:204
+#: setup.php:129 setup.php:152 setup.php:229
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:149 setup.php:423 setup.php:489
+#: setup.php:151 setup.php:453 setup.php:520
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:203
+#: setup.php:228
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:255 setup.php:357 setup.php:366 setup.php:384 setup.php:394
-#: setup.php:403 setup.php:430 setup.php:496 setup.php:522 setup.php:529
-#: setup.php:540 setup.php:547 setup.php:556 setup.php:564 setup.php:573
-#: setup.php:579
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:256 setup.php:358 setup.php:367 setup.php:385 setup.php:395
-#: setup.php:404 setup.php:431 setup.php:497 setup.php:523 setup.php:530
-#: setup.php:541 setup.php:557 setup.php:565 setup.php:574
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:270
+#: setup.php:299
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:271
+#: setup.php:300
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:276
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:277
+#: setup.php:306
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:548 setup.php:580
+#: setup.php:579 setup.php:611
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:644
+#: setup.php:631
+#, php-format
+msgid "MS SQL username and/or password not valid: %s"
+msgstr ""
+
+#: setup.php:849
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:645
+#: setup.php:850
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
@@ -234,16 +239,16 @@ msgstr ""
 msgid "years ago"
 msgstr ""
 
-#: updater.php:75
+#: updater.php:78
 #, php-format
 msgid "%s is available. Get <a href=\"%s\">more information</a>"
 msgstr ""
 
-#: updater.php:77
+#: updater.php:81
 msgid "up to date"
 msgstr ""
 
-#: updater.php:80
+#: updater.php:84
 msgid "updates check is disabled"
 msgstr ""
 
diff --git a/l10n/zh_HK/settings.po b/l10n/zh_HK/settings.po
index b5a84c03753be669bf327bfe8253187bb3778750..5650c789106bddbe5c2b1be4bd7089a00fea21c8 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-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 23:05+0000\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: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
@@ -21,8 +21,8 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr ""
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:15
-#: ajax/togglegroups.php:18
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr ""
 
@@ -70,12 +70,12 @@ 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 ""
@@ -116,7 +116,7 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:96
+#: js/personal.js:99
 msgid "Saving..."
 msgstr ""
 
@@ -145,23 +145,23 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
-#: js/users.js:190
+#: js/users.js:191
 msgid "add group"
 msgstr ""
 
-#: js/users.js:351
+#: js/users.js:352
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:357
+#: js/users.js:358
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
 msgid "__language_name__"
 msgstr ""
 
@@ -207,19 +207,19 @@ msgstr ""
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:61
+#: templates/admin.php:63
+#, php-format
 msgid ""
-"This ownCloud server can't set system locale to "
-"\"en_US.UTF-8\"/\"en_US.UTF8\". 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 en_US.UTF-8/en_US.UTF8."
+"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:72
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:75
+#: 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 "
@@ -229,98 +229,98 @@ msgid ""
 " of ownCloud."
 msgstr ""
 
-#: templates/admin.php:89
+#: templates/admin.php:92
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:98
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:108
+#: 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:118
+#: 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:125
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:131
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:132
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:140
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:147
+#: templates/admin.php:150
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:148
+#: templates/admin.php:151
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:155
+#: templates/admin.php:158
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:161
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:165
+#: templates/admin.php:168
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:181
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:179
+#: templates/admin.php:182
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:182
+#: templates/admin.php:185
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr ""
 
-#: templates/admin.php:192
+#: templates/admin.php:195
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:193
+#: templates/admin.php:196
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:220
+#: templates/admin.php:223
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:227 templates/personal.php:98
+#: templates/admin.php:230 templates/personal.php:102
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:230 templates/personal.php:100
+#: templates/admin.php:233 templates/personal.php:105
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -330,51 +330,51 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr ""
 
-#: templates/apps.php:10
+#: templates/apps.php:11
 msgid "Add your App"
 msgstr ""
 
-#: templates/apps.php:11
+#: templates/apps.php:12
 msgid "More Apps"
 msgstr ""
 
-#: templates/apps.php:24
+#: templates/apps.php:28
 msgid "Select an App"
 msgstr ""
 
-#: templates/apps.php:28
+#: templates/apps.php:34
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:29
+#: templates/apps.php:36
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
-#: templates/apps.php:31
+#: templates/apps.php:38
 msgid "Update"
 msgstr ""
 
-#: templates/help.php:3
+#: 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 ""
 
@@ -383,79 +383,79 @@ msgstr ""
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:14
+#: templates/personal.php:15
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:25
+#: templates/personal.php:26
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:36 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
 msgid "Password"
 msgstr ""
 
-#: templates/personal.php:37
+#: templates/personal.php:38
 msgid "Your password was changed"
 msgstr ""
 
-#: templates/personal.php:38
+#: templates/personal.php:39
 msgid "Unable to change your password"
 msgstr ""
 
-#: templates/personal.php:39
+#: templates/personal.php:40
 msgid "Current password"
 msgstr ""
 
-#: templates/personal.php:40
+#: templates/personal.php:42
 msgid "New password"
 msgstr ""
 
-#: templates/personal.php:42
+#: templates/personal.php:44
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:54 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:78
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:55
+#: templates/personal.php:57
 msgid "Your display name was changed"
 msgstr ""
 
-#: templates/personal.php:56
+#: templates/personal.php:58
 msgid "Unable to change your display name"
 msgstr ""
 
-#: templates/personal.php:59
+#: templates/personal.php:61
 msgid "Change display name"
 msgstr ""
 
-#: templates/personal.php:68
+#: templates/personal.php:70
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:69
+#: templates/personal.php:72
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:70
+#: templates/personal.php:73
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:76 templates/personal.php:77
+#: templates/personal.php:79 templates/personal.php:80
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:82
+#: templates/personal.php:86
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:87
+#: templates/personal.php:91
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:89
+#: templates/personal.php:93
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
diff --git a/l10n/zh_HK/user_ldap.po b/l10n/zh_HK/user_ldap.po
index 3d9f862dc9ba7963f0388cb41ac15eeb58b2fb63..55843162a9486763353966ca8e3ac6439940103e 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-02-08 00:10+0100\n"
-"PO-Revision-Date: 2013-02-07 23:11+0000\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: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
@@ -21,17 +21,17 @@ msgstr ""
 msgid "Failed to delete the server configuration"
 msgstr ""
 
-#: ajax/testConfiguration.php:35
+#: ajax/testConfiguration.php:36
 msgid "The configuration is valid and the connection could be established!"
 msgstr ""
 
-#: ajax/testConfiguration.php:37
+#: ajax/testConfiguration.php:39
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
 msgstr ""
 
-#: ajax/testConfiguration.php:40
+#: ajax/testConfiguration.php:43
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
@@ -86,224 +86,248 @@ msgstr ""
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:17
+#: templates/settings.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:23
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:25
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:26
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:27
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:28
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:32
 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:24
+#: templates/settings.php:33
 msgid "Password"
 msgstr ""
 
-#: templates/settings.php:24
+#: templates/settings.php:36
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:37
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:40
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:41
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:42
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:45
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:46
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:47
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:50
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:51
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:55
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:34
+#: templates/settings.php:58
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:60
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:39
+#: templates/settings.php:63
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:65
+msgid "Cache Time-To-Live"
+msgstr ""
+
+#: templates/settings.php:65
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:67
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:47
+#: templates/settings.php:71
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:47 templates/settings.php:50
+#: templates/settings.php:71 templates/settings.php:74
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:74
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:75
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:77
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:79
+msgid "Quota Field"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Quota Default"
+msgstr ""
+
+#: templates/settings.php:80
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:81
+msgid "Email Field"
+msgstr ""
+
+#: templates/settings.php:82
+msgid "User Home Folder Naming Rule"
+msgstr ""
+
+#: templates/settings.php:82
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:62
+#: templates/settings.php:86
+msgid "Test Configuration"
+msgstr ""
+
+#: templates/settings.php:86
 msgid "Help"
 msgstr ""
diff --git a/l10n/zh_TW/core.po b/l10n/zh_TW/core.po
index 6aa6cc3d4c2af90cb82d748a6c90aa5bf26c877a..ac0cd1754c9c46579ddab98ce8ebb13e94bb1330 100644
--- a/l10n/zh_TW/core.po
+++ b/l10n/zh_TW/core.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 14:32+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23: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"
@@ -391,7 +391,7 @@ msgstr "升級失敗,請將此問題回報 <a href=\"https://github.com/ownclo
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "升級成功,正將您重新導向至 ownCloud 。"
 
-#: lostpassword/controller.php:47
+#: lostpassword/controller.php:48
 msgid "ownCloud password reset"
 msgstr "ownCloud 密碼重設"
 
diff --git a/l10n/zh_TW/files.po b/l10n/zh_TW/files.po
index 4532870022c62257ee61af217835b3989e024e8f..8a20a235c16e148ed1fd28ba3956f49ea425b858 100644
--- a/l10n/zh_TW/files.po
+++ b/l10n/zh_TW/files.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\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: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -56,27 +56,27 @@ msgid ""
 "the HTML form"
 msgstr "上傳的檔案大小超過 HTML 表單中 MAX_FILE_SIZE 的限制"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
 msgstr "只有檔案的一部分被上傳"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:31
 msgid "No file was uploaded"
 msgstr "無已上傳檔案"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:32
 msgid "Missing a temporary folder"
 msgstr "遺失暫存資料夾"
 
-#: ajax/upload.php:34
+#: ajax/upload.php:33
 msgid "Failed to write to disk"
 msgstr "寫入硬碟失敗"
 
-#: ajax/upload.php:52
+#: ajax/upload.php:51
 msgid "Not enough storage available"
 msgstr "儲存空間不足"
 
-#: ajax/upload.php:83
+#: ajax/upload.php:82
 msgid "Invalid directory."
 msgstr "無效的資料夾。"
 
@@ -88,7 +88,7 @@ msgstr "檔案"
 msgid "Delete permanently"
 msgstr "永久刪除"
 
-#: js/fileactions.js:127 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:127 templates/index.php:92 templates/index.php:93
 msgid "Delete"
 msgstr "刪除"
 
@@ -96,40 +96,36 @@ msgstr "刪除"
 msgid "Rename"
 msgstr "重新命名"
 
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
 msgid "Pending"
 msgstr "等候中"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "{new_name} already exists"
 msgstr "{new_name} 已經存在"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "replace"
 msgstr "取代"
 
-#: js/filelist.js:253
+#: js/filelist.js:251
 msgid "suggest name"
 msgstr "建議檔名"
 
-#: js/filelist.js:253 js/filelist.js:255
+#: js/filelist.js:251 js/filelist.js:253
 msgid "cancel"
 msgstr "取消"
 
-#: js/filelist.js:295
-msgid "replaced {new_name}"
-msgstr "已取代 {new_name}"
+#: js/filelist.js:298
+msgid "replaced {new_name} with {old_name}"
+msgstr "使用 {new_name} 取代 {old_name}"
 
-#: js/filelist.js:295 js/filelist.js:297
+#: js/filelist.js:298
 msgid "undo"
 msgstr "復原"
 
-#: js/filelist.js:297
-msgid "replaced {new_name} with {old_name}"
-msgstr "使用 {new_name} 取代 {old_name}"
-
-#: js/filelist.js:322
+#: js/filelist.js:323
 msgid "perform delete operation"
 msgstr "進行刪除動作"
 
@@ -155,74 +151,74 @@ msgstr "您的儲存空間已滿,沒有辦法再更新或是同步檔案!"
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "您的儲存空間快要滿了 ({usedSpacePercent}%)"
 
-#: js/files.js:224
+#: js/files.js:225
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "正在準備您的下載,若您的檔案較大,將會需要更多時間。"
 
-#: js/files.js:261
+#: js/files.js:262
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "無法上傳您的檔案因為它可能是一個目錄或檔案大小為0"
 
-#: js/files.js:261
+#: js/files.js:262
 msgid "Upload Error"
 msgstr "上傳發生錯誤"
 
-#: js/files.js:272
+#: js/files.js:273
 msgid "Close"
 msgstr "關閉"
 
-#: js/files.js:311
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr "1 個檔案正在上傳"
 
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr "{count} 個檔案正在上傳"
 
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "上傳取消"
 
-#: js/files.js:496
+#: js/files.js:497
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "檔案上傳中。離開此頁面將會取消上傳。"
 
-#: js/files.js:569
+#: js/files.js:570
 msgid "URL cannot be empty."
 msgstr "URL 不能為空白."
 
-#: js/files.js:574
+#: js/files.js:575
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "無效的資料夾名稱,'Shared' 的使用被 Owncloud 保留"
 
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:953 templates/index.php:68
 msgid "Name"
 msgstr "名稱"
 
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:954 templates/index.php:79
 msgid "Size"
 msgstr "大小"
 
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:955 templates/index.php:81
 msgid "Modified"
 msgstr "修改"
 
-#: js/files.js:969
+#: js/files.js:974
 msgid "1 folder"
 msgstr "1 個資料夾"
 
-#: js/files.js:971
+#: js/files.js:976
 msgid "{count} folders"
 msgstr "{count} 個資料夾"
 
-#: js/files.js:979
+#: js/files.js:984
 msgid "1 file"
 msgstr "1 個檔案"
 
-#: js/files.js:981
+#: js/files.js:986
 msgid "{count} files"
 msgstr "{count} 個檔案"
 
@@ -286,33 +282,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr "取消上傳"
 
-#: templates/index.php:59
+#: templates/index.php:53
+msgid "You don’t have write permissions here."
+msgstr ""
+
+#: templates/index.php:60
 msgid "Nothing in here. Upload something!"
 msgstr "沒有任何東西。請上傳內容!"
 
-#: templates/index.php:73
+#: templates/index.php:74
 msgid "Download"
 msgstr "下載"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:86 templates/index.php:87
 msgid "Unshare"
 msgstr "取消共享"
 
-#: templates/index.php:105
+#: templates/index.php:106
 msgid "Upload too large"
 msgstr "上傳過大"
 
-#: templates/index.php:107
+#: templates/index.php:108
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "您試圖上傳的檔案已超過伺服器的最大檔案大小限制。 "
 
-#: templates/index.php:112
+#: templates/index.php:113
 msgid "Files are being scanned, please wait."
 msgstr "正在掃描檔案,請稍等。"
 
-#: templates/index.php:115
+#: templates/index.php:116
 msgid "Current scanning"
 msgstr "目前掃描"
 
diff --git a/l10n/zh_TW/files_external.po b/l10n/zh_TW/files_external.po
index 88c257062d00fde4381c39d3b131c8a9253ec3b0..c8c303ef4ca072b4958d2f3785c2ac2e7f7f67fa 100644
--- a/l10n/zh_TW/files_external.po
+++ b/l10n/zh_TW/files_external.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-11 23:22+0000\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"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -18,37 +18,33 @@ msgstr ""
 "Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0;\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:421
 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:424
 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 "
@@ -59,63 +55,63 @@ msgstr ""
 msgid "External Storage"
 msgstr "外部儲存裝置"
 
-#: templates/settings.php:8 templates/settings.php:22
-msgid "Mount point"
-msgstr "掛載點"
+#: 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 "使用者"
 
-#: 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 "刪除"
 
-#: 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/zh_TW/files_trashbin.po b/l10n/zh_TW/files_trashbin.po
index ae0e1da91d89ec89afb942f3289a1eeadaaaacd0..286b95c98d16068f985f83904d1112953aa7fa11 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-02-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 10:07+0000\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: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/delete.php:22
+#: ajax/delete.php:40
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
@@ -27,35 +27,39 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:33
+#: js/trash.js:34
 msgid "delete file permanently"
 msgstr ""
 
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr "永久刪除"
+
+#: js/trash.js:174 templates/index.php:17
 msgid "Name"
 msgstr "名稱"
 
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:175 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:135
+#: js/trash.js:184
 msgid "1 folder"
 msgstr "1 個資料夾"
 
-#: js/trash.js:137
+#: js/trash.js:186
 msgid "{count} folders"
 msgstr "{count} 個資料夾"
 
-#: js/trash.js:145
+#: js/trash.js:194
 msgid "1 file"
 msgstr "1 個檔案"
 
-#: js/trash.js:147
+#: js/trash.js:196
 msgid "{count} files"
 msgstr "{count} 個檔案"
 
@@ -66,3 +70,11 @@ 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/zh_TW/files_versions.po b/l10n/zh_TW/files_versions.po
index 2855967dae236ee5790bbc46f7ce54424ac544d3..f95ce4dc60e7a259995d6d15221291aea8207308 100644
--- a/l10n/zh_TW/files_versions.po
+++ b/l10n/zh_TW/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-08 00:10+0100\n"
-"PO-Revision-Date: 2013-02-07 23:11+0000\n"
+"POT-Creation-Date: 2013-02-28 00:04+0100\n"
+"PO-Revision-Date: 2013-02-27 23:04+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -49,18 +49,10 @@ msgstr ""
 msgid "No path specified"
 msgstr ""
 
-#: js/versions.js:16
-msgid "History"
-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 ""
-
-#: templates/settings.php:3
-msgid "Files Versioning"
-msgstr "檔案版本化中..."
-
-#: templates/settings.php:4
-msgid "Enable"
-msgstr "啟用"
diff --git a/l10n/zh_TW/lib.po b/l10n/zh_TW/lib.po
index bee087a4a7021694dd3c78b615aea28ee1b8fc05..16d21a7a5ada610f84d481bf54a77c87bac8774e 100644
--- a/l10n/zh_TW/lib.po
+++ b/l10n/zh_TW/lib.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 14:33+0000\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: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -21,27 +21,27 @@ msgstr ""
 "Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: app.php:339
+#: app.php:349
 msgid "Help"
 msgstr "說明"
 
-#: app.php:346
+#: app.php:362
 msgid "Personal"
 msgstr "個人"
 
-#: app.php:351
+#: app.php:373
 msgid "Settings"
 msgstr "設定"
 
-#: app.php:356
+#: app.php:385
 msgid "Users"
 msgstr "使用者"
 
-#: app.php:363
+#: app.php:398
 msgid "Apps"
 msgstr "應用程式"
 
-#: app.php:365
+#: app.php:406
 msgid "Admin"
 msgstr "管理"
 
@@ -53,15 +53,15 @@ msgstr "ZIP 下載已關閉"
 msgid "Files need to be downloaded one by one."
 msgstr "檔案需要逐一下載"
 
-#: files.php:203 files.php:228
+#: files.php:204 files.php:231
 msgid "Back to Files"
 msgstr "回到檔案列表"
 
-#: files.php:227
+#: files.php:228
 msgid "Selected files too large to generate zip file."
 msgstr "選擇的檔案太大以致於無法產生壓縮檔"
 
-#: helper.php:226
+#: helper.php:228
 msgid "couldn't be determined"
 msgstr "無法判斷"
 
@@ -101,87 +101,92 @@ msgstr ""
 msgid "Specify a data folder."
 msgstr ""
 
-#: setup.php:53
+#: setup.php:55
 #, php-format
 msgid "%s enter the database username."
 msgstr ""
 
-#: setup.php:56
+#: setup.php:58
 #, php-format
 msgid "%s enter the database name."
 msgstr ""
 
-#: setup.php:59
+#: setup.php:61
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr ""
 
-#: setup.php:62
+#: setup.php:64
 #, php-format
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:126 setup.php:291 setup.php:336
+#: setup.php:128 setup.php:320 setup.php:365
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:127 setup.php:150 setup.php:204
+#: setup.php:129 setup.php:152 setup.php:229
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:149 setup.php:423 setup.php:489
+#: setup.php:151 setup.php:453 setup.php:520
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:203
+#: setup.php:228
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:255 setup.php:357 setup.php:366 setup.php:384 setup.php:394
-#: setup.php:403 setup.php:430 setup.php:496 setup.php:522 setup.php:529
-#: setup.php:540 setup.php:547 setup.php:556 setup.php:564 setup.php:573
-#: setup.php:579
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:256 setup.php:358 setup.php:367 setup.php:385 setup.php:395
-#: setup.php:404 setup.php:431 setup.php:497 setup.php:523 setup.php:530
-#: setup.php:541 setup.php:557 setup.php:565 setup.php:574
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:270
+#: setup.php:299
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:271
+#: setup.php:300
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:276
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:277
+#: setup.php:306
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:548 setup.php:580
+#: setup.php:579 setup.php:611
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:644
+#: setup.php:631
+#, php-format
+msgid "MS SQL username and/or password not valid: %s"
+msgstr ""
+
+#: setup.php:849
 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:645
+#: setup.php:850
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "請參考<a href='%s'>安裝指南</a>。"
@@ -238,16 +243,16 @@ msgstr "去年"
 msgid "years ago"
 msgstr "幾年前"
 
-#: updater.php:75
+#: updater.php:78
 #, php-format
 msgid "%s is available. Get <a href=\"%s\">more information</a>"
 msgstr "%s 已經可用。取得 <a href=\"%s\">更多資訊</a>"
 
-#: updater.php:77
+#: updater.php:81
 msgid "up to date"
 msgstr "最新的"
 
-#: updater.php:80
+#: updater.php:84
 msgid "updates check is disabled"
 msgstr "檢查更新已停用"
 
diff --git a/l10n/zh_TW/settings.po b/l10n/zh_TW/settings.po
index 2962f45fcb86bacf0bf8c00b509c1a0a679ad453..4136e0f0388b14fa0bb2064e566c8733601c8d47 100644
--- a/l10n/zh_TW/settings.po
+++ b/l10n/zh_TW/settings.po
@@ -8,6 +8,7 @@
 #   <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.
@@ -15,8 +16,8 @@ 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:05+0000\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: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -29,8 +30,8 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "無法從 App Store 讀取清單"
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:15
-#: ajax/togglegroups.php:18
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr "認證錯誤"
 
@@ -78,12 +79,12 @@ 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 "使用者加入群組%s錯誤"
 
-#: ajax/togglegroups.php:34
+#: ajax/togglegroups.php:36
 #, php-format
 msgid "Unable to remove user from group %s"
 msgstr "使用者移出群組%s錯誤"
@@ -124,13 +125,13 @@ msgstr "錯誤"
 msgid "Updated"
 msgstr "已更新"
 
-#: js/personal.js:96
+#: js/personal.js:99
 msgid "Saving..."
 msgstr "儲存中..."
 
 #: js/users.js:30
 msgid "deleted"
-msgstr ""
+msgstr "已刪除"
 
 #: js/users.js:30
 msgid "undo"
@@ -138,7 +139,7 @@ msgstr "復原"
 
 #: js/users.js:62
 msgid "Unable to remove user"
-msgstr ""
+msgstr "無法刪除用戶"
 
 #: js/users.js:75 templates/users.php:26 templates/users.php:80
 #: templates/users.php:105
@@ -153,23 +154,23 @@ msgstr "群組 管理員"
 msgid "Delete"
 msgstr "刪除"
 
-#: js/users.js:190
+#: js/users.js:191
 msgid "add group"
-msgstr ""
+msgstr "新增群組"
 
-#: js/users.js:351
+#: js/users.js:352
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:357
+#: js/users.js:358
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
 msgid "__language_name__"
 msgstr "__語言_名稱__"
 
@@ -215,19 +216,19 @@ msgstr ""
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:61
+#: templates/admin.php:63
+#, php-format
 msgid ""
-"This ownCloud server can't set system locale to "
-"\"en_US.UTF-8\"/\"en_US.UTF8\". 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 en_US.UTF-8/en_US.UTF8."
+"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:72
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:75
+#: 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 "
@@ -237,98 +238,98 @@ msgid ""
 " of ownCloud."
 msgstr ""
 
-#: templates/admin.php:89
+#: templates/admin.php:92
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:98
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:108
+#: 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:118
+#: 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:125
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:131
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:132
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:140
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:147
+#: templates/admin.php:150
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:148
+#: templates/admin.php:151
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:155
+#: templates/admin.php:158
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:161
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:165
+#: templates/admin.php:168
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:181
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:179
+#: templates/admin.php:182
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:182
+#: templates/admin.php:185
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr ""
 
-#: templates/admin.php:192
+#: templates/admin.php:195
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:193
+#: templates/admin.php:196
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:220
+#: templates/admin.php:223
 msgid "More"
 msgstr "更多"
 
-#: templates/admin.php:227 templates/personal.php:98
+#: templates/admin.php:230 templates/personal.php:102
 msgid "Version"
 msgstr "版本"
 
-#: templates/admin.php:230 templates/personal.php:100
+#: templates/admin.php:233 templates/personal.php:105
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -338,51 +339,51 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "由<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud 社區</a>開發,<a href=\"https://github.com/owncloud\" target=\"_blank\">源代碼</a>在<a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>許可證下發布。"
 
-#: templates/apps.php:10
+#: templates/apps.php:11
 msgid "Add your App"
 msgstr "添加你的 App"
 
-#: templates/apps.php:11
+#: templates/apps.php:12
 msgid "More Apps"
 msgstr "更多Apps"
 
-#: templates/apps.php:24
+#: templates/apps.php:28
 msgid "Select an App"
 msgstr "選擇一個應用程式"
 
-#: templates/apps.php:28
+#: templates/apps.php:34
 msgid "See application page at apps.owncloud.com"
 msgstr "查看應用程式頁面於 apps.owncloud.com"
 
-#: templates/apps.php:29
+#: templates/apps.php:36
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-核准: <span class=\"author\"></span>"
 
-#: templates/apps.php:31
+#: templates/apps.php:38
 msgid "Update"
 msgstr "更新"
 
-#: templates/help.php:3
+#: 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 "Bugtracker"
 
-#: templates/help.php:11
+#: templates/help.php:17
 msgid "Commercial Support"
 msgstr "商用支援"
 
@@ -391,79 +392,79 @@ msgstr "商用支援"
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "您已經使用了 <strong>%s</strong> ,目前可用空間為 <strong>%s</strong>"
 
-#: templates/personal.php:14
+#: templates/personal.php:15
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:25
+#: templates/personal.php:26
 msgid "Show First Run Wizard again"
 msgstr "再次顯示首次使用精靈"
 
-#: templates/personal.php:36 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
 msgid "Password"
 msgstr "密碼"
 
-#: templates/personal.php:37
+#: templates/personal.php:38
 msgid "Your password was changed"
 msgstr "你的密碼已更改"
 
-#: templates/personal.php:38
+#: templates/personal.php:39
 msgid "Unable to change your password"
 msgstr "無法變更你的密碼"
 
-#: templates/personal.php:39
+#: templates/personal.php:40
 msgid "Current password"
 msgstr "目前密碼"
 
-#: templates/personal.php:40
+#: templates/personal.php:42
 msgid "New password"
 msgstr "新密碼"
 
-#: templates/personal.php:42
+#: templates/personal.php:44
 msgid "Change password"
 msgstr "變更密碼"
 
-#: templates/personal.php:54 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:78
 msgid "Display Name"
 msgstr "顯示名稱"
 
-#: templates/personal.php:55
+#: templates/personal.php:57
 msgid "Your display name was changed"
 msgstr "已更改顯示名稱"
 
-#: templates/personal.php:56
+#: templates/personal.php:58
 msgid "Unable to change your display name"
 msgstr "無法更改您的顯示名稱"
 
-#: templates/personal.php:59
+#: templates/personal.php:61
 msgid "Change display name"
 msgstr "更改顯示名稱"
 
-#: templates/personal.php:68
+#: templates/personal.php:70
 msgid "Email"
 msgstr "電子郵件"
 
-#: templates/personal.php:69
+#: templates/personal.php:72
 msgid "Your email address"
 msgstr "你的電子郵件信箱"
 
-#: templates/personal.php:70
+#: templates/personal.php:73
 msgid "Fill in an email address to enable password recovery"
 msgstr "請填入電子郵件信箱以便回復密碼"
 
-#: templates/personal.php:76 templates/personal.php:77
+#: templates/personal.php:79 templates/personal.php:80
 msgid "Language"
 msgstr "語言"
 
-#: templates/personal.php:82
+#: templates/personal.php:86
 msgid "Help translate"
 msgstr "幫助翻譯"
 
-#: templates/personal.php:87
+#: templates/personal.php:91
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:89
+#: templates/personal.php:93
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "在您的檔案管理員中使用這個地址來連線到 ownCloud"
 
diff --git a/l10n/zh_TW/user_ldap.po b/l10n/zh_TW/user_ldap.po
index 89db84884a7113c6eb03f16fb0a0c6bc307ccb30..1e9eb6fb3352403e49d7fbcc8ed3bd971af33ab0 100644
--- a/l10n/zh_TW/user_ldap.po
+++ b/l10n/zh_TW/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-08 00:10+0100\n"
-"PO-Revision-Date: 2013-02-07 23:11+0000\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: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -22,17 +22,17 @@ msgstr ""
 msgid "Failed to delete the server configuration"
 msgstr ""
 
-#: ajax/testConfiguration.php:35
+#: ajax/testConfiguration.php:36
 msgid "The configuration is valid and the connection could be established!"
 msgstr ""
 
-#: ajax/testConfiguration.php:37
+#: ajax/testConfiguration.php:39
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
 msgstr ""
 
-#: ajax/testConfiguration.php:40
+#: ajax/testConfiguration.php:43
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
@@ -87,224 +87,248 @@ msgstr ""
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:17
+#: templates/settings.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:23
 msgid "Host"
 msgstr "主機"
 
-#: templates/settings.php:21
+#: templates/settings.php:25
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:26
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:27
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:28
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:32
 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:24
+#: templates/settings.php:33
 msgid "Password"
 msgstr "密碼"
 
-#: templates/settings.php:24
+#: templates/settings.php:36
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:37
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:40
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:41
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:42
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:45
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:46
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:47
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:50
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:51
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:55
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:34
+#: templates/settings.php:58
 msgid "Port"
 msgstr "連接阜"
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:60
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Use TLS"
 msgstr "使用TLS"
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:39
+#: templates/settings.php:63
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid "Turn off SSL certificate validation."
 msgstr "關閉 SSL 憑證驗證"
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:65
+msgid "Cache Time-To-Live"
+msgstr ""
+
+#: templates/settings.php:65
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:67
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:47
+#: templates/settings.php:71
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:47 templates/settings.php:50
+#: templates/settings.php:71 templates/settings.php:74
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:74
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:75
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:77
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:79
+msgid "Quota Field"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Quota Default"
+msgstr ""
+
+#: templates/settings.php:80
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:81
+msgid "Email Field"
+msgstr ""
+
+#: templates/settings.php:82
+msgid "User Home Folder Naming Rule"
+msgstr ""
+
+#: templates/settings.php:82
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:62
+#: templates/settings.php:86
+msgid "Test Configuration"
+msgstr ""
+
+#: templates/settings.php:86
 msgid "Help"
 msgstr "說明"
diff --git a/lib/app.php b/lib/app.php
index e653c30b2d92bd1c94c525ac62557fd7c86666aa..55b4543ec9f874b0085a9118eb7334748c1f06c0 100644
--- a/lib/app.php
+++ b/lib/app.php
@@ -223,7 +223,7 @@ class OC_App{
 			// check if the app is compatible with this version of ownCloud
 			$info=OC_App::getAppInfo($app);
 			$version=OC_Util::getVersion();
-			if(!isset($info['require']) or ($version[0]>$info['require'])) {
+			if(!isset($info['require']) or !self::isAppVersionCompatible($version, $info['require'])) {
 				OC_Log::write('core',
 					'App "'.$info['name'].'" can\'t be installed because it is'
 					.' not compatible with this version of ownCloud',
@@ -851,7 +851,7 @@ class OC_App{
 		foreach($apps as $app) {
 			// check if the app is compatible with this version of ownCloud
 			$info = OC_App::getAppInfo($app);
-			if(!isset($info['require']) or (($version[0].'.'.$version[1])>$info['require'])) {
+			if(!isset($info['require']) or !self::isAppVersionCompatible($version, $info['require'])) {
 				OC_Log::write('core',
 					'App "'.$info['name'].'" ('.$app.') can\'t be used because it is'
 					.' not compatible with this version of ownCloud',
@@ -862,6 +862,38 @@ class OC_App{
 		}
 	}
 
+
+	/**
+	 * Compares the app version with the owncloud version to see if the app 
+	 * requires a newer version than the currently active one
+	 * @param array $owncloudVersions array with 3 entries: major minor bugfix
+	 * @param string $appRequired the required version from the xml 
+	 * major.minor.bugfix
+	 * @return boolean true if compatible, otherwise false
+	 */
+	public static function isAppVersionCompatible($owncloudVersions, $appRequired){
+		$appVersions = explode('.', $appRequired);
+
+		for($i=0; $i<count($appVersions); $i++){
+			$appVersion = (int) $appVersions[$i];
+
+			if(isset($owncloudVersions[$i])){
+				$owncloudVersion = $owncloudVersions[$i];
+			} else {
+				$owncloudVersion = 0;
+			}
+
+			if($owncloudVersion < $appVersion){
+				return false;
+			} elseif ($owncloudVersion > $appVersion) {
+				return true;
+			}
+		}
+
+		return true;
+	}
+
+
 	/**
 	 * get the installed version of all apps
 	 */
diff --git a/lib/arrayparser.php b/lib/arrayparser.php
new file mode 100644
index 0000000000000000000000000000000000000000..3bb394a5163b77a52cde1a98d04660c9a56afc7f
--- /dev/null
+++ b/lib/arrayparser.php
@@ -0,0 +1,189 @@
+<?php
+
+/**
+ * @author Robin Appelman
+ * @copyright 2013 Robin Appelman icewind@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;
+
+class SyntaxException extends \Exception {
+}
+
+class ArrayParser {
+	const TYPE_NUM = 1;
+	const TYPE_BOOL = 2;
+	const TYPE_STRING = 3;
+	const TYPE_ARRAY = 4;
+
+	function parsePHP($string) {
+		$string = $this->stripPHPTags($string);
+		$string = $this->stripAssignAndReturn($string);
+		return $this->parse($string);
+	}
+
+	function stripPHPTags($string) {
+		$string = trim($string);
+		if (substr($string, 0, 5) === '<?php') {
+			$string = substr($string, 5);
+		}
+		if (substr($string, -2) === '?>') {
+			$string = substr($string, 0, -2);
+		}
+		return $string;
+	}
+
+	function stripAssignAndReturn($string) {
+		$string = trim($string);
+		if (substr($string, 0, 6) === 'return') {
+			$string = substr($string, 6);
+		}
+		if (substr($string, 0, 1) === '$') {
+			list(, $string) = explode('=', $string, 2);
+		}
+		return $string;
+	}
+
+	function parse($string) {
+		$string = trim($string);
+		$string = trim($string, ';');
+		switch ($this->getType($string)) {
+			case self::TYPE_NUM:
+				return $this->parseNum($string);
+			case self::TYPE_BOOL:
+				return $this->parseBool($string);
+			case self::TYPE_STRING:
+				return $this->parseString($string);
+			case self::TYPE_ARRAY:
+				return $this->parseArray($string);
+		}
+		return null;
+	}
+
+	function getType($string) {
+		$string = strtolower($string);
+		$first = substr($string, 0, 1);
+		$last = substr($string, -1, 1);
+		$arrayFirst = substr($string, 0, 5);
+		if (($first === '"' or $first === "'") and ($last === '"' or $last === "'")) {
+			return self::TYPE_STRING;
+		} elseif ($string === 'false' or $string === 'true') {
+			return self::TYPE_BOOL;
+		} elseif ($arrayFirst === 'array' and $last === ')') {
+			return self::TYPE_ARRAY;
+		} else {
+			return self::TYPE_NUM;
+		}
+	}
+
+	function parseString($string) {
+		return substr($string, 1, -1);
+	}
+
+	function parseNum($string) {
+		return intval($string);
+	}
+
+	function parseBool($string) {
+		$string = strtolower($string);
+		return $string === 'true';
+	}
+
+	function parseArray($string) {
+		$body = substr($string, 5);
+		$body = trim($body);
+		$body = substr($body, 1, -1);
+		$items = $this->splitArray($body);
+		$result = array();
+		$lastKey = -1;
+		foreach ($items as $item) {
+			$item = trim($item);
+			if ($item) {
+				if (strpos($item, '=>')) {
+					list($key, $value) = explode('=>', $item, 2);
+					$key = $this->parse($key);
+					$value = $this->parse($value);
+				} else {
+					$key = ++$lastKey;
+					$value = $item;
+				}
+
+				if (is_numeric($key)) {
+					$lastKey = $key;
+				}
+				$result[$key] = $value;
+			}
+		}
+		return $result;
+	}
+
+	function splitArray($body) {
+		$inSingleQuote = false;//keep track if we are inside quotes
+		$inDoubleQuote = false;
+		$bracketDepth = 0;//keep track if we are inside brackets
+		$parts = array();
+		$start = 0;
+		$escaped = false;//keep track if we are after an escape character
+		$skips = array();//keep track of the escape characters we need to remove from the result
+		if (substr($body, -1, 1) !== ',') {
+			$body .= ',';
+		}
+		for ($i = 0; $i < strlen($body); $i++) {
+			$char = substr($body, $i, 1);
+			if ($char === '\\') {
+				if ($escaped) {
+					array_unshift($skips, $i - 1);
+				}
+				$escaped = !$escaped;
+			} else {
+				if ($char === '"' and !$inSingleQuote) {
+					if ($escaped) {
+						array_unshift($skips, $i - 1);
+					} else {
+						$inDoubleQuote = !$inDoubleQuote;
+					}
+				} elseif ($char === "'" and !$inDoubleQuote) {
+					if ($escaped) {
+						array_unshift($skips, $i - 1);
+					} else {
+						$inSingleQuote = !$inSingleQuote;
+					}
+				} elseif (!$inDoubleQuote and !$inSingleQuote) {
+					if ($char === '(') {
+						$bracketDepth++;
+					} elseif ($char === ')') {
+						if ($bracketDepth <= 0) {
+							throw new SyntaxException;
+						} else {
+							$bracketDepth--;
+						}
+					} elseif ($bracketDepth === 0 and $char === ',') {
+						$part = substr($body, $start, $i - $start);
+						foreach ($skips as $skip) {
+							$part = substr($part, 0, $skip - $start) . substr($part, $skip - $start + 1);
+						}
+						$parts[] = $part;
+						$start = $i + 1;
+						$skips = array();
+					}
+				}
+				$escaped = false;
+			}
+		}
+		return $parts;
+	}
+}
diff --git a/lib/base.php b/lib/base.php
index b5439c00abfcd9afc2eae23415e985d88f3c8577..59b861ffce110e727f66590e0b81a00778036c71 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -162,9 +162,9 @@ class OC {
 			OC::$THIRDPARTYWEBROOT = rtrim(dirname(OC::$WEBROOT), '/');
 			OC::$THIRDPARTYROOT = rtrim(dirname(OC::$SERVERROOT), '/');
 		} else {
-			echo("3rdparty directory not found! Please put the ownCloud 3rdparty'
+			echo('3rdparty directory not found! Please put the ownCloud 3rdparty'
 				.' folder in the ownCloud folder or the folder above.'
-				.' You can also configure the location in the config.php file.");
+				.' You can also configure the location in the config.php file.');
 			exit;
 		}
 		// search the apps folder
@@ -188,8 +188,8 @@ class OC {
 		}
 
 		if (empty(OC::$APPSROOTS)) {
-			echo("apps directory not found! Please put the ownCloud apps folder in the ownCloud folder'
-				.' or the folder above. You can also configure the location in the config.php file.");
+			echo('apps directory not found! Please put the ownCloud apps folder in the ownCloud folder'
+				.' or the folder above. You can also configure the location in the config.php file.');
 			exit;
 		}
 		$paths = array();
@@ -214,8 +214,8 @@ class OC {
 			$tmpl = new OC_Template('', 'error', 'guest');
 			$tmpl->assign('errors', array(1 => array(
 				'error' => "Can't write into config directory 'config'",
-				'hint' => "You can usually fix this by giving the webserver user write access'
-					.' to the config directory in owncloud"
+				'hint' => 'You can usually fix this by giving the webserver user write access'
+					.' to the config directory in owncloud'
 			)));
 			$tmpl->printPage();
 			exit();
@@ -277,6 +277,10 @@ class OC {
 					OC_Log::write('core',
 						'starting upgrade from ' . $installedVersion . ' to ' . $currentVersion,
 						OC_Log::DEBUG);
+					$minimizerCSS = new OC_Minimizer_CSS();
+					$minimizerCSS->clearCache();
+					$minimizerJS = new OC_Minimizer_JS();
+					$minimizerJS->clearCache();
 					OC_Util::addscript('update');
 					$tmpl = new OC_Template('', 'update', 'guest');
 					$tmpl->assign('version', OC_Util::getVersionString());
@@ -320,19 +324,33 @@ class OC {
 		// set the session name to the instance id - which is unique
 		session_name(OC_Util::getInstanceId());
 
-		// (re)-initialize session
-		session_start();
+		// if session cant be started break with http 500 error
+		if (session_start() === false){
+			OC_Log::write('core', 'Session could not be initialized', 
+				OC_Log::ERROR);
+			
+			header('HTTP/1.1 500 Internal Server Error');
+			OC_Util::addStyle("styles");
+			$error = 'Session could not be initialized. Please contact your ';
+			$error .= 'system administrator';
+
+			$tmpl = new OC_Template('', 'error', 'guest');
+			$tmpl->assign('errors', array(1 => array('error' => $error)));
+			$tmpl->printPage();
+
+			exit();
+		}
 
 		// regenerate session id periodically to avoid session fixation
 		if (!isset($_SESSION['SID_CREATED'])) {
 			$_SESSION['SID_CREATED'] = time();
-		} else if (time() - $_SESSION['SID_CREATED'] > 900) {
+		} else if (time() - $_SESSION['SID_CREATED'] > 60*60*12) {
 			session_regenerate_id(true);
 			$_SESSION['SID_CREATED'] = time();
 		}
 
 		// session timeout
-		if (isset($_SESSION['LAST_ACTIVITY']) && (time() - $_SESSION['LAST_ACTIVITY'] > 3600)) {
+		if (isset($_SESSION['LAST_ACTIVITY']) && (time() - $_SESSION['LAST_ACTIVITY'] > 60*60*24)) {
 			if (isset($_COOKIE[session_name()])) {
 				setcookie(session_name(), '', time() - 42000, '/');
 			}
@@ -525,7 +543,7 @@ class OC {
 				'setting locale to en_US.UTF-8/en_US.UTF8 failed. Support is probably not installed on your system',
 				OC_Log::ERROR);
 		}
-		if (OC_Config::getValue('installed', false)) {
+		if (OC_Config::getValue('installed', false) && !self::checkUpgrade(false)) {
 			if (OC_Appconfig::getValue('core', 'backgroundjobs_mode', 'ajax') == 'ajax') {
 				OC_Util::addScript('backgroundjobs');
 			}
@@ -582,8 +600,10 @@ class OC {
 
 		if (!self::$CLI) {
 			try {
-				OC_App::loadApps();
-				OC::getRouter()->match(OC_Request::getPathInfo());
+				if (!OC_Config::getValue('maintenance', false)) {
+					OC_App::loadApps();
+				}
+				OC::getRouter()->match(OC_Request::getRawPathInfo());
 				return;
 			} catch (Symfony\Component\Routing\Exception\ResourceNotFoundException $e) {
 				//header('HTTP/1.0 404 Not Found');
diff --git a/lib/config.php b/lib/config.php
index a5c11b466f74db61e9052bbcc4d4207ed71ffa4e..0bd497b8e50a396758f987ca44ecef66052fd948 100644
--- a/lib/config.php
+++ b/lib/config.php
@@ -166,8 +166,8 @@ class OC_Config{
 			$tmpl = new OC_Template( '', 'error', 'guest' );
 			$tmpl->assign('errors', array(1=>array(
 				'error'=>"Can't write into config directory 'config'",
-				'hint'=>"You can usually fix this by giving the webserver user write access'
-					.' to the config directory in owncloud")));
+				'hint'=>'You can usually fix this by giving the webserver user write access'
+					.' to the config directory in owncloud')));
 			$tmpl->printPage();
 			exit;
 		}
diff --git a/lib/connector/sabre/directory.php b/lib/connector/sabre/directory.php
index a9aa891d40997c82b2c22a43b84fba42a0346610..6ccb54b79abe564ba18d3694c8b87b04de4b1d1c 100644
--- a/lib/connector/sabre/directory.php
+++ b/lib/connector/sabre/directory.php
@@ -62,12 +62,12 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node implements Sa
 			}
 		} else {
 			$newPath = $this->path . '/' . $name;
-			
+
 			// mark file as partial while uploading (ignored by the scanner)
 			$partpath = $newPath . '.part';
-		
+
 			\OC\Files\Filesystem::file_put_contents($partpath, $data);
-			
+
 			//detect aborted upload
 			if (isset ($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] === 'PUT' ) {
 				if (isset($_SERVER['CONTENT_LENGTH'])) {
@@ -80,10 +80,10 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node implements Sa
 					}
 				}
 			}
-			
+
 			// rename to correct path
 			\OC\Files\Filesystem::rename($partpath, $newPath);
-			
+
 			// allow sync clients to send the mtime along in a header
 			$mtime = OC_Request::hasModificationTime();
 			if ($mtime !== false) {
@@ -91,7 +91,7 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node implements Sa
 					header('X-OC-MTime: accepted');
 				}
 			}
-			
+
 			return OC_Connector_Sabre_Node::getETagPropertyForPath($newPath);
 		}
 
@@ -107,7 +107,9 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node implements Sa
 	public function createDirectory($name) {
 
 		$newPath = $this->path . '/' . $name;
-		\OC\Files\Filesystem::mkdir($newPath);
+		if(!\OC\Files\Filesystem::mkdir($newPath)) {
+			throw new Sabre_DAV_Exception_Forbidden('Could not create directory '.$newPath);
+		}
 
 	}
 
diff --git a/lib/connector/sabre/file.php b/lib/connector/sabre/file.php
index c4c27e9225186d751c68b64c71bdc44fb056c6b8..91646312e901a6cdb77f4697908e876be8238e55 100644
--- a/lib/connector/sabre/file.php
+++ b/lib/connector/sabre/file.php
@@ -47,9 +47,9 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements Sabre_D
 
 		// mark file as partial while uploading (ignored by the scanner)
 		$partpath = $this->path . '.part';
-		
+
 		\OC\Files\Filesystem::file_put_contents($partpath, $data);
-		
+
 		//detect aborted upload
 		if (isset ($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] === 'PUT' ) {
 			if (isset($_SERVER['CONTENT_LENGTH'])) {
@@ -62,10 +62,10 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements Sabre_D
 				}
 			}
 		}
-		
+
 		// rename to correct path
 		\OC\Files\Filesystem::rename($partpath, $this->path);
-		
+
 		//allow sync clients to send the mtime along in a header
 		$mtime = OC_Request::hasModificationTime();
 		if ($mtime !== false) {
diff --git a/lib/connector/sabre/quotaplugin.php b/lib/connector/sabre/quotaplugin.php
index ce9a968eb3ca2eabe17e5fe8d01fec416d739394..c80a33d04b1e80b5625ec7fbf93ac748bdc4fd3c 100644
--- a/lib/connector/sabre/quotaplugin.php
+++ b/lib/connector/sabre/quotaplugin.php
@@ -50,7 +50,8 @@ class OC_Connector_Sabre_QuotaPlugin extends Sabre_DAV_ServerPlugin {
 				$uri='/'.$uri;
 			}
 			list($parentUri, $newName) = Sabre_DAV_URLUtil::splitPath($uri);
-			if ($length > \OC\Files\Filesystem::free_space($parentUri)) {
+			$freeSpace = \OC\Files\Filesystem::free_space($parentUri);
+			if ($freeSpace !== \OC\Files\FREE_SPACE_UNKNOWN && $length > $freeSpace) {
 				throw new Sabre_DAV_Exception_InsufficientStorage();
 			}
 		}
diff --git a/lib/db.php b/lib/db.php
index edbc2fe13edbca62aea008fdb12abd232b4052b7..347deac8519db437a91fa4c9b6aebcc7e0733f02 100644
--- a/lib/db.php
+++ b/lib/db.php
@@ -42,6 +42,7 @@ class OC_DB {
 	const BACKEND_MDB2=1;
 
 	static private $preparedQueries = array();
+	static private $cachingEnabled = true;
 
 	/**
 	 * @var MDB2_Driver_Common
@@ -178,6 +179,13 @@ class OC_DB {
 							$dsn = 'oci:dbname=//' . $host . '/' . $name;
 					}
 					break;
+                case 'mssql':
+					if ($port) {
+							$dsn='sqlsrv:Server='.$host.','.$port.';Database='.$name;
+					} else {
+							$dsn='sqlsrv:Server='.$host.';Database='.$name;
+					}
+					break;                    
 				default:
 					return false;
 			}
@@ -278,6 +286,15 @@ class OC_DB {
 						$dsn['database'] = $user;
 					}
 					break;
+				case 'mssql':
+					$dsn = array(
+						'phptype' => 'sqlsrv',
+						'username' => $user,
+						'password' => $pass,
+						'hostspec' => $host,
+						'database' => $name
+					);                    
+					break;
 				default:
 					return false;
 			}
@@ -340,7 +357,7 @@ class OC_DB {
 				}
 			}
 		} else {
-			if (isset(self::$preparedQueries[$query])) {
+			if (isset(self::$preparedQueries[$query]) and self::$cachingEnabled) {
 				return self::$preparedQueries[$query];
 			}
 		}
@@ -366,8 +383,11 @@ class OC_DB {
 			}
 			$result=new PDOStatementWrapper($result);
 		}
-		if (is_null($limit) || $limit == -1) {
-			self::$preparedQueries[$rawQuery] = $result;
+		if ((is_null($limit) || $limit == -1) and self::$cachingEnabled ) {
+			$type = OC_Config::getValue( "dbtype", "sqlite" );
+			if( $type != 'sqlite' && $type != 'sqlite3' ) {
+				self::$preparedQueries[$rawQuery] = $result;
+			}
 		}
 		return $result;
 	}
@@ -389,6 +409,13 @@ class OC_DB {
 			$query = self::prepare('SELECT lastval() AS id');
 			$row = $query->execute()->fetchRow();
 			return $row['id'];
+		}
+		if( $type == 'mssql' ) {
+			if($table !== null) {
+				$prefix = OC_Config::getValue( "dbtableprefix", "oc_" );
+				$table = str_replace( '*PREFIX*', $prefix, $table );
+			}
+			return self::$connection->lastInsertId($table);
 		}else{
 			if($table !== null) {
 				$prefix = OC_Config::getValue( "dbtableprefix", "oc_" );
@@ -631,7 +658,7 @@ class OC_DB {
 			} else {
 				return true;
 			}
-		} elseif( $type == 'pgsql' || $type == 'oci' || $type == 'mysql') {
+		} 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 ';
@@ -691,7 +718,15 @@ class OC_DB {
 		}elseif( $type == 'oci'  ) {
 			$query = str_replace( '`', '"', $query );
 			$query = str_ireplace( 'NOW()', 'CURRENT_TIMESTAMP', $query );
-		}
+		}elseif( $type == 'mssql' ) {
+			$query = preg_replace( "/\`(.*?)`/", "[$1]", $query );
+			$query = str_replace( 'NOW()', 'CURRENT_TIMESTAMP', $query );
+			$query = str_replace( 'now()', 'CURRENT_TIMESTAMP', $query );
+			$query = str_replace( 'LENGTH(', 'LEN(', $query );
+			$query = str_replace( 'SUBSTR(', 'SUBSTRING(', $query );
+            
+            $query = self::fixLimitClauseForMSSQL($query);
+        }
 
 		// replace table name prefix
 		$query = str_replace( '*PREFIX*', $prefix, $query );
@@ -699,6 +734,60 @@ class OC_DB {
 		return $query;
 	}
 
+    private static function fixLimitClauseForMSSQL($query) {
+        $limitLocation = stripos ($query, "LIMIT");
+        
+        if ( $limitLocation === false ) {
+            return $query;
+        } 
+        
+        // total == 0 means all results - not zero results
+        //
+        // First number is either total or offset, locate it by first space
+        //
+        $offset = substr ($query, $limitLocation + 5);
+        $offset = substr ($offset, 0, stripos ($offset, ' '));
+        $offset = trim ($offset);
+
+        // check for another parameter
+        if (stripos ($offset, ',') === false) {
+            // no more parameters
+            $offset = 0;
+            $total = intval ($offset);
+        } else {
+            // found another parameter
+            $offset = intval ($offset);
+
+            $total = substr ($query, $limitLocation + 5);
+            $total = substr ($total, stripos ($total, ','));
+
+            $total = substr ($total, 0, stripos ($total, ' '));
+            $total = intval ($total);
+        }
+
+        $query = trim (substr ($query, 0, $limitLocation));
+
+        if ($offset == 0 && $total !== 0) {
+            if (strpos($query, "SELECT") === false) {
+                $query = "TOP {$total} " . $query;
+            } else {
+                $query = preg_replace('/SELECT(\s*DISTINCT)?/Dsi', 'SELECT$1 TOP '.$total, $query);
+            }
+        } else if ($offset > 0) {
+            $query = preg_replace('/SELECT(\s*DISTINCT)?/Dsi', 'SELECT$1 TOP(10000000) ', $query);
+            $query = 'SELECT *
+                    FROM (SELECT sub2.*, ROW_NUMBER() OVER(ORDER BY sub2.line2) AS line3
+                    FROM (SELECT 1 AS line2, sub1.* FROM (' . $query . ') AS sub1) as sub2) AS sub3';
+
+            if ($total > 0) {
+                $query .= ' WHERE line3 BETWEEN ' . ($offset + 1) . ' AND ' . ($offset + $total);
+            } else {
+                $query .= ' WHERE line3 > ' . $offset;
+            }
+        }
+        return $query;
+    }
+    
 	/**
 	 * @brief drop a table
 	 * @param string $tableName the table to drop
@@ -830,6 +919,16 @@ class OC_DB {
 		}
 		return $msg;
 	}
+
+	/**
+	 * @param bool $enabled
+	 */
+	static public function enableCaching($enabled) {
+		if (!$enabled) {
+			self::$preparedQueries = array();
+		}
+		self::$cachingEnabled = $enabled;
+	}
 }
 
 /**
@@ -850,19 +949,119 @@ class PDOStatementWrapper{
 	 * make execute return the result instead of a bool
 	 */
 	public function execute($input=array()) {
-		$this->lastArguments=$input;
-		if(count($input)>0) {
+		$this->lastArguments = $input;
+		if (count($input) > 0) {
+
+			if (!isset($type)) {
+				$type = OC_Config::getValue( "dbtype", "sqlite" );
+			}
+
+			if ($type == 'mssql') {
+				$input = $this->tryFixSubstringLastArgumentDataForMSSQL($input);
+			}
+
 			$result=$this->statement->execute($input);
-		}else{
+		} else {
 			$result=$this->statement->execute();
 		}
-		if($result) {
+		
+		if ($result) {
 			return $this;
-		}else{
+		} else {
 			return false;
 		}
 	}
 
+	private function tryFixSubstringLastArgumentDataForMSSQL($input) {
+		$query = $this->statement->queryString;
+		$pos = stripos ($query, 'SUBSTRING');
+
+		if ( $pos === false) {
+			return;
+		}
+
+		try {
+			$newQuery = '';
+
+			$cArg = 0;
+
+			$inSubstring = false;
+
+			// Create new query
+			for ($i = 0; $i < strlen ($query); $i++) {
+				if ($inSubstring == false) {
+					// Defines when we should start inserting values
+					if (substr ($query, $i, 9) == 'SUBSTRING') {
+						$inSubstring = true;
+					}
+				} else {
+					// Defines when we should stop inserting values
+					if (substr ($query, $i, 1) == ')') {
+						$inSubstring = false;
+					}
+				}
+
+				if (substr ($query, $i, 1) == '?') {
+					// We found a question mark
+					if ($inSubstring) {
+						$newQuery .= $input[$cArg];
+
+						//
+						// Remove from input array
+						//
+						array_splice ($input, $cArg, 1);
+					} else {
+						$newQuery .= substr ($query, $i, 1);
+						$cArg++;
+					}
+				} else {
+					$newQuery .= substr ($query, $i, 1);
+				}
+			}
+
+			// The global data we need
+			$name = OC_Config::getValue( "dbname", "owncloud" );
+			$host = OC_Config::getValue( "dbhost", "" );
+			$user = OC_Config::getValue( "dbuser", "" );
+			$pass = OC_Config::getValue( "dbpassword", "" );
+			if (strpos($host,':')) {
+				list($host, $port) = explode(':', $host, 2);
+			} else {
+				$port = false;
+			}
+			$opts = array();
+
+			if ($port) {
+				$dsn = 'sqlsrv:Server='.$host.','.$port.';Database='.$name;
+			} else {
+				$dsn = 'sqlsrv:Server='.$host.';Database='.$name;
+			}
+
+			$PDO = new PDO($dsn, $user, $pass, $opts);
+			$PDO->setAttribute(PDO::ATTR_DEFAULT_FETCH_MODE, PDO::FETCH_ASSOC);
+			$PDO->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+
+			$this->statement = $PDO->prepare($newQuery);
+
+			$this->lastArguments = $input;
+
+			return $input;
+		} catch (PDOException $e){
+			$entry = 'PDO DB Error: "'.$e->getMessage().'"<br />';
+			$entry .= 'Offending command was: '.$this->statement->queryString .'<br />';
+			$entry .= 'Input parameters: ' .print_r($input, true).'<br />';
+			$entry .= 'Stack trace: ' .$e->getTraceAsString().'<br />';
+			OC_Log::write('core', $entry, OC_Log::FATAL);
+			OC_User::setUserId(null);
+
+			// send http status 503
+			header('HTTP/1.1 503 Service Temporarily Unavailable');
+			header('Status: 503 Service Temporarily Unavailable');
+			OC_Template::printErrorPage('Failed to connect to database');
+			die ($entry);
+		}
+	}
+    
 	/**
 	 * provide numRows
 	 */
diff --git a/lib/fileproxy/quota.php b/lib/fileproxy/quota.php
index 07d1d250e4d033bfc1537e3b1b0a61b3bf9175b2..3dac3264fbec6f27db03836410907a8b6d0bad9b 100644
--- a/lib/fileproxy/quota.php
+++ b/lib/fileproxy/quota.php
@@ -62,21 +62,21 @@ class OC_FileProxy_Quota extends OC_FileProxy{
 		 * @var string $internalPath
 		 */
 		list($storage, $internalPath) = \OC\Files\Filesystem::resolvePath($path);
-		$owner=$storage->getOwner($internalPath);
+		$owner = $storage->getOwner($internalPath);
 		if (!$owner) {
 			return -1;
 		}
 
-		$totalSpace=$this->getQuota($owner);
-		if($totalSpace==-1) {
+		$totalSpace = $this->getQuota($owner);
+		if($totalSpace == -1) {
 			return -1;
 		}
 
 		$view = new \OC\Files\View("/".$owner."/files");
 
-		$rootInfo=$view->getFileInfo('/');
-		$usedSpace=isset($rootInfo['size'])?$rootInfo['size']:0;
-		return $totalSpace-$usedSpace;
+		$rootInfo = $view->getFileInfo('/');
+		$usedSpace = isset($rootInfo['size'])?$rootInfo['size']:0;
+		return $totalSpace - $usedSpace;
 	}
 
 	public function postFree_space($path, $space) {
@@ -84,6 +84,9 @@ class OC_FileProxy_Quota extends OC_FileProxy{
 		if($free==-1) {
 			return $space;
 		}
+		if ($space < 0){
+			return $free;
+		}
 		return min($free, $space);
 	}
 
diff --git a/lib/files.php b/lib/files.php
index b594b78c4b768d7225368859535a76eb07b62ddd..71bb21851b6f57b89c586600eb83a002e16834f0 100644
--- a/lib/files.php
+++ b/lib/files.php
@@ -49,8 +49,9 @@ class OC_Files {
 			isset($_SERVER['MOD_X_ACCEL_REDIRECT_ENABLED'])) {
 			$xsendfile = true;
 		}
-		if(strpos($files, ';')) {
-			$files=explode(';', $files);
+
+		if (count($files) == 1) {
+			$files = $files[0];
 		}
 
 		if (is_array($files)) {
@@ -77,7 +78,13 @@ class OC_Files {
 				}
 			}
 			$zip->close();
-			$name = basename($dir) . '.zip';
+			$basename = basename($dir);
+			if ($basename) {
+				$name = $basename . '.zip';
+			} else {
+				$name = 'owncloud.zip';
+			}
+			
 			set_time_limit($executionTime);
 		} elseif (\OC\Files\Filesystem::is_dir($dir . '/' . $files)) {
 			self::validateZipDownload($dir, $files);
@@ -212,12 +219,18 @@ class OC_Files {
 		$zipLimit = OC_Config::getValue('maxZipInputSize', OC_Helper::computerFileSize('800 MB'));
 		if ($zipLimit > 0) {
 			$totalsize = 0;
-			if (is_array($files)) {
-				foreach ($files as $file) {
-					$totalsize += \OC\Files\Filesystem::filesize($dir . '/' . $file);
+			if(!is_array($files)) {
+				$files = array($files);
+			}
+			foreach ($files as $file) {
+				$path = $dir . '/' . $file;
+				if(\OC\Files\Filesystem::is_dir($path)) {
+					foreach (\OC\Files\Filesystem::getDirectoryContent($path) as $i) {
+						$totalsize += $i['size'];
+					}
+				} else {
+					$totalsize += \OC\Files\Filesystem::filesize($path);
 				}
-			} else {
-				$totalsize += \OC\Files\Filesystem::filesize($dir . '/' . $files);
 			}
 			if ($totalsize > $zipLimit) {
 				$l = OC_L10N::get('lib');
diff --git a/lib/files/cache/cache.php b/lib/files/cache/cache.php
index 65f33c5f797cf9952091f8ca0c6ee67f3b4d7aff..2413c05b8cd4e806b3b1b8d923a3ffba8a0dd9c0 100644
--- a/lib/files/cache/cache.php
+++ b/lib/files/cache/cache.php
@@ -48,6 +48,9 @@ class Cache {
 		} 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));
@@ -205,7 +208,7 @@ class Cache {
 			$valuesPlaceholder = array_fill(0, count($queryParts), '?');
 
 			$query = \OC_DB::prepare('INSERT INTO `*PREFIX*filecache`(' . implode(', ', $queryParts) . ')'
-				.' VALUES(' . implode(', ', $valuesPlaceholder) . ')');
+				. ' VALUES(' . implode(', ', $valuesPlaceholder) . ')');
 			$query->execute($params);
 
 			return (int)\OC_DB::insertid('*PREFIX*filecache');
@@ -223,7 +226,7 @@ class Cache {
 		$params[] = $id;
 
 		$query = \OC_DB::prepare('UPDATE `*PREFIX*filecache` SET ' . implode(' = ?, ', $queryParts) . '=?'
-			.' WHERE fileid = ?');
+			. ' WHERE fileid = ?');
 		$query->execute($params);
 	}
 
@@ -321,6 +324,9 @@ class Cache {
 		}
 		$query = \OC_DB::prepare('DELETE FROM `*PREFIX*filecache` WHERE `fileid` = ?');
 		$query->execute(array($entry['fileid']));
+
+		$permissionsCache = new Permissions($this->storageId);
+		$permissionsCache->remove($entry['fileid']);
 	}
 
 	/**
@@ -346,7 +352,7 @@ class Cache {
 		}
 
 		$query = \OC_DB::prepare('UPDATE `*PREFIX*filecache` SET `path` = ?, `path_hash` = ?, `parent` =?'
-			.' WHERE `fileid` = ?');
+			. ' WHERE `fileid` = ?');
 		$query->execute(array($target, md5($target), $newParentId, $sourceId));
 	}
 
@@ -507,9 +513,9 @@ 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');
-		$query->execute(array($this->numericId));
-		if ($row = $query->fetchRow()) {
+			. ' WHERE `storage` = ? AND `size` = -1 ORDER BY `fileid` DESC LIMIT 1');
+		$result = $query->execute(array($this->numericId));
+		if ($row = $result->fetchRow()) {
 			return $row['path'];
 		} else {
 			return false;
diff --git a/lib/files/cache/legacy.php b/lib/files/cache/legacy.php
index 6d1ffa7b40b2f19bd899d9d8ee003259cf80d053..2b8689fcbda3671735d60243c5cb19f280989cbe 100644
--- a/lib/files/cache/legacy.php
+++ b/lib/files/cache/legacy.php
@@ -51,12 +51,12 @@ class Legacy {
 			$this->cacheHasItems = false;
 			return false;
 		}
-		
+
 		if ($result === false || property_exists($result, 'error_message_prefix')) {
 			$this->cacheHasItems = false;
 			return false;
-		}		
-		
+		}
+
 		$this->cacheHasItems = (bool)$result->fetchRow();
 		return $this->cacheHasItems;
 	}
diff --git a/lib/files/cache/permissions.php b/lib/files/cache/permissions.php
index e1735831b9447773d250eeb4386ad1769257452a..a5c9c144054d0e8200d688e314c7575f14a5c97f 100644
--- a/lib/files/cache/permissions.php
+++ b/lib/files/cache/permissions.php
@@ -17,10 +17,10 @@ class Permissions {
 	/**
 	 * @param \OC\Files\Storage\Storage|string $storage
 	 */
-	public function __construct($storage){
-		if($storage instanceof \OC\Files\Storage\Storage) {
+	public function __construct($storage) {
+		if ($storage instanceof \OC\Files\Storage\Storage) {
 			$this->storageId = $storage->getId();
-		}else{
+		} else {
 			$this->storageId = $storage;
 		}
 	}
@@ -52,10 +52,10 @@ class Permissions {
 	public function set($fileId, $user, $permissions) {
 		if (self::get($fileId, $user) !== -1) {
 			$query = \OC_DB::prepare('UPDATE `*PREFIX*permissions` SET `permissions` = ?'
-				.' WHERE `user` = ? AND `fileid` = ?');
+				. ' WHERE `user` = ? AND `fileid` = ?');
 		} else {
 			$query = \OC_DB::prepare('INSERT INTO `*PREFIX*permissions`(`permissions`, `user`, `fileid`)'
-				.' VALUES(?, ?,? )');
+				. ' VALUES(?, ?,? )');
 		}
 		$query->execute(array($permissions, $user, $fileId));
 	}
@@ -76,7 +76,7 @@ class Permissions {
 		$inPart = implode(', ', array_fill(0, count($fileIds), '?'));
 
 		$query = \OC_DB::prepare('SELECT `fileid`, `permissions` FROM `*PREFIX*permissions`'
-			.' WHERE `fileid` IN (' . $inPart . ') AND `user` = ?');
+			. ' WHERE `fileid` IN (' . $inPart . ') AND `user` = ?');
 		$result = $query->execute($params);
 		$filePermissions = array();
 		while ($row = $result->fetchRow()) {
@@ -91,14 +91,19 @@ class Permissions {
 	 * @param int $fileId
 	 * @param string $user
 	 */
-	public function remove($fileId, $user) {
-		$query = \OC_DB::prepare('DELETE FROM `*PREFIX*permissions` WHERE `fileid` = ? AND `user` = ?');
-		$query->execute(array($fileId, $user));
+	public function remove($fileId, $user = null) {
+		if (is_null($user)) {
+			$query = \OC_DB::prepare('DELETE FROM `*PREFIX*permissions` WHERE `fileid` = ?');
+			$query->execute(array($fileId));
+		} else {
+			$query = \OC_DB::prepare('DELETE FROM `*PREFIX*permissions` WHERE `fileid` = ? AND `user` = ?');
+			$query->execute(array($fileId, $user));
+		}
 	}
 
 	public function removeMultiple($fileIds, $user) {
 		$query = \OC_DB::prepare('DELETE FROM `*PREFIX*permissions` WHERE `fileid` = ? AND `user` = ?');
-		foreach($fileIds as $fileId){
+		foreach ($fileIds as $fileId) {
 			$query->execute(array($fileId, $user));
 		}
 	}
diff --git a/lib/files/cache/upgrade.php b/lib/files/cache/upgrade.php
index 1fe4c5846867b20b5f1bb15803a0000038a6b0eb..811d82d7437e570883f20328e84c55264619d998 100644
--- a/lib/files/cache/upgrade.php
+++ b/lib/files/cache/upgrade.php
@@ -64,7 +64,7 @@ class Upgrade {
 	 * @param array $data the data for the new cache
 	 */
 	function insert($data) {
-		if (!$this->inCache($data['storage'], $data['path_hash'])) {
+		if (!$this->inCache($data['storage'], $data['path_hash'], $data['id'])) {
 			$insertQuery = \OC_DB::prepare('INSERT INTO `*PREFIX*filecache`
 					( `fileid`, `storage`, `path`, `path_hash`, `parent`, `name`, `mimetype`, `mimepart`, `size`, `mtime`, `encrypted` )
 					VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)');
@@ -78,11 +78,12 @@ class Upgrade {
 	/**
 	 * @param string $storage
 	 * @param string $pathHash
+	 * @param string $id
 	 * @return bool
 	 */
-	function inCache($storage, $pathHash) {
-		$query = \OC_DB::prepare('SELECT `fileid` FROM `*PREFIX*filecache` WHERE `storage` = ? AND `path_hash` = ?');
-		$result = $query->execute(array($storage, $pathHash));
+	function inCache($storage, $pathHash, $id) {
+		$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();
 	}
 
diff --git a/lib/files/filesystem.php b/lib/files/filesystem.php
index f45308680777d81fc39676f77cbb28806d1fa7ce..0bbd7550d74dce4638cc3f5e74f559f59f680513 100644
--- a/lib/files/filesystem.php
+++ b/lib/files/filesystem.php
@@ -29,6 +29,8 @@
 
 namespace OC\Files;
 
+const FREE_SPACE_UNKNOWN = -2;
+
 class Filesystem {
 	public static $loaded = false;
 	/**
@@ -215,9 +217,18 @@ class Filesystem {
 		if ($user == '') {
 			$user = \OC_User::getUser();
 		}
+		$parser = new \OC\ArrayParser();
+
+		$root = \OC_User::getHome($user);
+		self::mount('\OC\Files\Storage\Local', array('datadir' => $root), $user);
+
 		// Load system mount points
-		if (is_file(\OC::$SERVERROOT . '/config/mount.php')) {
-			$mountConfig = include 'config/mount.php';
+		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);
+			} elseif (is_file(\OC::$SERVERROOT . '/config/mount.php')) {
+				$mountConfig = $parser->parsePHP(file_get_contents(\OC::$SERVERROOT . '/config/mount.php'));
+			}
 			if (isset($mountConfig['global'])) {
 				foreach ($mountConfig['global'] as $mountPoint => $options) {
 					self::mount($options['class'], $options['options'], $mountPoint);
@@ -251,10 +262,12 @@ class Filesystem {
 			}
 		}
 		// Load personal mount points
-		$root = \OC_User::getHome($user);
-		self::mount('\OC\Files\Storage\Local', array('datadir' => $root), $user);
-		if (is_file($root . '/mount.php')) {
-			$mountConfig = include $root . '/mount.php';
+		if (is_file($root . '/mount.php') or is_file($root . '/mount.json')) {
+			if (is_file($root . '/mount.json')) {
+				$mountConfig = json_decode(file_get_contents($root . '/mount.json'), true);
+			} elseif (is_file($root . '/mount.php')) {
+				$mountConfig = $parser->parsePHP(file_get_contents($root . '/mount.php'));
+			}
 			if (isset($mountConfig['user'][$user])) {
 				foreach ($mountConfig['user'][$user] as $mountPoint => $options) {
 					self::mount($options['class'], $options['options'], $mountPoint);
@@ -377,20 +390,28 @@ class Filesystem {
 	 * @param array $data from hook
 	 */
 	static public function isBlacklisted($data) {
-		$blacklist = \OC_Config::getValue('blacklisted_files', array('.htaccess'));
 		if (isset($data['path'])) {
 			$path = $data['path'];
 		} else if (isset($data['newpath'])) {
 			$path = $data['newpath'];
 		}
 		if (isset($path)) {
-			$filename = strtolower(basename($path));
-			if (in_array($filename, $blacklist)) {
+			if (self::isFileBlacklisted($path)) {
 				$data['run'] = false;
 			}
 		}
 	}
 
+	/**
+	 * @param string $filename
+	 * @return bool
+	 */
+	static public function isFileBlacklisted($filename) {
+		$blacklist = \OC_Config::getValue('blacklisted_files', array('.htaccess'));
+		$filename = strtolower(basename($filename));
+		return (in_array($filename, $blacklist));
+	}
+
 	/**
 	 * following functions are equivalent to their php builtin equivalents for arguments/return values.
 	 */
@@ -613,11 +634,11 @@ class Filesystem {
 	}
 
 	/**
-	* Get the owner for a file or folder
-	*
-	* @param string $path
-	* @return string
-	*/
+	 * Get the owner for a file or folder
+	 *
+	 * @param string $path
+	 * @return string
+	 */
 	public static function getOwner($path) {
 		return self::$defaultInstance->getOwner($path);
 	}
diff --git a/lib/files/mapper.php b/lib/files/mapper.php
index cd163dcbfcd90732d6f1c3e4e13489d229cf6bd4..520fadbd8c634389d45e122e6a1aeba1f18c787b 100644
--- a/lib/files/mapper.php
+++ b/lib/files/mapper.php
@@ -7,6 +7,12 @@ namespace OC\Files;
  */
 class Mapper
 {
+	private $unchangedPhysicalRoot;
+
+	public function __construct($rootDir) {
+		$this->unchangedPhysicalRoot = $rootDir;
+	}
+
 	/**
 	 * @param string $logicPath
 	 * @param bool $create indicates if the generated physical name shall be stored in the database or not
@@ -23,7 +29,7 @@ class Mapper
 
 	/**
 	 * @param string $physicalPath
-	 * @return string|null
+	 * @return string
 	 */
 	public function physicalToLogic($physicalPath) {
 		$logicPath = $this->resolvePhysicalPath($physicalPath);
@@ -39,6 +45,7 @@ class Mapper
 	 * @param string $path
 	 * @param bool $isLogicPath indicates if $path is logical or physical
 	 * @param $recursive
+	 * @return void
 	 */
 	public function removePath($path, $isLogicPath, $recursive) {
 		if ($recursive) {
@@ -159,14 +166,11 @@ class Mapper
 	}
 
 	private function slugifyPath($path, $index=null) {
+		$path = $this->stripRootFolder($path, $this->unchangedPhysicalRoot);
+
 		$pathElements = explode('/', $path);
 		$sluggedElements = array();
 
-		// skip slugging the drive letter on windows - TODO: test if local path
-		if (\OC_Util::runningOnWindows()) {
-			$sluggedElements[]= $pathElements[0];
-			array_shift($pathElements);
-		}
 		foreach ($pathElements as $pathElement) {
 			// remove empty elements
 			if (empty($pathElement)) {
@@ -186,12 +190,8 @@ class Mapper
 			array_push($sluggedElements, $last.'-'.$index);
 		}
 
-		// on non-windows systems add the leading / if necessary
-		if (!\OC_Util::runningOnWindows() and $path[0] === '/') {
-			return DIRECTORY_SEPARATOR.implode(DIRECTORY_SEPARATOR, $sluggedElements);
-		}
-
-		return implode(DIRECTORY_SEPARATOR, $sluggedElements);
+		$sluggedPath = $this->unchangedPhysicalRoot.implode(DIRECTORY_SEPARATOR, $sluggedElements);
+		return $this->stripLast($sluggedPath);
 	}
 
 	/**
diff --git a/lib/files/mount.php b/lib/files/mount.php
index 74ee483b1bef928306907e914ce81a2db12d3a6d..1c9382d78e7d5347b04893217a24c1a4fc4f173b 100644
--- a/lib/files/mount.php
+++ b/lib/files/mount.php
@@ -93,6 +93,9 @@ class Mount {
 				$this->storage = $this->createStorage();
 			}
 			$this->storageId = $this->storage->getId();
+			if (strlen($this->storageId) > 64) {
+				$this->storageId = md5($this->storageId);
+			}
 		}
 		return $this->storageId;
 	}
@@ -173,10 +176,15 @@ class Mount {
 	}
 
 	/**
+	 * Find mounts by storage id
+	 *
 	 * @param string $id
-	 * @return \OC\Files\Storage\Storage[]
+	 * @return Mount[]
 	 */
-	public static function findById($id) {
+	public static function findByStorageId($id) {
+		if (strlen($id) > 64) {
+			$id = md5($id);
+		}
 		$result = array();
 		foreach (self::$mounts as $mount) {
 			if ($mount->getStorageId() === $id) {
@@ -185,4 +193,24 @@ class 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 4cdabf1c8a6ebc59c908bbb8379b01250f2735b7..8aa227ec0b72deb06bdd553b04d46e1a0c6fc565 100644
--- a/lib/files/storage/common.php
+++ b/lib/files/storage/common.php
@@ -22,83 +22,104 @@ namespace OC\Files\Storage;
 
 abstract class Common implements \OC\Files\Storage\Storage {
 
-	public function __construct($parameters) {}
+	public function __construct($parameters) {
+	}
+
 	public function is_dir($path) {
-		return $this->filetype($path)=='dir';
+		return $this->filetype($path) == 'dir';
 	}
+
 	public function is_file($path) {
-		return $this->filetype($path)=='file';
+		return $this->filetype($path) == 'file';
 	}
+
 	public function filesize($path) {
-		if($this->is_dir($path)) {
-			return 0;//by definition
-		}else{
+		if ($this->is_dir($path)) {
+			return 0; //by definition
+		} else {
 			$stat = $this->stat($path);
-			return $stat['size'];
+			if (isset($stat['size'])) {
+				return $stat['size'];
+			} else {
+				return 0;
+			}
 		}
 	}
+
 	public function isCreatable($path) {
 		if ($this->is_dir($path) && $this->isUpdatable($path)) {
 			return true;
 		}
 		return false;
 	}
+
 	public function isDeletable($path) {
 		return $this->isUpdatable($path);
 	}
+
 	public function isSharable($path) {
 		return $this->isReadable($path);
 	}
-	public function getPermissions($path){
+
+	public function getPermissions($path) {
 		$permissions = 0;
-		if($this->isCreatable($path)) {
+		if ($this->isCreatable($path)) {
 			$permissions |= \OCP\PERMISSION_CREATE;
 		}
-		if($this->isReadable($path)) {
+		if ($this->isReadable($path)) {
 			$permissions |= \OCP\PERMISSION_READ;
 		}
-		if($this->isUpdatable($path)) {
+		if ($this->isUpdatable($path)) {
 			$permissions |= \OCP\PERMISSION_UPDATE;
 		}
-		if($this->isDeletable($path)) {
+		if ($this->isDeletable($path)) {
 			$permissions |= \OCP\PERMISSION_DELETE;
 		}
-		if($this->isSharable($path)) {
+		if ($this->isSharable($path)) {
 			$permissions |= \OCP\PERMISSION_SHARE;
 		}
 		return $permissions;
 	}
+
 	public function filemtime($path) {
 		$stat = $this->stat($path);
-		return $stat['mtime'];
+		if (isset($stat['mtime'])) {
+			return $stat['mtime'];
+		} else {
+			return 0;
+		}
 	}
+
 	public function file_get_contents($path) {
 		$handle = $this->fopen($path, "r");
-		if(!$handle) {
+		if (!$handle) {
 			return false;
 		}
-		$size=$this->filesize($path);
-		if($size==0) {
+		$size = $this->filesize($path);
+		if ($size == 0) {
 			return '';
 		}
 		return fread($handle, $size);
 	}
+
 	public function file_put_contents($path, $data) {
 		$handle = $this->fopen($path, "w");
 		return fwrite($handle, $data);
 	}
+
 	public function rename($path1, $path2) {
-		if($this->copy($path1, $path2)) {
+		if ($this->copy($path1, $path2)) {
 			return $this->unlink($path1);
-		}else{
+		} else {
 			return false;
 		}
 	}
+
 	public function copy($path1, $path2) {
-		$source=$this->fopen($path1, 'r');
-		$target=$this->fopen($path2, 'w');
-		$count=\OC_Helper::streamCopy($source, $target);
-		return $count>0;
+		$source = $this->fopen($path1, 'r');
+		$target = $this->fopen($path2, 'w');
+		list($count, $result) = \OC_Helper::streamCopy($source, $target);
+		return $result;
 	}
 
 	/**
@@ -110,29 +131,30 @@ abstract class Common implements \OC\Files\Storage\Storage {
 	 * @note By default the directory specified by $directory will be
 	 * deleted together with its contents. To avoid this set $empty to true
 	 */
-	public function deleteAll( $directory, $empty = false ) {
+	public function deleteAll($directory, $empty = false) {
 		$directory = trim($directory, '/');
 
-		if ( !$this->file_exists( \OCP\USER::getUser() . '/' . $directory )
-			|| !$this->is_dir( \OCP\USER::getUser() . '/' . $directory ) ) {
+		if (!$this->file_exists(\OCP\USER::getUser() . '/' . $directory)
+			|| !$this->is_dir(\OCP\USER::getUser() . '/' . $directory)
+		) {
 			return false;
-		} elseif( !$this->isReadable( \OCP\USER::getUser() . '/' . $directory ) ) {
+		} elseif (!$this->isReadable(\OCP\USER::getUser() . '/' . $directory)) {
 			return false;
 		} else {
-			$directoryHandle = $this->opendir( \OCP\USER::getUser() . '/' . $directory );
-			while ( $contents = readdir( $directoryHandle ) ) {
-				if ( $contents != '.' && $contents != '..') {
+			$directoryHandle = $this->opendir(\OCP\USER::getUser() . '/' . $directory);
+			while ($contents = readdir($directoryHandle)) {
+				if ($contents != '.' && $contents != '..') {
 					$path = $directory . "/" . $contents;
-					if ( $this->is_dir( $path ) ) {
-						$this->deleteAll( $path );
+					if ($this->is_dir($path)) {
+						$this->deleteAll($path);
 					} else {
-						$this->unlink( \OCP\USER::getUser() .'/' . $path ); // TODO: make unlink use same system path as is_dir
+						$this->unlink(\OCP\USER::getUser() . '/' . $path); // TODO: make unlink use same system path as is_dir
 					}
 				}
 			}
 			//$this->closedir( $directoryHandle ); // TODO: implement closedir in OC_FSV
-			if ( $empty == false ) {
-				if ( !$this->rmdir( $directory ) ) {
+			if ($empty == false) {
+				if (!$this->rmdir($directory)) {
 					return false;
 				}
 			}
@@ -140,88 +162,95 @@ abstract class Common implements \OC\Files\Storage\Storage {
 		}
 
 	}
+
 	public function getMimeType($path) {
-		if(!$this->file_exists($path)) {
+		if (!$this->file_exists($path)) {
 			return false;
 		}
-		if($this->is_dir($path)) {
+		if ($this->is_dir($path)) {
 			return 'httpd/unix-directory';
 		}
-		$source=$this->fopen($path, 'r');
-		if(!$source) {
+		$source = $this->fopen($path, 'r');
+		if (!$source) {
 			return false;
 		}
-		$head=fread($source, 8192);//8kb should suffice to determine a mimetype
-		if($pos=strrpos($path, '.')) {
-			$extension=substr($path, $pos);
-		}else{
-			$extension='';
+		$head = fread($source, 8192); //8kb should suffice to determine a mimetype
+		if ($pos = strrpos($path, '.')) {
+			$extension = substr($path, $pos);
+		} else {
+			$extension = '';
 		}
-		$tmpFile=\OC_Helper::tmpFile($extension);
+		$tmpFile = \OC_Helper::tmpFile($extension);
 		file_put_contents($tmpFile, $head);
-		$mime=\OC_Helper::getMimeType($tmpFile);
+		$mime = \OC_Helper::getMimeType($tmpFile);
 		unlink($tmpFile);
 		return $mime;
 	}
+
 	public function hash($type, $path, $raw = false) {
-		$tmpFile=$this->getLocalFile($path);
-		$hash=hash($type, $tmpFile, $raw);
+		$tmpFile = $this->getLocalFile($path);
+		$hash = hash($type, $tmpFile, $raw);
 		unlink($tmpFile);
 		return $hash;
 	}
+
 	public function search($query) {
 		return $this->searchInDir($query);
 	}
+
 	public function getLocalFile($path) {
 		return $this->toTmpFile($path);
 	}
-	private function toTmpFile($path) {//no longer in the storage api, still useful here
-		$source=$this->fopen($path, 'r');
-		if(!$source) {
+
+	private function toTmpFile($path) { //no longer in the storage api, still useful here
+		$source = $this->fopen($path, 'r');
+		if (!$source) {
 			return false;
 		}
-		if($pos=strrpos($path, '.')) {
-			$extension=substr($path, $pos);
-		}else{
-			$extension='';
+		if ($pos = strrpos($path, '.')) {
+			$extension = substr($path, $pos);
+		} else {
+			$extension = '';
 		}
-		$tmpFile=\OC_Helper::tmpFile($extension);
-		$target=fopen($tmpFile, 'w');
+		$tmpFile = \OC_Helper::tmpFile($extension);
+		$target = fopen($tmpFile, 'w');
 		\OC_Helper::streamCopy($source, $target);
 		return $tmpFile;
 	}
+
 	public function getLocalFolder($path) {
-		$baseDir=\OC_Helper::tmpFolder();
+		$baseDir = \OC_Helper::tmpFolder();
 		$this->addLocalFolder($path, $baseDir);
 		return $baseDir;
 	}
+
 	private function addLocalFolder($path, $target) {
-		if($dh=$this->opendir($path)) {
-			while($file=readdir($dh)) {
-				if($file!=='.' and $file!=='..') {
-					if($this->is_dir($path.'/'.$file)) {
-						mkdir($target.'/'.$file);
-						$this->addLocalFolder($path.'/'.$file, $target.'/'.$file);
-					}else{
-						$tmp=$this->toTmpFile($path.'/'.$file);
-						rename($tmp, $target.'/'.$file);
+		if ($dh = $this->opendir($path)) {
+			while ($file = readdir($dh)) {
+				if ($file !== '.' and $file !== '..') {
+					if ($this->is_dir($path . '/' . $file)) {
+						mkdir($target . '/' . $file);
+						$this->addLocalFolder($path . '/' . $file, $target . '/' . $file);
+					} else {
+						$tmp = $this->toTmpFile($path . '/' . $file);
+						rename($tmp, $target . '/' . $file);
 					}
 				}
 			}
 		}
 	}
 
-	protected function searchInDir($query, $dir='') {
-		$files=array();
-		$dh=$this->opendir($dir);
-		if($dh) {
-			while($item=readdir($dh)) {
+	protected function searchInDir($query, $dir = '') {
+		$files = array();
+		$dh = $this->opendir($dir);
+		if ($dh) {
+			while ($item = readdir($dh)) {
 				if ($item == '.' || $item == '..') continue;
-				if(strstr(strtolower($item), strtolower($query))!==false) {
-					$files[]=$dir.'/'.$item;
+				if (strstr(strtolower($item), strtolower($query)) !== false) {
+					$files[] = $dir . '/' . $item;
 				}
-				if($this->is_dir($dir.'/'.$item)) {
-					$files=array_merge($files, $this->searchInDir($query, $dir.'/'.$item));
+				if ($this->is_dir($dir . '/' . $item)) {
+					$files = array_merge($files, $this->searchInDir($query, $dir . '/' . $item));
 				}
 			}
 		}
@@ -230,32 +259,34 @@ abstract class Common implements \OC\Files\Storage\Storage {
 
 	/**
 	 * 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;
+		return $this->filemtime($path) > $time;
 	}
 
-	public function getCache($path=''){
+	public function getCache($path = '') {
 		return new \OC\Files\Cache\Cache($this);
 	}
 
-	public function getScanner($path=''){
+	public function getScanner($path = '') {
 		return new \OC\Files\Cache\Scanner($this);
 	}
 
-	public function getPermissionsCache($path=''){
+	public function getPermissionsCache($path = '') {
 		return new \OC\Files\Cache\Permissions($this);
 	}
 
-	public function getWatcher($path=''){
+	public function getWatcher($path = '') {
 		return new \OC\Files\Cache\Watcher($this);
 	}
 
 	/**
 	 * get the owner of a path
+	 *
 	 * @param string $path The path to get the owner
 	 * @return string uid or false
 	 */
@@ -269,19 +300,20 @@ abstract class Common implements \OC\Files\Storage\Storage {
 	 * @param string $path
 	 * @return string
 	 */
-	public function getETag($path){
+	public function getETag($path) {
 		$ETagFunction = \OC_Connector_Sabre_Node::$ETagFunction;
-		if($ETagFunction) {
+		if ($ETagFunction) {
 			$hash = call_user_func($ETagFunction, $path);
 			return $hash;
-		}else{
+		} else {
 			return uniqid();
 		}
 	}
-	
+
 	/**
 	 * clean a path, i.e. remove all redundant '.' and '..'
 	 * making sure that it can't point to higher than '/'
+	 *
 	 * @param $path The path to clean
 	 * @return string cleaned path
 	 */
@@ -289,7 +321,7 @@ abstract class Common implements \OC\Files\Storage\Storage {
 		if (strlen($path) == 0 or $path[0] != '/') {
 			$path = '/' . $path;
 		}
-		
+
 		$output = array();
 		foreach (explode('/', $path) as $chunk) {
 			if ($chunk == '..') {
@@ -301,4 +333,21 @@ abstract class Common implements \OC\Files\Storage\Storage {
 		}
 		return implode('/', $output);
 	}
+
+	public function test() {
+		if ($this->stat('')) {
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * get the free space in the storage
+	 *
+	 * @param $path
+	 * return int
+	 */
+	public function free_space($path) {
+		return \OC\Files\FREE_SPACE_UNKNOWN;
+	}
 }
diff --git a/lib/files/storage/mappedlocal.php b/lib/files/storage/mappedlocal.php
index e707f71d71ce0610a03646fb900340b54b1a84a2..434c10bcbf7ae192cf8f631c100a9b74cf344aca 100644
--- a/lib/files/storage/mappedlocal.php
+++ b/lib/files/storage/mappedlocal.php
@@ -20,7 +20,7 @@ class MappedLocal extends \OC\Files\Storage\Common{
 			$this->datadir.='/';
 		}
 
-		$this->mapper= new \OC\Files\Mapper();
+		$this->mapper= new \OC\Files\Mapper($this->datadir);
 	}
 	public function __destruct() {
 		if (defined('PHPUNIT_RUN')) {
@@ -274,7 +274,7 @@ class MappedLocal extends \OC\Files\Storage\Common{
 		return $this->buildPath($path);
 	}
 
-	protected function searchInDir($query, $dir='', $isLogicPath=true) {
+	protected function searchInDir($query, $dir='') {
 		$files=array();
 		$physicalDir = $this->buildPath($dir);
 		foreach (scandir($physicalDir) as $item) {
@@ -287,7 +287,7 @@ class MappedLocal extends \OC\Files\Storage\Common{
 				$files[]=$dir.'/'.$item;
 			}
 			if(is_dir($physicalItem)) {
-				$files=array_merge($files, $this->searchInDir($query, $physicalItem, false));
+				$files=array_merge($files, $this->searchInDir($query, $dir.'/'.$item));
 			}
 		}
 		return $files;
diff --git a/lib/files/view.php b/lib/files/view.php
index 3348244715eb4537d80dc35e38a7d81d9b2562b8..3cea8b082dc996095a47667f074b9e7cc111a556 100644
--- a/lib/files/view.php
+++ b/lib/files/view.php
@@ -199,7 +199,7 @@ class View {
 		@ob_end_clean();
 		$handle = $this->fopen($path, 'rb');
 		if ($handle) {
-			$chunkSize = 8192; // 8 MB chunks
+			$chunkSize = 8192; // 8 kB chunks
 			while (!feof($handle)) {
 				echo fread($handle, $chunkSize);
 				flush();
@@ -245,7 +245,11 @@ class View {
 		if (!is_null($mtime) and !is_numeric($mtime)) {
 			$mtime = strtotime($mtime);
 		}
-		$result = $this->basicOperation('touch', $path, array('write'), $mtime);
+		$hooks = array('touch');
+		if (!$this->file_exists($path)) {
+			$hooks[] = 'write';
+		}
+		$result = $this->basicOperation('touch', $path, $hooks, $mtime);
 		if (!$result) { //if native touch fails, we emulate it by changing the mtime in the cache
 			$this->putFileInfo($path, array('mtime' => $mtime));
 		}
@@ -289,7 +293,7 @@ class View {
 				}
 				$target = $this->fopen($path, 'w');
 				if ($target) {
-					$count = \OC_Helper::streamCopy($data, $target);
+					list ($count, $result) = \OC_Helper::streamCopy($data, $target);
 					fclose($target);
 					fclose($data);
 					if ($this->fakeRoot == Filesystem::getRoot()) {
@@ -307,7 +311,7 @@ class View {
 						);
 					}
 					\OC_FileProxy::runPostProxies('file_put_contents', $absolutePath, $count);
-					return $count > 0;
+					return $result;
 				} else {
 					return false;
 				}
@@ -365,10 +369,9 @@ class View {
 				} else {
 					$source = $this->fopen($path1 . $postFix1, 'r');
 					$target = $this->fopen($path2 . $postFix2, 'w');
-					$count = \OC_Helper::streamCopy($source, $target);
+					list($count, $result) = \OC_Helper::streamCopy($source, $target);
 					list($storage1, $internalPath1) = Filesystem::resolvePath($absolutePath1 . $postFix1);
 					$storage1->unlink($internalPath1);
-					$result = $count > 0;
 				}
 				if ($this->fakeRoot == Filesystem::getRoot()) {
 					\OC_Hook::emit(
@@ -448,7 +451,7 @@ class View {
 				} else {
 					$source = $this->fopen($path1 . $postFix1, 'r');
 					$target = $this->fopen($path2 . $postFix2, 'w');
-					$result = \OC_Helper::streamCopy($source, $target);
+					list($count, $result) = \OC_Helper::streamCopy($source, $target);
 				}
 				if ($this->fakeRoot == Filesystem::getRoot()) {
 					\OC_Hook::emit(
@@ -601,6 +604,7 @@ class View {
 			if ($path == null) {
 				return false;
 			}
+
 			$run = $this->runHooks($hooks, $path);
 			list($storage, $internalPath) = Filesystem::resolvePath($absolutePath . $postFix);
 			if ($run and $storage) {
@@ -965,7 +969,7 @@ class View {
 	 */
 	public function getPath($id) {
 		list($storage, $internalPath) = Cache\Cache::getById($id);
-		$mounts = Mount::findById($storage);
+		$mounts = Mount::findByStorageId($storage);
 		foreach ($mounts as $mount) {
 			/**
 			 * @var \OC\Files\Mount $mount
diff --git a/lib/group.php b/lib/group.php
index 6afe1440030f8fe35cd981da03cb3d09ed810170..d1a830730b755a18398e0c052281bad2482730b6 100644
--- a/lib/group.php
+++ b/lib/group.php
@@ -286,38 +286,45 @@ class OC_Group {
 		}
 		return $users;
 	}
-	
-	/**
-	 * @brief get a list of all display names in a group
-	 * @returns array with display names (value) and user ids(key)
-	 */
-	public static function displayNamesInGroup($gid, $search = '', $limit = -1, $offset = 0) {
-		$displayNames=array();
-		foreach(self::$_usedBackends as $backend) {
-			$displayNames = array_merge($backend->displayNamesInGroup($gid, $search, $limit, $offset), $displayNames);
-		}
-		return $displayNames;
+
+	/**
+	 * @brief get a list of all display names in a group
+	 * @returns array with display names (value) and user ids(key)
+	 */
+	public static function displayNamesInGroup($gid, $search = '', $limit = -1, $offset = 0) {
+		$displayNames=array();
+		foreach(self::$_usedBackends as $backend) {
+			if($backend->implementsActions(OC_GROUP_BACKEND_GET_DISPLAYNAME)) {
+				$displayNames = array_merge($backend->displayNamesInGroup($gid, $search, $limit, $offset), $displayNames);
+			} else {
+				$users = $backend->usersInGroup($gid, $search, $limit, $offset);
+				$names = array_combine($users, $users);
+				$displayNames = array_merge($names, $displayNames);
+			}
+		}
+		return $displayNames;
 	}
-	
-	/**
-	 * @brief get a list of all display names in several groups
-	 * @param array $gids
-	 * @param string $search
-	 * @param int $limit
-	 * @param int $offset
-	 * @return array with display names (Key) user ids (value)
-	 */
-	public static function displayNamesInGroups($gids, $search = '', $limit = -1, $offset = 0) {
-		$displayNames = array();
-		foreach ($gids as $gid) {
-			// TODO Need to apply limits to groups as total
-			$displayNames = array_merge(
-				array_diff(
-					self::displayNamesInGroup($gid, $search, $limit, $offset),
-					$displayNames
-				),
-				$displayNames);
-		}
-		return $displayNames;
+
+	/**
+	 * @brief get a list of all display names in several groups
+	 * @param array $gids
+	 * @param string $search
+	 * @param int $limit
+	 * @param int $offset
+	 * @return array with display names (Key) user ids (value)
+	 */
+	public static function displayNamesInGroups($gids, $search = '', $limit = -1, $offset = 0) {
+		$displayNames = array();
+		foreach ($gids as $gid) {
+			// TODO Need to apply limits to groups as total
+			$diff = array_diff(
+				self::displayNamesInGroup($gid, $search, $limit, $offset),
+				$displayNames
+			);
+			if ($diff) {
+				$displayNames = array_merge($diff, $displayNames);
+			}
+		}
+		return $displayNames;
 	}
 }
diff --git a/lib/group/backend.php b/lib/group/backend.php
index 4f6570c3be31b36f40ec6071f884537ebd5d4096..2e17b5d0b7f9f805b7e5d47572e21d558286f7a0 100644
--- a/lib/group/backend.php
+++ b/lib/group/backend.php
@@ -33,6 +33,7 @@ define('OC_GROUP_BACKEND_CREATE_GROUP',      0x00000001);
 define('OC_GROUP_BACKEND_DELETE_GROUP',      0x00000010);
 define('OC_GROUP_BACKEND_ADD_TO_GROUP',      0x00000100);
 define('OC_GROUP_BACKEND_REMOVE_FROM_GOUP',  0x00001000);
+define('OC_GROUP_BACKEND_GET_DISPLAYNAME',   0x00010000);
 
 /**
  * Abstract base class for user management
@@ -43,6 +44,7 @@ abstract class OC_Group_Backend implements OC_Group_Interface {
 		OC_GROUP_BACKEND_DELETE_GROUP => 'deleteGroup',
 		OC_GROUP_BACKEND_ADD_TO_GROUP => 'addToGroup',
 		OC_GROUP_BACKEND_REMOVE_FROM_GOUP => 'removeFromGroup',
+		OC_GROUP_BACKEND_GET_DISPLAYNAME => 'displayNamesInGroup',
 	);
 
 	/**
@@ -133,23 +135,23 @@ abstract class OC_Group_Backend implements OC_Group_Interface {
 	public function usersInGroup($gid, $search = '', $limit = -1, $offset = 0) {
 		return array();
 	}
-	
-	/**
-	 * @brief get a list of all display names in a group
-	 * @param string $gid
-	 * @param string $search
-	 * @param int $limit
-	 * @param int $offset
-	 * @return array with display names (value) and user ids (key)
-	 */
-	public function DisplayNamesInGroup($gid, $search = '', $limit = -1, $offset = 0) {
-		$displayNames = '';
-		$users = $this->usersInGroup($gid, $search, $limit, $offset);
-		foreach ( $users as $user ) {
-			$DisplayNames[$user] = $user;
-		}
-			
-		return $DisplayNames;
+
+	/**
+	 * @brief get a list of all display names in a group
+	 * @param string $gid
+	 * @param string $search
+	 * @param int $limit
+	 * @param int $offset
+	 * @return array with display names (value) and user ids (key)
+	 */
+	public function displayNamesInGroup($gid, $search = '', $limit = -1, $offset = 0) {
+		$displayNames = array();
+		$users = $this->usersInGroup($gid, $search, $limit, $offset);
+		foreach ($users as $user) {
+			$displayNames[$user] = $user;
+		}
+
+		return $displayNames;
 	}
 
 }
diff --git a/lib/group/database.php b/lib/group/database.php
index 8816dd8169c216f4b79b20994ea306c81a24eec6..d0974685ff623bad945e29003fc827c075dbb4df 100644
--- a/lib/group/database.php
+++ b/lib/group/database.php
@@ -210,30 +210,30 @@ class OC_Group_Database extends OC_Group_Backend {
 		}
 		return $users;
 	}
-	
-	/**
-	 * @brief get a list of all display names in a group
-	 * @param string $gid
-	 * @param string $search
-	 * @param int $limit
-	 * @param int $offset
-	 * @return array with display names (value) and user ids (key)
-	 */
-	public function DisplayNamesInGroup($gid, $search = '', $limit = -1, $offset = 0) {
-		$displayNames = '';
+
+	/**
+	 * @brief get a list of all display names in a group
+	 * @param string $gid
+	 * @param string $search
+	 * @param int $limit
+	 * @param int $offset
+	 * @return array with display names (value) and user ids (key)
+	 */
+	public function displayNamesInGroup($gid, $search = '', $limit = -1, $offset = 0) {
+		$displayNames = array();
 
 		$stmt = OC_DB::prepare('SELECT `*PREFIX*users`.`uid`, `*PREFIX*users`.`displayname`'
 			.' FROM `*PREFIX*users`'
 			.' INNER JOIN `*PREFIX*group_user` ON `*PREFIX*group_user`.`uid` = `*PREFIX*users`.`uid`'
-			.' WHERE `gid` = ? AND `*PREFIX*group_user.uid` LIKE ?',
+			.' WHERE `gid` = ? AND `*PREFIX*group_user`.`uid` LIKE ?',
 			$limit,
 			$offset);
-		$result = $stmt->execute(array($gid, $search.'%'));
-		$users = array();
+		$result = $stmt->execute(array($gid, $search.'%'));
+		$users = array();
 		while ($row = $result->fetchRow()) {
-			$displayName = trim($row['displayname'], ' ');
-			$displayNames[$row['uid']] = empty($displayName) ? $row['uid'] : $displayName;
-		}		
-		return $displayNames;
+			$displayName = trim($row['displayname'], ' ');
+			$displayNames[$row['uid']] = empty($displayName) ? $row['uid'] : $displayName;
+		}
+		return $displayNames;
 	}
 }
diff --git a/lib/helper.php b/lib/helper.php
index 0f810ffc0c2dc885749a6992ad9eaf43f9006fa2..41985ca57a71478889bfaef774858578746b725d 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -513,11 +513,16 @@ class OC_Helper {
 		if(!$source or !$target) {
 			return false;
 		}
-		$count=0;
+		$result = true;
+		$count = 0;
 		while(!feof($source)) {
-			$count+=fwrite($target, fread($source, 8192));
+			if ( ( $c = fwrite($target, fread($source, 8192)) ) === false) {
+				$result = false;
+			} else {
+				$count += $c;
+			}
 		}
-		return $count;
+		return array($count, $result);
 	}
 
 	/**
@@ -762,9 +767,13 @@ class OC_Helper {
 		$maxUploadFilesize = min($upload_max_filesize, $post_max_size);
 
 		$freeSpace = \OC\Files\Filesystem::free_space($dir);
-		$freeSpace = max($freeSpace, 0);
+		if($freeSpace !== \OC\Files\FREE_SPACE_UNKNOWN){
+			$freeSpace = max($freeSpace, 0);
 
-		return min($maxUploadFilesize, $freeSpace);
+			return min($maxUploadFilesize, $freeSpace);
+		} else {
+			return $maxUploadFilesize;
+		}
 	}
 
 	/**
diff --git a/lib/hook.php b/lib/hook.php
index 554381251d6db749513c64bc3d783a111d8a52e5..8516cf0dcff40b6b04ca8c616e77821dfb32dc3e 100644
--- a/lib/hook.php
+++ b/lib/hook.php
@@ -20,23 +20,23 @@ class OC_Hook{
 	 * TODO: write example
 	 */
 	static public function connect( $signalclass, $signalname, $slotclass, $slotname ) {
-		// If we're trying to connect to an emitting class that isn't 
+		// If we're trying to connect to an emitting class that isn't
 		// yet registered, register it
 		if( !array_key_exists( $signalclass, self::$registered )) {
 			self::$registered[$signalclass] = array();
 		}
-		// If we're trying to connect to an emitting method that isn't 
+		// If we're trying to connect to an emitting method that isn't
 		// yet registered, register it with the emitting class
-		if( !array_key_exists( $signalname, self::$registered[$signalclass] )) {			
+		if( !array_key_exists( $signalname, self::$registered[$signalclass] )) {
 			self::$registered[$signalclass][$signalname] = array();
 		}
-		
+
 		// Connect the hook handler to the requested emitter
 		self::$registered[$signalclass][$signalname][] = array(
 				"class" => $slotclass,
 				"name" => $slotname
 		);
-		
+
 		// No chance for failure ;-)
 		return true;
 	}
@@ -53,19 +53,19 @@ class OC_Hook{
 	 * TODO: write example
 	 */
 	static public function emit( $signalclass, $signalname, $params = array()) {
-		
+
 		// Return false if no hook handlers are listening to this
 		// emitting class
 		if( !array_key_exists( $signalclass, self::$registered )) {
 			return false;
 		}
-		
+
 		// Return false if no hook handlers are listening to this
 		// emitting method
 		if( !array_key_exists( $signalname, self::$registered[$signalclass] )) {
 			return false;
 		}
-		
+
 		// Call all slots
 		foreach( self::$registered[$signalclass][$signalname] as $i ) {
 			try {
diff --git a/lib/image.php b/lib/image.php
index 7b0cbefd6570fa0c2dd7ff2f5a7fd3bf6dc45a48..c1b187608a6e1662f4ede1cc7855a6cb51500655 100644
--- a/lib/image.php
+++ b/lib/image.php
@@ -35,7 +35,13 @@ class OC_Image {
 	* @returns string The mime type if the it could be determined, otherwise an empty string.
 	*/
 	static public function getMimeTypeForFile($filepath) {
-		$imagetype = exif_imagetype($filepath);
+		// exif_imagetype throws "read error!" if file is less than 12 byte
+		if (filesize($filepath) > 11) {
+			$imagetype = exif_imagetype($filepath);
+		}
+		else {
+			$imagetype = false;
+		}
 		return $imagetype ? image_type_to_mime_type($imagetype) : '';
 	}
 
@@ -385,7 +391,8 @@ class OC_Image {
 	* @returns An image resource or false on error
 	*/
 	public function loadFromFile($imagepath=false) {
-		if(!is_file($imagepath) || !file_exists($imagepath) || !is_readable($imagepath)) {
+		// exif_imagetype throws "read error!" if file is less than 12 byte
+		if(!is_file($imagepath) || !file_exists($imagepath) || filesize($imagepath) < 12 || !is_readable($imagepath)) {
 			// Debug output disabled because this method is tried before loadFromBase64?
 			OC_Log::write('core', 'OC_Image->loadFromFile, couldn\'t load: '.$imagepath, OC_Log::DEBUG);
 			return false;
@@ -702,6 +709,13 @@ class OC_Image {
 			return false;
 		}
 
+		// preserve transparency
+		if($this->imagetype == IMAGETYPE_GIF or $this->imagetype == IMAGETYPE_PNG) {
+			imagecolortransparent($process, imagecolorallocatealpha($process, 0, 0, 0, 127));
+			imagealphablending($process, false);
+			imagesavealpha($process, true);
+		}
+
 		imagecopyresampled($process, $this->resource, 0, 0, 0, 0, $width, $height, $width_orig, $height_orig);
 		if ($process == false) {
 			OC_Log::write('core', __METHOD__.'(): Error resampling process image '.$width.'x'.$height, OC_Log::ERROR);
@@ -751,6 +765,14 @@ class OC_Image {
 			imagedestroy($process);
 			return false;
 		}
+
+		// preserve transparency
+		if($this->imagetype == IMAGETYPE_GIF or $this->imagetype == IMAGETYPE_PNG) {
+			imagecolortransparent($process, imagecolorallocatealpha($process, 0, 0, 0, 127));
+			imagealphablending($process, false);
+			imagesavealpha($process, true);
+		}
+
 		imagecopyresampled($process, $this->resource, 0, 0, $x, $y, $targetWidth, $targetHeight, $width, $height);
 		if ($process == false) {
 			OC_Log::write('core',
diff --git a/lib/l10n/bg_BG.php b/lib/l10n/bg_BG.php
index d80e03608a2ac253f54992da25a8cc0fe13f8f9e..d32e2aadfc5361de44cd1320856290b1cd243f28 100644
--- a/lib/l10n/bg_BG.php
+++ b/lib/l10n/bg_BG.php
@@ -21,6 +21,18 @@
 "Specify a data folder." => "Укажете папка за данни",
 "%s enter the database username." => "%s въведете потребителско име за базата с данни.",
 "%s enter the database name." => "%s въведете име на базата с данни.",
+"%s you may not use dots in the database name" => "%s, не можете да ползвате точки в името на базата от данни",
+"PostgreSQL username and/or password not valid" => "Невалидно PostgreSQL потребителско име и/или парола",
+"You need to enter either an existing account or the administrator." => "Необходимо е да влезете в всъществуващ акаунт или като администратора",
+"Oracle username and/or password not valid" => "Невалидно Oracle потребителско име и/или парола",
+"MySQL username and/or password not valid" => "Невалидно MySQL потребителско име и/или парола",
+"DB Error: \"%s\"" => "Грешка в базата от данни: \"%s\"",
+"MySQL user '%s'@'localhost' exists already." => "MySQL потребителят '%s'@'localhost' вече съществува",
+"Drop this user from MySQL" => "Изтриване на потребителя от MySQL",
+"MySQL user '%s'@'%%' already exists" => "MySQL потребителят  '%s'@'%%' вече съществува.",
+"Drop this user from MySQL." => "Изтриване на потребителя от MySQL.",
+"MS SQL username and/or password not valid: %s" => "Невалидно MS SQL потребителско име и/или парола: %s",
+"Please double check the <a href='%s'>installation guides</a>." => "Моля направете повторна справка с <a href='%s'>ръководството за инсталиране</a>.",
 "seconds ago" => "преди секунди",
 "1 minute ago" => "преди 1 минута",
 "%d minutes ago" => "преди %d минути",
diff --git a/lib/l10n/ca.php b/lib/l10n/ca.php
index 3e3938aa6cb20737075ad2e4f526a23d98a80e77..108bb5c09be8d33e807f89b2f5b936c43c140d5d 100644
--- a/lib/l10n/ca.php
+++ b/lib/l10n/ca.php
@@ -34,6 +34,7 @@
 "MySQL user '%s'@'%%' already exists" => "L'usuari MySQL '%s'@'%%' ja existeix",
 "Drop this user from MySQL." => "Elimina aquest usuari de MySQL.",
 "Offending command was: \"%s\", name: %s, password: %s" => "L'ordre en conflicte és: \"%s\", nom: %s, contrasenya: %s",
+"MS SQL username and/or password not valid: %s" => "Nom d'usuari i/o contrasenya MS SQL no vàlids: %s",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "El servidor web no està configurat correctament per permetre la sincronització de fitxers perquè la interfície WebDAV sembla no funcionar correctament.",
 "Please double check the <a href='%s'>installation guides</a>." => "Comproveu les <a href='%s'>guies d'instal·lació</a>.",
 "seconds ago" => "segons enrere",
diff --git a/lib/l10n/cs_CZ.php b/lib/l10n/cs_CZ.php
index d99f259cb0ffddfef1667f4d6100d4e924892b0f..d9ec3d82cf74c1b2ff358f0b44d2161649ef147c 100644
--- a/lib/l10n/cs_CZ.php
+++ b/lib/l10n/cs_CZ.php
@@ -34,6 +34,7 @@
 "MySQL user '%s'@'%%' already exists" => "Uživatel '%s'@'%%' již v MySQL existuje",
 "Drop this user from MySQL." => "Zahodit uživatele z MySQL.",
 "Offending command was: \"%s\", name: %s, password: %s" => "Podezřelý příkaz byl: \"%s\", jméno: %s, heslo: %s",
+"MS SQL username and/or password not valid: %s" => "Uživatelské jméno, či heslo MSSQL není platné: %s",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Váš webový server není správně nastaven pro umožnění synchronizace, protože rozhraní WebDAV je rozbité.",
 "Please double check the <a href='%s'>installation guides</a>." => "Zkonzultujte, prosím, <a href='%s'>průvodce instalací</a>.",
 "seconds ago" => "před vteřinami",
diff --git a/lib/l10n/da.php b/lib/l10n/da.php
index e61fba30ff3808e12ff4fea8fbef5da7a33cf4a8..38ccbbe8e2164513f8e94516a256013f8943cd40 100644
--- a/lib/l10n/da.php
+++ b/lib/l10n/da.php
@@ -34,6 +34,7 @@
 "MySQL user '%s'@'%%' already exists" => "MySQL brugeren '%s'@'%%' eksisterer allerede.",
 "Drop this user from MySQL." => "Slet denne bruger fra MySQL",
 "Offending command was: \"%s\", name: %s, password: %s" => "Fejlende kommando var: \"%s\", navn: %s, password: %s",
+"MS SQL username and/or password not valid: %s" => "MS SQL brugernavn og/eller adgangskode ikke er gyldigt: %s",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Din webserver er endnu ikke sat op til at tillade fil synkronisering fordi WebDAV grænsefladen virker ødelagt.",
 "Please double check the <a href='%s'>installation guides</a>." => "Dobbelttjek venligst <a href='%s'>installations vejledningerne</a>.",
 "seconds ago" => "sekunder siden",
diff --git a/lib/l10n/de.php b/lib/l10n/de.php
index f65ee5cfa3b871455aee5061ab60103b20b3e434..3c2069d46371f804c458362cb6c9b3f5995d0bf1 100644
--- a/lib/l10n/de.php
+++ b/lib/l10n/de.php
@@ -9,7 +9,7 @@
 "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",
+"couldn't be determined" => "konnte nicht festgestellt werden",
 "Application is not enabled" => "Die Anwendung ist nicht aktiviert",
 "Authentication error" => "Authentifizierungs-Fehler",
 "Token expired. Please reload page." => "Token abgelaufen. Bitte lade die Seite neu.",
@@ -18,13 +18,13 @@
 "Images" => "Bilder",
 "Set an admin username." => "Setze Administrator Benutzername.",
 "Set an admin password." => "Setze Administrator Passwort",
-"Specify a data folder." => "Datei-Verzeichnis angeben",
+"Specify a data folder." => "Datei-Verzeichnis angeben.",
 "%s enter the database username." => "%s gib den Datenbank-Benutzernamen an.",
 "%s enter the database name." => "%s gib den Datenbank-Namen an.",
 "%s you may not use dots in the database name" => "%s Der Datenbank-Name darf keine Punkte enthalten",
 "%s set the database host." => "%s setze den Datenbank-Host",
 "PostgreSQL username and/or password not valid" => "PostgreSQL Benutzername und/oder Passwort ungültig",
-"You need to enter either an existing account or the administrator." => "Sie müssen entweder ein existierendes Benutzerkonto oder das Administratoren-Konto angeben.",
+"You need to enter either an existing account or the administrator." => "Du musst entweder ein existierendes Benutzerkonto oder das Administratoren-Konto angeben.",
 "Oracle username and/or password not valid" => "Oracle Benutzername und/oder Passwort ungültig",
 "MySQL username and/or password not valid" => "MySQL Benutzername und/oder Passwort ungültig",
 "DB Error: \"%s\"" => "DB Fehler: \"%s\"",
@@ -32,10 +32,11 @@
 "MySQL user '%s'@'localhost' exists already." => "MySQL Benutzer '%s'@'localhost' existiert bereits.",
 "Drop this user from MySQL" => "Lösche diesen Benutzer von MySQL",
 "MySQL user '%s'@'%%' already exists" => "MySQL Benutzer '%s'@'%%' existiert bereits",
-"Drop this user from MySQL." => "Lösche diesen Benutzer von MySQL.",
+"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 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üfen Sie die <a href='%s'>Instalationsanleitungen</a>.",
+"Please double check the <a href='%s'>installation guides</a>." => "Bitte prüfe die <a href='%s'>Instalationsanleitungen</a>.",
 "seconds ago" => "Gerade eben",
 "1 minute ago" => "Vor einer Minute",
 "%d minutes ago" => "Vor %d Minuten",
diff --git a/lib/l10n/de_DE.php b/lib/l10n/de_DE.php
index 1f63fdd87b0f49df51c20963b99b574ff5c2ced1..9978cdf8b317b5820bb2e9ee78324d0f566117c0 100644
--- a/lib/l10n/de_DE.php
+++ b/lib/l10n/de_DE.php
@@ -30,10 +30,11 @@
 "DB Error: \"%s\"" => "DB Fehler: \"%s\"",
 "Offending command was: \"%s\"" => "Fehlerhafter Befehl war: \"%s\"",
 "MySQL user '%s'@'localhost' exists already." => "MySQL Benutzer '%s'@'localhost' existiert bereits.",
-"Drop this user from MySQL" => "Lösche diesen Benutzer von MySQL",
+"Drop this user from MySQL" => "Lösche diesen Benutzer aus MySQL",
 "MySQL user '%s'@'%%' already exists" => "MySQL Benutzer '%s'@'%%' existiert bereits",
-"Drop this user from MySQL." => "Lösche diesen Benutzer von MySQL.",
+"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>.",
 "seconds ago" => "Gerade eben",
diff --git a/lib/l10n/el.php b/lib/l10n/el.php
index cf0be24b432415cd14a582ded61882725204df81..c17a33dfee1439060ebab42ee5e05cf2641499f1 100644
--- a/lib/l10n/el.php
+++ b/lib/l10n/el.php
@@ -16,6 +16,23 @@
 "Files" => "Αρχεία",
 "Text" => "Κείμενο",
 "Images" => "Εικόνες",
+"Set an admin username." => "Εισάγετε όνομα χρήστη διαχειριστή.",
+"Set an admin password." => "Εισάγετε συνθηματικό διαχειριστή.",
+"Specify a data folder." => "Καθορίστε τον φάκελο δεδομένων.",
+"%s enter the database username." => "%s εισάγετε το όνομα χρήστη της βάσης δεδομένων.",
+"%s enter the database name." => "%s εισάγετε το όνομα της βάσης δεδομένων.",
+"%s you may not use dots in the database name" => "%s μάλλον δεν χρησιμοποιείτε τελείες στο όνομα της βάσης δεδομένων",
+"PostgreSQL username and/or password not valid" => "Μη έγκυρος χρήστης και/ή συνθηματικό της PostgreSQL",
+"You need to enter either an existing account or the administrator." => "Χρειάζεται να εισάγετε είτε έναν υπάρχον λογαριασμό ή του διαχειριστή.",
+"Oracle username and/or password not valid" => "Μη έγκυρος χρήστης και/ή συνθηματικό της Oracle",
+"MySQL username and/or password not valid" => "Μη έγκυρος χρήστης και/ή συνθηματικό της MySQL",
+"DB Error: \"%s\"" => "Σφάλμα Βάσης Δεδομένων: \"%s\"",
+"MySQL user '%s'@'localhost' exists already." => "Υπάρχει ήδη ο χρήστης '%s'@'localhost' της MySQL.",
+"Drop this user from MySQL" => "Απόρριψη αυτού του χρήστη από την MySQL",
+"MySQL user '%s'@'%%' already exists" => "Ο χρήστης '%s'@'%%' της MySQL υπάρχει ήδη",
+"Drop this user from MySQL." => "Απόρριψη αυτού του χρήστη από την MySQL",
+"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 λεπτά πριν",
@@ -28,7 +45,7 @@
 "%d months ago" => "%d μήνες πριν",
 "last year" => "τον προηγούμενο χρόνο",
 "years ago" => "χρόνια πριν",
-"%s is available. Get <a href=\"%s\">more information</a>" => "%s είναι διαθέσιμα. Δείτε <a href=\"%s\">περισσότερες πληροφορίες</a>",
+"%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/es.php b/lib/l10n/es.php
index f3b03b566521c90a97f6088b814b711e628800a8..37b15a375c48beda29af741b775d307154a5ffce 100644
--- a/lib/l10n/es.php
+++ b/lib/l10n/es.php
@@ -16,6 +16,25 @@
 "Files" => "Archivos",
 "Text" => "Texto",
 "Images" => "Imágenes",
+"Set an admin username." => "Configurar un nombre de usuario del administrador",
+"Set an admin password." => "Configurar la contraseña del administrador.",
+"Specify a data folder." => "Especificar la carpeta de datos.",
+"%s enter the database username." => "%s ingresar el usuario de la base de datos.",
+"%s enter the database name." => "%s ingresar el nombre de la base de datos",
+"%s you may not use dots in the database name" => "%s no se puede utilizar puntos en el nombre de la base de datos",
+"%s set the database host." => "%s ingresar el host de la base de datos.",
+"PostgreSQL username and/or password not valid" => "Usuario y/o contraseña de PostgreSQL no válidos",
+"You need to enter either an existing account or the administrator." => "Tiene que ingresar una cuenta existente o la del administrador.",
+"Oracle username and/or password not valid" => "Usuario y/o contraseña de Oracle no válidos",
+"MySQL username and/or password not valid" => "Usuario y/o contraseña de MySQL no válidos",
+"DB Error: \"%s\"" => "Error BD: \"%s\"",
+"Offending command was: \"%s\"" => "Comando infractor: \"%s\"",
+"MySQL user '%s'@'localhost' exists already." => "Usuario MySQL '%s'@'localhost' ya existe.",
+"Drop this user from MySQL" => "Eliminar este usuario de MySQL",
+"MySQL user '%s'@'%%' already exists" => "Usuario MySQL '%s'@'%%' ya existe",
+"Drop this user from MySQL." => "Eliminar este usuario de MySQL.",
+"Offending command was: \"%s\", name: %s, password: %s" => "Comando infractor: \"%s\", nombre: %s, contraseña: %s",
+"MS SQL username and/or password not valid: %s" => "Usuario y/o contraseña de MS SQL no válidos: %s",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Su servidor web aún no está configurado adecuadamente para permitir sincronización de archivos ya que la interfaz WebDAV parece no estar funcionando.",
 "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>.",
 "seconds ago" => "hace segundos",
diff --git a/lib/l10n/es_AR.php b/lib/l10n/es_AR.php
index a2391a45b23957c6661e95a03cd0e3297d315bcd..ff3d47285fc8e60013ee3648d1b752070fdee2ae 100644
--- a/lib/l10n/es_AR.php
+++ b/lib/l10n/es_AR.php
@@ -25,12 +25,16 @@
 "%s set the database host." => "%s Especifique la dirección de la Base de Datos",
 "PostgreSQL username and/or password not valid" => "Nombre de usuario o contraseña de PostgradeSQL no válido.",
 "You need to enter either an existing account or the administrator." => "Debe ingresar una cuenta existente o el administrador",
+"Oracle username and/or password not valid" => "El nombre de usuario y contraseña no son válidos",
 "MySQL username and/or password not valid" => "Usuario y/o contraseña MySQL no válido",
 "DB Error: \"%s\"" => "Error DB: \"%s\"",
+"Offending command was: \"%s\"" => "El comando no comprendido es: \"%s\"",
 "MySQL user '%s'@'localhost' exists already." => "Usuario MySQL '%s'@'localhost' ya existente",
 "Drop this user from MySQL" => "Borrar este usuario de MySQL",
 "MySQL user '%s'@'%%' already exists" => "Usuario MySQL '%s'@'%%' ya existente",
 "Drop this user from MySQL." => "Borrar este usuario de MySQL",
+"Offending command was: \"%s\", name: %s, password: %s" => "El comando no comprendido es: \"%s\", nombre: \"%s\", contraseña: \"%s\"",
+"MS SQL username and/or password not valid: %s" => "Nombre de usuario y contraseña de MS SQL no son válidas: %s",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Tu servidor web no está configurado todavía para permitir sincronización de archivos porque la interfaz WebDAV parece no funcionar.",
 "Please double check the <a href='%s'>installation guides</a>." => "Por favor, comprobá nuevamente la <a href='%s'>guía de instalación</a>.",
 "seconds ago" => "hace unos segundos",
diff --git a/lib/l10n/eu.php b/lib/l10n/eu.php
index 97eb6511198b1084d85e06d1f716dbd4d04c1157..36eb397e4256d052c711b45589373b796bf4df7a 100644
--- a/lib/l10n/eu.php
+++ b/lib/l10n/eu.php
@@ -34,6 +34,7 @@
 "MySQL user '%s'@'%%' already exists" => "MySQL '%s'@'%%' erabiltzailea dagoeneko existitzen da",
 "Drop this user from MySQL." => "Ezabatu erabiltzaile hau MySQLtik.",
 "Offending command was: \"%s\", name: %s, password: %s" => "Errorea komando honek sortu du: \"%s\", izena: %s, pasahitza: %s",
+"MS SQL username and/or password not valid: %s" => "MS SQL erabiltzaile izena edota pasahitza ez dira egokiak: %s",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Zure web zerbitzaria ez dago oraindik ongi konfiguratuta fitxategien sinkronizazioa egiteko, WebDAV interfazea ongi ez dagoela dirudi.",
 "Please double check the <a href='%s'>installation guides</a>." => "Mesedez begiratu <a href='%s'>instalazio gidak</a>.",
 "seconds ago" => "orain dela segundu batzuk",
diff --git a/lib/l10n/fi_FI.php b/lib/l10n/fi_FI.php
index c3ff3e9a2bf64b7e9eda6586744b93a917d8c594..89a584d389d137d4b96ba18992d28e0780661054 100644
--- a/lib/l10n/fi_FI.php
+++ b/lib/l10n/fi_FI.php
@@ -19,12 +19,16 @@
 "Set an admin username." => "Aseta ylläpitäjän käyttäjätunnus.",
 "Set an admin password." => "Aseta ylläpitäjän salasana.",
 "Specify a data folder." => "Määritä datakansio.",
+"%s enter the database username." => "%s anna tietokannan käyttäjätunnus.",
+"%s enter the database name." => "%s anna tietokannan nimi.",
+"%s you may not use dots in the database name" => "%s et voi käyttää pisteitä tietokannan nimessä",
 "PostgreSQL username and/or password not valid" => "PostgreSQL:n käyttäjätunnus ja/tai salasana on väärin",
 "Oracle username and/or password not valid" => "Oraclen käyttäjätunnus ja/tai salasana on väärin",
 "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.",
 "MySQL user '%s'@'%%' already exists" => "MySQL-käyttäjä '%s'@'%%' on jo olemassa",
+"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",
 "1 minute ago" => "1 minuutti sitten",
diff --git a/lib/l10n/fr.php b/lib/l10n/fr.php
index fc44f9760840adc25a148c27a2925634b1bfbdda..9448502df6a6a15488ebbd7846b410b9d5b387a5 100644
--- a/lib/l10n/fr.php
+++ b/lib/l10n/fr.php
@@ -34,6 +34,7 @@
 "MySQL user '%s'@'%%' already exists" => "L'utilisateur MySQL '%s'@'%%' existe déjà",
 "Drop this user from MySQL." => "Retirer cet utilisateur de la base MySQL.",
 "Offending command was: \"%s\", name: %s, password: %s" => "La requête en cause est : \"%s\", nom : %s, mot de passe : %s",
+"MS SQL username and/or password not valid: %s" => "Le nom d'utilisateur et/ou le mot de passe de la base MS SQL est invalide : %s",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Votre serveur web, n'est pas correctement configuré pour permettre la synchronisation des fichiers, car l'interface WebDav ne fonctionne pas comme il faut.",
 "Please double check the <a href='%s'>installation guides</a>." => "Veuillez vous référer au <a href='%s'>guide d'installation</a>.",
 "seconds ago" => "à l'instant",
diff --git a/lib/l10n/gl.php b/lib/l10n/gl.php
index c49e8134af10ec0355d9370516a836eb22257a01..a11724fef43a084c097c009fe2fd6221b46e35e7 100644
--- a/lib/l10n/gl.php
+++ b/lib/l10n/gl.php
@@ -6,7 +6,7 @@
 "Apps" => "Aplicativos",
 "Admin" => "Administración",
 "ZIP download is turned off." => "As descargas ZIP están desactivadas.",
-"Files need to be downloaded one by one." => "Os ficheiros necesitan seren descargados de un en un.",
+"Files need to be downloaded one by one." => "Os ficheiros necesitan seren descargados dun en un.",
 "Back to Files" => "Volver aos ficheiros",
 "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",
@@ -16,6 +16,25 @@
 "Files" => "Ficheiros",
 "Text" => "Texto",
 "Images" => "Imaxes",
+"Set an admin username." => "Estabeleza un nome de usuario administrador",
+"Set an admin password." => "Estabeleza un contrasinal de administrador",
+"Specify a data folder." => "Especifique un cartafol de datos.",
+"%s enter the database username." => "%s introduza o nome de usuario da base de datos",
+"%s enter the database name." => "%s introduza o nome da base de datos",
+"%s you may not use dots in the database name" => "%s non se poden empregar puntos na base de datos",
+"%s set the database host." => "%s estabeleza o servidor da base de datos",
+"PostgreSQL username and/or password not valid" => "Nome de usuario e/ou contrasinal de PostgreSQL incorrecto",
+"You need to enter either an existing account or the administrator." => "Deberá introducir unha conta existente ou o administrador.",
+"Oracle username and/or password not valid" => "Nome de usuario e/ou contrasinal de Oracle incorrecto",
+"MySQL username and/or password not valid" => "Nome de usuario e/ou contrasinal de MySQL incorrecto",
+"DB Error: \"%s\"" => "Produciuse un erro na base de datos: «%s»",
+"Offending command was: \"%s\"" => "A orde ofensiva foi: «%s»",
+"MySQL user '%s'@'localhost' exists already." => "O usuario MySQL  '%s'@'localhost' xa existe.",
+"Drop this user from MySQL" => "Omitir este usuario de MySQL",
+"MySQL user '%s'@'%%' already exists" => "O usuario MySQL «%s»@«%%» xa existe.",
+"Drop this user from MySQL." => "Omitir este usuario de MySQL.",
+"Offending command was: \"%s\", name: %s, password: %s" => "A orde ofensiva foi: «%s», nome: %s, contrasinal: %s",
+"MS SQL username and/or password not valid: %s" => "Nome de usuario e/ou contrasinal de MS SQL incorrecto: %s",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "O seu servidor web non está aínda configurado adecuadamente para permitir a sincronización de ficheiros xa que semella que a interface WebDAV non está a funcionar.",
 "Please double check the <a href='%s'>installation guides</a>." => "Volva comprobar as <a href='%s'>guías de instalación</a>",
 "seconds ago" => "segundos atrás",
@@ -31,7 +50,7 @@
 "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" => "ao dí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/hu_HU.php b/lib/l10n/hu_HU.php
index d1aeb621e2308a5a2d11a5bc69054a3634e07d26..537066c6feacab09a5954d33e68ce39f73f0f0ab 100644
--- a/lib/l10n/hu_HU.php
+++ b/lib/l10n/hu_HU.php
@@ -34,6 +34,7 @@
 "MySQL user '%s'@'%%' already exists" => "A '%s'@'%%' MySQL felhasználó már létezik",
 "Drop this user from MySQL." => "Törölje ezt a felhasználót a MySQL-ből.",
 "Offending command was: \"%s\", name: %s, password: %s" => "A hibát okozó parancs ez volt: \"%s\", login név: %s, jelszó: %s",
+"MS SQL username and/or password not valid: %s" => "Az MS SQL felhasználónév és/vagy jelszó érvénytelen: %s",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Az Ön webkiszolgálója nincs megfelelően beállítva az állományok szinkronizálásához, mert a WebDAV-elérés úgy tűnik, nem működik.",
 "Please double check the <a href='%s'>installation guides</a>." => "Kérjük tüzetesen tanulmányozza át a <a href='%s'>telepítési útmutatót</a>.",
 "seconds ago" => "másodperce",
diff --git a/lib/l10n/it.php b/lib/l10n/it.php
index fa4bac8ec4697d27db712e5ae8c09c14ad082b39..297f1efde056ad7f36e9fbdc1be6fad934f95a8b 100644
--- a/lib/l10n/it.php
+++ b/lib/l10n/it.php
@@ -34,6 +34,7 @@
 "MySQL user '%s'@'%%' already exists" => "L'utente MySQL '%s'@'%%' esiste già",
 "Drop this user from MySQL." => "Elimina questo utente da MySQL.",
 "Offending command was: \"%s\", name: %s, password: %s" => "Il comando non consentito era: \"%s\", nome: %s, password: %s",
+"MS SQL username and/or password not valid: %s" => "Nome utente e/o password MS SQL non validi: %s",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Il tuo server web non è configurato correttamente per consentire la sincronizzazione dei file poiché l'interfaccia WebDAV sembra essere danneggiata.",
 "Please double check the <a href='%s'>installation guides</a>." => "Leggi attentamente le <a href='%s'>guide d'installazione</a>.",
 "seconds ago" => "secondi fa",
diff --git a/lib/l10n/ja_JP.php b/lib/l10n/ja_JP.php
index 51b5b40940a3908ee053e47262124756c63c71b0..529eec3ac524c58b39a2272070c1f28c057b0550 100644
--- a/lib/l10n/ja_JP.php
+++ b/lib/l10n/ja_JP.php
@@ -34,6 +34,7 @@
 "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インタフェースが動作していないと考えられるため、あなたのWEBサーバはまだファイルの同期を許可するように適切な設定がされていません。",
 "Please double check the <a href='%s'>installation guides</a>." => "<a href='%s'>インストールガイド</a>をよく確認してください。",
 "seconds ago" => "秒前",
diff --git a/lib/l10n/ka.php b/lib/l10n/ka.php
new file mode 100644
index 0000000000000000000000000000000000000000..e5a3e6596684f6dc2dbeb860d626c135ec61e103
--- /dev/null
+++ b/lib/l10n/ka.php
@@ -0,0 +1,15 @@
+<?php $TRANSLATIONS = array(
+"Help" => "შველა",
+"Personal" => "პერსონა",
+"Users" => "მომხმარებლები",
+"Admin" => "ადმინისტრატორი",
+"ZIP download is turned off." => "ZIP გადმოწერა გამორთულია",
+"Files" => "ფაილები",
+"seconds ago" => "წამის წინ",
+"1 minute ago" => "1 წუთის წინ",
+"%d minutes ago" => "%d წუთის წინ",
+"1 hour ago" => "1 საათის წინ",
+"today" => "დღეს",
+"yesterday" => "გუშინ",
+"%d days ago" => "%d დღის წინ"
+);
diff --git a/lib/l10n/lv.php b/lib/l10n/lv.php
index 5ec9ddd969348abd92dd6843334e5ca79f15366d..c73d306ca0a6df932c8cef3afad80ced97101ac7 100644
--- a/lib/l10n/lv.php
+++ b/lib/l10n/lv.php
@@ -34,6 +34,7 @@
 "MySQL user '%s'@'%%' already exists" => "MySQL lietotājs '%s'@'%%' jau eksistē",
 "Drop this user from MySQL." => "Izmest šo lietotāju no MySQL.",
 "Offending command was: \"%s\", name: %s, password: %s" => "Vainīgā komanda bija \"%s\", vārds: %s, parole: %s",
+"MS SQL username and/or password not valid: %s" => "Nav derīga MySQL parole un/vai lietotājvārds — %s",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Jūsu serveris vēl nav pareizi iestatīts, lai ļautu sinhronizēt datnes, jo izskatās, ka WebDAV saskarne ir salauzta.",
 "Please double check the <a href='%s'>installation guides</a>." => "Lūdzu, vēlreiz pārbaudiet <a href='%s'>instalēšanas palīdzību</a>.",
 "seconds ago" => "sekundes atpakaļ",
diff --git a/lib/l10n/my_MM.php b/lib/l10n/my_MM.php
new file mode 100644
index 0000000000000000000000000000000000000000..d725a06a3a99bb97c945a2ce7f884f999b1381be
--- /dev/null
+++ b/lib/l10n/my_MM.php
@@ -0,0 +1,31 @@
+<?php $TRANSLATIONS = array(
+"Help" => "အကူအညီ",
+"Users" => "သုံးစွဲသူ",
+"Apps" => "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" => "မဆုံးဖြတ်နိုင်ပါ။",
+"Authentication error" => "ခွင့်ပြုချက်မအောင်မြင်",
+"Files" => "ဖိုင်များ",
+"Text" => "စာသား",
+"Images" => "ပုံရိပ်များ",
+"seconds ago" => "စက္ကန့်အနည်းငယ်က",
+"1 minute ago" => "၁ မိနစ်အရင်က",
+"%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" => "နှစ် အရင်က",
+"%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/nl.php b/lib/l10n/nl.php
index 4a357889fdcfd210c23922a435447a9657fe9c28..e26a663e9ccf523b3e68da055b93900e29f6363f 100644
--- a/lib/l10n/nl.php
+++ b/lib/l10n/nl.php
@@ -34,6 +34,7 @@
 "MySQL user '%s'@'%%' already exists" => "MySQL gebruiker '%s'@'%%' bestaat al",
 "Drop this user from MySQL." => "Verwijder deze gebruiker uit MySQL.",
 "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.",
 "seconds ago" => "seconden geleden",
diff --git a/lib/l10n/pl.php b/lib/l10n/pl.php
index 6ec35445bc2bdbfb383f40677b9e504d3d914940..9a1a5e836c975b408353b1c08b6a1e81b2a4d43d 100644
--- a/lib/l10n/pl.php
+++ b/lib/l10n/pl.php
@@ -16,6 +16,27 @@
 "Files" => "Pliki",
 "Text" => "Połączenie tekstowe",
 "Images" => "Obrazy",
+"Set an admin username." => "Ustaw nazwę administratora.",
+"Set an admin password." => "Ustaw hasło administratora.",
+"Specify a data folder." => "Określ folder danych.",
+"%s enter the database username." => "%s wpisz nazwę użytkownika do  bazy",
+"%s enter the database name." => "%s wpisz nazwę bazy.",
+"%s you may not use dots in the database name" => "%s nie można używać kropki w nazwie bazy danych",
+"%s set the database host." => "%s ustaw hosta bazy danych.",
+"PostgreSQL username and/or password not valid" => "PostgreSQL: Nazwa użytkownika i/lub hasło jest niepoprawne",
+"You need to enter either an existing account or the administrator." => "Należy wprowadzić istniejące konto użytkownika lub  administratora.",
+"Oracle username and/or password not valid" => "Oracle: Nazwa użytkownika i/lub hasło jest niepoprawne",
+"MySQL username and/or password not valid" => "MySQL: Nazwa użytkownika i/lub hasło jest niepoprawne",
+"DB Error: \"%s\"" => "Błąd DB: \"%s\"",
+"Offending command was: \"%s\"" => "Niepoprawna komenda: \"%s\"",
+"MySQL user '%s'@'localhost' exists already." => "Użytkownik MySQL  '%s'@'localhost' już istnieje",
+"Drop this user from MySQL" => "Usuń tego użytkownika z MySQL",
+"MySQL user '%s'@'%%' already exists" => "Użytkownik MySQL  '%s'@'%%t' już istnieje",
+"Drop this user from MySQL." => "Usuń tego użytkownika z MySQL.",
+"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>.",
 "seconds ago" => "sekund temu",
 "1 minute ago" => "1 minutę temu",
 "%d minutes ago" => "%d minut temu",
diff --git a/lib/l10n/pt_BR.php b/lib/l10n/pt_BR.php
index 25645b1dcd93f757d1bc0a37af5fdbdc77b881fc..d4f410d8885d1f2f9ec66f8cd4711620bfb8d81d 100644
--- a/lib/l10n/pt_BR.php
+++ b/lib/l10n/pt_BR.php
@@ -34,6 +34,7 @@
 "MySQL user '%s'@'%%' already exists" => "Usuário MySQL '%s'@'%%' já existe",
 "Drop this user from MySQL." => "Derrube este usuário do MySQL.",
 "Offending command was: \"%s\", name: %s, password: %s" => "Comando ofensivo era: \"%s\", nome: %s, senha: %s",
+"MS SQL username and/or password not valid: %s" => "Nome de usuário e/ou senha MS SQL inválido(s): %s",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Seu servidor web não está configurado corretamente para permitir sincronização de arquivos porque a interface WebDAV parece estar quebrada.",
 "Please double check the <a href='%s'>installation guides</a>." => "Por favor, confira os <a href='%s'>guias de instalação</a>.",
 "seconds ago" => "segundos atrás",
diff --git a/lib/l10n/pt_PT.php b/lib/l10n/pt_PT.php
index a3585f914daa5bb967b04ef66671a606bc35ad07..2c813f5b07c9fc76fe8d7cafd550190f2b89e209 100644
--- a/lib/l10n/pt_PT.php
+++ b/lib/l10n/pt_PT.php
@@ -23,8 +23,18 @@
 "%s enter the database name." => "%s introduza o nome da base de dados",
 "%s you may not use dots in the database name" => "%s não é permitido utilizar pontos (.) no nome da base de dados",
 "%s set the database host." => "%s defina o servidor da base de dados (geralmente localhost)",
-"PostgreSQL username and/or password not valid" => "Nome de utilizador/passwor do PostgreSQL inválido",
+"PostgreSQL username and/or password not valid" => "Nome de utilizador/password do PostgreSQL inválido",
 "You need to enter either an existing account or the administrator." => "Precisa de introduzir uma conta existente ou de administrador",
+"Oracle username and/or password not valid" => "Nome de utilizador/password do Oracle inválida",
+"MySQL username and/or password not valid" => "Nome de utilizador/password do MySQL inválida",
+"DB Error: \"%s\"" => "Erro na BD: \"%s\"",
+"Offending command was: \"%s\"" => "O comando gerador de erro foi: \"%s\"",
+"MySQL user '%s'@'localhost' exists already." => "O utilizador '%s'@'localhost' do MySQL já existe.",
+"Drop this user from MySQL" => "Eliminar este utilizador do MySQL",
+"MySQL user '%s'@'%%' already exists" => "O utilizador '%s'@'%%' do MySQL já existe",
+"Drop this user from MySQL." => "Eliminar este utilizador do MySQL",
+"Offending command was: \"%s\", name: %s, password: %s" => "O comando gerador de erro foi: \"%s\", nome: %s, password: %s",
+"MS SQL username and/or password not valid: %s" => "Nome de utilizador/password do MySQL é inválido: %s",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "O seu servidor web não está configurado correctamente para autorizar sincronização de ficheiros, pois o interface WebDAV parece estar com problemas.",
 "Please double check the <a href='%s'>installation guides</a>." => "Por favor verifique <a href='%s'>installation guides</a>.",
 "seconds ago" => "há alguns segundos",
diff --git a/lib/l10n/ru.php b/lib/l10n/ru.php
index c0ffcd68064f64b225a6dabc5a2756f52ba6ed57..25a88d5efc2bf4d272b97d06e60472ffd7ed4cf9 100644
--- a/lib/l10n/ru.php
+++ b/lib/l10n/ru.php
@@ -19,15 +19,24 @@
 "Set an admin username." => "Установить имя пользователя для admin.",
 "Set an admin password." => "становит пароль для admin.",
 "Specify a data folder." => "Указать папку данных.",
+"%s enter the database username." => "%s введите имя пользователя базы данных.",
+"%s enter the database name." => "%s введите имя базы данных.",
+"%s you may not use dots in the database name" => "%s Вы не можете использовать точки в имени базы данных",
+"%s set the database host." => "%s задайте хост базы данных.",
 "PostgreSQL username and/or password not valid" => "Неверное имя пользователя и/или пароль PostgreSQL",
 "You need to enter either an existing account or the administrator." => "Вы должны войти или в существующий аккаунт или под администратором.",
 "Oracle username and/or password not valid" => "Неверное имя пользователя и/или пароль Oracle",
 "MySQL username and/or password not valid" => "Неверное имя пользователя и/или пароль MySQL",
 "DB Error: \"%s\"" => "Ошибка БД: \"%s\"",
+"Offending command was: \"%s\"" => "Вызываемая команда была: \"%s\"",
 "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" => "менее минуты",
 "1 minute ago" => "1 минуту назад",
 "%d minutes ago" => "%d минут назад",
diff --git a/lib/l10n/sk_SK.php b/lib/l10n/sk_SK.php
index 97a4999407fe400f9dcb06d3910f133874ae4b10..8c9ce61622c9fbbc1ec6f989f59c7f306d0b7d82 100644
--- a/lib/l10n/sk_SK.php
+++ b/lib/l10n/sk_SK.php
@@ -34,6 +34,7 @@
 "MySQL user '%s'@'%%' already exists" => "Používateľ '%s'@'%%' už v MySQL existuje",
 "Drop this user from MySQL." => "Zahodiť používateľa z MySQL.",
 "Offending command was: \"%s\", name: %s, password: %s" => "Podozrivý príkaz bol: \"%s\", meno: %s, heslo: %s",
+"MS SQL username and/or password not valid: %s" => "Používateľské meno, alebo heslo MS SQL nie je platné: %s",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Váš webový server nie je správne nastavený na synchronizáciu, pretože rozhranie WebDAV je poškodené.",
 "Please double check the <a href='%s'>installation guides</a>." => "Prosím skontrolujte <a href='%s'>inštalačnú príručku</a>.",
 "seconds ago" => "pred sekundami",
diff --git a/lib/l10n/uk.php b/lib/l10n/uk.php
index 053644ddedec933a637035587a595f4e51c53446..68f7151d15e7ffb1c3c6bcb16301ff2b4369094d 100644
--- a/lib/l10n/uk.php
+++ b/lib/l10n/uk.php
@@ -16,6 +16,27 @@
 "Files" => "Файли",
 "Text" => "Текст",
 "Images" => "Зображення",
+"Set an admin username." => "Встановіть ім'я адміністратора.",
+"Set an admin password." => "Встановіть пароль адміністратора.",
+"Specify a data folder." => "Вкажіть теку для даних.",
+"%s enter the database username." => "%s введіть ім'я користувача бази даних.",
+"%s enter the database name." => "%s введіть назву бази даних.",
+"%s you may not use dots in the database name" => "%s не можна використовувати крапки в назві бази даних",
+"%s set the database host." => "%s встановити хост бази даних.",
+"PostgreSQL username and/or password not valid" => "PostgreSQL ім'я користувача та/або пароль не дійсні",
+"You need to enter either an existing account or the administrator." => "Вам потрібно ввести або існуючий обліковий запис або administrator.",
+"Oracle username and/or password not valid" => "Oracle ім'я користувача та/або пароль не дійсні",
+"MySQL username and/or password not valid" => "MySQL ім'я користувача та/або пароль не дійсні",
+"DB Error: \"%s\"" => "Помилка БД: \"%s\"",
+"Offending command was: \"%s\"" => "Команда, що викликала проблему: \"%s\"",
+"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." => "Ваш 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 хвилин тому",
diff --git a/lib/l10n/ur_PK.php b/lib/l10n/ur_PK.php
new file mode 100644
index 0000000000000000000000000000000000000000..7e09d79bc68b64088f6219d61a3d8fd07d8cf010
--- /dev/null
+++ b/lib/l10n/ur_PK.php
@@ -0,0 +1,8 @@
+<?php $TRANSLATIONS = array(
+"Help" => "مدد",
+"Personal" => "ذاتی",
+"Settings" => "سیٹینگز",
+"Users" => "یوزرز",
+"Apps" => "ایپز",
+"Admin" => "ایڈمن"
+);
diff --git a/lib/mail.php b/lib/mail.php
index 22194045a7643c2f3448fae871960b93ef84d9c7..61634632efce4c3bb2330b51fe422fc5c5085878 100644
--- a/lib/mail.php
+++ b/lib/mail.php
@@ -119,4 +119,12 @@ class OC_Mail {
 		return($txt);
 
 	}
+
+	/**
+	 * @param string $emailAddress a given email address to be validated
+	 * @return bool
+	 */
+	public static function ValidateAddress($emailAddress) {
+		return PHPMailer::ValidateAddress($emailAddress);
+	}
 }
diff --git a/lib/public/files.php b/lib/public/files.php
index c2945b200e85d80e09204071ae82ab648d077985..700bf574537fb6046743b8680c9152a07f8b9c3c 100644
--- a/lib/public/files.php
+++ b/lib/public/files.php
@@ -62,7 +62,8 @@ class Files {
 	 * @return int the number of bytes copied
 	 */
 	public static function streamCopy( $source, $target ) {
-		return(\OC_Helper::streamCopy( $source, $target ));
+		list($count, $result) = \OC_Helper::streamCopy( $source, $target );
+		return $count;
 	}
 
 	/**
diff --git a/lib/public/share.php b/lib/public/share.php
index c0f35333e83010f72387d675b2a55092b2d95f4d..59f41a9bfd6f59a0dbfacd9444b263a42c7d9ad0 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -61,6 +61,7 @@ class Share {
 	private static $shareTypeGroupUserUnique = 2;
 	private static $backends = array();
 	private static $backendTypes = array();
+	private static $isResharingAllowed;
 
 	/**
 	* @brief Register a sharing backend class that implements OCP\Share_Backend for an item type
@@ -384,7 +385,7 @@ class Share {
 				'itemSource' => $itemSource,
 				'shareType' => $shareType,
 				'shareWith' => $shareWith,
-			));			
+			));
 			self::delete($item['id']);
 			return true;
 		}
@@ -404,7 +405,7 @@ class Share {
 				'itemType' => $itemType,
 				'itemSource' => $itemSource,
 				'shares' => $shares
-			));			
+			));
 			foreach ($shares as $share) {
 				self::delete($share['id']);
 			}
@@ -567,6 +568,24 @@ class Share {
 		throw new \Exception($message);
 	}
 
+	/**
+	* @brief Check if resharing is allowed
+	* @return Returns true if allowed or false
+	*
+	* Resharing is allowed by default if not configured
+	*
+	*/
+	private static function isResharingAllowed() {
+		if (!isset(self::$isResharingAllowed)) {
+			if (\OC_Appconfig::getValue('core', 'shareapi_allow_resharing', 'yes') == 'yes') {
+				self::$isResharingAllowed = true;
+			} else {
+				self::$isResharingAllowed = false;
+			}
+		}
+		return self::$isResharingAllowed;
+	}
+
 	/**
 	* @brief Get a list of collection item types for the specified item type
 	* @param string Item type
@@ -767,7 +786,7 @@ class Share {
 					} else {
 						$select = '`*PREFIX*share`.`id`, `item_type`, `item_source`, `item_target`,
 							`*PREFIX*share`.`parent`, `share_type`, `share_with`, `uid_owner`,
-							`file_source`, `path`, `file_target`, `permissions`, `stime`, `expiration`, `token`';
+							`file_source`, `path`, `file_target`, `permissions`, `stime`, `expiration`, `token`, `storage`';
 					}
 				} else {
 					$select = '*';
@@ -840,7 +859,10 @@ class Share {
 					continue;
 				}
 			}
-
+			// Check if resharing is allowed, if not remove share permission
+			if (isset($row['permissions']) && !self::isResharingAllowed()) {
+				$row['permissions'] &= ~PERMISSION_SHARE;
+			}
 			// Add display names to result
 			if ( isset($row['share_with']) && $row['share_with'] != '') {
 				$row['share_with_displayname'] = \OCP\User::getDisplayName($row['share_with']);
@@ -848,7 +870,7 @@ class Share {
 			if ( isset($row['uid_owner']) && $row['uid_owner'] != '') {
 				$row['displayname_owner'] = \OCP\User::getDisplayName($row['uid_owner']);
 			}
-			
+
 			$items[$row['id']] = $row;
 		}
 		if (!empty($items)) {
@@ -978,7 +1000,7 @@ class Share {
 				throw new \Exception($message);
 			}
 			// Check if share permissions is granted
-			if ((int)$checkReshare['permissions'] & PERMISSION_SHARE) {
+			if (self::isResharingAllowed() && (int)$checkReshare['permissions'] & PERMISSION_SHARE) {
 				if (~(int)$checkReshare['permissions'] & $permissions) {
 					$message = 'Sharing '.$itemSource
 						.' failed, because the permissions exceed permissions granted to '.$uidOwner;
diff --git a/lib/public/user.php b/lib/public/user.php
index 86d1d0ccde8625c73d67eb0730256600b71b3295..9edebe0e7cf5ccc822b84f59193867403ba3b6d7 100644
--- a/lib/public/user.php
+++ b/lib/public/user.php
@@ -52,25 +52,25 @@ class User {
 	public static function getUsers($search = '', $limit = null, $offset = null) {
 		return \OC_USER::getUsers();
 	}
-	
-	/**
-	 * @brief get the user display name of the user currently logged in.
-	 * @return string display name
-	 */
-	public static function getDisplayName($user=null) {
-		return \OC_USER::getDisplayName($user);
+
+	/**
+	 * @brief get the user display name of the user currently logged in.
+	 * @return string display name
+	 */
+	public static function getDisplayName($user=null) {
+		return \OC_USER::getDisplayName($user);
 	}
-	
-	/**
-	 * @brief Get a list of all display names
-	 * @returns array with all display names (value) and the correspondig uids (key)
-	 *
-	 * Get a list of all display names and user ids.
-	 */
-	public static function getDisplayNames($search = '', $limit = null, $offset = null) {
-		return \OC_USER::getDisplayNames($search, $limit, $offset);
+
+	/**
+	 * @brief Get a list of all display names
+	 * @returns array with all display names (value) and the correspondig uids (key)
+	 *
+	 * Get a list of all display names and user ids.
+	 */
+	public static function getDisplayNames($search = '', $limit = null, $offset = null) {
+		return \OC_USER::getDisplayNames($search, $limit, $offset);
 	}
-	
+
 	/**
 	 * @brief Check if the user is logged in
 	 * @returns true/false
diff --git a/lib/public/util.php b/lib/public/util.php
index 13498b260ef88990f4f626f313cb332552d18ce1..db07cbcfff3911a1e93852cfcaba484c6b455076 100644
--- a/lib/public/util.php
+++ b/lib/public/util.php
@@ -217,11 +217,14 @@ class Util {
 	 */
 	public static function getDefaultEmailAddress($user_part) {
 		$host_name = self::getServerHostName();
-		// handle localhost installations
-		if ($host_name === 'localhost') {
-			$host_name = "example.com";
+		$defaultEmailAddress = $user_part.'@'.$host_name;
+
+		if (\OC_Mail::ValidateAddress($defaultEmailAddress)) {
+			return $defaultEmailAddress;
 		}
-		return $user_part.'@'.$host_name;
+
+		// in case we cannot build a valid email address from the hostname let's fallback to 'localhost.localdomain'
+		return $user_part.'@localhost.localdomain';
 	}
 
 	/**
diff --git a/lib/request.php b/lib/request.php
index 3af93289670cc4a45029498ba18750322c74b064..9f74cf9beb585fc8ce16957e842c97377b2a3608 100755
--- a/lib/request.php
+++ b/lib/request.php
@@ -107,7 +107,7 @@ class OC_Request {
 		if (array_key_exists('PATH_INFO', $_SERVER)) {
 			$path_info = $_SERVER['PATH_INFO'];
 		}else{
-			$path_info = substr($_SERVER['REQUEST_URI'], strlen($_SERVER['SCRIPT_NAME']));
+			$path_info = self::getRawPathInfo();
 			// following is taken from Sabre_DAV_URLUtil::decodePathSegment
 			$path_info = rawurldecode($path_info);
 			$encoding = mb_detect_encoding($path_info, array('UTF-8', 'ISO-8859-1'));
@@ -123,6 +123,19 @@ class OC_Request {
 		return $path_info;
 	}
 
+	/**
+	 * @brief get Path info from request, not urldecoded
+	 * @returns string Path info or false when not found
+	 */
+	public static function getRawPathInfo() {
+		$path_info = substr($_SERVER['REQUEST_URI'], strlen($_SERVER['SCRIPT_NAME']));
+		// Remove the query string from REQUEST_URI
+		if ($pos = strpos($path_info, '?')) {
+			$path_info = substr($path_info, 0, $pos);
+		}
+		return $path_info;
+	}
+
 	/**
 	 * @brief Check if this is a no-cache request
 	 * @returns true for no-cache
@@ -149,7 +162,7 @@ class OC_Request {
 			return 'gzip';
 		return false;
 	}
-	
+
 	/**
 	 * @brief Check if the requester sent along an mtime
 	 * @returns false or an mtime
diff --git a/lib/search.php b/lib/search.php
index e5a65f7157df6ec68ddea29bff6308cd8455f573..b9c75dfc33308523ce8afa9c28240105e2abb212 100644
--- a/lib/search.php
+++ b/lib/search.php
@@ -57,14 +57,14 @@ class OC_Search{
 		}
 		return $results;
 	}
-	
+
 	/**
 	 * remove an existing search provider
 	 * @param string $provider class name of a OC_Search_Provider
 	 */
 	public static function removeProvider($provider) {
 		self::$registeredProviders = array_filter(
-				self::$registeredProviders, 
+				self::$registeredProviders,
 				function ($element) use ($provider) {
 					return ($element['class'] != $provider);
 				}
diff --git a/lib/setup.php b/lib/setup.php
index 0c049841b2aa0965789a8696feb8cbd448354ba4..8814447f52feb4c78edc2804047af44f62990e7a 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -40,11 +40,13 @@ class OC_Setup {
 			$error[] = $l->t('Specify a data folder.');
 		}
 
-		if($dbtype=='mysql' or $dbtype == 'pgsql' or $dbtype == 'oci') { //mysql and postgresql needs more config options
-			if($dbtype=='mysql')
+		if($dbtype == 'mysql' or $dbtype == 'pgsql' or $dbtype == 'oci' or $dbtype == 'mssql') { //mysql and postgresql needs more config options
+			if($dbtype == 'mysql')
 				$dbprettyname = 'MySQL';
-			else if($dbtype=='pgsql')
+			else if($dbtype == 'pgsql')
 				$dbprettyname = 'PostgreSQL';
+			else if ($dbtype == 'mssql')
+				$dbprettyname = 'MS SQL Server';
 			else
 				$dbprettyname = 'Oracle';
 
@@ -98,7 +100,7 @@ class OC_Setup {
 					$error[] = array(
 						'error' => $e->getMessage(),
 						'hint' => $e->getHint()
-					);	
+					);
 					return($error);
 				} catch (Exception $e) {
 					$error[] = array(
@@ -152,6 +154,29 @@ class OC_Setup {
 					return $error;
 				}
 			}
+			elseif ($dbtype == 'mssql') {
+				$dbuser = $options['dbuser'];
+				$dbpass = $options['dbpass'];
+				$dbname = $options['dbname'];
+				$dbhost = $options['dbhost'];
+				$dbtableprefix = isset($options['dbtableprefix']) ? $options['dbtableprefix'] : 'oc_';
+
+				OC_Config::setValue('dbname', $dbname);
+				OC_Config::setValue('dbhost', $dbhost);
+				OC_Config::setValue('dbuser', $dbuser);
+				OC_Config::setValue('dbpassword', $dbpass);
+				OC_Config::setValue('dbtableprefix', $dbtableprefix);
+
+				try {
+					self::setupMSSQLDatabase($dbhost, $dbuser, $dbpass, $dbname, $dbtableprefix);
+				} catch (Exception $e) {
+					$error[] = array(
+						'error' => 'MS SQL username and/or password not valid',
+						'hint' => 'You need to enter either an existing account or the administrator.'
+					);
+					return $error;
+				}
+			}
 			else {
 				//delete the old sqlite database first, might cause infinte loops otherwise
 				if(file_exists("$datadir/owncloud.db")) {
@@ -174,7 +199,7 @@ class OC_Setup {
 				OC_Appconfig::setValue('core', 'lastupdatedat', microtime(true));
 				OC_AppConfig::setValue('core', 'remote_core.css', '/core/minimizer.php');
 				OC_AppConfig::setValue('core', 'remote_core.js', '/core/minimizer.php');
-				
+
 				OC_Group::createGroup('admin');
 				OC_Group::addToGroup($username, 'admin');
 				OC_User::login($username, $password);
@@ -236,8 +261,8 @@ class OC_Setup {
 		}
 
 		//fill the database if needed
-		$query="select count(*) from information_schema.tables'
-			.' where table_schema='$dbname' AND table_name = '{$dbtableprefix}users';";
+		$query='select count(*) from information_schema.tables'
+			." where table_schema='$dbname' AND table_name = '{$dbtableprefix}users';";
 		$result = mysql_query($query, $connection);
 		if($result) {
 			$row=mysql_fetch_row($result);
@@ -256,11 +281,12 @@ class OC_Setup {
 		if(!$result) {
 			$entry = $l->t('DB Error: "%s"', array(mysql_error($connection))) . '<br />';
 			$entry .= $l->t('Offending command was: "%s"', array($query)) . '<br />';
-			echo($entry);
+			\OC_Log::write('setup.mssql', $entry, \OC_Log::WARN);
 		}
 		$query="GRANT ALL PRIVILEGES ON  `$name` . * TO  '$user'";
-		//this query will fail if there aren't the right permissons, ignore the error
-		$result = mysql_query($query, $connection);
+
+		//this query will fail if there aren't the right permissions, ignore the error
+		mysql_query($query, $connection);
 	}
 
 	private static function createDBUser($name, $password, $connection) {
@@ -276,7 +302,7 @@ class OC_Setup {
 		$query = "CREATE USER '$name'@'%' IDENTIFIED BY '$password'";
 		$result = mysql_query($query, $connection);
 		if (!$result) {
-			throw new DatabaseSetupException($l->t("MySQL user '%s'@'%%' already exists", array($name)), 
+			throw new DatabaseSetupException($l->t("MySQL user '%s'@'%%' already exists", array($name)),
 				$l->t("Drop this user from MySQL."));
 		}
 	}
@@ -359,7 +385,7 @@ class OC_Setup {
 		if(!$result) {
 			$entry = $l->t('DB Error: "%s"', array(pg_last_error($connection))) . '<br />';
 			$entry .= $l->t('Offending command was: "%s"', array($query)) . '<br />';
-			echo($entry);
+			\OC_Log::write('setup.pg', $entry, \OC_Log::WARN);
 		}
 		if(! pg_fetch_row($result)) {
 			//The database does not exists... let's create it
@@ -368,11 +394,11 @@ class OC_Setup {
 			if(!$result) {
 				$entry = $l->t('DB Error: "%s"', array(pg_last_error($connection))) . '<br />';
 				$entry .= $l->t('Offending command was: "%s"', array($query)) . '<br />';
-				echo($entry);
+				\OC_Log::write('setup.pg', $entry, \OC_Log::WARN);
 			}
 			else {
 				$query = "REVOKE ALL PRIVILEGES ON DATABASE \"$e_name\" FROM PUBLIC";
-				$result = pg_query($connection, $query);
+				pg_query($connection, $query);
 			}
 		}
 	}
@@ -386,7 +412,7 @@ class OC_Setup {
 		if(!$result) {
 			$entry = $l->t('DB Error: "%s"', array(pg_last_error($connection))) . '<br />';
 			$entry .= $l->t('Offending command was: "%s"', array($query)) . '<br />';
-			echo($entry);
+			\OC_Log::write('setup.pg', $entry, \OC_Log::WARN);
 		}
 
 		if(! pg_fetch_row($result)) {
@@ -396,7 +422,7 @@ class OC_Setup {
 			if(!$result) {
 				$entry = $l->t('DB Error: "%s"', array(pg_last_error($connection))) . '<br />';
 				$entry .= $l->t('Offending command was: "%s"', array($query)) . '<br />';
-				echo($entry);
+				\OC_Log::write('setup.pg', $entry, \OC_Log::WARN);
 			}
 		}
 		else { // change password of the existing role
@@ -405,7 +431,7 @@ class OC_Setup {
 			if(!$result) {
 				$entry = $l->t('DB Error: "%s"', array(pg_last_error($connection))) . '<br />';
 				$entry .= $l->t('Offending command was: "%s"', array($query)) . '<br />';
-				echo($entry);
+				\OC_Log::write('setup.pg', $entry, \OC_Log::WARN);
 			}
 		}
 	}
@@ -428,13 +454,13 @@ class OC_Setup {
 		}
 		//check for roles creation rights in oracle
 
-		$query="SELECT count(*) FROM user_role_privs, role_sys_privs'
-			.' WHERE user_role_privs.granted_role = role_sys_privs.role AND privilege = 'CREATE ROLE'";
+		$query='SELECT count(*) FROM user_role_privs, role_sys_privs'
+			." WHERE user_role_privs.granted_role = role_sys_privs.role AND privilege = 'CREATE ROLE'";
 		$stmt = oci_parse($connection, $query);
 		if (!$stmt) {
 			$entry = $l->t('DB Error: "%s"', array(oci_last_error($connection))) . '<br />';
 			$entry .= $l->t('Offending command was: "%s"', array($query)) . '<br />';
-			echo($entry);
+			\OC_Log::write('setup.oci', $entry, \OC_Log::WARN);
 		}
 		$result = oci_execute($stmt);
 		if($result) {
@@ -498,9 +524,9 @@ class OC_Setup {
 		$un = $dbtableprefix.'users';
 		oci_bind_by_name($stmt, ':un', $un);
 		if (!$stmt) {
-			$entry = $l->t('DB Error: "%s"', array(oci_last_error($connection))) . '<br />';
+			$entry = $l->t('DB Error: "%s"', array(oci_error($connection))) . '<br />';
 			$entry .= $l->t('Offending command was: "%s"', array($query)) . '<br />';
-			echo($entry);
+			\OC_Log::write('setup.oci', $entry, \OC_Log::WARN);
 		}
 		$result = oci_execute($stmt);
 
@@ -526,14 +552,14 @@ class OC_Setup {
 		if (!$stmt) {
 			$entry = $l->t('DB Error: "%s"', array(oci_error($connection))) . '<br />';
 			$entry .= $l->t('Offending command was: "%s"', array($query)) . '<br />';
-			echo($entry);
+			\OC_Log::write('setup.oci', $entry, \OC_Log::WARN);
 		}
 		oci_bind_by_name($stmt, ':un', $name);
 		$result = oci_execute($stmt);
 		if(!$result) {
 			$entry = $l->t('DB Error: "%s"', array(oci_error($connection))) . '<br />';
 			$entry .= $l->t('Offending command was: "%s"', array($query)) . '<br />';
-			echo($entry);
+			\OC_Log::write('setup.oci', $entry, \OC_Log::WARN);
 		}
 
 		if(! oci_fetch_row($stmt)) {
@@ -544,15 +570,15 @@ class OC_Setup {
 			if (!$stmt) {
 				$entry = $l->t('DB Error: "%s"', array(oci_error($connection))) . '<br />';
 				$entry .= $l->t('Offending command was: "%s"', array($query)) . '<br />';
-				echo($entry);
+				\OC_Log::write('setup.oci', $entry, \OC_Log::WARN);
 			}
 			//oci_bind_by_name($stmt, ':un', $name);
 			$result = oci_execute($stmt);
 			if(!$result) {
 				$entry = $l->t('DB Error: "%s"', array(oci_error($connection))) . '<br />';
-				$entry .= $l->t('Offending command was: "%s", name: %s, password: %s', 
+				$entry .= $l->t('Offending command was: "%s", name: %s, password: %s',
 					array($query, $name, $password)) . '<br />';
-				echo($entry);
+				\OC_Log::write('setup.oci', $entry, \OC_Log::WARN);
 			}
 		} else { // change password of the existing role
 			$query = "ALTER USER :un IDENTIFIED BY :pw";
@@ -560,7 +586,7 @@ class OC_Setup {
 			if (!$stmt) {
 				$entry = $l->t('DB Error: "%s"', array(oci_error($connection))) . '<br />';
 				$entry .= $l->t('Offending command was: "%s"', array($query)) . '<br />';
-				echo($entry);
+				\OC_Log::write('setup.oci', $entry, \OC_Log::WARN);
 			}
 			oci_bind_by_name($stmt, ':un', $name);
 			oci_bind_by_name($stmt, ':pw', $password);
@@ -568,26 +594,200 @@ class OC_Setup {
 			if(!$result) {
 				$entry = $l->t('DB Error: "%s"', array(oci_error($connection))) . '<br />';
 				$entry .= $l->t('Offending command was: "%s"', array($query)) . '<br />';
-				echo($entry);
+				\OC_Log::write('setup.oci', $entry, \OC_Log::WARN);
 			}
 		}
-		// grant neccessary roles
+		// grant necessary roles
 		$query = 'GRANT CREATE SESSION, CREATE TABLE, CREATE SEQUENCE, CREATE TRIGGER, UNLIMITED TABLESPACE TO '.$name;
 		$stmt = oci_parse($connection, $query);
 		if (!$stmt) {
 			$entry = $l->t('DB Error: "%s"', array(oci_error($connection))) . '<br />';
 			$entry .= $l->t('Offending command was: "%s"', array($query)) . '<br />';
-			echo($entry);
+			\OC_Log::write('setup.oci', $entry, \OC_Log::WARN);
 		}
 		$result = oci_execute($stmt);
 		if(!$result) {
 			$entry = $l->t('DB Error: "%s"', array(oci_error($connection))) . '<br />';
-			$entry .= $l->t('Offending command was: "%s", name: %s, password: %s', 
+			$entry .= $l->t('Offending command was: "%s", name: %s, password: %s',
 				array($query, $name, $password)) . '<br />';
-			echo($entry);
+			\OC_Log::write('setup.oci', $entry, \OC_Log::WARN);
 		}
 	}
 
+	private static function setupMSSQLDatabase($dbhost, $dbuser, $dbpass, $dbname, $dbtableprefix) {
+		$l = self::getTrans();
+
+		//check if the database user has admin right
+		$masterConnectionInfo = array( "Database" => "master", "UID" => $dbuser, "PWD" => $dbpass);
+
+		$masterConnection = @sqlsrv_connect($dbhost, $masterConnectionInfo);
+		if(!$masterConnection) {
+			$entry = null;
+			if( ($errors = sqlsrv_errors() ) != null) {
+				$entry='DB Error: "'.print_r(sqlsrv_errors()).'"<br />';
+			} else {
+				$entry = '';
+			}
+			throw new Exception($l->t('MS SQL username and/or password not valid: %s', array($entry)));
+		}
+
+		OC_Config::setValue('dbuser', $dbuser);
+		OC_Config::setValue('dbpassword', $dbpass);
+
+		self::mssql_createDBLogin($dbuser, $dbpass, $masterConnection);
+
+		self::mssql_createDatabase($dbname, $masterConnection);
+
+		self::mssql_createDBUser($dbuser, $dbname, $masterConnection);
+
+		sqlsrv_close($masterConnection);
+
+		self::mssql_createDatabaseStructure($dbhost, $dbname, $dbuser, $dbpass, $dbtableprefix);
+	}
+
+	private static function mssql_createDBLogin($name, $password, $connection) {
+		$query = "SELECT * FROM master.sys.server_principals WHERE name = '".$name."';";
+		$result = sqlsrv_query($connection, $query);
+		if ($result === false) {
+			if ( ($errors = sqlsrv_errors() ) != null) {
+				$entry='DB Error: "'.print_r(sqlsrv_errors()).'"<br />';
+			} else {
+				$entry = '';
+			}
+			$entry.='Offending command was: '.$query.'<br />';
+			\OC_Log::write('setup.mssql', $entry, \OC_Log::WARN);
+		} else {
+			$row = sqlsrv_fetch_array($result);
+
+			if ($row === false) {
+				if ( ($errors = sqlsrv_errors() ) != null) {
+					$entry='DB Error: "'.print_r(sqlsrv_errors()).'"<br />';
+				} else {
+					$entry = '';
+				}
+				$entry.='Offending command was: '.$query.'<br />';
+				\OC_Log::write('setup.mssql', $entry, \OC_Log::WARN);
+			} else {
+				if ($row == null) {
+					$query = "CREATE LOGIN [".$name."] WITH PASSWORD = '".$password."';";
+					$result = sqlsrv_query($connection, $query);
+					if (!$result or $result === false) {
+						if ( ($errors = sqlsrv_errors() ) != null) {
+							$entry='DB Error: "'.print_r(sqlsrv_errors()).'"<br />';
+						} else {
+							$entry = '';
+						}
+						$entry.='Offending command was: '.$query.'<br />';
+						\OC_Log::write('setup.mssql', $entry, \OC_Log::WARN);
+					}
+				}
+			}
+		}
+	}
+
+	private static function mssql_createDBUser($name, $dbname, $connection) {
+		$query = "SELECT * FROM [".$dbname."].sys.database_principals WHERE name = '".$name."';";
+		$result = sqlsrv_query($connection, $query);
+		if ($result === false) {
+			if ( ($errors = sqlsrv_errors() ) != null) {
+				$entry='DB Error: "'.print_r(sqlsrv_errors()).'"<br />';
+			} else {
+				$entry = '';
+			}
+			$entry.='Offending command was: '.$query.'<br />';
+			\OC_Log::write('setup.mssql', $entry, \OC_Log::WARN);
+		} else {
+			$row = sqlsrv_fetch_array($result);
+
+			if ($row === false) {
+				if ( ($errors = sqlsrv_errors() ) != null) {
+					$entry='DB Error: "'.print_r(sqlsrv_errors()).'"<br />';
+				} else {
+					$entry = '';
+				}
+				$entry.='Offending command was: '.$query.'<br />';
+				\OC_Log::write('setup.mssql', $entry, \OC_Log::WARN);
+			} else {
+				if ($row == null) {
+					$query = "USE [".$dbname."]; CREATE USER [".$name."] FOR LOGIN [".$name."];";
+					$result = sqlsrv_query($connection, $query);
+					if (!$result || $result === false) {
+						if ( ($errors = sqlsrv_errors() ) != null) {
+							$entry = 'DB Error: "'.print_r(sqlsrv_errors()).'"<br />';
+						} else {
+							$entry = '';
+						}
+						$entry.='Offending command was: '.$query.'<br />';
+						\OC_Log::write('setup.mssql', $entry, \OC_Log::WARN);
+					}
+				}
+
+				$query = "USE [".$dbname."]; EXEC sp_addrolemember 'db_owner', '".$name."';";
+				$result = sqlsrv_query($connection, $query);
+				if (!$result || $result === false) {
+					if ( ($errors = sqlsrv_errors() ) != null) {
+						$entry='DB Error: "'.print_r(sqlsrv_errors()).'"<br />';
+					} else {
+						$entry = '';
+					}
+					$entry.='Offending command was: '.$query.'<br />';
+					\OC_Log::write('setup.mssql', $entry, \OC_Log::WARN);
+				}
+			}
+		}
+	}
+
+	private static function mssql_createDatabase($dbname, $connection) {
+		$query = "CREATE DATABASE [".$dbname."];";
+		$result = sqlsrv_query($connection, $query);
+		if (!$result || $result === false) {
+			if ( ($errors = sqlsrv_errors() ) != null) {
+				$entry='DB Error: "'.print_r(sqlsrv_errors()).'"<br />';
+			} else {
+				$entry = '';
+			}
+			$entry.='Offending command was: '.$query.'<br />';
+			\OC_Log::write('setup.mssql', $entry, \OC_Log::WARN);
+		}
+	}
+
+	private static function mssql_createDatabaseStructure($dbhost, $dbname, $dbuser, $dbpass, $dbtableprefix) {
+		$connectionInfo = array( "Database" => $dbname, "UID" => $dbuser, "PWD" => $dbpass);
+
+		$connection = @sqlsrv_connect($dbhost, $connectionInfo);
+
+		//fill the database if needed
+		$query = "SELECT * FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA = '{$dbname}' AND TABLE_NAME = '{$dbtableprefix}users'";
+		$result = sqlsrv_query($connection, $query);
+		if ($result === false) {
+			if ( ($errors = sqlsrv_errors() ) != null) {
+				$entry='DB Error: "'.print_r(sqlsrv_errors()).'"<br />';
+			} else {
+				$entry = '';
+			}
+			$entry.='Offending command was: '.$query.'<br />';
+			\OC_Log::write('setup.mssql', $entry, \OC_Log::WARN);
+		} else {
+			$row = sqlsrv_fetch_array($result);
+
+			if ($row === false) {
+				if ( ($errors = sqlsrv_errors() ) != null) {
+					$entry='DB Error: "'.print_r(sqlsrv_errors()).'"<br />';
+				} else {
+					$entry = '';
+				}
+				$entry.='Offending command was: '.$query.'<br />';
+				\OC_Log::write('setup.mssql', $entry, \OC_Log::WARN);
+			} else {
+				if ($row == null) {
+					OC_DB::createDbFromStructure('db_structure.xml');
+				}
+			}
+		}
+
+		sqlsrv_close($connection);
+	}
+
 	/**
 	 * create .htaccess files for apache hosts
 	 */
@@ -646,13 +846,12 @@ class OC_Setup {
 			header("Location: ".OC::$WEBROOT.'/');
 		} else {
 
-			$error = $l->t('Your web server is not yet properly setup to allow files'
-				.' synchronization because the WebDAV interface seems to be broken.');
+			$error = $l->t('Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken.');
 			$hint = $l->t('Please double check the <a href=\'%s\'>installation guides</a>.',
 				'http://doc.owncloud.org/server/5.0/admin_manual/installation.html');
 
 			$tmpl = new OC_Template('', 'error', 'guest');
-			$tmpl->assign('errors', array(1 => array('error' => $error, 'hint' => $hint)), false);
+			$tmpl->assign('errors', array(1 => array('error' => $error, 'hint' => $hint)));
 			$tmpl->printPage();
 			exit();
 		}
diff --git a/lib/template.php b/lib/template.php
index 3df5a24f946cb3db3c95a65671e2ee64606c2229..434c1e9e9901b7dc729773956e6f7bc7a7c8e46b 100644
--- a/lib/template.php
+++ b/lib/template.php
@@ -147,7 +147,7 @@ function html_select_options($options, $selected, $params=array()) {
 			$label = $label[$label_name];
 		}
 		$select = in_array($value, $selected) ? ' selected="selected"' : '';
-		$html .= '<option value="' . $value . '"' . $select . '>' . $label . '</option>'."\n";
+		$html .= '<option value="' . OC_Util::sanitizeHTML($value) . '"' . $select . '>' . OC_Util::sanitizeHTML($label) . '</option>'."\n";
 	}
 	return $html;
 }
@@ -200,7 +200,6 @@ class OC_Template{
 			.'img-src *; '
 			.'font-src \'self\' data:');
 		header('Content-Security-Policy:'.$policy); // Standard
-		header('X-WebKit-CSP:'.$policy); // Older webkit browsers
 
 		$this->findTemplate($name);
 	}
@@ -341,7 +340,6 @@ class OC_Template{
 	 * @brief Assign variables
 	 * @param string $key key
 	 * @param string $value value
-	 * @param bool $sanitizeHTML false, if data shouldn't get passed through htmlentities
 	 * @return bool
 	 *
 	 * This function assigns a variable. It can be accessed via $_[$key] in
@@ -349,8 +347,7 @@ class OC_Template{
 	 *
 	 * If the key existed before, it will be overwritten
 	 */
-	public function assign( $key, $value, $sanitizeHTML=true ) {
-		if($sanitizeHTML == true) $value=OC_Util::sanitizeHTML($value);
+	public function assign( $key, $value) {
 		$this->vars[$key] = $value;
 		return true;
 	}
@@ -413,11 +410,6 @@ class OC_Template{
 
 		if( $this->renderas ) {
 			$page = new OC_TemplateLayout($this->renderas);
-			if($this->renderas == 'user') {
-				$page->assign('requesttoken', $this->vars['requesttoken']);
-				$user = OC_User::getUser();
-				$page->assign('displayname', OCP\User::getDisplayName($user));
-			}
 
 			// Add custom headers
 			$page->assign('headers', $this->headers, false);
@@ -489,7 +481,7 @@ class OC_Template{
 	public static function printUserPage( $application, $name, $parameters = array() ) {
 		$content = new OC_Template( $application, $name, "user" );
 		foreach( $parameters as $key => $value ) {
-			$content->assign( $key, $value, false );
+			$content->assign( $key, $value );
 		}
 		print $content->printPage();
 	}
@@ -504,7 +496,7 @@ class OC_Template{
 	public static function printAdminPage( $application, $name, $parameters = array() ) {
 		$content = new OC_Template( $application, $name, "admin" );
 		foreach( $parameters as $key => $value ) {
-			$content->assign( $key, $value, false );
+			$content->assign( $key, $value );
 		}
 		return $content->printPage();
 	}
@@ -519,7 +511,7 @@ class OC_Template{
 	public static function printGuestPage( $application, $name, $parameters = array() ) {
 		$content = new OC_Template( $application, $name, "guest" );
 		foreach( $parameters as $key => $value ) {
-			$content->assign( $key, $value, false );
+			$content->assign( $key, $value );
 		}
 		return $content->printPage();
 	}
@@ -527,11 +519,14 @@ class OC_Template{
 	/**
 		* @brief Print a fatal error page and terminates the script
 		* @param string $error The error message to show
-		* @param string $hint An option hint message
+		* @param string $hint An optional hint message 
+		* Warning: All data passed to $hint needs to get sanitized using OC_Util::sanitizeHTML
 		*/
 	public static function printErrorPage( $error_msg, $hint = '' ) {
+		$content = new OC_Template( '', 'error', 'error' );
 		$errors = array(array('error' => $error_msg, 'hint' => $hint));
-		OC_Template::printGuestPage("", "error", array("errors" => $errors));
+		$content->assign( 'errors', $errors );
+		$content->printPage();
 		die();
 	}
 }
diff --git a/lib/templatelayout.php b/lib/templatelayout.php
index 25d4033d9eef1e7351e65c9abbbfae27c4013729..29f120a6041a532f09595b51b093c3dc53488b11 100644
--- a/lib/templatelayout.php
+++ b/lib/templatelayout.php
@@ -13,25 +13,26 @@ class OC_TemplateLayout extends OC_Template {
 		if( $renderas == 'user' ) {
 			parent::__construct( 'core', 'layout.user' );
 			if(in_array(OC_APP::getCurrentApp(), array('settings','admin', 'help'))!==false) {
-				$this->assign('bodyid', 'body-settings', false);
+				$this->assign('bodyid', 'body-settings');
 			}else{
-				$this->assign('bodyid', 'body-user', false);
+				$this->assign('bodyid', 'body-user');
 			}
 
 			// Add navigation entry
 			$this->assign( 'application', '', false );
 			$navigation = OC_App::getNavigation();
-			$this->assign( 'navigation', $navigation, false);
-			$this->assign( 'settingsnavigation', OC_App::getSettingsNavigation(), false);
+			$this->assign( 'navigation', $navigation);
+			$this->assign( 'settingsnavigation', OC_App::getSettingsNavigation());
 			foreach($navigation as $entry) {
 				if ($entry['active']) {
-					$this->assign( 'application', $entry['name'], false );
+					$this->assign( 'application', $entry['name'] );
 					break;
 				}
 			}
 			$user_displayname = OC_User::getDisplayName();
 			$this->assign( 'user_displayname', $user_displayname );
-		} else if ($renderas == 'guest') {
+			$this->assign( 'user_uid', OC_User::getUser() );
+		} else if ($renderas == 'guest' || $renderas == 'error') {
 			parent::__construct('core', 'layout.guest');
 		} else {
 			parent::__construct('core', 'layout.base');
@@ -39,7 +40,7 @@ class OC_TemplateLayout extends OC_Template {
 		// Add the js files
 		$jsfiles = self::findJavascriptFiles(OC_Util::$scripts);
 		$this->assign('jsfiles', array(), false);
-		if (OC_Config::getValue('installed', false)) {
+		if (OC_Config::getValue('installed', false) && $renderas!='error') {
 			$this->append( 'jsfiles', OC_Helper::linkToRoute('js_config'));
 		}
 		if (!empty(OC_Util::$core_scripts)) {
diff --git a/lib/user.php b/lib/user.php
index e69fef95a1383215717a215319bf8979881aceff..6144f0f6bf9851a0ae7daeb3576a77a0b90032c8 100644
--- a/lib/user.php
+++ b/lib/user.php
@@ -437,7 +437,7 @@ class OC_User {
 		}
 		return false;
 	}
-	
+
 	/**
 	 * @brief Check whether user can change his display name
 	 * @param $uid The username
@@ -530,7 +530,7 @@ class OC_User {
 				$displayNames = array_merge($displayNames, $backendDisplayNames);
 			}
 		}
-		ksort($displayNames);
+		asort($displayNames);
 		return $displayNames;
 	}
 
@@ -589,8 +589,8 @@ class OC_User {
 	 * @param string $userid
 	 */
 	public static function enableUser($userid) {
-		$sql = "DELETE FROM `*PREFIX*preferences`'
-			.' WHERE `userid` = ? AND `appid` = ? AND `configkey` = ? AND `configvalue` = ?";
+		$sql = 'DELETE FROM `*PREFIX*preferences`'
+			." WHERE `userid` = ? AND `appid` = ? AND `configkey` = ? AND `configvalue` = ?";
 		$stmt = OC_DB::prepare($sql);
 		if ( ! OC_DB::isError($stmt) ) {
 			$result = $stmt->execute(array($userid, 'core', 'enabled', 'false'));
diff --git a/lib/user/backend.php b/lib/user/backend.php
index 60b3cc6c5e4cde4ff79e44b092b6d66d2d932c32..93e8f17ca98ab460d2531dd35a3531b31cab6fbe 100644
--- a/lib/user/backend.php
+++ b/lib/user/backend.php
@@ -124,7 +124,7 @@ abstract class OC_User_Backend implements OC_User_Interface {
 	public function getHome($uid) {
 		return false;
 	}
-	
+
 	/**
 	 * @brief get display name of the user
 	 * @param $uid user ID of the user
@@ -133,7 +133,7 @@ abstract class OC_User_Backend implements OC_User_Interface {
 	public function getDisplayName($uid) {
 		return $uid;
 	}
-	
+
 	/**
 	 * @brief Get a list of all display names
 	 * @returns array with  all displayNames (value) and the corresponding uids (key)
diff --git a/lib/user/database.php b/lib/user/database.php
index a0ad03fe0a0fe7062d298c2e0a46952e7d64a9c6..210c7f3e1eb28c38b0cd42164ae3c2371a0755ef 100644
--- a/lib/user/database.php
+++ b/lib/user/database.php
@@ -110,7 +110,7 @@ class OC_User_Database extends OC_User_Backend {
 			return false;
 		}
 	}
-	
+
 	/**
 	 * @brief Set display name
 	 * @param $uid The username
@@ -146,7 +146,7 @@ class OC_User_Database extends OC_User_Backend {
 			}
 		}
 	}
-	
+
 	/**
 	 * @brief Get a list of all display names
 	 * @returns array with  all displayNames (value) and the correspondig uids (key)
@@ -162,7 +162,7 @@ class OC_User_Database extends OC_User_Backend {
 		while ($row = $result->fetchRow()) {
 			$displayNames[$row['uid']] = $row['displayname'];
 		}
-		
+
 		// let's see if we can also find some users who don't have a display name yet
 		$query = OC_DB::prepare('SELECT `uid`, `displayname` FROM `*PREFIX*users`'
 			.' WHERE LOWER(`uid`) LIKE LOWER(?)', $limit, $offset);
@@ -173,11 +173,11 @@ class OC_User_Database extends OC_User_Backend {
 				$displayNames[$row['uid']] = $row['uid'];
 			}
 		}
-		
-		
+
+
 		return $displayNames;
 	}
-	
+
 	/**
 	 * @brief Check if the password is correct
 	 * @param $uid The username
diff --git a/lib/util.php b/lib/util.php
index e739f76034c371798253f6f62b8db31e5577caac..6ed3b8b942f5a5e7d42f1f558158e4c5edc00064 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -73,9 +73,9 @@ class OC_Util {
 	 * @return array
 	 */
 	public static function getVersion() {
-		// hint: We only can count up. So the internal version number
-		// of ownCloud 4.5 will be 4.90.0. This is not visible to the user
-		return array(4, 92, 11);
+		// hint: We only can count up. Reset minor/patchlevel when
+		// updating major/minor version number.
+		return array(4, 97, 11);
 	}
 
 	/**
@@ -83,7 +83,7 @@ class OC_Util {
 	 * @return string
 	 */
 	public static function getVersionString() {
-		return '5.0 alpha 1';
+		return '5.0 RC 3';
 	}
 
 	/**
@@ -172,20 +172,20 @@ class OC_Util {
 		if(!(is_callable('sqlite_open') or class_exists('SQLite3'))
 			and !is_callable('mysql_connect')
 			and !is_callable('pg_connect')) {
-			$errors[]=array('error'=>'No database drivers (sqlite, mysql, or postgresql) installed.<br/>',
+			$errors[]=array('error'=>'No database drivers (sqlite, mysql, or postgresql) installed.',
 				'hint'=>'');//TODO: sane hint
 			$web_server_restart= true;
 		}
 
 		//common hint for all file permissons error messages
-		$permissionsHint="Permissions can usually be fixed by giving the webserver write access'
-			.' to the ownCloud directory";
+		$permissionsHint='Permissions can usually be fixed by giving the webserver write access'
+			.' to the ownCloud directory';
 
 		// Check if config folder is writable.
 		if(!is_writable(OC::$SERVERROOT."/config/") or !is_readable(OC::$SERVERROOT."/config/")) {
 			$errors[]=array('error'=>"Can't write into config directory 'config'",
-				'hint'=>"You can usually fix this by giving the webserver user write access'
-					.' to the config directory in owncloud");
+				'hint'=>'You can usually fix this by giving the webserver user write access'
+					.' to the config directory in owncloud');
 		}
 
 		// Check if there is a writable install folder.
@@ -194,8 +194,8 @@ class OC_Util {
 				|| !is_writable(OC_App::getInstallPath())
 				|| !is_readable(OC_App::getInstallPath()) ) {
 				$errors[]=array('error'=>"Can't write into apps directory",
-					'hint'=>"You can usually fix this by giving the webserver user write access'
-					.' to the apps directory in owncloud or disabling the appstore in the config file.");
+					'hint'=>'You can usually fix this by giving the webserver user write access'
+					.' to the apps directory in owncloud or disabling the appstore in the config file.');
 			}
 		}
 		$CONFIG_DATADIRECTORY = OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" );
@@ -218,73 +218,74 @@ class OC_Util {
 		}
 		// check if all required php modules are present
 		if(!class_exists('ZipArchive')) {
-			$errors[]=array('error'=>'PHP module zip not installed.<br/>',
+			$errors[]=array('error'=>'PHP module zip not installed.',
 				'hint'=>'Please ask your server administrator to install the module.');
 			$web_server_restart= false;
 		}
-
+		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;
+		}
+		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;
+		}
 		if(!function_exists('mb_detect_encoding')) {
-			$errors[]=array('error'=>'PHP module mb multibyte not installed.<br/>',
+			$errors[]=array('error'=>'PHP module mb multibyte not installed.',
 				'hint'=>'Please ask your server administrator to install the module.');
 			$web_server_restart= false;
 		}
 		if(!function_exists('ctype_digit')) {
-			$errors[]=array('error'=>'PHP module ctype is not installed.<br/>',
+			$errors[]=array('error'=>'PHP module ctype is not installed.',
 				'hint'=>'Please ask your server administrator to install the module.');
 			$web_server_restart= false;
 		}
 		if(!function_exists('json_encode')) {
-			$errors[]=array('error'=>'PHP module JSON is not installed.<br/>',
+			$errors[]=array('error'=>'PHP module JSON is not installed.',
 				'hint'=>'Please ask your server administrator to install the module.');
 			$web_server_restart= false;
 		}
 		if(!function_exists('imagepng')) {
-			$errors[]=array('error'=>'PHP module GD is not installed.<br/>',
+			$errors[]=array('error'=>'PHP module GD is not installed.',
 				'hint'=>'Please ask your server administrator to install the module.');
 			$web_server_restart= false;
 		}
 		if(!function_exists('gzencode')) {
-			$errors[]=array('error'=>'PHP module zlib is not installed.<br/>',
+			$errors[]=array('error'=>'PHP module zlib is not installed.',
 				'hint'=>'Please ask your server administrator to install the module.');
 			$web_server_restart= false;
 		}
 		if(!function_exists('iconv')) {
-			$errors[]=array('error'=>'PHP module iconv is not installed.<br/>',
+			$errors[]=array('error'=>'PHP module iconv is not installed.',
 				'hint'=>'Please ask your server administrator to install the module.');
 			$web_server_restart= false;
 		}
 		if(!function_exists('simplexml_load_string')) {
-			$errors[]=array('error'=>'PHP module SimpleXML is not installed.<br/>',
+			$errors[]=array('error'=>'PHP module SimpleXML is not installed.',
 				'hint'=>'Please ask your server administrator to install the module.');
 			$web_server_restart= false;
 		}
 		if(floatval(phpversion())<5.3) {
-			$errors[]=array('error'=>'PHP 5.3 is required.<br/>',
+			$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;
 		}
 		if(!defined('PDO::ATTR_DRIVER_NAME')) {
-			$errors[]=array('error'=>'PHP PDO module is not installed.<br/>',
+			$errors[]=array('error'=>'PHP PDO module is not installed.',
 				'hint'=>'Please ask your server administrator to install the module.');
 			$web_server_restart= false;
 		}
-
-		$handler = ini_get("session.save_handler");
-		if($handler == "files") {
-			$tmpDir = session_save_path();
-			if($tmpDir != "") {
-				if(!@is_writable($tmpDir)) {
-					$errors[]=array('error' => 'The temporary folder used by PHP to save the session data'
-						.' is either incorrect or not writable! Please check : '.session_save_path().'<br/>',
-					'hint'=>'Please ask your server administrator to grant write access'
-						.' or define another temporary folder.');
-				}
-			}
+		if(ini_get('safe_mode')) {
+			$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;
 		}
 
 		if($web_server_restart) {
-			$errors[]=array('error'=>'PHP modules have been installed, but they are still listed as missing?<br/>',
+			$errors[]=array('error'=>'PHP modules have been installed, but they are still listed as missing?',
 				'hint'=>'Please ask your server administrator to restart the web server.');
 		}
 
@@ -322,14 +323,14 @@ class OC_Util {
 			$parameters[$value] = true;
 		}
 		if (!empty($_POST['user'])) {
-			$parameters["username"] = OC_Util::sanitizeHTML($_POST['user']).'"';
+			$parameters["username"] = $_POST['user'];
 			$parameters['user_autofocus'] = false;
 		} else {
 			$parameters["username"] = '';
 			$parameters['user_autofocus'] = true;
 		}
 		if (isset($_REQUEST['redirect_url'])) {
-			$redirect_url = OC_Util::sanitizeHTML($_REQUEST['redirect_url']);
+			$redirect_url = $_REQUEST['redirect_url'];
 			$parameters['redirect_url'] = urlencode($redirect_url);
 		}
 
@@ -463,13 +464,17 @@ class OC_Util {
 	 * @see OC_Util::callRegister()
 	 */
 	public static function isCallRegistered() {
+		if(!isset($_SESSION['requesttoken'])) {
+			return false;
+		}
+
 		if(isset($_GET['requesttoken'])) {
 			$token=$_GET['requesttoken'];
-		}elseif(isset($_POST['requesttoken'])) {
+		} elseif(isset($_POST['requesttoken'])) {
 			$token=$_POST['requesttoken'];
-		}elseif(isset($_SERVER['HTTP_REQUESTTOKEN'])) {
+		} elseif(isset($_SERVER['HTTP_REQUESTTOKEN'])) {
 			$token=$_SERVER['HTTP_REQUESTTOKEN'];
-		}else{
+		} else {
 			//no token found.
 			return false;
 		}
@@ -504,10 +509,10 @@ class OC_Util {
 	 * @return array with sanitized strings or a single sanitized string, depends on the input parameter.
 	 */
 	public static function sanitizeHTML( &$value ) {
-		if (is_array($value) || is_object($value)) {
+		if (is_array($value)) {
 			array_walk_recursive($value, 'OC_Util::sanitizeHTML');
 		} else {
-			$value = htmlentities($value, ENT_QUOTES, 'UTF-8'); //Specify encoding for PHP<5.4
+			$value = htmlentities((string)$value, ENT_QUOTES, 'UTF-8'); //Specify encoding for PHP<5.4
 		}
 		return $value;
 	}
@@ -562,15 +567,23 @@ class OC_Util {
 	 */
 	public static function isWebDAVWorking() {
 		if (!function_exists('curl_init')) {
-			return;
+			return true;
 		}
-
 		$settings = array(
 			'baseUri' => OC_Helper::linkToRemote('webdav'),
 		);
 
+		// save the old timeout so that we can restore it later
+		$old_timeout=ini_get("default_socket_timeout");
+
+		// use a 5 sec timeout for the check. Should be enough for local requests.
+		ini_set("default_socket_timeout", 5);
+
 		$client = new \Sabre_DAV_Client($settings);
 
+		// for this self test we don't care if the ssl certificate is self signed and the peer cannot be verified.
+		$client->setVerifyPeer(false);
+
 		$return = true;
 		try {
 			// test PROPFIND
@@ -578,9 +591,13 @@ 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);
 			$return = false;
 		}
 
+		// restore the original timeout
+		ini_set("default_socket_timeout", $old_timeout);
+
 		return $return;
 	}
 
diff --git a/lib/vcategories.php b/lib/vcategories.php
index 8de497a61917017d9e6b43a7f16abb3e6067a3a2..2f990c5d2d2047a687eae18b6ebabdd5b4d6b5d8 100644
--- a/lib/vcategories.php
+++ b/lib/vcategories.php
@@ -306,12 +306,18 @@ class OC_VCategories {
 			OCP\Util::writeLog('core', __METHOD__.', name: ' . $name. ' exists already', OCP\Util::DEBUG);
 			return false;
 		}
-		OCP\DB::insertIfNotExist(self::CATEGORY_TABLE,
-			array(
-				'uid' => $this->user,
-				'type' => $this->type,
-				'category' => $name,
-			));
+		try {
+			OCP\DB::insertIfNotExist(self::CATEGORY_TABLE,
+				array(
+					'uid' => $this->user,
+					'type' => $this->type,
+					'category' => $name,
+				));
+			} catch(Exception $e) {
+				OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(),
+					OCP\Util::ERROR);
+				return false;
+			}
 		$id = OCP\DB::insertid(self::CATEGORY_TABLE);
 		OCP\Util::writeLog('core', __METHOD__.', id: ' . $id, OCP\Util::DEBUG);
 		$this->categories[$id] = $name;
@@ -342,12 +348,11 @@ class OC_VCategories {
 				self::$relations[] = array('objid' => $id, 'category' => $name);
 			}
 		}
-		if(count($newones) > 0) {
-			$this->categories = array_merge($this->categories, $newones);
-			if($sync === true) {
-				$this->save();
-			}
+		$this->categories = array_merge($this->categories, $newones);
+		if($sync === true) {
+			$this->save();
 		}
+
 		return true;
 	}
 
@@ -436,12 +441,17 @@ class OC_VCategories {
 	private function save() {
 		if(is_array($this->categories)) {
 			foreach($this->categories as $category) {
-				OCP\DB::insertIfNotExist(self::CATEGORY_TABLE,
-					array(
-						'uid' => $this->user,
-						'type' => $this->type,
-						'category' => $category,
-					));
+				try {
+					OCP\DB::insertIfNotExist(self::CATEGORY_TABLE,
+						array(
+							'uid' => $this->user,
+							'type' => $this->type,
+							'category' => $category,
+						));
+				} catch(Exception $e) {
+					OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(),
+						OCP\Util::ERROR);
+				}
 			}
 			// reload categories to get the proper ids.
 			$this->loadCategories();
@@ -454,12 +464,17 @@ class OC_VCategories {
 				$catid = $this->array_searchi($relation['category'], $categories);
 				OC_Log::write('core', __METHOD__ . 'catid, ' . $relation['category'] . ' ' . $catid, OC_Log::DEBUG);
 				if($catid) {
-					OCP\DB::insertIfNotExist(self::RELATION_TABLE,
-						array(
-							'objid' => $relation['objid'],
-							'categoryid' => $catid,
-							'type' => $this->type,
-							));
+					try {
+						OCP\DB::insertIfNotExist(self::RELATION_TABLE,
+							array(
+								'objid' => $relation['objid'],
+								'categoryid' => $catid,
+								'type' => $this->type,
+								));
+					} catch(Exception $e) {
+						OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(),
+							OCP\Util::ERROR);
+					}
 				}
 			}
 			self::$relations = array(); // reset
diff --git a/search/js/result.js b/search/js/result.js
index cadb0d0aabec4b6b7f6076d4a5c457dbe2442e17..78fa8efc8e9d04d3a5648eb03ddf721ebad3a67a 100644
--- a/search/js/result.js
+++ b/search/js/result.js
@@ -28,7 +28,7 @@ OC.search.showResults=function(results){
 				OC.search.hide();
 				event.stopPropagation();
 			});
-			$(window).click(function(event){
+			$(document).click(function(event){
 				OC.search.hide();
 			});
 			OC.search.lastResults=results;
diff --git a/settings/ajax/changedisplayname.php b/settings/ajax/changedisplayname.php
index 69462330765f0a6766a90be1a68d714b9697313c..dff4d733cd213790ee6469c18d52fb99f4847c31 100644
--- a/settings/ajax/changedisplayname.php
+++ b/settings/ajax/changedisplayname.php
@@ -1,33 +1,33 @@
-<?php
-// Check if we are a user
-
-OCP\JSON::callCheck();
-OC_JSON::checkLoggedIn();
-
-$username = isset($_POST["username"]) ? $_POST["username"] : OC_User::getUser();
-$displayName = $_POST["displayName"];
-
-$userstatus = null;
-if(OC_User::isAdminUser(OC_User::getUser())) {
-	$userstatus = 'admin';
-}
-if(OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username)) {
-	$userstatus = 'subadmin';
-}
-
-if ($username == OC_User::getUser() && OC_User::canUserChangeDisplayName($username)) {
-	$userstatus = 'changeOwnDisplayName';
-}
-
-if(is_null($userstatus)) {
-	OC_JSON::error( array( "data" => array( "message" => $l->t("Authentication error") )));
-	exit();
-}
-
-// Return Success story
-if( OC_User::setDisplayName( $username, $displayName )) {
-	OC_JSON::success(array("data" => array( "username" => $username, 'displayName' => $displayName )));
-}
-else{
-	OC_JSON::error(array("data" => array( "message" => $l->t("Unable to change display name"), displayName => OC_User::getDisplayName($username) )));
-}
\ No newline at end of file
+<?php
+// Check if we are a user
+
+OCP\JSON::callCheck();
+OC_JSON::checkLoggedIn();
+
+$username = isset($_POST["username"]) ? $_POST["username"] : OC_User::getUser();
+$displayName = $_POST["displayName"];
+
+$userstatus = null;
+if(OC_User::isAdminUser(OC_User::getUser())) {
+	$userstatus = 'admin';
+}
+if(OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username)) {
+	$userstatus = 'subadmin';
+}
+
+if ($username == OC_User::getUser() && OC_User::canUserChangeDisplayName($username)) {
+	$userstatus = 'changeOwnDisplayName';
+}
+
+if(is_null($userstatus)) {
+	OC_JSON::error( array( "data" => array( "message" => $l->t("Authentication error") )));
+	exit();
+}
+
+// Return Success story
+if( OC_User::setDisplayName( $username, $displayName )) {
+	OC_JSON::success(array("data" => array( "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 ceb4bbeecb0b96ba660f44fe3b5f22bac8f7ea87..1fc6d0e10002eae6296f1701bf8544c6150aa165 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 = $_POST["password"];
+$password = isset($_POST["password"]) ? $_POST["password"] : null;
 $oldPassword=isset($_POST["oldpassword"])?$_POST["oldpassword"]:'';
 
 $userstatus = null;
@@ -28,7 +28,7 @@ if(is_null($userstatus)) {
 }
 
 // Return Success story
-if( OC_User::setPassword( $username, $password )) {
+if(!is_null($password) && OC_User::setPassword( $username, $password )) {
 	OC_JSON::success(array("data" => array( "username" => $username )));
 }
 else{
diff --git a/settings/ajax/getlog.php b/settings/ajax/getlog.php
index 043124fa175a57e6cbc071ab55ca9fcb3b6ddb8d..141457e72a0ad1bf4ec7eaefa5f1ba27f8515d7b 100644
--- a/settings/ajax/getlog.php
+++ b/settings/ajax/getlog.php
@@ -11,6 +11,8 @@ $count=(isset($_GET['count']))?$_GET['count']:50;
 $offset=(isset($_GET['offset']))?$_GET['offset']:0;
 
 $entries=OC_Log_Owncloud::getEntries($count, $offset);
+$data = array();
+
 OC_JSON::success(array(
-	"data" => OC_Util::sanitizeHTML($entries),
+	"data" => $entries,
 	"remain"=>(count(OC_Log_Owncloud::getEntries(1, $offset + $offset)) != 0) ? true : false));
diff --git a/settings/ajax/setquota.php b/settings/ajax/setquota.php
index 356466c0c002c3d509a5aef5cf3e8ff307143a8a..cd8dc0e2796ee8fe99df217f6009a1e86f85f87b 100644
--- a/settings/ajax/setquota.php
+++ b/settings/ajax/setquota.php
@@ -10,7 +10,9 @@ OCP\JSON::callCheck();
 
 $username = isset($_POST["username"])?$_POST["username"]:'';
 
-if(($username == '' && !OC_User::isAdminUser(OC_User::getUser()))|| (!OC_User::isAdminUser(OC_User::getUser()) && !OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username))) {
+if(($username == '' && !OC_User::isAdminUser(OC_User::getUser()))
+	|| (!OC_User::isAdminUser(OC_User::getUser())
+		&& !OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username))) {
 	$l = OC_L10N::get('core');
 	OC_JSON::error(array( 'data' => array( 'message' => $l->t('Authentication error') )));
 	exit();
diff --git a/settings/ajax/togglegroups.php b/settings/ajax/togglegroups.php
index 9bba9c5269d0f8d56e24a3252e5a2432fd695e74..f6fd9aba6d908a0d77f52732bcbedcf1bddda149 100644
--- a/settings/ajax/togglegroups.php
+++ b/settings/ajax/togglegroups.php
@@ -13,7 +13,9 @@ if($username == OC_User::getUser() && $group == "admin" &&  OC_User::isAdminUser
 	exit();
 }
 
-if(!OC_User::isAdminUser(OC_User::getUser()) && (!OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username) || !OC_SubAdmin::isGroupAccessible(OC_User::getUser(), $group))) {
+if(!OC_User::isAdminUser(OC_User::getUser())
+	&& (!OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username)
+		|| !OC_SubAdmin::isGroupAccessible(OC_User::getUser(), $group))) {
 	$l = OC_L10N::get('core');
 	OC_JSON::error(array( 'data' => array( 'message' => $l->t('Authentication error') )));
 	exit();
diff --git a/settings/ajax/userlist.php b/settings/ajax/userlist.php
index 9bbff80ea0cc17eef7bccd0ae2e13f699b093fea..5282f4a7143e87f48b45c366134a206aaf55a71c 100644
--- a/settings/ajax/userlist.php
+++ b/settings/ajax/userlist.php
@@ -29,10 +29,11 @@ if (isset($_GET['offset'])) {
 }
 $users = array();
 if (OC_User::isAdminUser(OC_User::getUser())) {
-	$batch = OC_User::getUsers('', 10, $offset);
-	foreach ($batch as $user) {
+	$batch = OC_User::getDisplayNames('', 10, $offset);
+	foreach ($batch as $user => $displayname) {
 		$users[] = array(
 			'name' => $user,
+			'displayname' => $displayname,
 			'groups' => join(', ', OC_Group::getUserGroups($user)),
 			'subadmin' => join(', ', OC_SubAdmin::getSubAdminsGroups($user)),
 			'quota' => OC_Preferences::getValue($user, 'files', 'quota', 'default'));
@@ -43,6 +44,7 @@ if (OC_User::isAdminUser(OC_User::getUser())) {
 	foreach ($batch as $user) {
 		$users[] = array(
 			'name' => $user,
+			'displayname' => OC_User::determineDisplayName($user),
 			'groups' => join(', ', OC_Group::getUserGroups($user)),
 			'quota' => OC_Preferences::getValue($user, 'files', 'quota', 'default'));
 	}
diff --git a/settings/apps.php b/settings/apps.php
index b9ed2cac93a6a12f8562bf0de58bb458c25f9237..44cfff7e3f1e1f375db2295e720659d237355053 100644
--- a/settings/apps.php
+++ b/settings/apps.php
@@ -49,7 +49,7 @@ usort( $combinedApps, 'app_sort' );
 
 $tmpl = new OC_Template( "settings", "apps", "user" );
 
-$tmpl->assign('apps', $combinedApps, false);
+$tmpl->assign('apps', $combinedApps);
 
 $appid = (isset($_GET['appid'])?strip_tags($_GET['appid']):'');
 
diff --git a/settings/js/apps.js b/settings/js/apps.js
index 8c266c66e4b118c66e886974d84a4437a40778ad..43013a9e1ec8a547b77e51508e55a242c25f6e25 100644
--- a/settings/js/apps.js
+++ b/settings/js/apps.js
@@ -18,7 +18,7 @@ OC.Settings.Apps = OC.Settings.Apps || {
 			page.find('span.version').text('');
 		}
 		page.find('span.score').html(app.score);
-		page.find('p.description').html(app.description);
+		page.find('p.description').text(app.description);
 		page.find('img.preview').attr('src', app.preview);
 		page.find('small.externalapp').attr('style', 'visibility:visible');
 		page.find('span.author').text(app.author);
diff --git a/settings/js/log.js b/settings/js/log.js
index 04a7bf8b2881fff567920181c02563596d9434ec..09b8ec1ab4498a9f67e398929918803214a40ee5 100644
--- a/settings/js/log.js
+++ b/settings/js/log.js
@@ -42,7 +42,7 @@ OC.Log={
 			row.append(appTd);
 			
 			var messageTd=$('<td/>');
-			messageTd.html(entry.message);
+			messageTd.text(entry.message);
 			row.append(messageTd);
 			
 			var timeTd=$('<td/>');
diff --git a/settings/js/personal.js b/settings/js/personal.js
index d9455b3786bbdd881badd180919ffb61145a6bca..d0a471e56b57b5cf8ff0cb35ad6da349804e761b 100644
--- a/settings/js/personal.js
+++ b/settings/js/personal.js
@@ -31,7 +31,7 @@ $(document).ready(function(){
 		}
 
 	});
-	
+
 	$("#displaynamebutton").click( function(){
 		if ($('#displayName').val() != '' ) {
 			// Serialize the data
@@ -42,6 +42,9 @@ $(document).ready(function(){
 			$.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)
diff --git a/settings/js/users.js b/settings/js/users.js
index 086b0884a3b402a33fa3a2de2de2848ebcd825a0..9bc7455285a7d6ca2490465965cb5329d21299f1 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -27,7 +27,7 @@ var UserList = {
 
 		// Provide user with option to undo
 		$('#notification').data('deleteuser', true);
-		OC.Notification.showHtml(t('users', 'deleted') + ' ' + uid + '<span class="undo">' + t('users', 'undo') + '</span>');
+		OC.Notification.showHtml(t('users', 'deleted') + ' ' + escapeHTML(uid) + '<span class="undo">' + t('users', 'undo') + '</span>');
 	},
 
 	/**
@@ -66,10 +66,10 @@ var UserList = {
 		}
 	},
 
-	add: function (username, groups, subadmin, quota, sort) {
+	add: function (username, displayname, groups, subadmin, quota, sort) {
 		var tr = $('tbody tr').first().clone();
 		tr.attr('data-uid', username);
-		tr.attr('data-displayName', username);
+		tr.attr('data-displayName', displayname);
 		tr.find('td.name').text(username);
 		tr.find('td.displayName').text(username);
 		var groupsSelect = $('<select multiple="multiple" class="groupsselect" data-placehoder="Groups" title="' + t('settings', 'Groups') + '"></select>').attr('data-username', username).attr('data-user-groups', groups);
@@ -80,9 +80,9 @@ var UserList = {
 		}
 		var allGroups = String($('#content table').attr('data-groups')).split(', ');
 		$.each(allGroups, function (i, group) {
-			groupsSelect.append($('<option value="' + group + '">' + group + '</option>'));
+			groupsSelect.append($('<option value="' + escapeHTML(group) + '">' + escapeHTML(group) + '</option>'));
 			if (typeof subadminSelect !== 'undefined' && group != 'admin') {
-				subadminSelect.append($('<option value="' + group + '">' + group + '</option>'));
+				subadminSelect.append($('<option value="' + escapeHTML(group) + '">' + escapeHTML(group) + '</option>'));
 			}
 		});
 		tr.find('td.groups').append(groupsSelect);
@@ -111,14 +111,14 @@ var UserList = {
 			if (quotaSelect.find('option[value="' + quota + '"]').length > 0) {
 				quotaSelect.find('option[value="' + quota + '"]').attr('selected', 'selected');
 			} else {
-				quotaSelect.append('<option value="' + quota + '" selected="selected">' + quota + '</option>');
+				quotaSelect.append('<option value="' + escapeHTML(quota) + '" selected="selected">' + escapeHTML(quota) + '</option>');
 			}
 		}
 		var added = false;
 		if (sort) {
-			username = username.toLowerCase();
+			displayname = displayname.toLowerCase();
 			$('tbody tr').each(function () {
-				if (username < $(this).attr('data-uid').toLowerCase()) {
+				if (displayname < $(this).attr('data-uid').toLowerCase()) {
 					$(tr).insertBefore($(this));
 					added = true;
 					return false;
@@ -138,7 +138,7 @@ var UserList = {
 		$.get(OC.Router.generate('settings_ajax_userlist', { offset: UserList.offset }), function (result) {
 			if (result.status === 'success') {
 				$.each(result.data, function (index, user) {
-					var tr = UserList.add(user.name, user.groups, user.subadmin, user.quota, false);
+					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) {
@@ -182,7 +182,7 @@ var UserList = {
 			var addGroup = function (select, group) {
 				$('select[multiple]').each(function (index, element) {
 					if ($(element).find('option[value="' + group + '"]').length === 0 && select.data('msid') !== $(element).data('msid')) {
-						$(element).append('<option value="' + group + '">' + group + '</option>');
+						$(element).append('<option value="' + escapeHTML(group) + '">' + escapeHTML(group) + '</option>');
 					}
 				})
 			};
@@ -224,7 +224,7 @@ var UserList = {
 			var addSubAdmin = function (group) {
 				$('select[multiple]').each(function (index, element) {
 					if ($(element).find('option[value="' + group + '"]').length == 0) {
-						$(element).append('<option value="' + group + '">' + group + '</option>');
+						$(element).append('<option value="' + escapeHTML(group) + '">' + escapeHTML(group) + '</option>');
 					}
 				})
 			};
@@ -373,7 +373,7 @@ $(document).ready(function () {
 					OC.dialogs.alert(result.data.message,
 						t('settings', 'Error creating user'));
 				} else {
-					UserList.add(username, result.data.groups, null, 'default', true);
+					UserList.add(username, username, result.data.groups, null, 'default', true);
 				}
 			}
 		);
diff --git a/settings/l10n/bg_BG.php b/settings/l10n/bg_BG.php
index cdb9927a6aa766b3d4524975c2ca0d234ec50cc5..24664c5309f7646c38332a5952ba50b176c9f421 100644
--- a/settings/l10n/bg_BG.php
+++ b/settings/l10n/bg_BG.php
@@ -18,6 +18,7 @@
 "Groups" => "Групи",
 "Delete" => "Изтриване",
 "__language_name__" => "__language_name__",
+"Please double check the <a href='%s'>installation guides</a>." => "Моля направете повторна справка с <a href='%s'>ръководството за инсталиране</a>.",
 "More" => "Още",
 "Version" => "Версия",
 "Add your App" => "Добавете Ваше приложение",
diff --git a/settings/l10n/ca.php b/settings/l10n/ca.php
index e4b7208ee611a4e970847ce645b54dd47d6e7734..2c9699188773d55437583c816d3fb2f40696cd97 100644
--- a/settings/l10n/ca.php
+++ b/settings/l10n/ca.php
@@ -43,7 +43,7 @@
 "Module 'fileinfo' missing" => "No s'ha trobat el mòdul 'fileinfo'",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "El mòdul de PHP 'fileinfo' no s'ha trobat. Us recomanem que habiliteu aquest mòdul per obtenir millors resultats amb la detecció mime-type.",
 "Locale not working" => "Locale no funciona",
-"This ownCloud server can't set system locale to \"en_US.UTF-8\"/\"en_US.UTF8\". 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 en_US.UTF-8/en_US.UTF8." => "Aquest servidor ownCloud no pot establir el locale del sistema a \"en_US.UTF-8\"/\"en_US.UTF8\". Això significa que hi poden haver problemes amb alguns caràcters en el nom dels fitxers. Us recomanem instal·lar els paquets necessaris añ sistema per donar suport en_US.UTF-8/en_US.UTF8.",
+"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." => "Aquest servidor ownCloud no pot establir el locale del sistema a %s. Això significa que hi poden haver problemes amb alguns caràcters en el nom dels fitxers. Us recomanem instal·lar els paquets necessaris al sistema per donar suport a %s.",
 "Internet connection not working" => "La connexió a internet no funciona",
 "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." => "Aquest servidor ownCloud no té cap connexió a internet que funcioni. Això significa que algunes de les característiques com el muntatge d'emmagatzemament externs, les notificacions quant a actualitzacions o la instal·lació d'aplicacions de tercers no funcionarà. L'accés remot a fitxers i l'enviament de correus electrònics podria tampoc no funcionar. Us suggerim que habiliteu la connexió a internet per aquest servidor si voleu gaudir de totes les possibilitats d'ownCloud.",
 "Cron" => "Cron",
diff --git a/settings/l10n/cs_CZ.php b/settings/l10n/cs_CZ.php
index 45bacb0bb63dfb4661a6db454b75a9cd6d44442a..35b14f11de7d7619fa3ca53e2fd2bdf6a2fbe2e2 100644
--- a/settings/l10n/cs_CZ.php
+++ b/settings/l10n/cs_CZ.php
@@ -43,7 +43,7 @@
 "Module 'fileinfo' missing" => "Schází modul 'fileinfo'",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Schází modul PHP 'fileinfo'. Doporučujeme jej povolit pro nejlepší výsledky detekce typů MIME.",
 "Locale not working" => "Locale nefunguje",
-"This ownCloud server can't set system locale to \"en_US.UTF-8\"/\"en_US.UTF8\". 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 en_US.UTF-8/en_US.UTF8." => "Server ownCloud nemůže nastavit systémové locale na \"en_US.UTF-8\"/\"en_US.UTF8\".  Můžete tedy mít problémy s některými znaky v názvech souborů. Důrazně doporučujeme nainstalovat potřebné balíčky pro podporu en_US.UTF-8/en_US.UTF8.",
+"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 nemůže nastavit locale systému na %s. Můžete tedy mít problémy s některými znaky v názvech souborů. Důrazně doporučujeme nainstalovat potřebné balíčky pro podporu %s.",
 "Internet connection not working" => "Spojení s internetem nefujguje",
 "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 nemá funkční spojení s internetem. Některé moduly jako externí úložiště, oznámení o dostupných aktualizacích, nebo instalace aplikací třetích stran nefungují. Přístup k souborům z jiných míst a odesílání oznamovacích e-mailů také nemusí fungovat. Pokud si přejete využívat všech vlastností ownCloud, doporučujeme povolit internetové spojení pro tento server.",
 "Cron" => "Cron",
diff --git a/settings/l10n/da.php b/settings/l10n/da.php
index 5a330d371a832350b42ba75a0dcc5cbdbd6fc510..da17fc132d9c5c0bfdf1d90aee90f62958736605 100644
--- a/settings/l10n/da.php
+++ b/settings/l10n/da.php
@@ -26,14 +26,45 @@
 "Saving..." => "Gemmer...",
 "deleted" => "Slettet",
 "undo" => "fortryd",
+"Unable to remove user" => "Kan ikke fjerne bruger",
 "Groups" => "Grupper",
 "Group Admin" => "Gruppe Administrator",
 "Delete" => "Slet",
+"add group" => "Tilføj gruppe",
+"A valid username must be provided" => "Et gyldigt brugernavn skal angives",
+"Error creating user" => "Fejl ved oprettelse af bruger",
+"A valid password must be provided" => "En gyldig adgangskode skal angives",
 "__language_name__" => "Dansk",
 "Security Warning" => "Sikkerhedsadvarsel",
 "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 data mappe og dine filer er muligvis tilgængelige fra internettet. .htaccess filen som ownCloud leverer virker ikke. Vi anbefaler på det kraftigste at du konfigurerer din webserver på en måske så data mappen ikke  længere er tilgængelig eller at du flytter data mappen uden for webserverens dokument rod.  ",
+"Setup Warning" => "Opsætnings Advarsel",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Din webserver er endnu ikke sat op til at tillade fil synkronisering fordi WebDAV grænsefladen virker ødelagt.",
 "Please double check the <a href='%s'>installation guides</a>." => "Dobbelttjek venligst <a href='%s'>installations vejledningerne</a>.",
+"Module 'fileinfo' missing" => "Module 'fileinfo' mangler",
+"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP modulet 'fileinfo' mangler. Vi anbefaler stærkt at aktivere dette modul til at få de bedste resultater med mime-type detektion.",
+"Locale not working" => "Landestandard fungerer 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 server kan ikke indstille systemets landestandard for %s. Det betyder, at der kan være problemer med visse tegn i filnavne. Vi anbefaler kraftigt, at installere de nødvendige pakker på dit system til at understøtte %s.",
+"Internet connection not working" => "Internetforbindelse fungerer ikke",
+"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-server har ikke en fungerende forbindelse til internettet. Det betyder, at visse funktioner som montering af eksterne drev, oplysninger om opdatering eller installation af eksterne applikationer ikke fungerer. Det vil sandsynligvis heller ikke fungere at tilgå filer fra eksterne drev eller informationsemails. Vi opfordrer til at etablere forbindelse til internettet for denne server, såfremt du ønsker alle ownClouds funktioner.",
+"Cron" => "Cron",
+"Execute one task with each page loaded" => "Udføre en opgave med hver side indlæst",
+"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 registreret hos en webcron service. Kald cron.php side i owncloud rod en gang i minuttet over HTTP.",
+"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Brug system cron service. Kald cron.php filen i owncloud mappe via et system cronjob en gang i minuttet.",
+"Sharing" => "Deling",
+"Enable Share API" => "Aktiver Share API",
+"Allow apps to use the Share API" => "Tillad apps til at bruge Share API",
+"Allow links" => "Tillad links",
+"Allow users to share items to the public with links" => "Tillad brugere at dele elementer til offentligheden med links",
+"Allow resharing" => "Tillad videredeling",
+"Allow users to share items shared with them again" => "Tillad brugere at dele elementer delt med dem igen",
+"Allow users to share with anyone" => "Tillad brugere at dele med alle",
+"Allow users to only share with users in their groups" => "Tillad brugere at kun dele med brugerne i deres grupper",
+"Security" => "Sikkerhed",
+"Enforce HTTPS" => "Gennemtving HTTPS",
+"Enforces the clients to connect to ownCloud via an encrypted connection." => "Håndhæver klienter at oprette forbindelse til ownCloud via en krypteret forbindelse.",
+"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "Opret forbindelse til denne ownCloud enhed via HTTPS for at aktivere eller deaktivere SSL håndhævelse.",
+"Log" => "Log",
+"Log level" => "Log niveau",
 "More" => "Mere",
 "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>.",
diff --git a/settings/l10n/de.php b/settings/l10n/de.php
index 4b8ee76e762e16ca7ebcd1951553c0fdc5459294..6307bdc61b5e1a1826dc89a448ef8552ec12a08a 100644
--- a/settings/l10n/de.php
+++ b/settings/l10n/de.php
@@ -36,23 +36,23 @@
 "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.",
+"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>.",
 "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 \"en_US.UTF-8\"/\"en_US.UTF8\". 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 en_US.UTF-8/en_US.UTF8." => "Dieser ownCloud Server kann die Ländereinstellung nicht auf \"de_DE.UTF-8\"/\"de_DE.UTF8\" ändern. Dies bedeutet dass es Probleme mit bestimmten Zeichen in Dateinamen geben könnte. Wir empfehlen die für de_DE.UTF-8/de_DE.UTF8 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 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 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 Sie alle Funktionen von ownCloud nutzen wollen.",
+"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 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",
@@ -64,7 +64,7 @@
 "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",
 "Log" => "Log",
-"Log level" => "Logtiefe",
+"Log level" => "Loglevel",
 "More" => "Mehr",
 "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.",
@@ -81,7 +81,7 @@
 "Bugtracker" => "Bugtracker",
 "Commercial Support" => "Kommerzieller Support",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Du verwendest <strong>%s</strong> der verfügbaren <strong>%s<strong>",
-"Get the apps to sync your files" => "Laden Sie die Apps zur Synchronisierung ihrer Daten herunter",
+"Get the apps to sync your files" => "Lade die Apps zur Synchronisierung Deiner Daten herunter",
 "Show First Run Wizard again" => "Erstinstallation erneut durchführen",
 "Password" => "Passwort",
 "Your password was changed" => "Dein Passwort wurde geändert.",
diff --git a/settings/l10n/de_DE.php b/settings/l10n/de_DE.php
index cf947019585a76efe029a24766e2f86353dd5a91..3192a4a78683dbea1e8952950045f18e7a904b71 100644
--- a/settings/l10n/de_DE.php
+++ b/settings/l10n/de_DE.php
@@ -22,7 +22,7 @@
 "Updating...." => "Update...",
 "Error while updating app" => "Es ist ein Fehler während des Updates aufgetreten",
 "Error" => "Fehler",
-"Updated" => "Geupdated",
+"Updated" => "Aktualisiert",
 "Saving..." => "Speichern...",
 "deleted" => "gelöscht",
 "undo" => "rückgängig machen",
@@ -30,20 +30,35 @@
 "Groups" => "Gruppen",
 "Group Admin" => "Gruppenadministrator",
 "Delete" => "Löschen",
-"add group" => "Gruppe konnte nicht hinzugefügt werden",
+"add group" => "Gruppe hinzufügen",
+"A valid username must be provided" => "Es muss ein gültiger Benutzername angegeben werden",
 "Error creating user" => "Beim Erstellen des Benutzers ist ein Fehler aufgetreten",
+"A valid password must be provided" => "Es muss ein gültiges Passwort angegeben werden",
 "__language_name__" => "Deutsch (Förmlich: Sie)",
 "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.",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Ihr Web-Server ist wahrscheinlich noch nicht konfiguriert, Datei-Synchronisation zu erlauben, weil die WebDAV-Schnittstelle vermutlich defekt ist.",
+"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>.",
+"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.",
+"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.",
 "Sharing" => "Teilen",
-"Enable Share API" => "Teilen-API aktivieren",
-"Allow apps to use the Share API" => "Erlaube es Anwendungen, die Teilen-API zu benutzen",
+"Enable Share API" => "Share-API aktivieren",
+"Allow apps to use the Share API" => "Erlaube es Anwendungen, 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 weiterteilen",
+"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",
 "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.",
diff --git a/settings/l10n/el.php b/settings/l10n/el.php
index 66d9d92ca30e14ca205f68ecd3505874627ce8af..fb1b95a72d3c50b941bc70c74d7c40019ba442e9 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" => "Σφάλμα πιστοποίησης",
+"Unable to change display name" => "Δεν είναι δυνατή η αλλαγή του ονόματος εμφάνισης",
 "Group already exists" => "Η ομάδα υπάρχει ήδη",
 "Unable to add group" => "Αδυναμία προσθήκης ομάδας",
 "Could not enable app. " => "Αδυναμία ενεργοποίησης εφαρμογής ",
@@ -13,18 +14,52 @@
 "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 while updating app" => "Σφάλμα κατά την ενημέρωση της εφαρμογής",
 "Error" => "Σφάλμα",
+"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." => "Ο κατάλογος data και τα αρχεία σας πιθανόν να είναι διαθέσιμα στο διαδίκτυο. Το αρχείο .htaccess που παρέχει το ownCloud δεν δουλεύει. Σας προτείνουμε ανεπιφύλακτα να ρυθμίσετε το διακομιστή σας με τέτοιο τρόπο ώστε ο κατάλογος data να μην είναι πλέον προσβάσιμος ή να μετακινήσετε τον κατάλογο data έξω από τον κατάλογο του διακομιστή.",
+"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. Να καλείται μια φορά το λεπτό η σελίδα 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" => "Να επιτρέπεται στους χρήστες ο διαμοιρασμός μόνο με χρήστες της ίδιας ομάδας",
+"Security" => "Ασφάλεια",
+"Enforce HTTPS" => "Επιβολή χρήσης HTTPS",
+"Enforces the clients to connect to ownCloud via an encrypted connection." => "Επιβολή στους πελάτες να συνδεθούν στο ownCloud μέσω μιας κρυπτογραφημένης σύνδεσης.",
+"Log" => "Καταγραφές",
+"Log level" => "Επίπεδο καταγραφής",
 "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</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>.",
@@ -41,6 +76,7 @@
 "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" => "Το συνθηματικό σας έχει αλλάξει",
@@ -48,6 +84,10 @@
 "Current password" => "Τρέχων συνθηματικό",
 "New password" => "Νέο συνθηματικό",
 "Change password" => "Αλλαγή συνθηματικού",
+"Display Name" => "Όνομα εμφάνισης",
+"Your display name was changed" => "Το όνομα εμφάνισής σας άλλαξε",
+"Unable to change your display name" => "Δεν ήταν δυνατή η αλλαγή του ονόματος εμφάνισής σας",
+"Change display name" => "Αλλαγή ονόματος εμφάνισης",
 "Email" => "Email",
 "Your email address" => "Η διεύθυνση ηλεκτρονικού ταχυδρομείου σας",
 "Fill in an email address to enable password recovery" => "Συμπληρώστε μια διεύθυνση ηλεκτρονικού ταχυδρομείου για να ενεργοποιηθεί η ανάκτηση συνθηματικού",
@@ -55,10 +95,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/es.php b/settings/l10n/es.php
index e0c20c6d97c8e88d6da98d69ee4bf66d81f6cc3d..c8467853c4f52e7c2f0fabfe22e02c6971ecab52 100644
--- a/settings/l10n/es.php
+++ b/settings/l10n/es.php
@@ -26,14 +26,45 @@
 "Saving..." => "Guardando...",
 "deleted" => "borrado",
 "undo" => "deshacer",
+"Unable to remove user" => "No se puede quitar el usuario",
 "Groups" => "Grupos",
 "Group Admin" => "Grupo admin",
 "Delete" => "Eliminar",
+"add group" => "Añadir Grupo",
+"A valid username must be provided" => "Se debe usar un nombre de usuario  valido",
+"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 están 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.",
+"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 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.",
+"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.",
+"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.",
+"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 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 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",
 "More" => "Más",
 "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>." => "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>.",
@@ -50,6 +81,7 @@
 "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",
 "Show First Run Wizard again" => "Mostrar asistente para iniciar otra vez",
 "Password" => "Contraseña",
 "Your password was changed" => "Su contraseña ha sido cambiada",
diff --git a/settings/l10n/es_AR.php b/settings/l10n/es_AR.php
index d5e054a14dc08507161757c53dc302cac9f76411..b3788d49baa82f40d07345acdece00e35e0cdd29 100644
--- a/settings/l10n/es_AR.php
+++ b/settings/l10n/es_AR.php
@@ -43,10 +43,13 @@
 "Module 'fileinfo' missing" => "Modulo 'fileinfo' no existe",
 "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 existe. Es muy recomendable que active este modulo para obtener mejores resultados con la detección mime-type",
 "Locale not working" => "\"Locale\" no está funcionando",
-"This ownCloud server can't set system locale to \"en_US.UTF-8\"/\"en_US.UTF8\". 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 en_US.UTF-8/en_US.UTF8." => "El servidor ownCloud no puede establecer el sistema locale a \"en_US.UTF-8\"/\"en_US.UTF8\". Esto significa que debe haber u problema con ciertos caracteres en los nombres de archivo. Le recomendamos instalar en su sitema los paquetes requeridos para soportar en_US.UTF-8/en_US.UTF8.",
+"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." => "El servidor ownCloud no pude asignar la localización de sistema a %s. Esto puede hacer que hayan problemas con algunos caracteres en los nombres de los archivos. Te sugerimos que instales los paquetes necesarios en tu sistema para dar soporte a %s.",
 "Internet connection not working" => "La conexión 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 una conexión a internet que funcione. Esto significa que alguno de sus servicios como montar dispositivos externos, notificaciones de actualizaciones o instalar aplicaciones de otros desarrolladores no funcionan. Acceder a archivos remotos y mandar e-mails puede ser que tampoco funcione. Te sugerimos que actives una conexión a internet si querés estas características  de ownCloud.",
 "Cron" => "Cron",
 "Execute one task with each page loaded" => "Ejecute una tarea con cada pagina 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á registrado como un servicio webcron. Llamar la página cron.php en la raíz de ownCloud una vez al minuto sobre http.",
+"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Usa el servicio de sistema cron. Llama al archivo cron.php en la carpeta de ownCloud a través del sistema cronjob cada un minuto.",
 "Sharing" => "Compartiendo",
 "Enable Share API" => "Habilitar Share API",
 "Allow apps to use the Share API" => "Permitir a las aplicaciones usar la Share API",
@@ -59,6 +62,7 @@
 "Security" => "Seguridad",
 "Enforce HTTPS" => "Forzar HTTPS",
 "Enforces the clients to connect to ownCloud via an encrypted connection." => "Forzar a los clientes conectar a ownCloud vía conexión encriptada",
+"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "Por favor conectese a este ownCloud vía HTTPS para habilitar o des-habilitar el forzado de SSL",
 "Log" => "Log",
 "Log level" => "Nivel de Log",
 "More" => "Más",
diff --git a/settings/l10n/eu.php b/settings/l10n/eu.php
index 94c9fe55e27eb4bc3b2d40a4c5fc345594a5a8a2..410cb8336af502bd3675611fa523ed3c371ceb4e 100644
--- a/settings/l10n/eu.php
+++ b/settings/l10n/eu.php
@@ -43,6 +43,7 @@
 "Module 'fileinfo' missing" => "'fileinfo' Modulua falta da",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP 'fileinfo' modulua falta da. Modulu hau gaitzea aholkatzen dizugu mime-type ezberdinak hobe detektatzeko.",
 "Locale not working" => "Lokala ez dabil",
+"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." => "OwnClud zerbitzari honek ezin du sistemaren lokala %s-ra ezarri. Honek fitxategien izenetan karaktere batzuekin arazoak egon daitekeela esan nahi du. Aholkatzen dizugu zure sistema %s lokalea onartzeko beharrezkoak diren paketeak instalatzea.",
 "Internet connection not working" => "Interneteko konexioak ez du funtzionatzen",
 "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 zerbitzari honen interneteko konexioa ez dabil. Honek esan nahi du kanpoko biltegiratze zerbitzuak, eguneraketen informazioa edo bestelako aplikazioen instalazioa bezalako programek ez dutela funtzionatuko. Urrunetik fitxategiak eskuratzea eta e-postak bidaltzea ere ezinezkoa izan daiteke. onwCloud-en aukera guztiak erabili ahal izateko zerbitzari honetan interneteko konexioa gaitzea aholkatzen dizugu.",
 "Cron" => "Cron",
@@ -50,14 +51,14 @@
 "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 zerbitzu batean erregistratua dago. Deitu cron.php orria ownclouden erroan minuturo http bidez.",
 "Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Erabili sistemaren cron zerbitzua. Deitu cron.php fitxategia owncloud karpetan minuturo sistemaren cron lan baten bidez.",
 "Sharing" => "Partekatzea",
-"Enable Share API" => "Gaitu Partekatze APIa",
-"Allow apps to use the Share API" => "Baimendu aplikazioak Partekatze APIa erabiltzeko",
+"Enable Share API" => "Gaitu Elkarbanatze APIa",
+"Allow apps to use the Share API" => "Baimendu aplikazioak Elkarbanatze APIa erabiltzeko",
 "Allow links" => "Baimendu loturak",
-"Allow users to share items to the public with links" => "Baimendu erabiltzaileak loturen bidez fitxategiak publikoki partekatzen",
+"Allow users to share items to the public with links" => "Baimendu erabiltzaileak loturen bidez fitxategiak publikoki elkarbanatzen",
 "Allow resharing" => "Baimendu birpartekatzea",
-"Allow users to share items shared with them again" => "Baimendu erabiltzaileak haiekin partekatutako fitxategiak berriz ere partekatzen",
-"Allow users to share with anyone" => "Baimendu erabiltzaileak edonorekin partekatzen",
-"Allow users to only share with users in their groups" => "Baimendu erabiltzaileak bakarrik bere taldeko erabiltzaileekin partekatzen",
+"Allow users to share items shared with them again" => "Baimendu erabiltzaileak haiekin elkarbanatutako fitxategiak berriz ere elkarbanatzen",
+"Allow users to share with anyone" => "Baimendu erabiltzaileak edonorekin elkarbanatzen",
+"Allow users to only share with users in their groups" => "Baimendu erabiltzaileak bakarrik bere taldeko erabiltzaileekin elkarbanatzen",
 "Security" => "Segurtasuna",
 "Enforce HTTPS" => "Behartu HTTPS",
 "Enforces the clients to connect to ownCloud via an encrypted connection." => "Bezeroak konexio enkriptatu baten bidez ownCloud-era konektatzera behartzen du.",
diff --git a/settings/l10n/fa.php b/settings/l10n/fa.php
index d75efa85eba565993e9e528a356a7634f79f48c2..688374e8e3bb47fe5aeb09db8c81b1a99075b786 100644
--- a/settings/l10n/fa.php
+++ b/settings/l10n/fa.php
@@ -22,8 +22,15 @@
 "undo" => "بازگشت",
 "Groups" => "گروه ها",
 "Delete" => "پاک کردن",
+"add group" => "افزودن گروه",
+"Error creating user" => "خطا در ایجاد کاربر",
 "__language_name__" => "__language_name__",
 "Security Warning" => "اخطار امنیتی",
+"Setup Warning" => "هشدار راه اندازی",
+"Internet connection not working" => "اتصال اینترنت کار نمی کند",
+"Sharing" => "اشتراک گذاری",
+"Allow users to share items to the public with links" => "اجازه دادن به کاربران برای اشتراک گذاری آیتم ها با عموم از طریق پیوند ها",
+"Security" => "امنیت",
 "More" => "بیش‌تر",
 "Version" => "نسخه",
 "Add your App" => "برنامه خود را بیافزایید",
@@ -33,7 +40,9 @@
 "Update" => "به روز رسانی",
 "User Documentation" => "مستندات کاربر",
 "Administrator Documentation" => "مستندات مدیر",
+"Online Documentation" => "مستندات آنلاین",
 "Forum" => "انجمن",
+"Bugtracker" => "ردیاب باگ ",
 "Commercial Support" => "پشتیبانی تجاری",
 "Show First Run Wizard again" => "راهبری کمکی اجرای اول را دوباره نمایش بده",
 "Password" => "گذرواژه",
diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php
index 7276f56f2b4357385dbba896a03ca69c782cf9d0..c5ad5642d11fd997d4f797a43b78100468f9464f 100644
--- a/settings/l10n/fr.php
+++ b/settings/l10n/fr.php
@@ -37,12 +37,13 @@
 "__language_name__" => "Français",
 "Security Warning" => "Avertissement de sécurité",
 "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." => "Votre dossier data et vos fichiers sont probablement accessibles depuis internet. Le fichier .htaccess fourni par ownCloud ne fonctionne pas. Nous vous recommandons vivement de configurer votre serveur web de manière à ce que le dossier data ne soit plus accessible ou bien de déplacer le dossier data en dehors du dossier racine des documents du serveur web.",
+"Setup Warning" => "Avertissement, problème de configuration",
 "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>.",
 "Module 'fileinfo' missing" => "Module 'fileinfo' manquant",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Le module PHP 'fileinfo' est manquant. Il est vivement recommandé de l'activer afin d'obtenir de meilleurs résultats pour la détection des types de fichiers.",
 "Locale not working" => "Localisation non fonctionnelle",
-"This ownCloud server can't set system locale to \"en_US.UTF-8\"/\"en_US.UTF8\". 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 en_US.UTF-8/en_US.UTF8." => "Ce serveur ownCloud ne peut pas ajuster la localisation du système en tant que \"en_US.UTF-8\"/\"en_US.UTF8\". Cela signifie qu'il pourra y avoir des problèmes avec certains caractères dans les noms de fichiers. Il est vivement recommandé d'installer les paquets requis pour le support de en_US.UTF-8/en_US.UTF8.",
+"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." => "Ce serveur ownCloud ne peut pas ajuster la localisation du système en %s. Cela signifie qu'il pourra y avoir des problèmes avec certains caractères dans les noms de fichiers. Il est vivement recommandé d'installer les paquets requis pour le support de %s.",
 "Internet connection not working" => "La connexion internet ne fonctionne pas",
 "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." => "Ce serveur ownCloud ne peut pas se connecter à internet. Cela signifie que certaines fonctionnalités, telles que l'utilisation de supports de stockage distants, les notifications de mises à jour, ou l'installation d'applications tierces ne fonctionneront pas. L'accès aux fichiers à distance, ainsi que les notifications par mails ne marcheront pas non plus. Il est recommandé d'activer la connexion internet pour ce serveur si vous souhaitez utiliser toutes les fonctionnalités offertes par ownCloud.",
 "Cron" => "Cron",
@@ -51,6 +52,19 @@
 "Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Utilise le service cron du système. Appelle le fichier cron.php du répertoire owncloud toutes les minutes grâce à une tâche cron du système.",
 "Sharing" => "Partage",
 "Enable Share API" => "Activer l'API de partage",
+"Allow apps to use the Share API" => "Autoriser les applications à utiliser l'API de partage",
+"Allow links" => "Autoriser les liens",
+"Allow users to share items to the public with links" => "Autoriser les utilisateurs à partager des éléments publiquement à l'aide de liens",
+"Allow resharing" => "Autoriser le repartage",
+"Allow users to share items shared with them again" => "Autoriser les utilisateurs à partager des éléments qui ont été partagés avec eux",
+"Allow users to share with anyone" => "Autoriser les utilisateurs à partager avec tout le monde",
+"Allow users to only share with users in their groups" => "Autoriser les utilisateurs à partager avec des utilisateurs de leur groupe uniquement",
+"Security" => "Sécurité",
+"Enforce HTTPS" => "Forcer HTTPS",
+"Enforces the clients to connect to ownCloud via an encrypted connection." => "Forcer les clients à se connecter à Owncloud via une connexion chiffrée.",
+"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "Merci de vous connecter à cette instance Owncloud en HTTPS pour activer ou désactiver SSL.",
+"Log" => "Log",
+"Log level" => "Niveau de log",
 "More" => "Plus",
 "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>.",
diff --git a/settings/l10n/gl.php b/settings/l10n/gl.php
index 6452a75f6cbc4d85de39522d3cd22f485c030284..4d629e06ccb5a674e224557070aa8c8fe59d3860 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",
+"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",
 "Could not enable app. " => "Non é posíbel activar o aplicativo.",
@@ -41,7 +42,14 @@
 "Please double check the <a href='%s'>installation guides</a>." => "Volva comprobar as <a href='%s'>guías de instalación</a>",
 "Module 'fileinfo' missing" => "Non se atopou o módulo «fileinfo»",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Non se atopou o módulo de PHP «fileinfo». É recomendábel activar este módulo para obter os mellores resultados coa detección do tipo MIME.",
+"Locale not working" => "A configuración rexional non funciona",
+"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 non pode estabelecer a configuración rexional do sistema a %s. Isto significa que pode haber problemas con certos caracteres nos nomes de ficheiro. Recomendámoslle que inste os paquetes necesarios no sistema para aceptar o %s.",
+"Internet connection not working" => "A conexión á Internet non funciona",
+"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 non ten conexión a Internet. Isto significa que algunhas das funcionalidades como a montaxe de almacenamento externo, as notificacións sobre actualizacións ou instalación de aplicativos de terceiros non funcionan. O acceso aos ficheiros de forma remota e o envío de mensaxes de notificación poderían non funcionar. Suxerímoslle que active a conexión a Internet deste servidor se quere dispor de todas as funcionalidades de ownCloud.",
+"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.",
 "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",
@@ -82,6 +90,9 @@
 "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",
@@ -95,6 +106,7 @@
 "Unlimited" => "Sen límites",
 "Other" => "Outro",
 "Storage" => "Almacenamento",
+"change display name" => "cambiar o nome visíbel",
 "set new password" => "estabelecer un novo contrasinal",
 "Default" => "Predeterminado"
 );
diff --git a/settings/l10n/he.php b/settings/l10n/he.php
index 20e97b3ffda94217cdca1953e282ec2ec82d79bf..196dc4d146f2cc1ac3d9b32bbbe4dc7dafa0f3a9 100644
--- a/settings/l10n/he.php
+++ b/settings/l10n/he.php
@@ -39,6 +39,7 @@
 "Forum" => "פורום",
 "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" => "ססמה",
 "Your password was changed" => "הססמה שלך הוחלפה",
 "Unable to change your password" => "לא ניתן לשנות את הססמה שלך",
diff --git a/settings/l10n/hu_HU.php b/settings/l10n/hu_HU.php
index 9bcca68907115e24bc94daba62290001d326e866..4d5f9e0dbce118f5ad53c4cf91c157e23f809d67 100644
--- a/settings/l10n/hu_HU.php
+++ b/settings/l10n/hu_HU.php
@@ -43,7 +43,7 @@
 "Module 'fileinfo' missing" => "A 'fileinfo' modul hiányzik",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "A 'fileinfo' PHP modul hiányzik. Erősen javasolt ennek a modulnak az telepítése, ha az ember jó eredményt szeretne a MIME-típusok felismerésében.",
 "Locale not working" => "A nyelvi lokalizáció nem működik",
-"This ownCloud server can't set system locale to \"en_US.UTF-8\"/\"en_US.UTF8\". 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 en_US.UTF-8/en_US.UTF8." => "Az ownCloud kiszolgáló nem tudja beállítani a rendszer lokalizációját \"en_US.UTF-8\"/\"en_US.UTF8\"-re.  Emiatt bizonyos karakterek problémákat okozhatnak a fájlnevekben. Erősen javasolt, hogy telepítse az en_US.UTF-8/en_US.UTF8 támogatásához szükséges csomagokat.",
+"This ownCloud server can't set system locale to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "Ezen az ownCloud kiszolgálón nem használható a %s nyelvi beállítás. Ez azt jelenti, hogy a fájlnevekben gond lehet bizonyos karakterekkel. Nyomatékosan ajánlott, hogy telepítse a szükséges csomagokat annak érdekében, hogy a rendszer támogassa a %s beállítást.",
 "Internet connection not working" => "Az internet kapcsolat nem működik",
 "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." => "Az ownCloud kiszolgálónak nincs internet kapcsolata. Ez azt jelenti, hogy bizonyos dolgok nem fognak működni, pl. külső tárolók csatolása, programfrissítésekről való értesítések, vagy külső fejlesztői modulok telepítése. Lehet, hogy az állományok távolról történő elérése, ill. az email értesítések sem fog működni. Javasoljuk, hogy engedélyezze az internet kapcsolatot a kiszolgáló számára, ha az ownCloud összes szolgáltatását szeretné használni.",
 "Cron" => "Ütemezett feladatok",
diff --git a/settings/l10n/hy.php b/settings/l10n/hy.php
new file mode 100644
index 0000000000000000000000000000000000000000..9a9e46085ef5ea94f5a0191efce9e8e44c17bcfa
--- /dev/null
+++ b/settings/l10n/hy.php
@@ -0,0 +1,4 @@
+<?php $TRANSLATIONS = array(
+"Delete" => "Ջնջել",
+"Other" => "Այլ"
+);
diff --git a/settings/l10n/id.php b/settings/l10n/id.php
index e62b3e15a7ad222c128e1b5d68fba71977b79f87..7f53a50b248095b9c51186d7731e202e6d73b4c7 100644
--- a/settings/l10n/id.php
+++ b/settings/l10n/id.php
@@ -20,6 +20,7 @@
 "Select an App" => "Pilih satu 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",
diff --git a/settings/l10n/it.php b/settings/l10n/it.php
index 700a336d2d227ab2628dab58b9f0ddc094127a28..699ded137a60ba94560403f29fabea5e074d5543 100644
--- a/settings/l10n/it.php
+++ b/settings/l10n/it.php
@@ -43,7 +43,7 @@
 "Module 'fileinfo' missing" => "Modulo 'fileinfo' mancante",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Il modulo PHP 'fileinfo' non è presente. Consigliamo vivamente di abilitare questo modulo per ottenere risultati migliori con il rilevamento dei tipi MIME.",
 "Locale not working" => "Locale non funzionante",
-"This ownCloud server can't set system locale to \"en_US.UTF-8\"/\"en_US.UTF8\". 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 en_US.UTF-8/en_US.UTF8." => "Questo server ownCloud non può impostare la localizzazione a \"en_US.UTF-8\"/\"en_US.UTF8\". Ciò significa che potrebbero verificarsi dei problemi con alcuni caratteri nei nomi dei file. Consigliamo vivamente di installare i pacchetti necessari a supportare en_US.UTF-8/en_US.UTF8.",
+"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." => "Questo server ownCloud non può impostare la localizzazione a %s. Ciò significa che potrebbero esserci problemi con alcuni caratteri nei nomi dei file. Consigliamo vivamente di installare i pacchetti richiesti sul sistema per supportare %s.",
 "Internet connection not working" => "Concessione Internet non funzionante",
 "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." => "Questo server ownCloud non ha una connessione a Internet funzionante. Ciò significa che alcune delle funzionalità come il montaggio di archivi esterni, le notifiche degli aggiornamenti o l'installazione di applicazioni di terze parti non funzioneranno. Anche l'accesso remoto ai file e l'invio di email di notifica potrebbero non funzionare. Ti suggeriamo di abilitare la connessione a Internet del server se desideri disporre di tutte le funzionalità di ownCloud.",
 "Cron" => "Cron",
@@ -67,7 +67,7 @@
 "Log level" => "Livello di log",
 "More" => "Più",
 "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> è licenziato nei termini della <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>." => "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",
 "More Apps" => "Altre applicazioni",
 "Select an App" => "Seleziona un'applicazione",
diff --git a/settings/l10n/ja_JP.php b/settings/l10n/ja_JP.php
index 9a4cf460d268ee2b9e1d8c5627343647838495a0..181656bd392e670e7356d3fa20431dcea7172519 100644
--- a/settings/l10n/ja_JP.php
+++ b/settings/l10n/ja_JP.php
@@ -43,7 +43,7 @@
 "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 \"en_US.UTF-8\"/\"en_US.UTF8\". 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 en_US.UTF-8/en_US.UTF8." => "この ownCloud サーバは、システムロケールを \"en_US.UTF-8\"/\"en_US.UTF8\" に設定できません。これは、ファイル名の特定の文字で問題が発生する可能性があることを意味しています。en_US.UTF-8/en_US.UTF8 をサポートするために、システムに必要なパッケージをインストールすることを強く推奨します。",
+"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 サーバには有効なインターネット接続がありません。これは、外部ストレージのマウント、更新の通知、サードパーティ製アプリのインストール、のようないくつかの機能が動作しないことを意味しています。リモートからファイルにアクセスしたり、通知メールを送信したりすることもできません。全ての機能を利用するためには、このサーバのインターネット接続を有効にすることを推奨します。",
 "Cron" => "Cron",
diff --git a/settings/l10n/ka.php b/settings/l10n/ka.php
new file mode 100644
index 0000000000000000000000000000000000000000..63425e555b057dbd1d31ae80ca0c39dd35657bbc
--- /dev/null
+++ b/settings/l10n/ka.php
@@ -0,0 +1,3 @@
+<?php $TRANSLATIONS = array(
+"Password" => "პაროლი"
+);
diff --git a/settings/l10n/lv.php b/settings/l10n/lv.php
index 464633132f243f3bc97bd95e7d0b0dbb2d567b27..d5a29d84cb9d55a6f8ae184def007dda96f93550 100644
--- a/settings/l10n/lv.php
+++ b/settings/l10n/lv.php
@@ -43,7 +43,7 @@
 "Module 'fileinfo' missing" => "Trūkst modulis “fileinfo”",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Trūkst PHP modulis “fileinfo”. Mēs iesakām to aktivēt, lai pēc iespējas labāk noteiktu mime tipus.",
 "Locale not working" => "Lokāle nestrādā",
-"This ownCloud server can't set system locale to \"en_US.UTF-8\"/\"en_US.UTF8\". 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 en_US.UTF-8/en_US.UTF8." => "Šis ownCloud serveris nevar iestatīt sistēmas lokāli uz \"en_US.UTF-8\"/\"en_US.UTF8\". Tas nozīmē, ka varētu būt problēmas ar noteiktām rakstzīmēm datņu nosaukumos. Mēs iesakām instalēt vajadzīgās pakotnes savā sistēmā en_US.UTF-8/en_US.UTF8 atbalstam.",
+"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." => "Šis ownCloud serveris nevar iestatīt sistēmas lokāli uz %s. Tas nozīmē, ka varētu būt problēmas ar noteiktām rakstzīmēm datņu nosaukumos. Mēs iesakām instalēt vajadzīgās pakotnes savā sistēmā %s atbalstam.",
 "Internet connection not working" => "Interneta savienojums nedarbojas",
 "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." => "Šim ownCloud serverim nav strādājoša interneta savienojuma. Tas nozīmē, ka dažas no šīm iespējām, piemēram, ārējas krātuves montēšana, paziņošana par atjauninājumiem vai trešās puses programmatūras instalēšana nestrādā. Varētu nestrādāt attālināta piekļuve pie datnēm un paziņojumu e-pasta vēstuļu sūtīšana. Mēs iesakām aktivēt interneta savienojumu šim serverim, ja vēlaties visas ownCloud iespējas.",
 "Cron" => "Cron",
diff --git a/settings/l10n/my_MM.php b/settings/l10n/my_MM.php
new file mode 100644
index 0000000000000000000000000000000000000000..d12c9bcf036db87f8a07fe4274f0f28614de1058
--- /dev/null
+++ b/settings/l10n/my_MM.php
@@ -0,0 +1,7 @@
+<?php $TRANSLATIONS = array(
+"Authentication error" => "ခွင့်ပြုချက်မအောင်မြင်",
+"Invalid request" => "တောင်းဆိုချက်မမှန်ကန်ပါ",
+"Security Warning" => "လုံခြုံရေးသတိပေးချက်",
+"Password" => "စကားဝှက်",
+"New password" => "စကားဝှက်အသစ်"
+);
diff --git a/settings/l10n/nb_NO.php b/settings/l10n/nb_NO.php
index 708e78bf4b8585412ff90f8aa67197fab54d689b..4b3ff85445ab3dafbd9713e92e9e3e82eae4d840 100644
--- a/settings/l10n/nb_NO.php
+++ b/settings/l10n/nb_NO.php
@@ -34,6 +34,7 @@
 "Administrator Documentation" => "Administratordokumentasjon",
 "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",
 "Password" => "Passord",
 "Your password was changed" => "Passord har blitt endret",
 "Unable to change your password" => "Kunne ikke endre passordet ditt",
diff --git a/settings/l10n/nl.php b/settings/l10n/nl.php
index b8e6491cc5a7b63f24dae5504622a2e55205fba1..1ce0ef88291c4d8dcd37c4e0ba4c546ef8cf5e93 100644
--- a/settings/l10n/nl.php
+++ b/settings/l10n/nl.php
@@ -43,7 +43,7 @@
 "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 \"en_US.UTF-8\"/\"en_US.UTF8\". 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 en_US.UTF-8/en_US.UTF8." => "Deze ownCloud server kan de systeemtaal niet instellen op \"en_US.UTF-8\"/\"en_US.UTF8\". Er zijn vermoedelijk problemen met bepaalde tekens in de bestandsnamen. We adviseren om de voor ondersteuning van en_US.UTF-8/en_US.UTF8 vereiste pakketten op uw systeem te installeren.",
+"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.",
 "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",
diff --git a/settings/l10n/pl.php b/settings/l10n/pl.php
index c2aa8a2b33896f6d7e8a78f15f0532afbf28f361..012ee1d6a6f422926f16c5b676d9848f32fe9c1f 100644
--- a/settings/l10n/pl.php
+++ b/settings/l10n/pl.php
@@ -1,53 +1,86 @@
 <?php $TRANSLATIONS = array(
-"Unable to load list from App Store" => "Nie mogę załadować listy aplikacji",
+"Unable to load list from App Store" => "Nie można wczytać listy aplikacji",
 "Authentication error" => "Błąd uwierzytelniania",
-"Unable to change display name" => "Nie można zmienić nazwy wyświetlanej",
+"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",
 "Could not enable app. " => "Nie można włączyć aplikacji.",
-"Email saved" => "Email zapisany",
-"Invalid email" => "Niepoprawny email",
+"Email saved" => "E-mail zapisany",
+"Invalid email" => "Nieprawidłowy e-mail",
 "Unable to delete group" => "Nie można usunąć grupy",
 "Unable to delete user" => "Nie można usunąć użytkownika",
-"Language changed" => "Język zmieniony",
+"Language changed" => "Zmieniono język",
 "Invalid request" => "Nieprawidłowe żądanie",
-"Admins can't remove themself from the admin group" => "Administratorzy nie mogą usunąć się sami z grupy administratorów.",
+"Admins can't remove themself from the admin group" => "Administratorzy nie mogą usunąć siebie samych z grupy administratorów",
 "Unable to add user to group %s" => "Nie można dodać użytkownika do grupy %s",
 "Unable to remove user from group %s" => "Nie można usunąć użytkownika z grupy %s",
-"Couldn't update app." => "Nie można uaktualnić aplikacji",
+"Couldn't update app." => "Nie można uaktualnić aplikacji.",
 "Update to {appversion}" => "Aktualizacja do {appversion}",
 "Disable" => "Wyłącz",
 "Enable" => "Włącz",
-"Please wait...." => "Prosze czekać...",
+"Please wait...." => "Proszę czekać...",
 "Updating...." => "Aktualizacja w toku...",
 "Error while updating app" => "Błąd podczas aktualizacji aplikacji",
 "Error" => "Błąd",
 "Updated" => "Zaktualizowano",
 "Saving..." => "Zapisywanie...",
-"deleted" => "skasuj",
-"undo" => "wróć",
+"deleted" => "usunięto",
+"undo" => "cofnij",
+"Unable to remove user" => "Nie można usunąć użytkownika",
 "Groups" => "Grupy",
-"Group Admin" => "Grupa Admin",
-"Delete" => "Usuń",
-"__language_name__" => "Polski",
+"Group Admin" => "Administrator grupy",
+"Delete" => "Usuń",
+"add group" => "dodaj grupę",
+"A valid username must be provided" => "Należy podać prawidłową nazwę użytkownika",
+"Error creating user" => "Błąd podczas tworzenia użytkownika",
+"A valid password must be provided" => "Należy podać prawidłowe hasło",
+"__language_name__" => "polski",
 "Security Warning" => "Ostrzeżenie o zabezpieczeniach",
-"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." => "Katalog danych (data) i pliki są prawdopodobnie dostępnego z Internetu. Sprawdź plik .htaccess oraz konfigurację serwera (hosta). Sugerujemy, skonfiguruj swój serwer w taki sposób, żeby dane katalogu nie były dostępne lub przenieść katalog danych spoza głównego dokumentu webserwera.",
+"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." => "Katalog danych i twoje pliki są prawdopodobnie dostępne z Internetu. Plik .htaccess dostarczony przez ownCloud nie działa. Zalecamy skonfigurowanie serwera internetowego w taki sposób, aby katalog z danymi nie był dostępny lub przeniesienie katalogu z danymi poza katalog główny serwera internetowego.",
+"Setup Warning" => "Ostrzeżenia konfiguracji",
+"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>.",
+"Module 'fileinfo' missing" => "Brak modułu „fileinfo”",
+"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Brak modułu PHP „fileinfo”. Zalecamy włączenie tego modułu, aby uzyskać najlepsze wyniki podczas wykrywania typów MIME.",
+"Locale not working" => "Lokalizacja nie działa",
+"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." => "Ten serwer ownCloud nie może włączyć ustawień regionalnych %s. Może to oznaczać, że wystąpiły problemy z niektórymi znakami w nazwach plików. Zalecamy instalację wymaganych pakietów na tym systemie w celu wsparcia %s.",
+"Internet connection not working" => "Połączenie internetowe nie działa",
+"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." => "Ten serwer OwnCloud nie ma działającego połączenia z Internetem. Oznacza to, że niektóre z funkcji, takich jak montowanie zewnętrznych zasobów, powiadomienia o aktualizacji lub instalacja dodatkowych aplikacji nie będą działać. Dostęp do plików z zewnątrz i wysyłanie powiadomień e-mail może również nie działać. Sugerujemy, aby włączyć połączenie internetowe dla tego serwera, jeśli chcesz korzystać ze wszystkich funkcji ownCloud.",
+"Cron" => "Cron",
+"Execute one task with each page loaded" => "Wykonuj jedno zadanie wraz z każdą wczytaną stroną",
+"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php jest zarejestrowany w usłudze webcron. Przywołaj stronę cron.php w katalogu głównym ownCloud raz na minutę przez http.",
+"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Użyj systemowej usługi cron. Przywołaj plik cron.php z katalogu ownCloud przez systemowy cronjob raz na minutę.",
+"Sharing" => "Udostępnianie",
+"Enable Share API" => "Włącz API udostępniania",
+"Allow apps to use the Share API" => "Zezwalaj aplikacjom na korzystanie z API udostępniania",
+"Allow links" => "Zezwalaj na odnośniki",
+"Allow users to share items to the public with links" => "Zezwalaj użytkownikom na publiczne współdzielenie zasobów za pomocą odnośników",
+"Allow resharing" => "Zezwalaj na ponowne udostępnianie",
+"Allow users to share items shared with them again" => "Zezwalaj użytkownikom na ponowne współdzielenie zasobów już z nimi współdzielonych",
+"Allow users to share with anyone" => "Zezwalaj użytkownikom na współdzielenie z kimkolwiek",
+"Allow users to only share with users in their groups" => "Zezwalaj użytkownikom współdzielić z użytkownikami ze swoich grup",
+"Security" => "Bezpieczeństwo",
+"Enforce HTTPS" => "Wymuś HTTPS",
+"Enforces the clients to connect to ownCloud via an encrypted connection." => "Wymusza na klientach na łączenie się ownCloud za pośrednictwem połączenia szyfrowanego.",
+"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "Proszę połącz się do tej instancji ownCloud za pośrednictwem protokołu HTTPS, aby włączyć lub wyłączyć stosowanie protokołu SSL.",
+"Log" => "Logi",
+"Log level" => "Poziom logów",
 "More" => "Więcej",
 "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>, the <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 aplikacje",
+"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ę",
 "More Apps" => "Więcej aplikacji",
-"Select an App" => "Zaznacz aplikacje",
+"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",
 "User Documentation" => "Dokumentacja użytkownika",
-"Administrator Documentation" => "Dokumentacja Administratora",
-"Online Documentation" => "Dokumentacja Online",
+"Administrator Documentation" => "Dokumentacja administratora",
+"Online Documentation" => "Dokumentacja online",
 "Forum" => "Forum",
 "Bugtracker" => "Zgłaszanie błędów",
 "Commercial Support" => "Wsparcie komercyjne",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Korzystasz z <strong>%s</strong> z dostępnych <strong>%s</strong>",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Wykorzystujesz <strong>%s</strong> z dostępnych <strong>%s</strong>",
 "Get the apps to sync your files" => "Pobierz aplikacje żeby synchronizować swoje pliki",
 "Show First Run Wizard again" => "Uruchom ponownie kreatora pierwszego uruchomienia",
 "Password" => "Hasło",
@@ -58,22 +91,22 @@
 "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 zmianić wyświetlanej nazwy",
-"Change display name" => "Zmiana wyświetlanej nazwy",
+"Unable to change your display name" => "Nie można zmienić twojej wyświetlanej nazwy",
+"Change display name" => "Zmień wyświetlaną nazwę",
 "Email" => "E-mail",
-"Your email address" => "Adres e-mail użytkownika",
-"Fill in an email address to enable password recovery" => "Proszę wprowadzić adres e-mail, aby uzyskać możliwość odzyskania hasła",
+"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",
 "Help translate" => "Pomóż w tłumaczeniu",
 "WebDAV" => "WebDAV",
 "Use this address to connect to your ownCloud in your file manager" => "Użyj tego adresu aby podłączyć zasób ownCloud w menedżerze plików",
 "Login Name" => "Login",
 "Create" => "Utwórz",
-"Default Storage" => "Domyślny magazyn",
+"Default Storage" => "Magazyn domyślny",
 "Unlimited" => "Bez limitu",
 "Other" => "Inne",
 "Storage" => "Magazyn",
-"change display name" => "zmień nazwę wyświetlaną",
-"set new password" => "zmień hasło",
+"change display name" => "zmień wyświetlaną nazwę",
+"set new password" => "ustaw nowe hasło",
 "Default" => "Domyślny"
 );
diff --git a/settings/l10n/pt_BR.php b/settings/l10n/pt_BR.php
index 700bafc8153e90d2c8f5c1d1ddc3832ac5b20947..98cac0fd612f86eed5a6d00e0b3fc8f47bfb2b47 100644
--- a/settings/l10n/pt_BR.php
+++ b/settings/l10n/pt_BR.php
@@ -43,7 +43,7 @@
 "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",
-"This ownCloud server can't set system locale to \"en_US.UTF-8\"/\"en_US.UTF8\". 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 en_US.UTF-8/en_US.UTF8." => "Este servidor ownCloud não pode definir a localização do sistema para \"en_US.UTF-8\"/\"en_US.UTF8\". Isto significa que deve haver problemas com certos caracteres em nomes de arquivos. Sugerimos que instale os pacotes necessários no seu sistema para suportar en_US.UTF-8/en_US.UTF8.",
+"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 não pode configurar a localização do sistema para %s.  Isto significa que pode haver problema com alguns caracteres nos nomes de arquivos.  Nós recomendamos fortemente que você instale os pacotes requeridos em seu sistema para suportar %s.",
 "Internet connection not working" => "Sem conexão com a internet",
 "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 não tem conexão com a internet. Isto significa que alguns dos recursos como montar armazenamento externo, notificar atualizações ou instalar aplicativos de terceiros não funcionam. Acesso remoto a arquivos e envio de e-mails de notificação podem também não funcionar. Sugerimos que habilite a conexão com a internet neste servidor se quiser usufruir de todos os recursos do ownCloud.",
 "Cron" => "Cron",
diff --git a/settings/l10n/pt_PT.php b/settings/l10n/pt_PT.php
index 3ed2204daf03f468974260e29120d3fb110a2d90..71ad6347e8e06e9c8065d22b4966a879a8bdabac 100644
--- a/settings/l10n/pt_PT.php
+++ b/settings/l10n/pt_PT.php
@@ -43,7 +43,7 @@
 "Module 'fileinfo' missing" => "Falta o módulo 'fileinfo'",
 "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' não se encontra instalado/activado. É fortemente recomendado que active este módulo para obter os melhores resultado com a detecção dos tipos de mime.",
 "Locale not working" => "Internacionalização não está a funcionar",
-"This ownCloud server can't set system locale to \"en_US.UTF-8\"/\"en_US.UTF8\". 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 en_US.UTF-8/en_US.UTF8." => "Este servidor de ownCloud não consegue definir a codificação de caracteres para \"en_US.UTF-8\"/\"en_US.UTF8\". Isto significa que pode haver problemas com alguns caracteres nos nomes de ficheiros. É fortemente recomendado que instale o pacote para ser possível ver caracteres codificados em en_US.UTF-8/en_US.UTF8.",
+"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 de ownCloud não consegue definir a codificação de caracteres para %s. Isto significa que pode haver problemas com alguns caracteres nos nomes dos ficheiros. É fortemente recomendado que instale o pacote recomendado para ser possível ver caracteres codificados em %s.",
 "Internet connection not working" => "A ligação à internet não está a funcionar",
 "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 não tem uma ligação de internet funcional. Isto significa que algumas funcionalidades como o acesso a locais externos (dropbox, gdrive, etc), notificações sobre actualizções, ou a instalação de aplicações não irá funcionar. Sugerimos que active uma ligação à internet se pretende obter todas as funcionalidades do ownCloud.",
 "Cron" => "Cron",
diff --git a/settings/l10n/ru.php b/settings/l10n/ru.php
index 393993fa6117a418c679edf33f494f602341e6e8..56dd597966e938ceeab57a605b919fd9b7013561 100644
--- a/settings/l10n/ru.php
+++ b/settings/l10n/ru.php
@@ -26,12 +26,45 @@
 "Saving..." => "Сохранение...",
 "deleted" => "удален",
 "undo" => "отмена",
+"Unable to remove user" => "Невозможно удалить пользователя",
 "Groups" => "Группы",
 "Group Admin" => "Группа Администраторы",
 "Delete" => "Удалить",
+"add group" => "добавить группу",
+"A valid username must be provided" => "Предоставте подходящее имя пользователя",
+"Error creating user" => "Ошибка создания пользователя",
+"A valid password must be provided" => "Предоставте подходящий пароль",
 "__language_name__" => "Русский ",
 "Security Warning" => "Предупреждение безопасности",
 "Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Ваши каталоги данных и файлы, вероятно, доступны из Интернета. Файл .htaccess, предоставляемый ownCloud, не работает. Мы настоятельно рекомендуем Вам настроить вебсервер таким образом, чтобы каталоги данных больше не были доступны, или переместить их за пределы корневого каталога документов веб-сервера.",
+"Setup Warning" => "Предупреждение установки",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Ваш веб сервер до сих пор не настроен правильно для возможности синхронизации файлов, похоже что проблема в неисправности интерфейса WebDAV.",
+"Please double check the <a href='%s'>installation guides</a>." => "Пожалуйста, дважды просмотрите <a href='%s'>инструкции по установке</a>.",
+"Module 'fileinfo' missing" => "Модуль 'fileinfo' потерян",
+"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го рода приложений,не работают.",
+"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 раз в минуту через 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" => "Разрешить пользователям делать общий доступ только для пользователей их групп",
+"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" => "Больше",
 "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>.",
diff --git a/settings/l10n/sk_SK.php b/settings/l10n/sk_SK.php
index 0b0bbca7a5363d123f1531d31d48d034a37fa985..609c949f8ec4bc653b838d7873be40a52d9509c7 100644
--- a/settings/l10n/sk_SK.php
+++ b/settings/l10n/sk_SK.php
@@ -43,7 +43,7 @@
 "Module 'fileinfo' missing" => "Chýba modul 'fileinfo'",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Chýba modul 'fileinfo'. Dôrazne doporučujeme ho povoliť pre dosiahnutie najlepších výsledkov zisťovania mime-typu.",
 "Locale not working" => "Lokalizácia nefunguje",
-"This ownCloud server can't set system locale to \"en_US.UTF-8\"/\"en_US.UTF8\". 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 en_US.UTF-8/en_US.UTF8." => "Tento server ownCloud nemôže nastaviť národné prostredie systému na \"en_US.UTF-8\" / \"en_US.UTF8\". To znamená, že by mohli byť problémy s niektorými znakmi v názvoch súborov. Veľmi odporúčame nainštalovať požadované balíky na podporu en_US.UTF-8/en_US.UTF8.",
+"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." => "Tento server ownCloud nemôže nastaviť národné prostredie systému na %s. To znamená, že by mohli byť problémy s niektorými znakmi v názvoch súborov. Veľmi odporúčame nainštalovať požadované balíky na podporu %s.",
 "Internet connection not working" => "Pripojenie na internet nefunguje",
 "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." => "Tento server ownCloud nemá funkčné pripojenie k internetu. To znamená, že niektoré z funkcií, ako je pripojenie externého úložiska, oznámenia o aktualizáciách či inštalácia aplikácií tretích strán nefungujú. Prístup k súborom zo vzdialených miest a odosielanie oznamovacích e-mailov tiež nemusí fungovať. Odporúčame pripojiť tento server  k internetu, ak chcete využívať všetky vlastnosti ownCloud.",
 "Cron" => "Cron",
diff --git a/settings/l10n/sl.php b/settings/l10n/sl.php
index 854c4b7bd9faa268f9d6e1f091bacc297f831b5e..249591ab471a1af1ede22442257f8377c4f61975 100644
--- a/settings/l10n/sl.php
+++ b/settings/l10n/sl.php
@@ -41,6 +41,7 @@
 "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>",
+"Get the apps to sync your files" => "Pridobi programe za usklajevanje datotek",
 "Password" => "Geslo",
 "Your password was changed" => "Vaše geslo je spremenjeno",
 "Unable to change your password" => "Gesla ni mogoče spremeniti.",
diff --git a/settings/l10n/sv.php b/settings/l10n/sv.php
index 0e1723a9373e7fa407bdfe3afb1957cc4f77b9c5..393ca8135c227531084ad3985a7a8fdca8496fa8 100644
--- a/settings/l10n/sv.php
+++ b/settings/l10n/sv.php
@@ -29,11 +29,24 @@
 "Groups" => "Grupper",
 "Group Admin" => "Gruppadministratör",
 "Delete" => "Radera",
+"add group" => "lägg till grupp",
+"A valid username must be provided" => "Ett giltigt användarnamn måste anges",
+"Error creating user" => "Fel vid skapande av användare",
+"A valid password must be provided" => "Ett giltigt lösenord måste anges",
 "__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.",
 "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",
+"Sharing" => "Dela",
+"Allow links" => "Tillåt 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",
 "More" => "Mer",
 "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>.",
diff --git a/settings/l10n/tr.php b/settings/l10n/tr.php
index 64fae2f04a856e3f95e3237a6e960306853e28bc..dd70366557f499b9ad5a8fe2c42fcf722d0a836b 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",
+"Unable to change display name" => "Ekran adı değiştirilemiyor",
 "Group already exists" => "Grup zaten mevcut",
 "Unable to add group" => "Gruba eklenemiyor",
 "Could not enable app. " => "Uygulama devreye alınamadı",
@@ -10,26 +11,45 @@
 "Unable to delete user" => "Kullanıcı silinemiyor",
 "Language changed" => "Dil değiştirildi",
 "Invalid request" => "Geçersiz istek",
+"Admins can't remove themself from the admin group" => "Yöneticiler kendilerini yönetici grubundan kaldıramaz",
 "Unable to add user to group %s" => "Kullanıcı %s grubuna eklenemiyor",
+"Unable to remove user from group %s" => "%s grubundan kullanıcı kaldırılamıyor",
+"Couldn't update app." => "Uygulama güncellenemedi.",
+"Update to {appversion}" => "{appversion} Güncelle",
 "Disable" => "Etkin değil",
 "Enable" => "Etkin",
+"Please wait...." => "Lütfen bekleyin....",
+"Updating...." => "Güncelleniyor....",
+"Error while updating app" => "Uygulama güncellenirken hata",
 "Error" => "Hata",
+"Updated" => "Güncellendi",
 "Saving..." => "Kaydediliyor...",
 "deleted" => "silindi",
 "undo" => "geri al",
+"Unable to remove user" => "Kullanıcı kaldırılamıyor",
 "Groups" => "Gruplar",
 "Group Admin" => "Yönetici Grubu ",
 "Delete" => "Sil",
+"add group" => "grup ekle",
+"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ı__",
 "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ı",
+"Module 'fileinfo' missing" => "Modül 'fileinfo' kayıp",
+"Allow resharing" => "Paylaşıma izin ver",
+"Security" => "Güvenlik",
+"Log" => "Kayıtlar",
 "More" => "Daha fazla",
 "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",
-"More Apps" => "Daha fazla App",
+"More Apps" => "Daha fazla uygulama",
 "Select an App" => "Bir uygulama seçin",
 "See application page at apps.owncloud.com" => "Uygulamanın sayfasına apps.owncloud.com adresinden bakın ",
+"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-lisanslayan <span class=\"author\"></span>",
 "Update" => "Güncelleme",
 "User Documentation" => "Kullanıcı Belgelendirmesi",
 "Administrator Documentation" => "Yönetici Belgelendirmesi",
@@ -37,18 +57,32 @@
 "Forum" => "Forum",
 "Bugtracker" => "Hata Takip Sistemi",
 "Commercial Support" => "Ticari Destek",
+"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",
 "Your password was changed" => "Şifreniz değiştirildi",
 "Unable to change your password" => "Parolanız değiştirilemiyor",
 "Current password" => "Mevcut parola",
 "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",
 "Language" => "Dil",
 "Help translate" => "Çevirilere yardım edin",
 "WebDAV" => "WebDAV",
+"Use this address to connect to your ownCloud in your file manager" => "Bu adresi kullanarak ownCloud 'unuza dosya yöneticinizde bağlanın",
+"Login Name" => "Giriş Adı",
 "Create" => "Oluştur",
-"Other" => "Diğer"
+"Default Storage" => "Varsayılan Depolama",
+"Unlimited" => "Limitsiz",
+"Other" => "Diğer",
+"Storage" => "Depolama",
+"change display name" => "ekran adını değiştir",
+"set new password" => "yeni parola belirle",
+"Default" => "Varsayılan"
 );
diff --git a/settings/l10n/uk.php b/settings/l10n/uk.php
index fb1557577cbca6e96e2b32785ca716a72bbbb9e8..2e182b66292c79753353e2492d723755330ab585 100644
--- a/settings/l10n/uk.php
+++ b/settings/l10n/uk.php
@@ -26,12 +26,45 @@
 "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, не працює. Ми наполегливо рекомендуємо Вам налаштувати свій веб-сервер таким чином, щоб каталог data більше не був доступний, або перемістити каталог data за межі кореневого каталогу документів веб-сервера.",
+"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-типів.",
+"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" => "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 кожну хвилину по 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" => "Дозволити користувачам відкривати спільний доступ лише для користувачів з їхньої групи",
+"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" => "Більше",
 "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>.",
@@ -48,6 +81,8 @@
 "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" => "Не вдалося змінити Ваш пароль",
diff --git a/settings/l10n/ur_PK.php b/settings/l10n/ur_PK.php
new file mode 100644
index 0000000000000000000000000000000000000000..1adacafdff8d2cb78099f77b8e8ea73394d1cc95
--- /dev/null
+++ b/settings/l10n/ur_PK.php
@@ -0,0 +1,4 @@
+<?php $TRANSLATIONS = array(
+"Password" => "پاسورڈ",
+"New password" => "نیا پاسورڈ"
+);
diff --git a/settings/l10n/zh_CN.php b/settings/l10n/zh_CN.php
index e1d81eafab51797da975386d7a882547b5f3364b..226ffb58bc780a78084e3c3e2ad62b378ae3f209 100644
--- a/settings/l10n/zh_CN.php
+++ b/settings/l10n/zh_CN.php
@@ -41,6 +41,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" => "安装应用进行文件同步",
 "Password" => "密码",
 "Your password was changed" => "密码已修改",
 "Unable to change your password" => "无法修改密码",
diff --git a/settings/l10n/zh_TW.php b/settings/l10n/zh_TW.php
index 88eb956fe8e6ab3b9cf4f36ef56b28a6fa738815..0b9d2d3d023bde651e6f3dc5f60ef108bdf8c873 100644
--- a/settings/l10n/zh_TW.php
+++ b/settings/l10n/zh_TW.php
@@ -24,10 +24,13 @@
 "Error" => "錯誤",
 "Updated" => "已更新",
 "Saving..." => "儲存中...",
+"deleted" => "已刪除",
 "undo" => "復原",
+"Unable to remove user" => "無法刪除用戶",
 "Groups" => "群組",
 "Group Admin" => "群組 管理員",
 "Delete" => "刪除",
+"add group" => "新增群組",
 "__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 。",
diff --git a/settings/languageCodes.php b/settings/languageCodes.php
index 2939461f34173e58e33b1a61275a7ed93903de4a..c25fbb434a706b03c75190ad0b2f67a7bf677e55 100644
--- a/settings/languageCodes.php
+++ b/settings/languageCodes.php
@@ -62,5 +62,9 @@ return array(
 'ka_GE'=>'Georgian for Georgia',
 'ku_IQ'=>'Kurdish Iraq',
 'ru_RU'=>'Русский язык',
-'si_LK'=>'Sinhala'
+'si_LK'=>'Sinhala',
+'be'=>'Belarusian',
+'ka'=>'Kartuli (Georgian)',
+'my_MM'=>'Burmese - MYANMAR ',
+'ur_PK'	=>'Urdu (Pakistan)'
 );
diff --git a/settings/oauth.php b/settings/oauth.php
deleted file mode 100644
index 07b7ae5c31d0ef3c5915ceb35514f4e7efe6285b..0000000000000000000000000000000000000000
--- a/settings/oauth.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012, Tom Needham <tom@owncloud.com>
- * This file is licensed under the Affero General Public License version 3 or later.
- * See the COPYING-README file.
- */
-
-require_once('../lib/base.php');
-// Logic
-$operation = isset($_GET['operation']) ? $_GET['operation'] : '';
-$server = OC_OAuth_server::init();
-
-switch($operation){
-	
-	case 'register':
-
-		// Here external apps can register with an ownCloud
-		if(empty($_GET['name']) || empty($_GET['url'])) {
-			// Invalid request
-			echo 401;
-		} else {
-			$callbacksuccess = empty($_GET['callback_success']) ? null : $_GET['callback_success'];
-			$callbackfail = empty($_GET['callback_fail']) ? null : $_GET['callback_fail'];
-			$consumer = OC_OAuth_Server::register_consumer($_GET['name'], $_GET['url'], $callbacksuccess, $callbackfail);
-			
-			echo 'Registered consumer successfully! </br></br>Key: ' . $consumer->key . '</br>Secret: ' . $consumer->secret;
-		}
-	break;
-	
-	case 'request_token':
-		
-		try {
-			$request = OAuthRequest::from_request();
-			$token = $server->get_request_token($request);
-			echo $token;
-		} catch (OAuthException $exception) {
-			OC_Log::write('OC_OAuth_Server', $exception->getMessage(), OC_LOG::ERROR);
-			echo $exception->getMessage();
-		}
-	
-	break;
-	case 'authorise';
-	
-		OC_API::checkLoggedIn();
-		// Example
-		$consumer = array(
-			'name' => 'Firefox Bookmark Sync',
-			'scopes' => array('ookmarks'),
-		);
-		
-		// Check that the scopes are real and installed
-		$apps = OC_App::getEnabledApps();
-		$notfound = array();
-		foreach($consumer['scopes'] as $requiredapp){
-			// App scopes are in this format: app_$appname
-			$requiredapp = end(explode('_', $requiredapp));
-			if(!in_array($requiredapp, $apps)) {
-				$notfound[] = $requiredapp;
-			}
-		}
-		if(!empty($notfound)) {
-			// We need more apps :( Show error
-			if(count($notfound)==1) {
-				$message = 'requires that you have an extra app installed on your ownCloud. Please contact your ownCloud administrator and ask them to install the app below.';
-			} else {
-				$message = 'requires that you have some extra apps installed on your ownCloud. Please contract your ownCloud administrator and ask them to install the apps below.';
-			}
-			$t = new OC_Template('settings', 'oauth-required-apps', 'guest');
-			OC_Util::addStyle('settings', 'oauth');
-			$t->assign('requiredapps', $notfound);
-			$t->assign('consumer', $consumer);
-			$t->assign('message', $message);
-			$t->printPage();
-		} else {
-			$t = new OC_Template('settings', 'oauth', 'guest');
-			OC_Util::addStyle('settings', 'oauth');
-			$t->assign('consumer', $consumer);
-			$t->printPage();
-		}
-	break;
-	
-	case 'access_token';
-		try {
-			$request = OAuthRequest::from_request();
-			$token = $server->fetch_access_token($request);
-			echo $token;
-		} catch (OAuthException $exception) {
-			OC_Log::write('OC_OAuth_Server', $exception->getMessage(), OC_LOG::ERROR);
-			echo $exception->getMessage();
-		}
-		
-	break;
-	default:
-		// Something went wrong, we need an operation!
-		OC_Response::setStatus(400);
-	break;
-	
-}
diff --git a/settings/routes.php b/settings/routes.php
index 0a8af0dde2b35ba068b5d77ed2b0994d475722fd..b20119b5803012748a7674a053ada030f6694623 100644
--- a/settings/routes.php
+++ b/settings/routes.php
@@ -39,8 +39,8 @@ $this->create('settings_ajax_removegroup', '/settings/ajax/removegroup.php')
 	->actionInclude('settings/ajax/removegroup.php');
 $this->create('settings_ajax_changepassword', '/settings/ajax/changepassword.php')
 	->actionInclude('settings/ajax/changepassword.php');
-$this->create('settings_ajax_changedisplayname', '/settings/ajax/changedisplayname.php')
-->actionInclude('settings/ajax/changedisplayname.php');
+$this->create('settings_ajax_changedisplayname', '/settings/ajax/changedisplayname.php')
+	->actionInclude('settings/ajax/changedisplayname.php');
 // personel
 $this->create('settings_ajax_lostpassword', '/settings/ajax/lostpassword.php')
 	->actionInclude('settings/ajax/lostpassword.php');
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 17be3396930bd0e0051fd66d7c22ff5d07d934c5..dd5e89b8f8289338b4843c5990c479377afa11a4 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -12,10 +12,10 @@ $levels = array('Debug', 'Info', 'Warning', 'Error', 'Fatal');
 if (!$_['htaccessworking']) {
 	?>
 <fieldset class="personalblock">
-	<legend><strong><?php echo $l->t('Security Warning');?></strong></legend>
+	<legend><strong><?php p($l->t('Security Warning'));?></strong></legend>
 
 	<span class="securitywarning">
-		<?php echo $l->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.'); ?>
+		<?php p($l->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.')); ?>
 	</span>
 
 </fieldset>
@@ -26,11 +26,11 @@ if (!$_['htaccessworking']) {
 if (!$_['isWebDavWorking']) {
 	?>
 <fieldset class="personalblock">
-	<legend><strong><?php echo $l->t('Setup Warning');?></strong></legend>
+	<legend><strong><?php p($l->t('Setup Warning'));?></strong></legend>
 
 	<span class="securitywarning">
-		<?php echo $l->t('Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken.'); ?>
-		<?php echo $l->t('Please double check the <a href=\'%s\'>installation guides</a>.', 'http://doc.owncloud.org/server/5.0/admin_manual/installation.html'); ?>
+		<?php p($l->t('Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken.')); ?>
+		<?php print_unescaped($l->t('Please double check the <a href=\'%s\'>installation guides</a>.', 'http://doc.owncloud.org/server/5.0/admin_manual/installation.html')); ?>
 	</span>
 
 </fieldset>
@@ -41,10 +41,10 @@ if (!$_['isWebDavWorking']) {
 if (!$_['has_fileinfo']) {
 	?>
 <fieldset class="personalblock">
-	<legend><strong><?php echo $l->t('Module \'fileinfo\' missing');?></strong></legend>
+	<legend><strong><?php p($l->t('Module \'fileinfo\' missing'));?></strong></legend>
 
 		<span class="connectionwarning">
-		<?php echo $l->t('The PHP module \'fileinfo\' is missing. We strongly recommend to enable this module to get best results with mime-type detection.'); ?>
+		<?php p($l->t('The PHP module \'fileinfo\' is missing. We strongly recommend to enable this module to get best results with mime-type detection.')); ?>
 	</span>
 
 </fieldset>
@@ -55,10 +55,13 @@ if (!$_['has_fileinfo']) {
 if (!$_['islocaleworking']) {
 	?>
 <fieldset class="personalblock">
-	<legend><strong><?php echo $l->t('Locale not working');?></strong></legend>
+	<legend><strong><?php p($l->t('Locale not working'));?></strong></legend>
 
 		<span class="connectionwarning">
-		<?php echo $l->t('This ownCloud server can\'t set system locale to "en_US.UTF-8"/"en_US.UTF8". 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 en_US.UTF-8/en_US.UTF8.'); ?>
+		<?php
+			$locales = 'en_US.UTF-8/en_US.UTF8';
+			p($l->t('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.', array($locales, $locales)));
+			?>
 	</span>
 
 </fieldset>
@@ -69,10 +72,10 @@ if (!$_['islocaleworking']) {
 if (!$_['internetconnectionworking']) {
 	?>
 <fieldset class="personalblock">
-	<legend><strong><?php echo $l->t('Internet connection not working');?></strong></legend>
+	<legend><strong><?php p($l->t('Internet connection not working'));?></strong></legend>
 
 		<span class="connectionwarning">
-		<?php echo $l->t('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.'); ?>
+		<?php p($l->t('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.')); ?>
 	</span>
 
 </fieldset>
@@ -81,106 +84,106 @@ if (!$_['internetconnectionworking']) {
 ?>
 
 <?php foreach ($_['forms'] as $form) {
-	echo $form;
+	print_unescaped($form);
 }
 ;?>
 
 <fieldset class="personalblock" id="backgroundjobs">
-	<legend><strong><?php echo $l->t('Cron');?></strong></legend>
+	<legend><strong><?php p($l->t('Cron'));?></strong></legend>
 	<table class="nostyle">
 		<tr>
 			<td>
 				<input type="radio" name="mode" value="ajax"
 					   id="backgroundjobs_ajax" <?php if ($_['backgroundjobs_mode'] == "ajax") {
-					echo 'checked="checked"';
+					print_unescaped('checked="checked"');
 				} ?>>
 				<label for="backgroundjobs_ajax">AJAX</label><br/>
-				<em><?php echo $l->t("Execute one task with each page loaded"); ?></em>
+				<em><?php p($l->t("Execute one task with each page loaded")); ?></em>
 			</td>
 		</tr>
 		<tr>
 			<td>
 				<input type="radio" name="mode" value="webcron"
 					   id="backgroundjobs_webcron" <?php if ($_['backgroundjobs_mode'] == "webcron") {
-					echo 'checked="checked"';
+					print_unescaped('checked="checked"');
 				} ?>>
 				<label for="backgroundjobs_webcron">Webcron</label><br/>
-				<em><?php echo $l->t("cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http."); ?></em>
+				<em><?php p($l->t("cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http.")); ?></em>
 			</td>
 		</tr>
 		<tr>
 			<td>
 				<input type="radio" name="mode" value="cron"
 					   id="backgroundjobs_cron" <?php if ($_['backgroundjobs_mode'] == "cron") {
-					echo 'checked="checked"';
+					print_unescaped('checked="checked"');
 				} ?>>
 				<label for="backgroundjobs_cron">Cron</label><br/>
-				<em><?php echo $l->t("Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute."); ?></em>
+				<em><?php p($l->t("Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute.")); ?></em>
 			</td>
 		</tr>
 	</table>
 </fieldset>
 
 <fieldset class="personalblock" id="shareAPI">
-	<legend><strong><?php echo $l->t('Sharing');?></strong></legend>
+	<legend><strong><?php p($l->t('Sharing'));?></strong></legend>
 	<table class="shareAPI nostyle">
 		<tr>
 			<td id="enable">
 				<input type="checkbox" name="shareapi_enabled" id="shareAPIEnabled"
-					   value="1" <?php if ($_['shareAPIEnabled'] == 'yes') echo 'checked="checked"'; ?> />
-				<label for="shareAPIEnabled"><?php echo $l->t('Enable Share API');?></label><br/>
-				<em><?php echo $l->t('Allow apps to use the Share API'); ?></em>
+					   value="1" <?php if ($_['shareAPIEnabled'] == 'yes') print_unescaped('checked="checked"'); ?> />
+				<label for="shareAPIEnabled"><?php p($l->t('Enable Share API'));?></label><br/>
+				<em><?php p($l->t('Allow apps to use the Share API')); ?></em>
 			</td>
 		</tr>
 		<tr>
-			<td <?php if ($_['shareAPIEnabled'] == 'no') echo 'style="display:none"';?>>
+			<td <?php if ($_['shareAPIEnabled'] == 'no') print_unescaped('style="display:none"');?>>
 				<input type="checkbox" name="shareapi_allow_links" id="allowLinks"
-					   value="1" <?php if ($_['allowLinks'] == 'yes') echo 'checked="checked"'; ?> />
-				<label for="allowLinks"><?php echo $l->t('Allow links');?></label><br/>
-				<em><?php echo $l->t('Allow users to share items to the public with links'); ?></em>
+					   value="1" <?php if ($_['allowLinks'] == 'yes') print_unescaped('checked="checked"'); ?> />
+				<label for="allowLinks"><?php p($l->t('Allow links'));?></label><br/>
+				<em><?php p($l->t('Allow users to share items to the public with links')); ?></em>
 			</td>
 		</tr>
 		<tr>
-			<td <?php if ($_['shareAPIEnabled'] == 'no') echo 'style="display:none"';?>>
+			<td <?php if ($_['shareAPIEnabled'] == 'no') print_unescaped('style="display:none"');?>>
 				<input type="checkbox" name="shareapi_allow_resharing" id="allowResharing"
-					   value="1" <?php if ($_['allowResharing'] == 'yes') echo 'checked="checked"'; ?> />
-				<label for="allowResharing"><?php echo $l->t('Allow resharing');?></label><br/>
-				<em><?php echo $l->t('Allow users to share items shared with them again'); ?></em>
+					   value="1" <?php if ($_['allowResharing'] == 'yes') print_unescaped('checked="checked"'); ?> />
+				<label for="allowResharing"><?php p($l->t('Allow resharing'));?></label><br/>
+				<em><?php p($l->t('Allow users to share items shared with them again')); ?></em>
 			</td>
 		</tr>
 		<tr>
-			<td <?php if ($_['shareAPIEnabled'] == 'no') echo 'style="display:none"';?>>
+			<td <?php if ($_['shareAPIEnabled'] == 'no') print_unescaped('style="display:none"');?>>
 				<input type="radio" name="shareapi_share_policy" id="sharePolicyGlobal"
-					   value="global" <?php if ($_['sharePolicy'] == 'global') echo 'checked="checked"'; ?> />
-				<label for="sharePolicyGlobal"><?php echo $l->t('Allow users to share with anyone'); ?></label><br/>
+					   value="global" <?php if ($_['sharePolicy'] == 'global') print_unescaped('checked="checked"'); ?> />
+				<label for="sharePolicyGlobal"><?php p($l->t('Allow users to share with anyone')); ?></label><br/>
 				<input type="radio" name="shareapi_share_policy" id="sharePolicyGroupsOnly"
-					   value="groups_only" <?php if ($_['sharePolicy'] == 'groups_only') echo 'checked="checked"'; ?> />
-				<label for="sharePolicyGroupsOnly"><?php echo $l->t('Allow users to only share with users in their groups');?></label><br/>
+					   value="groups_only" <?php if ($_['sharePolicy'] == 'groups_only') print_unescaped('checked="checked"'); ?> />
+				<label for="sharePolicyGroupsOnly"><?php p($l->t('Allow users to only share with users in their groups'));?></label><br/>
 			</td>
 		</tr>
 	</table>
 </fieldset>
 
 <fieldset class="personalblock" id="security">
-	<legend><strong><?php echo $l->t('Security');?></strong></legend>
+	<legend><strong><?php p($l->t('Security'));?></strong></legend>
 	<table class="nostyle">
 		<tr>
 			<td id="enable">
 				<input type="checkbox" name="forcessl"  id="enforceHTTPSEnabled"
 					<?php if ($_['enforceHTTPSEnabled']) {
-						echo 'checked="checked" ';
-						echo 'value="false"';
+						print_unescaped('checked="checked" ');
+						print_unescaped('value="false"');
 					}  else {
-						echo 'value="true"';
+						print_unescaped('value="true"');
 					}
 					?>
-					<?php if (!$_['isConnectedViaHTTPS']) echo 'disabled'; ?> />
-				<label for="forcessl"><?php echo $l->t('Enforce HTTPS');?></label><br/>
-				<em><?php echo $l->t('Enforces the clients to connect to ownCloud via an encrypted connection.'); ?></em>
+					<?php if (!$_['isConnectedViaHTTPS']) p('disabled'); ?> />
+				<label for="forcessl"><?php p($l->t('Enforce HTTPS'));?></label><br/>
+				<em><?php p($l->t('Enforces the clients to connect to ownCloud via an encrypted connection.')); ?></em>
 				<?php if (!$_['isConnectedViaHTTPS']) {
-					echo "<br/><em>";
-					echo $l->t('Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement.');
-					echo "</em>";
+					print_unescaped("<br/><em>");
+					p($l->t('Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement.'));
+					print_unescaped("</em>");
 				}
 				?>
 			</td>
@@ -189,12 +192,12 @@ if (!$_['internetconnectionworking']) {
 </fieldset>
 
 <fieldset class="personalblock">
-	<legend><strong><?php echo $l->t('Log');?></strong></legend>
-	<?php echo $l->t('Log level');?> <select name='loglevel' id='loglevel'>
-	<option value='<?php echo $_['loglevel']?>'><?php echo $levels[$_['loglevel']]?></option>
+	<legend><strong><?php p($l->t('Log'));?></strong></legend>
+	<?php p($l->t('Log level'));?> <select name='loglevel' id='loglevel'>
+	<option value='<?php p($_['loglevel'])?>'><?php p($levels[$_['loglevel']])?></option>
 	<?php for ($i = 0; $i < 5; $i++):
 	if ($i != $_['loglevel']):?>
-		<option value='<?php echo $i?>'><?php echo $levels[$i]?></option>
+		<option value='<?php p($i)?>'><?php p($levels[$i])?></option>
 		<?php endif;
 endfor;?>
 </select>
@@ -202,31 +205,31 @@ endfor;?>
 		<?php foreach ($_['entries'] as $entry): ?>
 		<tr>
 			<td>
-				<?php echo $levels[$entry->level];?>
+				<?php p($levels[$entry->level]);?>
 			</td>
 			<td>
-				<?php echo $entry->app;?>
+				<?php p($entry->app);?>
 			</td>
 			<td>
-				<?php echo $entry->message;?>
+				<?php p($entry->message);?>
 			</td>
 			<td>
-				<?php echo OC_Util::formatDate($entry->time);?>
+				<?php p(OC_Util::formatDate($entry->time));?>
 			</td>
 		</tr>
 		<?php endforeach;?>
 	</table>
 	<?php if ($_['entriesremain']): ?>
-	<input id='moreLog' type='button' value='<?php echo $l->t('More');?>...'>
+	<input id='moreLog' type='button' value='<?php p($l->t('More'));?>...'>
 	<?php endif; ?>
 
 </fieldset>
 
 
 <fieldset class="personalblock">
-	<legend><strong><?php echo $l->t('Version');?></strong></legend>
-	<strong>ownCloud</strong> <?php echo(OC_Util::getVersionString()); ?> <?php echo(OC_Util::getEditionString()); ?>
-	(<?php echo(OC_Updater::ShowUpdatingHint()); ?>)<br/>
-	<?php echo $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>.'); ?>
+	<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/>
+	<?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/apps.php b/settings/templates/apps.php
index ed1232ac3227204c4719d9b9421581cd52cad6ed..d3639cbab34915ad1690a3fd7c5ff5d84ef89f08 100644
--- a/settings/templates/apps.php
+++ b/settings/templates/apps.php
@@ -3,31 +3,38 @@
  * This file is licensed under the Affero General Public License version 3 or later.
  * See the COPYING-README file.
  */?>
- <script type="text/javascript" src="<?php echo OC_Helper::linkToRoute('apps_custom');?>?appid=<?php echo $_['appid']; ?>"></script>
- <script type="text/javascript" src="<?php echo OC_Helper::linkTo('settings/js', 'apps.js');?>"></script>
+ <script type="text/javascript"
+	src="<?php print_unescaped(OC_Helper::linkToRoute('apps_custom'));?>?appid=<?php p($_['appid']); ?>"></script>
+ <script type="text/javascript" src="<?php print_unescaped(OC_Helper::linkTo('settings/js', 'apps.js'));?>"></script>
 
 <div id="controls">
-	<a class="button" target="_blank" href="http://owncloud.org/dev"><?php echo $l->t('Add your App');?></a>
-	<a class="button" target="_blank" href="http://apps.owncloud.com"><?php echo $l->t('More Apps');?></a>
+	<a class="button" target="_blank" href="http://owncloud.org/dev"><?php p($l->t('Add your App'));?></a>
+	<a class="button" target="_blank" href="http://apps.owncloud.com"><?php p($l->t('More Apps'));?></a>
 </div>
 <ul id="leftcontent" class="applist hascontrols">
 	<?php foreach($_['apps'] as $app):?>
-	<li <?php if($app['active']) echo 'class="active"'?> data-id="<?php echo $app['id'] ?>" <?php if ( isset( $app['ocs_id'] ) ) { echo "data-id-ocs=\"{$app['ocs_id']}\""; } ?>
-		data-type="<?php echo $app['internal'] ? 'internal' : 'external' ?>" data-installed="1">
-		<a class="app<?php if(!$app['internal']) echo ' externalapp' ?>" href="?appid=<?php echo $app['id'] ?>"><?php echo htmlentities($app['name']) ?></a>
-		<?php  if(!$app['internal']) echo '<small class="'.$app['internalclass'].' list">'.$app['internallabel'].'</small>' ?>
+	<li <?php if($app['active']) print_unescaped('class="active"')?> data-id="<?php p($app['id']) ?>"
+		<?php if ( isset( $app['ocs_id'] ) ) { print_unescaped("data-id-ocs=\"{".OC_Util::sanitizeHTML($app['ocs_id'])."}\""); } ?>
+			data-type="<?php p($app['internal'] ? 'internal' : 'external') ?>" data-installed="1">
+		<a class="app<?php if(!$app['internal']) p(' externalapp') ?>"
+			href="?appid=<?php p($app['id']) ?>"><?php p($app['name']) ?></a>
+		<?php  if(!$app['internal'])
+			print_unescaped('<small class="'.OC_Util::sanitizeHTML($app['internalclass']).' list">'.OC_Util::sanitizeHTML($app['internallabel']).'</small>') ?>
 	</li>
 	<?php endforeach;?>
 </ul>
 <div id="rightcontent">
 	<div class="appinfo">
-	<h3><strong><span class="name"><?php echo $l->t('Select an App');?></span></strong><span class="version"></span><small class="externalapp" style="visibility:hidden;"></small></h3>
+	<h3><strong><span class="name"><?php p($l->t('Select an App'));?></span></strong><span
+		class="version"></span><small class="externalapp" style="visibility:hidden;"></small></h3>
 	<span class="score"></span>
 	<p class="description"></p>
 	<img src="" class="preview" />
-	<p class="appslink hidden"><a href="#" target="_blank"><?php echo $l->t('See application page at apps.owncloud.com');?></a></p>
-	<p class="license hidden"><?php echo $l->t('<span class="licence"></span>-licensed by <span class="author"></span>');?></p>
+	<p class="appslink hidden"><a href="#" target="_blank"><?php
+		p($l->t('See application page at apps.owncloud.com'));?></a></p>
+	<p class="license hidden"><?php
+		print_unescaped($l->t('<span class="licence"></span>-licensed by <span class="author"></span>'));?></p>
 	<input class="enable hidden" type="submit" />
-	<input class="update hidden" type="submit" value="<?php echo($l->t('Update')); ?>" />
+	<input class="update hidden" type="submit" value="<?php p($l->t('Update')); ?>" />
 	</div>
 </div>
diff --git a/settings/templates/help.php b/settings/templates/help.php
index 315cbfdb9a2940f83fd3167a388b3a09cf9cf5f9..3739d220e6e49746387c5d8227b8510d59c8e5e1 100644
--- a/settings/templates/help.php
+++ b/settings/templates/help.php
@@ -1,15 +1,21 @@
 <div id="controls">
 	<?php if($_['admin']) { ?>
-		<a class="button newquestion <?php echo($_['style1']); ?>" href="<?php echo($_['url1']); ?>"><?php echo $l->t( 'User Documentation' ); ?></a>
-		<a class="button newquestion <?php echo($_['style2']); ?>" href="<?php echo($_['url2']); ?>"><?php echo $l->t( 'Administrator Documentation' ); ?></a>
+		<a class="button newquestion <?php p($_['style1']); ?>"
+			href="<?php print_unescaped($_['url1']); ?>"><?php p($l->t( 'User Documentation' )); ?></a>
+		<a class="button newquestion <?php p($_['style2']); ?>"
+			href="<?php print_unescaped($_['url2']); ?>"><?php p($l->t( 'Administrator Documentation' )); ?></a>
 	<?php } ?>
-	<a class="button newquestion" href="http://owncloud.org/support" target="_blank"><?php echo $l->t( 'Online Documentation' ); ?></a>
-	<a class="button newquestion" href="http://forum.owncloud.org" target="_blank"><?php echo $l->t( 'Forum' ); ?></a>
+	<a class="button newquestion" href="http://owncloud.org/support" target="_blank"><?php
+		p($l->t( 'Online Documentation' )); ?></a>
+	<a class="button newquestion" href="http://forum.owncloud.org" target="_blank"><?php
+		p($l->t( 'Forum' )); ?></a>
 	<?php if($_['admin']) { ?>
-		<a class="button newquestion" href="https://github.com/owncloud/core/issues" target="_blank"><?php echo $l->t( 'Bugtracker' ); ?></a>
+		<a class="button newquestion" href="https://github.com/owncloud/core/blob/master/CONTRIBUTING.md" target="_blank"><?php
+			p($l->t( 'Bugtracker' )); ?></a>
 	<?php } ?>
-	<a class="button newquestion" href="http://owncloud.com" target="_blank"><?php echo $l->t( 'Commercial Support' ); ?></a>
+	<a class="button newquestion" href="http://owncloud.com" target="_blank"><?php
+		p($l->t( 'Commercial Support' )); ?></a>
 </div>
 <div class="help-includes">
-	<iframe src="<?php echo($_['url']); ?>" class="help-iframe">abc</iframe>
+	<iframe src="<?php print_unescaped($_['url']); ?>" class="help-iframe">abc</iframe>
 </div>
diff --git a/settings/templates/oauth-required-apps.php b/settings/templates/oauth-required-apps.php
index d4fce54c59c1f96d2ee28fe2581c9b34930635a0..3660f423423c738af0adcfc3c40c20485d7ade6a 100644
--- a/settings/templates/oauth-required-apps.php
+++ b/settings/templates/oauth-required-apps.php
@@ -6,14 +6,14 @@
  */
 ?>
 <div id="oauth-request" class="guest-container">
-	<p><strong><?php echo $_['consumer']['name'].'</strong> '.$_['message']; ?></p>
+	<p><strong><?php print_unescaped(OC_Util::sanitizeHTML($_['consumer']['name']).'</strong> '.OC_Util::sanitizeHTML($_['message'])); ?></p>
 	<ul>
 		<?php
 		// Foreach requested scope
 		foreach($_['requiredapps'] as $requiredapp){
-			echo '<li>'.$requiredapp.'</li>';
+			print_unescaped('<li>'.OC_Util::sanitizeHTML($requiredapp).'</li>');
 		}
 		?>
 	</ul>
-	<a href="<?php echo OC::$WEBROOT; ?>" id="back-home" class="button">Back to ownCloud</a>
+	<a href="<?php print_unescaped(OC::$WEBROOT); ?>" id="back-home" class="button">Back to ownCloud</a>
 </div>
diff --git a/settings/templates/oauth.php b/settings/templates/oauth.php
deleted file mode 100644
index 053a8aee6d3f1fa946b580cb05d7471b31420968..0000000000000000000000000000000000000000
--- a/settings/templates/oauth.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012, Tom Needham <tom@owncloud.com>
- * This file is licensed under the Affero General Public License version 3 or later.
- * See the COPYING-README file.
- */
-?>
-<div id="oauth-request" class="guest-container">
-	<p><strong><?php echo $_['consumer']['name']; ?></strong> is requesting your permission to read, write, modify and delete data from the following apps:</p>
-	<ul>
-		<?php
-		// Foreach requested scope
-		foreach($_['consumer']['scopes'] as $app){
-			echo '<li>'.$app.'</li>';
-		}
-		?>
-	</ul>
-	<a href="#" class="button">Allow</a>
-	<a href="#" class="button">Disallow</a>
-</div>
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index 6b3e8acbf02f7f2679dadb8be395c705fae32b58..f3fd3f1010daf84b857afa3a44772b3c2621a83e 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -4,25 +4,26 @@
  * See the COPYING-README file.
  */?>
 
-<div id="quota" class="personalblock"><div style="width:<?php echo $_['usage_relative'];?>%;">
-	<p id="quotatext"><?php echo $l->t('You have used <strong>%s</strong> of the available <strong>%s</strong>', array($_['usage'], $_['total_space']));?></p>
+<div id="quota" class="personalblock"><div style="width:<?php p($_['usage_relative']);?>%;">
+	<p id="quotatext"><?php print_unescaped($l->t('You have used <strong>%s</strong> of the available <strong>%s</strong>',
+		array($_['usage'], $_['total_space'])));?></p>
 </div></div>
 
 
 
 <div class="clientsbox">
-	<h2><?php echo $l->t('Get the apps to sync your files');?></h2>
-	<a href="<?php echo $_['clients']['desktop']; ?>" target="_blank">
-		<img src="<?php echo OCP\Util::imagePath('core', 'desktopapp.png'); ?>" />
+	<h2><?php p($l->t('Get the apps to sync your files'));?></h2>
+	<a href="<?php p($_['clients']['desktop']); ?>" target="_blank">
+		<img src="<?php print_unescaped(OCP\Util::imagePath('core', 'desktopapp.png')); ?>" />
 	</a>
-	<a href="<?php echo $_['clients']['android']; ?>" target="_blank">
-		<img src="<?php echo OCP\Util::imagePath('core', 'googleplay.png'); ?>" />
+	<a href="<?php p($_['clients']['android']); ?>" target="_blank">
+		<img src="<?php print_unescaped(OCP\Util::imagePath('core', 'googleplay.png')); ?>" />
 	</a>
-	<a href="<?php echo $_['clients']['ios']; ?>" target="_blank">
-		<img src="<?php echo OCP\Util::imagePath('core', 'appstore.png'); ?>" />
+	<a href="<?php p($_['clients']['ios']); ?>" target="_blank">
+		<img src="<?php print_unescaped(OCP\Util::imagePath('core', 'appstore.png')); ?>" />
 	</a>
 	<?php if(OC_APP::isEnabled('firstrunwizard')) {?>
-	<center><a class="button" href="#" id="showWizard"><?php echo $l->t('Show First Run Wizard again');?></a></center>
+	<center><a class="button" href="#" id="showWizard"><?php p($l->t('Show First Run Wizard again'));?></a></center>
 	<?php }?>
 </div>
 
@@ -33,11 +34,12 @@ if($_['passwordChangeSupported']) {
 ?>
 <form id="passwordform">
 	<fieldset class="personalblock">
-		<legend><strong><?php echo $l->t('Password');?></strong></legend>
+		<legend><strong><?php p($l->t('Password'));?></strong></legend>
 		<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="personal-password" placeholder="<?php echo $l->t('New password');?>" data-typetoggle="#personal-show" />
+		<input type="password" id="pass2" name="password"
+			placeholder="<?php echo $l->t('New password');?>" data-typetoggle="#personal-show" />
 		<input type="checkbox" id="personal-show" name="show" /><label for="personal-show"></label>
 		<input id="passwordbutton" type="submit" value="<?php echo $l->t('Change password');?>" />
 	</fieldset>
@@ -52,11 +54,11 @@ if($_['displayNameChangeSupported']) {
 <form id="displaynameform">
 	<fieldset class="personalblock">
 		<legend><strong><?php echo $l->t('Display Name');?></strong></legend>
-		<div id="displaynamechanged"><?php echo $l->t('Your display name was changed');?></div>
-		<div id="displaynameerror"><?php echo $l->t('Unable to change your display name');?></div>
-		<input type="text" id="displayName" name="displayName" value="<?php echo $_['displayName']?>" />
-		<input type="hidden" id="oldDisplayName" name="oldDisplayName" value="<?php echo $_['displayName']?>" />
-		<input id="displaynamebutton" type="submit" value="<?php echo $l->t('Change display name');?>" />
+		<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'])?>" />
+		<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
@@ -65,39 +67,42 @@ if($_['displayNameChangeSupported']) {
 
 <form id="lostpassword">
 	<fieldset class="personalblock">
-		<legend><strong><?php echo $l->t('Email');?></strong></legend>
-		<input type="text" name="email" id="email" value="<?php echo $_['email']; ?>" placeholder="<?php echo $l->t('Your email address');?>" /><span class="msg"></span><br />
-		<em><?php echo $l->t('Fill in an email address to enable password recovery');?></em>
+		<legend><strong><?php p($l->t('Email'));?></strong></legend>
+		<input type="text" name="email" id="email" value="<?php p($_['email']); ?>"
+			placeholder="<?php p($l->t('Your email address'));?>" /><span class="msg"></span><br />
+		<em><?php p($l->t('Fill in an email address to enable password recovery'));?></em>
 	</fieldset>
 </form>
 
 <form>
 	<fieldset class="personalblock">
-		<legend><strong><?php echo $l->t('Language');?></strong></legend>
-		<select id="languageinput" class="chzen-select" name="lang" data-placeholder="<?php echo $l->t('Language');?>">
+		<legend><strong><?php p($l->t('Language'));?></strong></legend>
+		<select id="languageinput" class="chzen-select" name="lang" data-placeholder="<?php p($l->t('Language'));?>">
 		<?php foreach($_['languages'] as $language):?>
-			<option value="<?php echo $language['code'];?>"><?php echo $language['name'];?></option>
+			<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 echo $_['languages'][0]['code'];?>/" target="_blank"><em><?php echo $l->t('Help translate');?></em></a>
+		<a href="https://www.transifex.net/projects/p/owncloud/team/<?php p($_['languages'][0]['code']);?>/"
+			target="_blank"><em><?php p($l->t('Help translate'));?></em></a>
 	</fieldset>
 </form>
 
 <fieldset class="personalblock">
-	<legend><strong><?php echo $l->t('WebDAV');?></strong></legend>
-	<code><?php echo OC_Helper::linkToRemote('webdav'); ?></code><br />
-	<em><?php echo $l->t('Use this address to connect to your ownCloud in your file manager');?></em>
+	<legend><strong><?php p($l->t('WebDAV'));?></strong></legend>
+	<code><?php print_unescaped(OC_Helper::linkToRemote('webdav')); ?></code><br />
+	<em><?php p($l->t('Use this address to connect to your ownCloud in your file manager'));?></em>
 </fieldset>
 
 <?php foreach($_['forms'] as $form) {
-	echo $form;
+	print_unescaped($form);
 };?>
 
 
 <fieldset class="personalblock">
-	<legend><strong><?php echo $l->t('Version');?></strong></legend>
-	<strong>ownCloud</strong> <?php echo(OC_Util::getVersionString()); ?> <?php echo(OC_Util::getEditionString()); ?> <br />
-	<?php echo $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>.'); ?>
+	<legend><strong><?php p($l->t('Version'));?></strong></legend>
+	<strong>ownCloud</strong> <?php p(OC_Util::getVersionString()); ?>
+	<?php p(OC_Util::getEditionString()); ?> <br />
+	<?php print_unescaped($l->t('Developed by the <a href="http://ownCloud.org/contact" target="_blank">ownCloud community</a>, the <a href="https://github.com/owncloud" target="_blank">source code</a> is licensed under the <a href="http://www.gnu.org/licenses/agpl-3.0.html" target="_blank"><abbr title="Affero General Public License">AGPL</abbr></a>.')); ?>
 </fieldset>
 
 
diff --git a/settings/templates/settings.php b/settings/templates/settings.php
index de8092eeaff5a86ae048ec36206632c9d7251b24..48b4e6b32340ff0ec1cf07ecabe7506bd9b0398b 100644
--- a/settings/templates/settings.php
+++ b/settings/templates/settings.php
@@ -5,5 +5,5 @@
  */?>
 
 <?php foreach($_['forms'] as $form) {
-	echo $form;
+	print_unescaped($form);
 };
diff --git a/settings/templates/users.php b/settings/templates/users.php
index 53a66fb46869b3d840e43fc910fbde2cebc95732..deffe1683233036ad6759fa79e3447cad6bb69c5 100644
--- a/settings/templates/users.php
+++ b/settings/templates/users.php
@@ -14,49 +14,49 @@ unset($items['admin']);
 $_['subadmingroups'] = array_flip($items);
 ?>
 
-<script type="text/javascript" src="<?php echo OC_Helper::linkToRoute('isadmin');?>"></script>
+<script type="text/javascript" src="<?php print_unescaped(OC_Helper::linkToRoute('isadmin'));?>"></script>
 
 <div id="controls">
 	<form id="newuser" autocomplete="off">
-		<input id="newusername" type="text" placeholder="<?php echo $l->t('Login Name')?>" /> <input
+		<input id="newusername" type="text" placeholder="<?php p($l->t('Login Name'))?>" /> <input
 			type="password" id="newuserpassword"
-			placeholder="<?php echo $l->t('Password')?>" /> <select
+			placeholder="<?php p($l->t('Password'))?>" /> <select
 			class="groupsselect"
 			id="newusergroups" data-placeholder="groups"
-			title="<?php echo $l->t('Groups')?>" multiple="multiple">
+			title="<?php p($l->t('Groups'))?>" multiple="multiple">
 			<?php foreach($_["groups"] as $group): ?>
-			<option value="<?php echo $group['name'];?>">
-				<?php echo $group['name'];?>
+			<option value="<?php p($group['name']);?>">
+				<?php p($group['name']);?>
 			</option>
 			<?php endforeach;?>
-		</select> <input type="submit" value="<?php echo $l->t('Create')?>" />
+		</select> <input type="submit" value="<?php p($l->t('Create'))?>" />
 	</form>
 	<div class="quota">
-		<span><?php echo $l->t('Default Storage');?></span>
+		<span><?php p($l->t('Default Storage'));?></span>
 			<?php if((bool) $_['isadmin']): ?>
 			<select class='quota'>
 				<option
-					<?php if($_['default_quota']=='none') echo 'selected="selected"';?>
+					<?php if($_['default_quota']=='none') print_unescaped('selected="selected"');?>
 						value='none'>
-					<?php echo $l->t('Unlimited');?>
+					<?php p($l->t('Unlimited'));?>
 				</option>
 				<?php foreach($_['quota_preset'] as $preset):?>
 				<?php if($preset!='default'):?>
 				<option
-				<?php if($_['default_quota']==$preset) echo 'selected="selected"';?>
-					value='<?php echo $preset;?>'>
-					<?php echo $preset;?>
+				<?php if($_['default_quota']==$preset) print_unescaped('selected="selected"');?>
+					value='<?php p($preset);?>'>
+					<?php p($preset);?>
 				</option>
 				<?php endif;?>
 				<?php endforeach;?>
 				<?php if($_['defaultQuotaIsUserDefined']):?>
 				<option selected="selected"
-					value='<?php echo $_['default_quota'];?>'>
-					<?php echo $_['default_quota'];?>
+					value='<?php p($_['default_quota']);?>'>
+					<?php p($_['default_quota']);?>
 				</option>
 				<?php endif;?>
 				<option value='other'>
-					<?php echo $l->t('Other');?>
+					<?php p($l->t('Other'));?>
 					...
 				</option>
 			</select>
@@ -64,49 +64,49 @@ $_['subadmingroups'] = array_flip($items);
 			<?php if((bool) !$_['isadmin']): ?>
 				<select class='quota' disabled="disabled">
 					<option selected="selected">
-				<?php echo $_['default_quota'];?>
+				<?php p($_['default_quota']);?>
 					</option>
 				</select>
 			<?php endif; ?>
 	</div>
 </div>
 
-<table class="hascontrols" data-groups="<?php echo implode(', ', $allGroups);?>">
+<table class="hascontrols" data-groups="<?php p(implode(', ', $allGroups));?>">
 	<thead>
 		<tr>
-			<th id='headerName'><?php echo $l->t('Login Name')?></th>
-			<th id="headerDisplayName"><?php echo $l->t( 'Display Name' ); ?></th>
-			<th id="headerPassword"><?php echo $l->t( 'Password' ); ?></th>
-			<th id="headerGroups"><?php echo $l->t( 'Groups' ); ?></th>
+			<th id='headerName'><?php p($l->t('Login Name'))?></th>
+			<th id="headerDisplayName"><?php p($l->t( 'Display Name' )); ?></th>
+			<th id="headerPassword"><?php p($l->t( 'Password' )); ?></th>
+			<th id="headerGroups"><?php p($l->t( 'Groups' )); ?></th>
 			<?php if(is_array($_['subadmins']) || $_['subadmins']): ?>
-			<th id="headerSubAdmins"><?php echo $l->t('Group Admin'); ?></th>
+			<th id="headerSubAdmins"><?php p($l->t('Group Admin')); ?></th>
 			<?php endif;?>
-			<th id="headerQuota"><?php echo $l->t('Storage'); ?></th>
+			<th id="headerQuota"><?php p($l->t('Storage')); ?></th>
 			<th id="headerRemove">&nbsp;</th>
 		</tr>
 	</thead>
 	<tbody>
 		<?php foreach($_["users"] as $user): ?>
-		<tr data-uid="<?php echo $user["name"] ?>"
-			data-displayName="<?php echo $user["displayName"] ?>">
-			<td class="name"><?php echo $user["name"]; ?></td>
-			<td class="displayName"><span><?php echo $user["displayName"]; ?></span> <img class="svg action"
-				src="<?php echo image_path('core', 'actions/rename.svg')?>"
-				alt="<?php echo $l->t("change display name")?>" title="<?php echo $l->t("change display name")?>"/>
+		<tr data-uid="<?php p($user["name"]) ?>"
+			data-displayName="<?php p($user["displayName"]) ?>">
+			<td class="name"><?php p($user["name"]); ?></td>
+			<td class="displayName"><span><?php p($user["displayName"]); ?></span> <img class="svg action"
+				src="<?php p(image_path('core', 'actions/rename.svg'))?>"
+				alt="<?php p($l->t("change display name"))?>" title="<?php p($l->t("change display name"))?>"/>
 			</td>
 			<td class="password"><span>●●●●●●●</span> <img class="svg action"
-				src="<?php echo image_path('core', 'actions/rename.svg')?>"
-				alt="<?php echo $l->t("set new password")?>" title="<?php echo $l->t("set new password")?>"/>
+				src="<?php print_unescaped(image_path('core', 'actions/rename.svg'))?>"
+				alt="<?php p($l->t("set new password"))?>" title="<?php p($l->t("set new password"))?>"/>
 			</td>
 			<td class="groups"><select
 				class="groupsselect"
-				data-username="<?php echo $user['name'] ;?>"
-				data-user-groups="<?php echo $user['groups'] ;?>"
-				data-placeholder="groups" title="<?php echo $l->t('Groups')?>"
+				data-username="<?php p($user['name']) ;?>"
+				data-user-groups="<?php p($user['groups']) ;?>"
+				data-placeholder="groups" title="<?php p($l->t('Groups'))?>"
 				multiple="multiple">
 					<?php foreach($_["groups"] as $group): ?>
-					<option value="<?php echo $group['name'];?>">
-						<?php echo $group['name'];?>
+					<option value="<?php p($group['name']);?>">
+						<?php p($group['name']);?>
 					</option>
 					<?php endforeach;?>
 			</select>
@@ -114,13 +114,13 @@ $_['subadmingroups'] = array_flip($items);
 			<?php if(is_array($_['subadmins']) || $_['subadmins']): ?>
 			<td class="subadmins"><select
 				class="subadminsselect"
-				data-username="<?php echo $user['name'] ;?>"
-				data-subadmin="<?php echo $user['subadmin'] ;?>"
-				data-placeholder="subadmins" title="<?php echo $l->t('Group Admin')?>"
+				data-username="<?php p($user['name']) ;?>"
+				data-subadmin="<?php p($user['subadmin']);?>"
+				data-placeholder="subadmins" title="<?php p($l->t('Group Admin'))?>"
 				multiple="multiple">
 					<?php foreach($_["subadmingroups"] as $group): ?>
-					<option value="<?php echo $group;?>">
-						<?php echo $group;?>
+					<option value="<?php p($group);?>">
+						<?php p($group);?>
 					</option>
 					<?php endforeach;?>
 			</select>
@@ -129,37 +129,37 @@ $_['subadmingroups'] = array_flip($items);
 			<td class="quota">
 				<select class='quota-user'>
 					<option
-						<?php if($user['quota']=='default') echo 'selected="selected"';?>
+						<?php if($user['quota']=='default') print_unescaped('selected="selected"');?>
 							value='default'>
-						<?php echo $l->t('Default');?>
+						<?php p($l->t('Default'));?>
 					</option>
 					<option
-					<?php if($user['quota']=='none') echo 'selected="selected"';?>
+					<?php if($user['quota']=='none') print_unescaped('selected="selected"');?>
 							value='none'>
-						<?php echo $l->t('Unlimited');?>
+						<?php p($l->t('Unlimited'));?>
 					</option>
 					<?php foreach($_['quota_preset'] as $preset):?>
 					<option
-					<?php if($user['quota']==$preset) echo 'selected="selected"';?>
-						value='<?php echo $preset;?>'>
-						<?php echo $preset;?>
+					<?php if($user['quota']==$preset) print_unescaped('selected="selected"');?>
+						value='<?php p($preset);?>'>
+						<?php p($preset);?>
 					</option>
 					<?php endforeach;?>
 					<?php if($user['isQuotaUserDefined']):?>
-					<option selected="selected" value='<?php echo $user['quota'];?>'>
-						<?php echo $user['quota'];?>
+					<option selected="selected" value='<?php p($user['quota']);?>'>
+						<?php p($user['quota']);?>
 					</option>
 					<?php endif;?>
 					<option value='other' data-new>
-						<?php echo $l->t('Other');?>
+						<?php p($l->t('Other'));?>
 						...
 					</option>
 				</select>
 			</td>
 			<td class="remove">
 				<?php if($user['name']!=OC_User::getUser()):?>
-					<a href="#" class="action delete" original-title="<?php echo $l->t('Delete')?>">
-						<img src="<?php echo image_path('core', 'actions/delete.svg') ?>" class="svg" />
+					<a href="#" class="action delete" original-title="<?php p($l->t('Delete'))?>">
+						<img src="<?php print_unescaped(image_path('core', 'actions/delete.svg')) ?>" class="svg" />
 					</a>
 				<?php endif;?>
 			</td>
diff --git a/settings/users.php b/settings/users.php
index 7fcd1d3ed023247f6d2b9327590bfffd44263a05..94e6d0a9a10f9ee5751b7d5b645692642a0c5871 100644
--- a/settings/users.php
+++ b/settings/users.php
@@ -40,12 +40,14 @@ foreach($quotaPreset as &$preset) {
 $quotaPreset=array_diff($quotaPreset, array('default', 'none'));
 
 $defaultQuota=OC_Appconfig::getValue('files', 'default_quota', 'none');
-$defaultQuotaIsUserDefined=array_search($defaultQuota, $quotaPreset)===false && array_search($defaultQuota, array('none', 'default'))===false;
+$defaultQuotaIsUserDefined=array_search($defaultQuota, $quotaPreset)===false
+	&& array_search($defaultQuota, array('none', 'default'))===false;
 
 // load users and quota
 foreach($accessibleusers as $uid => $displayName) {
 	$quota=OC_Preferences::getValue($uid, 'files', 'quota', 'default');
-	$isQuotaUserDefined=array_search($quota, $quotaPreset)===false && array_search($quota, array('none', 'default'))===false;
+	$isQuotaUserDefined=array_search($quota, $quotaPreset)===false
+		&& array_search($quota, array('none', 'default'))===false;
 
 	$name = $displayName;
 	if ( $displayName != $uid ) {
diff --git a/tests/lib/app.php b/tests/lib/app.php
new file mode 100644
index 0000000000000000000000000000000000000000..c452d752c9f43cc13cc8749fd7242d9619ebe96b
--- /dev/null
+++ b/tests/lib/app.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * Copyright (c) 2012 Bernhard Posselt <nukeawhale@gmail.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+class Test_App extends PHPUnit_Framework_TestCase {
+
+	
+	public function testIsAppVersionCompatibleSingleOCNumber(){
+		$oc = array(4);
+		$app = '4.0';
+
+		$this->assertTrue(OC_App::isAppVersionCompatible($oc, $app));
+	}
+
+	
+	public function testIsAppVersionCompatibleMultipleOCNumber(){
+		$oc = array(4, 3, 1);
+		$app = '4.3';
+
+		$this->assertTrue(OC_App::isAppVersionCompatible($oc, $app));
+	}
+
+
+	public function testIsAppVersionCompatibleSingleNumber(){
+		$oc = array(4);
+		$app = '4';
+
+		$this->assertTrue(OC_App::isAppVersionCompatible($oc, $app));
+	}
+
+
+	public function testIsAppVersionCompatibleSingleAppNumber(){
+		$oc = array(4, 3);
+		$app = '4';
+
+		$this->assertTrue(OC_App::isAppVersionCompatible($oc, $app));
+	}
+
+
+	public function testIsAppVersionCompatibleComplex(){
+		$oc = array(5, 0, 0);
+		$app = '4.5.1';
+
+		$this->assertTrue(OC_App::isAppVersionCompatible($oc, $app));
+	}
+
+	
+	public function testIsAppVersionCompatibleShouldFail(){
+		$oc = array(4, 3, 1);
+		$app = '4.3.2';
+
+		$this->assertFalse(OC_App::isAppVersionCompatible($oc, $app));
+	}
+
+	public function testIsAppVersionCompatibleShouldFailTwoVersionNumbers(){
+		$oc = array(4, 3, 1);
+		$app = '4.4';
+
+		$this->assertFalse(OC_App::isAppVersionCompatible($oc, $app));
+	}
+
+
+	public function testIsAppVersionCompatibleShouldFailOneVersionNumbers(){
+		$oc = array(4, 3, 1);
+		$app = '5';
+
+		$this->assertFalse(OC_App::isAppVersionCompatible($oc, $app));
+	}
+
+}
\ No newline at end of file
diff --git a/tests/lib/dbschema.php b/tests/lib/dbschema.php
index fb60ce7dbb7d3f542fe975a18dba672227b7fca1..e20a04ef7fd06fe9d64e55b8de3e7feab9c7e413 100644
--- a/tests/lib/dbschema.php
+++ b/tests/lib/dbschema.php
@@ -91,9 +91,15 @@ class Test_DBSchema extends PHPUnit_Framework_TestCase {
 				break;
 			case 'pgsql':
 				$sql = "SELECT tablename AS table_name, schemaname AS schema_name "
-				. "FROM pg_tables WHERE schemaname NOT LIKE 'pg_%' "
-				.  "AND schemaname != 'information_schema' "
-				.  "AND tablename = '".$table."'";
+					. "FROM pg_tables WHERE schemaname NOT LIKE 'pg_%' "
+					.  "AND schemaname != 'information_schema' "
+					.  "AND tablename = '".$table."'";
+				$query = OC_DB::prepare($sql);
+				$result = $query->execute(array());
+				$exists = $result && $result->fetchOne();
+				break;
+			case 'mssql':
+				$sql = "SELECT * FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = '{$table}'";
 				$query = OC_DB::prepare($sql);
 				$result = $query->execute(array());
 				$exists = $result && $result->fetchOne();
diff --git a/tests/lib/files/cache/cache.php b/tests/lib/files/cache/cache.php
index 794664c8893d21df28e5c64d36a01c297b658cb5..edcd1c487d0b9e28e6751537b1168430ba5dcef7 100644
--- a/tests/lib/files/cache/cache.php
+++ b/tests/lib/files/cache/cache.php
@@ -8,6 +8,12 @@
 
 namespace Test\Files\Cache;
 
+class LongId extends \OC\Files\Storage\Temporary {
+	public function getId() {
+		return 'long:' . str_repeat('foo', 50) . parent::getId();
+	}
+}
+
 class Cache extends \PHPUnit_Framework_TestCase {
 	/**
 	 * @var \OC\Files\Storage\Temporary $storage;
@@ -221,6 +227,15 @@ class Cache extends \PHPUnit_Framework_TestCase {
 		$this->assertEquals(25, $cachedData['mtime']);
 	}
 
+	function testLongId() {
+		$storage = new LongId(array());
+		$cache = $storage->getCache();
+		$storageId = $storage->getId();
+		$data = array('size' => 1000, 'mtime' => 20, 'mimetype' => 'foo/file');
+		$id = $cache->put('foo', $data);
+		$this->assertEquals(array(md5($storageId), 'foo'), \OC\Files\Cache\Cache::getById($id));
+	}
+
 	public function tearDown() {
 		$this->cache->clear();
 	}
@@ -229,5 +244,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/mount.php b/tests/lib/files/mount.php
index f223f0f6c534de73fa4219bbff21db85390112f1..a3dc06cc66887b7a8cd7f3d111b1f3b45337432d 100644
--- a/tests/lib/files/mount.php
+++ b/tests/lib/files/mount.php
@@ -10,6 +10,12 @@ 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();
@@ -33,9 +39,20 @@ class Mount extends \PHPUnit_Framework_TestCase {
 		$this->assertEquals(2, count(\OC\Files\Mount::findIn('/')));
 
 		$id = $mount->getStorageId();
-		$this->assertEquals(array($mount), \OC\Files\Mount::findById($id));
+		$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::findById($id));
+		$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/storage/mappedlocalwithdotteddatadir.php b/tests/lib/files/storage/mappedlocalwithdotteddatadir.php
new file mode 100644
index 0000000000000000000000000000000000000000..d2e5e2e97aff8a84bd046410f1d5091036eb6373
--- /dev/null
+++ b/tests/lib/files/storage/mappedlocalwithdotteddatadir.php
@@ -0,0 +1,42 @@
+<?php
+/**
+* ownCloud
+*
+* @author Robin Appelman
+* @copyright 2012 Robin Appelman icewind@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\Storage;
+
+class MappedLocalWithDottedDataDir extends Storage {
+	/**
+	 * @var string tmpDir
+	 */
+	private $tmpDir;
+
+	public function setUp() {
+		$this->tmpDir = \OC_Helper::tmpFolder().'dir.123'.DIRECTORY_SEPARATOR;
+		mkdir($this->tmpDir);
+		$this->instance=new \OC\Files\Storage\MappedLocal(array('datadir'=>$this->tmpDir));
+	}
+
+	public function tearDown() {
+		\OC_Helper::rmdirr($this->tmpDir);
+		unset($this->instance);
+	}
+}
+
diff --git a/tests/lib/files/storage/storage.php b/tests/lib/files/storage/storage.php
index c74a16f509f5ae73fe85a7a77aa41b299c8ec47e..f78f66d8b8ad1345fa0a62141a8fadee0466bb16 100644
--- a/tests/lib/files/storage/storage.php
+++ b/tests/lib/files/storage/storage.php
@@ -223,6 +223,22 @@ abstract class Storage extends \PHPUnit_Framework_TestCase {
 		$this->assertContains('/logo-wide.png', $result);
 	}
 
+	public function testSearchInSubFolder() {
+		$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';
+		$this->instance->file_put_contents('/sub/logo-wide.png', file_get_contents($pngFile, 'r'));
+		$svgFile = \OC::$SERVERROOT . '/tests/data/logo-wide.svg';
+		$this->instance->file_put_contents('/sub/logo-wide.svg', file_get_contents($svgFile, 'r'));
+
+		$result = $this->instance->search('logo');
+		$this->assertEquals(2, count($result));
+		$this->assertContains('/sub/logo-wide.svg', $result);
+		$this->assertContains('/sub/logo-wide.png', $result);
+	}
+
 	public function testFOpen() {
 		$textFile = \OC::$SERVERROOT . '/tests/data/lorem.txt';
 
diff --git a/tests/lib/share/share.php b/tests/lib/share/share.php
index ab43e47726b9977515213669a58f2db5cc5a17a6..e7d441a7e780db7ff1c8d20a0a498c8d4a8863a3 100644
--- a/tests/lib/share/share.php
+++ b/tests/lib/share/share.php
@@ -28,7 +28,7 @@ class Test_Share extends PHPUnit_Framework_TestCase {
 	protected $groupBackend;
 	protected $group1;
 	protected $group2;
-
+	protected $resharing;
 
 	public function setUp() {
 		OC_User::clearBackends();
@@ -56,11 +56,14 @@ class Test_Share extends PHPUnit_Framework_TestCase {
 		OCP\Share::registerBackend('test', 'Test_Share_Backend');
 		OC_Hook::clear('OCP\\Share');
 		OC::registerShareHooks();
+		$this->resharing = OC_Appconfig::getValue('core', 'shareapi_allow_resharing', 'yes');
+		OC_Appconfig::setValue('core', 'shareapi_allow_resharing', 'yes');
 	}
 
 	public function tearDown() {
 		$query = OC_DB::prepare('DELETE FROM `*PREFIX*share` WHERE `item_type` = ?');
 		$query->execute(array('test'));
+		OC_Appconfig::setValue('core', 'shareapi_allow_resharing', $this->resharing);
 	}
 
 	public function testShareInvalidShareType() {
diff --git a/tests/lib/util.php b/tests/lib/util.php
index ebff3c7381a2fb7f679140e392599b6f396de6d5..b904c35980775f65822e676a761160cd81649737 100644
--- a/tests/lib/util.php
+++ b/tests/lib/util.php
@@ -42,4 +42,9 @@ class Test_Util extends PHPUnit_Framework_TestCase {
 		$result = strlen(OC_Util::generate_random_bytes(59));
 		$this->assertEquals(59, $result);
 	}
+
+	function testGetDefaultEmailAddress() {
+		$email = \OCP\Util::getDefaultEmailAddress("no-reply");
+		$this->assertEquals('no-reply@localhost.localdomain', $email);
+	}
 }
\ No newline at end of file